summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-08-05 04:41:49 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-05 04:41:49 -0700
commitc9b19d84176598cb004f587943bf151b4301b69a (patch)
treec23272a731c3a890f9757f624b4c1620abc455a3
parent03d64d185a49d165a316a45cd50ee8429c5c9ebc (diff)
parent90f8c1ab32eff49545f4db89544caff1e577e3d4 (diff)
downloadexternal_webkit-c9b19d84176598cb004f587943bf151b4301b69a.zip
external_webkit-c9b19d84176598cb004f587943bf151b4301b69a.tar.gz
external_webkit-c9b19d84176598cb004f587943bf151b4301b69a.tar.bz2
Merge "Fix incorrect cherry-pick of WebKit change 64465 in merge to WebKit r64264"
-rw-r--r--WebCore/rendering/SVGResourcesCycleSolver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/rendering/SVGResourcesCycleSolver.cpp b/WebCore/rendering/SVGResourcesCycleSolver.cpp
index 206efe5..e150144 100644
--- a/WebCore/rendering/SVGResourcesCycleSolver.cpp
+++ b/WebCore/rendering/SVGResourcesCycleSolver.cpp
@@ -283,8 +283,8 @@ void SVGResourcesCycleSolver::breakCycle(RenderSVGResourceContainer* resourceLea
m_resources->resetStroke();
break;
case FilterResourceType:
- ASSERT(resourceLeadingToCycle == m_resources->filter());
#if ENABLE(FILTERS)
+ ASSERT(resourceLeadingToCycle == m_resources->filter());
m_resources->resetFilter();
#endif
break;