Title: [271564] trunk/Source/WebCore
- Revision
- 271564
- Author
- [email protected]
- Date
- 2021-01-17 13:06:49 -0800 (Sun, 17 Jan 2021)
Log Message
Unreviewed, fix the internal iOS build after r271559
Fix the build with IOS_TOUCH_EVENTS enabled.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::handleTouchEvent): Deleted.
(WebCore::RenderLayer::registerAsTouchEventListenerForScrolling): Deleted.
(WebCore::RenderLayer::unregisterAsTouchEventListenerForScrolling): Deleted.
Remove a few undeclared method definitions. These methods were relocated to `RenderLayerScrollableArea`.
* rendering/RenderLayerScrollableArea.cpp:
Remove several methods that have duplicate implementations.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (271563 => 271564)
--- trunk/Source/WebCore/ChangeLog 2021-01-17 19:55:10 UTC (rev 271563)
+++ trunk/Source/WebCore/ChangeLog 2021-01-17 21:06:49 UTC (rev 271564)
@@ -1,3 +1,20 @@
+2021-01-17 Wenson Hsieh <[email protected]>
+
+ Unreviewed, fix the internal iOS build after r271559
+
+ Fix the build with IOS_TOUCH_EVENTS enabled.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::handleTouchEvent): Deleted.
+ (WebCore::RenderLayer::registerAsTouchEventListenerForScrolling): Deleted.
+ (WebCore::RenderLayer::unregisterAsTouchEventListenerForScrolling): Deleted.
+
+ Remove a few undeclared method definitions. These methods were relocated to `RenderLayerScrollableArea`.
+
+ * rendering/RenderLayerScrollableArea.cpp:
+
+ Remove several methods that have duplicate implementations.
+
2021-01-17 Zalan Bujtas <[email protected]>
[LFC][IFC] No need to maintain the "is considered empty" bit anymore.
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (271563 => 271564)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2021-01-17 19:55:10 UTC (rev 271563)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2021-01-17 21:06:49 UTC (rev 271564)
@@ -2583,35 +2583,6 @@
return toLayoutSize(convertToLayerCoords(ancestorLayer, LayoutPoint(), adjustForColumns));
}
-#if ENABLE(IOS_TOUCH_EVENTS)
-bool RenderLayer::handleTouchEvent(const PlatformTouchEvent& touchEvent)
-{
- // If we have accelerated scrolling, let the scrolling be handled outside of WebKit.
- if (hasCompositedScrollableOverflow())
- return false;
-
- return ScrollableArea::handleTouchEvent(touchEvent);
-}
-
-void RenderLayer::registerAsTouchEventListenerForScrolling()
-{
- if (!renderer().element() || m_registeredAsTouchEventListenerForScrolling)
- return;
-
- renderer().document().addTouchEventHandler(*renderer().element());
- m_registeredAsTouchEventListenerForScrolling = true;
-}
-
-void RenderLayer::unregisterAsTouchEventListenerForScrolling()
-{
- if (!renderer().element() || !m_registeredAsTouchEventListenerForScrolling)
- return;
-
- renderer().document().removeTouchEventHandler(*renderer().element());
- m_registeredAsTouchEventListenerForScrolling = false;
-}
-#endif // ENABLE(IOS_TOUCH_EVENTS)
-
static inline bool frameElementAndViewPermitScroll(HTMLFrameElementBase* frameElementBase, FrameView& frameView)
{
// If scrollbars aren't explicitly forbidden, permit scrolling.
Modified: trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp (271563 => 271564)
--- trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp 2021-01-17 19:55:10 UTC (rev 271563)
+++ trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp 2021-01-17 21:06:49 UTC (rev 271564)
@@ -1638,37 +1638,6 @@
updateResizerStyle();
}
-#if ENABLE(IOS_TOUCH_EVENTS)
-bool RenderLayerScrollableArea::handleTouchEvent(const PlatformTouchEvent& touchEvent)
-{
- // If we have accelerated scrolling, let the scrolling be handled outside of WebKit.
- if (hasCompositedScrollableOverflow())
- return false;
-
- return ScrollableArea::handleTouchEvent(touchEvent);
-}
-
-void RenderLayerScrollableArea::registerAsTouchEventListenerForScrolling()
-{
- auto& renderer = m_layer.renderer();
- if (!renderer.element() || m_registeredAsTouchEventListenerForScrolling)
- return;
-
- renderer.document().addTouchEventHandler(*renderer.element());
- m_registeredAsTouchEventListenerForScrolling = true;
-}
-
-void RenderLayerScrollableArea::unregisterAsTouchEventListenerForScrolling()
-{
- auto& renderer = m_layer.renderer;
- if (!renderer.element() || !m_registeredAsTouchEventListenerForScrolling)
- return;
-
- renderer.document().removeTouchEventHandler(*renderer.element());
- m_registeredAsTouchEventListenerForScrolling = false;
-}
-#endif // ENABLE(IOS_TOUCH_EVENTS)
-
// FIXME: this is only valid after we've made layers.
bool RenderLayerScrollableArea::usesCompositedScrolling() const
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
