| 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 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 496 void FrameTreeNode::DidChangeLoadProgress(double load_progress) { | 496 void FrameTreeNode::DidChangeLoadProgress(double load_progress) { |
| 497 loading_progress_ = load_progress; | 497 loading_progress_ = load_progress; |
| 498 frame_tree_->UpdateLoadProgress(); | 498 frame_tree_->UpdateLoadProgress(); |
| 499 } | 499 } |
| 500 | 500 |
| 501 bool FrameTreeNode::StopLoading() { | 501 bool FrameTreeNode::StopLoading() { |
| 502 if (IsBrowserSideNavigationEnabled()) { | 502 if (IsBrowserSideNavigationEnabled()) { |
| 503 if (navigation_request_) { | 503 if (navigation_request_) { |
| 504 navigation_request_->navigation_handle()->set_net_error_code( | 504 navigation_request_->navigation_handle()->set_net_error_code( |
| 505 net::ERR_ABORTED); | 505 net::ERR_ABORTED); |
| 506 navigator_->DiscardPendingEntryIfNeeded( |
| 507 navigation_request_->navigation_handle()); |
| 506 } | 508 } |
| 507 ResetNavigationRequest(false, true); | 509 ResetNavigationRequest(false, true); |
| 508 } | 510 } |
| 509 | 511 |
| 510 // TODO(nasko): see if child frames should send IPCs in site-per-process | 512 // TODO(nasko): see if child frames should send IPCs in site-per-process |
| 511 // mode. | 513 // mode. |
| 512 if (!IsMainFrame()) | 514 if (!IsMainFrame()) |
| 513 return true; | 515 return true; |
| 514 | 516 |
| 515 render_manager_.Stop(); | 517 render_manager_.Stop(); |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 } | 564 } |
| 563 return parent_->child_at(i + relative_offset); | 565 return parent_->child_at(i + relative_offset); |
| 564 } | 566 } |
| 565 } | 567 } |
| 566 | 568 |
| 567 NOTREACHED() << "FrameTreeNode not found in its parent's children."; | 569 NOTREACHED() << "FrameTreeNode not found in its parent's children."; |
| 568 return nullptr; | 570 return nullptr; |
| 569 } | 571 } |
| 570 | 572 |
| 571 } // namespace content | 573 } // namespace content |
| OLD | NEW |