| 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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 bottomLeftRadius, bottomRightRadius); | 194 bottomLeftRadius, bottomRightRadius); |
| 195 | 195 |
| 196 FloatRoundedRect finalRect(logicalRect, cornerRadii); | 196 FloatRoundedRect finalRect(logicalRect, cornerRadii); |
| 197 finalRect.constrainRadii(); | 197 finalRect.constrainRadii(); |
| 198 | 198 |
| 199 shape = createInsetShape(finalRect); | 199 shape = createInsetShape(finalRect); |
| 200 break; | 200 break; |
| 201 } | 201 } |
| 202 | 202 |
| 203 default: | 203 default: |
| 204 ASSERT_NOT_REACHED(); | 204 NOTREACHED(); |
| 205 } | 205 } |
| 206 | 206 |
| 207 shape->m_writingMode = writingMode; | 207 shape->m_writingMode = writingMode; |
| 208 shape->m_margin = margin; | 208 shape->m_margin = margin; |
| 209 | 209 |
| 210 return shape; | 210 return shape; |
| 211 } | 211 } |
| 212 | 212 |
| 213 std::unique_ptr<Shape> Shape::createEmptyRasterShape(WritingMode writingMode, | 213 std::unique_ptr<Shape> Shape::createEmptyRasterShape(WritingMode writingMode, |
| 214 float margin) { | 214 float margin) { |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 FloatRect rect(0, 0, roundedRect.rect().width(), roundedRect.rect().height()); | 297 FloatRect rect(0, 0, roundedRect.rect().width(), roundedRect.rect().height()); |
| 298 FloatRoundedRect bounds(rect, roundedRect.getRadii()); | 298 FloatRoundedRect bounds(rect, roundedRect.getRadii()); |
| 299 std::unique_ptr<Shape> shape = createInsetShape(bounds); | 299 std::unique_ptr<Shape> shape = createInsetShape(bounds); |
| 300 shape->m_writingMode = writingMode; | 300 shape->m_writingMode = writingMode; |
| 301 shape->m_margin = margin; | 301 shape->m_margin = margin; |
| 302 | 302 |
| 303 return shape; | 303 return shape; |
| 304 } | 304 } |
| 305 | 305 |
| 306 } // namespace blink | 306 } // namespace blink |
| OLD | NEW |