[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 b29027e74c51aa16cd890734af06a9069c2d4764
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 20 00:27:47 2011 +0000

    2011-01-19  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Sam Weinig.
    
            When resizing, the web process should repaint the page
            https://bugs.webkit.org/show_bug.cgi?id=52764
    
            * UIProcess/DrawingAreaProxyImpl.cpp:
            (WebKit::DrawingAreaProxyImpl::didSetSize):
            Incorporate the update.
    
            (WebKit::DrawingAreaProxyImpl::incorporateUpdate):
            Return early if the update bounds rect is empty. This can happen if painting is
            disabled and we get a DidSetSize message.
    
            * WebProcess/WebPage/DrawingAreaImpl.cpp:
            (WebKit::DrawingAreaImpl::setSize):
            If painting is disabled, just send back an empty UpdateInfo struct. Otherwise,
            paint and fill in the UpdateInfo struct.
    
            (WebKit::DrawingAreaImpl::display):
            Assert that painting is not disabled.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76179 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index b5684d7..db4255b 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,26 @@
+2011-01-19  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        When resizing, the web process should repaint the page
+        https://bugs.webkit.org/show_bug.cgi?id=52764
+
+        * UIProcess/DrawingAreaProxyImpl.cpp:
+        (WebKit::DrawingAreaProxyImpl::didSetSize):
+        Incorporate the update.
+
+        (WebKit::DrawingAreaProxyImpl::incorporateUpdate):
+        Return early if the update bounds rect is empty. This can happen if painting is
+        disabled and we get a DidSetSize message.
+
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::setSize):
+        If painting is disabled, just send back an empty UpdateInfo struct. Otherwise,
+        paint and fill in the UpdateInfo struct.
+
+        (WebKit::DrawingAreaImpl::display):
+        Assert that painting is not disabled.
+
 2011-01-19  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
index 1557432..300136d 100644
--- a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
+++ b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
@@ -125,11 +125,14 @@ void DrawingAreaProxyImpl::didSetSize(const UpdateInfo& updateInfo)
         sendSetSize();
 
     m_backingStore = nullptr;
+
+    incorporateUpdate(updateInfo);
 }
 
 void DrawingAreaProxyImpl::incorporateUpdate(const UpdateInfo& updateInfo)
 {
-    // FIXME: Check for the update bounds being empty here.
+    if (updateInfo.updateRectBounds.isEmpty())
+        return;
 
     if (!m_backingStore)
         m_backingStore = BackingStore::create(updateInfo.viewSize, m_webPageProxy);
diff --git a/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp b/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
index 72ed768..2c05434 100644
--- a/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
@@ -142,9 +142,11 @@ void DrawingAreaImpl::setSize(const IntSize& size)
     m_webPage->layoutIfNeeded();
 
     UpdateInfo updateInfo;
-    updateInfo.viewSize = m_webPage->size();
 
-    // FIXME: Repaint.
+    if (m_isPaintingSuspended)
+        updateInfo.viewSize = m_webPage->size();
+    else
+        display(updateInfo);
 
     m_webPage->send(Messages::DrawingAreaProxy::DidSetSize(updateInfo));
 }
@@ -231,6 +233,8 @@ static bool shouldPaintBoundsRect(const IntRect& bounds, const Vector<IntRect>&
 
 void DrawingAreaImpl::display(UpdateInfo& updateInfo)
 {
+    ASSERT(!m_isPaintingSuspended);
+
     // FIXME: It would be better if we could avoid painting altogether when there is a custom representation.
     if (m_webPage->mainFrameHasCustomRepresentation())
         return;

-- 
WebKit Debian packaging