Index: cc/resources/resource_provider_unittest.cc |
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc |
index 12075b56c81b091d0dd5b45d772734489791de66..bc4c89e39eab63763e0a2dbc363bd7c24b959922 100644 |
--- a/cc/resources/resource_provider_unittest.cc |
+++ b/cc/resources/resource_provider_unittest.cc |
@@ -421,12 +421,12 @@ class ResourceProviderTest |
resource_provider_ = ResourceProvider::Create( |
output_surface_.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, |
- false, 1, use_image_texture_targets_); |
+ gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1, |
+ use_image_texture_targets_); |
child_resource_provider_ = ResourceProvider::Create( |
child_output_surface_.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, |
- false, 1, use_image_texture_targets_); |
+ gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1, |
+ use_image_texture_targets_); |
} |
ResourceProviderTest() : ResourceProviderTest(true) {} |
@@ -1378,7 +1378,7 @@ TEST_P(ResourceProviderTest, TransferGLToSoftware) { |
scoped_ptr<ResourceProvider> child_resource_provider(ResourceProvider::Create( |
child_output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, |
+ gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_image_texture_targets_)); |
gfx::Size size(1, 1); |
@@ -1862,8 +1862,8 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest { |
scoped_ptr<ResourceProvider> child_resource_provider( |
ResourceProvider::Create(child_output_surface.get(), |
- shared_bitmap_manager.get(), NULL, NULL, 0, |
- false, 1, use_image_texture_targets_)); |
+ shared_bitmap_manager.get(), NULL, NULL, 0, 1, |
+ use_image_texture_targets_)); |
scoped_ptr<TextureStateTrackingContext> parent_context_owned( |
new TextureStateTrackingContext); |
@@ -1876,8 +1876,8 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest { |
scoped_ptr<ResourceProvider> parent_resource_provider( |
ResourceProvider::Create(parent_output_surface.get(), |
- shared_bitmap_manager.get(), NULL, NULL, 0, |
- false, 1, use_image_texture_targets_)); |
+ shared_bitmap_manager.get(), NULL, NULL, 0, 1, |
+ use_image_texture_targets_)); |
gfx::Size size(1, 1); |
ResourceFormat format = RGBA_8888; |
@@ -2509,7 +2509,7 @@ TEST_P(ResourceProviderTest, ScopedSampler) { |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, |
+ gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_image_texture_targets_)); |
gfx::Size size(1, 1); |
@@ -2592,7 +2592,7 @@ TEST_P(ResourceProviderTest, ManagedResource) { |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, |
+ gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_image_texture_targets_)); |
gfx::Size size(1, 1); |
@@ -2640,7 +2640,7 @@ TEST_P(ResourceProviderTest, TextureWrapMode) { |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, |
+ gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_image_texture_targets_)); |
gfx::Size size(1, 1); |
@@ -2691,7 +2691,7 @@ TEST_P(ResourceProviderTest, TextureHint) { |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, |
+ gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_image_texture_targets_)); |
gfx::Size size(1, 1); |
@@ -2756,8 +2756,8 @@ TEST_P(ResourceProviderTest, TextureMailbox_SharedMemory) { |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, |
- false, 1, use_image_texture_targets_)); |
+ gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1, |
+ use_image_texture_targets_)); |
uint32 release_sync_point = 0; |
bool lost_resource = false; |
@@ -2806,7 +2806,7 @@ class ResourceProviderTestTextureMailboxGLFilters |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager, gpu_memory_buffer_manager, |
- main_thread_task_runner, 0, false, 1, use_image_texture_targets_)); |
+ main_thread_task_runner, 0, 1, use_image_texture_targets_)); |
unsigned texture_id = 1; |
uint32 sync_point = 30; |
@@ -2949,7 +2949,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTextureExternalOES) { |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, |
+ gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_image_texture_targets_)); |
uint32 sync_point = 30; |
@@ -3019,7 +3019,7 @@ TEST_P(ResourceProviderTest, |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, |
+ gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_image_texture_targets_)); |
uint32 sync_point = 30; |
@@ -3073,7 +3073,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_WaitSyncPointIfNeeded_NoSyncPoint) { |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, |
+ gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_image_texture_targets_)); |
uint32 sync_point = 0; |
@@ -3194,7 +3194,7 @@ TEST_P(ResourceProviderTest, TextureAllocation) { |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, |
+ gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_image_texture_targets_)); |
gfx::Size size(2, 2); |
@@ -3250,7 +3250,7 @@ TEST_P(ResourceProviderTest, TextureAllocationHint) { |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, |
+ gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_image_texture_targets_)); |
gfx::Size size(2, 2); |
@@ -3306,7 +3306,7 @@ TEST_P(ResourceProviderTest, TextureAllocationHint_BGRA) { |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, |
+ gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_image_texture_targets_)); |
gfx::Size size(2, 2); |
@@ -3365,7 +3365,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) { |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, |
+ gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_image_texture_targets_)); |
id = resource_provider->CreateResource( |
@@ -3443,7 +3443,7 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1Allocate) { |
gfx::Size size(4, 4); |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, |
+ gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_image_texture_targets_)); |
int texture_id = 123; |
@@ -3475,7 +3475,7 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1Upload) { |
gfx::Size size(4, 4); |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
output_surface.get(), shared_bitmap_manager_.get(), |
- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, |
+ gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_image_texture_targets_)); |
int texture_id = 123; |
uint8_t pixels[8]; |
@@ -3531,7 +3531,7 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) { |
{ |
size_t kTextureAllocationChunkSize = 1; |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
- output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false, |
+ output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, |
kTextureAllocationChunkSize, |
ResourceProviderTest::use_image_texture_targets())); |
@@ -3548,7 +3548,7 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) { |
{ |
size_t kTextureAllocationChunkSize = 8; |
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create( |
- output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false, |
+ output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, |
kTextureAllocationChunkSize, |
ResourceProviderTest::use_image_texture_targets())); |