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

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

Issue 1326183002: Merge ReferenceFilter into Filter (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Touchups; Rebase. Created 5 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
Index: Source/platform/graphics/filters/FilterOperation.h
diff --git a/Source/platform/graphics/filters/FilterOperation.h b/Source/platform/graphics/filters/FilterOperation.h
index ab2c16ed3af0e3ae281590a2360a5d9f8352f100..7b835f73c902bda124af9a1d9270d8b032f58ea6 100644
--- a/Source/platform/graphics/filters/FilterOperation.h
+++ b/Source/platform/graphics/filters/FilterOperation.h
@@ -30,7 +30,6 @@
#include "platform/PlatformExport.h"
#include "platform/graphics/Color.h"
#include "platform/graphics/filters/Filter.h"
-#include "platform/graphics/filters/ReferenceFilter.h"
#include "platform/heap/Handle.h"
#include "wtf/OwnPtr.h"
#include "wtf/PassOwnPtr.h"
@@ -124,8 +123,8 @@ public:
const String& url() const { return m_url; }
const AtomicString& fragment() const { return m_fragment; }
- ReferenceFilter* filter() const { return m_filter.get(); }
- void setFilter(PassRefPtrWillBeRawPtr<ReferenceFilter> filter) { m_filter = filter; }
+ Filter* filter() const { return m_filter.get(); }
+ void setFilter(PassRefPtrWillBeRawPtr<Filter> filter) { m_filter = filter; }
DECLARE_VIRTUAL_TRACE();
@@ -153,7 +152,7 @@ private:
String m_url;
AtomicString m_fragment;
- RefPtrWillBeMember<ReferenceFilter> m_filter;
+ RefPtrWillBeMember<Filter> m_filter;
};
DEFINE_FILTER_OPERATION_TYPE_CASTS(ReferenceFilterOperation, REFERENCE);
« no previous file with comments | « Source/platform/graphics/filters/Filter.cpp ('k') | Source/platform/graphics/filters/ImageFilterBuilderTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698