| Index: third_party/WebKit/Source/core/css/MediaValues.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/MediaValues.cpp b/third_party/WebKit/Source/core/css/MediaValues.cpp
|
| index 294df98397efd6f9b0d41719738fdfc098939d3f..a36c3411f437d9fad10565373f4f4c92ddb11919 100644
|
| --- a/third_party/WebKit/Source/core/css/MediaValues.cpp
|
| +++ b/third_party/WebKit/Source/core/css/MediaValues.cpp
|
| @@ -32,18 +32,18 @@ PassRefPtrWillBeRawPtr<MediaValues> MediaValues::createDynamicIfFrameExists(Loca
|
| return MediaValuesCached::create();
|
| }
|
|
|
| -int MediaValues::calculateViewportWidth(LocalFrame* frame) const
|
| +double MediaValues::calculateViewportWidth(LocalFrame* frame) const
|
| {
|
| ASSERT(frame && frame->view() && frame->document());
|
| int viewportWidth = frame->view()->layoutSize(IncludeScrollbars).width();
|
| - return adjustForAbsoluteZoom(viewportWidth, frame->document()->layoutView());
|
| + return adjustDoubleForAbsoluteZoom(viewportWidth, *frame->document()->layoutView());
|
| }
|
|
|
| -int MediaValues::calculateViewportHeight(LocalFrame* frame) const
|
| +double MediaValues::calculateViewportHeight(LocalFrame* frame) const
|
| {
|
| ASSERT(frame && frame->view() && frame->document());
|
| int viewportHeight = frame->view()->layoutSize(IncludeScrollbars).height();
|
| - return adjustForAbsoluteZoom(viewportHeight, frame->document()->layoutView());
|
| + return adjustDoubleForAbsoluteZoom(viewportHeight, *frame->document()->layoutView());
|
| }
|
|
|
| int MediaValues::calculateDeviceWidth(LocalFrame* frame) const
|
| @@ -153,7 +153,7 @@ int MediaValues::calculateAvailableHoverTypes(LocalFrame* frame) const
|
| return frame->settings()->availableHoverTypes();
|
| }
|
|
|
| -bool MediaValues::computeLengthImpl(double value, CSSPrimitiveValue::UnitType type, unsigned defaultFontSize, unsigned viewportWidth, unsigned viewportHeight, double& result)
|
| +bool MediaValues::computeLengthImpl(double value, CSSPrimitiveValue::UnitType type, unsigned defaultFontSize, double viewportWidth, double viewportHeight, double& result)
|
| {
|
| // The logic in this function is duplicated from CSSToLengthConversionData::zoomedComputedPixels()
|
| // because MediaValues::computeLength() needs nearly identical logic, but we haven't found a way to make
|
|
|