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

[kenneth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 7f1ada419e1f421ff977b1e8bfeb6103523498ee
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 19 17:24:07 2010 +0000

    2010-12-19  Kenneth Rohde Christiansen  <kenneth at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [Qt] [WK2] Client are expected to render their own background for WebPages
            https://bugs.webkit.org/show_bug.cgi?id=51296
    
            Remove the rendering of the checkerboard from the tiled DrawingAreaProxy
    
            * UIProcess/TiledDrawingAreaProxy.cpp:
            (WebKit::TiledDrawingAreaProxy::paint):
            * UIProcess/TiledDrawingAreaTile.h:
            * UIProcess/qt/TiledDrawingAreaTileQt.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74324 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 2cef436..ba30e3f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-19  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] [WK2] Client are expected to render their own background for WebPages
+        https://bugs.webkit.org/show_bug.cgi?id=51296
+
+        Remove the rendering of the checkerboard from the tiled DrawingAreaProxy
+
+        * UIProcess/TiledDrawingAreaProxy.cpp:
+        (WebKit::TiledDrawingAreaProxy::paint):
+        * UIProcess/TiledDrawingAreaTile.h:
+        * UIProcess/qt/TiledDrawingAreaTileQt.cpp:
+
 2010-12-19  Benjamin Poulain  <benjamin.poulain at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp b/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp
index 3b29647..1958f8d 100644
--- a/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp
@@ -346,13 +346,6 @@ void TiledDrawingAreaProxy::paint(const IntRect& rect, PlatformDrawingContext co
             RefPtr<TiledDrawingAreaTile> currentTile = tileAt(currentCoordinate);
             if (currentTile && currentTile->isReadyToPaint())
                 currentTile->paint(&gc, dirtyRect);
-            else {
-                IntRect tileRect = tileRectForCoordinate(currentCoordinate);
-                IntRect target = intersection(tileRect, dirtyRect);
-                if (target.isEmpty())
-                    continue;
-                TiledDrawingAreaTile::paintCheckerPattern(&gc, FloatRect(target));
-            }
         }
     }
     gc.restore();
diff --git a/WebKit2/UIProcess/TiledDrawingAreaTile.h b/WebKit2/UIProcess/TiledDrawingAreaTile.h
index 0201461..c818a3f 100644
--- a/WebKit2/UIProcess/TiledDrawingAreaTile.h
+++ b/WebKit2/UIProcess/TiledDrawingAreaTile.h
@@ -65,8 +65,6 @@ public:
 
     void updateFromChunk(UpdateChunk* updateChunk, float);
 
-    static void paintCheckerPattern(WebCore::GraphicsContext*, const WebCore::FloatRect&);
-
     int ID() const { return m_ID; }
 
 private:
diff --git a/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp b/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp
index f8db8c3..2b631ca 100644
--- a/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp
+++ b/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp
@@ -40,29 +40,6 @@ using namespace WebCore;
 
 namespace WebKit {
 
-static const unsigned checkerSize = 16;
-static const unsigned checkerColor1 = 0xff555555;
-static const unsigned checkerColor2 = 0xffaaaaaa;
-
-static QPixmap& checkeredPixmap()
-{
-    static QPixmap* pixmap;
-    if (!pixmap) {
-        pixmap = new QPixmap(checkerSize, checkerSize);
-        QPainter painter(pixmap);
-        QColor color1(checkerColor1);
-        QColor color2(checkerColor2);
-        for (unsigned y = 0; y < checkerSize; y += checkerSize / 2) {
-            bool alternate = y % checkerSize;
-            for (unsigned x = 0; x < checkerSize; x += checkerSize / 2) {
-                painter.fillRect(x, y, checkerSize / 2, checkerSize / 2, alternate ? color1 : color2);
-                alternate = !alternate;
-            }
-        }
-    }
-    return *pixmap;
-}
-
 TiledDrawingAreaTile::TiledDrawingAreaTile(TiledDrawingAreaProxy* proxy, const Coordinate& tileCoordinate)
     : m_proxy(proxy)
     , m_coordinate(tileCoordinate)
@@ -139,31 +116,6 @@ void TiledDrawingAreaTile::paint(GraphicsContext* context, const IntRect& rect)
     context->platformContext()->drawPixmap(target, m_buffer, source);
 }
 
-void TiledDrawingAreaTile::paintCheckerPattern(GraphicsContext* context, const FloatRect& target)
-{
-    QPainter* painter = context->platformContext();
-    QTransform worldTransform = painter->worldTransform();
-    qreal scaleX = worldTransform.m11();
-    qreal scaleY = worldTransform.m22();
-
-    QRect targetViewRect = QRectF(target.x() * scaleX,
-                                  target.y() * scaleY,
-                                  target.width() * scaleX,
-                                  target.height() * scaleY).toAlignedRect();
-
-    QTransform adjustedTransform(1., worldTransform.m12(), worldTransform.m13(),
-                                 worldTransform.m21(), 1., worldTransform.m23(),
-                                 worldTransform.m31(), worldTransform.m32(), worldTransform.m33());
-    painter->setWorldTransform(adjustedTransform);
-
-    painter->drawTiledPixmap(targetViewRect,
-                             checkeredPixmap(),
-                             QPoint(targetViewRect.left() % checkerSize,
-                                    targetViewRect.top() % checkerSize));
-
-    painter->setWorldTransform(worldTransform);
-}
-
 void TiledDrawingAreaTile::updateFromChunk(UpdateChunk* updateChunk, float)
 {
     QImage image(updateChunk->createImage());

-- 
WebKit Debian packaging