Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Unified Diff: content/browser/renderer_host/media/video_capture_device_client.cc

Issue 1359163005: Remove surface_id from RenderWidget/RenderWidgetHost and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@channel_creation_preempt
Patch Set: fix more tests Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/video_capture_device_client.cc
diff --git a/content/browser/renderer_host/media/video_capture_device_client.cc b/content/browser/renderer_host/media/video_capture_device_client.cc
index 8e8d029638756f8d54086ed078378cbda8487511..fe7c623fcbfe61df38918be95cd55aa56282f431 100644
--- a/content/browser/renderer_host/media/video_capture_device_client.cc
+++ b/content/browser/renderer_host/media/video_capture_device_client.cc
@@ -42,8 +42,7 @@ 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";
@@ -61,15 +60,11 @@ scoped_ptr<content::WebGraphicsContext3DCommandBufferImpl> CreateContextCommon(
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
@@ -85,7 +80,7 @@ CreateOffscreenCommandBufferContext() {
content::BrowserGpuChannelHostFactory::instance()->
EstablishGpuChannelSync(cause));
DCHECK(gpu_channel_host);
- return CreateContextCommon(gpu_channel_host, 0);
+ return CreateContextCommon(gpu_channel_host);
}
#endif

Powered by Google App Engine
This is Rietveld 408576698