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

Unified Diff: Source/core/svg/graphics/filters/SVGFilterBuilder.cpp

Issue 678163002: Oilpan: move SVG property hierarchy to the heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased upto r185213 Created 6 years, 1 month 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
Index: Source/core/svg/graphics/filters/SVGFilterBuilder.cpp
diff --git a/Source/core/svg/graphics/filters/SVGFilterBuilder.cpp b/Source/core/svg/graphics/filters/SVGFilterBuilder.cpp
index d0a0f8b9a3e689cc9aa7df5d6b1d99ffe289766a..e5f16d2198c4dbb73aa3da07860bc6fb88362c8d 100644
--- a/Source/core/svg/graphics/filters/SVGFilterBuilder.cpp
+++ b/Source/core/svg/graphics/filters/SVGFilterBuilder.cpp
@@ -25,14 +25,25 @@
namespace blink {
-SVGFilterBuilder::SVGFilterBuilder(PassRefPtr<FilterEffect> sourceGraphic, PassRefPtr<FilterEffect> sourceAlpha)
+SVGFilterBuilder::SVGFilterBuilder(PassRefPtrWillBeRawPtr<FilterEffect> sourceGraphic, PassRefPtrWillBeRawPtr<FilterEffect> sourceAlpha)
{
m_builtinEffects.add(SourceGraphic::effectName(), sourceGraphic);
m_builtinEffects.add(SourceAlpha::effectName(), sourceAlpha);
addBuiltinEffects();
}
-void SVGFilterBuilder::add(const AtomicString& id, PassRefPtr<FilterEffect> effect)
+void SVGFilterBuilder::trace(Visitor* visitor)
+{
+#if ENABLE(OILPAN)
+ visitor->trace(m_builtinEffects);
+ visitor->trace(m_namedEffects);
+ visitor->trace(m_effectRenderer);
+ visitor->trace(m_effectReferences);
+ visitor->trace(m_lastEffect);
+#endif
+}
+
+void SVGFilterBuilder::add(const AtomicString& id, PassRefPtrWillBeRawPtr<FilterEffect> effect)
{
if (id.isEmpty()) {
m_lastEffect = effect;
@@ -62,9 +73,9 @@ FilterEffect* SVGFilterBuilder::getEffectById(const AtomicString& id) const
return m_builtinEffects.get(SourceGraphic::effectName());
}
-void SVGFilterBuilder::appendEffectToEffectReferences(PassRefPtr<FilterEffect> prpEffect, RenderObject* object)
+void SVGFilterBuilder::appendEffectToEffectReferences(PassRefPtrWillBeRawPtr<FilterEffect> prpEffect, RenderObject* object)
{
- RefPtr<FilterEffect> effect = prpEffect;
+ RefPtrWillBeRawPtr<FilterEffect> effect = prpEffect;
// The effect must be a newly created filter effect.
ASSERT(!m_effectReferences.contains(effect));
@@ -95,9 +106,9 @@ void SVGFilterBuilder::clearResultsRecursive(FilterEffect* effect)
effect->clearResult();
- HashSet<FilterEffect*>& effectReferences = this->effectReferences(effect);
- HashSet<FilterEffect*>::iterator end = effectReferences.end();
- for (HashSet<FilterEffect*>::iterator it = effectReferences.begin(); it != end; ++it)
+ FilterEffectSet& effectReferences = this->effectReferences(effect);
+ FilterEffectSet::iterator end = effectReferences.end();
+ for (FilterEffectSet::iterator it = effectReferences.begin(); it != end; ++it)
clearResultsRecursive(*it);
}
« no previous file with comments | « Source/core/svg/graphics/filters/SVGFilterBuilder.h ('k') | Source/core/svg/properties/SVGAnimatedProperty.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698