| Index: third_party/WebKit/public/web/WebDeviceEmulationParams.h
|
| diff --git a/third_party/WebKit/public/web/WebDeviceEmulationParams.h b/third_party/WebKit/public/web/WebDeviceEmulationParams.h
|
| index 85f9f7c466540104fcd230c409a7f8011188a696..46efe8c4bd5d63720f4ba021840f4e8a1c4a0310 100644
|
| --- a/third_party/WebKit/public/web/WebDeviceEmulationParams.h
|
| +++ b/third_party/WebKit/public/web/WebDeviceEmulationParams.h
|
| @@ -53,20 +53,38 @@ struct WebDeviceEmulationParams {
|
| // Screen orientation angle, used together with screenOrientationType.
|
| int screenOrientationAngle;
|
|
|
| + // Scroll position of outer viewport (frame). |x < 0| or |y < 0| disables
|
| + // the override for the respective coordinate.
|
| + WebPoint scrollPosition;
|
| +
|
| + // Emulated visible view size. |x < 0| or |y < 0| disables the override for
|
| + // the respective coordinate.
|
| + WebSize visualViewportSize;
|
| +
|
| + // Scroll position of inner (visual) viewport. |x < 0| or |y < 0| disables
|
| + // the override for the respective coordinate.
|
| + WebFloatPoint visualViewportPosition;
|
| +
|
| + // Pinch-zoom scale of inner (visual) viewport. |visualViewportScale == 0|
|
| + // disables the override.
|
| + double visualViewportScale;
|
| +
|
| WebDeviceEmulationParams()
|
| : screenPosition(Desktop)
|
| , deviceScaleFactor(0)
|
| , fitToView(false)
|
| , scale(1)
|
| , screenOrientationType(WebScreenOrientationUndefined)
|
| - , screenOrientationAngle(0) { }
|
| + , screenOrientationAngle(0)
|
| + , visualViewportScale(0) { }
|
| };
|
|
|
| inline bool operator==(const WebDeviceEmulationParams& a, const WebDeviceEmulationParams& b)
|
| {
|
| return a.screenPosition == b.screenPosition && a.screenSize == b.screenSize && a.viewPosition == b.viewPosition && a.deviceScaleFactor == b.deviceScaleFactor
|
| && a.viewSize == b.viewSize && a.fitToView == b.fitToView && a.offset == b.offset && a.scale == b.scale
|
| - && a.screenOrientationType == b.screenOrientationType && a.screenOrientationAngle == b.screenOrientationAngle;
|
| + && a.screenOrientationType == b.screenOrientationType && a.screenOrientationAngle == b.screenOrientationAngle && a.scrollPosition == b.scrollPosition
|
| + && a.visualViewportSize == b.visualViewportSize && a.visualViewportPosition == b.visualViewportPosition && a.visualViewportScale == b.visualViewportScale;
|
| }
|
|
|
| inline bool operator!=(const WebDeviceEmulationParams& a, const WebDeviceEmulationParams& b)
|
|
|