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 <utility> |
| 8 |
7 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
8 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
9 #include "build/build_config.h" | 11 #include "build/build_config.h" |
10 #include "content/browser/child_process_security_policy_impl.h" | 12 #include "content/browser/child_process_security_policy_impl.h" |
11 #include "content/browser/devtools/devtools_frame_trace_recorder.h" | 13 #include "content/browser/devtools/devtools_frame_trace_recorder.h" |
12 #include "content/browser/devtools/devtools_protocol_handler.h" | 14 #include "content/browser/devtools/devtools_protocol_handler.h" |
13 #include "content/browser/devtools/protocol/dom_handler.h" | 15 #include "content/browser/devtools/protocol/dom_handler.h" |
14 #include "content/browser/devtools/protocol/emulation_handler.h" | 16 #include "content/browser/devtools/protocol/emulation_handler.h" |
15 #include "content/browser/devtools/protocol/input_handler.h" | 17 #include "content/browser/devtools/protocol/input_handler.h" |
16 #include "content/browser/devtools/protocol/inspector_handler.h" | 18 #include "content/browser/devtools/protocol/inspector_handler.h" |
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 void RenderFrameDevToolsAgentHost::CommitPending() { | 398 void RenderFrameDevToolsAgentHost::CommitPending() { |
397 DCHECK(pending_); | 399 DCHECK(pending_); |
398 current_frame_crashed_ = false; | 400 current_frame_crashed_ = false; |
399 | 401 |
400 if (!ShouldCreateDevToolsFor(pending_->host())) { | 402 if (!ShouldCreateDevToolsFor(pending_->host())) { |
401 DestroyOnRenderFrameGone(); | 403 DestroyOnRenderFrameGone(); |
402 // |this| may be deleted at this point. | 404 // |this| may be deleted at this point. |
403 return; | 405 return; |
404 } | 406 } |
405 | 407 |
406 current_ = pending_.Pass(); | 408 current_ = std::move(pending_); |
407 UpdateProtocolHandlers(current_->host()); | 409 UpdateProtocolHandlers(current_->host()); |
408 current_->Resume(); | 410 current_->Resume(); |
409 } | 411 } |
410 | 412 |
411 void RenderFrameDevToolsAgentHost::DiscardPending() { | 413 void RenderFrameDevToolsAgentHost::DiscardPending() { |
412 DCHECK(pending_); | 414 DCHECK(pending_); |
413 DCHECK(current_); | 415 DCHECK(current_); |
414 pending_.reset(); | 416 pending_.reset(); |
415 UpdateProtocolHandlers(current_->host()); | 417 UpdateProtocolHandlers(current_->host()); |
416 current_->Resume(); | 418 current_->Resume(); |
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
751 page_handler_->SetRenderFrameHost(host); | 753 page_handler_->SetRenderFrameHost(host); |
752 service_worker_handler_->SetRenderFrameHost(host); | 754 service_worker_handler_->SetRenderFrameHost(host); |
753 if (security_handler_) | 755 if (security_handler_) |
754 security_handler_->SetRenderFrameHost(host); | 756 security_handler_->SetRenderFrameHost(host); |
755 } | 757 } |
756 | 758 |
757 void RenderFrameDevToolsAgentHost::DisconnectWebContents() { | 759 void RenderFrameDevToolsAgentHost::DisconnectWebContents() { |
758 if (pending_) | 760 if (pending_) |
759 DiscardPending(); | 761 DiscardPending(); |
760 UpdateProtocolHandlers(nullptr); | 762 UpdateProtocolHandlers(nullptr); |
761 disconnected_ = current_.Pass(); | 763 disconnected_ = std::move(current_); |
762 disconnected_->Detach(); | 764 disconnected_->Detach(); |
763 frame_tree_node_ = nullptr; | 765 frame_tree_node_ = nullptr; |
764 in_navigation_protocol_message_buffer_.clear(); | 766 in_navigation_protocol_message_buffer_.clear(); |
765 in_navigation_ = 0; | 767 in_navigation_ = 0; |
766 pending_handle_ = nullptr; | 768 pending_handle_ = nullptr; |
767 WebContentsObserver::Observe(nullptr); | 769 WebContentsObserver::Observe(nullptr); |
768 } | 770 } |
769 | 771 |
770 void RenderFrameDevToolsAgentHost::ConnectWebContents(WebContents* wc) { | 772 void RenderFrameDevToolsAgentHost::ConnectWebContents(WebContents* wc) { |
771 DCHECK(!current_); | 773 DCHECK(!current_); |
772 DCHECK(!pending_); | 774 DCHECK(!pending_); |
773 RenderFrameHostImpl* host = | 775 RenderFrameHostImpl* host = |
774 static_cast<RenderFrameHostImpl*>(wc->GetMainFrame()); | 776 static_cast<RenderFrameHostImpl*>(wc->GetMainFrame()); |
775 DCHECK(host); | 777 DCHECK(host); |
776 frame_tree_node_ = host->frame_tree_node(); | 778 frame_tree_node_ = host->frame_tree_node(); |
777 current_ = disconnected_.Pass(); | 779 current_ = std::move(disconnected_); |
778 SetPending(host); | 780 SetPending(host); |
779 CommitPending(); | 781 CommitPending(); |
780 WebContentsObserver::Observe(WebContents::FromRenderFrameHost(host)); | 782 WebContentsObserver::Observe(WebContents::FromRenderFrameHost(host)); |
781 } | 783 } |
782 | 784 |
783 DevToolsAgentHost::Type RenderFrameDevToolsAgentHost::GetType() { | 785 DevToolsAgentHost::Type RenderFrameDevToolsAgentHost::GetType() { |
784 return IsChildFrame() ? TYPE_FRAME : TYPE_WEB_CONTENTS; | 786 return IsChildFrame() ? TYPE_FRAME : TYPE_WEB_CONTENTS; |
785 } | 787 } |
786 | 788 |
787 std::string RenderFrameDevToolsAgentHost::GetTitle() { | 789 std::string RenderFrameDevToolsAgentHost::GetTitle() { |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
861 } | 863 } |
862 | 864 |
863 bool RenderFrameDevToolsAgentHost::MatchesMyTreeNode( | 865 bool RenderFrameDevToolsAgentHost::MatchesMyTreeNode( |
864 NavigationHandle* navigation_handle) { | 866 NavigationHandle* navigation_handle) { |
865 return frame_tree_node_ == | 867 return frame_tree_node_ == |
866 static_cast<NavigationHandleImpl*>(navigation_handle) | 868 static_cast<NavigationHandleImpl*>(navigation_handle) |
867 ->frame_tree_node(); | 869 ->frame_tree_node(); |
868 } | 870 } |
869 | 871 |
870 } // namespace content | 872 } // namespace content |
OLD | NEW |