Title: [265232] trunk/Source/WebCore
Revision
265232
Author
[email protected]
Date
2020-08-03 17:24:07 -0700 (Mon, 03 Aug 2020)

Log Message

Add an EventRegions log channel
https://bugs.webkit.org/show_bug.cgi?id=215092

Reviewed by Daniel Bates.

Add a log channel for EventRegions, add logging in some interesting places.

* platform/Logging.h:
* rendering/EventRegion.cpp:
(WebCore::EventRegion::unite):
(WebCore::EventRegion::uniteTouchActions):
(WebCore::EventRegion::uniteEventListeners):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintObject):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects const):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateEventRegion):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (265231 => 265232)


--- trunk/Source/WebCore/ChangeLog	2020-08-04 00:15:12 UTC (rev 265231)
+++ trunk/Source/WebCore/ChangeLog	2020-08-04 00:24:07 UTC (rev 265232)
@@ -1,3 +1,24 @@
+2020-08-03  Simon Fraser  <[email protected]>
+
+        Add an EventRegions log channel
+        https://bugs.webkit.org/show_bug.cgi?id=215092
+
+        Reviewed by Daniel Bates.
+
+        Add a log channel for EventRegions, add logging in some interesting places.
+
+        * platform/Logging.h:
+        * rendering/EventRegion.cpp:
+        (WebCore::EventRegion::unite):
+        (WebCore::EventRegion::uniteTouchActions):
+        (WebCore::EventRegion::uniteEventListeners):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintObject):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects const):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateEventRegion):
+
 2020-08-03  Myles C. Maxfield  <[email protected]>
 
         Make FontCascade.drawText() return a FloatSize instead of a float

Modified: trunk/Source/WebCore/platform/Logging.h (265231 => 265232)


--- trunk/Source/WebCore/platform/Logging.h	2020-08-04 00:15:12 UTC (rev 265231)
+++ trunk/Source/WebCore/platform/Logging.h	2020-08-04 00:24:07 UTC (rev 265232)
@@ -56,6 +56,7 @@
     M(Editing) \
     M(EME) \
     M(Events) \
+    M(EventRegions) \
     M(FileAPI) \
     M(Filters) \
     M(Fonts) \

Modified: trunk/Source/WebCore/rendering/EventRegion.cpp (265231 => 265232)


--- trunk/Source/WebCore/rendering/EventRegion.cpp	2020-08-04 00:15:12 UTC (rev 265231)
+++ trunk/Source/WebCore/rendering/EventRegion.cpp	2020-08-04 00:24:07 UTC (rev 265232)
@@ -26,7 +26,9 @@
 #include "config.h"
 #include "EventRegion.h"
 
+#include "Logging.h"
 #include "RenderStyle.h"
+#include <wtf/text/TextStream.h>
 
 namespace WebCore {
 
@@ -130,8 +132,10 @@
 #endif
 
 #if ENABLE(EDITABLE_REGION)
-    if (m_editableRegion && (overrideUserModifyIsEditable || style.userModify() != UserModify::ReadOnly))
+    if (m_editableRegion && (overrideUserModifyIsEditable || style.userModify() != UserModify::ReadOnly)) {
         m_editableRegion->unite(region);
+        LOG_WITH_STREAM(EventRegions, stream << " uniting editable region");
+    }
 #else
     UNUSED_PARAM(overrideUserModifyIsEditable);
 #endif
@@ -214,10 +218,13 @@
 
     for (unsigned i = 0; i < m_touchActionRegions.size(); ++i) {
         auto regionTouchAction = toTouchAction(i);
-        if (touchActions.contains(regionTouchAction))
+        if (touchActions.contains(regionTouchAction)) {
             m_touchActionRegions[i].unite(touchRegion);
-        else
+            LOG_WITH_STREAM(EventRegions, stream << " uniting for TouchAction " << regionTouchAction);
+        } else {
             m_touchActionRegions[i].subtract(touchRegion);
+            LOG_WITH_STREAM(EventRegions, stream << " subtracting for TouchAction " << regionTouchAction);
+        }
     }
 }
 
@@ -253,10 +260,14 @@
 #if ENABLE(WHEEL_EVENT_REGIONS)
 void EventRegion::uniteEventListeners(const Region& region, OptionSet<EventListenerRegionType> eventListenerRegionTypes)
 {
-    if (eventListenerRegionTypes.contains(EventListenerRegionType::Wheel))
+    if (eventListenerRegionTypes.contains(EventListenerRegionType::Wheel)) {
         m_wheelEventListenerRegion.unite(region);
-    if (eventListenerRegionTypes.contains(EventListenerRegionType::NonPassiveWheel))
+        LOG_WITH_STREAM(EventRegions, stream << " uniting for wheel event listener");
+    }
+    if (eventListenerRegionTypes.contains(EventListenerRegionType::NonPassiveWheel)) {
         m_nonPassiveWheelEventListenerRegion.unite(region);
+        LOG_WITH_STREAM(EventRegions, stream << " uniting for passive wheel event listener");
+    }
 }
 
 OptionSet<EventListenerRegionType> EventRegion::eventListenerRegionTypesForPoint(const IntPoint& point) const

Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (265231 => 265232)


--- trunk/Source/WebCore/rendering/RenderBlock.cpp	2020-08-04 00:15:12 UTC (rev 265231)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp	2020-08-04 00:24:07 UTC (rev 265232)
@@ -43,6 +43,7 @@
 #include "InlineIterator.h"
 #include "InlineTextBox.h"
 #include "LayoutRepainter.h"
+#include "Logging.h"
 #include "LogicalSelectionOffsetCaches.h"
 #include "OverflowEvent.h"
 #include "Page.h"
@@ -80,6 +81,7 @@
 #include <wtf/Optional.h>
 #include <wtf/SetForScope.h>
 #include <wtf/StackStats.h>
+#include <wtf/text/TextStream.h>
 
 namespace WebCore {
 
@@ -1249,22 +1251,29 @@
 
         if (visibleToHitTesting()) {
             auto borderRegion = approximateAsRegion(style().getRoundedBorderFor(borderRect));
+            LOG_WITH_STREAM(EventRegions, stream << "RenderBlock " << *this << " uniting region " << borderRegion);
             paintInfo.eventRegionContext->unite(borderRegion, style(), isTextControl() && downcast<RenderTextControl>(*this).textFormControlElement().isInnerTextElementEditable());
         }
 
         bool needsTraverseDescendants = hasVisualOverflow() || containsFloats() || !paintInfo.eventRegionContext->contains(enclosingIntRect(borderRect)) || view().needsEventRegionUpdateForNonCompositedFrame();
+        LOG_WITH_STREAM(EventRegions, stream << "RenderBlock " << *this << " needsTraverseDescendants for event region: hasVisualOverflow: " << hasVisualOverflow() << " containsFloats: "
+            << containsFloats() <<  " border box is outside current region: " << !paintInfo.eventRegionContext->contains(enclosingIntRect(borderRect)) << " needsEventRegionUpdateForNonCompositedFrame:" << view().needsEventRegionUpdateForNonCompositedFrame());
 #if ENABLE(TOUCH_ACTION_REGIONS)
         needsTraverseDescendants |= document().mayHaveElementsWithNonAutoTouchAction();
+        LOG_WITH_STREAM(EventRegions, stream << "  may have touch-action elements: " << document().mayHaveElementsWithNonAutoTouchAction());
 #endif
 #if !PLATFORM(IOS_FAMILY)
         needsTraverseDescendants |= document().hasWheelEventHandlers();
+        LOG_WITH_STREAM(EventRegions, stream << "  has wheel event handlers: " << document().hasWheelEventHandlers());
 #endif
 #if ENABLE(EDITABLE_REGION)
         // We treat the entire text control as editable to match users' expectation even
         // though it's actually the inner text element of the control that is editable.
         // So, no need to traverse to find the inner text element in this case.
-        if (!isTextControl())
+        if (!isTextControl()) {
             needsTraverseDescendants |= document().mayHaveEditableElements() && page().shouldBuildEditableRegion();
+            LOG_WITH_STREAM(EventRegions, stream << "  needs editable event region: " << (document().mayHaveEditableElements() && page().shouldBuildEditableRegion()));
+        }
 #endif
         if (!needsTraverseDescendants)
             return;

Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (265231 => 265232)


--- trunk/Source/WebCore/rendering/RenderLayer.cpp	2020-08-04 00:15:12 UTC (rev 265231)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp	2020-08-04 00:24:07 UTC (rev 265232)
@@ -7016,6 +7016,19 @@
     return false;
 }
 
+#if !LOG_DISABLED
+static TextStream& operator<<(TextStream& ts, RenderLayer::EventRegionInvalidationReason reason)
+{
+    switch (reason) {
+    case RenderLayer::EventRegionInvalidationReason::Paint: ts << "Paint"; break;
+    case RenderLayer::EventRegionInvalidationReason::SettingDidChange: ts << "SettingDidChange"; break;
+    case RenderLayer::EventRegionInvalidationReason::Style: ts << "Style"; break;
+    case RenderLayer::EventRegionInvalidationReason::NonCompositedFrame: ts << "NonCompositedFrame"; break;
+    }
+    return ts;
+}
+#endif // !LOG_DISABLED
+
 bool RenderLayer::invalidateEventRegion(EventRegionInvalidationReason reason)
 {
 #if ENABLE(ASYNC_SCROLLING)
@@ -7034,10 +7047,13 @@
     if (!shouldInvalidate())
         return false;
 
+    LOG_WITH_STREAM(EventRegions, stream << this << " invalidateEventRegion for reason " << reason << " invalidating in compositing layer " << compositingLayer);
+
     compositingLayer->setNeedsCompositingConfigurationUpdate();
 
     if (reason == EventRegionInvalidationReason::NonCompositedFrame) {
         auto& view = renderer().view();
+        LOG_WITH_STREAM(EventRegions, stream << " calling setNeedsEventRegionUpdateForNonCompositedFrame on " << view);
         view.setNeedsEventRegionUpdateForNonCompositedFrame();
         if (renderer().settings().visibleDebugOverlayRegions() & (TouchActionRegion | EditableElementRegion | WheelEventHandlerRegion))
             view.setNeedsRepaintHackAfterCompositingLayerUpdateForDebugOverlaysOnly();

Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (265231 => 265232)


--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp	2020-08-04 00:15:12 UTC (rev 265231)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp	2020-08-04 00:24:07 UTC (rev 265232)
@@ -1730,6 +1730,8 @@
     if (!maintainsEventRegion())
         return;
 
+    LOG_WITH_STREAM(EventRegions, stream << "RenderLayerBacking " << *this << " updateEventRegion");
+
     TraceScope scope(ComputeEventRegionsStart, ComputeEventRegionsEnd);
 
     auto updateEventRegionForLayer = [&](GraphicsLayer& graphicsLayer) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to