| Index: cc/layer_tree_host_impl.cc
|
| diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
|
| index 3c22180ecf923f86ccf6aed16f3c80d8c8f60075..1da6f61ec208976d0936fe1a832695037f375cd8 100644
|
| --- a/cc/layer_tree_host_impl.cc
|
| +++ b/cc/layer_tree_host_impl.cc
|
| @@ -427,7 +427,7 @@ void LayerTreeHostImpl::updateDrawProperties()
|
| void LayerTreeHostImpl::FrameData::appendRenderPass(scoped_ptr<RenderPass> renderPass)
|
| {
|
| renderPassesById[renderPass->id] = renderPass.get();
|
| - renderPasses.append(renderPass.Pass());
|
| + renderPasses.push_back(renderPass.Pass());
|
| }
|
|
|
| static void appendQuadsForLayer(RenderPass* targetRenderPass, LayerImpl* layer, OcclusionTrackerImpl& occlusionTracker, AppendQuadsData& appendQuadsData)
|
| @@ -518,7 +518,7 @@ static void appendQuadsToFillScreen(RenderPass* targetRenderPass, LayerImpl* roo
|
|
|
| bool LayerTreeHostImpl::calculateRenderPasses(FrameData& frame)
|
| {
|
| - DCHECK(frame.renderPasses.isEmpty());
|
| + DCHECK(frame.renderPasses.empty());
|
|
|
| if (!canDraw() || !rootLayer())
|
| return false;
|
| @@ -614,8 +614,8 @@ bool LayerTreeHostImpl::calculateRenderPasses(FrameData& frame)
|
| #endif
|
|
|
| if (!activeTree()->has_transparent_background()) {
|
| - frame.renderPasses.last()->has_transparent_background = false;
|
| - appendQuadsToFillScreen(frame.renderPasses.last(), rootLayer(), activeTree()->background_color(), occlusionTracker);
|
| + frame.renderPasses.back()->has_transparent_background = false;
|
| + appendQuadsToFillScreen(frame.renderPasses.back(), rootLayer(), activeTree()->background_color(), occlusionTracker);
|
| }
|
|
|
| if (drawFrame)
|
| @@ -659,9 +659,8 @@ static void removeRenderPassesRecursive(RenderPass::Id removeRenderPassId, Layer
|
|
|
| DCHECK(toRemove != renderPasses.end());
|
|
|
| - size_t index = toRemove - renderPasses.begin();
|
| - scoped_ptr<RenderPass> removedPass = renderPasses.take(index);
|
| - frame.renderPasses.remove(index);
|
| + scoped_ptr<RenderPass> removedPass = renderPasses.take(toRemove);
|
| + frame.renderPasses.erase(toRemove);
|
| frame.renderPassesById.erase(removeRenderPassId);
|
|
|
| // Now follow up for all RenderPass quads and remove their RenderPasses recursively.
|
| @@ -878,7 +877,7 @@ void LayerTreeHostImpl::drawLayers(FrameData& frame)
|
| {
|
| TRACE_EVENT0("cc", "LayerTreeHostImpl::drawLayers");
|
| DCHECK(canDraw());
|
| - DCHECK(!frame.renderPasses.isEmpty());
|
| + DCHECK(!frame.renderPasses.empty());
|
|
|
| // FIXME: use the frame begin time from the overall compositor scheduler.
|
| // This value is currently inaccessible because it is up in Chromium's
|
| @@ -895,7 +894,7 @@ void LayerTreeHostImpl::drawLayers(FrameData& frame)
|
|
|
| m_renderer->drawFrame(frame.renderPasses);
|
| // The render passes should be consumed by the renderer.
|
| - DCHECK(frame.renderPasses.isEmpty());
|
| + DCHECK(frame.renderPasses.empty());
|
| frame.renderPassesById.clear();
|
|
|
| // The next frame should start by assuming nothing has changed, and changes are noted as they occur.
|
|
|