Index: cc/delegated_renderer_layer_impl.cc |
diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/delegated_renderer_layer_impl.cc |
index 38a4c54006136a58d681a2847dc2423075fbaa0a..1222bc40f473782c14c9ab8838580a0d6d750697 100644 |
--- a/cc/delegated_renderer_layer_impl.cc |
+++ b/cc/delegated_renderer_layer_impl.cc |
@@ -29,7 +29,7 @@ bool DelegatedRendererLayerImpl::descendantDrawsContent() |
// layers without children). If this happens, then make a test that |
// ensures the opacity is being changed on quads in the root RenderPass |
// when this layer doesn't own a RenderSurfaceImpl. |
- return !m_renderPassesInDrawOrder.isEmpty(); |
+ return !m_renderPassesInDrawOrder.empty(); |
} |
bool DelegatedRendererLayerImpl::hasContributingDelegatedRenderPasses() const |
@@ -43,20 +43,20 @@ bool DelegatedRendererLayerImpl::hasContributingDelegatedRenderPasses() const |
void DelegatedRendererLayerImpl::setRenderPasses(ScopedPtrVector<RenderPass>& renderPassesInDrawOrder) |
{ |
gfx::RectF oldRootDamage; |
- if (!m_renderPassesInDrawOrder.isEmpty()) |
- oldRootDamage = m_renderPassesInDrawOrder.last()->damageRect(); |
+ if (!m_renderPassesInDrawOrder.empty()) |
+ oldRootDamage = m_renderPassesInDrawOrder.back()->damageRect(); |
clearRenderPasses(); |
for (size_t i = 0; i < renderPassesInDrawOrder.size(); ++i) { |
m_renderPassesIndexById.insert(std::pair<RenderPass::Id, int>(renderPassesInDrawOrder[i]->id(), i)); |
- m_renderPassesInDrawOrder.append(renderPassesInDrawOrder.take(i)); |
+ m_renderPassesInDrawOrder.push_back(renderPassesInDrawOrder.take(renderPassesInDrawOrder.begin() + i)); |
} |
renderPassesInDrawOrder.clear(); |
- if (!m_renderPassesInDrawOrder.isEmpty()) { |
- gfx::RectF newRootDamage = m_renderPassesInDrawOrder.last()->damageRect(); |
- m_renderPassesInDrawOrder.last()->setDamageRect(gfx::UnionRects(oldRootDamage, newRootDamage)); |
+ if (!m_renderPassesInDrawOrder.empty()) { |
+ gfx::RectF newRootDamage = m_renderPassesInDrawOrder.back()->damageRect(); |
+ m_renderPassesInDrawOrder.back()->setDamageRect(gfx::UnionRects(oldRootDamage, newRootDamage)); |
} |
} |
@@ -109,7 +109,7 @@ void DelegatedRendererLayerImpl::appendContributingRenderPasses(RenderPassSink& |
void DelegatedRendererLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQuadsData) |
{ |
- if (m_renderPassesInDrawOrder.isEmpty()) |
+ if (m_renderPassesInDrawOrder.empty()) |
return; |
RenderPass::Id targetRenderPassId = appendQuadsData.renderPassId; |
@@ -123,7 +123,7 @@ void DelegatedRendererLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData |
// Verify that the renderPass we are appending to is created our renderTarget. |
DCHECK(targetRenderPassId.layerId == renderTarget()->id()); |
- RenderPass* rootDelegatedRenderPass = m_renderPassesInDrawOrder.last(); |
+ RenderPass* rootDelegatedRenderPass = m_renderPassesInDrawOrder.back(); |
appendRenderPassQuads(quadSink, appendQuadsData, rootDelegatedRenderPass); |
} else { |
// Verify that the renderPass we are appending to was created by us. |
@@ -148,7 +148,7 @@ void DelegatedRendererLayerImpl::appendRenderPassQuads(QuadSink& quadSink, Appen |
bool targetIsFromDelegatedRendererLayer = appendQuadsData.renderPassId.layerId == id(); |
if (!targetIsFromDelegatedRendererLayer) { |
// Should be the root render pass. |
- DCHECK(delegatedRenderPass == m_renderPassesInDrawOrder.last()); |
+ DCHECK(delegatedRenderPass == m_renderPassesInDrawOrder.back()); |
// This layer must be drawing to a renderTarget other than itself. |
DCHECK(renderTarget() != this); |