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

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

 /*
  * Copyright (C) 2014 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 49 matching lines @@
 #include "platform/wtf/PtrUtil.h"
 #include "public/web/WebAutofillClient.h"
 #include "public/web/WebPlugin.h"
 #include "public/web/WebRange.h"
 #include "public/web/WebWidgetClient.h"
 #include "web/AnimationWorkletProxyClientImpl.h"
 #include "web/CompositionUnderlineVectorBuilder.h"
 #include "web/CompositorMutatorImpl.h"
 #include "web/CompositorWorkerProxyClientImpl.h"
 #include "web/ContextMenuAllowedScope.h"
-#include "web/InspectorOverlayAgent.h"
+#include "web/InspectorOverlay.h"
 #include "web/PageOverlay.h"
 #include "web/WebDevToolsAgentImpl.h"
 #include "web/WebInputEventConversion.h"
 #include "web/WebInputMethodControllerImpl.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebPluginContainerImpl.h"
 #include "web/WebRemoteFrameImpl.h"
 #include "web/WebViewFrameWidget.h"
 
 namespace blink {
@@ skipping 162 matching lines @@
                last_frame_time_monotonic);
   DCHECK(last_frame_time_monotonic);
   PageWidgetDelegate::Animate(*GetPage(), last_frame_time_monotonic);
 }
 
 void WebFrameWidgetImpl::UpdateAllLifecyclePhases() {
   TRACE_EVENT0("blink", "WebFrameWidgetImpl::updateAllLifecyclePhases");
   if (!local_root_)
     return;
 
-  if (InspectorOverlayAgent* overlay = GetInspectorOverlay()) {
+  if (InspectorOverlay* overlay = GetInspectorOverlay()) {
     overlay->UpdateAllLifecyclePhases();
     // TODO(chrishtr): integrate paint into the overlay's lifecycle.
     if (overlay->GetPageOverlay() &&
         overlay->GetPageOverlay()->GetGraphicsLayer())
       overlay->GetPageOverlay()->GetGraphicsLayer()->Paint(nullptr);
   }
   PageWidgetDelegate::UpdateAllLifecyclePhases(*GetPage(),
                                                *local_root_->GetFrame());
   UpdateLayerTreeBackgroundColor();
 }
@@ skipping 91 matching lines @@
                WebInputEvent::GetName(input_event.GetType()));
 
   // If a drag-and-drop operation is in progress, ignore input events.
   if (doing_drag_and_drop_)
     return WebInputEventResult::kHandledSuppressed;
 
   // Don't handle events once we've started shutting down.
   if (!GetPage())
     return WebInputEventResult::kNotHandled;
 
-  if (InspectorOverlayAgent* overlay = GetInspectorOverlay()) {
+  if (InspectorOverlay* overlay = GetInspectorOverlay()) {
     if (overlay->HandleInputEvent(input_event))
       return WebInputEventResult::kHandledSuppressed;
   }
 
   // Report the event to be NOT processed by WebKit, so that the browser can
   // handle it appropriately.
   if (IgnoreInputEvents())
     return WebInputEventResult::kNotHandled;
 
   // FIXME: pass event to m_localRoot's WebDevToolsAgentImpl once available.
@@ skipping 771 matching lines @@
     const IntPoint& pos_in_root_frame) {
   IntPoint doc_point(
       local_root_->GetFrame()->View()->RootFrameToContents(pos_in_root_frame));
   HitTestResult result =
       local_root_->GetFrame()->GetEventHandler().HitTestResultAtPoint(
           doc_point, HitTestRequest::kReadOnly | HitTestRequest::kActive);
   result.SetToShadowHostIfInRestrictedShadowRoot();
   return result;
 }
 
-InspectorOverlayAgent* WebFrameWidgetImpl::GetInspectorOverlay() {
+InspectorOverlay* WebFrameWidgetImpl::GetInspectorOverlay() {
   if (!local_root_)
     return nullptr;
   if (WebDevToolsAgentImpl* devtools = local_root_->DevToolsAgentImpl())
-    return devtools->OverlayAgent();
+    return devtools->Overlay();
   return nullptr;
 }
 
 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameInWidget() const {
   LocalFrame* frame = GetPage()->GetFocusController().FocusedFrame();
   return (frame && frame->LocalFrameRoot() == local_root_->GetFrame())
              ? frame
              : nullptr;
 }
 
 WebPlugin* WebFrameWidgetImpl::FocusedPluginIfInputMethodSupported(
     LocalFrame* frame) const {
   WebPluginContainerImpl* container =
       WebLocalFrameImpl::CurrentPluginContainer(frame);
   if (container && container->SupportsInputMethod())
     return container->Plugin();
   return nullptr;
 }
 
 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const {
   if (!ime_accept_events_)
     return nullptr;
   return FocusedLocalFrameInWidget();
 }
 
 }  // namespace blink