Revert of [DevTools] Consolidate overlay-related functionality in Overlay domain

third_party/WebKit/Source/core/inspector/InspectorPageAgent.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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 63 matching lines @@
 namespace blink {
 
 using protocol::Response;
 
 namespace PageAgentState {
 static const char kPageAgentEnabled[] = "pageAgentEnabled";
 static const char kPageAgentScriptsToEvaluateOnLoad[] =
     "pageAgentScriptsToEvaluateOnLoad";
 static const char kScreencastEnabled[] = "screencastEnabled";
 static const char kAutoAttachToCreatedPages[] = "autoAttachToCreatedPages";
+static const char kOverlaySuspended[] = "overlaySuspended";
+static const char kOverlayMessage[] = "overlayMessage";
 }
 
 namespace {
 
 KURL UrlWithoutFragment(const KURL& url) {
   KURL result = url;
   result.RemoveFragmentIdentifier();
   return result;
 }
 
@@ skipping 273 matching lines @@
       last_script_identifier_(0),
       enabled_(false),
       reloading_(false),
       inspector_resource_content_loader_(resource_content_loader),
       resource_content_loader_client_id_(
           resource_content_loader->CreateClientId()) {}
 
 void InspectorPageAgent::Restore() {
   if (state_->booleanProperty(PageAgentState::kPageAgentEnabled, false))
     enable();
+  if (client_) {
+    String overlay_message;
+    state_->getString(PageAgentState::kOverlayMessage, &overlay_message);
+    client_->ConfigureOverlay(
+        state_->booleanProperty(PageAgentState::kOverlaySuspended, false),
+        overlay_message);
+  }
 }
 
 Response InspectorPageAgent::enable() {
   enabled_ = true;
   state_->setBoolean(PageAgentState::kPageAgentEnabled, true);
   instrumenting_agents_->addInspectorPageAgent(this);
   return Response::OK();
 }
 
 Response InspectorPageAgent::disable() {
   enabled_ = false;
   state_->setBoolean(PageAgentState::kPageAgentEnabled, false);
   state_->remove(PageAgentState::kPageAgentScriptsToEvaluateOnLoad);
   script_to_evaluate_on_load_once_ = String();
   pending_script_to_evaluate_on_load_once_ = String();
   instrumenting_agents_->removeInspectorPageAgent(this);
   inspector_resource_content_loader_->Cancel(
       resource_content_loader_client_id_);
 
   stopScreencast();
+  configureOverlay(false, String());
 
   FinishReload();
   return Response::OK();
 }
 
 Response InspectorPageAgent::addScriptToEvaluateOnLoad(const String& source,
                                                        String* identifier) {
   protocol::DictionaryValue* scripts =
       state_->getObject(PageAgentState::kPageAgentScriptsToEvaluateOnLoad);
   if (!scripts) {
@@ skipping 440 matching lines @@
                                              Maybe<int> every_nth_frame) {
   state_->setBoolean(PageAgentState::kScreencastEnabled, true);
   return Response::OK();
 }
 
 Response InspectorPageAgent::stopScreencast() {
   state_->setBoolean(PageAgentState::kScreencastEnabled, false);
   return Response::OK();
 }
 
+Response InspectorPageAgent::configureOverlay(Maybe<bool> suspended,
+                                              Maybe<String> message) {
+  state_->setBoolean(PageAgentState::kOverlaySuspended,
+                     suspended.fromMaybe(false));
+  state_->setString(PageAgentState::kOverlaySuspended,
+                    message.fromMaybe(String()));
+  if (client_)
+    client_->ConfigureOverlay(suspended.fromMaybe(false),
+                              message.fromMaybe(String()));
+  return Response::OK();
+}
+
 Response InspectorPageAgent::getLayoutMetrics(
     std::unique_ptr<protocol::Page::LayoutViewport>* out_layout_viewport,
     std::unique_ptr<protocol::Page::VisualViewport>* out_visual_viewport,
     std::unique_ptr<protocol::DOM::Rect>* out_content_size) {
   LocalFrame* main_frame = inspected_frames_->Root();
   VisualViewport& visual_viewport = main_frame->GetPage()->GetVisualViewport();
 
   main_frame->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   IntRect visible_contents = main_frame->View()->VisibleContentRect();
@@ skipping 34 matching lines @@
   return Response::OK();
 }
 
 DEFINE_TRACE(InspectorPageAgent) {
   visitor->Trace(inspected_frames_);
   visitor->Trace(inspector_resource_content_loader_);
   InspectorBaseAgent::Trace(visitor);
 }
 
 }  // namespace blink