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

zherczeg at webkit.org zherczeg at webkit.org
Wed Dec 22 18:30:36 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 0473a7451385f07de5ffb4ac0b7af410d9eaed88
Author: zherczeg at webkit.org <zherczeg at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 13:13:22 2010 +0000

    Unreviewed build fix for r73894.
    
    SVGFEImage should also check its hasResult() in its apply().
    
    * svg/graphics/filters/SVGFEImage.cpp:
    (WebCore::FEImage::apply):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6bed479..4623e4e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-13  Zoltan Herczeg  <zherczeg at webkit.org>
+
+        Unreviewed build fix for r73894.
+
+        SVGFEImage should also check its hasResult() in its apply().
+
+        * svg/graphics/filters/SVGFEImage.cpp:
+        (WebCore::FEImage::apply):
+
 2010-12-13  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/svg/graphics/filters/SVGFEImage.cpp b/WebCore/svg/graphics/filters/SVGFEImage.cpp
index b5ae466..6ed305e 100644
--- a/WebCore/svg/graphics/filters/SVGFEImage.cpp
+++ b/WebCore/svg/graphics/filters/SVGFEImage.cpp
@@ -56,7 +56,7 @@ void FEImage::determineAbsolutePaintRect()
 
 void FEImage::apply()
 {
-    if (!m_image.get())
+    if (!m_image.get() || hasResult())
         return;
 
     ImageBuffer* resultImage = createImageBufferResult();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list