| Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| index 0f46d4d73f789debc6bb726893096afbec2f623a..48cd61bc4f693921f7ca7e3350fb02b842a6dea4 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| @@ -436,8 +436,8 @@ LayoutUnit LayoutBox::scrollWidth() const
|
| // For objects with visible overflow, this matches IE.
|
| // FIXME: Need to work right with writing modes.
|
| if (style()->isLeftToRightDirection())
|
| - return std::max(clientWidth(), layoutOverflowRect().maxX() - borderLeft());
|
| - return clientWidth() - std::min(LayoutUnit(), layoutOverflowRect().x() - borderLeft());
|
| + return std::max(clientWidth(), static_cast<LayoutUnit>((layoutOverflowRect().maxX() - borderLeft())));
|
| + return clientWidth() - std::min(LayoutUnit(), static_cast<LayoutUnit>((layoutOverflowRect().x() - borderLeft())));
|
| }
|
|
|
| LayoutUnit LayoutBox::scrollHeight() const
|
| @@ -446,7 +446,7 @@ LayoutUnit LayoutBox::scrollHeight() const
|
| return layer()->scrollableArea()->scrollHeight();
|
| // For objects with visible overflow, this matches IE.
|
| // FIXME: Need to work right with writing modes.
|
| - return std::max(clientHeight(), layoutOverflowRect().maxY() - borderTop());
|
| + return std::max(clientHeight(), LayoutUnit((layoutOverflowRect().maxY() - borderTop())));
|
| }
|
|
|
| LayoutUnit LayoutBox::scrollLeft() const
|
|
|