Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1699)

Unified Diff: Source/core/rendering/svg/RenderSVGResourceFilter.cpp

Issue 620483002: Drop FilterDataState::Applying (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/svg/RenderSVGResourceFilter.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/svg/RenderSVGResourceFilter.cpp
diff --git a/Source/core/rendering/svg/RenderSVGResourceFilter.cpp b/Source/core/rendering/svg/RenderSVGResourceFilter.cpp
index 3906e7e013f600795032c4b0363de8bbc2385eef..543d750411a3a6ef3c118550eea7492d385c566e 100644
--- a/Source/core/rendering/svg/RenderSVGResourceFilter.cpp
+++ b/Source/core/rendering/svg/RenderSVGResourceFilter.cpp
@@ -193,9 +193,9 @@ bool RenderSVGResourceFilter::applyResource(RenderObject* object, RenderStyle*,
if (m_filter.contains(object)) {
FilterData* filterData = m_filter.get(object);
- if (filterData->state == FilterData::PaintingSource || filterData->state == FilterData::Applying)
+ if (filterData->state == FilterData::PaintingSource)
filterData->state = FilterData::CycleDetected;
- return false; // Already built, or we're in a cycle, or we're marked for removal. Regardless, just do nothing more now.
+ return false; // Already built, or we're in a cycle. Regardless, just do nothing more now.
}
OwnPtr<FilterData> filterData(adoptPtr(new FilterData));
@@ -242,11 +242,10 @@ void RenderSVGResourceFilter::postApplyResource(RenderObject* object, GraphicsCo
switch (filterData->state) {
case FilterData::CycleDetected:
- case FilterData::Applying:
- // We have a cycle if we are already applying the data.
- // This can occur due to FeImage referencing a source that makes use of the FEImage itself.
- // This is the first place we've hit the cycle, so set the state back to PaintingSource so the return stack
- // will continue correctly.
+ // applyResource detected a cycle. This can occur due to FeImage
+ // referencing a source that makes use of the FEImage itself. This is
+ // the first place we've hit the cycle, so set the state back to
+ // PaintingSource so the return stack will continue correctly.
filterData->state = FilterData::PaintingSource;
return;
« no previous file with comments | « Source/core/rendering/svg/RenderSVGResourceFilter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698