[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 ebef3a29d51b91723e689e928e7b7b6ddda4a410
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 24 19:33:52 2011 +0000

    2011-01-24  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Sam Weinig.
    
            Wait for half a second if we're asked to paint when receiving a DidSetSize message
            https://bugs.webkit.org/show_bug.cgi?id=53028
    
            * UIProcess/DrawingAreaProxyImpl.cpp:
            (WebKit::DrawingAreaProxyImpl::paint):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76536 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index c2e796b..f3312ad 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Sam Weinig.
 
+        Wait for half a second if we're asked to paint when receiving a DidSetSize message
+        https://bugs.webkit.org/show_bug.cgi?id=53028
+
+        * UIProcess/DrawingAreaProxyImpl.cpp:
+        (WebKit::DrawingAreaProxyImpl::paint):
+
+2011-01-24  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
         Implement forceRedisplay in the new drawing area
         https://bugs.webkit.org/show_bug.cgi?id=53026
 
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
index 3207094..3f7eb9c 100644
--- a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
+++ b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
@@ -26,6 +26,7 @@
 #include "DrawingAreaProxyImpl.h"
 
 #include "DrawingAreaMessages.h"
+#include "DrawingAreaProxyMessages.h"
 #include "Region.h"
 #include "UpdateInfo.h"
 #include "WebPageProxy.h"
@@ -61,6 +62,17 @@ void DrawingAreaProxyImpl::paint(BackingStore::PlatformGraphicsContext context,
     if (!m_backingStore)
         return;
 
+    if (m_isWaitingForDidSetSize) {
+        if (!m_webPageProxy->isValid())
+            return;
+        if (m_webPageProxy->process()->isLaunching())
+            return;
+
+        // The timeout, in seconds, we use when waiting for a DidSetSize message when we're asked to paint.
+        static const double didSetSizeTimeout = 0.5;
+        m_webPageProxy->process()->connection()->waitForAndDispatchImmediately<Messages::DrawingAreaProxy::DidSetSize>(m_webPageProxy->pageID(), didSetSizeTimeout);
+    }
+
     m_backingStore->paint(context, rect);
     unpaintedRegion.subtract(IntRect(IntPoint(), m_backingStore->size()));
 }

-- 
WebKit Debian packaging