Title: [141513] trunk/Source
Revision
141513
Author
[email protected]
Date
2013-01-31 17:25:28 -0800 (Thu, 31 Jan 2013)

Log Message

Mac: Editor::baseWritingDirectionForSelectionStart should return WritingDirection instead of NSWritingDirection.
https://bugs.webkit.org/show_bug.cgi?id=108519.

Reviewed by Sam Weinig.

Source/WebCore: 

No new tests, no change in behavior.

There is no need to use AppKit types here.
baseWritingDirectionForSelectionStart now returns WritingDirection and
WebHTMLView toggleWritingDirection has been modified accordingly.
        
* editing/Editor.h:
* editing/mac/EditorMac.mm:
(WebCore::Editor::baseWritingDirectionForSelectionStart):

Source/WebKit/mac: 

There is no need to use AppKit types here.
baseWritingDirectionForSelectionStart now returns WritingDirection and
WebHTMLView toggleWritingDirection has been modified accordingly.

* WebView/WebHTMLView.mm:
(-[WebHTMLView toggleBaseWritingDirection:]):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (141512 => 141513)


--- trunk/Source/WebCore/ChangeLog	2013-02-01 01:23:47 UTC (rev 141512)
+++ trunk/Source/WebCore/ChangeLog	2013-02-01 01:25:28 UTC (rev 141513)
@@ -1,3 +1,20 @@
+2013-01-31  Enrica Casucci  <[email protected]>
+
+        Mac: Editor::baseWritingDirectionForSelectionStart should return WritingDirection instead of NSWritingDirection.
+        https://bugs.webkit.org/show_bug.cgi?id=108519.
+
+        Reviewed by Sam Weinig.
+
+        No new tests, no change in behavior.
+
+        There is no need to use AppKit types here.
+        baseWritingDirectionForSelectionStart now returns WritingDirection and
+        WebHTMLView toggleWritingDirection has been modified accordingly.
+        
+        * editing/Editor.h:
+        * editing/mac/EditorMac.mm:
+        (WebCore::Editor::baseWritingDirectionForSelectionStart):
+
 2013-01-31  Kentaro Hara  <[email protected]>
 
         [V8] Pass an Isolate to GetTemplate() in CodeGeneratorV8.pm

Modified: trunk/Source/WebCore/editing/Editor.h (141512 => 141513)


--- trunk/Source/WebCore/editing/Editor.h	2013-02-01 01:23:47 UTC (rev 141512)
+++ trunk/Source/WebCore/editing/Editor.h	2013-02-01 01:25:28 UTC (rev 141513)
@@ -377,7 +377,7 @@
 #if PLATFORM(MAC)
     const SimpleFontData* fontForSelection(bool&) const;
     NSDictionary* fontAttributesForSelectionStart() const;
-    NSWritingDirection baseWritingDirectionForSelectionStart() const;
+    WritingDirection baseWritingDirectionForSelectionStart() const;
     bool canCopyExcludingStandaloneImages();
     void takeFindStringFromSelection();
     void writeSelectionToPasteboard(const String& pasteboardName, const Vector<String>& pasteboardTypes);

Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (141512 => 141513)


--- trunk/Source/WebCore/editing/mac/EditorMac.mm	2013-02-01 01:23:47 UTC (rev 141512)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm	2013-02-01 01:25:28 UTC (rev 141513)
@@ -251,9 +251,9 @@
     return result;
 }
 
-NSWritingDirection Editor::baseWritingDirectionForSelectionStart() const
+WritingDirection Editor::baseWritingDirectionForSelectionStart() const
 {
-    NSWritingDirection result = NSWritingDirectionLeftToRight;
+    WritingDirection result = LeftToRightWritingDirection;
 
     Position pos = m_frame->selection()->selection().visibleStart().deepEquivalent();
     Node* node = pos.deprecatedNode();
@@ -276,10 +276,10 @@
         
     switch (style->direction()) {
         case LTR:
-            result = NSWritingDirectionLeftToRight;
+            result = LeftToRightWritingDirection;
             break;
         case RTL:
-            result = NSWritingDirectionRightToLeft;
+            result = RightToLeftWritingDirection;
             break;
     }
 

Modified: trunk/Source/WebKit/mac/ChangeLog (141512 => 141513)


--- trunk/Source/WebKit/mac/ChangeLog	2013-02-01 01:23:47 UTC (rev 141512)
+++ trunk/Source/WebKit/mac/ChangeLog	2013-02-01 01:25:28 UTC (rev 141513)
@@ -1,3 +1,17 @@
+2013-01-31  Enrica Casucci  <[email protected]>
+
+        Mac: Editor::baseWritingDirectionForSelectionStart should return WritingDirection instead of NSWritingDirection.
+        https://bugs.webkit.org/show_bug.cgi?id=108519.
+
+        Reviewed by Sam Weinig.
+
+        There is no need to use AppKit types here.
+        baseWritingDirectionForSelectionStart now returns WritingDirection and
+        WebHTMLView toggleWritingDirection has been modified accordingly.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView toggleBaseWritingDirection:]):
+
 2013-01-31  Aurimas Liutikas  <[email protected]>
 
         Editor::m_compositionNode not updated on HTMLInputElement::setValue()

Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (141512 => 141513)


--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm	2013-02-01 01:23:47 UTC (rev 141512)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm	2013-02-01 01:25:28 UTC (rev 141513)
@@ -4864,14 +4864,14 @@
 
     WritingDirection direction = RightToLeftWritingDirection;
     switch (coreFrame->editor()->baseWritingDirectionForSelectionStart()) {
-        case NSWritingDirectionLeftToRight:
+        case LeftToRightWritingDirection:
             break;
-        case NSWritingDirectionRightToLeft:
+        case RightToLeftWritingDirection:
             direction = LeftToRightWritingDirection;
             break;
         // The writingDirectionForSelectionStart method will never return "natural". It
         // will always return a concrete direction. So, keep the compiler happy, and assert not reached.
-        case NSWritingDirectionNatural:
+        case NaturalWritingDirection:
             ASSERT_NOT_REACHED();
             break;
     }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to