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

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

Issue 6907011: Merge 85406 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/
Patch Set: Created 9 years, 8 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/WebCore/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/WebCore/rendering/svg/RenderSVGResourceFilter.cpp
===================================================================
--- Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp (revision 85543)
+++ Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp (working copy)
@@ -84,8 +84,12 @@
{
ASSERT(client);
- if (m_filter.contains(client))
- delete m_filter.take(client);
+ if (FilterData* filterData = m_filter.get(client)) {
+ if (filterData->savedContext)
+ filterData->markedForRemoval = true;
+ else
+ delete m_filter.take(client);
+ }
markClientForInvalidation(client, markForInvalidation ? BoundariesInvalidation : ParentOnlyInvalidation);
}
@@ -266,10 +270,15 @@
UNUSED_PARAM(resourceMode);
#endif
- if (!m_filter.contains(object))
+ FilterData* filterData = m_filter.get(object);
+ if (!filterData)
return;
- FilterData* filterData = m_filter.get(object);
+ if (filterData->markedForRemoval) {
+ delete m_filter.take(object);
+ return;
+ }
+
if (!filterData->builded) {
if (!filterData->savedContext) {
removeClientFromCache(object);
« no previous file with comments | « Source/WebCore/rendering/svg/RenderSVGResourceFilter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698