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

Unified Diff: Source/core/rendering/FilterEffectRenderer.cpp

Issue 14398007: Remove USE(3D_GRAPHICS) as it is always turned on. (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/core/rendering/FilterEffectRenderer.cpp
diff --git a/Source/core/rendering/FilterEffectRenderer.cpp b/Source/core/rendering/FilterEffectRenderer.cpp
index 169092d83c47af7d95eea7e4f6e41242443254bb..1a818941335465d562ab8474df12d5d81c7e0816 100644
--- a/Source/core/rendering/FilterEffectRenderer.cpp
+++ b/Source/core/rendering/FilterEffectRenderer.cpp
@@ -40,7 +40,6 @@
#include <algorithm>
#include <wtf/MathExtras.h>
-#if USE(3D_GRAPHICS)
#include "core/platform/graphics/filters/custom/CustomFilterGlobalContext.h"
#include "core/platform/graphics/filters/custom/CustomFilterOperation.h"
#include "core/platform/graphics/filters/custom/CustomFilterProgram.h"
@@ -48,7 +47,6 @@
#include "core/platform/graphics/filters/custom/FECustomFilter.h"
#include "core/platform/graphics/filters/custom/ValidatedCustomFilterOperation.h"
#include "core/rendering/RenderView.h"
-#endif
#if ENABLE(SVG)
#include "core/loader/cache/CachedSVGDocument.h"
@@ -83,7 +81,6 @@ inline bool isFilterSizeValid(FloatRect rect)
return true;
}
-#if USE(3D_GRAPHICS)
static PassRefPtr<FECustomFilter> createCustomFilterEffect(Filter* filter, Document* document, ValidatedCustomFilterOperation* operation)
{
if (!document)
@@ -97,7 +94,6 @@ static PassRefPtr<FECustomFilter> createCustomFilterEffect(Filter* filter, Docum
return FECustomFilter::create(filter, globalContext->context(), operation->validatedProgram(), operation->parameters(),
operation->meshRows(), operation->meshColumns(), operation->meshType());
}
-#endif
FilterEffectRenderer::FilterEffectRenderer()
: m_graphicsBufferAttached(false)
@@ -335,7 +331,6 @@ bool FilterEffectRenderer::build(RenderObject* renderer, const FilterOperations&
dropShadowOperation->x(), dropShadowOperation->y(), dropShadowOperation->color(), 1);
break;
}
-#if USE(3D_GRAPHICS)
case FilterOperation::CUSTOM:
// CUSTOM operations are always converted to VALIDATED_CUSTOM before getting here.
// The conversion happens in RenderLayer::computeFilterOperations.
@@ -349,7 +344,6 @@ bool FilterEffectRenderer::build(RenderObject* renderer, const FilterOperations&
m_hasCustomShaderFilter = true;
break;
}
-#endif
default:
break;
}
« no previous file with comments | « Source/core/platform/graphics/filters/custom/FECustomFilter.cpp ('k') | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698