Index: content/browser/compositor/gpu_process_transport_factory.cc |
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc |
index fcb0a3e8abbb6ad1aefafb3486866c28e8c03371..bf5e4d36dccc4d47e7b7140635b083d1dded1786 100644 |
--- a/content/browser/compositor/gpu_process_transport_factory.cc |
+++ b/content/browser/compositor/gpu_process_transport_factory.cc |
@@ -129,11 +129,12 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() { |
scoped_ptr<WebGraphicsContext3DCommandBufferImpl> |
GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() { |
- CauseForGpuLaunch cause = |
- CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE; |
- scoped_refptr<GpuChannelHost> gpu_channel_host( |
- BrowserGpuChannelHostFactory::instance()->EstablishGpuChannelSync(cause)); |
- return CreateContextCommon(gpu_channel_host, 0); |
+// CauseForGpuLaunch cause = |
+// CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE; |
+// scoped_refptr<GpuChannelHost> gpu_channel_host( |
+// BrowserGpuChannelHostFactory::instance()->EstablishGpuChannelSync(cause)); |
+// return CreateContextCommon(gpu_channel_host, 0); |
+ return CreateContextCommon(scoped_refptr<GpuChannelHost>(nullptr), 0); |
} |
scoped_ptr<cc::SoftwareOutputDevice> |
@@ -534,7 +535,7 @@ GpuProcessTransportFactory::CreatePerCompositorData( |
} else { |
data->surface_id = tracker->AddSurfaceForNativeWidget(widget); |
tracker->SetSurfaceHandle(data->surface_id, |
- gfx::GLSurfaceHandle(widget, gfx::NATIVE_DIRECT)); |
+ gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::NATIVE_DIRECT)); |
no sievers
2015/10/20 19:24:22
this is fixed upstream and should compile on andro
|
} |
per_compositor_data_[compositor] = data; |