Changeset 82121 in webkit

Timestamp:

Mar 28, 2011 8:56:11 AM (13 years ago)

Author:

xji@chromium.org

Message:

2011-03-28 Xiaomei Ji <​xji@chromium.org>

Reviewed by Ryosuke Niwa.

move directionOfEnclosingBlock() to be global so that it could be reused.
​https://bugs.webkit.org/show_bug.cgi?id=57233.

Provide global function directionOfEnclosingBlock(Node*) so that it could be
reused in SelectionController and other functionalities that need enclosing
block's direcionality, such as moving caret by word in visual order.

No new functionality, so no new tests.

• editing/SelectionController.cpp: (WebCore::SelectionController::directionOfEnclosingBlock):
• editing/htmlediting.cpp: (WebCore::directionOfEnclosingBlock):
• editing/htmlediting.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/SelectionController.cpp (modified) (2 diffs)
• editing/htmlediting.cpp (modified) (1 diff)
• editing/htmlediting.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-28  Xiaomei Ji  <xji@chromium.org>
+
+        Reviewed by Ryosuke Niwa.
+
+        move directionOfEnclosingBlock() to be global so that it could be reused.
+        https://bugs.webkit.org/show_bug.cgi?id=57233.
+
+        Provide global function directionOfEnclosingBlock(Node*) so that it could be
+        reused in SelectionController and other functionalities that need enclosing
+        block's direcionality, such as moving caret by word in visual order.
+      
+        No new functionality, so no new tests.
+
+        * editing/SelectionController.cpp:
+        (WebCore::SelectionController::directionOfEnclosingBlock):
+        * editing/htmlediting.cpp:
+        (WebCore::directionOfEnclosingBlock):
+        * editing/htmlediting.h:
+
 2011-03-28  Jarkko Sakkinen  <jarkko.j.sakkinen@gmail.com>
 

trunk/Source/WebCore/editing/SelectionController.cpp

@@ -335 +335 @@
 }
 
+TextDirection SelectionController::directionOfEnclosingBlock()
+{
+    return WebCore::directionOfEnclosingBlock(m_selection.extent());
+}
+
 void SelectionController::willBeModified(EAlteration alter, SelectionDirection direction)
 {
@@ -382 +387 @@
         m_selection.setExtent(start);
     }
-}
-
-TextDirection SelectionController::directionOfEnclosingBlock()
-{
-    Node* enclosingBlockNode = enclosingBlock(m_selection.extent().containerNode());
-    if (!enclosingBlockNode)
-        return LTR;
-    RenderObject* renderer = enclosingBlockNode->renderer();
-    if (renderer)
-        return renderer->style()->direction();
-    return LTR;
 }
 

trunk/Source/WebCore/editing/htmlediting.cpp

@@ -333 +333 @@
 }
 
+TextDirection directionOfEnclosingBlock(const Position& position)
+{
+    Node* enclosingBlockNode = enclosingBlock(position.containerNode());
+    if (!enclosingBlockNode)
+        return LTR;
+    RenderObject* renderer = enclosingBlockNode->renderer();
+    return renderer ? renderer->style()->direction() : LTR;
+}
+
 // This method is used to create positions in the DOM. It returns the maximum valid offset
 // in a node.  It returns 1 for some elements even though they do not have children, which

trunk/Source/WebCore/editing/htmlediting.h

@@ -31 +31 @@
 #include "HTMLNames.h"
 #include "Position.h"
+#include "TextDirection.h"
 #include <wtf/Forward.h>
 #include <wtf/unicode/CharacterNames.h>
@@ -97 +98 @@
 bool isNodeInTextFormControl(Node* node);
     
+TextDirection directionOfEnclosingBlock(const Position&);
+
 // -------------------------------------------------------------------------
 // Position