Adds DevTools commands for forced viewport override.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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 92 matching lines @@
 #include "platform/Histogram.h"
 #include "platform/KeyboardCodes.h"
 #include "platform/PlatformGestureEvent.h"
 #include "platform/PlatformKeyboardEvent.h"
 #include "platform/PlatformMouseEvent.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/TraceEvent.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/exported/WebActiveGestureAnimation.h"
 #include "platform/fonts/FontCache.h"
+#include "platform/geometry/FloatRect.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/CompositorMutatorClient.h"
 #include "platform/graphics/FirstPaintInvalidationTracking.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/Image.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/gpu/DrawingBuffer.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include "platform/image-decoders/ImageDecoder.h"
 #include "platform/scroll/ScrollbarTheme.h"
@@ skipping 290 matching lines @@
     , m_zoomFactorForDeviceScaleFactor(0.f)
     , m_maximumLegibleScale(1)
     , m_doubleTapZoomPageScaleFactor(0)
     , m_doubleTapZoomPending(false)
     , m_enableFakePageScaleAnimationForTesting(false)
     , m_fakePageScaleAnimationPageScaleFactor(0)
     , m_fakePageScaleAnimationUseAnchor(false)
     , m_doingDragAndDrop(false)
     , m_ignoreInputEvents(false)
     , m_compositorDeviceScaleFactorOverride(0)
-    , m_rootLayerScale(1)
     , m_suppressNextKeypressEvent(false)
     , m_imeAcceptEvents(true)
     , m_operationsAllowed(WebDragOperationNone)
     , m_dragOperation(WebDragOperationNone)
     , m_devToolsEmulator(nullptr)
     , m_isTransparent(false)
     , m_tabsToLinks(false)
     , m_layerTreeView(nullptr)
     , m_rootLayer(nullptr)
     , m_rootGraphicsLayer(nullptr)
@@ skipping 3403 matching lines @@
         return;
     m_compositorDeviceScaleFactorOverride = deviceScaleFactor;
     if (m_zoomFactorForDeviceScaleFactor) {
         setZoomLevel(zoomLevel());
         return;
     }
     if (page() && m_layerTreeView)
         updateLayerTreeDeviceScaleFactor();
 }
 
-void WebViewImpl::setRootLayerTransform(const WebSize& rootLayerOffset, float rootLayerScale)
+void WebViewImpl::setRootLayerTransform(const TransformationMatrix& transform)
 {
-    if (m_rootLayerScale == rootLayerScale && m_rootLayerOffset == rootLayerOffset)
+    if (transform == m_rootLayerTransform)
         return;
-    m_rootLayerScale = rootLayerScale;
-    m_rootLayerOffset = rootLayerOffset;
-    if (mainFrameImpl())
-        mainFrameImpl()->setInputEventsTransformForEmulation(m_rootLayerOffset, m_rootLayerScale);
+    m_rootLayerTransform = transform;
     updateRootLayerTransform();
 }
 
+TransformationMatrix WebViewImpl::getRootLayerTransformForTesting() const
+{
+    return m_rootLayerTransform;
+}
+
 void WebViewImpl::enableDeviceEmulation(const WebDeviceEmulationParams& params)
 {
     m_devToolsEmulator->enableDeviceEmulation(params);
 }
 
 void WebViewImpl::disableDeviceEmulation()
 {
     m_devToolsEmulator->disableDeviceEmulation();
 }
 
@@ skipping 215 matching lines @@
 void WebViewImpl::didChangeContentsSize()
 {
     pageScaleConstraintsSet().didChangeContentsSize(contentsSize(), pageScaleFactor());
 }
 
 void WebViewImpl::pageScaleFactorChanged()
 {
     pageScaleConstraintsSet().setNeedsReset(false);
     updateLayerTreeViewport();
     m_client->pageScaleFactorChanged();
+    m_devToolsEmulator->mainFrameScrollOrScaleChanged();

[chrishtr, 2016/08/22 22:00:42]

This seems new. Why was it not needed before?

[Eric Seckler, 2016/08/23 09:32:19]

Should have been there in the previous version of the patch you looked at, too.
It's needed to notify the emulator about a page scale change, so that it can
update the viewport transform (to ensure the |scale| param of forceViewport is
enforced relative to a page scale of 1.0).

+}
+
+void WebViewImpl::mainFrameScrollOffsetChanged()
+{
+    m_devToolsEmulator->mainFrameScrollOrScaleChanged();
 }
 
 bool WebViewImpl::useExternalPopupMenus()
 {
     return shouldUseExternalPopupMenus;
 }
 
 void WebViewImpl::startDragging(LocalFrame* frame,
                                 const WebDragData& dragData,
                                 WebDragOperationsMask mask,
@@ skipping 310 matching lines @@
 {
     DCHECK(page());
     DCHECK(m_layerTreeView);
 
     float deviceScaleFactor = m_compositorDeviceScaleFactorOverride ? m_compositorDeviceScaleFactorOverride : page()->deviceScaleFactor();
     m_layerTreeView->setDeviceScaleFactor(deviceScaleFactor);
 }
 
 void WebViewImpl::updateRootLayerTransform()
 {
-    if (m_visualViewportContainerLayer) {
-        TransformationMatrix transform;
-        transform.translate(m_rootLayerOffset.width, m_rootLayerOffset.height);
-        transform = transform.scale(m_rootLayerScale);
-        m_visualViewportContainerLayer->setTransform(transform);
-    }
+    if (m_visualViewportContainerLayer)
+        m_visualViewportContainerLayer->setTransform(m_rootLayerTransform);
 }
 
 bool WebViewImpl::detectContentOnTouch(const GestureEventWithHitTestResults& targetedEvent)
 {
     if (!m_page->mainFrame()->isLocalFrame())
         return false;
 
     // Need a local copy of the hit test as setToShadowHostIfInUserAgentShadowRoot() will modify it.
     HitTestResult touchHit = targetedEvent.hitTestResult();
     touchHit.setToShadowHostIfInUserAgentShadowRoot();
@@ skipping 161 matching lines @@
         return nullptr;
     return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const
 {
     return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 } // namespace blink