| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2005 Nokia. All rights reserved. | 3 * Copyright (C) 2005 Nokia. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 FloatPoint(const NSPoint&); | 151 FloatPoint(const NSPoint&); |
| 152 operator NSPoint() const; | 152 operator NSPoint() const; |
| 153 #endif | 153 #endif |
| 154 #endif | 154 #endif |
| 155 | 155 |
| 156 // Can we remove this one? | 156 // Can we remove this one? |
| 157 SkPoint data() const; | 157 SkPoint data() const; |
| 158 | 158 |
| 159 operator SkPoint() const { return SkPoint::Make(m_x, m_y); } | 159 operator SkPoint() const { return SkPoint::Make(m_x, m_y); } |
| 160 | 160 |
| 161 #ifndef NDEBUG | |
| 162 String toString() const; | 161 String toString() const; |
| 163 #endif | |
| 164 | 162 |
| 165 private: | 163 private: |
| 166 float m_x, m_y; | 164 float m_x, m_y; |
| 167 }; | 165 }; |
| 168 | 166 |
| 169 | 167 |
| 170 inline FloatPoint& operator+=(FloatPoint& a, const FloatSize& b) | 168 inline FloatPoint& operator+=(FloatPoint& a, const FloatSize& b) |
| 171 { | 169 { |
| 172 a.move(b.width(), b.height()); | 170 a.move(b.width(), b.height()); |
| 173 return a; | 171 return a; |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 // Find point where lines through the two pairs of points intersect. Returns fal
se if the lines don't intersect. | 277 // Find point where lines through the two pairs of points intersect. Returns fal
se if the lines don't intersect. |
| 280 PLATFORM_EXPORT bool findIntersection(const FloatPoint& p1, const FloatPoint& p2
, const FloatPoint& d1, const FloatPoint& d2, FloatPoint& intersection); | 278 PLATFORM_EXPORT bool findIntersection(const FloatPoint& p1, const FloatPoint& p2
, const FloatPoint& d1, const FloatPoint& d2, FloatPoint& intersection); |
| 281 | 279 |
| 282 // Redeclared here to avoid ODR issues. | 280 // Redeclared here to avoid ODR issues. |
| 283 // See platform/testing/GeometryPrinters.h. | 281 // See platform/testing/GeometryPrinters.h. |
| 284 void PrintTo(const FloatPoint&, std::ostream*); | 282 void PrintTo(const FloatPoint&, std::ostream*); |
| 285 | 283 |
| 286 } // namespace blink | 284 } // namespace blink |
| 287 | 285 |
| 288 #endif | 286 #endif |
| OLD | NEW |