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

Side by Side Diff: content/browser/renderer_host/render_widget_helper.cc

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_helper.h" 5 #include "content/browser/renderer_host/render_widget_helper.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/posix/eintr_wrapper.h" 10 #include "base/posix/eintr_wrapper.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 97
98 void RenderWidgetHelper::OnResumeDeferredNavigation( 98 void RenderWidgetHelper::OnResumeDeferredNavigation(
99 const GlobalRequestID& request_id) { 99 const GlobalRequestID& request_id) {
100 resource_dispatcher_host_->ResumeDeferredNavigation(request_id); 100 resource_dispatcher_host_->ResumeDeferredNavigation(request_id);
101 } 101 }
102 102
103 void RenderWidgetHelper::CreateNewWindow( 103 void RenderWidgetHelper::CreateNewWindow(
104 const ViewHostMsg_CreateWindow_Params& params, 104 const ViewHostMsg_CreateWindow_Params& params,
105 bool no_javascript_access, 105 bool no_javascript_access,
106 base::ProcessHandle render_process, 106 base::ProcessHandle render_process,
107 int* route_id, 107 int32* route_id,
108 int* main_frame_route_id, 108 int32* main_frame_route_id,
109 int* surface_id, 109 int32* main_frame_widget_route_id,
110 int32* surface_id,
110 SessionStorageNamespace* session_storage_namespace) { 111 SessionStorageNamespace* session_storage_namespace) {
111 if (params.opener_suppressed || no_javascript_access) { 112 if (params.opener_suppressed || no_javascript_access) {
112 // If the opener is supppressed or script access is disallowed, we should 113 // If the opener is supppressed or script access is disallowed, we should
113 // open the window in a new BrowsingInstance, and thus a new process. That 114 // open the window in a new BrowsingInstance, and thus a new process. That
114 // means the current renderer process will not be able to route messages to 115 // means the current renderer process will not be able to route messages to
115 // it. Because of this, we will immediately show and navigate the window 116 // it. Because of this, we will immediately show and navigate the window
116 // in OnCreateWindowOnUI, using the params provided here. 117 // in OnCreateWindowOnUI, using the params provided here.
117 *route_id = MSG_ROUTING_NONE; 118 *route_id = MSG_ROUTING_NONE;
118 *main_frame_route_id = MSG_ROUTING_NONE; 119 *main_frame_route_id = MSG_ROUTING_NONE;
120 *main_frame_widget_route_id = MSG_ROUTING_NONE;
119 *surface_id = 0; 121 *surface_id = 0;
120 } else { 122 } else {
121 *route_id = GetNextRoutingID(); 123 *route_id = GetNextRoutingID();
122 *main_frame_route_id = GetNextRoutingID(); 124 *main_frame_route_id = GetNextRoutingID();
125 *main_frame_widget_route_id = GetNextRoutingID();
123 *surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer( 126 *surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
124 render_process_id_, *route_id); 127 render_process_id_, *route_id);
125 // Block resource requests until the view is created, since the HWND might 128 // Block resource requests until the view is created, since the HWND might
126 // be needed if a response ends up creating a plugin. 129 // be needed if a response ends up creating a plugin.
127 resource_dispatcher_host_->BlockRequestsForRoute( 130 resource_dispatcher_host_->BlockRequestsForRoute(
128 render_process_id_, *route_id); 131 render_process_id_, *route_id);
129 resource_dispatcher_host_->BlockRequestsForRoute( 132 resource_dispatcher_host_->BlockRequestsForRoute(
130 render_process_id_, *main_frame_route_id); 133 render_process_id_, *main_frame_route_id);
131 } 134 }
132 135
133 BrowserThread::PostTask( 136 BrowserThread::PostTask(
134 BrowserThread::UI, FROM_HERE, 137 BrowserThread::UI, FROM_HERE,
135 base::Bind(&RenderWidgetHelper::OnCreateWindowOnUI, 138 base::Bind(&RenderWidgetHelper::OnCreateWindowOnUI, this, params,
136 this, params, *route_id, *main_frame_route_id, 139 *route_id, *main_frame_route_id, *main_frame_widget_route_id,
137 make_scoped_refptr(session_storage_namespace))); 140 make_scoped_refptr(session_storage_namespace)));
138 } 141 }
139 142
140 void RenderWidgetHelper::OnCreateWindowOnUI( 143 void RenderWidgetHelper::OnCreateWindowOnUI(
141 const ViewHostMsg_CreateWindow_Params& params, 144 const ViewHostMsg_CreateWindow_Params& params,
142 int route_id, 145 int32 route_id,
143 int main_frame_route_id, 146 int32 main_frame_route_id,
147 int32 main_frame_widget_route_id,
144 SessionStorageNamespace* session_storage_namespace) { 148 SessionStorageNamespace* session_storage_namespace) {
145 RenderViewHostImpl* host = 149 RenderViewHostImpl* host =
146 RenderViewHostImpl::FromID(render_process_id_, params.opener_id); 150 RenderViewHostImpl::FromID(render_process_id_, params.opener_id);
147 if (host) 151 if (host)
148 host->CreateNewWindow(route_id, main_frame_route_id, params, 152 host->CreateNewWindow(route_id, main_frame_route_id,
149 session_storage_namespace); 153 main_frame_widget_route_id, params,
154 session_storage_namespace);
150 } 155 }
151 156
152 void RenderWidgetHelper::OnResumeRequestsForView(int route_id) { 157 void RenderWidgetHelper::OnResumeRequestsForView(int route_id) {
153 resource_dispatcher_host_->ResumeBlockedRequestsForRoute( 158 resource_dispatcher_host_->ResumeBlockedRequestsForRoute(
154 render_process_id_, route_id); 159 render_process_id_, route_id);
155 } 160 }
156 161
157 void RenderWidgetHelper::CreateNewWidget(int opener_id, 162 void RenderWidgetHelper::CreateNewWidget(int opener_id,
158 blink::WebPopupType popup_type, 163 blink::WebPopupType popup_type,
159 int* route_id, 164 int* route_id,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 196
192 void RenderWidgetHelper::OnCreateFullscreenWidgetOnUI(int opener_id, 197 void RenderWidgetHelper::OnCreateFullscreenWidgetOnUI(int opener_id,
193 int route_id) { 198 int route_id) {
194 RenderViewHostImpl* host = RenderViewHostImpl::FromID( 199 RenderViewHostImpl* host = RenderViewHostImpl::FromID(
195 render_process_id_, opener_id); 200 render_process_id_, opener_id);
196 if (host) 201 if (host)
197 host->CreateNewFullscreenWidget(route_id); 202 host->CreateNewFullscreenWidget(route_id);
198 } 203 }
199 204
200 } // namespace content 205 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698