cc: Remove wtf includes from resource provider

cc/resource_provider_unittest.cc

 // 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 "CCResourceProvider.h"
 
 #include "CCGraphicsContext.h"
 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
 #include "Extensions3DChromium.h"
 #include "cc/test/compositor_fake_web_graphics_context_3d.h"
 #include "cc/test/fake_web_compositor_output_surface.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebGraphicsContext3D.h>
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
+#include <wtf/Deque.h>
 
 using namespace cc;
 using namespace WebKit;
 
 namespace {
 
 size_t textureSize(const IntSize& size, WGC3Denum format)
 {
     unsigned int componentsPerPixel = 4;
     unsigned int bytesPerComponent = 1;
@@ skipping 266 matching lines @@
     {
         EXPECT_EQ(count, static_cast<int>(m_resourceProvider->numResources()));
         if (GetParam() == CCResourceProvider::GLTexture)
             EXPECT_EQ(count, context()->textureCount());
     }
 
 protected:
     DebugScopedSetImplThread implThread;
     OwnPtr<ContextSharedData> m_sharedData;
     scoped_ptr<CCGraphicsContext> m_context;
-    OwnPtr<CCResourceProvider> m_resourceProvider;
+    scoped_ptr<CCResourceProvider> m_resourceProvider;
 };
 
 TEST_P(CCResourceProviderTest, Basic)
 {
     IntSize size(1, 1);
     WGC3Denum format = GraphicsContext3D::RGBA;
     int pool = 1;
     size_t pixelSize = textureSize(size, format);
     ASSERT_EQ(4U, pixelSize);
 
@@ skipping 94 matching lines @@
     m_resourceProvider->deleteResource(id);
 }
 
 TEST_P(CCResourceProviderTest, TransferResources)
 {
     // Resource transfer is only supported with GL textures for now.
     if (GetParam() != CCResourceProvider::GLTexture)
         return;
 
     scoped_ptr<CCGraphicsContext> childContext(FakeWebCompositorOutputSurface::create(ResourceProviderContext::create(m_sharedData.get())));
-    OwnPtr<CCResourceProvider> childResourceProvider(CCResourceProvider::create(childContext.get()));
+    scoped_ptr<CCResourceProvider> childResourceProvider(CCResourceProvider::create(childContext.get()));
 
     IntSize size(1, 1);
     WGC3Denum format = GraphicsContext3D::RGBA;
     int pool = 1;
     size_t pixelSize = textureSize(size, format);
     ASSERT_EQ(4U, pixelSize);
 
     CCResourceProvider::ResourceId id1 = childResourceProvider->createResource(pool, size, format, CCResourceProvider::TextureUsageAny);
     uint8_t data1[4] = {1, 2, 3, 4};
     IntRect rect(IntPoint(), size);
     childResourceProvider->upload(id1, data1, rect, rect, IntSize());
 
     CCResourceProvider::ResourceId id2 = childResourceProvider->createResource(pool, size, format, CCResourceProvider::TextureUsageAny);
     uint8_t data2[4] = {5, 5, 5, 5};
     childResourceProvider->upload(id2, data2, rect, rect, IntSize());
 
     int childPool = 2;
     int childId = m_resourceProvider->createChild(childPool);
 
     {
         // Transfer some resources to the parent.
         CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
-        resourceIdsToTransfer.append(id1);
-        resourceIdsToTransfer.append(id2);
+        resourceIdsToTransfer.push_back(id1);
+        resourceIdsToTransfer.push_back(id2);
         CCResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
         EXPECT_NE(0u, list.syncPoint);
         EXPECT_EQ(2u, list.resources.size());
         EXPECT_TRUE(childResourceProvider->inUseByConsumer(id1));
         EXPECT_TRUE(childResourceProvider->inUseByConsumer(id2));
         m_resourceProvider->receiveFromChild(childId, list);
     }
 
     EXPECT_EQ(2u, m_resourceProvider->numResources());
     EXPECT_EQ(2u, m_resourceProvider->mailboxCount());
     CCResourceProvider::ResourceIdMap resourceMap = m_resourceProvider->getChildToParentMap(childId);
     CCResourceProvider::ResourceId mappedId1 = resourceMap[id1];
     CCResourceProvider::ResourceId mappedId2 = resourceMap[id2];
     EXPECT_NE(0u, mappedId1);
     EXPECT_NE(0u, mappedId2);
     EXPECT_FALSE(m_resourceProvider->inUseByConsumer(id1));
     EXPECT_FALSE(m_resourceProvider->inUseByConsumer(id2));
 
     uint8_t result[4] = {0};
     getResourcePixels(mappedId1, size, format, result);
     EXPECT_EQ(0, memcmp(data1, result, pixelSize));
 
     getResourcePixels(mappedId2, size, format, result);
     EXPECT_EQ(0, memcmp(data2, result, pixelSize));
 
     {
         // Check that transfering again the same resource from the child to the
         // parent is a noop.
         CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
-        resourceIdsToTransfer.append(id1);
+        resourceIdsToTransfer.push_back(id1);
         CCResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
         EXPECT_EQ(0u, list.syncPoint);
         EXPECT_EQ(0u, list.resources.size());
     }
 
     {
         // Transfer resources back from the parent to the child.
         CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
-        resourceIdsToTransfer.append(mappedId1);
-        resourceIdsToTransfer.append(mappedId2);
+        resourceIdsToTransfer.push_back(mappedId1);
+        resourceIdsToTransfer.push_back(mappedId2);
         CCResourceProvider::TransferableResourceList list = m_resourceProvider->prepareSendToChild(childId, resourceIdsToTransfer);
         EXPECT_NE(0u, list.syncPoint);
         EXPECT_EQ(2u, list.resources.size());
         childResourceProvider->receiveFromParent(list);
     }
     EXPECT_EQ(0u, m_resourceProvider->mailboxCount());
     EXPECT_EQ(2u, childResourceProvider->mailboxCount());
     EXPECT_FALSE(childResourceProvider->inUseByConsumer(id1));
     EXPECT_FALSE(childResourceProvider->inUseByConsumer(id2));
 
     ResourceProviderContext* childContext3D = static_cast<ResourceProviderContext*>(childContext->context3D());
     {
         CCResourceProvider::ScopedReadLockGL lock(childResourceProvider.get(), id1);
         ASSERT_NE(0U, lock.textureId());
         childContext3D->bindTexture(GraphicsContext3D::TEXTURE_2D, lock.textureId());
         childContext3D->getPixels(size, format, result);
         EXPECT_EQ(0, memcmp(data1, result, pixelSize));
     }
     {
         CCResourceProvider::ScopedReadLockGL lock(childResourceProvider.get(), id2);
         ASSERT_NE(0U, lock.textureId());
         childContext3D->bindTexture(GraphicsContext3D::TEXTURE_2D, lock.textureId());
         childContext3D->getPixels(size, format, result);
         EXPECT_EQ(0, memcmp(data2, result, pixelSize));
     }
 
     {
         // Transfer resources to the parent again.
         CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
-        resourceIdsToTransfer.append(id1);
-        resourceIdsToTransfer.append(id2);
+        resourceIdsToTransfer.push_back(id1);
+        resourceIdsToTransfer.push_back(id2);
         CCResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
         EXPECT_NE(0u, list.syncPoint);
         EXPECT_EQ(2u, list.resources.size());
         EXPECT_TRUE(childResourceProvider->inUseByConsumer(id1));
         EXPECT_TRUE(childResourceProvider->inUseByConsumer(id2));
         m_resourceProvider->receiveFromChild(childId, list);
     }
 
     EXPECT_EQ(2u, m_resourceProvider->numResources());
     m_resourceProvider->destroyChild(childId);
     EXPECT_EQ(0u, m_resourceProvider->numResources());
     EXPECT_EQ(0u, m_resourceProvider->mailboxCount());
 }
 
 TEST_P(CCResourceProviderTest, DeleteTransferredResources)
 {
     // Resource transfer is only supported with GL textures for now.
     if (GetParam() != CCResourceProvider::GLTexture)
         return;
 
     scoped_ptr<CCGraphicsContext> childContext(FakeWebCompositorOutputSurface::create(ResourceProviderContext::create(m_sharedData.get())));
-    OwnPtr<CCResourceProvider> childResourceProvider(CCResourceProvider::create(childContext.get()));
+    scoped_ptr<CCResourceProvider> childResourceProvider(CCResourceProvider::create(childContext.get()));
 
     IntSize size(1, 1);
     WGC3Denum format = GraphicsContext3D::RGBA;
     int pool = 1;
     size_t pixelSize = textureSize(size, format);
     ASSERT_EQ(4U, pixelSize);
 
     CCResourceProvider::ResourceId id = childResourceProvider->createResource(pool, size, format, CCResourceProvider::TextureUsageAny);
     uint8_t data[4] = {1, 2, 3, 4};
     IntRect rect(IntPoint(), size);
     childResourceProvider->upload(id, data, rect, rect, IntSize());
 
     int childPool = 2;
     int childId = m_resourceProvider->createChild(childPool);
 
     {
         // Transfer some resource to the parent.
         CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
-        resourceIdsToTransfer.append(id);
+        resourceIdsToTransfer.push_back(id);
         CCResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
         EXPECT_NE(0u, list.syncPoint);
         EXPECT_EQ(1u, list.resources.size());
         EXPECT_TRUE(childResourceProvider->inUseByConsumer(id));
         m_resourceProvider->receiveFromChild(childId, list);
     }
 
     // Delete textures in the child, while they are transfered.
     childResourceProvider->deleteResource(id);
     EXPECT_EQ(1u, childResourceProvider->numResources());
 
     {
         // Transfer resources back from the parent to the child.
         CCResourceProvider::ResourceIdMap resourceMap = m_resourceProvider->getChildToParentMap(childId);
         CCResourceProvider::ResourceId mappedId = resourceMap[id];
         EXPECT_NE(0u, mappedId);
         CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
-        resourceIdsToTransfer.append(mappedId);
+        resourceIdsToTransfer.push_back(mappedId);
         CCResourceProvider::TransferableResourceList list = m_resourceProvider->prepareSendToChild(childId, resourceIdsToTransfer);
         EXPECT_NE(0u, list.syncPoint);
         EXPECT_EQ(1u, list.resources.size());
         childResourceProvider->receiveFromParent(list);
     }
     EXPECT_EQ(0u, childResourceProvider->numResources());
 }
 
 INSTANTIATE_TEST_CASE_P(CCResourceProviderTests,
                         CCResourceProviderTest,
                         ::testing::Values(CCResourceProvider::GLTexture,
                                           CCResourceProvider::Bitmap));
 
 } // namespace