| OLD | NEW |
| 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 "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "CCDelegatedRendererLayerImpl.h" | 7 #include "CCDelegatedRendererLayerImpl.h" |
| 8 | 8 |
| 9 #include "CCAppendQuadsData.h" | 9 #include "CCAppendQuadsData.h" |
| 10 #include "CCQuadSink.h" | 10 #include "CCQuadSink.h" |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 if (!targetIsFromDelegatedRendererLayer) { | 153 if (!targetIsFromDelegatedRendererLayer) { |
| 154 // Should be the root render pass. | 154 // Should be the root render pass. |
| 155 ASSERT(delegatedRenderPass == m_renderPassesInDrawOrder.last()); | 155 ASSERT(delegatedRenderPass == m_renderPassesInDrawOrder.last()); |
| 156 // This layer must be drawing to a renderTarget other than itself. | 156 // This layer must be drawing to a renderTarget other than itself. |
| 157 ASSERT(renderTarget() != this); | 157 ASSERT(renderTarget() != this); |
| 158 | 158 |
| 159 copiedSharedQuadState->quadTransform = copiedSharedQuadState->quadTr
ansform * drawTransform(); | 159 copiedSharedQuadState->quadTransform = copiedSharedQuadState->quadTr
ansform * drawTransform(); |
| 160 copiedSharedQuadState->opacity *= drawOpacity(); | 160 copiedSharedQuadState->opacity *= drawOpacity(); |
| 161 } | 161 } |
| 162 | 162 |
| 163 OwnPtr<CCDrawQuad> copyQuad; | 163 scoped_ptr<CCDrawQuad> copyQuad; |
| 164 if (quad->material() != CCDrawQuad::RenderPass) | 164 if (quad->material() != CCDrawQuad::RenderPass) |
| 165 copyQuad = quad->copy(copiedSharedQuadState); | 165 copyQuad = quad->copy(copiedSharedQuadState); |
| 166 else { | 166 else { |
| 167 CCRenderPass::Id contributingDelegatedRenderPassId = CCRenderPassDra
wQuad::materialCast(quad)->renderPassId(); | 167 CCRenderPass::Id contributingDelegatedRenderPassId = CCRenderPassDra
wQuad::materialCast(quad)->renderPassId(); |
| 168 CCRenderPass::Id contributingRenderPassId = convertDelegatedRenderPa
ssId(contributingDelegatedRenderPassId); | 168 CCRenderPass::Id contributingRenderPassId = convertDelegatedRenderPa
ssId(contributingDelegatedRenderPassId); |
| 169 ASSERT(contributingRenderPassId != appendQuadsData.renderPassId); | 169 ASSERT(contributingRenderPassId != appendQuadsData.renderPassId); |
| 170 | 170 |
| 171 copyQuad = CCRenderPassDrawQuad::materialCast(quad)->copy(copiedShar
edQuadState, contributingRenderPassId); | 171 copyQuad = CCRenderPassDrawQuad::materialCast(quad)->copy(copiedShar
edQuadState, contributingRenderPassId).PassAs<CCDrawQuad>(); |
| 172 } | 172 } |
| 173 ASSERT(copyQuad); | 173 ASSERT(copyQuad.get()); |
| 174 | 174 |
| 175 quadSink.append(copyQuad.release(), appendQuadsData); | 175 quadSink.append(copyQuad.Pass(), appendQuadsData); |
| 176 } | 176 } |
| 177 } | 177 } |
| 178 | 178 |
| 179 const char* CCDelegatedRendererLayerImpl::layerTypeAsString() const | 179 const char* CCDelegatedRendererLayerImpl::layerTypeAsString() const |
| 180 { | 180 { |
| 181 return "DelegatedRendererLayer"; | 181 return "DelegatedRendererLayer"; |
| 182 } | 182 } |
| 183 | 183 |
| 184 } | 184 } |
| OLD | NEW |