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/layer_tree_host_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/layer_tree_host_unittest.cc')
| -rw-r--r-- | cc/layer_tree_host_unittest.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc index a91304e..4c55d65 100644 --- a/cc/layer_tree_host_unittest.cc +++ b/cc/layer_tree_host_unittest.cc @@ -13,7 +13,6 @@ #include "CCTextureUpdateQueue.h" #include "CCThreadedTest.h" #include "CCTimingFunction.h" -#include "Extensions3DChromium.h" #include "base/synchronization/lock.h" #include "cc/content_layer.h" #include "cc/content_layer_client.h" @@ -21,6 +20,8 @@ #include "cc/test/geometry_test_utils.h" #include "cc/test/occlusion_tracker_test_common.h" #include "testing/gmock/include/gmock/gmock.h" +#include "third_party/khronos/GLES2/gl2.h" +#include "third_party/khronos/GLES2/gl2ext.h" #include <public/Platform.h> #include <public/WebLayerScrollClient.h> #include <public/WebSize.h> @@ -2419,7 +2420,7 @@ private: if (m_texture.get()) return; m_texture = CCPrioritizedTexture::create(layerTreeHost()->contentsTextureManager()); - m_texture->setDimensions(IntSize(10, 10), cc::GraphicsContext3D::RGBA); + m_texture->setDimensions(IntSize(10, 10), GL_RGBA); m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10); } @@ -2725,8 +2726,8 @@ public: virtual void setContextLostCallback(WebGraphicsContextLostCallback* callback) { m_contextLostCallback = callback; } virtual bool isContextLost() { return m_isContextLost; } - virtual void beginQueryEXT(GC3Denum, WebGLId) { } - virtual void endQueryEXT(GC3Denum) + virtual void beginQueryEXT(WGC3Denum, WebGLId) { } + virtual void endQueryEXT(WGC3Denum) { // Lose context. if (!m_isContextLost) { @@ -2734,10 +2735,10 @@ public: m_isContextLost = true; } } - virtual void getQueryObjectuivEXT(WebGLId, GC3Denum pname, GC3Duint* params) + virtual void getQueryObjectuivEXT(WebGLId, WGC3Denum pname, WGC3Duint* params) { // Context is lost. We need to behave as if result is available. - if (pname == Extensions3DChromium::QUERY_RESULT_AVAILABLE_EXT) + if (pname == GL_QUERY_RESULT_AVAILABLE_EXT) *params = 1; } |