| OLD | NEW |
| 1 /* | 1 /* |
| 2 Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <wildfox@kde.org> | 2 Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <wildfox@kde.org> |
| 3 2004, 2005 Rob Buis <buis@kde.org> | 3 2004, 2005 Rob Buis <buis@kde.org> |
| 4 2005 Eric Seidel <eric@webkit.org> | 4 2005 Eric Seidel <eric@webkit.org> |
| 5 2010 Zoltan Herczeg <zherczeg@webkit.org> | 5 2010 Zoltan Herczeg <zherczeg@webkit.org> |
| 6 | 6 |
| 7 This library is free software; you can redistribute it and/or | 7 This library is free software; you can redistribute it and/or |
| 8 modify it under the terms of the GNU Library General Public | 8 modify it under the terms of the GNU Library General Public |
| 9 License as published by the Free Software Foundation; either | 9 License as published by the Free Software Foundation; either |
| 10 version 2 of the License, or (at your option) any later version. | 10 version 2 of the License, or (at your option) any later version. |
| 11 | 11 |
| 12 This library is distributed in the hope that it will be useful, | 12 This library is distributed in the hope that it will be useful, |
| 13 but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 15 Library General Public License for more details. | 15 Library General Public License for more details. |
| 16 | 16 |
| 17 You should have received a copy of the GNU Library General Public License | 17 You should have received a copy of the GNU Library General Public License |
| 18 aint with this library; see the file COPYING.LIB. If not, write to | 18 aint with this library; see the file COPYING.LIB. If not, write to |
| 19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 20 Boston, MA 02110-1301, USA. | 20 Boston, MA 02110-1301, USA. |
| 21 */ | 21 */ |
| 22 | 22 |
| 23 #ifndef FloatPoint3D_h | 23 #ifndef FloatPoint3D_h |
| 24 #define FloatPoint3D_h | 24 #define FloatPoint3D_h |
| 25 | 25 |
| 26 #include "platform/geometry/FloatPoint.h" | 26 #include "platform/geometry/FloatPoint.h" |
| 27 #include "platform/wtf/Allocator.h" |
| 27 #include "third_party/skia/include/core/SkPoint3.h" | 28 #include "third_party/skia/include/core/SkPoint3.h" |
| 28 #include "wtf/Allocator.h" | |
| 29 | 29 |
| 30 namespace blink { | 30 namespace blink { |
| 31 | 31 |
| 32 class PLATFORM_EXPORT FloatPoint3D { | 32 class PLATFORM_EXPORT FloatPoint3D { |
| 33 DISALLOW_NEW(); | 33 DISALLOW_NEW(); |
| 34 | 34 |
| 35 public: | 35 public: |
| 36 FloatPoint3D() : m_x(0), m_y(0), m_z(0) {} | 36 FloatPoint3D() : m_x(0), m_y(0), m_z(0) {} |
| 37 | 37 |
| 38 FloatPoint3D(float x, float y, float z) : m_x(x), m_y(y), m_z(z) {} | 38 FloatPoint3D(float x, float y, float z) : m_x(x), m_y(y), m_z(z) {} |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 return (*this - a).length(); | 155 return (*this - a).length(); |
| 156 } | 156 } |
| 157 | 157 |
| 158 // Redeclared here to avoid ODR issues. | 158 // Redeclared here to avoid ODR issues. |
| 159 // See platform/testing/GeometryPrinters.h. | 159 // See platform/testing/GeometryPrinters.h. |
| 160 void PrintTo(const FloatPoint3D&, std::ostream*); | 160 void PrintTo(const FloatPoint3D&, std::ostream*); |
| 161 | 161 |
| 162 } // namespace blink | 162 } // namespace blink |
| 163 | 163 |
| 164 #endif // FloatPoint3D_h | 164 #endif // FloatPoint3D_h |
| OLD | NEW |