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

Unified Diff: cc/test/layer_tree_pixel_test.cc

Issue 105743004: Add gpu::MailboxHolder to hold state for a gpu::Mailbox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 89bedb8c Reference return. Created 6 years, 11 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
Index: cc/test/layer_tree_pixel_test.cc
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
index d0635a7bf3d47827828968cecab0b241628a24de..86ef62222a10e63d08d496218446e12eb7a44590 100644
--- a/cc/test/layer_tree_pixel_test.cc
+++ b/cc/test/layer_tree_pixel_test.cc
@@ -246,7 +246,7 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap(
gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- gl->ConsumeTextureCHROMIUM(texture_mailbox.target(), texture_mailbox.data());
+ gl->ConsumeTextureCHROMIUM(texture_mailbox.target(), texture_mailbox.name());
gl->BindTexture(GL_TEXTURE_2D, 0);
GLuint fbo = 0;
@@ -368,7 +368,7 @@ void LayerTreePixelTest::CopyBitmapToTextureMailboxAsTexture(
gl->BindTexture(GL_TEXTURE_2D, 0);
uint32 sync_point = gl->InsertSyncPointCHROMIUM();
- *texture_mailbox = TextureMailbox(mailbox, sync_point);
+ *texture_mailbox = TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point);
*release_callback = SingleReleaseCallback::Create(
base::Bind(&LayerTreePixelTest::ReleaseTextureMailbox,
base::Unretained(this),

Powered by Google App Engine
This is Rietveld 408576698