[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
kenneth at webkit.org
kenneth at webkit.org
Wed Dec 22 15:36:26 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d8b64db14e6c33d39e709020d0309d336e601101
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 9 03:41:14 2010 +0000
2010-11-08 Kenneth Rohde Christiansen <kenneth at webkit.org>
Reviewed by Andreas Kling.
Send page scroll requests to the PageClient when scroll delegation is turned on
https://bugs.webkit.org/show_bug.cgi?id=49171
Implement the IPC and API required for making scroll delegation work
with WebKit2. This is only used when you have tiling enabled.
* UIProcess/API/qt/qwkpage.cpp:
(QWKPagePrivate::pageDidRequestScroll):
* UIProcess/API/qt/qwkpage.h:
* UIProcess/API/qt/qwkpage_p.h:
* UIProcess/PageClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::pageDidRequestScroll):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::delegatedScrollRequested):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::pageDidRequestScroll):
* WebProcess/WebPage/WebPage.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71600 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 1e9169e..ea22552 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,28 @@
+2010-11-08 Kenneth Rohde Christiansen <kenneth at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ Send page scroll requests to the PageClient when scroll delegation is turned on
+ https://bugs.webkit.org/show_bug.cgi?id=49171
+
+ Implement the IPC and API required for making scroll delegation work
+ with WebKit2. This is only used when you have tiling enabled.
+
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPagePrivate::pageDidRequestScroll):
+ * UIProcess/API/qt/qwkpage.h:
+ * UIProcess/API/qt/qwkpage_p.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::pageDidRequestScroll):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::delegatedScrollRequested):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::pageDidRequestScroll):
+ * WebProcess/WebPage/WebPage.h:
+
2010-11-08 Ivan Krstić <ike at apple.com>
Reviewed by Mark Rowe.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 8fb7df8..d5825df 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -98,6 +98,11 @@ void QWKPagePrivate::setViewportArguments(const ViewportArguments& args)
emit q->viewportChangeRequested();
}
+void QWKPagePrivate::pageDidRequestScroll(const IntSize& delta)
+{
+ emit q->scrollRequested(delta.width(), delta.height());
+}
+
void QWKPagePrivate::didChangeContentsSize(const IntSize& newSize)
{
emit q->contentsSizeChanged(QSize(newSize));
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.h b/WebKit2/UIProcess/API/qt/qwkpage.h
index a33cb1b..3235697 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage.h
@@ -107,6 +107,7 @@ public:
Q_SIGNAL void initialLayoutCompleted();
Q_SIGNAL void urlChanged(const QUrl&);
Q_SIGNAL void contentsSizeChanged(const QSize&);
+ Q_SIGNAL void scrollRequested(int dx, int dy);
Q_SIGNAL void cursorChanged(const QCursor&);
Q_SIGNAL void viewportChangeRequested();
diff --git a/WebKit2/UIProcess/API/qt/qwkpage_p.h b/WebKit2/UIProcess/API/qt/qwkpage_p.h
index 744893d..6bef745 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -48,6 +48,7 @@ public:
void pageDidEnterAcceleratedCompositing() { }
void pageDidLeaveAcceleratedCompositing() { }
#endif // USE(ACCELERATED_COMPOSITING)
+ virtual void pageDidRequestScroll(const WebCore::IntSize&);
virtual void processDidCrash() { }
virtual void didRelaunchProcess() { }
virtual void didChangeContentsSize(const WebCore::IntSize&);
diff --git a/WebKit2/UIProcess/PageClient.h b/WebKit2/UIProcess/PageClient.h
index db72a54..da81c68 100644
--- a/WebKit2/UIProcess/PageClient.h
+++ b/WebKit2/UIProcess/PageClient.h
@@ -54,6 +54,9 @@ public:
virtual void takeFocus(bool direction) = 0;
virtual void toolTipChanged(const String&, const String&) = 0;
+#if ENABLE(TILED_BACKING_STORE)
+ virtual void pageDidRequestScroll(const WebCore::IntSize&) = 0;
+#endif
#if PLATFORM(QT)
virtual void didChangeContentsSize(const WebCore::IntSize&) = 0;
#endif
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 2805e00..89f27fe 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -1014,6 +1014,13 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(const String& message, uint64_t f
shouldClose = m_uiClient.runBeforeUnloadConfirmPanel(this, message, process()->webFrame(frameID));
}
+#if ENABLE(TILED_BACKING_STORE)
+void WebPageProxy::pageDidRequestScroll(const IntSize& delta)
+{
+ m_pageClient->pageDidRequestScroll(delta);
+}
+#endif
+
void WebPageProxy::didChangeViewportData(const ViewportArguments& args)
{
m_pageClient->setViewportArguments(args);
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index c66d452..755d2af 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -296,6 +296,9 @@ private:
void runBeforeUnloadConfirmPanel(const String& message, uint64_t frameID, bool& shouldClose);
void didChangeViewportData(const WebCore::ViewportArguments&);
void pageDidScroll();
+#if ENABLE(TILED_BACKING_STORE)
+ void pageDidRequestScroll(const WebCore::IntSize&);
+#endif
#if PLATFORM(QT)
void didChangeContentsSize(const WebCore::IntSize&);
#endif
diff --git a/WebKit2/UIProcess/WebPageProxy.messages.in b/WebKit2/UIProcess/WebPageProxy.messages.in
index c258b9e..a97cd23 100644
--- a/WebKit2/UIProcess/WebPageProxy.messages.in
+++ b/WebKit2/UIProcess/WebPageProxy.messages.in
@@ -50,6 +50,9 @@ messages -> WebPageProxy {
CanRunBeforeUnloadConfirmPanel() -> (bool canRun)
RunBeforeUnloadConfirmPanel(WTF::String message, uint64_t frameID) -> (bool shouldClose)
PageDidScroll()
+#if ENABLE(TILED_BACKING_STORE)
+ PageDidRequestScroll(WebCore::IntSize delta)
+#endif
#if PLATFORM(QT)
DidChangeContentsSize(WebCore::IntSize newSize)
#endif
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
index a5d805a..37e6fd9 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
@@ -343,7 +343,7 @@ void WebChromeClient::scroll(const IntSize& scrollDelta, const IntRect& rectToSc
#if ENABLE(TILED_BACKING_STORE)
void WebChromeClient::delegatedScrollRequested(const IntSize& scrollDelta)
{
- notImplemented();
+ m_page->pageDidRequestScroll(scrollDelta);
}
#endif
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 77e26a1..8a2e2ec 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -488,6 +488,13 @@ void WebPage::pageDidScroll()
send(Messages::WebPageProxy::PageDidScroll());
}
+#if ENABLE(TILED_BACKING_STORE)
+void WebPage::pageDidRequestScroll(const IntSize& delta)
+{
+ send(Messages::WebPageProxy::PageDidRequestScroll(delta));
+}
+#endif
+
WebContextMenu* WebPage::contextMenu()
{
if (!m_contextMenu)
diff --git a/WebKit2/WebProcess/WebPage/WebPage.h b/WebKit2/WebProcess/WebPage/WebPage.h
index 14cde78..00d78b7 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/WebKit2/WebProcess/WebPage/WebPage.h
@@ -188,7 +188,10 @@ public:
FindController& findController() { return m_findController; }
void pageDidScroll();
-
+#if ENABLE(TILED_BACKING_STORE)
+ void pageDidRequestScroll(const WebCore::IntSize& delta);
+#endif
+
WebContextMenu* contextMenu();
private:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list