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

Unified Diff: Source/WebCore/platform/graphics/filters/FilterOperation.h

Issue 13853009: Reverting base class for CachedSVGDocumentReference to avoid platform layering violations Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Created 7 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
Index: Source/WebCore/platform/graphics/filters/FilterOperation.h
diff --git a/Source/WebCore/platform/graphics/filters/FilterOperation.h b/Source/WebCore/platform/graphics/filters/FilterOperation.h
index 28a607a16ac656ad238361c8e8aae7d4981f0b00..e4292995d9157cf5e48d62504f3101eef82da053 100644
--- a/Source/WebCore/platform/graphics/filters/FilterOperation.h
+++ b/Source/WebCore/platform/graphics/filters/FilterOperation.h
@@ -37,10 +37,6 @@
#include <wtf/RefCounted.h>
#include <wtf/text/WTFString.h>
-#if ENABLE(SVG)
-#include "CachedSVGDocumentReference.h"
-#endif
-
// Annoyingly, wingdi.h #defines this.
#ifdef PASSTHROUGH
#undef PASSTHROUGH
@@ -157,16 +153,19 @@ public:
return adoptRef(new ReferenceFilterOperation(url, fragment, type));
}
+ class Data {
+ public:
+ virtual ~Data() { }
+ };
+
virtual bool affectsOpacity() const { return true; }
virtual bool movesPixels() const { return true; }
const String& url() const { return m_url; }
const String& fragment() const { return m_fragment; }
-#if ENABLE(SVG)
- CachedSVGDocumentReference* cachedSVGDocumentReference() const { return m_cachedSVGDocumentReference.get(); }
- void setCachedSVGDocumentReference(PassOwnPtr<CachedSVGDocumentReference> cachedSVGDocumentReference) { m_cachedSVGDocumentReference = cachedSVGDocumentReference; }
-#endif
+ Data* data() const { return m_data.get(); }
+ void setData(PassOwnPtr<Data> data) { m_data = data; }
FilterEffect* filterEffect() const { return m_filterEffect.get(); }
void setFilterEffect(PassRefPtr<FilterEffect> filterEffect) { m_filterEffect = filterEffect; }
@@ -190,9 +189,7 @@ private:
String m_url;
String m_fragment;
-#if ENABLE(SVG)
- OwnPtr<CachedSVGDocumentReference> m_cachedSVGDocumentReference;
-#endif
+ OwnPtr<Data> m_data;
RefPtr<FilterEffect> m_filterEffect;
};
« no previous file with comments | « Source/WebCore/loader/cache/CachedSVGDocumentReference.h ('k') | Source/WebCore/rendering/FilterEffectRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698