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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 51d8ef343b0e8f70203a8b021334bd94b4096b34
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 17 17:47:59 2010 +0000

    2010-09-17  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] [REGRESSION] Listbox rendering is incorrect
            https://bugs.webkit.org/show_bug.cgi?id=45941
    
            Only apply the shadow tiling optimization to a layer if the GraphicsContext
            has a shadow.
    
            This is covered by manual-tests/select-element-type-select.html.
    
            * platform/graphics/cairo/GraphicsContextCairo.cpp:
            (WebCore::drawBorderlessRectShadow): Before applying the tiled shadow optimization
            first check to see if the context has a shadow at all.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67725 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 021dd9c..2cdb467 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,21 @@
 2010-09-17  Martin Robinson  <mrobinson at igalia.com>
 
+        Reviewed by Xan Lopez.
+
+        [GTK] [REGRESSION] Listbox rendering is incorrect
+        https://bugs.webkit.org/show_bug.cgi?id=45941
+
+        Only apply the shadow tiling optimization to a layer if the GraphicsContext
+        has a shadow.
+
+        This is covered by manual-tests/select-element-type-select.html.
+
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::drawBorderlessRectShadow): Before applying the tiled shadow optimization
+        first check to see if the context has a shadow at all.
+
+2010-09-17  Martin Robinson  <mrobinson at igalia.com>
+
         Reviewed by Oliver Hunt.
 
         [GTK] FontPlatformDataFreeType should use smart pointers to hold its members
diff --git a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
index d6cc96a..4e58b99 100644
--- a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
+++ b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
@@ -641,6 +641,12 @@ void GraphicsContext::fillRect(const FloatRect& rect)
 static void drawBorderlessRectShadow(GraphicsContext* context, const FloatRect& rect, const Color& rectColor)
 {
 #if ENABLE(FILTERS)
+    FloatSize shadowOffset;
+    float shadowBlur;
+    Color shadowColor;
+    if (!context->getShadow(shadowOffset, shadowBlur, shadowColor))
+        return;
+
     AffineTransform transform = context->getCTM();
     // drawTiledShadow still does not work with rotations.
     if ((transform.isIdentityOrTranslationOrFlipped())) {
@@ -655,13 +661,6 @@ static void drawBorderlessRectShadow(GraphicsContext* context, const FloatRect&
         return;
     }
 
-    FloatSize shadowOffset;
-    float shadowBlur;
-    Color shadowColor;
-
-    if (!context->getShadow(shadowOffset, shadowBlur, shadowColor))
-        return;
-
     IntSize shadowBufferSize;
     FloatRect shadowRect;
     float radius = 0;

-- 
WebKit Debian packaging