[DevTools] Cleanup overlay resources in Dispose

third_party/WebKit/Source/web/InspectorOverlayAgent.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 202 matching lines @@
 };
 
 InspectorOverlayAgent::InspectorOverlayAgent(
     WebLocalFrameImpl* frame_impl,
     InspectedFrames* inspected_frames,
     v8_inspector::V8InspectorSession* v8_session,
     InspectorDOMAgent* dom_agent)
     : frame_impl_(frame_impl),
       inspected_frames_(inspected_frames),
       enabled_(false),
-      overlay_host_(new InspectorOverlayHost(this)),
       draw_view_size_(false),
       resize_timer_active_(false),
       omit_tooltip_(false),
       timer_(TaskRunnerHelper::Get(TaskType::kUnspecedTimer,
                                    frame_impl->GetFrame()),
              this,
              &InspectorOverlayAgent::OnTimer),
       suspended_(false),
+      disposed_(false),
       show_reloading_blanket_(false),
       in_layout_(false),
       needs_update_(false),
       v8_session_(v8_session),
       dom_agent_(dom_agent),
       swallow_next_mouse_up_(false),
       inspect_mode_(kNotSearching),
       backend_node_id_to_inspect_(0) {}
 
 InspectorOverlayAgent::~InspectorOverlayAgent() {
@@ skipping 20 matching lines @@
       state_->booleanProperty(OverlayAgentState::kShowDebugBorders, false));
   setShowFPSCounter(
       state_->booleanProperty(OverlayAgentState::kShowFPSCounter, false));
   setShowPaintRects(
       state_->booleanProperty(OverlayAgentState::kShowPaintRects, false));
   setShowScrollBottleneckRects(state_->booleanProperty(
       OverlayAgentState::kShowScrollBottleneckRects, false));
   setShowViewportSizeOnResize(
       state_->booleanProperty(OverlayAgentState::kShowSizeOnResize, false));
   String message;
-  state_->getString(OverlayAgentState::kPausedInDebuggerMessage, &message);
-  setPausedInDebuggerMessage(message);
+  if (state_->getString(OverlayAgentState::kPausedInDebuggerMessage, &message))
+    setPausedInDebuggerMessage(message);
   setSuspended(state_->booleanProperty(OverlayAgentState::kSuspended, false));
 }
 
 void InspectorOverlayAgent::Dispose() {
+  InspectorBaseAgent::Dispose();
   show_reloading_blanket_ = false;
+  disposed_ = true;
   ClearInternal();
-  InspectorBaseAgent::Dispose();
 }
 
 Response InspectorOverlayAgent::enable() {
   if (!dom_agent_->Enabled())
     return Response::Error("DOM should be enabled first");
   state_->setBoolean(OverlayAgentState::kEnabled, true);
   enabled_ = true;
   if (backend_node_id_to_inspect_)
     GetFrontend()->inspectNodeRequested(backend_node_id_to_inspect_);
   backend_node_id_to_inspect_ = 0;
@@ skipping 200 matching lines @@
   Node* node = nullptr;
   Response response = dom_agent_->AssertNode(node_id, node);
   if (!response.isSuccess())
     return response;
   InspectorHighlight highlight(node, InspectorHighlight::DefaultConfig(), true);
   *result = highlight.AsProtocolValue();
   return Response::OK();
 }
 
 void InspectorOverlayAgent::Invalidate() {
+  if (IsEmpty())
+    return;
+
   if (!page_overlay_) {
     page_overlay_ = PageOverlay::Create(
         frame_impl_, WTF::WrapUnique(new InspectorPageOverlayDelegate(*this)));
   }
 
   page_overlay_->Update();
 }
 
 void InspectorOverlayAgent::UpdateAllLifecyclePhases() {
   if (IsEmpty())
@@ skipping 122 matching lines @@
     Maybe<protocol::DOM::RGBA> outline_color) {
   quad_content_color_ = InspectorDOMAgent::ParseColor(color.fromMaybe(nullptr));
   quad_content_outline_color_ =
       InspectorDOMAgent::ParseColor(outline_color.fromMaybe(nullptr));
   highlight_quad_ = std::move(quad);
   omit_tooltip_ = false;
   ScheduleUpdate();
 }
 
 bool InspectorOverlayAgent::IsEmpty() {
+  if (disposed_)
+    return true;
   if (show_reloading_blanket_)
     return false;
   if (suspended_)
     return true;
   bool has_visible_elements = highlight_node_ || event_target_node_ ||
                               highlight_quad_ ||
                               (resize_timer_active_ && draw_view_size_) ||
                               !paused_in_debugger_message_.IsNull();
   return !has_visible_elements && inspect_mode_ == kNotSearching;
 }
@@ skipping 122 matching lines @@
 
   DEFINE_STATIC_LOCAL(LocalFrameClient, dummy_local_frame_client,
                       (EmptyLocalFrameClient::Create()));
   Page::PageClients page_clients;
   FillWithEmptyClients(page_clients);
   DCHECK(!overlay_chrome_client_);
   overlay_chrome_client_ = InspectorOverlayChromeClient::Create(
       frame_impl_->GetFrame()->GetPage()->GetChromeClient(), *this);
   page_clients.chrome_client = overlay_chrome_client_.Get();
   overlay_page_ = Page::Create(page_clients);
+  overlay_host_ = new InspectorOverlayHost(this);
 
   Settings& settings = frame_impl_->GetFrame()->GetPage()->GetSettings();
   Settings& overlay_settings = overlay_page_->GetSettings();
 
   overlay_settings.GetGenericFontFamilySettings().UpdateStandard(
       settings.GetGenericFontFamilySettings().Standard());
   overlay_settings.GetGenericFontFamilySettings().UpdateSerif(
       settings.GetGenericFontFamilySettings().Serif());
   overlay_settings.GetGenericFontFamilySettings().UpdateSansSerif(
       settings.GetGenericFontFamilySettings().SansSerif());
@@ skipping 126 matching lines @@
 void InspectorOverlayAgent::OnTimer(TimerBase*) {
   resize_timer_active_ = false;
   ScheduleUpdate();
 }
 
 void InspectorOverlayAgent::ClearInternal() {
   if (overlay_page_) {
     overlay_page_->WillBeDestroyed();
     overlay_page_.Clear();
     overlay_chrome_client_.Clear();
+    overlay_host_->ClearListener();
+    overlay_host_.Clear();
   }
   resize_timer_active_ = false;
   paused_in_debugger_message_ = String();
   inspect_mode_ = kNotSearching;
   timer_.Stop();
+  page_overlay_.reset();
   InnerHideHighlight();
 }
 
 void InspectorOverlayAgent::OverlayResumed() {
   if (v8_session_)
     v8_session_->resume();
 }
 
 void InspectorOverlayAgent::OverlaySteppedOver() {
   if (v8_session_)
@@ skipping 207 matching lines @@
       InspectorDOMAgent::ParseColor(config->getShapeColor(nullptr));
   highlight_config->shape_margin =
       InspectorDOMAgent::ParseColor(config->getShapeMarginColor(nullptr));
   highlight_config->selector_list = config->getSelectorList("");
 
   *out_config = std::move(highlight_config);
   return Response::OK();
 }
 
 }  // namespace blink