| 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 20 matching lines...) Expand all Loading... |
| 31 #ifndef WebRect_h | 31 #ifndef WebRect_h |
| 32 #define WebRect_h | 32 #define WebRect_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/IntRect.h" | 37 #include "platform/geometry/IntRect.h" |
| 38 #else | 38 #else |
| 39 #include <algorithm> | 39 #include <algorithm> |
| 40 #include <cmath> | 40 #include <cmath> |
| 41 // FIXME: ceil(x) macro defined in wtf/MathExtras.h causes compile error |
| 42 // when we have "std::ceil(x)". So use #undef ceil to avoid the error. |
| 43 #undef ceil |
| 41 #include <ui/gfx/rect.h> | 44 #include <ui/gfx/rect.h> |
| 42 #endif | 45 #endif |
| 43 | 46 |
| 44 namespace blink { | 47 namespace blink { |
| 45 | 48 |
| 46 struct WebRect { | 49 struct WebRect { |
| 47 int x; | 50 int x; |
| 48 int y; | 51 int y; |
| 49 int width; | 52 int width; |
| 50 int height; | 53 int height; |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 } | 123 } |
| 121 | 124 |
| 122 inline bool operator!=(const WebRect& a, const WebRect& b) | 125 inline bool operator!=(const WebRect& a, const WebRect& b) |
| 123 { | 126 { |
| 124 return !(a == b); | 127 return !(a == b); |
| 125 } | 128 } |
| 126 | 129 |
| 127 } // namespace blink | 130 } // namespace blink |
| 128 | 131 |
| 129 #endif | 132 #endif |
| OLD | NEW |