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

Unified Diff: cc/layer_impl.cc

Issue 11418117: cc: Increment the ref count when assigning the SkImageFilter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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.cc
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc
index 0b341fa8e66829f0f838bae61ebc594f848cd0e1..b2986a8ee08a25e3eb8aa5d3bf96bbeb698c6ab0 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"
@@ -70,7 +69,6 @@ LayerImpl::~LayerImpl()
#ifndef NDEBUG
DCHECK(!m_betweenWillDrawAndDidDraw);
#endif
- SkSafeUnref(m_filter);
}
void LayerImpl::addChild(scoped_ptr<LayerImpl> child)
@@ -534,13 +532,13 @@ void LayerImpl::setBackgroundFilters(const WebKit::WebFilterOperations& backgrou
m_layerPropertyChanged = true;
}
-void LayerImpl::setFilter(SkImageFilter* filter)
+void LayerImpl::setFilter(const SkRefPtr<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();
}

Powered by Google App Engine
This is Rietveld 408576698