Changeset 74324 in webkit

Timestamp:

Dec 19, 2010 9:24:07 AM (13 years ago)

Author:

kenneth@webkit.org

Message:

2010-12-19 Kenneth Rohde Christiansen <​kenneth@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:

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/TiledDrawingAreaProxy.cpp (modified) (1 diff)
• UIProcess/TiledDrawingAreaTile.h (modified) (1 diff)
• UIProcess/qt/TiledDrawingAreaTileQt.cpp (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-19  Kenneth Rohde Christiansen  <kenneth@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@nokia.com>
 

trunk/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp

@@ -347 +347 @@
             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));
-            }
         }
     }

trunk/WebKit2/UIProcess/TiledDrawingAreaTile.h

@@ -66 +66 @@
     void updateFromChunk(UpdateChunk* updateChunk, float);
 
-    static void paintCheckerPattern(WebCore::GraphicsContext*, const WebCore::FloatRect&);
-
     int ID() const { return m_ID; }
 

trunk/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp

@@ -40 +40 @@
 
 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)
@@ -140 +117 @@
 }
 
-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)
 {