Changeset 152430 in webkit

Timestamp:

Jul 5, 2013 4:21:22 PM (11 years ago)

Author:

weinig@apple.com

Message:

WKPageFindStringMatches with kWKFindOptionsBackwards still doesn't work
<rdar://problem/13881024>
​https://bugs.webkit.org/show_bug.cgi?id=118436

Reviewed by Tim Horton.

• page/Page.cpp:

(WebCore::Page::findStringMatchingRanges):

• When searching backwards, use END_TO_START rather than START_TO_END.
• If there is no selection and we are searching backwards, we now select the last item, not the first.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Page.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-05  Sam Weinig  <sam@webkit.org>
+
+        WKPageFindStringMatches with kWKFindOptionsBackwards still doesn't work
+        <rdar://problem/13881024>
+        https://bugs.webkit.org/show_bug.cgi?id=118436
+
+        Reviewed by Tim Horton.
+
+        * page/Page.cpp:
+        (WebCore::Page::findStringMatchingRanges):
+        - When searching backwards, use END_TO_START rather than START_TO_END.
+        - If there is no selection and we are searching backwards, we now select the last item,
+          not the first.
+
 2013-07-05  Tullio Lucena  <tullio.lucena@openbossa.org>
 

trunk/Source/WebCore/page/Page.cpp

@@ -613 +613 @@
         if (options & Backwards) {
             for (size_t i = matchRanges->size(); i > 0; --i) {
-                if (selectedRange->compareBoundaryPoints(Range::START_TO_END, matchRanges->at(i - 1).get(), IGNORE_EXCEPTION) > 0) {
+                if (selectedRange->compareBoundaryPoints(Range::END_TO_START, matchRanges->at(i - 1).get(), IGNORE_EXCEPTION) > 0) {
                     indexForSelection = i - 1;
                     break;
@@ -626 +626 @@
             }
         }
+    } else {
+        if (options & Backwards)
+            indexForSelection = matchRanges->size() - 1;
+        else
+            indexForSelection = 0;
     }
 }