| 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 "third_party/skia/include/core/SkPoint3.h" | 27 #include "third_party/skia/include/core/SkPoint3.h" |
| 28 #include "wtf/Allocator.h" | 28 #include "wtf/Allocator.h" |
| 29 #include <iosfwd> |
| 29 | 30 |
| 30 namespace blink { | 31 namespace blink { |
| 31 | 32 |
| 32 class PLATFORM_EXPORT FloatPoint3D { | 33 class PLATFORM_EXPORT FloatPoint3D { |
| 33 DISALLOW_NEW(); | 34 DISALLOW_NEW(); |
| 34 public: | 35 public: |
| 35 FloatPoint3D() | 36 FloatPoint3D() |
| 36 : m_x(0) | 37 : m_x(0) |
| 37 , m_y(0) | 38 , m_y(0) |
| 38 , m_z(0) | 39 , m_z(0) |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 inline FloatPoint3D operator*(const FloatPoint3D& v, float k) | 185 inline FloatPoint3D operator*(const FloatPoint3D& v, float k) |
| 185 { | 186 { |
| 186 return FloatPoint3D(k * v.x(), k * v.y(), k * v.z()); | 187 return FloatPoint3D(k * v.x(), k * v.y(), k * v.z()); |
| 187 } | 188 } |
| 188 | 189 |
| 189 inline float FloatPoint3D::distanceTo(const FloatPoint3D& a) const | 190 inline float FloatPoint3D::distanceTo(const FloatPoint3D& a) const |
| 190 { | 191 { |
| 191 return (*this - a).length(); | 192 return (*this - a).length(); |
| 192 } | 193 } |
| 193 | 194 |
| 194 // Redeclared here to avoid ODR issues. | 195 PLATFORM_EXPORT std::ostream& operator<<(std::ostream&, const FloatPoint3D&); |
| 195 // See platform/testing/GeometryPrinters.h. | |
| 196 void PrintTo(const FloatPoint3D&, std::ostream*); | |
| 197 | 196 |
| 198 } // namespace blink | 197 } // namespace blink |
| 199 | 198 |
| 200 #endif // FloatPoint3D_h | 199 #endif // FloatPoint3D_h |
| OLD | NEW |