Revert "cc: Defer texture allocation (to allow async allocations)."

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/logging.h"
 #include "cc/output_surface.h"
 #include "cc/scoped_ptr_deque.h"
 #include "cc/scoped_ptr_hash_map.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_web_graphics_context_3d.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "ui/gfx/rect.h"
 
 using namespace WebKit;
 
 using testing::Mock;
-using testing::StrictMock;
-using testing::NiceMock;
-using testing::_;
 
 namespace cc {
 namespace {
 
 size_t textureSize(const gfx::Size& size, WGC3Denum format)
 {
     unsigned int componentsPerPixel = 4;
     unsigned int bytesPerComponent = 1;
     return size.width() * size.height() * componentsPerPixel * bytesPerComponent;
 }
@@ skipping 547 matching lines @@
     int textureId = 1;
 
     // Check that the texture gets created with the right sampler settings.
     EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, textureId));
     EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
     EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
     EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
     EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
     EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_POOL_CHROMIUM, GL_TEXTURE_POOL_UNMANAGED_CHROMIUM));
     ResourceProvider::ResourceId id = resourceProvider->createResource(size, format, ResourceProvider::TextureUsageAny);
-    resourceProvider->allocateForTesting(id);
 
     // Creating a sampler with the default filter should not change any texture
     // parameters.
     {
         EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, textureId));
         ResourceProvider::ScopedSamplerGL sampler(resourceProvider.get(), id, GL_TEXTURE_2D, GL_LINEAR);
     }
 
     // Using a different filter should be reflected in the texture parameters.
     {
@@ skipping 33 matching lines @@
     EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
     EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
     EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
     EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
     EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_POOL_CHROMIUM, GL_TEXTURE_POOL_MANAGED_CHROMIUM));
     ResourceProvider::ResourceId id = resourceProvider->createManagedResource(size, format, ResourceProvider::TextureUsageAny);
 
     Mock::VerifyAndClearExpectations(context);
 }
 
-class AllocationTrackingContext3D : public FakeWebGraphicsContext3D {
-public:
-    MOCK_METHOD9(texImage2D, void(WGC3Denum target, WGC3Dint level, WGC3Denum internalformat,
-                                  WGC3Dsizei width, WGC3Dsizei height, WGC3Dint border, WGC3Denum format,
-                                  WGC3Denum type, const void* pixels));
-    MOCK_METHOD9(texSubImage2D, void(WGC3Denum target, WGC3Dint level, WGC3Dint xoffset, WGC3Dint yoffset,
-                                     WGC3Dsizei width, WGC3Dsizei height, WGC3Denum format,
-                                     WGC3Denum type, const void* pixels));
-    MOCK_METHOD9(asyncTexImage2DCHROMIUM, void(WGC3Denum target, WGC3Dint level, WGC3Denum internalformat,
-                                              WGC3Dsizei width, WGC3Dsizei height, WGC3Dint border, WGC3Denum format,
-                                              WGC3Denum type, const void* pixels));
-    MOCK_METHOD9(asyncTexSubImage2DCHROMIUM, void(WGC3Denum target, WGC3Dint level, WGC3Dint xoffset, WGC3Dint yoffset,
-                                                  WGC3Dsizei width, WGC3Dsizei height, WGC3Denum format,
-                                                  WGC3Denum type, const void* pixels));
-};
-
-TEST_P(ResourceProviderTest, TextureAllocation)
-{
-    // Only for GL textures.
-    if (GetParam() != ResourceProvider::GLTexture)
-        return;
-    scoped_ptr<WebKit::WebGraphicsContext3D> mock_context(
-        static_cast<WebKit::WebGraphicsContext3D*>(new NiceMock<AllocationTrackingContext3D>));
-    scoped_ptr<OutputSurface> outputSurface(FakeOutputSurface::Create3d(mock_context.Pass()));
-
-    gfx::Size size(2, 2);
-    gfx::Vector2d offset(0, 0);
-    gfx::Rect rect(0, 0, 2, 2);
-    WGC3Denum format = GL_RGBA;
-    ResourceProvider::ResourceId id = 0;
-    uint8_t pixels[16] = {0};
-
-    AllocationTrackingContext3D* context = static_cast<AllocationTrackingContext3D*>(outputSurface->Context3D());
-    scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(outputSurface.get()));
-
-    // Lazy allocation. Don't allocate when creating the resource.
-    EXPECT_CALL(*context, texImage2D(_,_,_,_,_,_,_,_,_)).Times(0);
-    EXPECT_CALL(*context, asyncTexImage2DCHROMIUM(_,_,_,_,_,_,_,_,_)).Times(0);
-    id = resourceProvider->createResource(size, format, ResourceProvider::TextureUsageAny);
-    resourceProvider->deleteResource(id);
-    Mock::VerifyAndClearExpectations(context);
-
-    // Do allocate when we set the pixels.
-    EXPECT_CALL(*context, texImage2D(_,_,_,2,2,_,_,_,_)).Times(1);
-    EXPECT_CALL(*context, texSubImage2D(_,_,_,_,2,2,_,_,_)).Times(1);
-    id = resourceProvider->createResource(size, format, ResourceProvider::TextureUsageAny);
-    resourceProvider->setPixels(id, pixels, rect, rect, offset);
-    resourceProvider->deleteResource(id);
-    Mock::VerifyAndClearExpectations(context);
-
-    // Same for setPixelsFromBuffer
-    EXPECT_CALL(*context, texImage2D(_,_,_,2,2,_,_,_,_)).Times(1);
-    EXPECT_CALL(*context, texSubImage2D(_,_,_,_,2,2,_,_,_)).Times(1);
-    id = resourceProvider->createResource(size, format, ResourceProvider::TextureUsageAny);
-    resourceProvider->acquirePixelBuffer(id);
-    resourceProvider->setPixelsFromBuffer(id);
-    resourceProvider->releasePixelBuffer(id);
-    resourceProvider->deleteResource(id);
-    Mock::VerifyAndClearExpectations(context);
-
-    // Same for async version.
-    EXPECT_CALL(*context, asyncTexImage2DCHROMIUM(_,_,_,2,2,_,_,_,_)).Times(1);
-    id = resourceProvider->createResource(size, format, ResourceProvider::TextureUsageAny);
-    resourceProvider->acquirePixelBuffer(id);
-    resourceProvider->beginSetPixels(id);
-    resourceProvider->releasePixelBuffer(id);
-    resourceProvider->deleteResource(id);
-    Mock::VerifyAndClearExpectations(context);
-}
-
 INSTANTIATE_TEST_CASE_P(ResourceProviderTests,
                         ResourceProviderTest,
                         ::testing::Values(ResourceProvider::GLTexture,
                                           ResourceProvider::Bitmap));
 
 }  // namespace
 }  // namespace cc