Title: [210644] branches/safari-603-branch/Source/WebCore
- Revision
- 210644
- Author
- [email protected]
- Date
- 2017-01-12 08:45:17 -0800 (Thu, 12 Jan 2017)
Log Message
Merge r210378. rdar://problem/29024384
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210643 => 210644)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-12 16:45:15 UTC (rev 210643)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-12 16:45:17 UTC (rev 210644)
@@ -1,5 +1,22 @@
2017-01-12 Matthew Hanson <[email protected]>
+ Merge r210378. rdar://problem/29024384
+
+ 2017-01-05 Zalan Bujtas <[email protected]>
+
+ Start hittesting a clean tree in RenderEmbeddedObject::isReplacementObscured
+ https://bugs.webkit.org/show_bug.cgi?id=166743
+ <rdar://problem/29024384>
+
+ Reviewed by Simon Fraser.
+
+ Unable to reproduce.
+
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::isReplacementObscured):
+
+2017-01-12 Matthew Hanson <[email protected]>
+
Merge r210376. rdar://problem/29763079
2017-01-04 Ryosuke Niwa <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp (210643 => 210644)
--- branches/safari-603-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2017-01-12 16:45:15 UTC (rev 210643)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2017-01-12 16:45:17 UTC (rev 210644)
@@ -422,12 +422,14 @@
if (!rootRenderView)
return true;
- IntRect rootViewRect = view().frameView().convertToRootView(snappedIntRect(rect));
-
+ // We should always start hit testing a clean tree.
+ view().frameView().updateLayoutAndStyleIfNeededRecursive();
+
HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowUserAgentShadowContent | HitTestRequest::AllowChildFrameContent);
HitTestResult result;
HitTestLocation location;
+ IntRect rootViewRect = view().frameView().convertToRootView(snappedIntRect(rect));
LayoutUnit x = rootViewRect.x();
LayoutUnit y = rootViewRect.y();
LayoutUnit width = rootViewRect.width();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes