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

Unified Diff: content/browser/frame_host/interstitial_page_impl.cc

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: plumb through surface ID *and* widget surface ID for window.open 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/frame_host/interstitial_page_impl.cc
diff --git a/content/browser/frame_host/interstitial_page_impl.cc b/content/browser/frame_host/interstitial_page_impl.cc
index e93660bcbab821726cea9fc93b8be45b570bbd18..890a57f6beb223f75f27e23eb9a239d663ef16ba 100644
--- a/content/browser/frame_host/interstitial_page_impl.cc
+++ b/content/browser/frame_host/interstitial_page_impl.cc
@@ -19,6 +19,7 @@
#include "content/browser/frame_host/interstitial_page_navigator_impl.h"
#include "content/browser/frame_host/navigation_controller_impl.h"
#include "content/browser/frame_host/navigation_entry_impl.h"
+#include "content/browser/gpu/gpu_surface_tracker.h"
#include "content/browser/loader/resource_dispatcher_host_impl.h"
#include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/browser/renderer_host/render_view_host_delegate_view.h"
@@ -591,9 +592,12 @@ RenderViewHostImpl* InterstitialPageImpl::CreateRenderViewHost() {
new SessionStorageNamespaceImpl(dom_storage_context);
// Use the RenderViewHost from our FrameTree.
- frame_tree_.root()->render_manager()->Init(
- browser_context, site_instance.get(), MSG_ROUTING_NONE, MSG_ROUTING_NONE,
- MSG_ROUTING_NONE, 0 /* surface_id */);
+ int32 widget_routing_id = site_instance->GetProcess()->GetNextRoutingID();
+ int32 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
+ site_instance->GetProcess()->GetID(), widget_routing_id);
+ frame_tree_.root()->render_manager()->Init(site_instance.get(),
+ MSG_ROUTING_NONE, MSG_ROUTING_NONE,
+ widget_routing_id, surface_id);
return frame_tree_.root()->current_frame_host()->render_view_host();
}
@@ -757,8 +761,10 @@ gfx::Rect InterstitialPageImpl::GetRootWindowResizerRect() const {
void InterstitialPageImpl::CreateNewWindow(
SiteInstance* source_site_instance,
- int route_id,
- int main_frame_route_id,
+ int32 route_id,
+ int32 main_frame_route_id,
+ int32 main_frame_widget_route_id,
+ int32 surface_id,
const ViewHostMsg_CreateWindow_Params& params,
SessionStorageNamespace* session_storage_namespace) {
NOTREACHED() << "InterstitialPage does not support showing popups yet.";

Powered by Google App Engine
This is Rietveld 408576698