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_texture.h | |
| 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_texture.h')
| -rw-r--r-- | cc/test/test_texture.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/test/test_texture.h b/cc/test/test_texture.h index 71015c8..f5070e1 100644 --- a/cc/test/test_texture.h +++ b/cc/test/test_texture.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "cc/resources/resource_format.h" -#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" +#include "third_party/khronos/GLES2/gl2.h" #include "ui/gfx/size.h" namespace cc { @@ -20,13 +20,13 @@ struct TestTexture : public base::RefCounted<TestTexture> { TestTexture(); void Reallocate(gfx::Size size, ResourceFormat format); - bool IsValidParameter(blink::WGC3Denum pname); + bool IsValidParameter(GLenum pname); gfx::Size size; ResourceFormat format; scoped_ptr<uint8_t[]> data; - typedef base::hash_map<blink::WGC3Denum, blink::WGC3Dint> + typedef base::hash_map<GLenum, GLint> TextureParametersMap; TextureParametersMap params; |