Implement SkImageFilter support in the compositor.

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 "config.h"
 
 #include "cc/layer.h"
 
 #include "CCActiveAnimation.h"
 #include "CCAnimationEvents.h"
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHost.h"
 #include "cc/settings.h"
+#include "SkImageFilter.h"
 #include <public/WebAnimationDelegate.h>
 #include <public/WebLayerScrollClient.h>
 #include <public/WebSize.h>
 
 using namespace std;
 using WebKit::WebTransformationMatrix;
 
 namespace cc {
 
 static int s_nextLayerId = 1;
@@ skipping 12 matching lines @@
     , m_layerAnimationController(CCLayerAnimationController::create(this))
     , m_scrollable(false)
     , m_shouldScrollOnMainThread(false)
     , m_haveWheelEventHandlers(false)
     , m_nonFastScrollableRegionChanged(false)
     , m_anchorPoint(0.5, 0.5)
     , m_backgroundColor(0)
     , m_debugBorderColor(0)
     , m_debugBorderWidth(0)
     , m_opacity(1.0)
+    , m_filter(0)
     , m_anchorPointZ(0)
     , m_isContainerForFixedPositionLayers(false)
     , m_fixedToContainerLayer(false)
     , m_isDrawable(false)
     , m_masksToBounds(false)
     , m_contentsOpaque(false)
     , m_doubleSided(true)
     , m_useLCDText(false)
     , m_preserves3D(false)
     , m_useParentBackfaceVisibility(false)
@@ skipping 17 matching lines @@
 }
 
 LayerChromium::~LayerChromium()
 {
     // 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 LayerChromium::setUseLCDText(bool useLCDText)
 {
     m_useLCDText = useLCDText;
 }
 
 void LayerChromium::setLayerTreeHost(CCLayerTreeHost* host)
 {
     if (m_layerTreeHost == host)
@@ skipping 222 matching lines @@
 void LayerChromium::setFilters(const WebKit::WebFilterOperations& filters)
 {
     if (m_filters == filters)
         return;
     m_filters = filters;
     setNeedsCommit();
     if (!filters.isEmpty())
         CCLayerTreeHost::setNeedsFilterContext(true);
 }
 
+void LayerChromium::setFilter(SkImageFilter* filter)
+{
+    if (m_filter == filter)
+        return;
+    SkRefCnt_SafeAssign(m_filter, filter);
+    setNeedsCommit();
+    if (filter)
+        CCLayerTreeHost::setNeedsFilterContext(true);
+}
+
 void LayerChromium::setBackgroundFilters(const WebKit::WebFilterOperations& backgroundFilters)
 {
     if (m_backgroundFilters == backgroundFilters)
         return;
     m_backgroundFilters = backgroundFilters;
     setNeedsCommit();
     if (!backgroundFilters.isEmpty())
         CCLayerTreeHost::setNeedsFilterContext(true);
 }
 
@@ skipping 201 matching lines @@
     layer->setBounds(m_bounds);
     layer->setContentBounds(contentBounds());
     layer->setDebugBorderColor(m_debugBorderColor);
     layer->setDebugBorderWidth(m_debugBorderWidth);
     layer->setDebugName(m_debugName);
     layer->setDoubleSided(m_doubleSided);
     layer->setDrawCheckerboardForMissingTiles(m_drawCheckerboardForMissingTiles);
     layer->setForceRenderSurface(m_forceRenderSurface);
     layer->setDrawsContent(drawsContent());
     layer->setFilters(filters());
+    layer->setFilter(filter());
     layer->setBackgroundFilters(backgroundFilters());
     layer->setUseLCDText(m_useLCDText);
     layer->setMasksToBounds(m_masksToBounds);
     layer->setScrollable(m_scrollable);
     layer->setShouldScrollOnMainThread(m_shouldScrollOnMainThread);
     layer->setHaveWheelEventHandlers(m_haveWheelEventHandlers);
     // Copying a Region is more expensive than most layer properties, since it involves copying two Vectors that may be
     // arbitrarily large depending on page content, so we only push the property if it's changed.
     if (m_nonFastScrollableRegionChanged) {
         layer->setNonFastScrollableRegion(m_nonFastScrollableRegion);
@@ skipping 231 matching lines @@
 {
     return 0;
 }
 
 void sortLayers(std::vector<scoped_refptr<LayerChromium> >::iterator, std::vector<scoped_refptr<LayerChromium> >::iterator, void*)
 {
     // Currently we don't use z-order to decide what to paint, so there's no need to actually sort LayerChromiums.
 }
 
 }