| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012, Google Inc. All rights reserved. | 2 * Copyright (c) 2012, Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef LayoutPoint_h | 31 #ifndef LayoutPoint_h |
| 32 #define LayoutPoint_h | 32 #define LayoutPoint_h |
| 33 | 33 |
| 34 #include <algorithm> |
| 34 #include "platform/geometry/DoublePoint.h" | 35 #include "platform/geometry/DoublePoint.h" |
| 35 #include "platform/geometry/FloatPoint.h" | 36 #include "platform/geometry/FloatPoint.h" |
| 36 #include "platform/geometry/LayoutSize.h" | 37 #include "platform/geometry/LayoutSize.h" |
| 37 #include "wtf/Allocator.h" | 38 #include "platform/wtf/Allocator.h" |
| 38 #include "wtf/Forward.h" | 39 #include "platform/wtf/Forward.h" |
| 39 #include "wtf/MathExtras.h" | 40 #include "platform/wtf/MathExtras.h" |
| 40 #include <algorithm> | |
| 41 | 41 |
| 42 namespace blink { | 42 namespace blink { |
| 43 | 43 |
| 44 class PLATFORM_EXPORT LayoutPoint { | 44 class PLATFORM_EXPORT LayoutPoint { |
| 45 DISALLOW_NEW(); | 45 DISALLOW_NEW(); |
| 46 | 46 |
| 47 public: | 47 public: |
| 48 LayoutPoint() {} | 48 LayoutPoint() {} |
| 49 LayoutPoint(LayoutUnit x, LayoutUnit y) : m_x(x), m_y(y) {} | 49 LayoutPoint(LayoutUnit x, LayoutUnit y) : m_x(x), m_y(y) {} |
| 50 LayoutPoint(int x, int y) : m_x(LayoutUnit(x)), m_y(LayoutUnit(y)) {} | 50 LayoutPoint(int x, int y) : m_x(LayoutUnit(x)), m_y(LayoutUnit(y)) {} |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 return flooredLayoutPoint(FloatPoint(s)); | 217 return flooredLayoutPoint(FloatPoint(s)); |
| 218 } | 218 } |
| 219 | 219 |
| 220 // Redeclared here to avoid ODR issues. | 220 // Redeclared here to avoid ODR issues. |
| 221 // See platform/testing/GeometryPrinters.h. | 221 // See platform/testing/GeometryPrinters.h. |
| 222 void PrintTo(const LayoutPoint&, std::ostream*); | 222 void PrintTo(const LayoutPoint&, std::ostream*); |
| 223 | 223 |
| 224 } // namespace blink | 224 } // namespace blink |
| 225 | 225 |
| 226 #endif // LayoutPoint_h | 226 #endif // LayoutPoint_h |
| OLD | NEW |