Title: [152509] branches/safari-537-branch/Source/WebCore
- Revision
- 152509
- Author
- [email protected]
- Date
- 2013-07-09 11:41:25 -0700 (Tue, 09 Jul 2013)
Log Message
Merged r152430. <rdar://problem/13881024>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152508 => 152509)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-09 18:37:46 UTC (rev 152508)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-09 18:41:25 UTC (rev 152509)
@@ -1,5 +1,23 @@
2013-07-09 Lucas Forschler <[email protected]>
+ Merge r152430
+
+ 2013-07-05 Sam Weinig <[email protected]>
+
+ 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-09 Lucas Forschler <[email protected]>
+
Merge r152425
2013-07-05 Tim Horton <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/page/Page.cpp (152508 => 152509)
--- branches/safari-537-branch/Source/WebCore/page/Page.cpp 2013-07-09 18:37:46 UTC (rev 152508)
+++ branches/safari-537-branch/Source/WebCore/page/Page.cpp 2013-07-09 18:41:25 UTC (rev 152509)
@@ -613,7 +613,7 @@
RefPtr<Range> selectedRange = frameWithSelection->selection()->selection().firstRange();
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,6 +626,11 @@
}
}
}
+ } else {
+ if (options & Backwards)
+ indexForSelection = matchRanges->size() - 1;
+ else
+ indexForSelection = 0;
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
