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

Unified Diff: cc/layers/layer_impl.h

Issue 16968002: Move implementation of WebFilterOperations into cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/layers/layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl.h
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index 6ec1573b0c93f44426925cdfdec34d4f8433b867..d2b44eebb0b9411eb96df49007a5e328db313a12 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -21,11 +21,11 @@
#include "cc/layers/layer_lists.h"
#include "cc/layers/layer_position_constraint.h"
#include "cc/layers/render_surface_impl.h"
+#include "cc/output/filter_operations.h"
#include "cc/quads/render_pass.h"
#include "cc/quads/shared_quad_state.h"
#include "cc/resources/resource_provider.h"
#include "skia/ext/refptr.h"
-#include "third_party/WebKit/public/platform/WebFilterOperations.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkImageFilter.h"
#include "third_party/skia/include/core/SkPicture.h"
@@ -148,11 +148,11 @@ class CC_EXPORT LayerImpl : LayerAnimationValueObserver {
// non-opaque color. Tries to return background_color(), if possible.
SkColor SafeOpaqueBackgroundColor() const;
- void SetFilters(const WebKit::WebFilterOperations& filters);
- const WebKit::WebFilterOperations& filters() const { return filters_; }
+ void SetFilters(const FilterOperations& filters);
+ const FilterOperations& filters() const { return filters_; }
- void SetBackgroundFilters(const WebKit::WebFilterOperations& filters);
- const WebKit::WebFilterOperations& background_filters() const {
+ void SetBackgroundFilters(const FilterOperations& filters);
+ const FilterOperations& background_filters() const {
return background_filters_;
}
@@ -541,8 +541,8 @@ class CC_EXPORT LayerImpl : LayerAnimationValueObserver {
std::string debug_name_;
CompositingReasons compositing_reasons_;
- WebKit::WebFilterOperations filters_;
- WebKit::WebFilterOperations background_filters_;
+ FilterOperations filters_;
+ FilterOperations background_filters_;
skia::RefPtr<SkImageFilter> filter_;
protected:
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/layers/layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698