| Index: third_party/WebKit/Source/web/WebViewImpl.h
|
| diff --git a/third_party/WebKit/Source/web/WebViewImpl.h b/third_party/WebKit/Source/web/WebViewImpl.h
|
| index 70905512f151dc17ad4376ec6ec27677327c4487..e26bf0dd658f0fe3a0550e940d09610d72ba5823 100644
|
| --- a/third_party/WebKit/Source/web/WebViewImpl.h
|
| +++ b/third_party/WebKit/Source/web/WebViewImpl.h
|
| @@ -69,6 +69,7 @@
|
|
|
| namespace blink {
|
|
|
| +class CompositorMutatorImpl;
|
| class DataObject;
|
| class DevToolsEmulator;
|
| class Frame;
|
| @@ -78,6 +79,7 @@ class LinkHighlightImpl;
|
| class PageOverlay;
|
| class PageScaleConstraintsSet;
|
| class PaintLayerCompositor;
|
| +class ScrollAndScaleEmulator;
|
| class TopControls;
|
| class UserGestureToken;
|
| class WebActiveGestureAnimation;
|
| @@ -87,7 +89,6 @@ class WebLayerTreeView;
|
| class WebLocalFrame;
|
| class WebLocalFrameImpl;
|
| class WebImage;
|
| -class CompositorMutatorImpl;
|
| class WebPagePopupImpl;
|
| class WebPlugin;
|
| class WebRemoteFrame;
|
| @@ -530,6 +531,12 @@ private:
|
| void setPageScaleFactorAndLocation(float, const FloatPoint&);
|
| void propagateZoomFactorToLocalFrameRoots(Frame*, float);
|
|
|
| + // Override the page scale and scroll positions of main frame and visual viewport.
|
| + void setScrollAndScaleOverride(const WebDeviceEmulationParams&);
|
| +
|
| + // Clear the page scale and scroll position overrides.
|
| + void clearScrollAndScaleOverride();
|
| +
|
| void scrollAndRescaleViewports(float scaleFactor, const IntPoint& mainFrameOrigin, const FloatPoint& visualViewportOrigin);
|
|
|
| float maximumLegiblePageScale() const;
|
| @@ -670,6 +677,8 @@ private:
|
| float m_fakePageScaleAnimationPageScaleFactor;
|
| bool m_fakePageScaleAnimationUseAnchor;
|
|
|
| + RefPtr<ScrollAndScaleEmulator> m_scrollAndScaleEmulator;
|
| +
|
| bool m_doingDragAndDrop;
|
|
|
| bool m_ignoreInputEvents;
|
|
|