cc: Increment the ref count when assigning the SkImageFilter

cc/layer.cc

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layer.h"
 
 #include "cc/active_animation.h"
 #include "cc/animation_events.h"
 #include "cc/layer_animation_controller.h"
 #include "cc/layer_impl.h"
@@ skipping 63 matching lines @@
 }
 
 Layer::~Layer()
 {
     // Our parent should be holding a reference to us so there should be no
     // way for us to be destroyed while we still have a parent.
     DCHECK(!parent());
 
     // Remove the parent reference from all children.
     removeAllChildren();
-
-    SkSafeUnref(m_filter);
 }
 
 void Layer::setUseLCDText(bool useLCDText)
 {
     m_useLCDText = useLCDText;
 }
 
 void Layer::setLayerTreeHost(LayerTreeHost* host)
 {
     if (m_layerTreeHost == host)
@@ skipping 225 matching lines @@
 {
     if (m_filters == filters)
         return;
     DCHECK(!m_filter);
     m_filters = filters;
     setNeedsCommit();
     if (!filters.isEmpty())
         LayerTreeHost::setNeedsFilterContext(true);
 }
 
-void Layer::setFilter(SkImageFilter* filter)
+void Layer::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;
     setNeedsCommit();
     if (filter)
         LayerTreeHost::setNeedsFilterContext(true);
 }
 
 void Layer::setBackgroundFilters(const WebKit::WebFilterOperations& backgroundFilters)
 {
     if (m_backgroundFilters == backgroundFilters)
         return;
     m_backgroundFilters = backgroundFilters;
@@ skipping 487 matching lines @@
 {
     return 0;
 }
 
 void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped_refptr<Layer> >::iterator, void*)
 {
     // Currently we don't use z-order to decide what to paint, so there's no need to actually sort Layers.
 }
 
 }  // namespace cc