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

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

Issue 331723003: gpu: Remove Create/DeleteImage IPC by adding an X11_PIXMAP_BUFFER GpuMemoryBuffer type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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: gpu/command_buffer/service/texture_manager_unittest.cc
diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc
index 873511d3d359e46ad596c27de72e5bf7a628f587..8d0d91a94e0401237f279217708d0b13437fad18 100644
--- a/gpu/command_buffer/service/texture_manager_unittest.cc
+++ b/gpu/command_buffer/service/texture_manager_unittest.cc
@@ -14,6 +14,7 @@
#include "gpu/command_buffer/service/mocks.h"
#include "gpu/command_buffer/service/test_helper.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gl/gl_image_stub.h"
#include "ui/gl/gl_mock.h"
using ::testing::AtLeast;
@@ -1641,18 +1642,13 @@ TEST_F(TextureTest, GetLevelImage) {
Texture* texture = texture_ref_->texture();
EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 1) == NULL);
// Set image.
- manager_->SetLevelImage(texture_ref_.get(),
- GL_TEXTURE_2D,
- 1,
- gfx::GLImage::CreateGLImage(0).get());
+ scoped_refptr<gfx::GLImage> image(new gfx::GLImageStub);
+ manager_->SetLevelImage(texture_ref_.get(), GL_TEXTURE_2D, 1, image.get());
EXPECT_FALSE(texture->GetLevelImage(GL_TEXTURE_2D, 1) == NULL);
// Remove it.
manager_->SetLevelImage(texture_ref_.get(), GL_TEXTURE_2D, 1, NULL);
EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 1) == NULL);
- manager_->SetLevelImage(texture_ref_.get(),
- GL_TEXTURE_2D,
- 1,
- gfx::GLImage::CreateGLImage(0).get());
+ manager_->SetLevelImage(texture_ref_.get(), GL_TEXTURE_2D, 1, image.get());
// Image should be reset when SetLevelInfo is called.
manager_->SetLevelInfo(texture_ref_.get(),
GL_TEXTURE_2D,
@@ -2100,7 +2096,7 @@ TEST_P(ProduceConsumeTextureTest, ProduceConsumeTextureWithImage) {
manager_->SetTarget(texture_ref_.get(), target);
Texture* texture = texture_ref_->texture();
EXPECT_EQ(static_cast<GLenum>(target), texture->target());
- scoped_refptr<gfx::GLImage> image(gfx::GLImage::CreateGLImage(0));
+ scoped_refptr<gfx::GLImage> image(new gfx::GLImageStub);
manager_->SetLevelInfo(texture_ref_.get(),
target,
0,
@@ -2485,18 +2481,14 @@ TEST_F(SharedTextureTest, Images) {
EXPECT_FALSE(ref2->texture()->HasImages());
EXPECT_FALSE(texture_manager1_->HaveImages());
EXPECT_FALSE(texture_manager2_->HaveImages());
- texture_manager1_->SetLevelImage(ref1.get(),
- GL_TEXTURE_2D,
- 1,
- gfx::GLImage::CreateGLImage(0).get());
+ scoped_refptr<gfx::GLImage> image1(new gfx::GLImageStub);
+ texture_manager1_->SetLevelImage(ref1.get(), GL_TEXTURE_2D, 1, image1.get());
EXPECT_TRUE(ref1->texture()->HasImages());
EXPECT_TRUE(ref2->texture()->HasImages());
EXPECT_TRUE(texture_manager1_->HaveImages());
EXPECT_TRUE(texture_manager2_->HaveImages());
- texture_manager1_->SetLevelImage(ref1.get(),
- GL_TEXTURE_2D,
- 1,
- gfx::GLImage::CreateGLImage(0).get());
+ scoped_refptr<gfx::GLImage> image2(new gfx::GLImageStub);
+ texture_manager1_->SetLevelImage(ref1.get(), GL_TEXTURE_2D, 1, image2.get());
EXPECT_TRUE(ref1->texture()->HasImages());
EXPECT_TRUE(ref2->texture()->HasImages());
EXPECT_TRUE(texture_manager1_->HaveImages());

Powered by Google App Engine
This is Rietveld 408576698