Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBox.cpp

Issue 1574933002: Changed type of border-width longhands from unsigned to float. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed test rebaselines, will add them to TestExpectations instead Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698