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

Side by Side Diff: cc/delegated_renderer_layer_impl.cc

Issue 11871008: cc: Stop using drawableContentRect for occlusion. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months 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 | « no previous file | cc/delegated_renderer_layer_impl_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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/delegated_renderer_layer_impl.h" 5 #include "cc/delegated_renderer_layer_impl.h"
6 6
7 #include "cc/append_quads_data.h" 7 #include "cc/append_quads_data.h"
8 #include "cc/math_util.h" 8 #include "cc/math_util.h"
9 #include "cc/quad_sink.h" 9 #include "cc/quad_sink.h"
10 #include "cc/render_pass_draw_quad.h" 10 #include "cc/render_pass_draw_quad.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 // Don't allow areas inside the bounds that are empty. 152 // Don't allow areas inside the bounds that are empty.
153 DCHECK(m_displaySize.IsEmpty() || gfx::Rect(m_displaySize).Contain s(gfx::Rect(bounds()))); 153 DCHECK(m_displaySize.IsEmpty() || gfx::Rect(m_displaySize).Contain s(gfx::Rect(bounds())));
154 gfx::Size displaySize = m_displaySize.IsEmpty() ? bounds() : m_dis playSize; 154 gfx::Size displaySize = m_displaySize.IsEmpty() ? bounds() : m_dis playSize;
155 155
156 gfx::Transform delegatedFrameToLayerSpaceTransform; 156 gfx::Transform delegatedFrameToLayerSpaceTransform;
157 delegatedFrameToLayerSpaceTransform.Scale( 157 delegatedFrameToLayerSpaceTransform.Scale(
158 static_cast<double>(displaySize.width()) / frameSize.width(), 158 static_cast<double>(displaySize.width()) / frameSize.width(),
159 static_cast<double>(displaySize.height()) / frameSize.height() ); 159 static_cast<double>(displaySize.height()) / frameSize.height() );
160 160
161 copiedSharedQuadState->content_to_target_transform = drawTransform () * delegatedFrameToLayerSpaceTransform * copiedSharedQuadState->content_to_tar get_transform; 161 copiedSharedQuadState->content_to_target_transform = drawTransform () * delegatedFrameToLayerSpaceTransform * copiedSharedQuadState->content_to_tar get_transform;
162 copiedSharedQuadState->clipped_rect_in_target = MathUtil::mapClipp edRect(drawTransform() * delegatedFrameToLayerSpaceTransform, copiedSharedQuadSt ate->clipped_rect_in_target);
163 copiedSharedQuadState->clip_rect = MathUtil::mapClippedRect(drawTr ansform() * delegatedFrameToLayerSpaceTransform, copiedSharedQuadState->clip_rec t); 162 copiedSharedQuadState->clip_rect = MathUtil::mapClippedRect(drawTr ansform() * delegatedFrameToLayerSpaceTransform, copiedSharedQuadState->clip_rec t);
164 copiedSharedQuadState->opacity *= drawOpacity(); 163 copiedSharedQuadState->opacity *= drawOpacity();
165 } 164 }
166 } 165 }
167 DCHECK(copiedSharedQuadState); 166 DCHECK(copiedSharedQuadState);
168 167
169 scoped_ptr<DrawQuad> copyQuad; 168 scoped_ptr<DrawQuad> copyQuad;
170 if (quad->material != DrawQuad::RENDER_PASS) 169 if (quad->material != DrawQuad::RENDER_PASS)
171 copyQuad = quad->Copy(copiedSharedQuadState); 170 copyQuad = quad->Copy(copiedSharedQuadState);
172 else { 171 else {
173 RenderPass::Id contributingDelegatedRenderPassId = RenderPassDrawQua d::MaterialCast(quad)->render_pass_id; 172 RenderPass::Id contributingDelegatedRenderPassId = RenderPassDrawQua d::MaterialCast(quad)->render_pass_id;
174 RenderPass::Id contributingRenderPassId = convertDelegatedRenderPass Id(contributingDelegatedRenderPassId); 173 RenderPass::Id contributingRenderPassId = convertDelegatedRenderPass Id(contributingDelegatedRenderPassId);
175 DCHECK(contributingRenderPassId != appendQuadsData.renderPassId); 174 DCHECK(contributingRenderPassId != appendQuadsData.renderPassId);
176 175
177 copyQuad = RenderPassDrawQuad::MaterialCast(quad)->Copy(copiedShared QuadState, contributingRenderPassId).PassAs<DrawQuad>(); 176 copyQuad = RenderPassDrawQuad::MaterialCast(quad)->Copy(copiedShared QuadState, contributingRenderPassId).PassAs<DrawQuad>();
178 } 177 }
179 DCHECK(copyQuad.get()); 178 DCHECK(copyQuad.get());
180 179
181 quadSink.append(copyQuad.Pass(), appendQuadsData); 180 quadSink.append(copyQuad.Pass(), appendQuadsData);
182 } 181 }
183 } 182 }
184 183
185 const char* DelegatedRendererLayerImpl::layerTypeAsString() const 184 const char* DelegatedRendererLayerImpl::layerTypeAsString() const
186 { 185 {
187 return "DelegatedRendererLayer"; 186 return "DelegatedRendererLayer";
188 } 187 }
189 188
190 } // namespace cc 189 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/delegated_renderer_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698