Chromium roll (https://codereview.chromium.org/976353002)

gpu/blink/webgraphicscontext3d_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 "gpu/blink/webgraphicscontext3d_impl.h"
 
 #include "base/atomicops.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "gpu/GLES2/gl2extchromium.h"
@@ skipping 791 matching lines @@
   gl_->DeleteQueriesEXT(1, &query);
 }
 
 DELEGATE_TO_GL_1R(isQueryEXT, IsQueryEXT, WebGLId, WGC3Dboolean)
 DELEGATE_TO_GL_2(beginQueryEXT, BeginQueryEXT, WGC3Denum, WebGLId)
 DELEGATE_TO_GL_1(endQueryEXT, EndQueryEXT, WGC3Denum)
 DELEGATE_TO_GL_3(getQueryivEXT, GetQueryivEXT, WGC3Denum, WGC3Denum, WGC3Dint*)
 DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivEXT,
                  WebGLId, WGC3Denum, WGC3Duint*)
 
-DELEGATE_TO_GL_6(copyTextureCHROMIUM, CopyTextureCHROMIUM,  WGC3Denum,
-                 WebGLId, WebGLId, WGC3Dint, WGC3Denum, WGC3Denum);
+void WebGraphicsContext3DImpl::copyTextureCHROMIUM(WGC3Denum target,
+                                                   WebGLId source_id,
+                                                   WebGLId dest_id,
+                                                   WGC3Dint level,
+                                                   WGC3Denum internal_format,
+                                                   WGC3Denum dest_type) {
+  copyTextureCHROMIUM(target, source_id, dest_id, internal_format, dest_type);
+}
+
+void WebGraphicsContext3DImpl::copySubTextureCHROMIUM(WGC3Denum target,
+                                                      WebGLId source_id,
+                                                      WebGLId dest_id,
+                                                      WGC3Dint level,
+                                                      WGC3Dint xoffset,
+                                                      WGC3Dint yoffset) {
+  copySubTextureCHROMIUM(target, source_id, dest_id, xoffset, yoffset);
+}
+
+DELEGATE_TO_GL_5(copyTextureCHROMIUM,
+                 CopyTextureCHROMIUM,
+                 WGC3Denum,
+                 WebGLId,
+                 WebGLId,
+                 WGC3Denum,
+                 WGC3Denum);
+
+DELEGATE_TO_GL_5(copySubTextureCHROMIUM,
+                 CopySubTextureCHROMIUM,
+                 WGC3Denum,
+                 WebGLId,
+                 WebGLId,
+                 WGC3Dint,
+                 WGC3Dint);
 
 DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM,
                  WebGLId, WGC3Dint, const WGC3Dchar*)
 
 void WebGraphicsContext3DImpl::shallowFlushCHROMIUM() {
   flush_id_ = GenFlushID();
   gl_->ShallowFlushCHROMIUM();
 }
 
 void WebGraphicsContext3DImpl::shallowFinishCHROMIUM() {
@@ skipping 352 matching lines @@
     const blink::WebGraphicsContext3D::Attributes& attributes,
     ::gpu::gles2::ContextCreationAttribHelper* output_attribs) {
   output_attribs->alpha_size = attributes.alpha ? 8 : 0;
   output_attribs->depth_size = attributes.depth ? 24 : 0;
   output_attribs->stencil_size = attributes.stencil ? 8 : 0;
   output_attribs->samples = attributes.antialias ? 4 : 0;
   output_attribs->sample_buffers = attributes.antialias ? 1 : 0;
   output_attribs->fail_if_major_perf_caveat =
       attributes.failIfMajorPerformanceCaveat;
   output_attribs->bind_generates_resource = false;
+  output_attribs->es3_context_required =
+      (attributes.webGL && attributes.webGLVersion == 2);
 }
 
 }  // namespace gpu_blink