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

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

Issue 2903263002: Fix LoadDataWithBaseUrlTest.testloadDataWithBaseUrlCallsOnPageStarted after r474498. (Closed)
Patch Set: Created 3 years, 7 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/navigation_handle_impl.h" 5 #include "content/browser/frame_host/navigation_handle_impl.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "content/browser/appcache/appcache_navigation_handle.h" 10 #include "content/browser/appcache/appcache_navigation_handle.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 if (!nav_entry && 146 if (!nav_entry &&
147 nav_controller->GetPendingEntry() && 147 nav_controller->GetPendingEntry() &&
148 nav_controller->GetPendingEntry()->GetUniqueID() == 148 nav_controller->GetPendingEntry()->GetUniqueID() ==
149 pending_nav_entry_id_) { 149 pending_nav_entry_id_) {
150 nav_entry = nav_controller->GetPendingEntry(); 150 nav_entry = nav_controller->GetPendingEntry();
151 } 151 }
152 152
153 if (nav_entry) { 153 if (nav_entry) {
154 reload_type_ = nav_entry->reload_type(); 154 reload_type_ = nav_entry->reload_type();
155 restore_type_ = nav_entry->restore_type(); 155 restore_type_ = nav_entry->restore_type();
156 base_url_for_data_url_ = nav_entry->GetBaseURLForDataURL();
156 } 157 }
157 } 158 }
158 159
159 if (!IsRendererDebugURL(url_)) 160 if (!IsRendererDebugURL(url_))
160 GetDelegate()->DidStartNavigation(this); 161 GetDelegate()->DidStartNavigation(this);
161 162
162 if (IsInMainFrame()) { 163 if (IsInMainFrame()) {
163 TRACE_EVENT_ASYNC_BEGIN_WITH_TIMESTAMP1( 164 TRACE_EVENT_ASYNC_BEGIN_WITH_TIMESTAMP1(
164 "navigation", "Navigation StartToCommit", this, 165 "navigation", "Navigation StartToCommit", this,
165 navigation_start, "Initial URL", url_.spec()); 166 navigation_start, "Initial URL", url_.spec());
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 if (new_site_url == site_url_) 1114 if (new_site_url == site_url_)
1114 return; 1115 return;
1115 1116
1116 // When redirecting cross-site, stop telling the speculative 1117 // When redirecting cross-site, stop telling the speculative
1117 // RenderProcessHost to expect a navigation commit. 1118 // RenderProcessHost to expect a navigation commit.
1118 SetExpectedProcess(nullptr); 1119 SetExpectedProcess(nullptr);
1119 site_url_ = new_site_url; 1120 site_url_ = new_site_url;
1120 } 1121 }
1121 1122
1122 } // namespace content 1123 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_handle_impl.h ('k') | content/browser/frame_host/navigation_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698