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

Unified Diff: cc/layer.h

Issue 11418217: Add skia::RefPtr class to wrap ref counted classes from Skia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit Created 8 years, 1 month 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/gl_renderer.cc ('k') | cc/layer.cc » ('j') | cc/skia_refptr.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « cc/gl_renderer.cc ('k') | cc/layer.cc » ('j') | cc/skia_refptr.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698