| Index: third_party/WebKit/Source/core/dom/Document.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
|
| index db999f3fc3671d960408fe3438955f4e2e4c766f..f34043b22f579b8db2e4a0f4fa5a7272d8de4fbe 100644
|
| --- a/third_party/WebKit/Source/core/dom/Document.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/Document.cpp
|
| @@ -1994,12 +1994,12 @@ bool Document::isPageBoxVisible(int pageIndex)
|
| return styleForPage(pageIndex)->visibility() != HIDDEN; // display property doesn't apply to @page.
|
| }
|
|
|
| -void Document::pageSizeAndMarginsInPixels(int pageIndex, IntSize& pageSize, int& marginTop, int& marginRight, int& marginBottom, int& marginLeft)
|
| +void Document::pageSizeAndMarginsInPixels(int pageIndex, FloatSize& pageSize, int& marginTop, int& marginRight, int& marginBottom, int& marginLeft)
|
| {
|
| RefPtr<ComputedStyle> style = styleForPage(pageIndex);
|
|
|
| - int width = pageSize.width();
|
| - int height = pageSize.height();
|
| + float width = pageSize.width();
|
| + float height = pageSize.height();
|
| switch (style->getPageSizeType()) {
|
| case PAGE_SIZE_AUTO:
|
| break;
|
| @@ -2020,7 +2020,7 @@ void Document::pageSizeAndMarginsInPixels(int pageIndex, IntSize& pageSize, int&
|
| default:
|
| ASSERT_NOT_REACHED();
|
| }
|
| - pageSize = IntSize(width, height);
|
| + pageSize = FloatSize(width, height);
|
|
|
| // The percentage is calculated with respect to the width even for margin top and bottom.
|
| // http://www.w3.org/TR/CSS2/box.html#margin-properties
|
|
|