Remove WebGraphicsContext3D::getGLES2Interface().

content/renderer/media/android/webmediaplayer_android.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 "content/renderer/media/android/webmediaplayer_android.h"
 
 #include <stddef.h>
 
 #include <limits>
 
@@ skipping 630 matching lines @@
   bool ret = did_loading_progress_;
   did_loading_progress_ = false;
   return ret;
 }
 
 void WebMediaPlayerAndroid::paint(blink::WebCanvas* canvas,
                                   const blink::WebRect& rect,
                                   unsigned char alpha,
                                   SkXfermode::Mode mode) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
-  scoped_ptr<blink::WebGraphicsContext3DProvider> provider =
-    scoped_ptr<blink::WebGraphicsContext3DProvider>(blink::Platform::current(
-      )->createSharedOffscreenGraphicsContext3DProvider());
+  scoped_ptr<blink::WebGraphicsContext3DProvider> provider(
+      blink::Platform::current()
+          ->createSharedOffscreenGraphicsContext3DProvider());
   if (!provider)
     return;
-  blink::WebGraphicsContext3D* context3D = provider->context3d();
-  if (!context3D)
-    return;
+  gpu::gles2::GLES2Interface* gl = provider->contextGL();
 
   // Copy video texture into a RGBA texture based bitmap first as video texture
   // on Android is GL_TEXTURE_EXTERNAL_OES which is not supported by Skia yet.
   // The bitmap's size needs to be the same as the video and use naturalSize()
   // here. Check if we could reuse existing texture based bitmap.
   // Otherwise, release existing texture based bitmap and allocate
   // a new one based on video size.
   if (!IsSkBitmapProperlySizedTexture(&bitmap_, naturalSize())) {
     if (!AllocateSkBitmapTexture(provider->grContext(), &bitmap_,
                                  naturalSize())) {
       return;
     }
   }
 
   unsigned textureId = skia::GrBackendObjectToGrGLTextureInfo(
                            (bitmap_.getTexture())->getTextureHandle())
                            ->fID;
-  if (!copyVideoTextureToPlatformTexture(context3D, textureId,
-      GL_RGBA, GL_UNSIGNED_BYTE, true, false)) {
+  if (!copyVideoTextureToPlatformTexture(gl, textureId, GL_RGBA,
+                                         GL_UNSIGNED_BYTE, true, false)) {
     return;
   }
 
   // Ensure SkBitmap to make the latest change by external source visible.
   bitmap_.notifyPixelsChanged();
 
   // Draw the texture based bitmap onto the Canvas. If the canvas is
   // hardware based, this will do a GPU-GPU texture copy.
   // If the canvas is software based, the texture based bitmap will be
   // readbacked to system memory then draw onto the canvas.
   SkRect dest;
   dest.set(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
   SkPaint paint;
   paint.setAlpha(alpha);
   paint.setXfermodeMode(mode);
   // It is not necessary to pass the dest into the drawBitmap call since all
   // the context have been set up before calling paintCurrentFrameInContext.
   canvas->drawBitmapRect(bitmap_, dest, &paint);
   canvas->flush();
 }
 
 bool WebMediaPlayerAndroid::copyVideoTextureToPlatformTexture(
-    blink::WebGraphicsContext3D* web_graphics_context,
+    gpu::gles2::GLES2Interface* gl,
     unsigned int texture,
     unsigned int internal_format,
     unsigned int type,
     bool premultiply_alpha,
     bool flip_y) {
   // TODO(danakj): Pass a GLES2Interface to this method instead.

[DaleCurtis, 2016/03/25 22:32:00]

Delete todo?

[danakj, 2016/03/25 22:36:44]

:D

-  gpu::gles2::GLES2Interface* gl = web_graphics_context->getGLES2Interface();
   DCHECK(main_thread_checker_.CalledOnValidThread());
   // Don't allow clients to copy an encrypted video frame.
   if (needs_external_surface_)
     return false;
 
   scoped_refptr<VideoFrame> video_frame;
   {
     base::AutoLock auto_lock(current_frame_lock_);
     video_frame = current_frame_;
   }
@@ skipping 957 matching lines @@
     result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER;
   } else if (is_hls_url == is_hls) {
     result = PREDICTION_RESULT_URL_BASED_WAS_BETTER;
   }
   UMA_HISTOGRAM_ENUMERATION(
       "Media.Android.IsHttpLiveStreamingMediaPredictionResult",
       result, PREDICTION_RESULT_MAX);
 }
 
 }  // namespace content