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

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

Issue 2857213005: PlzNavigate: implement process reuse for ServiceWorkers (Closed)
Patch Set: Removed wrong CleanupNavigation call Created 3 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 #include "content/browser/frame_host/render_frame_host_manager.h" 5 #include "content/browser/frame_host/render_frame_host_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 476
477 // If the current RenderFrameHost has a pending WebUI it must be committed. 477 // If the current RenderFrameHost has a pending WebUI it must be committed.
478 if (render_frame_host_->pending_web_ui()) 478 if (render_frame_host_->pending_web_ui())
479 CommitPendingWebUI(); 479 CommitPendingWebUI();
480 480
481 // A navigation in the original page has taken place. Cancel the pending 481 // A navigation in the original page has taken place. Cancel the pending
482 // one. Only do it for user gesture originated navigations to prevent page 482 // one. Only do it for user gesture originated navigations to prevent page
483 // doing any shenanigans to prevent user from navigating. See 483 // doing any shenanigans to prevent user from navigating. See
484 // https://code.google.com/p/chromium/issues/detail?id=75195 484 // https://code.google.com/p/chromium/issues/detail?id=75195
485 if (was_caused_by_user_gesture) { 485 if (was_caused_by_user_gesture) {
486 if (IsBrowserSideNavigationEnabled()) { 486 if (IsBrowserSideNavigationEnabled()) {
Charlie Reis 2017/05/24 17:18:37 Did this change cause NavigatorTestWithBrowserSide
clamy 2017/05/24 18:03:04 NavigatorTestWithBrowserSideNavigation.SimpleRende
487 CleanUpNavigation();
488 frame_tree_node_->ResetNavigationRequest(false, true); 487 frame_tree_node_->ResetNavigationRequest(false, true);
489 } else { 488 } else {
490 CancelPending(); 489 CancelPending();
491 } 490 }
492 } 491 }
493 } else { 492 } else {
494 // No one else should be sending us DidNavigate in this state. 493 // No one else should be sending us DidNavigate in this state.
495 NOTREACHED(); 494 NOTREACHED();
496 } 495 }
497 } 496 }
(...skipping 2337 matching lines...) Expand 10 before | Expand all | Expand 10 after
2835 delegate_->IsHidden()) { 2834 delegate_->IsHidden()) {
2836 if (delegate_->IsHidden()) { 2835 if (delegate_->IsHidden()) {
2837 render_frame_host_->GetView()->Hide(); 2836 render_frame_host_->GetView()->Hide();
2838 } else { 2837 } else {
2839 render_frame_host_->GetView()->Show(); 2838 render_frame_host_->GetView()->Show();
2840 } 2839 }
2841 } 2840 }
2842 } 2841 }
2843 2842
2844 } // namespace content 2843 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698