OLD | NEW |
---|---|
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/frame_tree_node.h" | 5 #include "content/browser/frame_host/frame_tree_node.h" |
6 | 6 |
7 #include <queue> | 7 #include <queue> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
419 // on behalf of the navigation in the current RenderFrameHost. Clear it. | 419 // on behalf of the navigation in the current RenderFrameHost. Clear it. |
420 if (site_instance_type == | 420 if (site_instance_type == |
421 NavigationRequest::AssociatedSiteInstanceType::CURRENT) { | 421 NavigationRequest::AssociatedSiteInstanceType::CURRENT) { |
422 current_frame_host()->ClearPendingWebUI(); | 422 current_frame_host()->ClearPendingWebUI(); |
423 } | 423 } |
424 | 424 |
425 // If the navigation is renderer-initiated, the renderer should also be | 425 // If the navigation is renderer-initiated, the renderer should also be |
426 // informed that the navigation stopped. | 426 // informed that the navigation stopped. |
427 if (was_renderer_initiated) { | 427 if (was_renderer_initiated) { |
428 current_frame_host()->Send( | 428 current_frame_host()->Send( |
429 new FrameMsg_Stop(current_frame_host()->GetRoutingID())); | 429 new FrameMsg_DroppedNavigation(current_frame_host()->GetRoutingID())); |
nasko
2017/03/09 05:19:28
Hmm, why use the new IPC here? The navigation coul
clamy
2017/03/13 13:55:57
Yes. But I don't think that the cancellation of on
| |
430 } | 430 } |
431 | 431 |
432 } | 432 } |
433 | 433 |
434 bool FrameTreeNode::has_started_loading() const { | 434 bool FrameTreeNode::has_started_loading() const { |
435 return loading_progress_ != kLoadingProgressNotStarted; | 435 return loading_progress_ != kLoadingProgressNotStarted; |
436 } | 436 } |
437 | 437 |
438 void FrameTreeNode::reset_loading_progress() { | 438 void FrameTreeNode::reset_loading_progress() { |
439 loading_progress_ = kLoadingProgressNotStarted; | 439 loading_progress_ = kLoadingProgressNotStarted; |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
556 } | 556 } |
557 return parent_->child_at(i + relative_offset); | 557 return parent_->child_at(i + relative_offset); |
558 } | 558 } |
559 } | 559 } |
560 | 560 |
561 NOTREACHED() << "FrameTreeNode not found in its parent's children."; | 561 NOTREACHED() << "FrameTreeNode not found in its parent's children."; |
562 return nullptr; | 562 return nullptr; |
563 } | 563 } |
564 | 564 |
565 } // namespace content | 565 } // namespace content |
OLD | NEW |