Title: [204763] releases/WebKitGTK/webkit-2.12/Source/WebCore
Revision
204763
Author
carlo...@webkit.org
Date
2016-08-22 23:34:03 -0700 (Mon, 22 Aug 2016)

Log Message

Merge r201384 - Addressing post-review comments on r200971.

Reviewed by Darin Adler.

* page/EventHandler.cpp:
(WebCore::EventHandler::hitTestResultAtPoint):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (204762 => 204763)


--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog	2016-08-23 06:24:40 UTC (rev 204762)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog	2016-08-23 06:34:03 UTC (rev 204763)
@@ -1,3 +1,12 @@
+2016-05-25  Zalan Bujtas  <za...@apple.com>
+
+        Addressing post-review comments on r200971.
+
+        Reviewed by Darin Adler.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::hitTestResultAtPoint):
+
 2016-05-24  Zalan Bujtas  <za...@apple.com>
 
         fast/table/neighboring-cells-when-collapsed-border-changes.html is flaky.

Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/page/EventHandler.cpp (204762 => 204763)


--- releases/WebKitGTK/webkit-2.12/Source/WebCore/page/EventHandler.cpp	2016-08-23 06:24:40 UTC (rev 204762)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/page/EventHandler.cpp	2016-08-23 06:34:03 UTC (rev 204763)
@@ -1128,14 +1128,14 @@
         }
     }
 
+    // We should always start hit testing a clean tree.
+    if (m_frame.document())
+        m_frame.document()->updateLayoutIgnorePendingStylesheets();
     HitTestResult result(point, padding.height(), padding.width(), padding.height(), padding.width());
-
     RenderView* renderView = m_frame.contentRenderer();
     if (!renderView)
         return result;
-    
-    // We should always start hittesting a clean tree.
-    renderView->document().updateLayoutIgnorePendingStylesheets();
+
     // hitTestResultAtPoint is specifically used to hitTest into all frames, thus it always allows child frame content.
     HitTestRequest request(hitType | HitTestRequest::AllowChildFrameContent);
     renderView->hitTest(request, result);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to