| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2012 Adobe Systems Incorporated. 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above | 8 * 1. Redistributions of source code must retain the above |
| 9 * copyright notice, this list of conditions and the following | 9 * copyright notice, this list of conditions and the following |
| 10 * disclaimer. | 10 * disclaimer. |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 m_computedLength == other.m_computedLength; | 102 m_computedLength == other.m_computedLength; |
| 103 } | 103 } |
| 104 | 104 |
| 105 Direction getDirection() const { return m_direction; } | 105 Direction getDirection() const { return m_direction; } |
| 106 const Length& length() const { return m_length; } | 106 const Length& length() const { return m_length; } |
| 107 const Length& computedLength() const { return m_computedLength; } | 107 const Length& computedLength() const { return m_computedLength; } |
| 108 | 108 |
| 109 BasicShapeCenterCoordinate blend(const BasicShapeCenterCoordinate& other, | 109 BasicShapeCenterCoordinate blend(const BasicShapeCenterCoordinate& other, |
| 110 double progress) const { | 110 double progress) const { |
| 111 return BasicShapeCenterCoordinate( | 111 return BasicShapeCenterCoordinate( |
| 112 TopLeft, m_computedLength.blend(other.m_computedLength, progress, | 112 TopLeft, |
| 113 ValueRangeAll)); | 113 m_computedLength.blend(other.m_computedLength, progress, |
| 114 ValueRangeAll)); |
| 114 } | 115 } |
| 115 | 116 |
| 116 private: | 117 private: |
| 117 Direction m_direction; | 118 Direction m_direction; |
| 118 Length m_length; | 119 Length m_length; |
| 119 Length m_computedLength; | 120 Length m_computedLength; |
| 120 }; | 121 }; |
| 121 | 122 |
| 122 class BasicShapeRadius { | 123 class BasicShapeRadius { |
| 123 DISALLOW_NEW(); | 124 DISALLOW_NEW(); |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 LengthSize m_topLeftRadius; | 304 LengthSize m_topLeftRadius; |
| 304 LengthSize m_topRightRadius; | 305 LengthSize m_topRightRadius; |
| 305 LengthSize m_bottomRightRadius; | 306 LengthSize m_bottomRightRadius; |
| 306 LengthSize m_bottomLeftRadius; | 307 LengthSize m_bottomLeftRadius; |
| 307 }; | 308 }; |
| 308 | 309 |
| 309 DEFINE_BASICSHAPE_TYPE_CASTS(BasicShapeInset); | 310 DEFINE_BASICSHAPE_TYPE_CASTS(BasicShapeInset); |
| 310 | 311 |
| 311 } // namespace blink | 312 } // namespace blink |
| 312 #endif | 313 #endif |
| OLD | NEW |