Changeset 195591 in webkit

Timestamp:

Jan 26, 2016 9:00:18 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Main frame scrollbars not updated on hovering when using overlay scrollbars
​https://bugs.webkit.org/show_bug.cgi?id=153304

Reviewed by Michael Catanzaro.

Legacy scrollbars were fixed in r194155, but overlay scrollbars
are not notified when they are hovered. This is because the layer
hit test in RenderView::hitTest always returns true when using
overlay scrollbars and we are returning early in such case,
ignoring the HitTestRequest::AllowFrameScrollbars flag. So, in
case of using overlay scrollbars we still need to check the
RenderView scrollbars even when the layer hit test succeeded.

• rendering/RenderView.cpp:

(WebCore::RenderView::hitTest):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderView.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-25  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Main frame scrollbars not updated on hovering when using overlay scrollbars
+        https://bugs.webkit.org/show_bug.cgi?id=153304
+
+        Reviewed by Michael Catanzaro.
+
+        Legacy scrollbars were fixed in r194155, but overlay scrollbars
+        are not notified when they are hovered. This is because the layer
+        hit test in RenderView::hitTest always returns true when using
+        overlay scrollbars and we are returning early in such case,
+        ignoring the HitTestRequest::AllowFrameScrollbars flag. So, in
+        case of using overlay scrollbars we still need to check the
+        RenderView scrollbars even when the layer hit test succeeded.
+
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::hitTest):
+
 2016-01-26  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -48 +48 @@
 #include "RenderSelectionInfo.h"
 #include "RenderWidget.h"
+#include "ScrollbarTheme.h"
 #include "Settings.h"
 #include "StyleInheritedData.h"
@@ -198 +199 @@
     FrameFlatteningLayoutDisallower disallower(frameView());
 
-    if (layer()->hitTest(request, location, result))
-        return true;
-
-    // FIXME: Consider if this test should be done unconditionally.
-    if (request.allowsFrameScrollbars()) {
-        // ScrollView scrollbars are not the same as RenderLayer scrollbars tested by RenderLayer::hitTestOverflowControls,
-        // so we need to test ScrollView scrollbars separately here.
-        IntPoint windowPoint = frameView().contentsToWindow(location.roundedPoint());
-        if (Scrollbar* frameScrollbar = frameView().scrollbarAtPoint(windowPoint)) {
-            result.setScrollbar(frameScrollbar);
-            return true;
+    bool resultLayer = layer()->hitTest(request, location, result);
+
+    // ScrollView scrollbars are not the same as RenderLayer scrollbars tested by RenderLayer::hitTestOverflowControls,
+    // so we need to test ScrollView scrollbars separately here. In case of using overlay scrollbars, the layer hit test
+    // will always work so we need to check the ScrollView scrollbars in that case too.
+    if (!resultLayer || ScrollbarTheme::theme().usesOverlayScrollbars()) {
+        // FIXME: Consider if this test should be done unconditionally.
+        if (request.allowsFrameScrollbars()) {
+            IntPoint windowPoint = frameView().contentsToWindow(location.roundedPoint());
+            if (Scrollbar* frameScrollbar = frameView().scrollbarAtPoint(windowPoint)) {
+                result.setScrollbar(frameScrollbar);
+                return true;
+            }
         }
     }
 
-    return false;
+    return resultLayer;
 }