Remove WGC3D::width(), height(), reshape() implementations

webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 #include <GLES2/gl2.h>
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
@@ skipping 109 matching lines @@
         gfx::AcceleratedWidget window)
     : is_offscreen_(is_offscreen),
       window_(window),
       initialized_(false),
       initialize_failed_(false),
       context_(context.Pass()),
       gl_(NULL),
       context_lost_callback_(NULL),
       context_lost_reason_(GL_NO_ERROR),
       attributes_(attributes),
-      cached_width_(0),
-      cached_height_(0),
       flush_id_(0) {
 }
 
 WebGraphicsContext3DInProcessCommandBufferImpl::
     ~WebGraphicsContext3DInProcessCommandBufferImpl() {
 }
 
 // static
 void WebGraphicsContext3DInProcessCommandBufferImpl::ConvertAttributes(
     const WebKit::WebGraphicsContext3D::Attributes& attributes,
@@ skipping 88 matching lines @@
   // direct OpenGL bindings needs to call the appropriate form of
   // eglMakeCurrent. If it doesn't it will be issuing commands on the wrong
   // context. Uncommenting the line below clears the current context so that
   // any code not calling eglMakeCurrent in the appropriate place should crash.
   // This is not a perfect test but generally code that used the direct OpenGL
   // bindings should not be mixed with code that uses WebGraphicsContext3D.
   //
   // GLInProcessContext::MakeCurrent(NULL);
 }
 
-int WebGraphicsContext3DInProcessCommandBufferImpl::width() {
-  return cached_width_;
+// Helper macros to reduce the amount of code.
+
+#define DELEGATE_TO_GL(name, glname)                                    \
+void WebGraphicsContext3DInProcessCommandBufferImpl::name() {           \
+  ClearContext();                                                       \
+  gl_->glname();                                                        \
 }
 
-int WebGraphicsContext3DInProcessCommandBufferImpl::height() {
-  return cached_height_;
+#define DELEGATE_TO_GL_1(name, glname, t1)                              \
+void WebGraphicsContext3DInProcessCommandBufferImpl::name(t1 a1) {      \
+  ClearContext();                                                       \
+  gl_->glname(a1);                                                      \
+}
+
+#define DELEGATE_TO_GL_1R(name, glname, t1, rt)                         \
+rt WebGraphicsContext3DInProcessCommandBufferImpl::name(t1 a1) {        \
+  ClearContext();                                                       \
+  return gl_->glname(a1);                                               \
+}
+
+#define DELEGATE_TO_GL_1RB(name, glname, t1, rt)                        \
+rt WebGraphicsContext3DInProcessCommandBufferImpl::name(t1 a1) {        \
+  ClearContext();                                                       \
+  return gl_->glname(a1) ? true : false;                                \
+}
+
+#define DELEGATE_TO_GL_2(name, glname, t1, t2)                          \
+void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
+    t1 a1, t2 a2) {                                                     \
+  ClearContext();                                                       \
+  gl_->glname(a1, a2);                                                  \
+}
+
+#define DELEGATE_TO_GL_2R(name, glname, t1, t2, rt)                     \
+rt WebGraphicsContext3DInProcessCommandBufferImpl::name(t1 a1, t2 a2) { \
+  ClearContext();                                                       \
+  return gl_->glname(a1, a2);                                           \
+}
+
+#define DELEGATE_TO_GL_3(name, glname, t1, t2, t3)                      \
+void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
+    t1 a1, t2 a2, t3 a3) {                                              \
+  ClearContext();                                                       \
+  gl_->glname(a1, a2, a3);                                              \
+}
+
+#define DELEGATE_TO_GL_3R(name, glname, t1, t2, t3, rt)                 \
+rt WebGraphicsContext3DInProcessCommandBufferImpl::name(                \
+    t1 a1, t2 a2, t3 a3) {                                              \
+  ClearContext();                                                       \
+  return gl_->glname(a1, a2, a3);                                       \
+}
+
+#define DELEGATE_TO_GL_4(name, glname, t1, t2, t3, t4)                  \
+void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
+    t1 a1, t2 a2, t3 a3, t4 a4) {                                       \
+  ClearContext();                                                       \
+  gl_->glname(a1, a2, a3, a4);                                          \
+}
+
+#define DELEGATE_TO_GL_5(name, glname, t1, t2, t3, t4, t5)              \
+void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
+    t1 a1, t2 a2, t3 a3, t4 a4, t5 a5) {                                \
+  ClearContext();                                                       \
+  gl_->glname(a1, a2, a3, a4, a5);                                      \
+}
+
+#define DELEGATE_TO_GL_6(name, glname, t1, t2, t3, t4, t5, t6)          \
+void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
+    t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6) {                         \
+  ClearContext();                                                       \
+  gl_->glname(a1, a2, a3, a4, a5, a6);                                  \
+}
+
+#define DELEGATE_TO_GL_7(name, glname, t1, t2, t3, t4, t5, t6, t7)      \
+void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
+    t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7) {                  \
+  ClearContext();                                                       \
+  gl_->glname(a1, a2, a3, a4, a5, a6, a7);                              \
+}
+
+#define DELEGATE_TO_GL_8(name, glname, t1, t2, t3, t4, t5, t6, t7, t8)  \
+void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
+    t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8) {           \
+  ClearContext();                                                       \
+  gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8);                          \
+}
+
+#define DELEGATE_TO_GL_9(name, glname, t1, t2, t3, t4, t5, t6, t7, t8, t9) \
+void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
+    t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8, t9 a9) {    \
+  ClearContext();                                                       \
+  gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8, a9);                      \
 }
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::prepareTexture() {
   if (!isContextLost()) {
     gl_->SwapBuffers();
     gl_->ShallowFlushCHROMIUM();
   }
 }
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::postSubBufferCHROMIUM(
     int x, int y, int width, int height) {
   gl_->PostSubBufferCHROMIUM(x, y, width, height);
 }
 
-void WebGraphicsContext3DInProcessCommandBufferImpl::reshape(
-    int width, int height) {
-  reshapeWithScaleFactor(width, height, 1.0f);
-}
-
-void WebGraphicsContext3DInProcessCommandBufferImpl::reshapeWithScaleFactor(
-    int width, int height, float scale_factor) {
-  cached_width_ = width;
-  cached_height_ = height;
-
-  // TODO(gmam): See if we can comment this in.
-  // ClearContext();
-
-  gl_->ResizeCHROMIUM(width, height, scale_factor);
-}
+DELEGATE_TO_GL_3(reshapeWithScaleFactor, ResizeCHROMIUM, int, int, float)
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::synthesizeGLError(
     WGC3Denum error) {
   if (std::find(synthetic_errors_.begin(), synthetic_errors_.end(), error) ==
       synthetic_errors_.end()) {
     synthetic_errors_.push_back(error);
   }
 }
 
 void* WebGraphicsContext3DInProcessCommandBufferImpl::mapBufferSubDataCHROMIUM(
@@ skipping 94 matching lines @@
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::
     renderbufferStorageMultisampleCHROMIUM(
         WGC3Denum target, WGC3Dsizei samples, WGC3Denum internalformat,
         WGC3Dsizei width, WGC3Dsizei height) {
   ClearContext();
   gl_->RenderbufferStorageMultisampleEXT(
       target, samples, internalformat, width, height);
 }
 
-// Helper macros to reduce the amount of code.
-
-#define DELEGATE_TO_GL(name, glname)                                    \
-void WebGraphicsContext3DInProcessCommandBufferImpl::name() {           \
-  ClearContext();                                                       \
-  gl_->glname();                                                        \
-}
-
-#define DELEGATE_TO_GL_1(name, glname, t1)                              \
-void WebGraphicsContext3DInProcessCommandBufferImpl::name(t1 a1) {      \
-  ClearContext();                                                       \
-  gl_->glname(a1);                                                      \
-}
-
-#define DELEGATE_TO_GL_1R(name, glname, t1, rt)                         \
-rt WebGraphicsContext3DInProcessCommandBufferImpl::name(t1 a1) {        \
-  ClearContext();                                                       \
-  return gl_->glname(a1);                                               \
-}
-
-#define DELEGATE_TO_GL_1RB(name, glname, t1, rt)                        \
-rt WebGraphicsContext3DInProcessCommandBufferImpl::name(t1 a1) {        \
-  ClearContext();                                                       \
-  return gl_->glname(a1) ? true : false;                                \
-}
-
-#define DELEGATE_TO_GL_2(name, glname, t1, t2)                          \
-void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
-    t1 a1, t2 a2) {                                                     \
-  ClearContext();                                                       \
-  gl_->glname(a1, a2);                                                  \
-}
-
-#define DELEGATE_TO_GL_2R(name, glname, t1, t2, rt)                     \
-rt WebGraphicsContext3DInProcessCommandBufferImpl::name(t1 a1, t2 a2) { \
-  ClearContext();                                                       \
-  return gl_->glname(a1, a2);                                           \
-}
-
-#define DELEGATE_TO_GL_3(name, glname, t1, t2, t3)                      \
-void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
-    t1 a1, t2 a2, t3 a3) {                                              \
-  ClearContext();                                                       \
-  gl_->glname(a1, a2, a3);                                              \
-}
-
-#define DELEGATE_TO_GL_3R(name, glname, t1, t2, t3, rt)                 \
-rt WebGraphicsContext3DInProcessCommandBufferImpl::name(                \
-    t1 a1, t2 a2, t3 a3) {                                              \
-  ClearContext();                                                       \
-  return gl_->glname(a1, a2, a3);                                       \
-}
-
-#define DELEGATE_TO_GL_4(name, glname, t1, t2, t3, t4)                  \
-void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
-    t1 a1, t2 a2, t3 a3, t4 a4) {                                       \
-  ClearContext();                                                       \
-  gl_->glname(a1, a2, a3, a4);                                          \
-}
-
-#define DELEGATE_TO_GL_5(name, glname, t1, t2, t3, t4, t5)              \
-void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
-    t1 a1, t2 a2, t3 a3, t4 a4, t5 a5) {                                \
-  ClearContext();                                                       \
-  gl_->glname(a1, a2, a3, a4, a5);                                      \
-}
-
-#define DELEGATE_TO_GL_6(name, glname, t1, t2, t3, t4, t5, t6)          \
-void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
-    t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6) {                         \
-  ClearContext();                                                       \
-  gl_->glname(a1, a2, a3, a4, a5, a6);                                  \
-}
-
-#define DELEGATE_TO_GL_7(name, glname, t1, t2, t3, t4, t5, t6, t7)      \
-void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
-    t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7) {                  \
-  ClearContext();                                                       \
-  gl_->glname(a1, a2, a3, a4, a5, a6, a7);                              \
-}
-
-#define DELEGATE_TO_GL_8(name, glname, t1, t2, t3, t4, t5, t6, t7, t8)  \
-void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
-    t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8) {           \
-  ClearContext();                                                       \
-  gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8);                          \
-}
-
-#define DELEGATE_TO_GL_9(name, glname, t1, t2, t3, t4, t5, t6, t7, t8, t9) \
-void WebGraphicsContext3DInProcessCommandBufferImpl::name(              \
-    t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8, t9 a9) {    \
-  ClearContext();                                                       \
-  gl_->glname(a1, a2, a3, a4, a5, a6, a7, a8, a9);                      \
-}
-
 DELEGATE_TO_GL_1(activeTexture, ActiveTexture, WGC3Denum)
 
 DELEGATE_TO_GL_2(attachShader, AttachShader, WebGLId, WebGLId)
 
 DELEGATE_TO_GL_3(bindAttribLocation, BindAttribLocation, WebGLId,
                  WGC3Duint, const WGC3Dchar*)
 
 DELEGATE_TO_GL_2(bindBuffer, BindBuffer, WGC3Denum, WebGLId)
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::bindFramebuffer(
@@ skipping 738 matching lines @@
 
 DELEGATE_TO_GL_9(asyncTexSubImage2DCHROMIUM, AsyncTexSubImage2DCHROMIUM,
     WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei,
     WGC3Denum, WGC3Denum, const void*)
 
 DELEGATE_TO_GL_1(waitAsyncTexImage2DCHROMIUM, WaitAsyncTexImage2DCHROMIUM,
     WGC3Denum)
 
 }  // namespace gpu
 }  // namespace webkit