| Index: cc/layer_tree_host_impl.cc
|
| diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
|
| index a3f865611f7a0695c766c36ff4fb05958660af4f..20d77a3ea74afd54e8c940e063eccccac208507e 100644
|
| --- a/cc/layer_tree_host_impl.cc
|
| +++ b/cc/layer_tree_host_impl.cc
|
| @@ -380,7 +380,7 @@ void LayerTreeHostImpl::FrameData::appendRenderPass(scoped_ptr<RenderPass> rende
|
| {
|
| RenderPass* pass = renderPass.get();
|
| renderPasses.push_back(pass);
|
| - renderPassesById.set(pass->id(), renderPass.Pass());
|
| + renderPassesById.set(pass->id, renderPass.Pass());
|
| }
|
|
|
| bool LayerTreeHostImpl::calculateRenderPasses(FrameData& frame)
|
| @@ -421,12 +421,12 @@ bool LayerTreeHostImpl::calculateRenderPasses(FrameData& frame)
|
|
|
| occlusionTracker.enterLayer(it);
|
|
|
| - AppendQuadsData appendQuadsData(targetRenderPass->id());
|
| + AppendQuadsData appendQuadsData(targetRenderPass->id);
|
|
|
| if (it.representsContributingRenderSurface()) {
|
| RenderPass::Id contributingRenderPassId = it->renderSurface()->renderPassId();
|
| RenderPass* contributingRenderPass = frame.renderPassesById.get(contributingRenderPassId);
|
| - targetRenderPass->appendQuadsForRenderSurfaceLayer(*it, contributingRenderPass, &occlusionTracker, appendQuadsData);
|
| + targetRenderPass->AppendQuadsForRenderSurfaceLayer(*it, *contributingRenderPass, occlusionTracker, appendQuadsData);
|
| } else if (it.representsItself() && !it->visibleContentRect().IsEmpty()) {
|
| bool hasOcclusionFromOutsideTargetSurface;
|
| bool implDrawTransformIsUnknown = false;
|
| @@ -441,19 +441,19 @@ bool LayerTreeHostImpl::calculateRenderPasses(FrameData& frame)
|
| while (frame.renderPassesById.contains(contributingRenderPassId)) {
|
| RenderPass* renderPass = frame.renderPassesById.get(contributingRenderPassId);
|
|
|
| - AppendQuadsData appendQuadsData(renderPass->id());
|
| - renderPass->appendQuadsForLayer(*it, &occlusionTracker, appendQuadsData);
|
| + AppendQuadsData appendQuadsData(renderPass->id);
|
| + renderPass->AppendQuadsForLayer(*it, occlusionTracker, appendQuadsData);
|
|
|
| contributingRenderPassId = it->nextContributingRenderPassId(contributingRenderPassId);
|
| }
|
| }
|
|
|
| - targetRenderPass->appendQuadsForLayer(*it, &occlusionTracker, appendQuadsData);
|
| + targetRenderPass->AppendQuadsForLayer(*it, occlusionTracker, appendQuadsData);
|
| }
|
| }
|
|
|
| if (appendQuadsData.hadOcclusionFromOutsideTargetSurface)
|
| - targetRenderPass->setHasOcclusionFromOutsideTargetSurface(true);
|
| + targetRenderPass->has_occlusion_from_outside_target_surface = true;
|
|
|
| if (appendQuadsData.hadMissingTiles) {
|
| bool layerHasAnimatingTransform = it->screenSpaceTransformIsAnimating() || it->drawTransformIsAnimating();
|
| @@ -466,15 +466,15 @@ 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(frame.renderPassesById.contains(frame.renderPasses[i]->id()));
|
| + for (size_t j = 0; j < frame.renderPasses[i]->quad_list.size(); ++j)
|
| + DCHECK(frame.renderPasses[i]->quad_list[j]->shared_quad_state);
|
| + DCHECK(frame.renderPassesById.contains(frame.renderPasses[i]->id));
|
| }
|
| #endif
|
|
|
| if (!m_hasTransparentBackground) {
|
| - frame.renderPasses.back()->setHasTransparentBackground(false);
|
| - frame.renderPasses.back()->appendQuadsToFillScreen(m_rootLayerImpl.get(), m_backgroundColor, occlusionTracker);
|
| + frame.renderPasses.back()->has_transparent_background = false;
|
| + frame.renderPasses.back()->AppendQuadsToFillScreen(m_rootLayerImpl.get(), m_backgroundColor, occlusionTracker);
|
| }
|
|
|
| if (drawFrame)
|
| @@ -555,7 +555,7 @@ static void removeRenderPassesRecursive(RenderPass::Id removeRenderPassId, Layer
|
| frame.renderPasses.erase(toRemove);
|
|
|
| // Now follow up for all RenderPass quads and remove their RenderPasses recursively.
|
| - const QuadList& quadList = removedPass->quadList();
|
| + const QuadList& quadList = removedPass->quad_list;
|
| QuadList::constBackToFrontIterator quadListIterator = quadList.backToFrontBegin();
|
| for (; quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
|
| DrawQuad* currentQuad = (*quadListIterator);
|
| @@ -583,7 +583,7 @@ bool LayerTreeHostImpl::CullRenderPassesWithNoQuads::shouldRemoveRenderPass(cons
|
| return false;
|
|
|
| // If any quad or RenderPass draws into this RenderPass, then keep it.
|
| - const QuadList& quadList = (*foundPass)->quadList();
|
| + const QuadList& quadList = (*foundPass)->quad_list;
|
| for (QuadList::constBackToFrontIterator quadListIterator = quadList.backToFrontBegin(); quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
|
| DrawQuad* currentQuad = *quadListIterator;
|
|
|
| @@ -608,7 +608,7 @@ void LayerTreeHostImpl::removeRenderPasses(RenderPassCuller culler, FrameData& f
|
| {
|
| for (size_t it = culler.renderPassListBegin(frame.renderPasses); it != culler.renderPassListEnd(frame.renderPasses); it = culler.renderPassListNext(it)) {
|
| const RenderPass* currentPass = frame.renderPasses[it];
|
| - const QuadList& quadList = currentPass->quadList();
|
| + const QuadList& quadList = currentPass->quad_list;
|
| QuadList::constBackToFrontIterator quadListIterator = quadList.backToFrontBegin();
|
|
|
| for (; quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
|
| @@ -721,7 +721,7 @@ void LayerTreeHostImpl::drawLayers(const FrameData& frame)
|
| // Once a RenderPass has been drawn, its damage should be cleared in
|
| // case the RenderPass will be reused next frame.
|
| for (unsigned int i = 0; i < frame.renderPasses.size(); i++)
|
| - frame.renderPasses[i]->setDamageRect(gfx::RectF());
|
| + frame.renderPasses[i]->damage_rect = gfx::RectF();
|
|
|
| // The next frame should start by assuming nothing has changed, and changes are noted as they occur.
|
| for (unsigned int i = 0; i < frame.renderSurfaceLayerList->size(); i++)
|
|
|