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

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

Issue 1157373002: Revert of Fix the commit type for out-of-process iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « content/browser/frame_host/navigation_request.cc ('k') | content/common/frame_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/navigator_impl.h" 5 #include "content/browser/frame_host/navigator_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "content/browser/frame_host/frame_tree.h" 10 #include "content/browser/frame_host/frame_tree.h"
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 // Create the navigation parameters. 318 // Create the navigation parameters.
319 // TODO(vitalybuka): Move this before AboutToNavigateRenderFrame once 319 // TODO(vitalybuka): Move this before AboutToNavigateRenderFrame once
320 // http://crbug.com/408684 is fixed. 320 // http://crbug.com/408684 is fixed.
321 FrameMsg_Navigate_Type::Value navigation_type = 321 FrameMsg_Navigate_Type::Value navigation_type =
322 GetNavigationType(controller_->GetBrowserContext(), entry, reload_type); 322 GetNavigationType(controller_->GetBrowserContext(), entry, reload_type);
323 dest_render_frame_host->Navigate( 323 dest_render_frame_host->Navigate(
324 entry.ConstructCommonNavigationParams(navigation_type), 324 entry.ConstructCommonNavigationParams(navigation_type),
325 entry.ConstructStartNavigationParams(), 325 entry.ConstructStartNavigationParams(),
326 entry.ConstructRequestNavigationParams( 326 entry.ConstructRequestNavigationParams(
327 navigation_start, 327 navigation_start,
328 controller_->HasCommittedRealLoad(frame_tree_node),
329 controller_->GetPendingEntryIndex() == -1, 328 controller_->GetPendingEntryIndex() == -1,
330 controller_->GetIndexOfEntry(&entry), 329 controller_->GetIndexOfEntry(&entry),
331 controller_->GetLastCommittedEntryIndex(), 330 controller_->GetLastCommittedEntryIndex(),
332 controller_->GetEntryCount())); 331 controller_->GetEntryCount()));
333 } else { 332 } else {
334 // No need to navigate again. Just resume the deferred request. 333 // No need to navigate again. Just resume the deferred request.
335 dest_render_frame_host->GetProcess()->ResumeDeferredNavigation( 334 dest_render_frame_host->GetProcess()->ResumeDeferredNavigation(
336 entry.transferred_global_request_id()); 335 entry.transferred_global_request_id());
337 } 336 }
338 337
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
893 "Navigation.TimeToCommit_ExistingRenderer_BeforeUnloadDiscounted", 892 "Navigation.TimeToCommit_ExistingRenderer_BeforeUnloadDiscounted",
894 time_to_commit); 893 time_to_commit);
895 UMA_HISTOGRAM_TIMES( 894 UMA_HISTOGRAM_TIMES(
896 "Navigation.TimeToURLJobStart_ExistingRenderer_BeforeUnloadDiscounted", 895 "Navigation.TimeToURLJobStart_ExistingRenderer_BeforeUnloadDiscounted",
897 time_to_network); 896 time_to_network);
898 } 897 }
899 navigation_data_.reset(); 898 navigation_data_.reset();
900 } 899 }
901 900
902 } // namespace content 901 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_request.cc ('k') | content/common/frame_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698