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

Unified Diff: cc/test/test_web_graphics_context_3d.cc

Issue 635543002: cc: Make ResourceProvider use bindless Produce/ConsumeTextureCHROMIUM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + fix test expectations. Created 6 years 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/test_web_graphics_context_3d.cc
diff --git a/cc/test/test_web_graphics_context_3d.cc b/cc/test/test_web_graphics_context_3d.cc
index 2d82f89a71cdd8005f69f41cecde3d8a6061e9f6..76d94ce32ee5fd72d4ee926ef44410c648b6fed3 100644
--- a/cc/test/test_web_graphics_context_3d.cc
+++ b/cc/test/test_web_graphics_context_3d.cc
@@ -336,6 +336,13 @@ scoped_refptr<TestTexture> TestWebGraphicsContext3D::BoundTexture(
return namespace_->textures.TextureForId(BoundTextureId(target));
}
+scoped_refptr<TestTexture> TestWebGraphicsContext3D::UnboundTexture(
+ GLuint texture) {
+ // The caller is expected to lock the namespace for texture access.
+ namespace_->lock.AssertAcquired();
+ return namespace_->textures.TextureForId(texture);
+}
+
void TestWebGraphicsContext3D::CheckTextureIsBound(GLenum target) {
DCHECK(BoundTextureId(target));
}
@@ -444,7 +451,9 @@ void TestWebGraphicsContext3D::genMailboxCHROMIUM(GLbyte* mailbox) {
GLuint TestWebGraphicsContext3D::createAndConsumeTextureCHROMIUM(
GLenum target,
const GLbyte* mailbox) {
- return createTexture();
+ GLuint texture_id = createTexture();
+ consumeTextureCHROMIUM(target, mailbox);
+ return texture_id;
}
void TestWebGraphicsContext3D::loseContextCHROMIUM(GLenum current,

Powered by Google App Engine
This is Rietveld 408576698