diff options
author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 02:26:37 +0000 |
---|---|---|
committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 02:26:37 +0000 |
commit | 0f9969980cd06a0cc87ec30e00d17d6e331324ad (patch) | |
tree | 7a68afcd82b625f3d01530b6ac8e1197b0d2753e /cc/test/test_web_graphics_context_3d_unittest.cc | |
parent | d7c9dc2d8a1b1b1ada826785f8693b3b55c17e4d (diff) | |
download | chromium_src-0f9969980cd06a0cc87ec30e00d17d6e331324ad.zip chromium_src-0f9969980cd06a0cc87ec30e00d17d6e331324ad.tar.gz chromium_src-0f9969980cd06a0cc87ec30e00d17d6e331324ad.tar.bz2 |
Remove unnecessary use of blink typedefs
This replaces uses of blink's WebGraphicsContext3D.h typedefs for GL numeric
types with the types from the khronos headers.
BUG=181120
Review URL: https://codereview.chromium.org/133023002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/test_web_graphics_context_3d_unittest.cc')
-rw-r--r-- | cc/test/test_web_graphics_context_3d_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cc/test/test_web_graphics_context_3d_unittest.cc b/cc/test/test_web_graphics_context_3d_unittest.cc index aa5ccf3..107f15c 100644 --- a/cc/test/test_web_graphics_context_3d_unittest.cc +++ b/cc/test/test_web_graphics_context_3d_unittest.cc @@ -13,9 +13,9 @@ namespace cc { namespace { static bool check_parameter_value(TestWebGraphicsContext3D* context, - blink::WGC3Denum pname, - blink::WGC3Dint expected_value) { - blink::WGC3Dint actual_value = 0; + GLenum pname, + GLint expected_value) { + GLint actual_value = 0; context->getTexParameteriv(GL_TEXTURE_2D, pname, &actual_value); return expected_value == actual_value; } @@ -35,7 +35,7 @@ TEST(TestWebGraphicsContext3DTest, GetDefaultTextureParameterValues) { scoped_ptr<TestWebGraphicsContext3D> context( TestWebGraphicsContext3D::Create()); - blink::WebGLId texture = context->createTexture(); + GLuint texture = context->createTexture(); context->bindTexture(GL_TEXTURE_2D, texture); expect_default_parameter_values(context.get()); @@ -45,7 +45,7 @@ TEST(TestWebGraphicsContext3DTest, SetAndGetTextureParameter) { scoped_ptr<TestWebGraphicsContext3D> context( TestWebGraphicsContext3D::Create()); - blink::WebGLId texture = context->createTexture(); + GLuint texture = context->createTexture(); context->bindTexture(GL_TEXTURE_2D, texture); context->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); @@ -59,7 +59,7 @@ TEST(TestWebGraphicsContext3DTest, TestWebGraphicsContext3D::Create()); // Set and get non-default texture parameters on the first texture. - blink::WebGLId first_texture = context->createTexture(); + GLuint first_texture = context->createTexture(); context->bindTexture(GL_TEXTURE_2D, first_texture); context->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); context->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -71,7 +71,7 @@ TEST(TestWebGraphicsContext3DTest, // Set and get different, non-default texture parameters on the second // texture. - blink::WebGLId second_texture = context->createTexture(); + GLuint second_texture = context->createTexture(); context->bindTexture(GL_TEXTURE_2D, second_texture); context->texParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); |