Combine event and touch action regions into a single class
[WebKit-https.git] / Source / WebCore / platform / graphics / GraphicsLayer.cpp
index 1504ea3..2500fd4 100644 (file)
@@ -411,18 +411,11 @@ void GraphicsLayer::setShapeLayerWindRule(WindRule windRule)
 #endif
 }
 
-void GraphicsLayer::setEventRegion(Region&& eventRegion)
+void GraphicsLayer::setEventRegion(EventRegion&& eventRegion)
 {
     m_eventRegion = WTFMove(eventRegion);
 }
 
-#if ENABLE(POINTER_EVENTS)
-void GraphicsLayer::setTouchActionRegion(TouchActionRegion&& touchActionRegion)
-{
-    m_touchActionRegion = WTFMove(touchActionRegion);
-}
-#endif
-
 void GraphicsLayer::noteDeviceOrPageScaleFactorChangedIncludingDescendants()
 {
     deviceOrPageScaleFactorChanged();
@@ -933,13 +926,9 @@ void GraphicsLayer::dumpProperties(TextStream& ts, LayerTreeAsTextBehavior behav
         ts << indent << ")\n";
     }
 
-    if (behavior & LayerTreeAsTextIncludeEventRegion) {
-        if (!m_eventRegion.isEmpty())
-            ts << indent << "(event region" << m_eventRegion << ")\n";
-#if ENABLE(POINTER_EVENTS)
-        if (!m_touchActionRegion.isEmpty())
-            ts << indent << "(touch-action region" << m_touchActionRegion << ")\n";
-#endif
+    if (behavior & LayerTreeAsTextIncludeEventRegion && !m_eventRegion.isEmpty()) {
+        ts << indent << "(event region" << m_eventRegion;
+        ts << indent << ")\n";
     }
 
     if (behavior & LayerTreeAsTextIncludePaintingPhases && paintingPhase()) {