| Index: Source/web/DevToolsEmulator.cpp
|
| diff --git a/Source/web/DevToolsEmulator.cpp b/Source/web/DevToolsEmulator.cpp
|
| index 062a6aab265b91d011d3906d1d02a044fd386f64..0a43dd81c3189993659d69f4a2ac97dd5e74978e 100644
|
| --- a/Source/web/DevToolsEmulator.cpp
|
| +++ b/Source/web/DevToolsEmulator.cpp
|
| @@ -5,7 +5,6 @@
|
| #include "config.h"
|
| #include "web/DevToolsEmulator.h"
|
|
|
| -#include "core/frame/FrameHost.h"
|
| #include "core/frame/FrameView.h"
|
| #include "core/frame/Settings.h"
|
| #include "core/page/Page.h"
|
| @@ -214,7 +213,6 @@
|
| RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
|
| m_webViewImpl->enableViewport();
|
| m_webViewImpl->settings()->setViewportMetaEnabled(true);
|
| - m_webViewImpl->page()->frameHost().visualViewport().initializeScrollbars();
|
| m_webViewImpl->settings()->setShrinksViewportContentToFit(true);
|
| m_webViewImpl->page()->settings().setTextAutosizingEnabled(true);
|
| m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(true);
|
| @@ -225,6 +223,8 @@
|
| m_originalDefaultMinimumPageScaleFactor = m_webViewImpl->defaultMinimumPageScaleFactor();
|
| m_originalDefaultMaximumPageScaleFactor = m_webViewImpl->defaultMaximumPageScaleFactor();
|
| m_webViewImpl->setDefaultPageScaleLimits(0.25f, 5);
|
| + if (m_webViewImpl->layerTreeView())
|
| + m_webViewImpl->layerTreeView()->setHidePinchScrollbarsNearMinScale(false);
|
| }
|
|
|
| void DevToolsEmulator::disableMobileEmulation()
|
| @@ -234,7 +234,6 @@
|
| RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_isOverlayScrollbarsEnabled);
|
| m_webViewImpl->disableViewport();
|
| m_webViewImpl->settings()->setViewportMetaEnabled(false);
|
| - m_webViewImpl->page()->frameHost().visualViewport().initializeScrollbars();
|
| m_webViewImpl->settings()->setShrinksViewportContentToFit(false);
|
| m_webViewImpl->page()->settings().setTextAutosizingEnabled(m_embedderTextAutosizingEnabled);
|
| m_webViewImpl->page()->settings().setPreferCompositingToLCDTextEnabled(m_embedderPreferCompositingToLCDTextEnabled);
|
| @@ -245,6 +244,10 @@
|
| m_webViewImpl->setDefaultPageScaleLimits(
|
| m_originalDefaultMinimumPageScaleFactor,
|
| m_originalDefaultMaximumPageScaleFactor);
|
| + if (m_webViewImpl->layerTreeView()) {
|
| + m_webViewImpl->layerTreeView()->setHidePinchScrollbarsNearMinScale(
|
| + m_hidePinchScrollbarsNearMinScale);
|
| + }
|
| }
|
|
|
| void DevToolsEmulator::setTouchEventEmulationEnabled(bool enabled)
|
|
|