[DevTools] Promote Device Mode v2 to default experiments.

third_party/WebKit/Source/web/InspectorOverlay.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 163 matching lines @@
     { }
 
     RawPtrWillBeMember<ChromeClient> m_client;
     RawPtrWillBeMember<InspectorOverlay> m_overlay;
 };
 
 
 InspectorOverlay::InspectorOverlay(WebViewImpl* webViewImpl)
     : m_webViewImpl(webViewImpl)
     , m_overlayHost(InspectorOverlayHost::create())
-    , m_drawViewSize(false)
-    , m_drawViewSizeWithGrid(false)
-    , m_resizeTimerActive(false)
     , m_omitTooltip(false)
-    , m_timer(this, &InspectorOverlay::onTimer)
     , m_suspendCount(0)
     , m_inLayout(false)
     , m_needsUpdate(false)
     , m_inspectMode(InspectorDOMAgent::NotSearching)
 {
 }
 
 InspectorOverlay::~InspectorOverlay()
 {
     ASSERT(!m_overlayPage);
@@ skipping 159 matching lines @@
     m_quadHighlightConfig = highlightConfig;
     m_highlightQuad = quad;
     m_omitTooltip = false;
     scheduleUpdate();
 }
 
 bool InspectorOverlay::isEmpty()
 {
     if (m_suspendCount)
         return true;
-    bool hasVisibleElements = m_highlightNode || m_eventTargetNode || m_highlightQuad  || (m_resizeTimerActive && m_drawViewSize) || !m_pausedInDebuggerMessage.isNull();
+    bool hasVisibleElements = m_highlightNode || m_eventTargetNode || m_highlightQuad  || !m_pausedInDebuggerMessage.isNull();
     return !hasVisibleElements && m_inspectMode == InspectorDOMAgent::NotSearching;
 }
 
 void InspectorOverlay::scheduleUpdate()
 {
     if (isEmpty()) {
         if (m_pageOverlay)
             m_pageOverlay.clear();
         return;
     }
     m_needsUpdate = true;
     m_webViewImpl->page()->chromeClient().scheduleAnimation();
 }
 
 void InspectorOverlay::rebuildOverlayPage()
 {
     FrameView* view = m_webViewImpl->mainFrameImpl()->frameView();
     if (!view)
         return;
 
     IntRect visibleRectInDocument = view->scrollableArea()->visibleContentRect();
     IntSize viewportSize = m_webViewImpl->page()->frameHost().visualViewport().size();
     toLocalFrame(overlayPage()->mainFrame())->view()->resize(viewportSize);
     overlayPage()->frameHost().visualViewport().setSize(viewportSize);
     reset(viewportSize, visibleRectInDocument.location());
 
     drawNodeHighlight();
     drawQuadHighlight();
     drawPausedInDebuggerMessage();
-    drawViewSize();
     if (m_layoutEditor && !m_highlightNode)
         m_layoutEditor->rebuild();
 }
 
 static PassRefPtr<JSONObject> buildObjectForSize(const IntSize& size)
 {
     RefPtr<JSONObject> result = JSONObject::create();
     result->setNumber("width", size.width());
     result->setNumber("height", size.height());
     return result.release();
@@ skipping 36 matching lines @@
     highlight.appendQuad(*m_highlightQuad, m_quadHighlightConfig.content, m_quadHighlightConfig.contentOutline);
     evaluateInOverlay("drawHighlight", highlight.asJSONObject());
 }
 
 void InspectorOverlay::drawPausedInDebuggerMessage()
 {
     if (m_inspectMode == InspectorDOMAgent::NotSearching && !m_pausedInDebuggerMessage.isNull())
         evaluateInOverlay("drawPausedInDebuggerMessage", m_pausedInDebuggerMessage);
 }
 
-void InspectorOverlay::drawViewSize()
-{
-    if (m_resizeTimerActive && m_drawViewSize)
-        evaluateInOverlay("drawViewSize", m_drawViewSizeWithGrid ? "true" : "false");
-}
-
 Page* InspectorOverlay::overlayPage()
 {
     if (m_overlayPage)
         return m_overlayPage.get();
 
     ScriptForbiddenScope::AllowUserAgentScript allowScript;
 
     DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<FrameLoaderClient>, dummyFrameLoaderClient, (EmptyFrameLoaderClient::create()));
     Page::PageClients pageClients;
     fillWithEmptyClients(pageClients);
@@ skipping 86 matching lines @@
 }
 
 String InspectorOverlay::evaluateInOverlayForTest(const String& script)
 {
     ScriptForbiddenScope::AllowUserAgentScript allowScript;
     v8::HandleScope handleScope(toIsolate(overlayMainFrame()));
     v8::Local<v8::Value> string = toLocalFrame(overlayPage()->mainFrame())->script().executeScriptInMainWorldAndReturnValue(ScriptSourceCode(script), ScriptController::ExecuteScriptWhenScriptsDisabled);
     return toCoreStringWithUndefinedOrNullCheck(string);
 }
 
-void InspectorOverlay::onTimer(Timer<InspectorOverlay>*)
-{
-    m_resizeTimerActive = false;
-    scheduleUpdate();
-}
-
 void InspectorOverlay::clear()
 {
     if (m_layoutEditor)
         m_layoutEditor.clear();
 
     if (m_overlayPage) {
         m_overlayPage->willBeDestroyed();
         m_overlayPage.clear();
         m_overlayChromeClient.clear();
     }
-    m_resizeTimerActive = false;
     m_pausedInDebuggerMessage = String();
     m_inspectMode = InspectorDOMAgent::NotSearching;
-    m_timer.stop();
     hideHighlight();
 }
 
 void InspectorOverlay::overlayResumed()
 {
     if (m_debuggerAgent) {
         ErrorString error;
         m_debuggerAgent->resume(&error);
     }
 }
@@ skipping 60 matching lines @@
 {
     if (!m_suspendCount++)
         clear();
 }
 
 void InspectorOverlay::profilingStopped()
 {
     --m_suspendCount;
 }
 
-void InspectorOverlay::pageLayoutInvalidated(bool resized)
+void InspectorOverlay::pageLayoutInvalidated()
 {
-    if (resized && m_drawViewSize) {
-        m_resizeTimerActive = true;
-        m_timer.startOneShot(1, BLINK_FROM_HERE);
-    }
     scheduleUpdate();
 }
 
-void InspectorOverlay::setShowViewportSizeOnResize(bool show, bool showGrid)
-{
-    m_drawViewSize = show;
-    m_drawViewSizeWithGrid = showGrid;
-}
-
 bool InspectorOverlay::handleMouseMove(const PlatformMouseEvent& event)
 {
     if (!shouldSearchForNode())
         return false;
 
     LocalFrame* frame = m_webViewImpl->mainFrameImpl()->frame();
     if (!frame->view() || !frame->contentLayoutObject())
         return false;
     Node* node = hoveredNodeForEvent(frame, event, event.shiftKey());
 
@@ skipping 79 matching lines @@
 
 void InspectorOverlay::initializeLayoutEditorIfNeeded(Node* node)
 {
     if (m_inspectMode != InspectorDOMAgent::ShowLayoutEditor || !node || !node->isElementNode() || !node->ownerDocument()->isActive())
         return;
     m_layoutEditor = LayoutEditor::create(toElement(node), m_cssAgent, m_domAgent, &overlayMainFrame()->script());
     toChromeClientImpl(m_webViewImpl->page()->chromeClient()).setCursorOverridden(true);
 }
 
 } // namespace blink