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

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

Issue 1661423002: Solidify Entry discarding logic (NavigationHandle keeps its ID) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 993 matching lines...) Expand 10 before | Expand all | Expand 10 after
1004 // navigation. 1004 // navigation.
1005 if (navigation_handle_ && 1005 if (navigation_handle_ &&
1006 navigation_handle_->GetURL() != validated_params.url) { 1006 navigation_handle_->GetURL() != validated_params.url) {
1007 navigation_handle_.reset(); 1007 navigation_handle_.reset();
1008 } 1008 }
1009 1009
1010 // Synchronous renderer-initiated navigations will send a 1010 // Synchronous renderer-initiated navigations will send a
1011 // DidCommitProvisionalLoad IPC without a prior DidStartProvisionalLoad 1011 // DidCommitProvisionalLoad IPC without a prior DidStartProvisionalLoad
1012 // message. 1012 // message.
1013 if (!navigation_handle_) { 1013 if (!navigation_handle_) {
1014 // There is no pending NavigationEntry in these cases, so pass 0 as the
1015 // nav_id.
1014 navigation_handle_ = NavigationHandleImpl::Create( 1016 navigation_handle_ = NavigationHandleImpl::Create(
1015 validated_params.url, frame_tree_node_, base::TimeTicks::Now()); 1017 validated_params.url, frame_tree_node_, base::TimeTicks::Now(), 0);
1016 } 1018 }
1017 1019
1018 accessibility_reset_count_ = 0; 1020 accessibility_reset_count_ = 0;
1019 frame_tree_node()->navigator()->DidNavigate(this, validated_params); 1021 frame_tree_node()->navigator()->DidNavigate(this, validated_params);
1020 1022
1021 // For a top-level frame, there are potential security concerns associated 1023 // For a top-level frame, there are potential security concerns associated
1022 // with displaying graphics from a previously loaded page after the URL in 1024 // with displaying graphics from a previously loaded page after the URL in
1023 // the omnibar has been changed. It is unappealing to clear the page 1025 // the omnibar has been changed. It is unappealing to clear the page
1024 // immediately, but if the renderer is taking a long time to issue any 1026 // immediately, but if the renderer is taking a long time to issue any
1025 // compositor output (possibly because of script deliberately creating this 1027 // compositor output (possibly because of script deliberately creating this
(...skipping 1527 matching lines...) Expand 10 before | Expand all | Expand 10 after
2553 *dst = src; 2555 *dst = src;
2554 2556
2555 if (src.routing_id != -1) 2557 if (src.routing_id != -1)
2556 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); 2558 dst->tree_id = RoutingIDToAXTreeID(src.routing_id);
2557 2559
2558 if (src.parent_routing_id != -1) 2560 if (src.parent_routing_id != -1)
2559 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); 2561 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id);
2560 } 2562 }
2561 2563
2562 } // namespace content 2564 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698