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

ariya at webkit.org ariya at webkit.org
Wed Dec 22 12:16:26 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit a1777a8ead77ca470e49a3de6b554b99b16702ee
Author: ariya at webkit.org <ariya at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 01:20:58 2010 +0000

    [Qt] Remove unused ContextShadowParameter class in GraphicsContextQt
    https://bugs.webkit.org/show_bug.cgi?id=44142
    
    Patch by Ariya Hidayat <ariya at sencha.com> on 2010-08-17
    Reviewed by Antonio Gomes.
    
    The class is not needed anymore after r65425.
    We know have dedicated ContextShadow in its own file.
    
    * platform/graphics/qt/GraphicsContextQt.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65580 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 21848dc..b668037 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-17  Ariya Hidayat  <ariya at sencha.com>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Remove unused ContextShadowParameter class in GraphicsContextQt
+        https://bugs.webkit.org/show_bug.cgi?id=44142
+
+        The class is not needed anymore after r65425.
+        We know have dedicated ContextShadow in its own file.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+
 2010-08-17  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 1822a8a..1632804 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -169,63 +169,6 @@ static inline Qt::FillRule toQtFillRule(WindRule rule)
     return Qt::OddEvenFill;
 }
 
-
-// This is to track and keep the shadow state. We use this rather than
-// using GraphicsContextState to allow possible optimizations (right now
-// only to determine the shadow type, but in future it might cover things
-// like cached scratch image, persistent shader, etc).
-
-class ContextShadowParameter {
-public:
-    enum {
-        NoShadow,
-        OpaqueSolidShadow,
-        AlphaSolidShadow,
-        BlurShadow
-    } type;
-
-    QColor color;
-    int blurRadius;
-    QPointF offset;
-
-    ContextShadowParameter()
-        : type(NoShadow)
-        , blurRadius(0)
-    {
-    }
-
-    ContextShadowParameter(const QColor& c, float r, qreal dx, qreal dy)
-        : color(c)
-        , blurRadius(qRound(r))
-        , offset(dx, dy)
-    {
-        // The type of shadow is decided by the blur radius, shadow offset, and shadow color.
-        if (!color.isValid() || !color.alpha()) {
-            // Can't paint the shadow with invalid or invisible color.
-            type = NoShadow;
-        } else if (r > 0) {
-            // Shadow is always blurred, even the offset is zero.
-            type = BlurShadow;
-        } else if (offset.isNull()) {
-            // Without blur and zero offset means the shadow is fully hidden.
-            type = NoShadow;
-        } else {
-            if (color.alpha() > 0)
-                type = AlphaSolidShadow;
-            else
-                type = OpaqueSolidShadow;
-        }
-    }
-
-    void clear()
-    {
-        type = NoShadow;
-        color = QColor();
-        blurRadius = 0;
-        offset = QPointF();
-    }
-};
-
 class GraphicsContextPlatformPrivate : public Noncopyable {
 public:
     GraphicsContextPlatformPrivate(QPainter* painter);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list