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

Unified Diff: cc/layers/layer.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/delegated_renderer_layer_impl_unittest.cc ('k') | cc/layers/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer.h
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 91972b35204d701e4278fdf1a0fa0e1d8ff0319e..f4224b95bb467f44aba23cf4f5ec4db10b84b582 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -21,9 +21,9 @@
#include "cc/layers/layer_position_constraint.h"
#include "cc/layers/paint_properties.h"
#include "cc/layers/render_surface.h"
+#include "cc/output/filter_operations.h"
#include "cc/trees/occlusion_tracker.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 "ui/gfx/rect.h"
@@ -118,8 +118,8 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
bool OpacityIsAnimating() const;
virtual bool OpacityCanAnimateOnImplThread() 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 SetFilter(const skia::RefPtr<SkImageFilter>& filter);
skia::RefPtr<SkImageFilter> filter() const { return filter_; }
@@ -127,8 +127,8 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
// Background filters are filters applied to what is behind this layer, when
// they are viewed through non-opaque regions in this layer. They are used
// through the WebLayer interface, and are not exposed to HTML.
- 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_;
}
@@ -459,8 +459,8 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
CompositingReasons compositing_reasons_;
float opacity_;
skia::RefPtr<SkImageFilter> filter_;
- WebKit::WebFilterOperations filters_;
- WebKit::WebFilterOperations background_filters_;
+ FilterOperations filters_;
+ FilterOperations background_filters_;
float anchor_point_z_;
bool is_container_for_fixed_position_layers_;
LayerPositionConstraint position_constraint_;
« no previous file with comments | « cc/layers/delegated_renderer_layer_impl_unittest.cc ('k') | cc/layers/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698