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

Side by Side Diff: content/browser/frame_host/render_frame_host_manager.h

Issue 297973002: Navigation transitions: Block first response until after transitions have run. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 // transferred between renderers. 213 // transferred between renderers.
214 void OnCrossSiteResponse( 214 void OnCrossSiteResponse(
215 RenderFrameHostImpl* pending_render_frame_host, 215 RenderFrameHostImpl* pending_render_frame_host,
216 const GlobalRequestID& global_request_id, 216 const GlobalRequestID& global_request_id,
217 scoped_ptr<CrossSiteTransferringRequest> cross_site_transferring_request, 217 scoped_ptr<CrossSiteTransferringRequest> cross_site_transferring_request,
218 const std::vector<GURL>& transfer_url_chain, 218 const std::vector<GURL>& transfer_url_chain,
219 const Referrer& referrer, 219 const Referrer& referrer,
220 PageTransition page_transition, 220 PageTransition page_transition,
221 bool should_replace_current_entry); 221 bool should_replace_current_entry);
222 222
223 // Received a response from CrossSiteResourceHandler. If the navigation
224 // specifies a transition, this is called and the navigation will not resume
225 // until ResumeResponseDeferredAtStart.
226 void OnDeferredAfterResponseStarted(
227 const GlobalRequestID& global_request_id,
228 RenderFrameHostImpl* pending_render_frame_host);
229
230 // Resume navigation paused after receiving response headers.
231 void ResumeResponseDeferredAtStart();
232
223 // The RenderFrameHost has been swapped out, so we should resume the pending 233 // The RenderFrameHost has been swapped out, so we should resume the pending
224 // network response and allow the pending RenderFrameHost to commit. 234 // network response and allow the pending RenderFrameHost to commit.
225 void SwappedOut(RenderFrameHostImpl* render_frame_host); 235 void SwappedOut(RenderFrameHostImpl* render_frame_host);
226 236
227 // Called when a renderer's frame navigates. 237 // Called when a renderer's frame navigates.
228 void DidNavigateFrame(RenderFrameHostImpl* render_frame_host); 238 void DidNavigateFrame(RenderFrameHostImpl* render_frame_host);
229 239
230 // Called when a renderer sets its opener to null. 240 // Called when a renderer sets its opener to null.
231 void DidDisownOpener(RenderViewHost* render_view_host); 241 void DidDisownOpener(RenderViewHost* render_view_host);
232 242
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 // The |pending_web_ui_| may be non-NULL even when the 459 // The |pending_web_ui_| may be non-NULL even when the
450 // |pending_render_frame_host_| is NULL. This will happen when we're 460 // |pending_render_frame_host_| is NULL. This will happen when we're
451 // transitioning between two Web UI pages: the RFH won't be swapped, so the 461 // transitioning between two Web UI pages: the RFH won't be swapped, so the
452 // pending pointer will be unused, but there will be a pending Web UI 462 // pending pointer will be unused, but there will be a pending Web UI
453 // associated with the navigation. 463 // associated with the navigation.
454 scoped_ptr<RenderFrameHostImpl> pending_render_frame_host_; 464 scoped_ptr<RenderFrameHostImpl> pending_render_frame_host_;
455 465
456 // Tracks information about any current pending cross-process navigation. 466 // Tracks information about any current pending cross-process navigation.
457 scoped_ptr<PendingNavigationParams> pending_nav_params_; 467 scoped_ptr<PendingNavigationParams> pending_nav_params_;
458 468
469 // Tracks information about any navigation paused after receiving response
470 // headers.
471 scoped_ptr<GlobalRequestID> response_started_id_;
472
459 // If either of these is non-NULL, the pending navigation is to a chrome: 473 // If either of these is non-NULL, the pending navigation is to a chrome:
460 // page. The scoped_ptr is used if pending_web_ui_ != web_ui_, the WeakPtr is 474 // page. The scoped_ptr is used if pending_web_ui_ != web_ui_, the WeakPtr is
461 // used for when they reference the same object. If either is non-NULL, the 475 // used for when they reference the same object. If either is non-NULL, the
462 // other should be NULL. 476 // other should be NULL.
463 scoped_ptr<WebUIImpl> pending_web_ui_; 477 scoped_ptr<WebUIImpl> pending_web_ui_;
464 base::WeakPtr<WebUIImpl> pending_and_current_web_ui_; 478 base::WeakPtr<WebUIImpl> pending_and_current_web_ui_;
465 479
466 // A map of site instance ID to RenderFrameProxyHosts. 480 // A map of site instance ID to RenderFrameProxyHosts.
467 typedef base::hash_map<int32, RenderFrameProxyHost*> RenderFrameProxyHostMap; 481 typedef base::hash_map<int32, RenderFrameProxyHost*> RenderFrameProxyHostMap;
468 RenderFrameProxyHostMap proxy_hosts_; 482 RenderFrameProxyHostMap proxy_hosts_;
(...skipping 10 matching lines...) Expand all
479 NotificationRegistrar registrar_; 493 NotificationRegistrar registrar_;
480 494
481 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 495 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
482 496
483 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 497 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
484 }; 498 };
485 499
486 } // namespace content 500 } // namespace content
487 501
488 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 502 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698