cc/resource_provider_unittest.cc - Issue 11348371: cc: Move WebCompositorOutputSurface and related classes into cc/

Unified Diff: cc/resource_provider_unittest.cc

Issue 11348371: cc: Move WebCompositorOutputSurface and related classes into cc/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: mynits Created 8 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: cc/resource_provider_unittest.cc

diff --git a/cc/resource_provider_unittest.cc b/cc/resource_provider_unittest.cc

index 851144c9dcfefb6d0e69eda000b2e683449f8d26..678eabe879b2d39cc81b0393d021d9afb6089b3d 100644

--- a/cc/resource_provider_unittest.cc

+++ b/cc/resource_provider_unittest.cc

@@ -9,7 +9,7 @@

#include "cc/scoped_ptr_deque.h"

#include "cc/scoped_ptr_hash_map.h"

#include "cc/test/compositor_fake_web_graphics_context_3d.h"

-#include "cc/test/fake_web_compositor_output_surface.h"

+#include "cc/test/fake_output_surface.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "third_party/khronos/GLES2/gl2.h"

#include "third_party/khronos/GLES2/gl2ext.h"

@@ -269,13 +269,13 @@ class ResourceProviderTest : public testing::TestWithParam<ResourceProvider::Res

public:

ResourceProviderTest()

: m_sharedData(ContextSharedData::create())

- , m_context(FakeWebCompositorOutputSurface::create(ResourceProviderContext::create(m_sharedData.get()).PassAs<WebKit::WebGraphicsContext3D>().PassAs<WebKit::WebGraphicsContext3D>()))

+ , m_context(FakeOutputSurface::Create(ResourceProviderContext::create(m_sharedData.get()).PassAs<WebKit::WebGraphicsContext3D>().PassAs<WebKit::WebGraphicsContext3D>()))

, m_resourceProvider(ResourceProvider::create(m_context.get()))

{

m_resourceProvider->setDefaultResourceType(GetParam());

}

- ResourceProviderContext* context() { return static_cast<ResourceProviderContext*>(m_context->context3D()); }

+ ResourceProviderContext* context() { return static_cast<ResourceProviderContext*>(m_context->Context3D()); }

void getResourcePixels(ResourceProvider::ResourceId id, const gfx::Size& size, WGC3Denum format, uint8_t* pixels)

{

@@ -414,7 +414,7 @@ TEST_P(ResourceProviderTest, TransferResources)

if (GetParam() != ResourceProvider::GLTexture)

return;

- scoped_ptr<GraphicsContext> childContext(FakeWebCompositorOutputSurface::create(ResourceProviderContext::create(m_sharedData.get()).PassAs<WebKit::WebGraphicsContext3D>()));

+ scoped_ptr<GraphicsContext> childContext(FakeOutputSurface::Create(ResourceProviderContext::create(m_sharedData.get()).PassAs<WebKit::WebGraphicsContext3D>()));

scoped_ptr<ResourceProvider> childResourceProvider(ResourceProvider::create(childContext.get()));

gfx::Size size(1, 1);

@@ -490,7 +490,7 @@ TEST_P(ResourceProviderTest, TransferResources)

EXPECT_FALSE(childResourceProvider->inUseByConsumer(id1));

EXPECT_FALSE(childResourceProvider->inUseByConsumer(id2));

- ResourceProviderContext* childContext3D = static_cast<ResourceProviderContext*>(childContext->context3D());

+ ResourceProviderContext* childContext3D = static_cast<ResourceProviderContext*>(childContext->Context3D());

{

ResourceProvider::ScopedReadLockGL lock(childResourceProvider.get(), id1);

ASSERT_NE(0U, lock.textureId());

@@ -531,7 +531,7 @@ TEST_P(ResourceProviderTest, DeleteTransferredResources)