Title: [187607] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187607
- Author
- matthew_han...@apple.com
- Date
- 2015-07-30 14:20:38 -0700 (Thu, 30 Jul 2015)
Log Message
Merge r187517. rdar://problem/21645007
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187606 => 187607)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-30 21:20:34 UTC (rev 187606)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-30 21:20:38 UTC (rev 187607)
@@ -1,5 +1,22 @@
2015-07-30 Matthew Hanson <matthew_han...@apple.com>
+ Merge r187517. rdar://problem/21645007
+
+ 2015-07-28 Yongjun Zhang <yongjun_zh...@apple.com>
+
+ Bounds in InteractionInformationAtPosition should be always in main frame coordinate space.
+ https://bugs.webkit.org/show_bug.cgi?id=147372
+
+ When we prepare the bounds for InteractionInformationAtPosition, we should convert the rect to
+ main frame space since WKContent in UIProcess expects it to be in the web view space.
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getPositionInformation): Convert the bounding rect to main frame space if the element is inside a sub-frame.
+
+2015-07-30 Matthew Hanson <matthew_han...@apple.com>
+
Merge r187478. rdar://problem/21838764
2015-07-27 Andreas Kling <akl...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (187606 => 187607)
--- branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-07-30 21:20:34 UTC (rev 187606)
+++ branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-07-30 21:20:38 UTC (rev 187607)
@@ -2215,6 +2215,11 @@
info.bounds = downcast<RenderImage>(*renderer).absoluteContentQuad().enclosingBoundingBox();
else
info.bounds = renderer->absoluteBoundingBoxRect();
+
+ if (!renderer->document().frame()->isMainFrame()) {
+ FrameView *view = renderer->document().frame()->view();
+ info.bounds = view->contentsToRootView(info.bounds);
+ }
}
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
