Chromium Code Reviews| 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..ca9aa9c1746da91ee97d6fe17239068b6d56577b 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()))); |
|
leviw_travelin_and_unemployed
2016/02/02 02:20:18
Echo-ing the static_cast comment (use the construc
|
| + 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(), static_cast<LayoutUnit>((layoutOverflowRect().maxY() - borderTop()))); |
| } |
| LayoutUnit LayoutBox::scrollLeft() const |