Remove create/delete methods from WebGraphicsContext3D.

components/test_runner/test_plugin.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_TEST_RUNNER_TEST_PLUGIN_H_
 #define COMPONENTS_TEST_RUNNER_TEST_PLUGIN_H_
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/layers/texture_layer_client.h"
 #include "third_party/WebKit/public/platform/WebExternalTextureLayer.h"
 #include "third_party/WebKit/public/platform/WebExternalTextureLayerClient.h"
 #include "third_party/WebKit/public/platform/WebExternalTextureMailbox.h"
 #include "third_party/WebKit/public/platform/WebLayer.h"
 #include "third_party/WebKit/public/web/WebPlugin.h"
 #include "third_party/WebKit/public/web/WebPluginContainer.h"
+#include "third_party/khronos/GLES2/gl2.h"
 
 namespace blink {
 class WebFrame;
 class WebGraphicsContext3D;
 class WebGraphicsContext3DProvider;
 class WebLayer;
 struct WebPluginParams;
 }
 
 namespace cc {
@@ skipping 72 matching lines @@
 
  private:
   TestPlugin(blink::WebFrame* frame,
              const blink::WebPluginParams& params,
              WebTestDelegate* delegate);
 
   enum Primitive { PrimitiveNone, PrimitiveTriangle };
 
   struct Scene {
     Primitive primitive;
-    unsigned background_color[3];
-    unsigned primitive_color[3];
+    uint8_t background_color[3];
+    uint8_t primitive_color[3];
     float opacity;
 
-    unsigned vbo;
-    unsigned program;
+    GLuint vbo;
+    GLuint program;
     int color_location;
     int position_location;
 
     Scene()
         : primitive(PrimitiveNone),
           opacity(1.0f)  // Fully opaque.
           ,
           vbo(0),
           program(0),
           color_location(-1),
           position_location(-1) {
       background_color[0] = background_color[1] = background_color[2] = 0;
       primitive_color[0] = primitive_color[1] = primitive_color[2] = 0;
     }
   };
 
   // Functions for parsing plugin parameters.
   Primitive ParsePrimitive(const blink::WebString& string);
-  void ParseColor(const blink::WebString& string, unsigned color[3]);
+  void ParseColor(const blink::WebString& string, uint8_t color[3]);
   float ParseOpacity(const blink::WebString& string);
   bool ParseBoolean(const blink::WebString& string);
 
   // Functions for loading and drawing scene in GL.
   bool InitScene();
   void DrawSceneGL();
   void DestroyScene();
   bool InitProgram();
   bool InitPrimitive();
   void DrawPrimitive();
-  unsigned LoadShader(unsigned type, const std::string& source);
-  unsigned LoadProgram(const std::string& vertex_source,
-                       const std::string& fragment_source);
+  GLuint LoadShader(GLenum type, const std::string& source);
+  GLuint LoadProgram(const std::string& vertex_source,
+                     const std::string& fragment_source);
 
   // Functions for drawing scene in Software.
   void DrawSceneSoftware(void* memory);
 
   blink::WebFrame* frame_;
   WebTestDelegate* delegate_;
   blink::WebPluginContainer* container_;
 
   blink::WebRect rect_;
   scoped_ptr<blink::WebGraphicsContext3DProvider> context_provider_;
   blink::WebGraphicsContext3D* context_;
   gpu::gles2::GLES2Interface* gl_;
-  unsigned color_texture_;
+  GLuint color_texture_;
   cc::TextureMailbox texture_mailbox_;
   scoped_ptr<cc::SharedBitmap> shared_bitmap_;
   bool mailbox_changed_;
-  unsigned framebuffer_;
+  GLuint framebuffer_;
   Scene scene_;
   scoped_refptr<cc::TextureLayer> layer_;
   scoped_ptr<blink::WebLayer> web_layer_;
 
   blink::WebPluginContainer::TouchEventRequestType touch_event_request_;
   // Requests touch events from the WebPluginContainerImpl multiple times to
   // tickle webkit.org/b/108381
   bool re_request_touch_events_;
   bool print_event_details_;
   bool print_user_gesture_status_;
   bool can_process_drag_;
   bool supports_keyboard_focus_;
 
   bool is_persistent_;
   bool can_create_without_renderer_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPlugin);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_TEST_PLUGIN_H_