| 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/macros.h" | 10 #include "base/macros.h" |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 render_manager()->OnDidStopLoading(); | 419 render_manager()->OnDidStopLoading(); |
| 420 | 420 |
| 421 // TODO(erikchen): Remove ScopedTracker below once crbug.com/465796 is fixed. | 421 // TODO(erikchen): Remove ScopedTracker below once crbug.com/465796 is fixed. |
| 422 tracked_objects::ScopedTracker tracking_profile4( | 422 tracked_objects::ScopedTracker tracking_profile4( |
| 423 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 423 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 424 "465796 FrameTreeNode::DidStopLoading::End")); | 424 "465796 FrameTreeNode::DidStopLoading::End")); |
| 425 } | 425 } |
| 426 | 426 |
| 427 void FrameTreeNode::DidChangeLoadProgress(double load_progress) { | 427 void FrameTreeNode::DidChangeLoadProgress(double load_progress) { |
| 428 loading_progress_ = load_progress; | 428 loading_progress_ = load_progress; |
| 429 frame_tree_->UpdateLoadProgress(); | 429 frame_tree_->UpdateLoadProgress(this); |
| 430 } | 430 } |
| 431 | 431 |
| 432 bool FrameTreeNode::StopLoading() { | 432 bool FrameTreeNode::StopLoading() { |
| 433 if (IsBrowserSideNavigationEnabled()) | 433 if (IsBrowserSideNavigationEnabled()) |
| 434 ResetNavigationRequest(false); | 434 ResetNavigationRequest(false); |
| 435 | 435 |
| 436 // TODO(nasko): see if child frames should send IPCs in site-per-process | 436 // TODO(nasko): see if child frames should send IPCs in site-per-process |
| 437 // mode. | 437 // mode. |
| 438 if (!IsMainFrame()) | 438 if (!IsMainFrame()) |
| 439 return true; | 439 return true; |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 473 void FrameTreeNode::TraceSnapshot() const { | 473 void FrameTreeNode::TraceSnapshot() const { |
| 474 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 474 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 475 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID( | 475 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID( |
| 476 "navigation", "FrameTreeNode", | 476 "navigation", "FrameTreeNode", |
| 477 TRACE_ID_WITH_SCOPE("FrameTreeNode", frame_tree_node_id_), | 477 TRACE_ID_WITH_SCOPE("FrameTreeNode", frame_tree_node_id_), |
| 478 scoped_ptr<base::trace_event::ConvertableToTraceFormat>( | 478 scoped_ptr<base::trace_event::ConvertableToTraceFormat>( |
| 479 new TracedFrameTreeNode(*this))); | 479 new TracedFrameTreeNode(*this))); |
| 480 } | 480 } |
| 481 | 481 |
| 482 } // namespace content | 482 } // namespace content |
| OLD | NEW |