Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(755)

Unified Diff: cc/delegated_renderer_layer_impl.cc

Issue 11418108: cc: Make the ScopedPtrVector and ScopedPtrDeque containers act like STL vector and deque. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add DCHECK Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cc/delegated_renderer_layer_impl_unittest.cc » ('j') | cc/scoped_ptr_deque.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | cc/delegated_renderer_layer_impl_unittest.cc » ('j') | cc/scoped_ptr_deque.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698