| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 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 WebFloatSize_h | 31 #ifndef WebFloatSize_h |
| 32 #define WebFloatSize_h | 32 #define WebFloatSize_h |
| 33 | 33 |
| 34 #include "WebCommon.h" | |
| 35 | |
| 36 #include <algorithm> | 34 #include <algorithm> |
| 35 #include "sky/engine/public/platform/WebCommon.h" |
| 37 | 36 |
| 38 #if INSIDE_BLINK | 37 #if INSIDE_BLINK |
| 39 #include "platform/geometry/FloatSize.h" | 38 #include "sky/engine/platform/geometry/FloatSize.h" |
| 40 #else | 39 #else |
| 41 #include <cmath> | 40 #include <cmath> |
| 42 #include <ui/gfx/geometry/size_f.h> | 41 #include "ui/gfx/geometry/size_f.h" |
| 43 #include <ui/gfx/vector2d_f.h> | 42 #include "ui/gfx/vector2d_f.h" |
| 44 #endif | 43 #endif |
| 45 | 44 |
| 46 namespace blink { | 45 namespace blink { |
| 47 | 46 |
| 48 struct WebFloatSize { | 47 struct WebFloatSize { |
| 49 float width; | 48 float width; |
| 50 float height; | 49 float height; |
| 51 | 50 |
| 52 bool isEmpty() const { return width <= 0 || height <= 0; } | 51 bool isEmpty() const { return width <= 0 || height <= 0; } |
| 53 | 52 |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 } | 125 } |
| 127 | 126 |
| 128 inline bool operator!=(const WebFloatSize& a, const WebFloatSize& b) | 127 inline bool operator!=(const WebFloatSize& a, const WebFloatSize& b) |
| 129 { | 128 { |
| 130 return !(a == b); | 129 return !(a == b); |
| 131 } | 130 } |
| 132 | 131 |
| 133 } // namespace blink | 132 } // namespace blink |
| 134 | 133 |
| 135 #endif | 134 #endif |
| OLD | NEW |