[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[andersca at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 987ad2e1a5033e9ab0139fe2122b9c29f2082f15
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 22:22:21 2011 +0000

    2011-01-18  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Dan Bernstein.
    
            Ask the web page proxy to scroll the view when needed
            https://bugs.webkit.org/show_bug.cgi?id=52665
    
            * UIProcess/DrawingAreaProxyImpl.cpp:
            (WebKit::DrawingAreaProxyImpl::incorporateUpdate):
            * UIProcess/WebPageProxy.cpp:
            (WebKit::WebPageProxy::scrollView):
            * UIProcess/WebPageProxy.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76065 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index a16427d..f879c44 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,18 @@
 2011-01-18  Anders Carlsson  <andersca at apple.com>
 
+        Reviewed by Dan Bernstein.
+
+        Ask the web page proxy to scroll the view when needed
+        https://bugs.webkit.org/show_bug.cgi?id=52665
+
+        * UIProcess/DrawingAreaProxyImpl.cpp:
+        (WebKit::DrawingAreaProxyImpl::incorporateUpdate):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::scrollView):
+        * UIProcess/WebPageProxy.h:
+
+2011-01-18  Anders Carlsson  <andersca at apple.com>
+
         Fix build.
 
         * UIProcess/win/WebView.cpp:
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
index 02b0dd2..d6c287e 100644
--- a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
+++ b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
@@ -121,7 +121,7 @@ void DrawingAreaProxyImpl::incorporateUpdate(const UpdateInfo& updateInfo)
         m_webPageProxy->setViewNeedsDisplay(updateInfo.updateRects[i]);
 
     if (!updateInfo.scrollRect.isEmpty()) {
-        m_webPageProxy->setViewNeedsDisplay(updateInfo.scrollRect);
+        m_webPageProxy->scrollView(updateInfo.scrollRect, updateInfo.scrollOffset);
         m_webPageProxy->displayView();
     }
 }
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp
index f433fbd..ae01ad6 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp
@@ -475,6 +475,11 @@ void WebPageProxy::displayView()
     m_pageClient->displayView();
 }
 
+void WebPageProxy::scrollView(const IntRect& scrollRect, const IntSize& scrollOffset)
+{
+    m_pageClient->scrollView(scrollRect, scrollOffset);
+}
+
 void WebPageProxy::viewStateDidChange(ViewStateFlags flags)
 {
     if (!isValid())
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h
index 4a9e478..fd636da 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.h
+++ b/Source/WebKit2/UIProcess/WebPageProxy.h
@@ -173,6 +173,7 @@ public:
 
     void setViewNeedsDisplay(const WebCore::IntRect&);
     void displayView();
+    void scrollView(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset);
 
     enum {
         ViewWindowIsActive = 1 << 0,

-- 
WebKit Debian packaging