Remove GraphicsContext3D:: stubs from cc

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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=162839

[enne (OOO), 2012-10-12 00:06:09]

https://codereview.chromium.org/11111005/diff/1/cc/test/FakeWebGraphicsContex...
File cc/test/FakeWebGraphicsContext3D.h (right):

https://codereview.chromium.org/11111005/diff/1/cc/test/FakeWebGraphicsContex...
cc/test/FakeWebGraphicsContext3D.h:248: virtual void beginQueryEXT(GLenum,
WebGLId) { }
These look wrong.  Something overriding WebGraphicsContext3D should not be using
GLenum, even if it maps to the same thing underneath.

[jamesr, 2012-10-12 00:07:13]

On 2012/10/12 00:06:09, enne wrote:
>
https://codereview.chromium.org/11111005/diff/1/cc/test/FakeWebGraphicsContex...
> File cc/test/FakeWebGraphicsContext3D.h (right):
> 
>
https://codereview.chromium.org/11111005/diff/1/cc/test/FakeWebGraphicsContex...
> cc/test/FakeWebGraphicsContext3D.h:248: virtual void beginQueryEXT(GLenum,
> WebGLId) { }
> These look wrong.  Something overriding WebGraphicsContext3D should not be
using
> GLenum, even if it maps to the same thing underneath.

That's true, but it also doesn't matter AFAICT.  These aren't going to change.

[enne (OOO), 2012-10-12 00:28:07]

On 2012/10/12 00:07:13, jamesr wrote:
> On 2012/10/12 00:06:09, enne wrote:
> >
>
https://codereview.chromium.org/11111005/diff/1/cc/test/FakeWebGraphicsContex...
> > File cc/test/FakeWebGraphicsContext3D.h (right):
> > 
> >
>
https://codereview.chromium.org/11111005/diff/1/cc/test/FakeWebGraphicsContex...
> > cc/test/FakeWebGraphicsContext3D.h:248: virtual void beginQueryEXT(GLenum,
> > WebGLId) { }
> > These look wrong.  Something overriding WebGraphicsContext3D should not be
> using
> > GLenum, even if it maps to the same thing underneath.
> 
> That's true, but it also doesn't matter AFAICT.  These aren't going to change.

I'm not sure I follow.

[jamesr, 2012-10-15 21:02:26]

PTAL.

In this patch I'm using the gl2.h types + values in all actual code and using
the WGC3D* types in mocks+fakes of WebGraphicsContext3D.  We'll have to rewrite
the mocks/fakes so having these types is OK.  This patch removes all uses of
GraphicsContext3D:: and GC3D* types.

[jamesr, 2012-10-15 21:21:36]

Sent tryjobs out here: https://codereview.chromium.org/11150025 - something is
unhappy with the file deletions in this patch.

Most of this was generated by the following sed script:

s/WebGraphicsContext3D/WebGraphicsAAAAAContext3D/g
s/WebSharedGraphicsContext3D/WebSharedGraphicsAAAAAContext3D/g
s/Extensions3DChromium::/GL_/g
s/Extensions3D::/GL_/g
s/GraphicsContext3D::/GL_/g
s/WebGraphicsAAAAAContext3D/WebGraphicsContext3D/g
s/WebSharedGraphicsAAAAAContext3D/WebSharedGraphicsContext3D/g
s?#include "GraphicsContext3D.h"?#include "third_party/khronos/GLES2/gl2.h"?
s?#include "GraphicsTypes3D.h"?#include "third_party/khronos/GLES2/gl2.h"?
s?#include "Extensions3D.h"?#include "third_party/khronos/GLES2/gl2ext.h"?
s?#include "Extensions3DChromium.h"?#include
"third_party/khronos/GLES2/gl2ext.h"?
s/GC3Denum/GLenum/g
s/WGLenum/WGC3Denum/g
s/Platform3DObject/GLuint/g
s/GC3Dbyte/GLbyte/g
s/WGLbyte/WGC3Dbyte/g
s/GC3Dint/GLint/g
s/WGLint/WGC3Dint/g
s/GL_GL_/GL_/g

[enne (OOO), 2012-10-15 21:32:45]

lgtm

[commit-bot: I haz the power, 2012-10-16 21:03:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jamesr@chromium.org/11111005/24001

[commit-bot: I haz the power, 2012-10-17 11:15:07]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jamesr@chromium.org/11111005/24001

[commit-bot: I haz the power, 2012-10-17 11:15:23]

Failed to apply patch for cc/layer_tree_host_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/layer_tree_host_unittest.cc
  Hunk #1 FAILED at 15.
  1 out of 4 hunks FAILED -- saving rejects to file
cc/layer_tree_host_unittest.cc.rej

Patch:       cc/layer_tree_host_unittest.cc
Index: cc/layer_tree_host_unittest.cc
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index
a79295ac9846b79c5ca879d2858da6c96219ad23..37da7903e6552ae228310c8f12b7814050154b37
100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -15,12 +15,13 @@
 #include "CCTimingFunction.h"
 #include "ContentLayerChromium.h"
 #include "ContentLayerChromiumClient.h"
-#include "Extensions3DChromium.h"
 #include "base/synchronization/lock.h"
 #include "cc/test/fake_web_compositor_output_surface.h"
 #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);
     }
 
@@ -2723,8 +2724,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) {
@@ -2732,10 +2733,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;
     }

[commit-bot: I haz the power, 2012-10-18 21:13:30]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jamesr@chromium.org/11111005/31001

[commit-bot: I haz the power, 2012-10-18 23:35:45]

Change committed as 162839