| Index: cc/delegated_renderer_layer_impl.cc
|
| diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/delegated_renderer_layer_impl.cc
|
| index 6d6396177143e495824828d2e6c74ed72f345304..e8d3b0695285c8894284bc81d66443a3b1f9e06c 100644
|
| --- a/cc/delegated_renderer_layer_impl.cc
|
| +++ b/cc/delegated_renderer_layer_impl.cc
|
| @@ -140,10 +140,10 @@ void DelegatedRendererLayerImpl::appendRenderPassQuads(QuadSink& quadSink, Appen
|
| const SharedQuadState* currentSharedQuadState = 0;
|
| SharedQuadState* copiedSharedQuadState = 0;
|
| for (size_t i = 0; i < delegatedRenderPass->quadList().size(); ++i) {
|
| - DrawQuad* quad = delegatedRenderPass->quadList()[i];
|
| + const DrawQuad* quad = delegatedRenderPass->quadList()[i];
|
|
|
| - if (quad->shared_quad_state() != currentSharedQuadState) {
|
| - currentSharedQuadState = quad->shared_quad_state();
|
| + if (quad->shared_quad_state != currentSharedQuadState) {
|
| + currentSharedQuadState = quad->shared_quad_state;
|
| copiedSharedQuadState = quadSink.useSharedQuadState(currentSharedQuadState->copy());
|
| bool targetIsFromDelegatedRendererLayer = appendQuadsData.renderPassId.layerId == id();
|
| if (!targetIsFromDelegatedRendererLayer) {
|
| @@ -160,7 +160,7 @@ void DelegatedRendererLayerImpl::appendRenderPassQuads(QuadSink& quadSink, Appen
|
| DCHECK(copiedSharedQuadState);
|
|
|
| scoped_ptr<DrawQuad> copyQuad;
|
| - if (quad->material() != DrawQuad::RENDER_PASS)
|
| + if (quad->material != DrawQuad::RENDER_PASS)
|
| copyQuad = quad->Copy(copiedSharedQuadState);
|
| else {
|
| RenderPass::Id contributingDelegatedRenderPassId = RenderPassDrawQuad::materialCast(quad)->renderPassId();
|
|
|