Remove surface_id from RenderWidget/RenderWidgetHost and friends

content/browser/renderer_host/media/video_capture_device_client.cc

 // Copyright 2015 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/browser/renderer_host/media/video_capture_device_client.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 24 matching lines @@
 using media::VideoFrame;
 using media::VideoFrameMetadata;
 
 namespace content {
 
 namespace {
 
 #if !defined(OS_ANDROID)
 // Modelled after GpuProcessTransportFactory::CreateContextCommon().
 scoped_ptr<content::WebGraphicsContext3DCommandBufferImpl> CreateContextCommon(
-    scoped_refptr<content::GpuChannelHost> gpu_channel_host,
-    int surface_id) {
+    scoped_refptr<content::GpuChannelHost> gpu_channel_host) {
   if (!content::GpuDataManagerImpl::GetInstance()->
         CanUseGpuBrowserCompositor()) {
     DLOG(ERROR) << "No accelerated graphics found. Check chrome://gpu";
     return scoped_ptr<content::WebGraphicsContext3DCommandBufferImpl>();
   }
   blink::WebGraphicsContext3D::Attributes attrs;
   attrs.shareResources = true;
   attrs.depth = false;
   attrs.stencil = false;
   attrs.antialias = false;
   attrs.noAutomaticFlushes = true;
 
   if (!gpu_channel_host.get()) {
     DLOG(ERROR) << "Failed to establish GPU channel.";
     return scoped_ptr<content::WebGraphicsContext3DCommandBufferImpl>();
   }
   GURL url("chrome://gpu/GpuProcessTransportFactory::CreateCaptureContext");
-  return make_scoped_ptr(
-      new WebGraphicsContext3DCommandBufferImpl(
-          surface_id,
-          url,
-          gpu_channel_host.get(),
-          attrs,
-          true  /* lose_context_when_out_of_memory */,
-          content::WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits(),
-          NULL));
+  return make_scoped_ptr(new WebGraphicsContext3DCommandBufferImpl(
+      0, url, gpu_channel_host.get(), attrs,
+      true /* lose_context_when_out_of_memory */,
+      content::WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits(),
+      NULL));
 }
 
 // Modelled after
 // GpuProcessTransportFactory::CreateOffscreenCommandBufferContext().
 scoped_ptr<content::WebGraphicsContext3DCommandBufferImpl>
 CreateOffscreenCommandBufferContext() {
   content::CauseForGpuLaunch cause = content::CAUSE_FOR_GPU_LAUNCH_CANVAS_2D;
   // Android does not support synchronous opening of GPU channels. Should use
   // EstablishGpuChannel() instead.
   if (!content::BrowserGpuChannelHostFactory::instance())
     return scoped_ptr<content::WebGraphicsContext3DCommandBufferImpl>();
   scoped_refptr<content::GpuChannelHost> gpu_channel_host(
       content::BrowserGpuChannelHostFactory::instance()->
           EstablishGpuChannelSync(cause));
   DCHECK(gpu_channel_host);
-  return CreateContextCommon(gpu_channel_host, 0);
+  return CreateContextCommon(gpu_channel_host);
 }
 #endif
 
 typedef base::Callback<void(scoped_refptr<ContextProviderCommandBuffer>)>
     ProcessContextCallback;
 
 void CreateContextOnUIThread(ProcessContextCallback bottom_half) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 #if !defined(OS_ANDROID)
   bottom_half.Run(ContextProviderCommandBuffer::Create(
@@ skipping 667 matching lines @@
 void VideoCaptureDeviceClient::TextureWrapHelper::OnError(
     const std::string& message) {
   DCHECK(capture_task_runner_->BelongsToCurrentThread());
   DLOG(ERROR) << message;
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&VideoCaptureController::DoErrorOnIOThread, controller_));
 }
 
 }  // namespace content