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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/resources/resource_provider_unittest.cc

Issue 664803003: Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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/resources/resource_update_controller_unittest.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 3aea34fff4fc9071bbe47033f5ae5f865efcaaee..2c585c4d5dddd46c048c58d890f284aba83c898e 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -423,8 +423,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(),
@@ -432,8 +431,7 @@ class ResourceProviderTest
main_thread_task_runner_.get(),
0,
false,
- 1,
- false);
+ 1);
}
static void CollectResources(ReturnedResourceArray* array,
@@ -1168,8 +1166,7 @@ TEST_P(ResourceProviderTest, TransferGLToSoftware) {
NULL,
0,
false,
- 1,
- false));
+ 1));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -1651,8 +1648,7 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest {
NULL,
0,
false,
- 1,
- false));
+ 1));
scoped_ptr<TextureStateTrackingContext> parent_context_owned(
new TextureStateTrackingContext);
@@ -1670,8 +1666,7 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest {
NULL,
0,
false,
- 1,
- false));
+ 1));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -2303,8 +2298,7 @@ TEST_P(ResourceProviderTest, ScopedSampler) {
NULL,
0,
false,
- 1,
- false));
+ 1));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -2391,8 +2385,7 @@ TEST_P(ResourceProviderTest, ManagedResource) {
NULL,
0,
false,
- 1,
- false));
+ 1));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -2447,8 +2440,7 @@ TEST_P(ResourceProviderTest, TextureWrapMode) {
NULL,
0,
false,
- 1,
- false));
+ 1));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -2507,8 +2499,7 @@ TEST_P(ResourceProviderTest, TextureHint) {
NULL,
0,
false,
- 1,
- false));
+ 1));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -2581,8 +2572,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;
@@ -2634,8 +2624,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTexture2D) {
main_thread_task_runner_.get(),
0,
false,
- 1,
- false));
+ 1));
unsigned texture_id = 1;
uint32 sync_point = 30;
@@ -2720,8 +2709,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTextureExternalOES) {
NULL,
0,
false,
- 1,
- false));
+ 1));
unsigned texture_id = 1;
uint32 sync_point = 30;
@@ -2796,8 +2784,7 @@ TEST_P(ResourceProviderTest,
NULL,
0,
false,
- 1,
- false));
+ 1));
uint32 sync_point = 30;
unsigned target = GL_TEXTURE_2D;
@@ -2856,8 +2843,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_WaitSyncPointIfNeeded_NoSyncPoint) {
NULL,
0,
false,
- 1,
- false));
+ 1));
uint32 sync_point = 0;
unsigned target = GL_TEXTURE_2D;
@@ -2983,8 +2969,7 @@ TEST_P(ResourceProviderTest, TextureAllocation) {
NULL,
0,
false,
- 1,
- false));
+ 1));
gfx::Size size(2, 2);
gfx::Vector2d offset(0, 0);
@@ -3064,8 +3049,7 @@ TEST_P(ResourceProviderTest, TextureAllocationHint) {
NULL,
0,
false,
- 1,
- false));
+ 1));
gfx::Size size(2, 2);
@@ -3125,8 +3109,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};
@@ -3185,8 +3168,7 @@ TEST_P(ResourceProviderTest, PixelBuffer_GLTexture) {
NULL,
0,
false,
- 1,
- false));
+ 1));
id = resource_provider->CreateResource(
size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureHintImmutable, format);
@@ -3233,8 +3215,7 @@ TEST_P(ResourceProviderTest, ForcingAsyncUploadToComplete) {
NULL,
0,
false,
- 1,
- false));
+ 1));
id = resource_provider->CreateResource(
size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureHintImmutable, format);
@@ -3281,8 +3262,7 @@ TEST_P(ResourceProviderTest, PixelBufferLostContext) {
NULL,
0,
false,
- 1,
- false));
+ 1));
EXPECT_CALL(*context, NextTextureId()).WillRepeatedly(Return(texture_id));
@@ -3327,8 +3307,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {
NULL,
0,
false,
- 1,
- false));
+ 1));
id = resource_provider->CreateResource(
size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureHintImmutable, format);
@@ -3415,8 +3394,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);
@@ -3498,8 +3476,7 @@ TEST(ResourceProviderTest, BasicInitializeGLSoftware) {
NULL,
0,
false,
- 1,
- false));
+ 1));
CheckCreateResource(ResourceProvider::Bitmap, resource_provider.get(), NULL);
@@ -3538,8 +3515,7 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1Allocate) {
NULL,
0,
false,
- 1,
- false));
+ 1));
int texture_id = 123;
ResourceProvider::ResourceId id = resource_provider->CreateResource(
@@ -3575,8 +3551,7 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1SetPixels) {
NULL,
0,
false,
- 1,
- false));
+ 1));
int texture_id = 123;
uint8_t pixels[8];
@@ -3637,8 +3612,7 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) {
NULL,
0,
false,
- kTextureAllocationChunkSize,
- false));
+ kTextureAllocationChunkSize));
ResourceProvider::ResourceId id = resource_provider->CreateResource(
size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureHintImmutable, format);
@@ -3658,8 +3632,7 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) {
NULL,
0,
false,
- kTextureAllocationChunkSize,
- false));
+ kTextureAllocationChunkSize));
ResourceProvider::ResourceId id = resource_provider->CreateResource(
size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureHintImmutable, format);
« no previous file with comments | « cc/resources/resource_provider.cc ('k') | cc/resources/resource_update_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698