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

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

Issue 1140603004: Revert of [DevTools] Fix potential crash in RenderFrameDevToolsAgentHost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/browser/child_process_security_policy_impl.h" 10 #include "content/browser/child_process_security_policy_impl.h"
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 410
411 if (emulation_handler_) 411 if (emulation_handler_)
412 emulation_handler_->SetRenderFrameHost(render_frame_host_); 412 emulation_handler_->SetRenderFrameHost(render_frame_host_);
413 if (page_handler_) 413 if (page_handler_)
414 page_handler_->SetRenderFrameHost(render_frame_host_); 414 page_handler_->SetRenderFrameHost(render_frame_host_);
415 } 415 }
416 416
417 void RenderFrameDevToolsAgentHost::ClearRenderFrameHost() { 417 void RenderFrameDevToolsAgentHost::ClearRenderFrameHost() {
418 DCHECK(render_frame_host_); 418 DCHECK(render_frame_host_);
419 render_frame_host_ = nullptr; 419 render_frame_host_ = nullptr;
420 WebContentsObserver::Observe(nullptr);
421 dom_handler_->SetRenderFrameHost(nullptr); 420 dom_handler_->SetRenderFrameHost(nullptr);
422 if (emulation_handler_) 421 if (emulation_handler_)
423 emulation_handler_->SetRenderFrameHost(nullptr); 422 emulation_handler_->SetRenderFrameHost(nullptr);
424 input_handler_->SetRenderWidgetHost(nullptr); 423 input_handler_->SetRenderWidgetHost(nullptr);
425 network_handler_->SetRenderFrameHost(nullptr); 424 network_handler_->SetRenderFrameHost(nullptr);
426 if (page_handler_) 425 if (page_handler_)
427 page_handler_->SetRenderFrameHost(nullptr); 426 page_handler_->SetRenderFrameHost(nullptr);
428 service_worker_handler_->SetRenderFrameHost(nullptr); 427 service_worker_handler_->SetRenderFrameHost(nullptr);
429 } 428 }
430 429
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 if (!IsAttached() || !render_frame_host_) 526 if (!IsAttached() || !render_frame_host_)
528 return; 527 return;
529 ProcessChunkedMessageFromAgent(message); 528 ProcessChunkedMessageFromAgent(message);
530 } 529 }
531 530
532 bool RenderFrameDevToolsAgentHost::IsChildFrame() { 531 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
533 return render_frame_host_ && render_frame_host_->GetParent(); 532 return render_frame_host_ && render_frame_host_->GetParent();
534 } 533 }
535 534
536 } // namespace content 535 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698