gpu/command_buffer/service/mailbox_manager_unittest.cc - Issue 1401423003: Re-land: ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/command_buffer/service/mailbox_manager_unittest.cc

Issue 1401423003: Re-land: ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

« gpu/command_buffer/service/gles2_cmd_decoder.cc ('K') | « gpu/command_buffer/service/mailbox_manager_sync.cc ('k') | gpu/command_buffer/service/texture_definition.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/mailbox_manager_unittest.cc

diff --git a/gpu/command_buffer/service/mailbox_manager_unittest.cc b/gpu/command_buffer/service/mailbox_manager_unittest.cc

index 81979d098fa2faa6a1820716f584f3f377a0ea27..ac0365ed2b213257a366dac784b06c856a0bdd09 100644

--- a/gpu/command_buffer/service/mailbox_manager_unittest.cc

+++ b/gpu/command_buffer/service/mailbox_manager_unittest.cc

@@ -338,7 +338,7 @@ TEST_F(MailboxManagerSyncTest, ProduceConsumeResize) {

SetLevelInfo(texture, GL_TEXTURE_2D, 0, GL_RGBA, 16, 32, 1, 0, GL_RGBA,

GL_UNSIGNED_BYTE, gfx::Rect(16, 32));

// Should have been orphaned

- EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == NULL);

+ EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0, nullptr) == nullptr);

// Synchronize again

manager_->PushTextureUpdates(g_sync_token);

@@ -351,7 +351,7 @@ TEST_F(MailboxManagerSyncTest, ProduceConsumeResize) {

EXPECT_EQ(32, height);

// Should have gotten a new attachment

- EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) != NULL);

+ EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0, nullptr) != nullptr);

// Resize original texture again....

SetLevelInfo(texture, GL_TEXTURE_2D, 0, GL_RGBA, 64, 64, 1, 0, GL_RGBA,

GL_UNSIGNED_BYTE, gfx::Rect(64, 64));