| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2005 Nokia. All rights reserved. | 3 * Copyright (C) 2005 Nokia. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #ifndef FloatPoint_h | 27 #ifndef FloatPoint_h |
| 28 #define FloatPoint_h | 28 #define FloatPoint_h |
| 29 | 29 |
| 30 #include <algorithm> |
| 31 #include <iosfwd> |
| 30 #include "platform/geometry/FloatSize.h" | 32 #include "platform/geometry/FloatSize.h" |
| 31 #include "platform/geometry/IntPoint.h" | 33 #include "platform/geometry/IntPoint.h" |
| 32 #include "third_party/skia/include/core/SkPoint.h" | 34 #include "third_party/skia/include/core/SkPoint.h" |
| 33 #include "wtf/Allocator.h" | 35 #include "wtf/Allocator.h" |
| 34 #include "wtf/Forward.h" | 36 #include "wtf/Forward.h" |
| 35 #include "wtf/MathExtras.h" | 37 #include "wtf/MathExtras.h" |
| 36 #include <algorithm> | |
| 37 #include <iosfwd> | |
| 38 | 38 |
| 39 #if OS(MACOSX) | 39 #if OS(MACOSX) |
| 40 typedef struct CGPoint CGPoint; | 40 typedef struct CGPoint CGPoint; |
| 41 | 41 |
| 42 #ifdef __OBJC__ | 42 #ifdef __OBJC__ |
| 43 #import <Foundation/Foundation.h> | 43 #import <Foundation/Foundation.h> |
| 44 #endif | 44 #endif |
| 45 #endif | 45 #endif |
| 46 | 46 |
| 47 namespace blink { | 47 namespace blink { |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 const FloatPoint& d2, | 244 const FloatPoint& d2, |
| 245 FloatPoint& intersection); | 245 FloatPoint& intersection); |
| 246 | 246 |
| 247 // Redeclared here to avoid ODR issues. | 247 // Redeclared here to avoid ODR issues. |
| 248 // See platform/testing/GeometryPrinters.h. | 248 // See platform/testing/GeometryPrinters.h. |
| 249 void PrintTo(const FloatPoint&, std::ostream*); | 249 void PrintTo(const FloatPoint&, std::ostream*); |
| 250 | 250 |
| 251 } // namespace blink | 251 } // namespace blink |
| 252 | 252 |
| 253 #endif | 253 #endif |
| OLD | NEW |