Diff
Modified: trunk/Source/WebKit/ChangeLog (243846 => 243847)
--- trunk/Source/WebKit/ChangeLog 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/ChangeLog 2019-04-04 02:53:02 UTC (rev 243847)
@@ -1,3 +1,34 @@
+2019-04-03 Simon Fraser <[email protected]>
+
+ Remove the isProgrammaticScroll argument to requestScroll() because no-one uses it
+ https://bugs.webkit.org/show_bug.cgi?id=196587
+
+ Reviewed by Zalan Bujtas.
+
+ This argument was unused.
+
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::requestScroll):
+ * UIProcess/API/gtk/PageClientImpl.h:
+ * UIProcess/API/wpe/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::requestScroll):
+ * UIProcess/API/wpe/PageClientImpl.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::requestScroll):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::requestScroll):
+ * UIProcess/mac/PageClientImplMac.h:
+ * UIProcess/mac/PageClientImplMac.mm:
+ (WebKit::PageClientImpl::requestScroll):
+ * UIProcess/win/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::requestScroll):
+ * UIProcess/win/PageClientImpl.h:
+
2019-04-03 Myles C. Maxfield <[email protected]>
-apple-trailing-word is needed for browser detection
Modified: trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp (243846 => 243847)
--- trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp 2019-04-04 02:53:02 UTC (rev 243847)
@@ -82,7 +82,7 @@
gtk_widget_queue_draw_region(m_viewWidget, toCairoRegion(region).get());
}
-void PageClientImpl::requestScroll(const WebCore::FloatPoint&, const WebCore::IntPoint&, bool)
+void PageClientImpl::requestScroll(const WebCore::FloatPoint&, const WebCore::IntPoint&)
{
notImplemented();
}
Modified: trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h (243846 => 243847)
--- trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h 2019-04-04 02:53:02 UTC (rev 243847)
@@ -62,7 +62,7 @@
// PageClient
std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy(WebProcessProxy&) override;
void setViewNeedsDisplay(const WebCore::Region&) override;
- void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, bool isProgrammaticScroll) override;
+ void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin) override;
WebCore::FloatPoint viewScrollPosition() override;
WebCore::IntSize viewSize() override;
bool isViewWindowActive() override;
Modified: trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp (243846 => 243847)
--- trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp 2019-04-04 02:53:02 UTC (rev 243847)
@@ -66,7 +66,7 @@
{
}
-void PageClientImpl::requestScroll(const WebCore::FloatPoint&, const WebCore::IntPoint&, bool)
+void PageClientImpl::requestScroll(const WebCore::FloatPoint&, const WebCore::IntPoint&)
{
}
Modified: trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h (243846 => 243847)
--- trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h 2019-04-04 02:53:02 UTC (rev 243847)
@@ -59,7 +59,7 @@
// PageClient
std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy(WebProcessProxy&) override;
void setViewNeedsDisplay(const WebCore::Region&) override;
- void requestScroll(const WebCore::FloatPoint&, const WebCore::IntPoint&, bool) override;
+ void requestScroll(const WebCore::FloatPoint&, const WebCore::IntPoint&) override;
WebCore::FloatPoint viewScrollPosition() override;
WebCore::IntSize viewSize() override;
bool isViewWindowActive() override;
Modified: trunk/Source/WebKit/UIProcess/PageClient.h (243846 => 243847)
--- trunk/Source/WebKit/UIProcess/PageClient.h 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/UIProcess/PageClient.h 2019-04-04 02:53:02 UTC (rev 243847)
@@ -168,7 +168,7 @@
virtual void setViewNeedsDisplay(const WebCore::Region&) = 0;
// Tell the view to scroll to the given position, and whether this was a programmatic scroll.
- virtual void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, bool isProgrammaticScroll) = 0;
+ virtual void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin) = 0;
// Return the current scroll position (not necessarily the same as the WebCore scroll position, because of scaling, insets etc.)
virtual WebCore::FloatPoint viewScrollPosition() = 0;
Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm (243846 => 243847)
--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm 2019-04-04 02:53:02 UTC (rev 243847)
@@ -230,7 +230,7 @@
// Handle requested scroll position updates from the scrolling tree transaction after didCommitLayerTree()
// has updated the view size based on the content size.
if (requestedScrollInfo.requestsScrollPositionUpdate)
- m_webPageProxy.requestScroll(requestedScrollInfo.requestedScrollPosition, layerTreeTransaction.scrollOrigin(), requestedScrollInfo.requestIsProgrammaticScroll);
+ m_webPageProxy.requestScroll(requestedScrollInfo.requestedScrollPosition, layerTreeTransaction.scrollOrigin());
#endif // ENABLE(ASYNC_SCROLLING)
if (m_debugIndicatorLayerTreeHost) {
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (243846 => 243847)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-04-04 02:53:02 UTC (rev 243847)
@@ -1618,9 +1618,9 @@
pageClient().setViewNeedsDisplay(region);
}
-void WebPageProxy::requestScroll(const FloatPoint& scrollPosition, const IntPoint& scrollOrigin, bool isProgrammaticScroll)
+void WebPageProxy::requestScroll(const FloatPoint& scrollPosition, const IntPoint& scrollOrigin)
{
- pageClient().requestScroll(scrollPosition, scrollOrigin, isProgrammaticScroll);
+ pageClient().requestScroll(scrollPosition, scrollOrigin);
}
WebCore::FloatPoint WebPageProxy::viewScrollPosition() const
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (243846 => 243847)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-04-04 02:53:02 UTC (rev 243847)
@@ -566,7 +566,7 @@
PageClient& pageClient() const;
void setViewNeedsDisplay(const WebCore::Region&);
- void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, bool isProgrammaticScroll);
+ void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin);
WebCore::FloatPoint viewScrollPosition() const;
Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h (243846 => 243847)
--- trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h 2019-04-04 02:53:02 UTC (rev 243847)
@@ -56,7 +56,7 @@
// PageClient
std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy(WebProcessProxy&) override;
void setViewNeedsDisplay(const WebCore::Region&) override;
- void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, bool isProgrammaticScroll) override;
+ void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin) override;
WebCore::FloatPoint viewScrollPosition() override;
WebCore::IntSize viewSize() override;
bool isViewWindowActive() override;
Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm (243846 => 243847)
--- trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2019-04-04 02:53:02 UTC (rev 243847)
@@ -92,9 +92,8 @@
ASSERT_NOT_REACHED();
}
-void PageClientImpl::requestScroll(const FloatPoint& scrollPosition, const IntPoint& scrollOrigin, bool isProgrammaticScroll)
+void PageClientImpl::requestScroll(const FloatPoint& scrollPosition, const IntPoint& scrollOrigin)
{
- UNUSED_PARAM(isProgrammaticScroll);
[m_webView _scrollToContentScrollPosition:scrollPosition scrollOrigin:scrollOrigin];
}
Modified: trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.h (243846 => 243847)
--- trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.h 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.h 2019-04-04 02:53:02 UTC (rev 243847)
@@ -65,7 +65,7 @@
// PageClient
std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy(WebProcessProxy&) override;
void setViewNeedsDisplay(const WebCore::Region&) override;
- void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, bool isProgrammaticScroll) override;
+ void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin) override;
WebCore::FloatPoint viewScrollPosition() override;
WebCore::IntSize viewSize() override;
Modified: trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.mm (243846 => 243847)
--- trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.mm 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.mm 2019-04-04 02:53:02 UTC (rev 243847)
@@ -132,7 +132,7 @@
ASSERT_NOT_REACHED();
}
-void PageClientImpl::requestScroll(const FloatPoint& scrollPosition, const IntPoint& scrollOrigin, bool isProgrammaticScroll)
+void PageClientImpl::requestScroll(const FloatPoint& scrollPosition, const IntPoint& scrollOrigin)
{
}
Modified: trunk/Source/WebKit/UIProcess/win/PageClientImpl.cpp (243846 => 243847)
--- trunk/Source/WebKit/UIProcess/win/PageClientImpl.cpp 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/UIProcess/win/PageClientImpl.cpp 2019-04-04 02:53:02 UTC (rev 243847)
@@ -54,7 +54,7 @@
m_view.setViewNeedsDisplay(region);
}
-void PageClientImpl::requestScroll(const WebCore::FloatPoint&, const WebCore::IntPoint&, bool)
+void PageClientImpl::requestScroll(const WebCore::FloatPoint&, const WebCore::IntPoint&)
{
notImplemented();
}
Modified: trunk/Source/WebKit/UIProcess/win/PageClientImpl.h (243846 => 243847)
--- trunk/Source/WebKit/UIProcess/win/PageClientImpl.h 2019-04-04 02:52:58 UTC (rev 243846)
+++ trunk/Source/WebKit/UIProcess/win/PageClientImpl.h 2019-04-04 02:53:02 UTC (rev 243847)
@@ -59,7 +59,7 @@
// PageClient
std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy(WebProcessProxy&) override;
void setViewNeedsDisplay(const WebCore::Region&) override;
- void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, bool isProgrammaticScroll) override;
+ void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin) override;
WebCore::FloatPoint viewScrollPosition() override;
WebCore::IntSize viewSize() override;
bool isViewWindowActive() override;