Title: [176345] branches/safari-600.3-branch/Source/WebCore
- Revision
- 176345
- Author
- [email protected]
- Date
- 2014-11-19 14:20:03 -0800 (Wed, 19 Nov 2014)
Log Message
Merge r176296. rdar://problem/18912505
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176344 => 176345)
--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-19 22:14:42 UTC (rev 176344)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-19 22:20:03 UTC (rev 176345)
@@ -1,5 +1,23 @@
2014-11-19 Dana Burkart <[email protected]>
+ Merge r176296. rdar://problem/18912505
+
+ 2014-11-18 Beth Dakin <[email protected]>
+
+ REGRESSION: Invoking dictionary lookup on text in some search fields searches for
+ incorrect item
+ https://bugs.webkit.org/show_bug.cgi?id=138853
+ -and corresponding-
+ rdar://problem/18912505
+
+ Reviewed by Tim Horton.
+
+ Get the visible position based on the frame, not just the renderer.
+ * editing/mac/DictionaryLookup.mm:
+ (WebCore::rangeForDictionaryLookupAtHitTestResult):
+
+2014-11-19 Dana Burkart <[email protected]>
+
Merge r176221. rdar://problem/18991369
2014-11-17 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebCore/editing/mac/DictionaryLookup.mm (176344 => 176345)
--- branches/safari-600.3-branch/Source/WebCore/editing/mac/DictionaryLookup.mm 2014-11-19 22:14:42 UTC (rev 176344)
+++ branches/safari-600.3-branch/Source/WebCore/editing/mac/DictionaryLookup.mm 2014-11-19 22:20:03 UTC (rev 176345)
@@ -137,10 +137,11 @@
return nullptr;
// Don't do anything if there is no character at the point.
- if (!frame->rangeForPoint(hitTestResult.roundedPointInInnerNodeFrame()))
+ IntPoint framePoint = hitTestResult.roundedPointInInnerNodeFrame();
+ if (!frame->rangeForPoint(framePoint))
return nullptr;
- VisiblePosition position = renderer->positionForPoint(hitTestResult.localPoint(), nullptr);
+ VisiblePosition position = frame->visiblePositionForPoint(framePoint);
if (position.isNull())
position = firstPositionInOrBeforeNode(node);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
