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 4175494dbde1e95a724404febab5f0883951a7f5..5578985773954749543ea05af0b3d0116aec7480 100644 |
--- a/third_party/WebKit/Source/platform/LayoutUnit.h |
+++ b/third_party/WebKit/Source/platform/LayoutUnit.h |
@@ -31,11 +31,11 @@ |
#ifndef LayoutUnit_h |
#define LayoutUnit_h |
+#include "base/numerics/saturated_arithmetic.h" |
#include "platform/PlatformExport.h" |
#include "wtf/Allocator.h" |
#include "wtf/Assertions.h" |
#include "wtf/MathExtras.h" |
-#include "wtf/SaturatedArithmetic.h" |
#include "wtf/text/WTFString.h" |
#include <algorithm> |
#include <limits.h> |
@@ -159,7 +159,7 @@ class LayoutUnit { |
return toInt(); |
} |
ALWAYS_INLINE int round() const { |
- return saturatedAddition(rawValue(), kFixedPointDenominator / 2) >> |
+ return base::SaturatedAddition(rawValue(), kFixedPointDenominator / 2) >> |
kLayoutUnitFractionalBits; |
} |
@@ -239,11 +239,11 @@ class LayoutUnit { |
} |
ALWAYS_INLINE void setValue(int value) { |
- m_value = saturatedSet<kLayoutUnitFractionalBits>(value); |
+ m_value = base::SaturatedSet<kLayoutUnitFractionalBits>(value); |
} |
inline void setValue(unsigned value) { |
- m_value = saturatedSet<kLayoutUnitFractionalBits>(value); |
+ m_value = base::SaturatedSet<kLayoutUnitFractionalBits>(value); |
} |
int m_value; |
@@ -523,7 +523,7 @@ inline LayoutUnit operator/(unsigned long long a, const LayoutUnit& b) { |
ALWAYS_INLINE LayoutUnit operator+(const LayoutUnit& a, const LayoutUnit& b) { |
LayoutUnit returnVal; |
- returnVal.setRawValue(saturatedAddition(a.rawValue(), b.rawValue())); |
+ returnVal.setRawValue(base::SaturatedAddition(a.rawValue(), b.rawValue())); |
return returnVal; |
} |
@@ -553,7 +553,7 @@ inline double operator+(const double a, const LayoutUnit& b) { |
ALWAYS_INLINE LayoutUnit operator-(const LayoutUnit& a, const LayoutUnit& b) { |
LayoutUnit returnVal; |
- returnVal.setRawValue(saturatedSubtraction(a.rawValue(), b.rawValue())); |
+ returnVal.setRawValue(base::SaturatedSubtraction(a.rawValue(), b.rawValue())); |
return returnVal; |
} |
@@ -583,7 +583,7 @@ inline float operator-(const float a, const LayoutUnit& b) { |
inline LayoutUnit operator-(const LayoutUnit& a) { |
LayoutUnit returnVal; |
- returnVal.setRawValue(saturatedNegative(a.rawValue())); |
+ returnVal.setRawValue(base::SaturatedNegative(a.rawValue())); |
return returnVal; |
} |
@@ -615,7 +615,7 @@ inline LayoutUnit operator%(int a, const LayoutUnit& b) { |
} |
inline LayoutUnit& operator+=(LayoutUnit& a, const LayoutUnit& b) { |
- a.setRawValue(saturatedAddition(a.rawValue(), b.rawValue())); |
+ a.setRawValue(base::SaturatedAddition(a.rawValue(), b.rawValue())); |
return a; |
} |
@@ -640,7 +640,7 @@ inline LayoutUnit& operator-=(LayoutUnit& a, int b) { |
} |
inline LayoutUnit& operator-=(LayoutUnit& a, const LayoutUnit& b) { |
- a.setRawValue(saturatedSubtraction(a.rawValue(), b.rawValue())); |
+ a.setRawValue(base::SaturatedSubtraction(a.rawValue(), b.rawValue())); |
return a; |
} |