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

Unified Diff: Source/WebCore/rendering/RenderLayerFilterInfo.h

Issue 13839016: Remove CSS_SHADERS compile-time flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@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/rendering/RenderLayerFilterInfo.h
diff --git a/Source/WebCore/rendering/RenderLayerFilterInfo.h b/Source/WebCore/rendering/RenderLayerFilterInfo.h
index 15b57ae5e766e201be6910bcbd963f3e9ecee972..9ed540351992b12b480e7c9862ee34c2916459db 100644
--- a/Source/WebCore/rendering/RenderLayerFilterInfo.h
+++ b/Source/WebCore/rendering/RenderLayerFilterInfo.h
@@ -38,9 +38,7 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
-#if ENABLE(CSS_SHADERS)
#include "CustomFilterProgramClient.h"
-#endif
#if ENABLE(SVG)
#include "CachedSVGDocument.h"
@@ -57,14 +55,10 @@ class RenderLayerFilterInfo;
typedef HashMap<const RenderLayer*, RenderLayerFilterInfo*> RenderLayerFilterInfoMap;
class RenderLayerFilterInfo
-#if ENABLE(CSS_SHADERS)
: public CustomFilterProgramClient
#if ENABLE(SVG)
, public CachedSVGDocumentClient
#endif
-#elif ENABLE(SVG)
- : public CachedSVGDocumentClient
-#endif
{
public:
static RenderLayerFilterInfo* filterInfoForRenderLayer(const RenderLayer*);
@@ -77,14 +71,12 @@ public:
FilterEffectRenderer* renderer() const { return m_renderer.get(); }
void setRenderer(PassRefPtr<FilterEffectRenderer>);
-
-#if ENABLE(CSS_SHADERS)
+
// Implementation of the CustomFilterProgramClient interface.
virtual void notifyCustomFilterProgramLoaded(CustomFilterProgram*);
void updateCustomFilterClients(const FilterOperations&);
void removeCustomFilterClients();
-#endif
#if ENABLE(SVG)
void updateReferenceFilterClients(const FilterOperations&);
@@ -100,11 +92,9 @@ private:
RefPtr<FilterEffectRenderer> m_renderer;
LayoutRect m_dirtySourceRect;
-
-#if ENABLE(CSS_SHADERS)
+
typedef Vector<RefPtr<CustomFilterProgram> > CustomFilterProgramList;
CustomFilterProgramList m_cachedCustomFilterPrograms;
-#endif
static RenderLayerFilterInfoMap* s_filterMap;
#if ENABLE(SVG)

Powered by Google App Engine
This is Rietveld 408576698