Changeset 92431 in webkit

Timestamp:

Aug 4, 2011, 4:56:24 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

A few purely stylistic modifications to visible_units.cpp
​https://bugs.webkit.org/show_bug.cgi?id=65723

Patch by Van Lam <​vanlam@google.com> on 2011-08-04
Reviewed by Ryosuke Niwa.

Renamed greatestValueUnder to greatestOffsetUnder, positionIsInsideBox
to positionIsInBoxButNotOnBoundary (to avoid confusion with
positionIsInBox, which is just a getInlineBoxAndOffset check).
Removed use of invalidOffset as an error value in greatestOffsetUnder
and smallestOffsetAbove since semantically it should only be used to
check if it makes sense to compare offsets in a single box.

• editing/visible_units.cpp:

(WebCore::greatestOffsetUnder):
(WebCore::smallestOffsetAbove):
(WebCore::positionIsInBoxButNotOnBoundary):
(WebCore::leftWordPositionAcrossBoundary):
(WebCore::rightWordPositionAcrossBoundary):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/visible_units.cpp (modified) (11 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-04  Van Lam  <vanlam@google.com>
+
+        A few purely stylistic modifications to visible_units.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=65723
+
+        Reviewed by Ryosuke Niwa.
+
+        Renamed greatestValueUnder to greatestOffsetUnder, positionIsInsideBox
+        to positionIsInBoxButNotOnBoundary (to avoid confusion with
+        positionIsInBox, which is just a getInlineBoxAndOffset check).
+        Removed use of invalidOffset as an error value in greatestOffsetUnder
+        and smallestOffsetAbove since semantically it should only be used to
+        check if it makes sense to compare offsets in a single box.
+
+        * editing/visible_units.cpp:
+        (WebCore::greatestOffsetUnder):
+        (WebCore::smallestOffsetAbove):
+        (WebCore::positionIsInBoxButNotOnBoundary):
+        (WebCore::leftWordPositionAcrossBoundary):
+        (WebCore::rightWordPositionAcrossBoundary):
+
 2011-08-04  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/editing/visible_units.cpp

@@ -1445 +1445 @@
 }
         
-static int greatestValueUnder(int offset, bool boxAndBlockAreInSameDirection, const WordBoundaryVector& orderedWordBoundaries)
+static int greatestOffsetUnder(int offset, bool boxAndBlockAreInSameDirection, const WordBoundaryVector& orderedWordBoundaries)
 {
     if (!orderedWordBoundaries.size())
-        return invalidOffset;
+        return -1;
     // FIXME: binary search.
     if (boxAndBlockAreInSameDirection) {
@@ -1455 +1455 @@
                 return i;
         }
-        return invalidOffset;
+        return -1;
     }
     for (int i = orderedWordBoundaries.size() - 1; i >= 0; --i) {
@@ -1461 +1461 @@
             return i;
     }
-    return invalidOffset;
+    return -1;
 }
 
@@ -1467 +1467 @@
 {
     if (!orderedWordBoundaries.size())
-        return invalidOffset;
+        return -1;
     // FIXME: binary search.
     if (boxAndBlockAreInSameDirection) {
@@ -1474 +1474 @@
                 return i;
         }
-        return invalidOffset;
+        return -1;
     }
     for (unsigned i = 0; i < orderedWordBoundaries.size(); ++i) {
@@ -1480 +1480 @@
             return i;
     }
-    return invalidOffset;
+    return -1;
 }
 
@@ -1600 +1600 @@
 }
     
-static bool positionIsInsideBox(const VisiblePosition& wordBreak, const InlineBox* box)
+static bool positionIsInBoxButNotOnBoundary(const VisiblePosition& wordBreak, const InlineBox* box)
 {
     int offsetOfWordBreak;
@@ -1634 +1634 @@
             wordBreak = nextBoundary(visiblePosition, nextWordPositionBoundary);
     }
-    if (wordBreak.isNotNull() && positionIsInsideBox(wordBreak, box))
+    if (wordBreak.isNotNull() && positionIsInBoxButNotOnBoundary(wordBreak, box))
         return wordBreak;
     
@@ -1640 +1640 @@
     collectWordBreaksInBox(box, orderedWordBoundaries, blockDirection);
 
-    int index = box->isLeftToRightDirection() ? greatestValueUnder(offset, blockDirection == LTR, orderedWordBoundaries) :
-        smallestOffsetAbove(offset, blockDirection == RTL, orderedWordBoundaries);
-    if (index != invalidOffset)
+    int index = box->isLeftToRightDirection() ? greatestOffsetUnder(offset, blockDirection == LTR, orderedWordBoundaries)
+        : smallestOffsetAbove(offset, blockDirection == RTL, orderedWordBoundaries);
+    if (index >= 0)
         return orderedWordBoundaries[index].visiblePosition;
     
@@ -1671 +1671 @@
             wordBreak = nextBoundary(visiblePosition, nextWordPositionBoundary);
     }
-    if (wordBreak.isNotNull() && positionIsInsideBox(wordBreak, box))
+    if (wordBreak.isNotNull() && positionIsInBoxButNotOnBoundary(wordBreak, box))
         return wordBreak;
     
@@ -1677 +1677 @@
     collectWordBreaksInBox(box, orderedWordBoundaries, blockDirection);
     
-    int index = box->isLeftToRightDirection() ? smallestOffsetAbove(offset, blockDirection == LTR, orderedWordBoundaries) :
-        greatestValueUnder(offset, blockDirection == RTL, orderedWordBoundaries);
-    if (index != invalidOffset)
+    int index = box->isLeftToRightDirection() ? smallestOffsetAbove(offset, blockDirection == LTR, orderedWordBoundaries)
+        : greatestOffsetUnder(offset, blockDirection == RTL, orderedWordBoundaries);
+    if (index >= 0)
         return orderedWordBoundaries[index].visiblePosition;