| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef WebSize_h | 31 #ifndef WebSize_h |
| 32 #define WebSize_h | 32 #define WebSize_h |
| 33 | 33 |
| 34 #include "WebCommon.h" | 34 #include "WebCommon.h" |
| 35 | 35 |
| 36 #if BLINK_IMPLEMENTATION | 36 #if BLINK_IMPLEMENTATION |
| 37 #include "core/platform/graphics/IntSize.h" | 37 #include "platform/geometry/IntSize.h" |
| 38 #else | 38 #else |
| 39 #include <algorithm> | 39 #include <algorithm> |
| 40 #include <cmath> | 40 #include <cmath> |
| 41 #include <ui/gfx/size.h> | 41 #include <ui/gfx/size.h> |
| 42 #include <ui/gfx/vector2d.h> | 42 #include <ui/gfx/vector2d.h> |
| 43 #endif | 43 #endif |
| 44 | 44 |
| 45 namespace WebKit { | 45 namespace WebKit { |
| 46 | 46 |
| 47 struct WebSize { | 47 struct WebSize { |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 } | 125 } |
| 126 | 126 |
| 127 inline bool operator!=(const WebSize& a, const WebSize& b) | 127 inline bool operator!=(const WebSize& a, const WebSize& b) |
| 128 { | 128 { |
| 129 return !(a == b); | 129 return !(a == b); |
| 130 } | 130 } |
| 131 | 131 |
| 132 } // namespace WebKit | 132 } // namespace WebKit |
| 133 | 133 |
| 134 #endif | 134 #endif |
| OLD | NEW |