Index: content/browser/renderer_host/render_view_host_impl.cc |
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc |
index 7b599eabc86fd6e14d77a2571999bbf6e2303f27..c6d18cbe83620c225cba490ff2fd4c86b1e713ae 100644 |
--- a/content/browser/renderer_host/render_view_host_impl.cc |
+++ b/content/browser/renderer_host/render_view_host_impl.cc |
@@ -295,8 +295,14 @@ bool RenderViewHostImpl::CreateRenderView( |
set_renderer_initialized(true); |
- GpuSurfaceTracker::Get()->SetSurfaceHandle( |
- surface_id(), GetCompositingSurface()); |
+ if (proxy_route_id == MSG_ROUTING_NONE) { |
+ GpuSurfaceTracker::Get()->SetSurfaceHandle(surface_id(), |
+ GetCompositingSurface()); |
+ } else { |
+ GpuSurfaceTracker::Get()->SetSurfaceHandle( |
Charlie Reis
2015/08/28 18:58:26
Is this case ever reached? I don't see a path whe
lfg
2015/08/28 21:18:40
The only place that can call this function with a
|
+ surface_id(), |
+ gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::NULL_TRANSPORT)); |
+ } |
// Ensure the RenderView starts with a next_page_id larger than any existing |
// page ID it might be asked to render. |