Index: cc/resources/resource_provider_unittest.cc |
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc |
index 3daef6619ab31142b1eaf0e9b8ce4ea9743760f2..6971f6358058dd32a438051196534eb258d03e82 100644 |
--- a/cc/resources/resource_provider_unittest.cc |
+++ b/cc/resources/resource_provider_unittest.cc |
@@ -425,8 +425,7 @@ class ResourceProviderTest |
main_thread_task_runner_.get(), |
0, |
false, |
- 1, |
- false); |
+ 1); |
child_resource_provider_ = |
ResourceProvider::Create(child_output_surface_.get(), |
shared_bitmap_manager_.get(), |
@@ -434,8 +433,7 @@ class ResourceProviderTest |
main_thread_task_runner_.get(), |
0, |
false, |
- 1, |
- false); |
+ 1); |
} |
static void CollectResources(ReturnedResourceArray* array, |
@@ -1170,8 +1168,7 @@ TEST_P(ResourceProviderTest, TransferGLToSoftware) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
gfx::Size size(1, 1); |
ResourceFormat format = RGBA_8888; |
@@ -1653,8 +1650,7 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
scoped_ptr<TextureStateTrackingContext> parent_context_owned( |
new TextureStateTrackingContext); |
@@ -1672,8 +1668,7 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
gfx::Size size(1, 1); |
ResourceFormat format = RGBA_8888; |
@@ -2305,8 +2300,7 @@ TEST_P(ResourceProviderTest, ScopedSampler) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
gfx::Size size(1, 1); |
ResourceFormat format = RGBA_8888; |
@@ -2393,8 +2387,7 @@ TEST_P(ResourceProviderTest, ManagedResource) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
gfx::Size size(1, 1); |
ResourceFormat format = RGBA_8888; |
@@ -2449,8 +2442,7 @@ TEST_P(ResourceProviderTest, TextureWrapMode) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
gfx::Size size(1, 1); |
ResourceFormat format = RGBA_8888; |
@@ -2509,8 +2501,7 @@ TEST_P(ResourceProviderTest, TextureHint) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
gfx::Size size(1, 1); |
ResourceFormat format = RGBA_8888; |
@@ -2583,8 +2574,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_SharedMemory) { |
main_thread_task_runner_.get(), |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
uint32 release_sync_point = 0; |
bool lost_resource = false; |
@@ -2636,8 +2626,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTexture2D) { |
main_thread_task_runner_.get(), |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
unsigned texture_id = 1; |
uint32 sync_point = 30; |
@@ -2722,8 +2711,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTextureExternalOES) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
unsigned texture_id = 1; |
uint32 sync_point = 30; |
@@ -2798,8 +2786,7 @@ TEST_P(ResourceProviderTest, |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
uint32 sync_point = 30; |
unsigned target = GL_TEXTURE_2D; |
@@ -2858,8 +2845,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_WaitSyncPointIfNeeded_NoSyncPoint) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
uint32 sync_point = 0; |
unsigned target = GL_TEXTURE_2D; |
@@ -2985,8 +2971,7 @@ TEST_P(ResourceProviderTest, TextureAllocation) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
gfx::Size size(2, 2); |
gfx::Vector2d offset(0, 0); |
@@ -3066,8 +3051,7 @@ TEST_P(ResourceProviderTest, TextureAllocationHint) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
gfx::Size size(2, 2); |
@@ -3127,8 +3111,7 @@ TEST_P(ResourceProviderTest, TextureAllocationHint_BGRA) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
gfx::Size size(2, 2); |
const ResourceFormat formats[2] = {RGBA_8888, BGRA_8888}; |
@@ -3187,8 +3170,7 @@ TEST_P(ResourceProviderTest, PixelBuffer_GLTexture) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
id = resource_provider->CreateResource( |
size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureHintImmutable, format); |
@@ -3235,8 +3217,7 @@ TEST_P(ResourceProviderTest, ForcingAsyncUploadToComplete) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
id = resource_provider->CreateResource( |
size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureHintImmutable, format); |
@@ -3283,8 +3264,7 @@ TEST_P(ResourceProviderTest, PixelBufferLostContext) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
EXPECT_CALL(*context, NextTextureId()).WillRepeatedly(Return(texture_id)); |
@@ -3329,8 +3309,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
id = resource_provider->CreateResource( |
size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureHintImmutable, format); |
@@ -3417,8 +3396,7 @@ TEST_P(ResourceProviderTest, CopyResource_GLTexture) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
source_id = resource_provider->CreateResource( |
size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureHintImmutable, format); |
@@ -3500,8 +3478,7 @@ TEST(ResourceProviderTest, BasicInitializeGLSoftware) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
CheckCreateResource(ResourceProvider::Bitmap, resource_provider.get(), NULL); |
@@ -3540,8 +3517,7 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1Allocate) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
int texture_id = 123; |
ResourceProvider::ResourceId id = resource_provider->CreateResource( |
@@ -3577,8 +3553,7 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1SetPixels) { |
NULL, |
0, |
false, |
- 1, |
- false)); |
+ 1)); |
int texture_id = 123; |
uint8_t pixels[8]; |
@@ -3639,8 +3614,7 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) { |
NULL, |
0, |
false, |
- kTextureAllocationChunkSize, |
- false)); |
+ kTextureAllocationChunkSize)); |
ResourceProvider::ResourceId id = resource_provider->CreateResource( |
size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureHintImmutable, format); |
@@ -3660,8 +3634,7 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) { |
NULL, |
0, |
false, |
- kTextureAllocationChunkSize, |
- false)); |
+ kTextureAllocationChunkSize)); |
ResourceProvider::ResourceId id = resource_provider->CreateResource( |
size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureHintImmutable, format); |