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 21 matching lines...) Expand all Loading... |
32 #define WebFloatSize_h | 32 #define WebFloatSize_h |
33 | 33 |
34 #include "WebCommon.h" | 34 #include "WebCommon.h" |
35 | 35 |
36 #include <algorithm> | 36 #include <algorithm> |
37 | 37 |
38 #if INSIDE_BLINK | 38 #if INSIDE_BLINK |
39 #include "platform/geometry/FloatSize.h" | 39 #include "platform/geometry/FloatSize.h" |
40 #else | 40 #else |
41 #include <cmath> | 41 #include <cmath> |
42 #include <ui/gfx/size_f.h> | 42 #include <ui/gfx/geometry/size_f.h> |
43 #include <ui/gfx/vector2d_f.h> | 43 #include <ui/gfx/vector2d_f.h> |
44 #endif | 44 #endif |
45 | 45 |
46 namespace blink { | 46 namespace blink { |
47 | 47 |
48 struct WebFloatSize { | 48 struct WebFloatSize { |
49 float width; | 49 float width; |
50 float height; | 50 float height; |
51 | 51 |
52 bool isEmpty() const { return width <= 0 || height <= 0; } | 52 bool isEmpty() const { return width <= 0 || height <= 0; } |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 } | 126 } |
127 | 127 |
128 inline bool operator!=(const WebFloatSize& a, const WebFloatSize& b) | 128 inline bool operator!=(const WebFloatSize& a, const WebFloatSize& b) |
129 { | 129 { |
130 return !(a == b); | 130 return !(a == b); |
131 } | 131 } |
132 | 132 |
133 } // namespace blink | 133 } // namespace blink |
134 | 134 |
135 #endif | 135 #endif |
OLD | NEW |