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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 { | 51 { |
52 } | 52 } |
53 | 53 |
54 WebFloatPoint(float x, float y) | 54 WebFloatPoint(float x, float y) |
55 : x(x) | 55 : x(x) |
56 , y(y) | 56 , y(y) |
57 { | 57 { |
58 } | 58 } |
59 | 59 |
60 #if INSIDE_BLINK | 60 #if INSIDE_BLINK |
61 WebFloatPoint(const WebCore::FloatPoint& p) | 61 WebFloatPoint(const blink::FloatPoint& p) |
62 : x(p.x()) | 62 : x(p.x()) |
63 , y(p.y()) | 63 , y(p.y()) |
64 { | 64 { |
65 } | 65 } |
66 | 66 |
67 WebFloatPoint& operator=(const WebCore::FloatPoint& p) | 67 WebFloatPoint& operator=(const blink::FloatPoint& p) |
68 { | 68 { |
69 x = p.x(); | 69 x = p.x(); |
70 y = p.y(); | 70 y = p.y(); |
71 return *this; | 71 return *this; |
72 } | 72 } |
73 | 73 |
74 operator WebCore::FloatPoint() const | 74 operator blink::FloatPoint() const |
75 { | 75 { |
76 return WebCore::FloatPoint(x, y); | 76 return blink::FloatPoint(x, y); |
77 } | 77 } |
78 #else | 78 #else |
79 WebFloatPoint(const gfx::PointF& p) | 79 WebFloatPoint(const gfx::PointF& p) |
80 : x(p.x()) | 80 : x(p.x()) |
81 , y(p.y()) | 81 , y(p.y()) |
82 { | 82 { |
83 } | 83 } |
84 | 84 |
85 WebFloatPoint& operator=(const gfx::PointF& p) | 85 WebFloatPoint& operator=(const gfx::PointF& p) |
86 { | 86 { |
(...skipping 16 matching lines...) Expand all Loading... |
103 } | 103 } |
104 | 104 |
105 inline bool operator!=(const WebFloatPoint& a, const WebFloatPoint& b) | 105 inline bool operator!=(const WebFloatPoint& a, const WebFloatPoint& b) |
106 { | 106 { |
107 return !(a == b); | 107 return !(a == b); |
108 } | 108 } |
109 | 109 |
110 } // namespace blink | 110 } // namespace blink |
111 | 111 |
112 #endif | 112 #endif |
OLD | NEW |