Changeset 260547 in webkit

Timestamp:

Apr 22, 2020 5:42:45 PM (4 years ago)

Author:

dbates@webkit.org

Message:

Support toggling debug overlay for touch action region and editable element region independent from non-fast scrollable region
​https://bugs.webkit.org/show_bug.cgi?id=210774

Reviewed by Dean Jackson.

Source/WebCore:

Break out the touch action region and editable element region debug overlays into their own
flags that can be passed to Settings::setVisibleDebugOverlayRegions() to toggle these overlays,
respectively. Currently both of these overlays piggyback on whether the engine will paint the
non-fast scrollable region.

• page/SettingsBase.h: Add two more enumerators.
• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::invalidateEventRegion const): Update the code to be more precise now that
we can target the update paint overlay hack to when we are painting touch-action or editable
element regions.

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::paintDebugOverlays): Condition the painting of touch action region
on one enumerator and the painting of editable element region on another.
(WebCore::RenderLayerBacking::paintContents): Update the code to be more precise.

Source/WebKit:

Expose two new enumerators to toggle touch action region and editable element region
overlay painting.

• UIProcess/API/C/WKPreferencesRef.h:
• UIProcess/API/Cocoa/WKPreferencesPrivate.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/SettingsBase.h (modified) (1 diff)
• WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• WebCore/rendering/RenderLayerBacking.cpp (modified) (3 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/API/C/WKPreferencesRef.h (modified) (1 diff)
• WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-22  Daniel Bates  <dabates@apple.com>
+
+        Support toggling debug overlay for touch action region and editable element region independent from non-fast scrollable region
+        https://bugs.webkit.org/show_bug.cgi?id=210774
+
+        Reviewed by Dean Jackson.
+
+        Break out the touch action region and editable element region debug overlays into their own
+        flags that can be passed to Settings::setVisibleDebugOverlayRegions() to toggle these overlays,
+        respectively. Currently both of these overlays piggyback on whether the engine will paint the
+        non-fast scrollable region.
+
+        * page/SettingsBase.h: Add two more enumerators.
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::invalidateEventRegion const): Update the code to be more precise now that
+        we can target the update paint overlay hack to when we are painting touch-action or editable
+        element regions.
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::paintDebugOverlays): Condition the painting of touch action region
+        on one enumerator and the painting of editable element region on another.
+        (WebCore::RenderLayerBacking::paintContents): Update the code to be more precise.
+
 2020-04-22  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/page/SettingsBase.h

@@ -70 +70 @@
     NonFastScrollableRegion = 1 << 0,
     WheelEventHandlerRegion = 1 << 1,
+    TouchActionRegion = 1 << 2,
+    EditableElementRegion = 1 << 3,
 };
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -7023 +7023 @@
         auto& view = renderer().view();
         view.setNeedsEventRegionUpdateForNonCompositedFrame();
-        if (renderer().settings().visibleDebugOverlayRegions() & NonFastScrollableRegion)
+        if (renderer().settings().visibleDebugOverlayRegions() & (TouchActionRegion | EditableElementRegion))
             view.setNeedsRepaintHackAfterCompositingLayerUpdateForDebugOverlaysOnly();
         view.compositor().scheduleCompositingLayerUpdate();

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -3110 +3110 @@
 void RenderLayerBacking::paintDebugOverlays(const GraphicsLayer* graphicsLayer, GraphicsContext& context)
 {
-    if (graphicsLayer->eventRegion().isEmpty())
+    auto& eventRegion = graphicsLayer->eventRegion();
+    if (eventRegion.isEmpty())
         return;
 
@@ -3119 +3120 @@
     context.translate(-contentOffset);
 
+    auto visibleDebugOverlayRegions = renderer().settings().visibleDebugOverlayRegions();
+
     // The interactive part.
     // Paint rects for touch action.
-    auto& eventRegion = graphicsLayer->eventRegion();
-    Color regionColor(0, 0, 255, 50);
-    context.setFillColor(regionColor);
-    for (auto rect : eventRegion.region().rects())
-        context.fillRect(rect);
-
-    const TouchAction touchActionList[] = {
-        TouchAction::None,
-        TouchAction::Manipulation,
-        TouchAction::PanX,
-        TouchAction::PanY,
-        TouchAction::PinchZoom,
-    };
-
-    for (auto action : touchActionList) {
-        auto* actionRegion = graphicsLayer->eventRegion().regionForTouchAction(action);
-        if (!actionRegion)
-            continue;
-
-        auto fillPattern = patternForTouchAction(action, contentOffsetInCompositingLayer(), context);
-        if (!fillPattern)
-            continue;
-
-        context.setFillPattern(fillPattern.releaseNonNull());
-        for (auto rect : actionRegion->rects())
+    if (visibleDebugOverlayRegions & TouchActionRegion) {
+        Color regionColor(0, 0, 255, 50);
+        context.setFillColor(regionColor);
+        for (auto rect : eventRegion.region().rects())
             context.fillRect(rect);
+
+        const TouchAction touchActionList[] = {
+            TouchAction::None,
+            TouchAction::Manipulation,
+            TouchAction::PanX,
+            TouchAction::PanY,
+            TouchAction::PinchZoom,
+        };
+
+        for (auto action : touchActionList) {
+            auto* actionRegion = graphicsLayer->eventRegion().regionForTouchAction(action);
+            if (!actionRegion)
+                continue;
+
+            auto fillPattern = patternForTouchAction(action, contentOffsetInCompositingLayer(), context);
+            if (!fillPattern)
+                continue;
+
+            context.setFillPattern(fillPattern.releaseNonNull());
+            for (auto rect : actionRegion->rects())
+                context.fillRect(rect);
+        }
     }
 
 #if ENABLE(EDITABLE_REGION)
     // Paint rects for editable elements.
-    context.setFillColor({ 128, 0, 128, 50 });
-    for (auto rect : eventRegion.rectsForEditableElements())
-        context.fillRect(rect);
+    if (visibleDebugOverlayRegions & EditableElementRegion) {
+        context.setFillColor({ 128, 0, 128, 50 });
+        for (auto rect : eventRegion.rectsForEditableElements())
+            context.fillRect(rect);
+    }
 #endif
 }
@@ -3196 +3202 @@
         paintIntoLayer(graphicsLayer, context, dirtyRect, behavior);
 
-        if (renderer().settings().visibleDebugOverlayRegions() & NonFastScrollableRegion) // Piggy-back off the setting that shows touch handler regions.
+        if (renderer().settings().visibleDebugOverlayRegions() & (TouchActionRegion | EditableElementRegion))
             paintDebugOverlays(graphicsLayer, context);
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-22  Daniel Bates  <dabates@apple.com>
+
+        Support toggling debug overlay for touch action region and editable element region independent from non-fast scrollable region
+        https://bugs.webkit.org/show_bug.cgi?id=210774
+
+        Reviewed by Dean Jackson.
+
+        Expose two new enumerators to toggle touch action region and editable element region
+        overlay painting.
+
+        * UIProcess/API/C/WKPreferencesRef.h:
+        * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+
 2020-04-22  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h

@@ -47 +47 @@
 enum WKDebugOverlayRegionFlags {
     kWKNonFastScrollableRegion = 1 << 0,
-    kWKWheelEventHandlerRegion = 1 << 1
+    kWKWheelEventHandlerRegion = 1 << 1,
+    kWKTouchActionRegion = 1 << 2,
+    kWKEditableElementRegion = 1 << 3,
 };
 typedef unsigned WKDebugOverlayRegions;

trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h

@@ -35 +35 @@
 typedef NS_OPTIONS(NSUInteger, _WKDebugOverlayRegions) {
     _WKNonFastScrollableRegion = 1 << 0,
-    _WKWheelEventHandlerRegion = 1 << 1
+    _WKWheelEventHandlerRegion = 1 << 1,
+    _WKTouchActionRegion = 1 << 2,
+    _WKEditableElementRegion = 1 << 3,
 } WK_API_AVAILABLE(macos(10.11), ios(9.0));