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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit aa160e0e6890fcd8dc6cc9a2f9297637f232b50b
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 2 16:17:56 2010 +0000

    2010-08-02  Kristian Monsen  <kristianm at google.com>
    
            Reviewed by Steve Block.
    
            Compile fix for Android, adding guards around filter specific code.
            https://bugs.webkit.org/show_bug.cgi?id=43338
            This CL introduced the code:
            http://trac.webkit.org/changeset/64196
    
            Compile fix only, no new tests.
    
            * rendering/SVGResourcesCycleSolver.cpp:
            (WebCore::SVGResourcesCycleSolver::breakCycle):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64465 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0958314..59ffde3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Steve Block.
 
+        Compile fix for Android, adding guards around filter specific code.
+        https://bugs.webkit.org/show_bug.cgi?id=43338
+        This CL introduced the code:
+        http://trac.webkit.org/changeset/64196
+
+        Compile fix only, no new tests.
+
+        * rendering/SVGResourcesCycleSolver.cpp:
+        (WebCore::SVGResourcesCycleSolver::breakCycle):
+
+2010-08-02  Kristian Monsen  <kristianm at google.com>
+
+        Reviewed by Steve Block.
+
         Compile fix for Android, guard inspector code with ENABLE(INSPECTOR).
         https://bugs.webkit.org/show_bug.cgi?id=43345
         Code introduced in this CL:
diff --git a/WebCore/rendering/SVGResourcesCycleSolver.cpp b/WebCore/rendering/SVGResourcesCycleSolver.cpp
index 3cd6d8d..8cd2e80 100644
--- a/WebCore/rendering/SVGResourcesCycleSolver.cpp
+++ b/WebCore/rendering/SVGResourcesCycleSolver.cpp
@@ -193,8 +193,10 @@ void SVGResourcesCycleSolver::breakCycle(RenderSVGResourceContainer* resourceLea
             m_resources->resetStroke();
         break;
     case FilterResourceType:
+#if ENABLE(FILTERS)
         ASSERT(resourceLeadingToCycle == m_resources->filter());
         m_resources->resetFilter();
+#endif
         break;
     case ClipperResourceType:
         ASSERT(resourceLeadingToCycle == m_resources->clipper());

-- 
WebKit Debian packaging