| 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 16677770cb0f7be5762cf5721fd9ef0027c4a294..700aef96bd08df3423fe5895456321b7f03893b8 100644
|
| --- a/third_party/WebKit/Source/platform/LayoutUnit.h
|
| +++ b/third_party/WebKit/Source/platform/LayoutUnit.h
|
| @@ -31,10 +31,12 @@
|
| #ifndef LayoutUnit_h
|
| #define LayoutUnit_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>
|
| #include <limits>
|
| @@ -55,7 +57,7 @@ const int intMaxForLayoutUnit = INT_MAX / kFixedPointDenominator;
|
| const int intMinForLayoutUnit = INT_MIN / kFixedPointDenominator;
|
|
|
| // TODO(thakis): Remove these two lines once http://llvm.org/PR26504 is resolved
|
| -class LayoutUnit;
|
| +class PLATFORM_EXPORT LayoutUnit;
|
| inline bool operator<(const LayoutUnit&, const LayoutUnit&);
|
|
|
| class LayoutUnit {
|
| @@ -212,6 +214,8 @@ public:
|
| return clampTo<LayoutUnit>(value, LayoutUnit::min(), LayoutUnit::max());
|
| }
|
|
|
| + String toString() const;
|
| +
|
| private:
|
| static bool isInBounds(int value)
|
| {
|
| @@ -808,7 +812,7 @@ inline LayoutUnit clampToLayoutUnit(LayoutUnit value, LayoutUnit min, LayoutUnit
|
|
|
| inline std::ostream& operator<<(std::ostream& stream, const LayoutUnit& value)
|
| {
|
| - return stream << value.toDouble();
|
| + return stream << value.toString();
|
| }
|
|
|
| } // namespace blink
|
|
|