Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(177)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/resources/resource_provider_unittest.cc

Issue 2007593005: Remove the concept of OutputSurface from ResourceProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resourceprovider-no-outputsurface: moreccptcompile Created 4 years, 7 months 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
« no previous file with comments | « cc/resources/resource_provider.cc ('k') | cc/surfaces/display.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_provider_unittest.cc
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index 939a1e05c0f32eef609fe7d58a799edfdcf6df5a..b8426c07e76e9edef929361b5d29f06f3f0a831e 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -46,6 +46,12 @@ using testing::_;
namespace cc {
namespace {
+static const bool kUseGpuMemoryBufferResources = false;
+static const bool kDelegatedSyncPointsRequired = true;
+static const std::vector<unsigned> kUseImageTextureTargets(
+ static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
+ GL_TEXTURE_2D);
+
MATCHER_P(MatchesSyncToken, sync_token, "") {
gpu::SyncToken other;
memcpy(&other, arg, sizeof(other));
@@ -459,14 +465,17 @@ class ResourceProviderTest
child_gpu_memory_buffer_manager_ =
gpu_memory_buffer_manager_->CreateClientGpuMemoryBufferManager();
- resource_provider_ = ResourceProvider::Create(
- output_surface_.get(), shared_bitmap_manager_.get(),
+ resource_provider_ = base::MakeUnique<ResourceProvider>(
+ output_surface_->context_provider(), shared_bitmap_manager_.get(),
gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_);
- child_resource_provider_ = ResourceProvider::Create(
- child_output_surface_.get(), shared_bitmap_manager_.get(),
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets);
+ child_resource_provider_ = base::MakeUnique<ResourceProvider>(
+ child_output_surface_->context_provider(), shared_bitmap_manager_.get(),
child_gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(),
- 0, 1, use_gpu_memory_buffer_resources_, use_image_texture_targets_);
+ 0, 1,
+ child_output_surface_->capabilities().delegated_sync_points_required,
+ kUseGpuMemoryBufferResources, kUseImageTextureTargets);
}
ResourceProviderTest() : ResourceProviderTest(true) {}
@@ -527,17 +536,7 @@ class ResourceProviderTest
}
}
- public:
- static bool use_gpu_memory_buffer_resources() {
- return use_gpu_memory_buffer_resources_;
- }
- static std::vector<unsigned> use_image_texture_targets() {
- return use_image_texture_targets_;
- }
-
protected:
- static bool use_gpu_memory_buffer_resources_;
- static std::vector<unsigned> use_image_texture_targets_;
std::unique_ptr<ContextSharedData> shared_data_;
ResourceProviderContext* context3d_;
ResourceProviderContext* child_context_;
@@ -553,12 +552,6 @@ class ResourceProviderTest
std::unique_ptr<TestSharedBitmapManager> shared_bitmap_manager_;
};
-bool ResourceProviderTest::use_gpu_memory_buffer_resources_ = false;
-
-std::vector<unsigned> ResourceProviderTest::use_image_texture_targets_ =
- std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
- GL_TEXTURE_2D);
-
void CheckCreateResource(ResourceProvider::ResourceType expected_default_type,
ResourceProvider* resource_provider,
ResourceProviderContext* context) {
@@ -1466,10 +1459,11 @@ TEST_P(ResourceProviderTest, TransferGLToSoftware) {
CHECK(child_output_surface->BindToClient(&child_output_surface_client));
std::unique_ptr<ResourceProvider> child_resource_provider(
- ResourceProvider::Create(
- child_output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ base::MakeUnique<ResourceProvider>(
+ child_output_surface->context_provider(),
+ shared_bitmap_manager_.get(), gpu_memory_buffer_manager_.get(),
+ nullptr, 0, 1, kDelegatedSyncPointsRequired,
+ kUseGpuMemoryBufferResources, kUseImageTextureTargets));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -1987,10 +1981,11 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest {
new TestSharedBitmapManager());
std::unique_ptr<ResourceProvider> child_resource_provider(
- ResourceProvider::Create(child_output_surface.get(),
- shared_bitmap_manager.get(), NULL, NULL, 0, 1,
- use_gpu_memory_buffer_resources_,
- use_image_texture_targets_));
+ base::MakeUnique<ResourceProvider>(
+ child_output_surface->context_provider(),
+ shared_bitmap_manager.get(), nullptr, nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
std::unique_ptr<TextureStateTrackingContext> parent_context_owned(
new TextureStateTrackingContext);
@@ -2002,10 +1997,11 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest {
CHECK(parent_output_surface->BindToClient(&parent_output_surface_client));
std::unique_ptr<ResourceProvider> parent_resource_provider(
- ResourceProvider::Create(parent_output_surface.get(),
- shared_bitmap_manager.get(), NULL, NULL, 0, 1,
- use_gpu_memory_buffer_resources_,
- use_image_texture_targets_));
+ base::MakeUnique<ResourceProvider>(
+ parent_output_surface->context_provider(),
+ shared_bitmap_manager.get(), nullptr, nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -2172,7 +2168,7 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) {
gpu::SyncToken release_sync_token;
bool lost_resource = false;
- BlockingTaskRunner* main_thread_task_runner = NULL;
+ BlockingTaskRunner* main_thread_task_runner = nullptr;
ReleaseCallbackImpl callback =
base::Bind(ReleaseCallback, &release_sync_token, &lost_resource,
&main_thread_task_runner);
@@ -2607,7 +2603,7 @@ TEST_P(ResourceProviderTest, LostContext) {
gpu::SyncToken release_sync_token;
bool lost_resource = false;
- BlockingTaskRunner* main_thread_task_runner = NULL;
+ BlockingTaskRunner* main_thread_task_runner = nullptr;
std::unique_ptr<SingleReleaseCallbackImpl> callback =
SingleReleaseCallbackImpl::Create(
base::Bind(ReleaseCallback, &release_sync_token, &lost_resource,
@@ -2617,7 +2613,7 @@ TEST_P(ResourceProviderTest, LostContext) {
EXPECT_FALSE(release_sync_token.HasData());
EXPECT_FALSE(lost_resource);
- EXPECT_EQ(NULL, main_thread_task_runner);
+ EXPECT_FALSE(main_thread_task_runner);
resource_provider_->DidLoseOutputSurface();
resource_provider_ = nullptr;
@@ -2641,10 +2637,12 @@ TEST_P(ResourceProviderTest, ScopedSampler) {
FakeOutputSurface::Create3d(std::move(context_owned)));
CHECK(output_surface->BindToClient(&output_surface_client));
- std::unique_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ std::unique_ptr<ResourceProvider> resource_provider(
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager_.get(),
+ gpu_memory_buffer_manager_.get(), nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -2720,10 +2718,12 @@ TEST_P(ResourceProviderTest, ManagedResource) {
FakeOutputSurface::Create3d(std::move(context_owned)));
CHECK(output_surface->BindToClient(&output_surface_client));
- std::unique_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ std::unique_ptr<ResourceProvider> resource_provider(
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager_.get(),
+ gpu_memory_buffer_manager_.get(), nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -2763,10 +2763,12 @@ TEST_P(ResourceProviderTest, TextureWrapMode) {
FakeOutputSurface::Create3d(std::move(context_owned)));
CHECK(output_surface->BindToClient(&output_surface_client));
- std::unique_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ std::unique_ptr<ResourceProvider> resource_provider(
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager_.get(),
+ gpu_memory_buffer_manager_.get(), nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -2807,10 +2809,12 @@ TEST_P(ResourceProviderTest, TextureHint) {
FakeOutputSurface::Create3d(std::move(context_owned)));
CHECK(output_surface->BindToClient(&output_surface_client));
- std::unique_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ std::unique_ptr<ResourceProvider> resource_provider(
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager_.get(),
+ gpu_memory_buffer_manager_.get(), nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -2866,14 +2870,16 @@ TEST_P(ResourceProviderTest, TextureMailbox_SharedMemory) {
base::WrapUnique(new SoftwareOutputDevice)));
CHECK(output_surface->BindToClient(&output_surface_client));
- std::unique_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ std::unique_ptr<ResourceProvider> resource_provider(
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager_.get(),
+ gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0,
+ 1, kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
gpu::SyncToken release_sync_token;
bool lost_resource = false;
- BlockingTaskRunner* main_thread_task_runner = NULL;
+ BlockingTaskRunner* main_thread_task_runner = nullptr;
std::unique_ptr<SingleReleaseCallbackImpl> callback =
SingleReleaseCallbackImpl::Create(
base::Bind(&ReleaseCallback, &release_sync_token, &lost_resource,
@@ -2916,10 +2922,11 @@ class ResourceProviderTestTextureMailboxGLFilters
CHECK(output_surface->BindToClient(&output_surface_client));
std::unique_ptr<ResourceProvider> resource_provider(
- ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager,
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager,
gpu_memory_buffer_manager, main_thread_task_runner, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
unsigned texture_id = 1;
gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
@@ -2937,7 +2944,7 @@ class ResourceProviderTestTextureMailboxGLFilters
memcpy(gpu_mailbox.name, "Hello world", strlen("Hello world") + 1);
gpu::SyncToken release_sync_token;
bool lost_resource = false;
- BlockingTaskRunner* mailbox_task_runner = NULL;
+ BlockingTaskRunner* mailbox_task_runner = nullptr;
std::unique_ptr<SingleReleaseCallbackImpl> callback =
SingleReleaseCallbackImpl::Create(
base::Bind(&ReleaseCallback, &release_sync_token, &lost_resource,
@@ -3061,10 +3068,12 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTextureExternalOES) {
FakeOutputSurface::Create3d(std::move(context_owned)));
CHECK(output_surface->BindToClient(&output_surface_client));
- std::unique_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ std::unique_ptr<ResourceProvider> resource_provider(
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager_.get(),
+ gpu_memory_buffer_manager_.get(), nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
gpu::CommandBufferId::FromUnsafeValue(0x12), 0x34);
@@ -3131,10 +3140,12 @@ TEST_P(ResourceProviderTest,
FakeOutputSurface::Create3d(std::move(context_owned)));
CHECK(output_surface->BindToClient(&output_surface_client));
- std::unique_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ std::unique_ptr<ResourceProvider> resource_provider(
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager_.get(),
+ gpu_memory_buffer_manager_.get(), nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
gpu::CommandBufferId::FromUnsafeValue(0x12), 0x34);
@@ -3187,10 +3198,12 @@ TEST_P(ResourceProviderTest, TextureMailbox_WaitSyncTokenIfNeeded_NoSyncToken) {
FakeOutputSurface::Create3d(std::move(context_owned)));
CHECK(output_surface->BindToClient(&output_surface_client));
- std::unique_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ std::unique_ptr<ResourceProvider> resource_provider(
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager_.get(),
+ gpu_memory_buffer_manager_.get(), nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
gpu::SyncToken sync_token;
const GLuint64 current_fence_sync = context->GetNextFenceSync();
@@ -3309,10 +3322,12 @@ TEST_P(ResourceProviderTest, TextureAllocation) {
FakeOutputSurface::Create3d(std::move(context_owned)));
CHECK(output_surface->BindToClient(&output_surface_client));
- std::unique_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ std::unique_ptr<ResourceProvider> resource_provider(
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager_.get(),
+ gpu_memory_buffer_manager_.get(), nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
gfx::Size size(2, 2);
gfx::Vector2d offset(0, 0);
@@ -3365,10 +3380,12 @@ TEST_P(ResourceProviderTest, TextureAllocationHint) {
FakeOutputSurface::Create3d(std::move(context_owned)));
CHECK(output_surface->BindToClient(&output_surface_client));
- std::unique_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ std::unique_ptr<ResourceProvider> resource_provider(
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager_.get(),
+ gpu_memory_buffer_manager_.get(), nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
gfx::Size size(2, 2);
@@ -3421,10 +3438,12 @@ TEST_P(ResourceProviderTest, TextureAllocationHint_BGRA) {
FakeOutputSurface::Create3d(std::move(context_owned)));
CHECK(output_surface->BindToClient(&output_surface_client));
- std::unique_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ std::unique_ptr<ResourceProvider> resource_provider(
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager_.get(),
+ gpu_memory_buffer_manager_.get(), nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
gfx::Size size(2, 2);
const ResourceFormat formats[2] = {RGBA_8888, BGRA_8888};
@@ -3480,10 +3499,12 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {
const unsigned kTextureId = 123u;
const unsigned kImageId = 234u;
- std::unique_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ std::unique_ptr<ResourceProvider> resource_provider(
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager_.get(),
+ gpu_memory_buffer_manager_.get(), nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
id = resource_provider->CreateResource(
size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format);
@@ -3558,10 +3579,12 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1Allocate) {
CHECK(output_surface->BindToClient(&output_surface_client));
gfx::Size size(4, 4);
- std::unique_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ std::unique_ptr<ResourceProvider> resource_provider(
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager_.get(),
+ gpu_memory_buffer_manager_.get(), nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
int texture_id = 123;
ResourceId id = resource_provider->CreateResource(
@@ -3590,10 +3613,12 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1Upload) {
CHECK(output_surface->BindToClient(&output_surface_client));
gfx::Size size(4, 4);
- std::unique_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager_.get(),
- gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_gpu_memory_buffer_resources_, use_image_texture_targets_));
+ std::unique_ptr<ResourceProvider> resource_provider(
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager_.get(),
+ gpu_memory_buffer_manager_.get(), nullptr, 0, 1,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
int texture_id = 123;
uint8_t pixels[8];
@@ -3648,11 +3673,11 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) {
{
size_t kTextureAllocationChunkSize = 1;
std::unique_ptr<ResourceProvider> resource_provider(
- ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0,
- kTextureAllocationChunkSize,
- ResourceProviderTest::use_gpu_memory_buffer_resources(),
- ResourceProviderTest::use_image_texture_targets()));
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager.get(),
+ nullptr, nullptr, 0, kTextureAllocationChunkSize,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
ResourceId id = resource_provider->CreateResource(
size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format);
@@ -3666,11 +3691,11 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) {
{
size_t kTextureAllocationChunkSize = 8;
std::unique_ptr<ResourceProvider> resource_provider(
- ResourceProvider::Create(
- output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0,
- kTextureAllocationChunkSize,
- ResourceProviderTest::use_gpu_memory_buffer_resources(),
- ResourceProviderTest::use_image_texture_targets()));
+ base::MakeUnique<ResourceProvider>(
+ output_surface->context_provider(), shared_bitmap_manager.get(),
+ nullptr, nullptr, 0, kTextureAllocationChunkSize,
+ kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+ kUseImageTextureTargets));
ResourceId id = resource_provider->CreateResource(
size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format);
« no previous file with comments | « cc/resources/resource_provider.cc ('k') | cc/surfaces/display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698