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

andreas.kling at nokia.com andreas.kling at nokia.com
Wed Dec 22 11:10:55 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 95ef75349331ea09888549cf1b1aabdb09d3b44c
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 17:47:26 2010 +0000

    2010-07-14  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Ojan Vafai.
    
            Unbreak fast/canvas/gradient-add-second-start-end-stop.html
    
            Assigning the same CanvasGradient or CanvasPattern to fillStyle
            or strokeStyle may not be a no-op since the object could have been
            modified since it was last set.
    
            Regressed with <http://trac.webkit.org/changeset/63327>
    
            * html/canvas/CanvasStyle.cpp:
            (WebCore::operator==):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63329 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index db13bf8..fa59c01 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,20 @@
 2010-07-14  Andreas Kling  <andreas.kling at nokia.com>
 
+        Reviewed by Ojan Vafai.
+
+        Unbreak fast/canvas/gradient-add-second-start-end-stop.html
+
+        Assigning the same CanvasGradient or CanvasPattern to fillStyle
+        or strokeStyle may not be a no-op since the object could have been
+        modified since it was last set.
+
+        Regressed with <http://trac.webkit.org/changeset/63327>
+
+        * html/canvas/CanvasStyle.cpp:
+        (WebCore::operator==):
+
+2010-07-14  Andreas Kling  <andreas.kling at nokia.com>
+
         Reviewed by Darin Adler.
 
         Canvas: Make assigning the same fillStyle or strokeStyle a fast no-op
diff --git a/WebCore/html/canvas/CanvasStyle.cpp b/WebCore/html/canvas/CanvasStyle.cpp
index a2b56a9..4783a90 100644
--- a/WebCore/html/canvas/CanvasStyle.cpp
+++ b/WebCore/html/canvas/CanvasStyle.cpp
@@ -130,9 +130,9 @@ bool operator==(const CanvasStyle& s1, const CanvasStyle& s2)
     case CanvasStyle::RGBA:
         return s1.m_rgba == s2.m_rgba;
     case CanvasStyle::Gradient:
-        return s1.m_gradient == s2.m_gradient;
+        return false;
     case CanvasStyle::ImagePattern:
-        return s1.m_pattern == s2.m_pattern;
+        return false;
     case CanvasStyle::CMYKA:
         return s1.m_cmyka.c == s2.m_cmyka.c
             && s1.m_cmyka.m == s2.m_cmyka.m

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list