| Index: Source/core/dom/ViewportArguments.cpp
|
| diff --git a/Source/core/dom/ViewportArguments.cpp b/Source/core/dom/ViewportArguments.cpp
|
| index 92ae2cf0ae0dc57aecb8c5f2da81ca7e8984a384..72a64ebe4a5bffde8b2bc26d1fe4a13c9709c0b4 100644
|
| --- a/Source/core/dom/ViewportArguments.cpp
|
| +++ b/Source/core/dom/ViewportArguments.cpp
|
| @@ -68,7 +68,7 @@ static inline float clampScaleValue(float value)
|
| return value;
|
| }
|
|
|
| -PageScaleConstraints ViewportArguments::resolve(const FloatSize& initialViewportSize, const FloatSize& deviceSize, int defaultWidth) const
|
| +PageScaleConstraints ViewportArguments::resolve(const FloatSize& initialViewportSize, int defaultWidth) const
|
| {
|
| float resultWidth = width;
|
| float resultMaxWidth = maxWidth;
|
| @@ -168,19 +168,19 @@ PageScaleConstraints ViewportArguments::resolve(const FloatSize& initialViewport
|
|
|
| switch (static_cast<int>(resultWidth)) {
|
| case ViewportArguments::ValueDeviceWidth:
|
| - resultWidth = deviceSize.width();
|
| + resultWidth = initialViewportSize.width();
|
| break;
|
| case ViewportArguments::ValueDeviceHeight:
|
| - resultWidth = deviceSize.height();
|
| + resultWidth = initialViewportSize.height();
|
| break;
|
| }
|
|
|
| switch (static_cast<int>(resultHeight)) {
|
| case ViewportArguments::ValueDeviceWidth:
|
| - resultHeight = deviceSize.width();
|
| + resultHeight = initialViewportSize.width();
|
| break;
|
| case ViewportArguments::ValueDeviceHeight:
|
| - resultHeight = deviceSize.height();
|
| + resultHeight = initialViewportSize.height();
|
| break;
|
| }
|
|
|
|
|