DevTools: make ignoreInputEvents a static flag

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 81 matching lines @@
                                 toWebLocalFrameImpl(*mainFrame));
 }
 
 WebFrameWidgetImpl* WebFrameWidgetImpl::create(WebWidgetClient* client,
                                                WebLocalFrame* localRoot) {
   // Pass the WebFrameWidgetImpl's self-reference to the caller.
   return new WebFrameWidgetImpl(
       client, localRoot);  // SelfKeepAlive is set in constructor.
 }
 
-// static
-WebFrameWidgetsSet& WebFrameWidgetImpl::allInstances() {
-  DEFINE_STATIC_LOCAL(WebFrameWidgetsSet, allInstances, ());
-  return allInstances;
-}
-
 WebFrameWidgetImpl::WebFrameWidgetImpl(WebWidgetClient* client,
                                        WebLocalFrame* localRoot)
     : m_client(client),
       m_localRoot(toWebLocalFrameImpl(localRoot)),
       m_mutator(nullptr),
       m_layerTreeView(nullptr),
       m_rootLayer(nullptr),
       m_rootGraphicsLayer(nullptr),
       m_isAcceleratedCompositingActive(false),
       m_layerTreeViewClosed(false),
       m_suppressNextKeypressEvent(false),
-      m_ignoreInputEvents(false),
       m_isTransparent(false),
       m_imeAcceptEvents(true),
       m_selfKeepAlive(this) {
   DCHECK(m_localRoot->frame()->isLocalRoot());
   initializeLayerTreeView();
   m_localRoot->setFrameWidget(this);
-  allInstances().add(this);
 
   if (localRoot->parent())
     setIsTransparent(true);
 }
 
 WebFrameWidgetImpl::~WebFrameWidgetImpl() {}
 
 DEFINE_TRACE(WebFrameWidgetImpl) {
   visitor->trace(m_localRoot);
   visitor->trace(m_mouseCaptureNode);
 }
 
 // WebWidget ------------------------------------------------------------------
 
 void WebFrameWidgetImpl::close() {
-  WebDevToolsAgentImpl::webFrameWidgetImplClosed(this);
-  DCHECK(allInstances().contains(this));
-  allInstances().remove(this);
-
   m_localRoot->setFrameWidget(nullptr);
   m_localRoot = nullptr;
   // Reset the delegate to prevent notifications being sent as we're being
   // deleted.
   m_client = nullptr;
 
   m_mutator = nullptr;
   m_layerTreeView = nullptr;
   m_rootLayer = nullptr;
   m_rootGraphicsLayer = nullptr;
@@ skipping 65 matching lines @@
 
   FrameView* view = m_localRoot->frameView();
   if (!view)
     return;
 
   WebSize layoutSize = m_size;
 
   view->setLayoutSize(layoutSize);
 }
 
-void WebFrameWidgetImpl::setIgnoreInputEvents(bool newValue) {
-  DCHECK_NE(m_ignoreInputEvents, newValue);
-  m_ignoreInputEvents = newValue;
-}
 
 void WebFrameWidgetImpl::didEnterFullscreen() {
   view()->didEnterFullscreen();
 }
 
 void WebFrameWidgetImpl::didExitFullscreen() {
   view()->didExitFullscreen();
 }
 
 void WebFrameWidgetImpl::beginFrame(double lastFrameTimeMonotonic) {
@@ skipping 91 matching lines @@
   if (!page())
     return WebInputEventResult::NotHandled;
 
   if (InspectorOverlay* overlay = inspectorOverlay()) {
     if (overlay->handleInputEvent(inputEvent))
       return WebInputEventResult::HandledSuppressed;
   }
 
   // Report the event to be NOT processed by WebKit, so that the browser can
   // handle it appropriately.
-  if (m_ignoreInputEvents)
+  if (ignoreInputEvents())
     return WebInputEventResult::NotHandled;
 
   // FIXME: pass event to m_localRoot's WebDevToolsAgentImpl once available.
 
   AutoReset<const WebInputEvent*> currentEventChange(&m_currentInputEvent,
                                                      &inputEvent);
 
   if (m_mouseCaptureNode && WebInputEvent::isMouseEventType(inputEvent.type)) {
     TRACE_EVENT1("input", "captured mouse event", "type", inputEvent.type);
     // Save m_mouseCaptureNode since mouseCaptureLost() will clear it.
@@ skipping 798 matching lines @@
   return nullptr;
 }
 
 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const {
   if (!m_imeAcceptEvents)
     return nullptr;
   return focusedLocalFrameInWidget();
 }
 
 }  // namespace blink