[DevTools] Cleanup inspector overlay and make it work with virtual viewport.

Source/core/inspector/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 317 matching lines @@
 
     return overlayPage()->mainFrame()->eventHandler().keyEvent(event);
 }
 
 void InspectorOverlay::drawOutline(GraphicsContext* context, const LayoutRect& rect, const Color& color)
 {
     FloatRect outlineRect = rect;
     drawOutlinedQuad(context, outlineRect, Color(), color);
 }
 
-void InspectorOverlay::resize(const IntSize& size)
-{
-    m_size = size;
-    update();
-}
-
 void InspectorOverlay::setPausedInDebuggerMessage(const String* message)
 {
     m_pausedInDebuggerMessage = message ? *message : String();
     update();
 }
 
 void InspectorOverlay::setInspectModeEnabled(bool enabled)
 {
     m_inspectModeEnabled = enabled;
     update();
@@ skipping 34 matching lines @@
 
 Node* InspectorOverlay::highlightedNode() const
 {
     return m_highlightNode.get();
 }
 
 bool InspectorOverlay::isEmpty()
 {
     if (m_activeProfilerCount)
         return true;
-    bool hasAlwaysVisibleElements = m_highlightNode || m_eventTargetNode || m_highlightQuad || !m_size.isEmpty() || m_drawViewSize;
+    bool hasAlwaysVisibleElements = m_highlightNode || m_eventTargetNode || m_highlightQuad  || m_drawViewSize;
     bool hasInvisibleInInspectModeElements = !m_pausedInDebuggerMessage.isNull();
     return !(hasAlwaysVisibleElements || (hasInvisibleInInspectModeElements && !m_inspectModeEnabled));
 }
 
 void InspectorOverlay::update()
 {
     if (isEmpty()) {
         m_client->hideHighlight();
         return;
     }
 
     FrameView* view = m_page->mainFrame()->view();
     if (!view)
         return;
-    IntRect viewRect = view->visibleContentRect();
 
     // Include scrollbars to avoid masking them by the gutter.
-    IntSize frameViewFullSize = view->visibleContentRect(IncludeScrollbars).size();
-    IntSize size = m_size.isEmpty() ? frameViewFullSize : m_size;
-    size.scale(m_page->pageScaleFactor());
+    IntSize size = view->unscaledVisibleContentSize(IncludeScrollbars);
     overlayPage()->mainFrame()->view()->resize(size);
 
     // Clear canvas and paint things.
-    reset(size, m_size.isEmpty() ? IntSize() : frameViewFullSize, viewRect.x(), viewRect.y());
+    IntRect viewRect = view->visibleContentRect();
+    reset(size, viewRect.x(), viewRect.y());
 
     drawNodeHighlight();
     drawQuadHighlight();
     if (!m_inspectModeEnabled)
         drawPausedInDebuggerMessage();
     drawViewSize();
 
     // Position DOM elements.
     overlayPage()->mainFrame()->document()->setNeedsStyleRecalc(SubtreeStyleChange);
     overlayPage()->mainFrame()->document()->updateLayout();
 
     // Kick paint.
     m_client->highlight();
 }
 
 void InspectorOverlay::hide()
 {
     m_timer.stop();
     m_highlightNode.clear();
     m_eventTargetNode.clear();
     m_highlightQuad.clear();
     m_pausedInDebuggerMessage = String();
-    m_size = IntSize();
     m_drawViewSize = false;
     m_drawViewSizeWithGrid = false;
     update();
 }
 
 static PassRefPtr<JSONObject> buildObjectForPoint(const FloatPoint& point)
 {
     RefPtr<JSONObject> object = JSONObject::create();
     object->setNumber("x", point.x());
     object->setNumber("y", point.y());
@@ skipping 278 matching lines @@
     evaluateInOverlay("setPlatform", "windows");
 #elif OS(MACOSX)
     evaluateInOverlay("setPlatform", "mac");
 #elif OS(POSIX)
     evaluateInOverlay("setPlatform", "linux");
 #endif
 
     return m_overlayPage.get();
 }
 
-void InspectorOverlay::reset(const IntSize& viewportSize, const IntSize& frameViewFullSize, int scrollX, int scrollY)
+void InspectorOverlay::reset(const IntSize& viewportSize, int scrollX, int scrollY)
 {
     RefPtr<JSONObject> resetData = JSONObject::create();
-    resetData->setNumber("pageScaleFactor", m_page->pageScaleFactor());
+    resetData->setNumber("pageScaleFactor", m_page->settings().pinchVirtualViewportEnabled() ? 1 : m_page->pageScaleFactor());

[dgozman, 2014/05/29 13:58:13]

I think there should be utility method instead of a lot places through blink
code with |pinchVirtualViewportEnabled() ? 1 : pageScaleFactor|.

I'm not even sure why page knows about pageScaleFactor when pinchVirtualViewport
is enabled. Will it be gone or not?

[bokan, 2014/05/29 15:09:06]

page->pageScaleFactor() returns the actual, correct scale factor in both cases
so I'm not sure why you need this. It's the FrameView's visibleContentScale
factor that's going away and is only used in the old path. It was redundant as
the FrameView's value was set from page->pageScaleFactor anyway.

[dgozman, 2014/05/29 15:15:08]

We use pageScaleFactor to scale from css values (like render boxes) to the
visible page sizes. Since virtual viewport does page scaling somewhere outside
of frameview, this is required.

[bokan, 2014/05/29 15:21:16]

Ok, in that case, once we remove the old path this pageScaleFactor value can go
away.

     resetData->setNumber("deviceScaleFactor", m_page->deviceScaleFactor());
     resetData->setObject("viewportSize", buildObjectForSize(viewportSize));
-    resetData->setObject("frameViewFullSize", buildObjectForSize(frameViewFullSize));
     resetData->setNumber("pageZoomFactor", m_page->mainFrame()->pageZoomFactor());
     resetData->setNumber("scrollX", scrollX);
     resetData->setNumber("scrollY", scrollY);
     evaluateInOverlay("reset", resetData.release());
 }
 
 void InspectorOverlay::evaluateInOverlay(const String& method, const String& argument)
 {
     RefPtr<JSONArray> command = JSONArray::create();
     command->pushString(method);
@@ skipping 36 matching lines @@
     hideHighlight();
 }
 
 void InspectorOverlay::startedRecordingProfile()
 {
     if (!m_activeProfilerCount++)
         freePage();
 }
 
 } // namespace WebCore