Remove WTF HashMap and PassOwnPtr dependencies for CCRenderPass

cc/CCDirectRenderer.cpp

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCDirectRenderer.h"
 
 #include "CCMathUtil.h"
 #include <public/WebTransformationMatrix.h>
+#include <vector>
 
 using WebKit::WebTransformationMatrix;
 
 static WebTransformationMatrix orthoProjectionMatrix(float left, float right, float bottom, float top)
 {
     // Use the standard formula to map the clipping frustum to the cube from
     // [-1, -1, -1] to [1, 1, 1].
     float deltaX = right - left;
     float deltaY = top - bottom;
     WebTransformationMatrix proj;
@@ skipping 86 matching lines @@
     , m_resourceProvider(resourceProvider)
 {
 }
 
 CCDirectRenderer::~CCDirectRenderer()
 {
 }
 
 void CCDirectRenderer::decideRenderPassAllocationsForFrame(const CCRenderPassList& renderPassesInDrawOrder)
 {
-    HashMap<CCRenderPass::Id, const CCRenderPass*> renderPassesInFrame;
+    base::hash_map<CCRenderPass::Id, const CCRenderPass*> renderPassesInFrame;
     for (size_t i = 0; i < renderPassesInDrawOrder.size(); ++i)
-        renderPassesInFrame.set(renderPassesInDrawOrder[i]->id(), renderPassesInDrawOrder[i]);
+        renderPassesInFrame.insert(std::pair<CCRenderPass::Id, const CCRenderPass*>(renderPassesInDrawOrder[i]->id(), renderPassesInDrawOrder[i]));
 
-    Vector<CCRenderPass::Id> passesToDelete;
-    HashMap<CCRenderPass::Id, OwnPtr<CachedTexture> >::const_iterator passIterator;
+    std::vector<CCRenderPass::Id> passesToDelete;
+    ScopedPtrHashMap<CCRenderPass::Id, CachedTexture>::const_iterator passIterator;
     for (passIterator = m_renderPassTextures.begin(); passIterator != m_renderPassTextures.end(); ++passIterator) {
-#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
-        const CCRenderPass* renderPassInFrame = renderPassesInFrame.get(passIterator->key);
-#else
-        const CCRenderPass* renderPassInFrame = renderPassesInFrame.get(passIterator->first);
-#endif
-        if (!renderPassInFrame) {
-#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
-            passesToDelete.append(passIterator->key);
-#else
-            passesToDelete.append(passIterator->first);
-#endif
+        base::hash_map<CCRenderPass::Id, const CCRenderPass*>::const_iterator it = renderPassesInFrame.find(passIterator->first);
+        if (it == renderPassesInFrame.end()) {
+            passesToDelete.push_back(passIterator->first);
             continue;
         }
 
+        const CCRenderPass* renderPassInFrame = it->second;
         const IntSize& requiredSize = renderPassTextureSize(renderPassInFrame);
         GC3Denum requiredFormat = renderPassTextureFormat(renderPassInFrame);
-#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
-        CachedTexture* texture = passIterator->value.get();
-#else
-        CachedTexture* texture = passIterator->second.get();
-#endif
+        CachedTexture* texture = passIterator->second;
         ASSERT(texture);
 
         if (texture->id() && (texture->size() != requiredSize || texture->format() != requiredFormat))
             texture->free();
     }
 
     // Delete RenderPass textures from the previous frame that will not be used again.
     for (size_t i = 0; i < passesToDelete.size(); ++i)
-        m_renderPassTextures.remove(passesToDelete[i]);
+        m_renderPassTextures.erase(passesToDelete[i]);
 
     for (size_t i = 0; i < renderPassesInDrawOrder.size(); ++i) {
         if (!m_renderPassTextures.contains(renderPassesInDrawOrder[i]->id())) {
-            OwnPtr<CachedTexture> texture = CachedTexture::create(m_resourceProvider);
-            m_renderPassTextures.set(renderPassesInDrawOrder[i]->id(), texture.release());
+          scoped_ptr<CachedTexture> texture = CachedTexture::create(m_resourceProvider);
+            m_renderPassTextures.set(renderPassesInDrawOrder[i]->id(), texture.Pass());
         }
     }
 }
 
 void CCDirectRenderer::drawFrame(const CCRenderPassList& renderPassesInDrawOrder, const CCRenderPassIdHashMap& renderPassesById)
 {
     const CCRenderPass* rootRenderPass = renderPassesInDrawOrder.last();
     ASSERT(rootRenderPass);
 
     DrawingFrame frame;
@@ skipping 69 matching lines @@
     return pass->outputRect().size();
 }
 
 // static
 GC3Denum CCDirectRenderer::renderPassTextureFormat(const CCRenderPass*)
 {
     return GraphicsContext3D::RGBA;
 }
 
 }