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