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

Unified Diff: cc/CCLayerTreeHostImpl.cpp

Issue 10940002: Add wrapper container for a vector of OwnPtr<T> (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months 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 | « cc/CCLayerTreeHostCommonTest.cpp ('k') | cc/CCLayerTreeHostImplTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCLayerTreeHostImpl.cpp
diff --git a/cc/CCLayerTreeHostImpl.cpp b/cc/CCLayerTreeHostImpl.cpp
index 0c17573d8aa1894d358c1ff8869302a49adc6415..24a0934b6432212551909a8aeccaabf456697e43 100644
--- a/cc/CCLayerTreeHostImpl.cpp
+++ b/cc/CCLayerTreeHostImpl.cpp
@@ -355,7 +355,7 @@ void CCLayerTreeHostImpl::animateLayersRecursive(CCLayerImpl* current, double mo
for (size_t i = 0; i < current->children().size(); ++i) {
bool childNeedsAnimateLayers = false;
- animateLayersRecursive(current->children()[i].get(), monotonicTime, wallClockTime, events, didAnimate, childNeedsAnimateLayers);
+ animateLayersRecursive(current->children()[i], monotonicTime, wallClockTime, events, didAnimate, childNeedsAnimateLayers);
if (childNeedsAnimateLayers)
subtreeNeedsAnimateLayers = true;
}
@@ -408,7 +408,7 @@ static void removeRenderPassesRecursive(CCRenderPass::Id removeRenderPassId, CCL
const CCQuadList& quadList = removedPass->quadList();
CCQuadList::constBackToFrontIterator quadListIterator = quadList.backToFrontBegin();
for (; quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
- CCDrawQuad* currentQuad = (*quadListIterator).get();
+ CCDrawQuad* currentQuad = (*quadListIterator);
if (currentQuad->material() != CCDrawQuad::RenderPass)
continue;
@@ -434,7 +434,7 @@ bool CCLayerTreeHostImpl::CullRenderPassesWithNoQuads::shouldRemoveRenderPass(co
// If any quad or RenderPass draws into this RenderPass, then keep it.
const CCQuadList& quadList = frame.renderPasses[passIndex]->quadList();
for (CCQuadList::constBackToFrontIterator quadListIterator = quadList.backToFrontBegin(); quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
- CCDrawQuad* currentQuad = quadListIterator->get();
+ CCDrawQuad* currentQuad = *quadListIterator;
if (currentQuad->material() != CCDrawQuad::RenderPass)
return false;
@@ -460,7 +460,7 @@ void CCLayerTreeHostImpl::removeRenderPasses(RenderPassCuller culler, FrameData&
CCQuadList::constBackToFrontIterator quadListIterator = quadList.backToFrontBegin();
for (; quadListIterator != quadList.backToFrontEnd(); ++quadListIterator) {
- CCDrawQuad* currentQuad = quadListIterator->get();
+ CCDrawQuad* currentQuad = *quadListIterator;
if (currentQuad->material() != CCDrawQuad::RenderPass)
continue;
@@ -612,7 +612,7 @@ static CCLayerImpl* findRootScrollLayer(CCLayerImpl* layer)
return layer;
for (size_t i = 0; i < layer->children().size(); ++i) {
- CCLayerImpl* found = findRootScrollLayer(layer->children()[i].get());
+ CCLayerImpl* found = findRootScrollLayer(layer->children()[i]);
if (found)
return found;
}
@@ -757,7 +757,7 @@ static void adjustScrollsForPageScaleChange(CCLayerImpl* layerImpl, float pageSc
}
for (size_t i = 0; i < layerImpl->children().size(); ++i)
- adjustScrollsForPageScaleChange(layerImpl->children()[i].get(), pageScaleChange);
+ adjustScrollsForPageScaleChange(layerImpl->children()[i], pageScaleChange);
}
void CCLayerTreeHostImpl::setDeviceScaleFactor(float deviceScaleFactor)
@@ -1128,7 +1128,7 @@ static void collectScrollDeltas(CCScrollAndScaleSet* scrollInfo, CCLayerImpl* la
}
for (size_t i = 0; i < layerImpl->children().size(); ++i)
- collectScrollDeltas(scrollInfo, layerImpl->children()[i].get());
+ collectScrollDeltas(scrollInfo, layerImpl->children()[i]);
}
PassOwnPtr<CCScrollAndScaleSet> CCLayerTreeHostImpl::processScrollDeltas()
@@ -1213,14 +1213,14 @@ void CCLayerTreeHostImpl::sendDidLoseContextRecursive(CCLayerImpl* current)
if (current->replicaLayer())
sendDidLoseContextRecursive(current->replicaLayer());
for (size_t i = 0; i < current->children().size(); ++i)
- sendDidLoseContextRecursive(current->children()[i].get());
+ sendDidLoseContextRecursive(current->children()[i]);
}
static void clearRenderSurfacesOnCCLayerImplRecursive(CCLayerImpl* current)
{
ASSERT(current);
for (size_t i = 0; i < current->children().size(); ++i)
- clearRenderSurfacesOnCCLayerImplRecursive(current->children()[i].get());
+ clearRenderSurfacesOnCCLayerImplRecursive(current->children()[i]);
current->clearRenderSurface();
}
@@ -1247,7 +1247,7 @@ void CCLayerTreeHostImpl::dumpRenderSurfaces(std::string* str, int indent, const
layer->renderSurface()->dumpSurface(str, indent);
for (size_t i = 0; i < layer->children().size(); ++i)
- dumpRenderSurfaces(str, indent, layer->children()[i].get());
+ dumpRenderSurfaces(str, indent, layer->children()[i]);
}
int CCLayerTreeHostImpl::sourceAnimationFrameNumber() const
@@ -1276,7 +1276,7 @@ void CCLayerTreeHostImpl::animateScrollbarsRecursive(CCLayerImpl* layer, double
m_client->setNeedsRedrawOnImplThread();
for (size_t i = 0; i < layer->children().size(); ++i)
- animateScrollbarsRecursive(layer->children()[i].get(), monotonicTime);
+ animateScrollbarsRecursive(layer->children()[i], monotonicTime);
}
} // namespace cc
« no previous file with comments | « cc/CCLayerTreeHostCommonTest.cpp ('k') | cc/CCLayerTreeHostImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698