Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1025)

Side by Side Diff: content/browser/devtools/render_frame_devtools_agent_host.cc

Issue 2969753002: [DevTools] Split auto-attach part of TargetHandler into a separate class (Closed)
Patch Set: similarity Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 if (!IsBrowserSideNavigationEnabled()) { 636 if (!IsBrowserSideNavigationEnabled()) {
637 // CommitPending may destruct |this|. 637 // CommitPending may destruct |this|.
638 scoped_refptr<RenderFrameDevToolsAgentHost> protect(this); 638 scoped_refptr<RenderFrameDevToolsAgentHost> protect(this);
639 if (navigation_handle->HasCommitted() && 639 if (navigation_handle->HasCommitted() &&
640 !navigation_handle->IsErrorPage()) { 640 !navigation_handle->IsErrorPage()) {
641 if (pending_ && 641 if (pending_ &&
642 pending_->host() == navigation_handle->GetRenderFrameHost()) { 642 pending_->host() == navigation_handle->GetRenderFrameHost()) {
643 CommitPending(); 643 CommitPending();
644 } 644 }
645 for (auto* target : protocol::TargetHandler::ForAgentHost(this)) 645 for (auto* target : protocol::TargetHandler::ForAgentHost(this))
646 target->UpdateServiceWorkers(); 646 target->DidFinishNavigation();
caseq 2017/07/07 17:46:33 Not sure if it's fair to rename this to DidFinishN
dgozman 2017/07/13 21:46:22 Renamed to DidCommitNavigation.
647 } else if (pending_ && pending_->host()->GetFrameTreeNodeId() == 647 } else if (pending_ && pending_->host()->GetFrameTreeNodeId() ==
648 navigation_handle->GetFrameTreeNodeId()) { 648 navigation_handle->GetFrameTreeNodeId()) {
649 DiscardPending(); 649 DiscardPending();
650 } 650 }
651 DCHECK(CheckConsistency()); 651 DCHECK(CheckConsistency());
652 return; 652 return;
653 } 653 }
654 654
655 NavigationHandleImpl* handle = 655 NavigationHandleImpl* handle =
656 static_cast<NavigationHandleImpl*>(navigation_handle); 656 static_cast<NavigationHandleImpl*>(navigation_handle);
(...skipping 17 matching lines...) Expand all
674 message.method, message.message)); 674 message.method, message.message));
675 } 675 }
676 session->waiting_messages()[message.call_id] = {message.method, 676 session->waiting_messages()[message.call_id] = {message.method,
677 message.message}; 677 message.message};
678 } 678 }
679 } 679 }
680 suspended_messages_by_session_id_.clear(); 680 suspended_messages_by_session_id_.clear();
681 } 681 }
682 if (handle->HasCommitted()) { 682 if (handle->HasCommitted()) {
683 for (auto* target : protocol::TargetHandler::ForAgentHost(this)) 683 for (auto* target : protocol::TargetHandler::ForAgentHost(this))
684 target->UpdateServiceWorkers(); 684 target->DidFinishNavigation();
685 } 685 }
686 } 686 }
687 687
688 void RenderFrameDevToolsAgentHost::UpdateFrameHost( 688 void RenderFrameDevToolsAgentHost::UpdateFrameHost(
689 RenderFrameHostImpl* frame_host) { 689 RenderFrameHostImpl* frame_host) {
690 if (frame_host == frame_host_) { 690 if (frame_host == frame_host_) {
691 if (frame_host && !render_frame_alive_) { 691 if (frame_host && !render_frame_alive_) {
692 render_frame_alive_ = true; 692 render_frame_alive_ = true;
693 MaybeReattachToRenderFrame(); 693 MaybeReattachToRenderFrame();
694 } 694 }
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 if (handle->frame_tree_node() != frame_tree_node_) 808 if (handle->frame_tree_node() != frame_tree_node_)
809 return; 809 return;
810 navigation_handles_.insert(handle); 810 navigation_handles_.insert(handle);
811 DCHECK(CheckConsistency()); 811 DCHECK(CheckConsistency());
812 } 812 }
813 813
814 void RenderFrameDevToolsAgentHost::RenderFrameHostChanged( 814 void RenderFrameDevToolsAgentHost::RenderFrameHostChanged(
815 RenderFrameHost* old_host, 815 RenderFrameHost* old_host,
816 RenderFrameHost* new_host) { 816 RenderFrameHost* new_host) {
817 for (auto* target : protocol::TargetHandler::ForAgentHost(this)) 817 for (auto* target : protocol::TargetHandler::ForAgentHost(this))
818 target->UpdateFrames(); 818 target->RenderFrameHostChanged();
819 819
820 if (IsBrowserSideNavigationEnabled()) { 820 if (IsBrowserSideNavigationEnabled()) {
821 if (old_host != frame_host_) 821 if (old_host != frame_host_)
822 return; 822 return;
823 823
824 // UpdateFrameHost may destruct |this|. 824 // UpdateFrameHost may destruct |this|.
825 scoped_refptr<RenderFrameDevToolsAgentHost> protect(this); 825 scoped_refptr<RenderFrameDevToolsAgentHost> protect(this);
826 UpdateFrameHost(nullptr); 826 UpdateFrameHost(nullptr);
827 DCHECK(CheckConsistency()); 827 DCHECK(CheckConsistency());
828 return; 828 return;
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
1307 bool RenderFrameDevToolsAgentHost::IsChildFrame() { 1307 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
1308 return frame_tree_node_ && frame_tree_node_->parent(); 1308 return frame_tree_node_ && frame_tree_node_->parent();
1309 } 1309 }
1310 1310
1311 DevToolsSession* RenderFrameDevToolsAgentHost::SingleSession() { 1311 DevToolsSession* RenderFrameDevToolsAgentHost::SingleSession() {
1312 DCHECK(!IsBrowserSideNavigationEnabled()); 1312 DCHECK(!IsBrowserSideNavigationEnabled());
1313 return sessions().empty() ? nullptr : *sessions().begin(); 1313 return sessions().empty() ? nullptr : *sessions().begin();
1314 } 1314 }
1315 1315
1316 } // namespace content 1316 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698