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

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

Issue 10809051: Fix regression of bug 205 where a plugin in a window shown with window.open may not have the correc… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 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 | Annotate | Revision Log
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 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 10
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 // UI THREAD ONLY ----------------------------------------------------------- 123 // UI THREAD ONLY -----------------------------------------------------------
124 124
125 // These three functions provide the backend implementation of the 125 // These three functions provide the backend implementation of the
126 // corresponding functions in RenderProcessHost. See those declarations 126 // corresponding functions in RenderProcessHost. See those declarations
127 // for documentation. 127 // for documentation.
128 void CancelResourceRequests(int render_widget_id); 128 void CancelResourceRequests(int render_widget_id);
129 void CrossSiteSwapOutACK(const ViewMsg_SwapOut_Params& params); 129 void CrossSiteSwapOutACK(const ViewMsg_SwapOut_Params& params);
130 bool WaitForBackingStoreMsg(int render_widget_id, 130 bool WaitForBackingStoreMsg(int render_widget_id,
131 const base::TimeDelta& max_delay, 131 const base::TimeDelta& max_delay,
132 IPC::Message* msg); 132 IPC::Message* msg);
133 // Called to resume the requests for a view after it's ready. The view was
134 // created by CreateNewWindow which initially blocked the requests.
135 void ResumeRequestsForView(int route_id);
133 136
134 #if defined(OS_MACOSX) 137 #if defined(OS_MACOSX)
135 // Given the id of a transport DIB, return a mapping to it or NULL on error. 138 // Given the id of a transport DIB, return a mapping to it or NULL on error.
136 TransportDIB* MapTransportDIB(TransportDIB::Id dib_id); 139 TransportDIB* MapTransportDIB(TransportDIB::Id dib_id);
137 #endif 140 #endif
138 141
139 // IO THREAD ONLY ----------------------------------------------------------- 142 // IO THREAD ONLY -----------------------------------------------------------
140 143
141 // Called on the IO thread when a BackingStore message is received. 144 // Called on the IO thread when a BackingStore message is received.
142 void DidReceiveBackingStoreMsg(const IPC::Message& msg); 145 void DidReceiveBackingStoreMsg(const IPC::Message& msg);
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 // Called on the UI thread to dispatch a paint message if necessary. 193 // Called on the UI thread to dispatch a paint message if necessary.
191 void OnDispatchBackingStoreMsg(BackingStoreMsgProxy* proxy); 194 void OnDispatchBackingStoreMsg(BackingStoreMsgProxy* proxy);
192 195
193 // Called on the UI thread to finish creating a window. 196 // Called on the UI thread to finish creating a window.
194 void OnCreateWindowOnUI( 197 void OnCreateWindowOnUI(
195 const ViewHostMsg_CreateWindow_Params& params, 198 const ViewHostMsg_CreateWindow_Params& params,
196 int route_id, 199 int route_id,
197 SessionStorageNamespace* session_storage_namespace); 200 SessionStorageNamespace* session_storage_namespace);
198 201
199 // Called on the IO thread after a window was created on the UI thread. 202 // Called on the IO thread after a window was created on the UI thread.
200 void OnCreateWindowOnIO(int route_id); 203 void OnResumeRequestsForView(int route_id);
201 204
202 // Called on the UI thread to finish creating a widget. 205 // Called on the UI thread to finish creating a widget.
203 void OnCreateWidgetOnUI(int opener_id, 206 void OnCreateWidgetOnUI(int opener_id,
204 int route_id, 207 int route_id,
205 WebKit::WebPopupType popup_type); 208 WebKit::WebPopupType popup_type);
206 209
207 // Called on the UI thread to create a fullscreen widget. 210 // Called on the UI thread to create a fullscreen widget.
208 void OnCreateFullscreenWidgetOnUI(int opener_id, int route_id); 211 void OnCreateFullscreenWidgetOnUI(int opener_id, int route_id);
209 212
210 // Called on the IO thread to cancel resource requests for the render widget. 213 // Called on the IO thread to cancel resource requests for the render widget.
(...skipping 28 matching lines...) Expand all
239 base::AtomicSequenceNumber next_routing_id_; 242 base::AtomicSequenceNumber next_routing_id_;
240 243
241 ResourceDispatcherHostImpl* resource_dispatcher_host_; 244 ResourceDispatcherHostImpl* resource_dispatcher_host_;
242 245
243 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHelper); 246 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHelper);
244 }; 247 };
245 248
246 } // namespace content 249 } // namespace content
247 250
248 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_ 251 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698