| 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 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/profiler/scoped_tracker.h" | 10 #include "base/profiler/scoped_tracker.h" |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 if (!opener_observer_) | 186 if (!opener_observer_) |
| 187 opener_observer_ = make_scoped_ptr(new OpenerDestroyedObserver(this)); | 187 opener_observer_ = make_scoped_ptr(new OpenerDestroyedObserver(this)); |
| 188 opener_->AddObserver(opener_observer_.get()); | 188 opener_->AddObserver(opener_observer_.get()); |
| 189 } | 189 } |
| 190 } | 190 } |
| 191 | 191 |
| 192 void FrameTreeNode::SetCurrentURL(const GURL& url) { | 192 void FrameTreeNode::SetCurrentURL(const GURL& url) { |
| 193 if (!has_committed_real_load_ && url != GURL(url::kAboutBlankURL)) | 193 if (!has_committed_real_load_ && url != GURL(url::kAboutBlankURL)) |
| 194 has_committed_real_load_ = true; | 194 has_committed_real_load_ = true; |
| 195 current_url_ = url; | 195 current_url_ = url; |
| 196 frame_tree_->TraceSnapshot(); |
| 196 } | 197 } |
| 197 | 198 |
| 198 void FrameTreeNode::SetCurrentOrigin(const url::Origin& origin) { | 199 void FrameTreeNode::SetCurrentOrigin(const url::Origin& origin) { |
| 199 if (!origin.IsSameOriginWith(replication_state_.origin)) | 200 if (!origin.IsSameOriginWith(replication_state_.origin)) |
| 200 render_manager_.OnDidUpdateOrigin(origin); | 201 render_manager_.OnDidUpdateOrigin(origin); |
| 201 replication_state_.origin = origin; | 202 replication_state_.origin = origin; |
| 202 } | 203 } |
| 203 | 204 |
| 204 void FrameTreeNode::SetFrameName(const std::string& name) { | 205 void FrameTreeNode::SetFrameName(const std::string& name) { |
| 205 if (name != replication_state_.name) | 206 if (name != replication_state_.name) |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 // TODO(nasko): see if child frames should send IPCs in site-per-process | 379 // TODO(nasko): see if child frames should send IPCs in site-per-process |
| 379 // mode. | 380 // mode. |
| 380 if (!IsMainFrame()) | 381 if (!IsMainFrame()) |
| 381 return true; | 382 return true; |
| 382 | 383 |
| 383 render_manager_.Stop(); | 384 render_manager_.Stop(); |
| 384 return true; | 385 return true; |
| 385 } | 386 } |
| 386 | 387 |
| 387 } // namespace content | 388 } // namespace content |
| OLD | NEW |