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

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit ad6dc2f6ae5080b3bbdc21008fef6a97a3129680
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 19 15:28:30 2010 +0000

    2010-12-19  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] [WK2] Client are expected to render their own background for WebPages
            https://bugs.webkit.org/show_bug.cgi?id=51296
    
            Do not render a white background before rendering the page with DrawingAreaProxy.
    
            * UIProcess/API/qt/qwkpage.cpp:
            (QWKPagePrivate::paint):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74322 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f76b22e..2cef436 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-19  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] [WK2] Client are expected to render their own background for WebPages
+        https://bugs.webkit.org/show_bug.cgi?id=51296
+
+        Do not render a white background before rendering the page with DrawingAreaProxy.
+
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPagePrivate::paint):
+
 2010-12-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index f089b4f..9a1cee1 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -162,11 +162,10 @@ void QWKPagePrivate::paint(QPainter* painter, QRect area)
 {
     painter->save();
 
-    painter->setBrush(Qt::white);
-    painter->drawRect(area);
-
     if (page->isValid() && page->drawingArea())
         page->drawingArea()->paint(IntRect(area), painter);
+    else
+        painter->fillRect(area, Qt::white);
 
     painter->restore();
 }

-- 
WebKit Debian packaging