Changeset 85377 in webkit

Timestamp:

Apr 29, 2011 6:13:28 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-04-29 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

Extract a function to obtain VisiblePosition from RenderText::positionForPoint
​https://bugs.webkit.org/show_bug.cgi?id=59811

Extracted lineDirectionPointFitsInBox from positionForPoint.

• rendering/RenderText.cpp: (WebCore::lineDirectionPointFitsInBox): (WebCore::RenderText::positionForPoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderText.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-29  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Extract a function to obtain VisiblePosition from RenderText::positionForPoint
+        https://bugs.webkit.org/show_bug.cgi?id=59811
+
+        Extracted lineDirectionPointFitsInBox from positionForPoint.
+
+        * rendering/RenderText.cpp:
+        (WebCore::lineDirectionPointFitsInBox):
+        (WebCore::RenderText::positionForPoint):
+
 2011-04-29  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -435 +435 @@
 }
 
+static bool lineDirectionPointFitsInBox(int pointLineDirection, InlineTextBox* box, int offset, EAffinity& affinity)
+{
+    affinity = DOWNSTREAM;
+
+    // the x coordinate is equal to the left edge of this box
+    // the affinity must be downstream so the position doesn't jump back to the previous line
+    if (pointLineDirection == box->logicalLeft())
+        return true;
+
+    // and the x coordinate is to the left of the right edge of this box
+    // check to see if position goes in this box
+    if (pointLineDirection < box->logicalRight()) {
+        affinity = offset > 0 ? VP_UPSTREAM_IF_POSSIBLE : DOWNSTREAM;
+        return true;
+    }
+
+    // box is first on line
+    // and the x coordinate is to the left of the first text box left edge
+    if (!box->prevOnLine() && pointLineDirection < box->logicalLeft())
+        return true;
+
+    if (!box->nextOnLine()) {
+        // box is last on line
+        // and the x coordinate is to the right of the last text box right edge
+        // generate VisiblePosition, use UPSTREAM affinity if possible
+        affinity = offset > 0 ? VP_UPSTREAM_IF_POSSIBLE : DOWNSTREAM;
+        return true;
+    }
+
+    return false;
+}
+
 VisiblePosition RenderText::positionForPoint(const IntPoint& point)
 {
@@ -467 +499 @@
             if (rootBox->nextRootBox())
                 bottom = min(bottom, rootBox->nextRootBox()->lineTop());
+
             if (pointBlockDirection < bottom) {
-                offset = box->offsetForPosition(pointLineDirection);
-
-                if (pointLineDirection == box->logicalLeft())
-                    // the x coordinate is equal to the left edge of this box
-                    // the affinity must be downstream so the position doesn't jump back to the previous line
-                    return createVisiblePosition(offset + box->start(), DOWNSTREAM);
-
-                if (pointLineDirection < box->logicalRight())
-                    // and the x coordinate is to the left of the right edge of this box
-                    // check to see if position goes in this box
-                    return createVisiblePosition(offset + box->start(), offset > 0 ? VP_UPSTREAM_IF_POSSIBLE : DOWNSTREAM);
-
-                if (!box->prevOnLine() && pointLineDirection < box->logicalLeft())
-                    // box is first on line
-                    // and the x coordinate is to the left of the first text box left edge
-                    return createVisiblePosition(offset + box->start(), DOWNSTREAM);
-
-                if (!box->nextOnLine())
-                    // box is last on line
-                    // and the x coordinate is to the right of the last text box right edge
-                    // generate VisiblePosition, use UPSTREAM affinity if possible
-                    return createVisiblePosition(offset + box->start(), offset > 0 ? VP_UPSTREAM_IF_POSSIBLE : DOWNSTREAM);
+                EAffinity affinity;
+                int offset = box->offsetForPosition(pointLineDirection);
+                if (lineDirectionPointFitsInBox(pointLineDirection, box, offset, affinity))
+                    return createVisiblePosition(offset + box->start(), affinity);
             }
             lastBoxAbove = box;