| Index: cc/layer_tree_host_impl.cc
|
| diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
|
| index 10879e984c629329f96462b923164cfec1ab62dc..fade6a738a7da74bc3ee2eb32fea270c07b75236 100644
|
| --- a/cc/layer_tree_host_impl.cc
|
| +++ b/cc/layer_tree_host_impl.cc
|
| @@ -453,8 +453,8 @@ bool LayerTreeHostImpl::calculateRenderPasses(FrameData& frame)
|
| #ifndef NDEBUG
|
| for (size_t i = 0; i < frame.renderPasses.size(); ++i) {
|
| for (size_t j = 0; j < frame.renderPasses[i]->quadList().size(); ++j) {
|
| - DCHECK(frame.renderPasses[i]->quadList()[j]->shared_quad_state());
|
| - DCHECK_GE(frame.renderPasses[i]->quadList()[j]->shared_quad_state()->id, 0);
|
| + DCHECK(frame.renderPasses[i]->quadList()[j]->shared_quad_state);
|
| + DCHECK_GE(frame.renderPasses[i]->quadList()[j]->shared_quad_state->id, 0);
|
| }
|
| DCHECK(frame.renderPassesById.contains(frame.renderPasses[i]->id()));
|
| }
|
| @@ -547,7 +547,7 @@ static void removeRenderPassesRecursive(RenderPass::Id removeRenderPassId, Layer
|
| QuadList::constBackToFrontIterator quadListIterator = quadList.backToFrontBegin();
|
| for (; quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
|
| DrawQuad* currentQuad = (*quadListIterator);
|
| - if (currentQuad->material() != DrawQuad::RENDER_PASS)
|
| + if (currentQuad->material != DrawQuad::RENDER_PASS)
|
| continue;
|
|
|
| RenderPass::Id nextRemoveRenderPassId = RenderPassDrawQuad::materialCast(currentQuad)->renderPassId();
|
| @@ -575,7 +575,7 @@ bool LayerTreeHostImpl::CullRenderPassesWithNoQuads::shouldRemoveRenderPass(cons
|
| for (QuadList::constBackToFrontIterator quadListIterator = quadList.backToFrontBegin(); quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
|
| DrawQuad* currentQuad = *quadListIterator;
|
|
|
| - if (currentQuad->material() != DrawQuad::RENDER_PASS)
|
| + if (currentQuad->material != DrawQuad::RENDER_PASS)
|
| return false;
|
|
|
| const RenderPass* contributingPass = findRenderPassById(RenderPassDrawQuad::materialCast(currentQuad)->renderPassId(), frame);
|
| @@ -602,7 +602,7 @@ void LayerTreeHostImpl::removeRenderPasses(RenderPassCuller culler, FrameData& f
|
| for (; quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
|
| DrawQuad* currentQuad = *quadListIterator;
|
|
|
| - if (currentQuad->material() != DrawQuad::RENDER_PASS)
|
| + if (currentQuad->material != DrawQuad::RENDER_PASS)
|
| continue;
|
|
|
| RenderPassDrawQuad* renderPassQuad = static_cast<RenderPassDrawQuad*>(currentQuad);
|
|
|