| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved. |
| 3 * Copyright (C) 2005 Nokia. All rights reserved. | 3 * Copyright (C) 2005 Nokia. All rights reserved. |
| 4 * 2008 Eric Seidel <eric@webkit.org> | 4 * 2008 Eric Seidel <eric@webkit.org> |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #ifndef FloatSize_h | 28 #ifndef FloatSize_h |
| 29 #define FloatSize_h | 29 #define FloatSize_h |
| 30 | 30 |
| 31 #include <iosfwd> |
| 31 #include "platform/geometry/IntPoint.h" | 32 #include "platform/geometry/IntPoint.h" |
| 33 #include "platform/wtf/Allocator.h" |
| 34 #include "platform/wtf/Forward.h" |
| 35 #include "platform/wtf/MathExtras.h" |
| 32 #include "third_party/skia/include/core/SkSize.h" | 36 #include "third_party/skia/include/core/SkSize.h" |
| 33 #include "wtf/Allocator.h" | |
| 34 #include "wtf/Forward.h" | |
| 35 #include "wtf/MathExtras.h" | |
| 36 #include <iosfwd> | |
| 37 | 37 |
| 38 #if OS(MACOSX) | 38 #if OS(MACOSX) |
| 39 typedef struct CGSize CGSize; | 39 typedef struct CGSize CGSize; |
| 40 | 40 |
| 41 #ifdef __OBJC__ | 41 #ifdef __OBJC__ |
| 42 #import <Foundation/Foundation.h> | 42 #import <Foundation/Foundation.h> |
| 43 #endif | 43 #endif |
| 44 #endif | 44 #endif |
| 45 | 45 |
| 46 namespace blink { | 46 namespace blink { |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 clampTo<int>(floorf(p.height()))); | 193 clampTo<int>(floorf(p.height()))); |
| 194 } | 194 } |
| 195 | 195 |
| 196 // Redeclared here to avoid ODR issues. | 196 // Redeclared here to avoid ODR issues. |
| 197 // See platform/testing/GeometryPrinters.h. | 197 // See platform/testing/GeometryPrinters.h. |
| 198 void PrintTo(const FloatSize&, std::ostream*); | 198 void PrintTo(const FloatSize&, std::ostream*); |
| 199 | 199 |
| 200 } // namespace blink | 200 } // namespace blink |
| 201 | 201 |
| 202 #endif // FloatSize_h | 202 #endif // FloatSize_h |
| OLD | NEW |