Changeset 181617 in webkit

Timestamp:

Mar 16, 2015, 10:30:46 PM (11 years ago)

Author:

Simon Fraser

Message:

Update the debug overlays after layout
​https://bugs.webkit.org/show_bug.cgi?id=142768

Reviewed by Zalan Bujtas.

The debug overlays need to be updated after layout, in case elements with wheel event handlers
moved around.

DebugPageOverlays::didLayout() is cheap if there are no overlays.

Call DebugPageOverlays::didLayout() for all frames, not just the main frame, since subframes can contribute
to the main frame's event handler region.

• page/DebugPageOverlays.cpp:

(WebCore::DebugPageOverlays::regionChanged):

• page/DebugPageOverlays.h:

(WebCore::DebugPageOverlays::didLayout):
(WebCore::DebugPageOverlays::didChangeEventHandlers):

• page/FrameView.cpp:

(WebCore::FrameView::layout):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DebugPageOverlays.cpp (modified) (1 diff)
• page/DebugPageOverlays.h (modified) (4 diffs)
• page/FrameView.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Update the debug overlays after layout
+        https://bugs.webkit.org/show_bug.cgi?id=142768
+
+        Reviewed by Zalan Bujtas.
+
+        The debug overlays need to be updated after layout, in case elements with wheel event handlers
+        moved around.
+        
+        DebugPageOverlays::didLayout() is cheap if there are no overlays.
+        
+        Call DebugPageOverlays::didLayout() for all frames, not just the main frame, since subframes can contribute
+        to the main frame's event handler region.
+
+        * page/DebugPageOverlays.cpp:
+        (WebCore::DebugPageOverlays::regionChanged):
+        * page/DebugPageOverlays.h:
+        (WebCore::DebugPageOverlays::didLayout):
+        (WebCore::DebugPageOverlays::didChangeEventHandlers):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout):
+
 2015-03-16  Jon Lee  <jonlee@apple.com>
 

trunk/Source/WebCore/page/DebugPageOverlays.cpp

@@ -263 +263 @@
 }
 
-void DebugPageOverlays::regionChanged(MainFrame& frame, RegionType regionType)
-{
-    if (RegionOverlay* visualizer = regionOverlayForFrame(frame, regionType))
+void DebugPageOverlays::regionChanged(Frame& frame, RegionType regionType)
+{
+    if (RegionOverlay* visualizer = regionOverlayForFrame(frame.mainFrame(), regionType))
         visualizer->recomputeRegion();
 }

trunk/Source/WebCore/page/DebugPageOverlays.h

@@ -27 +27 @@
 #define DebugPageOverlays_h
 
+#include "Frame.h"
 #include "Settings.h"
 #include <wtf/HashMap.h>
@@ -46 +47 @@
     static const unsigned NumberOfRegionTypes = NonFastScrollableRegion + 1;
 
-    static void didLayout(MainFrame&);
+    static void didLayout(Frame&);
+    static void didChangeEventHandlers(Frame&);
+
     WEBCORE_EXPORT static void settingsChanged(MainFrame&);
 
@@ -55 +58 @@
     void hideRegionOverlay(MainFrame&, RegionType);
 
-    void regionChanged(MainFrame&, RegionType);
+    void regionChanged(Frame&, RegionType);
 
     bool hasOverlaysForFrame(MainFrame& frame) const
@@ -82 +85 @@
 }
 
-inline void DebugPageOverlays::didLayout(MainFrame& frame)
+inline void DebugPageOverlays::didLayout(Frame& frame)
 {
-    FAST_RETURN_IF_NO_OVERLAYS(frame);
+    FAST_RETURN_IF_NO_OVERLAYS(frame.mainFrame());
+
+    sharedDebugOverlays->regionChanged(frame, RegionType::WheelEventHandlers);
+    sharedDebugOverlays->regionChanged(frame, RegionType::NonFastScrollableRegion);
+}
+
+inline void DebugPageOverlays::didChangeEventHandlers(Frame& frame)
+{
+    FAST_RETURN_IF_NO_OVERLAYS(frame.mainFrame());
 
     sharedDebugOverlays->regionChanged(frame, RegionType::WheelEventHandlers);

trunk/Source/WebCore/page/FrameView.cpp

@@ -1405 +1405 @@
 
     InspectorInstrumentation::didLayout(cookie, root);
-    if (frame().isMainFrame())
-        DebugPageOverlays::didLayout(frame().mainFrame());
+    DebugPageOverlays::didLayout(frame());
 
     --m_nestedLayoutCount;