Implement SkImageFilter support in the compositor.

cc/render_pass.cc

 // Copyright 2011 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 "CCRenderPass.h"
 
 #include "CCLayerImpl.h"
 #include "CCMathUtil.h"
 #include "CCOcclusionTracker.h"
 #include "CCQuadCuller.h"
 #include "CCSharedQuadState.h"
 #include "CCSolidColorDrawQuad.h"
+#include "SkImageFilter.h"
 
 using WebKit::WebTransformationMatrix;
 
 namespace cc {
 
 scoped_ptr<CCRenderPass> CCRenderPass::create(Id id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget)
 {
     return make_scoped_ptr(new CCRenderPass(id, outputRect, transformToRootTarget));
 }
 
 CCRenderPass::CCRenderPass(Id id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget)
     : m_id(id)
     , m_transformToRootTarget(transformToRootTarget)
     , m_outputRect(outputRect)
     , m_hasTransparentBackground(true)
     , m_hasOcclusionFromOutsideTargetSurface(false)
+    , m_filter(0)
 {
     DCHECK(id.layerId > 0);
     DCHECK(id.index >= 0);
 }
 
 CCRenderPass::~CCRenderPass()
 {
 }
 
 scoped_ptr<CCRenderPass> CCRenderPass::copy(Id newId) const
 {
     DCHECK(newId != m_id);
 
     scoped_ptr<CCRenderPass> copyPass(create(newId, m_outputRect, m_transformToRootTarget));
     copyPass->setDamageRect(m_damageRect);
     copyPass->setHasTransparentBackground(m_hasTransparentBackground);
     copyPass->setHasOcclusionFromOutsideTargetSurface(m_hasOcclusionFromOutsideTargetSurface);
     copyPass->setFilters(m_filters);
     copyPass->setBackgroundFilters(m_backgroundFilters);
+    copyPass->setFilter(m_filter);
     return copyPass.Pass();
 }
 
 void CCRenderPass::appendQuadsForLayer(CCLayerImpl* layer, CCOcclusionTrackerImpl* occlusionTracker, CCAppendQuadsData& appendQuadsData)
 {
     const bool forSurface = false;
     CCQuadCuller quadCuller(m_quadList, m_sharedQuadStateList, layer, occlusionTracker, layer->hasDebugBorders(), forSurface);
 
     layer->appendQuads(quadCuller, appendQuadsData);
 }
@@ skipping 36 matching lines @@
     WebTransformationMatrix transformToLayerSpace = rootLayer->screenSpaceTransform().inverse();
     Vector<WebCore::IntRect> fillRects = fillRegion.rects();
     for (size_t i = 0; i < fillRects.size(); ++i) {
         // The root layer transform is composed of translations and scales only, no perspective, so mapping is sufficient.
         IntRect layerRect = CCMathUtil::mapClippedRect(transformToLayerSpace, cc::IntRect(fillRects[i]));
         // Skip the quad culler and just append the quads directly to avoid occlusion checks.
         m_quadList.append(CCSolidColorDrawQuad::create(sharedQuadState, layerRect, screenBackgroundColor).PassAs<CCDrawQuad>());
     }
 }
 
+void CCRenderPass::setFilter(SkImageFilter* filter) {
+    SkRefCnt_SafeAssign(m_filter, filter);
+}

[danakj, 2012/10/19 19:34:24]

Same question as james, who frees this one?

[Stephen White, 2012/10/19 21:34:50]

Done.

+
 }  // namespace cc