[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit ade118b31d22cc0a69b661fd0cf898ca67250bdd
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 11 14:47:23 2010 +0000

    2010-11-11  Kenneth Rohde Christiansen  <kenneth at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [Qt] Add a Qt WebKit2 API for overriding the actual visible content rect
            https://bugs.webkit.org/show_bug.cgi?id=49381
    
            Add an Qt WebKit2 API for overriding the actual visible content rect in
            WebCore. This is supposed to be used in combination with tiling.
    
            * UIProcess/API/qt/qwkpage.cpp:
            (QWKPage::setActualVisibleContentsRect):
            * UIProcess/API/qt/qwkpage.h:
            * UIProcess/WebPageProxy.cpp:
            (WebKit::WebPageProxy::setActualVisibleContentRect):
            * UIProcess/WebPageProxy.h:
            * WebProcess/WebPage/WebPage.cpp:
            (WebKit::WebPage::setActualVisibleContentRect):
            * WebProcess/WebPage/WebPage.h:
            * WebProcess/WebPage/WebPage.messages.in:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71817 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0b7642a..47daf78 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,24 @@
+2010-11-11  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Add a Qt WebKit2 API for overriding the actual visible content rect
+        https://bugs.webkit.org/show_bug.cgi?id=49381
+
+        Add an Qt WebKit2 API for overriding the actual visible content rect in
+        WebCore. This is supposed to be used in combination with tiling.
+
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPage::setActualVisibleContentsRect):
+        * UIProcess/API/qt/qwkpage.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::setActualVisibleContentRect):
+        * UIProcess/WebPageProxy.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setActualVisibleContentRect):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPage.messages.in:
+
 2010-11-10  Beth Dakin  <bdakin at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index d5825df..f47bbc3 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -431,6 +431,11 @@ QWKPage::ViewportAttributes QWKPage::viewportAttributesForSize(const QSize& avai
     return result;
 }
 
+void QWKPage::setActualVisibleContentsRect(const QRect& rect) const
+{
+    d->page->setActualVisibleContentRect(rect);
+}
+
 void QWKPage::timerEvent(QTimerEvent* ev)
 {
     int timerId = ev->timerId();
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.h b/WebKit2/UIProcess/API/qt/qwkpage.h
index 3235697..958cfb9 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage.h
@@ -82,6 +82,8 @@ public:
     void setViewportSize(const QSize&);
     ViewportAttributes viewportAttributesForSize(const QSize& availableSize) const;
 
+    void setActualVisibleContentsRect(const QRect& rect) const;
+
     QAction* action(WebAction action) const;
     void triggerAction(WebAction action, bool checked = false);
 
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 629b0dc..3e0ed93 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -410,6 +410,16 @@ void WebPageProxy::updateWindowFrame(const IntRect& windowFrame)
 }
 #endif
 
+#if ENABLE(TILED_BACKING_STORE)
+void WebPageProxy::setActualVisibleContentRect(const IntRect& rect)
+{
+    if (!isValid())
+        return;
+
+    process()->send(Messages::WebPage::SetActualVisibleContentRect(rect), m_pageID);
+}
+#endif
+
 void WebPageProxy::handleMouseEvent(const WebMouseEvent& event)
 {
     if (!isValid())
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index e6086a0..8579365 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -164,6 +164,10 @@ public:
     void updateWindowFrame(const WebCore::IntRect&);
 #endif
 
+#if ENABLE(TILED_BACKING_STORE)
+    void setActualVisibleContentRect(const WebCore::IntRect& rect);
+#endif
+
     void handleMouseEvent(const WebMouseEvent&);
     void handleWheelEvent(const WebWheelEvent&);
     void handleKeyboardEvent(const NativeWebKeyboardEvent&);
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 03995bd..56b708b 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -403,6 +403,15 @@ void WebPage::setSize(const WebCore::IntSize& viewSize)
     m_viewSize = viewSize;
 }
 
+#if ENABLE(TILED_BACKING_STORE)
+void WebPage::setActualVisibleContentRect(const IntRect& rect)
+{
+    Frame* frame = m_page->mainFrame();
+
+    frame->view()->setActualVisibleContentRect(rect);
+}
+#endif
+
 void WebPage::drawRect(GraphicsContext& graphicsContext, const IntRect& rect)
 {
     graphicsContext.save();
diff --git a/WebKit2/WebProcess/WebPage/WebPage.h b/WebKit2/WebProcess/WebPage/WebPage.h
index dd946a2..4c3a9c2 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/WebKit2/WebProcess/WebPage/WebPage.h
@@ -193,6 +193,7 @@ public:
     void pageDidScroll();
 #if ENABLE(TILED_BACKING_STORE)
     void pageDidRequestScroll(const WebCore::IntSize& delta);
+    void setActualVisibleContentRect(const WebCore::IntRect&);
 #endif
 
     WebContextMenu* contextMenu();
diff --git a/WebKit2/WebProcess/WebPage/WebPage.messages.in b/WebKit2/WebProcess/WebPage/WebPage.messages.in
index f301bee..8ec8dfe 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.messages.in
+++ b/WebKit2/WebProcess/WebPage/WebPage.messages.in
@@ -55,6 +55,7 @@ messages -> WebPage {
     PreferencesDidChange(WebKit::WebPreferencesStore store)
 
     SetCustomUserAgent(WTF::String customUserAgent)
+    SetActualVisibleContentRect(WebCore::IntRect rect)
 
     Close()
     TryClose()

-- 
WebKit Debian packaging