| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 18 matching lines...) Expand all Loading... |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef WebFloatRect_h | 31 #ifndef WebFloatRect_h |
| 32 #define WebFloatRect_h | 32 #define WebFloatRect_h |
| 33 | 33 |
| 34 #include "WebCommon.h" | 34 #include "WebCommon.h" |
| 35 | 35 |
| 36 #if INSIDE_BLINK | 36 #if INSIDE_BLINK |
| 37 #include "platform/geometry/FloatRect.h" | 37 #include "platform/geometry/FloatRect.h" |
| 38 #else | 38 #else |
| 39 #include <ui/gfx/geometry/rect_f.h> |
| 39 #include <algorithm> | 40 #include <algorithm> |
| 40 #include <cmath> | 41 #include <cmath> |
| 41 #include <ui/gfx/geometry/rect_f.h> | |
| 42 #endif | 42 #endif |
| 43 | 43 |
| 44 namespace blink { | 44 namespace blink { |
| 45 | 45 |
| 46 struct WebFloatRect { | 46 struct WebFloatRect { |
| 47 float x; | 47 float x; |
| 48 float y; | 48 float y; |
| 49 float width; | 49 float width; |
| 50 float height; | 50 float height; |
| 51 | 51 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 return a.x == b.x && a.y == b.y && a.width == b.width && a.height == b.height; | 91 return a.x == b.x && a.y == b.y && a.width == b.width && a.height == b.height; |
| 92 } | 92 } |
| 93 | 93 |
| 94 inline bool operator!=(const WebFloatRect& a, const WebFloatRect& b) { | 94 inline bool operator!=(const WebFloatRect& a, const WebFloatRect& b) { |
| 95 return !(a == b); | 95 return !(a == b); |
| 96 } | 96 } |
| 97 | 97 |
| 98 } // namespace blink | 98 } // namespace blink |
| 99 | 99 |
| 100 #endif | 100 #endif |
| OLD | NEW |