Changeset 56915 in webkit

Timestamp:

Apr 1, 2010 8:14:41 AM (14 years ago)

Author:

hamaji@chromium.org

Message:

2010-04-01 MORITA Hajime <​morrita@google.com>

Reviewed by Shinichiro Hamaji.

​https://bugs.webkit.org/show_bug.cgi?id=36948
Refactoring: Position::primaryDirection() should be extracted.

No new tests. No functinal change.

• dom/Position.cpp: (WebCore::Position::getInlineBoxAndOffset): (WebCore::Position::primaryDirection): Added
• dom/Position.h:
• editing/VisiblePosition.cpp: (WebCore::VisiblePosition::leftVisuallyDistinctCandidate): (WebCore::VisiblePosition::rightVisuallyDistinctCandidate):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Position.cpp (modified) (2 diffs)
• dom/Position.h (modified) (1 diff)
• editing/VisiblePosition.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-01  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Shinichiro Hamaji.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36948
+        Refactoring: Position::primaryDirection() should be extracted.
+
+        No new tests. No functinal change.
+
+        * dom/Position.cpp:
+        (WebCore::Position::getInlineBoxAndOffset):
+        (WebCore::Position::primaryDirection): Added
+        * dom/Position.h:
+        * editing/VisiblePosition.cpp:
+        (WebCore::VisiblePosition::leftVisuallyDistinctCandidate):
+        (WebCore::VisiblePosition::rightVisuallyDistinctCandidate):
+
 2010-04-01  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/WebCore/dom/Position.cpp

@@ -947 +947 @@
 void Position::getInlineBoxAndOffset(EAffinity affinity, InlineBox*& inlineBox, int& caretOffset) const
 {
-    TextDirection primaryDirection = LTR;
-    for (RenderObject* r = node()->renderer(); r; r = r->parent()) {
-        if (r->isBlockFlow()) {
-            primaryDirection = r->style()->direction();
-            break;
-        }
-    }
-    getInlineBoxAndOffset(affinity, primaryDirection, inlineBox, caretOffset);
+    getInlineBoxAndOffset(affinity, primaryDirection(), inlineBox, caretOffset);
 }
 
@@ -1148 +1141 @@
 }
 
+TextDirection Position::primaryDirection() const
+{
+    TextDirection primaryDirection = LTR;
+    for (const RenderObject* r = node()->renderer(); r; r = r->parent()) {
+        if (r->isBlockFlow()) {
+            primaryDirection = r->style()->direction();
+            break;
+        }
+    }
+
+    return primaryDirection;
+}
+
+
 void Position::debugPosition(const char* msg) const
 {

trunk/WebCore/dom/Position.h

@@ -159 +159 @@
     void getInlineBoxAndOffset(EAffinity, TextDirection primaryDirection, InlineBox*&, int& caretOffset) const;
 
+    TextDirection primaryDirection() const;
+
     static bool hasRenderedNonAnonymousDescendantsWithHeight(RenderObject*);
     static bool nodeIsUserSelectNone(Node*);

trunk/WebCore/editing/VisiblePosition.cpp

@@ -111 +111 @@
 
     Position downstreamStart = p.downstream();
-    TextDirection primaryDirection = LTR;
-    for (RenderObject* r = p.node()->renderer(); r; r = r->parent()) {
-        if (r->isBlockFlow()) {
-            primaryDirection = r->style()->direction();
-            break;
-        }
-    }
+    TextDirection primaryDirection = p.primaryDirection();
 
     while (true) {
@@ -253 +247 @@
 
     Position downstreamStart = p.downstream();
-    TextDirection primaryDirection = LTR;
-    for (RenderObject* r = p.node()->renderer(); r; r = r->parent()) {
-        if (r->isBlockFlow()) {
-            primaryDirection = r->style()->direction();
-            break;
-        }
-    }
+    TextDirection primaryDirection = p.primaryDirection();
 
     while (true) {