| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc. All rights | 2 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * Copyright (C) 2013 Google Inc. All rights reserved. | 4 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 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 11 matching lines...) Expand all Loading... |
| 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 IntSize_h | 28 #ifndef IntSize_h |
| 29 #define IntSize_h | 29 #define IntSize_h |
| 30 | 30 |
| 31 #include "platform/PlatformExport.h" | 31 #include "platform/PlatformExport.h" |
| 32 #include "platform/wtf/Allocator.h" |
| 33 #include "platform/wtf/Forward.h" |
| 32 #include "public/platform/WebCommon.h" | 34 #include "public/platform/WebCommon.h" |
| 33 #include "wtf/Allocator.h" | |
| 34 #include "wtf/Forward.h" | |
| 35 | 35 |
| 36 #if OS(MACOSX) | 36 #if OS(MACOSX) |
| 37 typedef struct CGSize CGSize; | 37 typedef struct CGSize CGSize; |
| 38 | 38 |
| 39 #ifdef __OBJC__ | 39 #ifdef __OBJC__ |
| 40 #import <Foundation/Foundation.h> | 40 #import <Foundation/Foundation.h> |
| 41 #endif | 41 #endif |
| 42 #endif | 42 #endif |
| 43 | 43 |
| 44 namespace gfx { | 44 namespace gfx { |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 return a.width() != b.width() || a.height() != b.height(); | 157 return a.width() != b.width() || a.height() != b.height(); |
| 158 } | 158 } |
| 159 | 159 |
| 160 // Redeclared here to avoid ODR issues. | 160 // Redeclared here to avoid ODR issues. |
| 161 // See platform/testing/GeometryPrinters.h. | 161 // See platform/testing/GeometryPrinters.h. |
| 162 void PrintTo(const IntSize&, std::ostream*); | 162 void PrintTo(const IntSize&, std::ostream*); |
| 163 | 163 |
| 164 } // namespace blink | 164 } // namespace blink |
| 165 | 165 |
| 166 #endif // IntSize_h | 166 #endif // IntSize_h |
| OLD | NEW |