Remove framebufferRenderbuffer and framebufferTexture* from WGC3D.

components/test_runner/test_plugin.cc

 // 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.
 
 #include "components/test_runner/test_plugin.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "base/strings/stringprintf.h"
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "components/test_runner/web_test_delegate.h"
+#include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebCompositorSupport.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/public/platform/WebTaskRunner.h"
 #include "third_party/WebKit/public/platform/WebThread.h"
 #include "third_party/WebKit/public/platform/WebTraceLocation.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "third_party/WebKit/public/web/WebTouchPoint.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 
 namespace test_runner {
 
 namespace {
 
-// GLenum values copied from gl2.h.
-#define GL_FALSE 0
-#define GL_TRUE 1
-#define GL_ONE 1
-#define GL_TRIANGLES 0x0004
-#define GL_ONE_MINUS_SRC_ALPHA 0x0303
-#define GL_DEPTH_TEST 0x0B71
-#define GL_BLEND 0x0BE2
-#define GL_SCISSOR_TEST 0x0B90
-#define GL_TEXTURE_2D 0x0DE1
-#define GL_FLOAT 0x1406
-#define GL_RGBA 0x1908
-#define GL_UNSIGNED_BYTE 0x1401
-#define GL_TEXTURE_MAG_FILTER 0x2800
-#define GL_TEXTURE_MIN_FILTER 0x2801
-#define GL_TEXTURE_WRAP_S 0x2802
-#define GL_TEXTURE_WRAP_T 0x2803
-#define GL_NEAREST 0x2600
-#define GL_COLOR_BUFFER_BIT 0x4000
-#define GL_CLAMP_TO_EDGE 0x812F
-#define GL_ARRAY_BUFFER 0x8892
-#define GL_STATIC_DRAW 0x88E4
-#define GL_FRAGMENT_SHADER 0x8B30
-#define GL_VERTEX_SHADER 0x8B31
-#define GL_COMPILE_STATUS 0x8B81
-#define GL_LINK_STATUS 0x8B82
-#define GL_COLOR_ATTACHMENT0 0x8CE0
-#define GL_FRAMEBUFFER_COMPLETE 0x8CD5
-#define GL_FRAMEBUFFER 0x8D40
-
 void PremultiplyAlpha(const unsigned color_in[3],
                       float alpha,
                       float color_out[4]) {
   for (int i = 0; i < 3; ++i)
     color_out[i] = (color_in[i] / 255.0f) * alpha;
 
   color_out[3] = alpha;
 }
 
 const char* PointState(blink::WebTouchPoint::State state) {
@@ skipping 61 matching lines @@
   scoped_ptr<TestPlugin> plugin_;
 };
 
 }  // namespace
 
 TestPlugin::TestPlugin(blink::WebFrame* frame,
                        const blink::WebPluginParams& params,
                        WebTestDelegate* delegate)
     : frame_(frame),
       delegate_(delegate),
-      container_(0),
-      context_(0),
+      container_(nullptr),
+      context_(nullptr),
+      gl_(nullptr),
       color_texture_(0),
       mailbox_changed_(false),
       framebuffer_(0),
       touch_event_request_(
           blink::WebPluginContainer::TouchEventRequestTypeNone),
       re_request_touch_events_(false),
       print_event_details_(false),
       print_user_gesture_status_(false),
       can_process_drag_(false),
       supports_keyboard_focus_(false),
@@ skipping 32 matching lines @@
         std::string("TestPlugin: canCreateWithoutRenderer\n"));
 }
 
 TestPlugin::~TestPlugin() {
 }
 
 bool TestPlugin::initialize(blink::WebPluginContainer* container) {
   blink::WebGraphicsContext3D::Attributes attrs;
   context_ =
       blink::Platform::current()->createOffscreenGraphicsContext3D(attrs);
+  gl_ = context_->getGLES2Interface();
 
   if (!InitScene())
     return false;
 
   layer_ = cc::TextureLayer::CreateForMailbox(this);
   web_layer_ = make_scoped_ptr(new cc_blink::WebLayerImpl(layer_));
   container_ = container;
   container_->setWebLayer(web_layer_.get());
   if (re_request_touch_events_) {
     container_->requestTouchEventType(
         blink::WebPluginContainer::TouchEventRequestTypeSynthesizedMouse);
     container_->requestTouchEventType(
         blink::WebPluginContainer::TouchEventRequestTypeRaw);
   }
   container_->requestTouchEventType(touch_event_request_);
   container_->setWantsWheelEvents(true);
   return true;
 }
 
 void TestPlugin::destroy() {
   if (layer_.get())
     layer_->ClearTexture();
   if (container_)
     container_->setWebLayer(0);
   web_layer_.reset();
   layer_ = NULL;
   DestroyScene();
 
+  gl_ = nullptr;
   delete context_;
-  context_ = 0;
+  context_ = nullptr;
 
-  container_ = 0;
-  frame_ = 0;
+  container_ = nullptr;
+  frame_ = nullptr;
 
   blink::Platform::current()->mainThread()->getWebTaskRunner()->postTask(
       blink::WebTraceLocation(__FUNCTION__, __FILE__),
       new DeferredDeleteTask(make_scoped_ptr(this)));
 }
 
 NPObject* TestPlugin::scriptableObject() {
   return 0;
 }
 
@@ skipping 28 matching lines @@
     context_->texImage2D(GL_TEXTURE_2D,
                          0,
                          GL_RGBA,
                          rect_.width,
                          rect_.height,
                          0,
                          GL_RGBA,
                          GL_UNSIGNED_BYTE,
                          0);
     context_->bindFramebuffer(GL_FRAMEBUFFER, framebuffer_);
-    context_->framebufferTexture2D(
-        GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, color_texture_, 0);
+    gl_->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                              GL_TEXTURE_2D, color_texture_, 0);
 
     DrawSceneGL();
 
     gpu::Mailbox mailbox;
     context_->genMailboxCHROMIUM(mailbox.name);
     context_->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
     const blink::WGC3Duint64 fence_sync = context_->insertFenceSyncCHROMIUM();
     context_->flush();
 
     gpu::SyncToken sync_token;
@@ skipping 459 matching lines @@
   return kPluginPersistsMimeType;
 }
 
 bool TestPlugin::IsSupportedMimeType(const blink::WebString& mime_type) {
   return mime_type == TestPlugin::MimeType() ||
          mime_type == PluginPersistsMimeType() ||
          mime_type == CanCreateWithoutRendererMimeType();
 }
 
 }  // namespace test_runner