DevTools: make ignoreInputEvents a static flag

third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp

 /*
  * Copyright (C) 2010-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 99 matching lines @@
   static void ensureMainThreadDebuggerCreated(WebDevToolsAgentClient* client) {
     if (s_instance)
       return;
     std::unique_ptr<ClientMessageLoopAdapter> instance =
         WTF::wrapUnique(new ClientMessageLoopAdapter(
             WTF::wrapUnique(client->createClientMessageLoop())));
     s_instance = instance.get();
     MainThreadDebugger::instance()->setClientMessageLoop(std::move(instance));
   }
 
-  static void webViewImplClosed(WebViewImpl* view) {
-    if (s_instance)
-      s_instance->m_frozenViews.remove(view);
-  }
-
-  static void webFrameWidgetImplClosed(WebFrameWidgetImpl* widget) {
-    if (s_instance)
-      s_instance->m_frozenWidgets.remove(widget);
-  }
-
   static void continueProgram() {
     // Release render thread if necessary.
     if (s_instance)
       s_instance->quitNow();
   }
 
   static void pauseForCreateWindow(WebLocalFrameImpl* frame) {
     if (s_instance)
       s_instance->runForCreateWindow(frame);
   }
@@ skipping 28 matching lines @@
     m_runningForCreateWindow = true;
     if (!m_runningForDebugBreak)
       runLoop(frame);
   }
 
   void runLoop(WebLocalFrameImpl* frame) {
     // 0. Flush pending frontend messages.
     WebDevToolsAgentImpl* agent = frame->devToolsAgentImpl();
     agent->flushProtocolNotifications();
 
-    Vector<WebViewImpl*> views;
-    HeapVector<Member<WebFrameWidgetImpl>> widgets;
-
     // 1. Disable input events.
-    const HashSet<WebViewImpl*>& viewImpls = WebViewImpl::allInstances();
-    HashSet<WebViewImpl*>::const_iterator viewImplsEnd = viewImpls.end();
-    for (HashSet<WebViewImpl*>::const_iterator it = viewImpls.begin();
-         it != viewImplsEnd; ++it) {
-      WebViewImpl* view = *it;
-      m_frozenViews.add(view);
-      views.append(view);
-      view->setIgnoreInputEvents(true);
+    WebFrameWidgetBase::setIgnoreInputEvents(true);
+    for (const auto view : WebViewImpl::allInstances())
       view->chromeClient().notifyPopupOpeningObservers();
-    }
-
-    const WebFrameWidgetsSet& widgetImpls = WebFrameWidgetImpl::allInstances();
-    WebFrameWidgetsSet::const_iterator widgetImplsEnd = widgetImpls.end();
-    for (WebFrameWidgetsSet::const_iterator it = widgetImpls.begin();
-         it != widgetImplsEnd; ++it) {
-      WebFrameWidgetImpl* widget = *it;
-      m_frozenWidgets.add(widget);
-      widgets.append(widget);
-      widget->setIgnoreInputEvents(true);
-    }
 
     // 2. Notify embedder about pausing.
     if (agent->client())
       agent->client()->willEnterDebugLoop();
 
     // 3. Disable active objects
     WebView::willEnterModalLoop();
 
     // 4. Process messages until quitNow is called.
     m_messageLoop->run();
 
     // 5. Resume active objects
     WebView::didExitModalLoop();
 
-    // 6. Resume input events.
-    for (Vector<WebViewImpl*>::iterator it = views.begin(); it != views.end();
-         ++it) {
-      if (m_frozenViews.contains(*it)) {
-        // The view was not closed during the dispatch.
-        (*it)->setIgnoreInputEvents(false);
-      }
-    }
-    for (HeapVector<Member<WebFrameWidgetImpl>>::iterator it = widgets.begin();
-         it != widgets.end(); ++it) {
-      if (m_frozenWidgets.contains(*it)) {
-        // The widget was not closed during the dispatch.
-        (*it)->setIgnoreInputEvents(false);
-      }
-    }
+    WebFrameWidgetBase::setIgnoreInputEvents(false);
 
     // 7. Notify embedder about resuming.
     if (agent->client())
       agent->client()->didExitDebugLoop();
-
-    // 8. All views have been resumed, clear the set.
-    m_frozenViews.clear();
-    m_frozenWidgets.clear();
   }
 
   void quitNow() override {
     if (m_runningForDebugBreak) {
       m_runningForDebugBreak = false;
       if (!m_runningForCreateWindow)
         m_messageLoop->quitNow();
     }
   }
 
@@ skipping 15 matching lines @@
     WebDevToolsAgentImpl* agent =
         WebLocalFrameImpl::fromFrame(frame)->devToolsAgentImpl();
     if (agent && agent->client())
       agent->client()->resumeStartup();
   }
 
   bool m_runningForDebugBreak;
   bool m_runningForCreateWindow;
   std::unique_ptr<WebDevToolsAgentClient::WebKitClientMessageLoop>
       m_messageLoop;
-  typedef HashSet<WebViewImpl*> FrozenViewsSet;
-  FrozenViewsSet m_frozenViews;
-  WebFrameWidgetsSet m_frozenWidgets;
+
   static ClientMessageLoopAdapter* s_instance;
 };
 
 ClientMessageLoopAdapter* ClientMessageLoopAdapter::s_instance = nullptr;
 
 // static
 WebDevToolsAgentImpl* WebDevToolsAgentImpl::create(
     WebLocalFrameImpl* frame,
     WebDevToolsAgentClient* client) {
   InspectorOverlay* overlay = new InspectorOverlay(frame);
@@ skipping 35 matching lines @@
       m_includeViewAgents(includeViewAgents),
       m_layerTreeId(0) {
   DCHECK(isMainThread());
   DCHECK(m_webLocalFrameImpl->frame());
 }
 
 WebDevToolsAgentImpl::~WebDevToolsAgentImpl() {
   DCHECK(!m_client);
 }
 
-// static
-void WebDevToolsAgentImpl::webViewImplClosed(WebViewImpl* webViewImpl) {
-  ClientMessageLoopAdapter::webViewImplClosed(webViewImpl);
-}
-
-// static
-void WebDevToolsAgentImpl::webFrameWidgetImplClosed(
-    WebFrameWidgetImpl* webFrameWidgetImpl) {
-  ClientMessageLoopAdapter::webFrameWidgetImplClosed(webFrameWidgetImpl);
-}
-
 DEFINE_TRACE(WebDevToolsAgentImpl) {
   visitor->trace(m_webLocalFrameImpl);
   visitor->trace(m_instrumentingAgents);
   visitor->trace(m_resourceContentLoader);
   visitor->trace(m_overlay);
   visitor->trace(m_inspectedFrames);
   visitor->trace(m_resourceContainer);
   visitor->trace(m_domAgent);
   visitor->trace(m_pageAgent);
   visitor->trace(m_networkAgent);
@@ skipping 346 matching lines @@
 }
 
 bool WebDevToolsAgent::shouldInterruptForMethod(const WebString& method) {
   return method == "Debugger.pause" || method == "Debugger.setBreakpoint" ||
          method == "Debugger.setBreakpointByUrl" ||
          method == "Debugger.removeBreakpoint" ||
          method == "Debugger.setBreakpointsActive";
 }
 
 }  // namespace blink