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

Side by Side Diff: cc/render_surface_impl.cc

Issue 11416088: cc: Turn SharedQuadState into a struct-like class similar to DrawQuads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix debug build 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
« no previous file with comments | « cc/render_pass_unittest.cc ('k') | cc/render_surface_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 pass->setBackgroundFilters(m_owningLayer->backgroundFilters()); 191 pass->setBackgroundFilters(m_owningLayer->backgroundFilters());
192 passSink.appendRenderPass(pass.Pass()); 192 passSink.appendRenderPass(pass.Pass());
193 } 193 }
194 194
195 void RenderSurfaceImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQ uadsData, bool forReplica, RenderPass::Id renderPassId) 195 void RenderSurfaceImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQ uadsData, bool forReplica, RenderPass::Id renderPassId)
196 { 196 {
197 DCHECK(!forReplica || m_owningLayer->hasReplica()); 197 DCHECK(!forReplica || m_owningLayer->hasReplica());
198 198
199 gfx::Rect clippedRectInTarget = computeClippedRectInTarget(m_owningLayer); 199 gfx::Rect clippedRectInTarget = computeClippedRectInTarget(m_owningLayer);
200 const WebTransformationMatrix& drawTransform = forReplica ? m_replicaDrawTra nsform : m_drawTransform; 200 const WebTransformationMatrix& drawTransform = forReplica ? m_replicaDrawTra nsform : m_drawTransform;
201 SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(SharedQuadSta te::create(drawTransform, m_contentRect, clippedRectInTarget, m_drawOpacity).Pas s()); 201 SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(SharedQuadSta te::Create());
202 sharedQuadState->SetAll(drawTransform, m_contentRect, clippedRectInTarget, m _drawOpacity);
202 203
203 if (m_owningLayer->showDebugBorders()) { 204 if (m_owningLayer->showDebugBorders()) {
204 SkColor color = forReplica ? DebugColors::SurfaceReplicaBorderColor() : DebugColors::SurfaceBorderColor(); 205 SkColor color = forReplica ? DebugColors::SurfaceReplicaBorderColor() : DebugColors::SurfaceBorderColor();
205 float width = forReplica ? DebugColors::SurfaceReplicaBorderWidth(m_owni ngLayer->layerTreeHostImpl()) : DebugColors::SurfaceBorderWidth(m_owningLayer->l ayerTreeHostImpl()); 206 float width = forReplica ? DebugColors::SurfaceReplicaBorderWidth(m_owni ngLayer->layerTreeHostImpl()) : DebugColors::SurfaceBorderWidth(m_owningLayer->l ayerTreeHostImpl());
206 scoped_ptr<DebugBorderDrawQuad> debugBorderQuad = DebugBorderDrawQuad::C reate(); 207 scoped_ptr<DebugBorderDrawQuad> debugBorderQuad = DebugBorderDrawQuad::C reate();
207 debugBorderQuad->SetNew(sharedQuadState, contentRect(), color, width); 208 debugBorderQuad->SetNew(sharedQuadState, contentRect(), color, width);
208 quadSink.append(debugBorderQuad.PassAs<DrawQuad>(), appendQuadsData); 209 quadSink.append(debugBorderQuad.PassAs<DrawQuad>(), appendQuadsData);
209 } 210 }
210 211
211 // FIXME: By using the same RenderSurfaceImpl for both the content and its r eflection, 212 // FIXME: By using the same RenderSurfaceImpl for both the content and its r eflection,
(...skipping 26 matching lines...) Expand all
238 ResourceProvider::ResourceId maskResourceId = maskLayer ? maskLayer->content sResourceId() : 0; 239 ResourceProvider::ResourceId maskResourceId = maskLayer ? maskLayer->content sResourceId() : 0;
239 gfx::Rect contentsChangedSinceLastFrame = contentsChanged() ? m_contentRect : gfx::Rect(); 240 gfx::Rect contentsChangedSinceLastFrame = contentsChanged() ? m_contentRect : gfx::Rect();
240 241
241 scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create(); 242 scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create();
242 quad->SetNew(sharedQuadState, contentRect(), renderPassId, forReplica, maskR esourceId, contentsChangedSinceLastFrame, 243 quad->SetNew(sharedQuadState, contentRect(), renderPassId, forReplica, maskR esourceId, contentsChangedSinceLastFrame,
243 maskTexCoordScaleX, maskTexCoordScaleY, maskTexCoordOffsetX, ma skTexCoordOffsetY); 244 maskTexCoordScaleX, maskTexCoordScaleY, maskTexCoordOffsetX, ma skTexCoordOffsetY);
244 quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData); 245 quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData);
245 } 246 }
246 247
247 } // namespace cc 248 } // namespace cc
OLDNEW
« no previous file with comments | « cc/render_pass_unittest.cc ('k') | cc/render_surface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698