diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 23:35:43 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 23:35:43 +0000 |
| commit | d9c2852424a372ad67459719c398d9040e2c0111 (patch) | |
| tree | 68ca65cbcd9c3d791e9eced185c17d8fa4850bb6 /cc/texture_copier_unittest.cc | |
| parent | b9deda21a9b74d344d60081688b10fab4ebf0d4b (diff) | |
| download | chromium_src-d9c2852424a372ad67459719c398d9040e2c0111.zip chromium_src-d9c2852424a372ad67459719c398d9040e2c0111.tar.gz chromium_src-d9c2852424a372ad67459719c398d9040e2c0111.tar.bz2 | |
Remove GraphicsContext3D:: stubs from cc
cc needs GL enum values. In WebKit, these came from GraphicsContext3D::,
Extensions3D::, Extensions3DChromium and types came from GraphicsTypes3D.
In chromium, we juse use the GL headers for this.
BUG=144577
Review URL: https://chromiumcodereview.appspot.com/11111005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/texture_copier_unittest.cc')
| -rw-r--r-- | cc/texture_copier_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cc/texture_copier_unittest.cc b/cc/texture_copier_unittest.cc index e804aaf..0a4c425 100644 --- a/cc/texture_copier_unittest.cc +++ b/cc/texture_copier_unittest.cc @@ -6,10 +6,10 @@ #include "cc/texture_copier.h" -#include "GraphicsContext3D.h" #include "cc/test/fake_web_graphics_context_3d.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/khronos/GLES2/gl2.h" using namespace cc; using namespace WebKit; @@ -33,20 +33,20 @@ TEST(TextureCopierTest, testDrawArraysCopy) InSequence sequence; // Here we check just some essential properties of copyTexture() to avoid mirroring the full implementation. - EXPECT_CALL(*mockContext, bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, _)); + EXPECT_CALL(*mockContext, bindFramebuffer(GL_FRAMEBUFFER, _)); // Make sure linear filtering is disabled during the copy. - EXPECT_CALL(*mockContext, texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::NEAREST)); - EXPECT_CALL(*mockContext, texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::NEAREST)); + EXPECT_CALL(*mockContext, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST)); + EXPECT_CALL(*mockContext, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST)); EXPECT_CALL(*mockContext, drawArrays(_, _, _)); // Linear filtering should be restored. - EXPECT_CALL(*mockContext, texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR)); - EXPECT_CALL(*mockContext, texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::LINEAR)); + EXPECT_CALL(*mockContext, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)); + EXPECT_CALL(*mockContext, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)); // Default framebuffer should be restored - EXPECT_CALL(*mockContext, bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, 0)); + EXPECT_CALL(*mockContext, bindFramebuffer(GL_FRAMEBUFFER, 0)); } int sourceTextureId = 1; |