Index: content/browser/renderer_host/render_view_host.cc |
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc |
index dfc0fb9342341ec93c6e042a37a728aee828ac3c..73bf38d0b6d6c40a5dfa94398dde1af82ad433a8 100644 |
--- a/content/browser/renderer_host/render_view_host.cc |
+++ b/content/browser/renderer_host/render_view_host.cc |
@@ -19,6 +19,7 @@ |
#include "base/values.h" |
#include "content/browser/child_process_security_policy.h" |
#include "content/browser/cross_site_request_manager.h" |
+#include "content/browser/gpu/gpu_surface_tracker.h" |
#include "content/browser/host_zoom_map.h" |
#include "content/browser/in_process_webkit/session_storage_namespace.h" |
#include "content/browser/power_save_blocker.h" |
@@ -176,8 +177,8 @@ bool RenderViewHost::CreateRenderView(const string16& frame_name, |
renderer_initialized_ = true; |
- process()->SetCompositingSurface(routing_id(), |
- GetCompositingSurface()); |
+ GpuSurfaceTracker::Get()->SetSurfaceHandle( |
+ surface_id(), GetCompositingSurface()); |
// Ensure the RenderView starts with a next_page_id larger than any existing |
// page ID it might be asked to render. |
@@ -191,6 +192,7 @@ bool RenderViewHost::CreateRenderView(const string16& frame_name, |
delegate_->GetRendererPrefs(process()->GetBrowserContext()); |
params.web_preferences = delegate_->GetWebkitPrefs(); |
params.view_id = routing_id(); |
+ params.surface_id = surface_id(); |
params.session_storage_namespace_id = session_storage_namespace_->id(); |
params.frame_name = frame_name; |
params.next_page_id = next_page_id; |