cc: Chromify Layer and LayerImpl classes.

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 "cc/resource_provider.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "cc/output_surface.h"
 #include "cc/scoped_ptr_deque.h"
@@ skipping 43 matching lines @@
     gfx::Size size;
     WGC3Denum format;
     WGC3Denum filter;
     scoped_array<uint8_t> data;
 };
 
 // Shared data between multiple ResourceProviderContext. This contains mailbox
 // contents as well as information about sync points.
 class ContextSharedData {
 public:
-    static scoped_ptr<ContextSharedData> create() { return make_scoped_ptr(new ContextSharedData()); }
+    static scoped_ptr<ContextSharedData> Create() { return make_scoped_ptr(new ContextSharedData()); }
 
     unsigned insertSyncPoint() { return m_nextSyncPoint++; }
 
     void genMailbox(WGC3Dbyte* mailbox)
     {
         memset(mailbox, 0, sizeof(WGC3Dbyte[64]));
         memcpy(mailbox, &m_nextMailBox, sizeof(m_nextMailBox));
         ++m_nextMailBox;
     }
 
@@ skipping 31 matching lines @@
 
     unsigned m_nextSyncPoint;
     unsigned m_nextMailBox;
     typedef ScopedPtrHashMap<unsigned, Texture> TextureMap;
     TextureMap m_textures;
     base::hash_map<unsigned, unsigned> m_syncPointForMailbox;
 };
 
 class ResourceProviderContext : public TestWebGraphicsContext3D {
 public:
-    static scoped_ptr<ResourceProviderContext> create(ContextSharedData* sharedData) { return make_scoped_ptr(new ResourceProviderContext(Attributes(), sharedData)); }
+    static scoped_ptr<ResourceProviderContext> Create(ContextSharedData* sharedData) { return make_scoped_ptr(new ResourceProviderContext(Attributes(), sharedData)); }
 
     virtual unsigned insertSyncPoint()
     {
         unsigned syncPoint = m_sharedData->insertSyncPoint();
         // Commit the produceTextureCHROMIUM calls at this point, so that
         // they're associated with the sync point.
         for (PendingProduceTextureList::iterator it = m_pendingProduceTextures.begin(); it != m_pendingProduceTextures.end(); ++it)
             m_sharedData->produceTexture((*it)->mailbox, syncPoint, (*it)->texture.Pass());
         m_pendingProduceTextures.clear();
         return syncPoint;
@@ skipping 174 matching lines @@
     ContextSharedData* m_sharedData;
     WebGLId m_currentTexture;
     TextureMap m_textures;
     unsigned m_lastWaitedSyncPoint;
     PendingProduceTextureList m_pendingProduceTextures;
 };
 
 class ResourceProviderTest : public testing::TestWithParam<ResourceProvider::ResourceType> {
 public:
     ResourceProviderTest()
-        : m_sharedData(ContextSharedData::create())
-        , m_outputSurface(FakeOutputSurface::Create3d(ResourceProviderContext::create(m_sharedData.get()).PassAs<WebKit::WebGraphicsContext3D>().PassAs<WebKit::WebGraphicsContext3D>()))
+        : m_sharedData(ContextSharedData::Create())
+        , m_outputSurface(FakeOutputSurface::Create3d(ResourceProviderContext::Create(m_sharedData.get()).PassAs<WebKit::WebGraphicsContext3D>().PassAs<WebKit::WebGraphicsContext3D>()))
         , m_resourceProvider(ResourceProvider::Create(m_outputSurface.get()))
     {
         m_resourceProvider->set_default_resource_type(GetParam());
     }
 
     ResourceProviderContext* context() { return static_cast<ResourceProviderContext*>(m_outputSurface->context3d()); }
 
     void getResourcePixels(ResourceProvider::ResourceId id, const gfx::Size& size, WGC3Denum format, uint8_t* pixels)
     {
         if (GetParam() == ResourceProvider::GLTexture) {
@@ skipping 119 matching lines @@
 
     m_resourceProvider->DeleteResource(id);
 }
 
 TEST_P(ResourceProviderTest, TransferResources)
 {
     // Resource transfer is only supported with GL textures for now.
     if (GetParam() != ResourceProvider::GLTexture)
         return;
 
-    scoped_ptr<OutputSurface> childOutputSurface(FakeOutputSurface::Create3d(ResourceProviderContext::create(m_sharedData.get()).PassAs<WebKit::WebGraphicsContext3D>()));
+    scoped_ptr<OutputSurface> childOutputSurface(FakeOutputSurface::Create3d(ResourceProviderContext::Create(m_sharedData.get()).PassAs<WebKit::WebGraphicsContext3D>()));
     scoped_ptr<ResourceProvider> childResourceProvider(ResourceProvider::Create(childOutputSurface.get()));
 
     gfx::Size size(1, 1);
     WGC3Denum format = GL_RGBA;
     size_t pixelSize = textureSize(size, format);
     ASSERT_EQ(4U, pixelSize);
 
     ResourceProvider::ResourceId id1 = childResourceProvider->CreateResource(size, format, ResourceProvider::TextureUsageAny);
     uint8_t data1[4] = {1, 2, 3, 4};
     gfx::Rect rect(gfx::Point(), size);
@@ skipping 96 matching lines @@
     m_resourceProvider->DestroyChild(childId);
     EXPECT_EQ(0u, m_resourceProvider->num_resources());
 }
 
 TEST_P(ResourceProviderTest, DeleteTransferredResources)
 {
     // Resource transfer is only supported with GL textures for now.
     if (GetParam() != ResourceProvider::GLTexture)
         return;
 
-    scoped_ptr<OutputSurface> childOutputSurface(FakeOutputSurface::Create3d(ResourceProviderContext::create(m_sharedData.get()).PassAs<WebKit::WebGraphicsContext3D>()));
+    scoped_ptr<OutputSurface> childOutputSurface(FakeOutputSurface::Create3d(ResourceProviderContext::Create(m_sharedData.get()).PassAs<WebKit::WebGraphicsContext3D>()));
     scoped_ptr<ResourceProvider> childResourceProvider(ResourceProvider::Create(childOutputSurface.get()));
 
     gfx::Size size(1, 1);
     WGC3Denum format = GL_RGBA;
     size_t pixelSize = textureSize(size, format);
     ASSERT_EQ(4U, pixelSize);
 
     ResourceProvider::ResourceId id = childResourceProvider->CreateResource(size, format, ResourceProvider::TextureUsageAny);
     uint8_t data[4] = {1, 2, 3, 4};
     gfx::Rect rect(gfx::Point(), size);
@@ skipping 32 matching lines @@
     }
     EXPECT_EQ(0u, childResourceProvider->num_resources());
 }
 
 TEST_P(ResourceProviderTest, TextureFilters)
 {
     // Resource transfer is only supported with GL textures for now.
     if (GetParam() != ResourceProvider::GLTexture)
         return;
 
-    scoped_ptr<OutputSurface> childOutputSurface(FakeOutputSurface::Create3d(ResourceProviderContext::create(m_sharedData.get()).PassAs<WebKit::WebGraphicsContext3D>()));
+    scoped_ptr<OutputSurface> childOutputSurface(FakeOutputSurface::Create3d(ResourceProviderContext::Create(m_sharedData.get()).PassAs<WebKit::WebGraphicsContext3D>()));
     scoped_ptr<ResourceProvider> childResourceProvider(ResourceProvider::Create(childOutputSurface.get()));
 
     gfx::Size size(1, 1);
     WGC3Denum format = GL_RGBA;
     size_t pixelSize = textureSize(size, format);
     ASSERT_EQ(4U, pixelSize);
 
     ResourceProvider::ResourceId id = childResourceProvider->CreateResource(size, format, ResourceProvider::TextureUsageAny);
     uint8_t data[4] = {1, 2, 3, 4};
     gfx::Rect rect(gfx::Point(), size);
@@ skipping 315 matching lines @@
     Mock::VerifyAndClearExpectations(context);
 }
 
 INSTANTIATE_TEST_CASE_P(ResourceProviderTests,
                         ResourceProviderTest,
                         ::testing::Values(ResourceProvider::GLTexture,
                                           ResourceProvider::Bitmap));
 
 }  // namespace
 }  // namespace cc