Index: cc/layer_impl.cc |
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc |
index 81bc49f01aafb4a2ea926f0412e3764a5c786d8a..5272e016c8b5b61ee8414de0a04c3731e7fe2955 100644 |
--- a/cc/layer_impl.cc |
+++ b/cc/layer_impl.cc |
@@ -14,7 +14,6 @@ |
#include "cc/proxy.h" |
#include "cc/quad_sink.h" |
#include "cc/scrollbar_animation_controller.h" |
-#include "third_party/skia/include/core/SkImageFilter.h" |
#include "ui/gfx/point_conversions.h" |
#include "ui/gfx/rect_conversions.h" |
@@ -52,7 +51,6 @@ LayerImpl::LayerImpl(int id) |
, m_drawDepth(0) |
, m_drawOpacity(0) |
, m_drawOpacityIsAnimating(false) |
- , m_filter(0) |
, m_drawTransformIsAnimating(false) |
, m_screenSpaceTransformIsAnimating(false) |
, m_isClipped(false) |
@@ -69,7 +67,6 @@ LayerImpl::~LayerImpl() |
#ifndef NDEBUG |
DCHECK(!m_betweenWillDrawAndDidDraw); |
#endif |
- SkSafeUnref(m_filter); |
} |
void LayerImpl::addChild(scoped_ptr<LayerImpl> child) |
@@ -533,13 +530,13 @@ void LayerImpl::setBackgroundFilters(const WebKit::WebFilterOperations& backgrou |
m_layerPropertyChanged = true; |
} |
-void LayerImpl::setFilter(SkImageFilter* filter) |
+void LayerImpl::setFilter(const SkiaRefPtr<SkImageFilter>& filter) |
{ |
- if (m_filter == filter) |
+ if (m_filter.get() == filter.get()) |
return; |
DCHECK(m_filters.isEmpty()); |
- SkRefCnt_SafeAssign(m_filter, filter); |
+ m_filter = filter; |
noteLayerPropertyChangedForSubtree(); |
} |