Index: cc/CCLayerTreeHostImpl.cpp |
diff --git a/cc/CCLayerTreeHostImpl.cpp b/cc/CCLayerTreeHostImpl.cpp |
index 504e50b0ba319ec000eaa45aa873ce35336d910d..93c9dd301d22bb4604076e1e7d91695daf00b883 100644 |
--- a/cc/CCLayerTreeHostImpl.cpp |
+++ b/cc/CCLayerTreeHostImpl.cpp |
@@ -249,11 +249,11 @@ void CCLayerTreeHostImpl::calculateRenderSurfaceLayerList(CCLayerList& renderSur |
} |
} |
-void CCLayerTreeHostImpl::FrameData::appendRenderPass(PassOwnPtr<CCRenderPass> renderPass) |
+void CCLayerTreeHostImpl::FrameData::appendRenderPass(scoped_ptr<CCRenderPass> renderPass) |
{ |
CCRenderPass* pass = renderPass.get(); |
renderPasses.append(pass); |
- renderPassesById.set(pass->id(), renderPass); |
+ renderPassesById.set(pass->id(), renderPass.Pass()); |
} |
bool CCLayerTreeHostImpl::calculateRenderPasses(FrameData& frame) |
@@ -407,11 +407,7 @@ static inline CCRenderPass* findRenderPassById(CCRenderPass::Id renderPassId, co |
{ |
CCRenderPassIdHashMap::const_iterator it = frame.renderPassesById.find(renderPassId); |
ASSERT(it != frame.renderPassesById.end()); |
-#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE |
- return it->value.get(); |
-#else |
- return it->second.get(); |
-#endif |
+ return it->second; |
} |
static void removeRenderPassesRecursive(CCRenderPass::Id removeRenderPassId, CCLayerTreeHostImpl::FrameData& frame) |