Chromium Code Reviews| 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 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 573 return; | 573 return; |
| 574 | 574 |
| 575 frame_trace_recorder_.reset(new DevToolsFrameTraceRecorder()); | 575 frame_trace_recorder_.reset(new DevToolsFrameTraceRecorder()); |
| 576 CreatePowerSaveBlocker(); | 576 CreatePowerSaveBlocker(); |
| 577 } | 577 } |
| 578 | 578 |
| 579 void RenderFrameDevToolsAgentHost::OnClientDetached() { | 579 void RenderFrameDevToolsAgentHost::OnClientDetached() { |
| 580 #if defined(OS_ANDROID) | 580 #if defined(OS_ANDROID) |
| 581 power_save_blocker_.reset(); | 581 power_save_blocker_.reset(); |
| 582 #endif | 582 #endif |
| 583 if (input_handler_) | |
|
dgozman
2016/11/23 02:03:53
I think it's never null (created in constructor).
tdresser
2016/11/23 13:38:13
Looks like you're right. I'm not sure why this is
samuong
2016/11/23 18:40:48
Done. I removed the "if (input_handler_)", but I n
tdresser
2016/11/23 18:52:46
I'd be happy to see us stack allocated input_handl
| |
| 584 input_handler_->Detached(); | |
| 583 if (emulation_handler_) | 585 if (emulation_handler_) |
| 584 emulation_handler_->Detached(); | 586 emulation_handler_->Detached(); |
| 585 if (page_handler_) | 587 if (page_handler_) |
| 586 page_handler_->Detached(); | 588 page_handler_->Detached(); |
| 587 service_worker_handler_->Detached(); | 589 service_worker_handler_->Detached(); |
| 588 target_handler_->Detached(); | 590 target_handler_->Detached(); |
| 589 frame_trace_recorder_.reset(); | 591 frame_trace_recorder_.reset(); |
| 590 in_navigation_protocol_message_buffer_.clear(); | 592 in_navigation_protocol_message_buffer_.clear(); |
| 591 } | 593 } |
| 592 | 594 |
| (...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1140 RenderFrameHost* host) { | 1142 RenderFrameHost* host) { |
| 1141 return (current_ && current_->host() == host) || | 1143 return (current_ && current_->host() == host) || |
| 1142 (pending_ && pending_->host() == host); | 1144 (pending_ && pending_->host() == host); |
| 1143 } | 1145 } |
| 1144 | 1146 |
| 1145 bool RenderFrameDevToolsAgentHost::IsChildFrame() { | 1147 bool RenderFrameDevToolsAgentHost::IsChildFrame() { |
| 1146 return current_ && current_->host()->GetParent(); | 1148 return current_ && current_->host()->GetParent(); |
| 1147 } | 1149 } |
| 1148 | 1150 |
| 1149 } // namespace content | 1151 } // namespace content |
| OLD | NEW |