[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.0.1-3

Mike Hommey glandium at debian.org
Sat Sep 20 11:40:09 UTC 2008


The following commit has been merged in the debian/unstable branch:
commit 42a57c36b37307e04fd9ff782bf227516f944971
Author: Mike Hommey <glandium at debian.org>
Date:   Sat Sep 20 13:15:14 2008 +0200

    Make parent cherry-pick independent of r34765

diff --git a/WebCore/platform/graphics/gtk/FontGtk.cpp b/WebCore/platform/graphics/gtk/FontGtk.cpp
index c4ff0ab..2cfa026 100644
--- a/WebCore/platform/graphics/gtk/FontGtk.cpp
+++ b/WebCore/platform/graphics/gtk/FontGtk.cpp
@@ -209,8 +209,8 @@ void Font::drawComplexText(GraphicsContext* context, const TextRun& run, const F
     IntSize shadowSize;
     int shadowBlur = 0;
     Color shadowColor;
-    bool hasShadow = context->textDrawingMode() == cTextFill &&
-        context->getShadow(shadowSize, shadowBlur, shadowColor);
+    context->getShadow(shadowSize, shadowBlur, shadowColor);
+    bool hasShadow = context->textDrawingMode() == cTextFill && shadowColor.isValid() && !shadowSize.isEmpty();
 
     // TODO: Blur support
     if (hasShadow) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list