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

[jberlin at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c55e5bb27bd216d3e629985e8cb611ecfc742cfe
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 18:16:57 2010 +0000

    2010-08-18  Jessie Berlin  <jberlin at apple.com>
    
            Reviewed by Adam Roben.
    
            Bug 44180 - WebView::paint fails to paint a child WebView of a Layered Window.
            https://bugs.webkit.org/show_bug.cgi?id=44180
    
            Decide to end painting if the m_backingStoreBitmap is null after the call to
            ensureBackingStore() instead of when the rcPaint rect filled by BeginPaint is empty.
            The rcPaint rect filled by BeginPaint is always empty for a child WebView of a Layered
            Window, even if GetUpdateRect and GetUpdateRgn report a non-empty region that needs
            painting.
    
            * WebView.cpp:
            (WebView::paint):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65618 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index cd0f234..e7944fd 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-18  Jessie Berlin  <jberlin at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Bug 44180 - WebView::paint fails to paint a child WebView of a Layered Window.
+        https://bugs.webkit.org/show_bug.cgi?id=44180
+        
+        Decide to end painting if the m_backingStoreBitmap is null after the call to
+        ensureBackingStore() instead of when the rcPaint rect filled by BeginPaint is empty.
+        The rcPaint rect filled by BeginPaint is always empty for a child WebView of a Layered 
+        Window, even if GetUpdateRect and GetUpdateRgn report a non-empty region that needs
+        painting.
+
+        * WebView.cpp:
+        (WebView::paint):
+
 2010-08-17  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 6d610a1..98c1023 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -977,7 +977,8 @@ void WebView::paint(HDC dc, LPARAM options)
         windowsToPaint = PaintWebViewAndChildren;
     }
 
-    if (::IsRectEmpty(&rcPaint)) {
+    bool backingStoreCompletelyDirty = ensureBackingStore();
+    if (!m_backingStoreBitmap) {
         if (!dc)
             EndPaint(m_viewWindow, &ps);
         return;
@@ -986,7 +987,6 @@ void WebView::paint(HDC dc, LPARAM options)
     m_paintCount++;
 
     HDC bitmapDC = ::CreateCompatibleDC(hdc);
-    bool backingStoreCompletelyDirty = ensureBackingStore();
     ::SelectObject(bitmapDC, m_backingStoreBitmap->handle());
 
     // Update our backing store if needed.

-- 
WebKit Debian packaging