| Index: cc/layer.h
|
| diff --git a/cc/layer.h b/cc/layer.h
|
| index 67f3932912f5e45698b13391f9628454452a33fd..be7cf762d53813b49eec3a0d82be927abc38ec4e 100644
|
| --- a/cc/layer.h
|
| +++ b/cc/layer.h
|
| @@ -15,7 +15,9 @@
|
| #include "cc/occlusion_tracker.h"
|
| #include "cc/region.h"
|
| #include "cc/render_surface.h"
|
| +#include "cc/skia_refptr.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| +#include "third_party/skia/include/core/SkImageFilter.h"
|
| #include "ui/gfx/rect.h"
|
| #include "ui/gfx/rect_f.h"
|
| #include "ui/gfx/transform.h"
|
| @@ -25,8 +27,6 @@ class WebAnimationDelegate;
|
| class WebLayerScrollClient;
|
| }
|
|
|
| -class SkImageFilter;
|
| -
|
| namespace cc {
|
|
|
| class ActiveAnimation;
|
| @@ -102,8 +102,8 @@ public:
|
| void setFilters(const WebKit::WebFilterOperations&);
|
| const WebKit::WebFilterOperations& filters() const { return m_filters; }
|
|
|
| - void setFilter(SkImageFilter* filter);
|
| - SkImageFilter* filter() const { return m_filter; }
|
| + void setFilter(const SkiaRefPtr<SkImageFilter>& filter);
|
| + SkiaRefPtr<SkImageFilter> filter() const { return m_filter; }
|
|
|
| // 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.
|
| @@ -371,7 +371,7 @@ private:
|
| SkColor m_backgroundColor;
|
| std::string m_debugName;
|
| float m_opacity;
|
| - SkImageFilter* m_filter;
|
| + SkiaRefPtr<SkImageFilter> m_filter;
|
| WebKit::WebFilterOperations m_filters;
|
| WebKit::WebFilterOperations m_backgroundFilters;
|
| float m_anchorPointZ;
|
|
|