| Index: third_party/WebKit/Source/core/frame/FrameHost.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameHost.cpp b/third_party/WebKit/Source/core/frame/FrameHost.cpp
|
| index f1b5c4e43777bbaf164f295da3f69e3acd7462ac..a962f743f45da94de0f3ab6ba567deeb0bba2c56 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameHost.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameHost.cpp
|
| @@ -35,6 +35,7 @@
|
| #include "core/frame/FrameView.h"
|
| #include "core/frame/PageScaleConstraints.h"
|
| #include "core/frame/PageScaleConstraintsSet.h"
|
| +#include "core/frame/ScrollAndScaleEmulator.h"
|
| #include "core/frame/TopControls.h"
|
| #include "core/frame/VisualViewport.h"
|
| #include "core/inspector/ConsoleMessageStorage.h"
|
| @@ -204,6 +205,7 @@ DEFINE_TRACE(FrameHost)
|
| visitor->trace(m_eventHandlerRegistry);
|
| visitor->trace(m_consoleMessageStorage);
|
| visitor->trace(m_customElementReactionStack);
|
| + visitor->trace(m_scrollAndScaleEmulator);
|
| }
|
|
|
| #if ENABLE(ASSERT)
|
| @@ -269,4 +271,25 @@ void FrameHost::setUserAgentPageScaleConstraints(const PageScaleConstraints& new
|
| rootView->setNeedsLayout();
|
| }
|
|
|
| +void FrameHost::setScrollAndScaleOverride(const IntPoint& framePosition, const DoublePoint& visualViewportPosition, float pageScale)
|
| +{
|
| + if (!page().mainFrame() || !page().mainFrame()->isLocalFrame())
|
| + return;
|
| +
|
| + if (!m_scrollAndScaleEmulator)
|
| + m_scrollAndScaleEmulator = ScrollAndScaleEmulator::create(this);
|
| +
|
| + m_scrollAndScaleEmulator->update(
|
| + framePosition, visualViewportPosition, pageScale);
|
| +}
|
| +
|
| +void FrameHost::clearScrollAndScaleOverride()
|
| +{
|
| + if (!m_scrollAndScaleEmulator)
|
| + return;
|
| +
|
| + m_scrollAndScaleEmulator->clear();
|
| + m_scrollAndScaleEmulator = nullptr;
|
| +}
|
| +
|
| } // namespace blink
|
|
|