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

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

Issue 2023243002: Remove base::Tuple (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lint fix Created 4 years, 6 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 <utility> 8 #include <utility>
8 9
9 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
10 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
11 #include "build/build_config.h" 12 #include "build/build_config.h"
12 #include "content/browser/child_process_security_policy_impl.h" 13 #include "content/browser/child_process_security_policy_impl.h"
13 #include "content/browser/devtools/devtools_frame_trace_recorder.h" 14 #include "content/browser/devtools/devtools_frame_trace_recorder.h"
14 #include "content/browser/devtools/devtools_protocol_handler.h" 15 #include "content/browser/devtools/devtools_protocol_handler.h"
15 #include "content/browser/devtools/protocol/dom_handler.h" 16 #include "content/browser/devtools/protocol/dom_handler.h"
16 #include "content/browser/devtools/protocol/emulation_handler.h" 17 #include "content/browser/devtools/protocol/emulation_handler.h"
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 } 848 }
848 return false; 849 return false;
849 } 850 }
850 851
851 void RenderFrameDevToolsAgentHost::OnSwapCompositorFrame( 852 void RenderFrameDevToolsAgentHost::OnSwapCompositorFrame(
852 const IPC::Message& message) { 853 const IPC::Message& message) {
853 ViewHostMsg_SwapCompositorFrame::Param param; 854 ViewHostMsg_SwapCompositorFrame::Param param;
854 if (!ViewHostMsg_SwapCompositorFrame::Read(&message, &param)) 855 if (!ViewHostMsg_SwapCompositorFrame::Read(&message, &param))
855 return; 856 return;
856 if (page_handler_) 857 if (page_handler_)
857 page_handler_->OnSwapCompositorFrame(base::get<1>(param).metadata); 858 page_handler_->OnSwapCompositorFrame(std::get<1>(param).metadata);
858 if (input_handler_) 859 if (input_handler_)
859 input_handler_->OnSwapCompositorFrame(base::get<1>(param).metadata); 860 input_handler_->OnSwapCompositorFrame(std::get<1>(param).metadata);
860 if (frame_trace_recorder_ && tracing_handler_->did_initiate_recording()) { 861 if (frame_trace_recorder_ && tracing_handler_->did_initiate_recording()) {
861 frame_trace_recorder_->OnSwapCompositorFrame( 862 frame_trace_recorder_->OnSwapCompositorFrame(
862 current_ ? current_->host() : nullptr, 863 current_ ? current_->host() : nullptr, std::get<1>(param).metadata);
863 base::get<1>(param).metadata);
864 } 864 }
865 } 865 }
866 866
867 void RenderFrameDevToolsAgentHost::SynchronousSwapCompositorFrame( 867 void RenderFrameDevToolsAgentHost::SynchronousSwapCompositorFrame(
868 const cc::CompositorFrameMetadata& frame_metadata) { 868 const cc::CompositorFrameMetadata& frame_metadata) {
869 if (page_handler_) 869 if (page_handler_)
870 page_handler_->OnSynchronousSwapCompositorFrame(frame_metadata); 870 page_handler_->OnSynchronousSwapCompositorFrame(frame_metadata);
871 if (input_handler_) 871 if (input_handler_)
872 input_handler_->OnSwapCompositorFrame(frame_metadata); 872 input_handler_->OnSwapCompositorFrame(frame_metadata);
873 if (frame_trace_recorder_ && tracing_handler_->did_initiate_recording()) { 873 if (frame_trace_recorder_ && tracing_handler_->did_initiate_recording()) {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 RenderFrameHost* host) { 908 RenderFrameHost* host) {
909 return (current_ && current_->host() == host) || 909 return (current_ && current_->host() == host) ||
910 (pending_ && pending_->host() == host); 910 (pending_ && pending_->host() == host);
911 } 911 }
912 912
913 bool RenderFrameDevToolsAgentHost::IsChildFrame() { 913 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
914 return current_ && current_->host()->GetParent(); 914 return current_ && current_->host()->GetParent();
915 } 915 }
916 916
917 } // namespace content 917 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698