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

Side by Side Diff: cc/render_surface_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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/render_surface_impl.h" 5 #include "cc/render_surface_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 DCHECK(layerId > 0); 178 DCHECK(layerId > 0);
179 return RenderPass::Id(layerId, subId); 179 return RenderPass::Id(layerId, subId);
180 } 180 }
181 181
182 void RenderSurfaceImpl::appendRenderPasses(RenderPassSink& passSink) 182 void RenderSurfaceImpl::appendRenderPasses(RenderPassSink& passSink)
183 { 183 {
184 for (size_t i = 0; i < m_contributingDelegatedRenderPassLayerList.size(); ++ i) 184 for (size_t i = 0; i < m_contributingDelegatedRenderPassLayerList.size(); ++ i)
185 m_contributingDelegatedRenderPassLayerList[i]->appendContributingRenderP asses(passSink); 185 m_contributingDelegatedRenderPassLayerList[i]->appendContributingRenderP asses(passSink);
186 186
187 scoped_ptr<RenderPass> pass = RenderPass::Create(); 187 scoped_ptr<RenderPass> pass = RenderPass::Create();
188 pass->SetNew(renderPassId(), m_contentRect, m_damageTracker->currentDamageRe ct(), m_screenSpaceTransform); 188 pass->SetNew(renderPassId(), m_contentRect, m_damageTracker->currentDamageRe ct(), m_screenSpaceTransform, m_owningLayer->filter());
189 pass->filters = m_owningLayer->filters(); 189 pass->filters = m_owningLayer->filters();
190 pass->filter = m_owningLayer->filter();
191 pass->background_filters = m_owningLayer->backgroundFilters(); 190 pass->background_filters = m_owningLayer->backgroundFilters();
192 passSink.appendRenderPass(pass.Pass()); 191 passSink.appendRenderPass(pass.Pass());
193 } 192 }
194 193
195 void RenderSurfaceImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQ uadsData, bool forReplica, RenderPass::Id renderPassId) 194 void RenderSurfaceImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQ uadsData, bool forReplica, RenderPass::Id renderPassId)
196 { 195 {
197 DCHECK(!forReplica || m_owningLayer->hasReplica()); 196 DCHECK(!forReplica || m_owningLayer->hasReplica());
198 197
199 gfx::Rect clippedRectInTarget = computeClippedRectInTarget(m_owningLayer); 198 gfx::Rect clippedRectInTarget = computeClippedRectInTarget(m_owningLayer);
200 const WebTransformationMatrix& drawTransform = forReplica ? m_replicaDrawTra nsform : m_drawTransform; 199 const WebTransformationMatrix& drawTransform = forReplica ? m_replicaDrawTra nsform : m_drawTransform;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 ResourceProvider::ResourceId maskResourceId = maskLayer ? maskLayer->content sResourceId() : 0; 238 ResourceProvider::ResourceId maskResourceId = maskLayer ? maskLayer->content sResourceId() : 0;
240 gfx::Rect contentsChangedSinceLastFrame = contentsChanged() ? m_contentRect : gfx::Rect(); 239 gfx::Rect contentsChangedSinceLastFrame = contentsChanged() ? m_contentRect : gfx::Rect();
241 240
242 scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create(); 241 scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create();
243 quad->SetNew(sharedQuadState, contentRect(), renderPassId, forReplica, maskR esourceId, contentsChangedSinceLastFrame, 242 quad->SetNew(sharedQuadState, contentRect(), renderPassId, forReplica, maskR esourceId, contentsChangedSinceLastFrame,
244 maskTexCoordScaleX, maskTexCoordScaleY, maskTexCoordOffsetX, ma skTexCoordOffsetY); 243 maskTexCoordScaleX, maskTexCoordScaleY, maskTexCoordOffsetX, ma skTexCoordOffsetY);
245 quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData); 244 quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData);
246 } 245 }
247 246
248 } // namespace cc 247 } // namespace cc
OLDNEW
« cc/render_pass.cc ('K') | « cc/render_pass.cc ('k') | cc/software_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698