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; |