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

Unified Diff: third_party/WebKit/Source/platform/LayoutUnit.h

Issue 1660863002: Force all LayoutUnit construction to be explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also fix LayoutRectTest.cpp Created 4 years, 10 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/platform/LayoutUnit.h
diff --git a/third_party/WebKit/Source/platform/LayoutUnit.h b/third_party/WebKit/Source/platform/LayoutUnit.h
index 09daec7766f89f0c6b092a4347ea744e8c779c91..355f65dc9ea747eb5514483ba3c6659e5071280e 100644
--- a/third_party/WebKit/Source/platform/LayoutUnit.h
+++ b/third_party/WebKit/Source/platform/LayoutUnit.h
@@ -71,13 +71,13 @@ class LayoutUnit {
public:
LayoutUnit() : m_value(0) { }
// TODO(leviw): All of the below constructors should be explicit. crbug.com/581254
- LayoutUnit(int value) { setValue(value); }
- LayoutUnit(unsigned short value) { setValue(value); }
- LayoutUnit(unsigned value) { setValue(value); }
- LayoutUnit(unsigned long value) { m_value = clampTo<int>(value * kFixedPointDenominator); }
- LayoutUnit(unsigned long long value) { m_value = clampTo<int>(value * kFixedPointDenominator); }
- LayoutUnit(float value) { m_value = clampTo<int>(value * kFixedPointDenominator); }
- LayoutUnit(double value) { m_value = clampTo<int>(value * kFixedPointDenominator); }
+ explicit LayoutUnit(int value) { setValue(value); }
+ explicit LayoutUnit(unsigned short value) { setValue(value); }
+ explicit LayoutUnit(unsigned value) { setValue(value); }
+ explicit LayoutUnit(unsigned long value) { m_value = clampTo<int>(value * kFixedPointDenominator); }
+ explicit LayoutUnit(unsigned long long value) { m_value = clampTo<int>(value * kFixedPointDenominator); }
+ explicit LayoutUnit(float value) { m_value = clampTo<int>(value * kFixedPointDenominator); }
+ explicit LayoutUnit(double value) { m_value = clampTo<int>(value * kFixedPointDenominator); }
static LayoutUnit fromFloatCeil(float value)
{
@@ -796,6 +796,11 @@ inline LayoutUnit layoutMod(const LayoutUnit& numerator, const LayoutUnit& denom
return numerator % denominator;
}
+inline LayoutUnit layoutMod(const LayoutUnit& numerator, int denominator)
+{
+ return numerator % LayoutUnit(denominator);
+}
+
inline bool isIntegerValue(const LayoutUnit value)
{
return value.toInt() == value;
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp ('k') | third_party/WebKit/Source/platform/LengthFunctions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698