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

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit cbb36dabeb3bf92e640af0ec67ab5a69450bbc5a
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 23:54:29 2010 +0000

    2010-09-08  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Kenneth Russell.
    
            [chromium] Always do 2d canvas clearRect() in hardware
            https://bugs.webkit.org/show_bug.cgi?id=45415
    
            r67003 forced Canvas 2d's clearRect() to happen in software if a gradient/shadow/etc was
            active.  This is subtly wrong for mixed mode rendering since it results in only the
            software backing store being cleared and not the hardware.  This forces clearRect() to
            happen in hardware.  Since we upload mixed mode results before doing any hardware draw
            this means we always clear everything.
    
            * platform/graphics/skia/GraphicsContextSkia.cpp:
            (WebCore::GraphicsContext::clearRect):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67039 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fec0f85..39d1c40 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-08  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        [chromium] Always do 2d canvas clearRect() in hardware
+        https://bugs.webkit.org/show_bug.cgi?id=45415
+
+        r67003 forced Canvas 2d's clearRect() to happen in software if a gradient/shadow/etc was
+        active.  This is subtly wrong for mixed mode rendering since it results in only the
+        software backing store being cleared and not the hardware.  This forces clearRect() to
+        happen in hardware.  Since we upload mixed mode results before doing any hardware draw
+        this means we always clear everything.
+
+        * platform/graphics/skia/GraphicsContextSkia.cpp:
+        (WebCore::GraphicsContext::clearRect):
+
 2010-09-08  Dean Jackson  <dino at apple.com>
 
         Unreviewed attempt to fix the Mac builds.
diff --git a/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp b/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
index 1f9381d..4eb80aa 100644
--- a/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
+++ b/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
@@ -338,7 +338,7 @@ void GraphicsContext::clearRect(const FloatRect& rect)
     if (paintingDisabled())
         return;
 
-    if (platformContext()->useGPU() && platformContext()->canAccelerate()) {
+    if (platformContext()->useGPU()) {
         platformContext()->prepareForHardwareDraw();
         platformContext()->gpuCanvas()->clearRect(rect);
         return;

-- 
WebKit Debian packaging