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

Unified Diff: cc/layer_impl.h

Issue 11412255: cc: Use skia::RefPtr in place of raw pointers and SkAutoTUnref. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add webkit 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
Index: cc/layer_impl.h
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index 6cc4d1230b349846c3fb0495fe19e317372a1aa4..de980265bd0599de5947e0beb8516f057d69d5b8 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -19,7 +19,9 @@
#include "cc/resource_provider.h"
#include "cc/scoped_ptr_vector.h"
#include "cc/shared_quad_state.h"
+#include "skia/ext/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"
@@ -115,8 +117,8 @@ public:
void setBackgroundFilters(const WebKit::WebFilterOperations&);
const WebKit::WebFilterOperations& backgroundFilters() const { return m_backgroundFilters; }
- void setFilter(SkImageFilter*);
- SkImageFilter* filter() const { return m_filter; }
+ void setFilter(const skia::RefPtr<SkImageFilter>&);
+ skia::RefPtr<SkImageFilter> filter() const { return m_filter; }
void setMasksToBounds(bool);
bool masksToBounds() const { return m_masksToBounds; }
@@ -392,7 +394,7 @@ private:
WebKit::WebFilterOperations m_filters;
WebKit::WebFilterOperations m_backgroundFilters;
- SkImageFilter* m_filter;
+ skia::RefPtr<SkImageFilter> m_filter;
gfx::Transform m_drawTransform;
gfx::Transform m_screenSpaceTransform;
« no previous file with comments | « cc/layer.cc ('k') | cc/layer_impl.cc » ('j') | webkit/compositor_bindings/web_layer_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698