diff options
author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 05:08:15 +0000 |
---|---|---|
committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 05:08:15 +0000 |
commit | 1940c4ee397232a4948b0328e728024ea19e3f5f (patch) | |
tree | 34571d6bff7ecc3904b54bfc3df97c906437b7f1 /cc/layer.h | |
parent | 45413146bcedc4087f4a8862384dd1508411848d (diff) | |
download | chromium_src-1940c4ee397232a4948b0328e728024ea19e3f5f.zip chromium_src-1940c4ee397232a4948b0328e728024ea19e3f5f.tar.gz chromium_src-1940c4ee397232a4948b0328e728024ea19e3f5f.tar.bz2 |
cc: Use skia::RefPtr in place of raw pointers and SkAutoTUnref.
Safe reference counting for skia objects ahoy!
R=jamesr
BUG=163454
Depends on: https://codereview.chromium.org/11418217/
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11412255
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer.h')
-rw-r--r-- | cc/layer.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -15,7 +15,9 @@ #include "cc/occlusion_tracker.h" #include "cc/region.h" #include "cc/render_surface.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" @@ -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 skia::RefPtr<SkImageFilter>& filter); + skia::RefPtr<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. @@ -374,7 +374,7 @@ private: SkColor m_backgroundColor; std::string m_debugName; float m_opacity; - SkImageFilter* m_filter; + skia::RefPtr<SkImageFilter> m_filter; WebKit::WebFilterOperations m_filters; WebKit::WebFilterOperations m_backgroundFilters; float m_anchorPointZ; |