| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/devtools/render_frame_devtools_agent_host.h" | 5 #include "content/browser/devtools/render_frame_devtools_agent_host.h" |
| 6 | 6 |
| 7 #include <tuple> | 7 #include <tuple> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/guid.h" | 10 #include "base/guid.h" |
| (...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 if (!IsBrowserSideNavigationEnabled()) | 655 if (!IsBrowserSideNavigationEnabled()) |
| 656 return; | 656 return; |
| 657 DCHECK(current_); | 657 DCHECK(current_); |
| 658 navigating_handles_.insert(navigation_handle); | 658 navigating_handles_.insert(navigation_handle); |
| 659 DCHECK(CheckConsistency()); | 659 DCHECK(CheckConsistency()); |
| 660 } | 660 } |
| 661 | 661 |
| 662 void RenderFrameDevToolsAgentHost::RenderFrameHostChanged( | 662 void RenderFrameDevToolsAgentHost::RenderFrameHostChanged( |
| 663 RenderFrameHost* old_host, | 663 RenderFrameHost* old_host, |
| 664 RenderFrameHost* new_host) { | 664 RenderFrameHost* new_host) { |
| 665 target_handler_->UpdateFrames(); |
| 666 |
| 665 if (IsBrowserSideNavigationEnabled()) | 667 if (IsBrowserSideNavigationEnabled()) |
| 666 return; | 668 return; |
| 667 | 669 |
| 668 DCHECK(!pending_ || pending_->host() != old_host); | 670 DCHECK(!pending_ || pending_->host() != old_host); |
| 669 if (!current_ || current_->host() != old_host) { | 671 if (!current_ || current_->host() != old_host) { |
| 670 DCHECK(CheckConsistency()); | 672 DCHECK(CheckConsistency()); |
| 671 return; | 673 return; |
| 672 } | 674 } |
| 673 | 675 |
| 674 // AboutToNavigateRenderFrame was not called for renderer-initiated | 676 // AboutToNavigateRenderFrame was not called for renderer-initiated |
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1071 RenderFrameHost* host) { | 1073 RenderFrameHost* host) { |
| 1072 return (current_ && current_->host() == host) || | 1074 return (current_ && current_->host() == host) || |
| 1073 (pending_ && pending_->host() == host); | 1075 (pending_ && pending_->host() == host); |
| 1074 } | 1076 } |
| 1075 | 1077 |
| 1076 bool RenderFrameDevToolsAgentHost::IsChildFrame() { | 1078 bool RenderFrameDevToolsAgentHost::IsChildFrame() { |
| 1077 return current_ && current_->host()->GetParent(); | 1079 return current_ && current_->host()->GetParent(); |
| 1078 } | 1080 } |
| 1079 | 1081 |
| 1080 } // namespace content | 1082 } // namespace content |
| OLD | NEW |