Index: cc/CCDelegatedRendererLayerImpl.cpp |
diff --git a/cc/CCDelegatedRendererLayerImpl.cpp b/cc/CCDelegatedRendererLayerImpl.cpp |
index d6574ec50b686f5f0a91cddc3302030a9ef90172..237f01f32971647639446de170a02af986e1cc22 100644 |
--- a/cc/CCDelegatedRendererLayerImpl.cpp |
+++ b/cc/CCDelegatedRendererLayerImpl.cpp |
@@ -41,7 +41,7 @@ bool CCDelegatedRendererLayerImpl::hasContributingDelegatedRenderPasses() const |
return m_renderPassesInDrawOrder.size() > 1; |
} |
-void CCDelegatedRendererLayerImpl::setRenderPasses(OwnPtrVector<CCRenderPass>& renderPassesInDrawOrder) |
+void CCDelegatedRendererLayerImpl::setRenderPasses(ScopedPtrVector<CCRenderPass>& renderPassesInDrawOrder) |
{ |
FloatRect oldRootDamage; |
if (!m_renderPassesInDrawOrder.isEmpty()) |
@@ -50,7 +50,7 @@ void CCDelegatedRendererLayerImpl::setRenderPasses(OwnPtrVector<CCRenderPass>& r |
clearRenderPasses(); |
for (size_t i = 0; i < renderPassesInDrawOrder.size(); ++i) { |
- m_renderPassesIndexById.set(renderPassesInDrawOrder[i]->id(), i); |
+ m_renderPassesIndexById.insert(std::pair<CCRenderPass::Id, int>(renderPassesInDrawOrder[i]->id(), i)); |
m_renderPassesInDrawOrder.append(renderPassesInDrawOrder.take(i)); |
} |
renderPassesInDrawOrder.clear(); |
@@ -88,7 +88,9 @@ CCRenderPass::Id CCDelegatedRendererLayerImpl::nextContributingRenderPassId(CCRe |
CCRenderPass::Id CCDelegatedRendererLayerImpl::convertDelegatedRenderPassId(CCRenderPass::Id delegatedRenderPassId) const |
{ |
- unsigned delegatedRenderPassIndex = m_renderPassesIndexById.get(delegatedRenderPassId); |
+ base::hash_map<CCRenderPass::Id, int>::const_iterator it = m_renderPassesIndexById.find(delegatedRenderPassId); |
+ ASSERT(it != m_renderPassesIndexById.end()); |
+ unsigned delegatedRenderPassIndex = it->second; |
return CCRenderPass::Id(id(), indexToId(delegatedRenderPassIndex)); |
} |