| 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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 } | 210 } |
| 211 } | 211 } |
| 212 | 212 |
| 213 OwnPtr<RasterShape> rasterShape = adoptPtr(new RasterShape(intervals.release
(), marginRect.size())); | 213 OwnPtr<RasterShape> rasterShape = adoptPtr(new RasterShape(intervals.release
(), marginRect.size())); |
| 214 rasterShape->m_writingMode = writingMode; | 214 rasterShape->m_writingMode = writingMode; |
| 215 rasterShape->m_margin = floatValueForLength(margin, 0); | 215 rasterShape->m_margin = floatValueForLength(margin, 0); |
| 216 rasterShape->m_padding = floatValueForLength(padding, 0); | 216 rasterShape->m_padding = floatValueForLength(padding, 0); |
| 217 return rasterShape.release(); | 217 return rasterShape.release(); |
| 218 } | 218 } |
| 219 | 219 |
| 220 PassOwnPtr<Shape> Shape::createLayoutBoxShape(const RoundedRect& roundedRect, Wr
itingMode writingMode, const Length& margin, const Length& padding) | 220 PassOwnPtr<Shape> Shape::createBoxShape(const RoundedRect& roundedRect, WritingM
ode writingMode, const Length& margin, const Length& padding) |
| 221 { | 221 { |
| 222 FloatRect rect(0, 0, roundedRect.rect().width(), roundedRect.rect().height()
); | 222 FloatRect rect(0, 0, roundedRect.rect().width(), roundedRect.rect().height()
); |
| 223 FloatRoundedRect bounds(rect, roundedRect.radii()); | 223 FloatRoundedRect bounds(rect, roundedRect.radii()); |
| 224 OwnPtr<Shape> shape = createInsetShape(bounds); | 224 OwnPtr<Shape> shape = createInsetShape(bounds); |
| 225 shape->m_writingMode = writingMode; | 225 shape->m_writingMode = writingMode; |
| 226 shape->m_margin = floatValueForLength(margin, 0); | 226 shape->m_margin = floatValueForLength(margin, 0); |
| 227 shape->m_padding = floatValueForLength(padding, 0); | 227 shape->m_padding = floatValueForLength(padding, 0); |
| 228 | 228 |
| 229 return shape.release(); | 229 return shape.release(); |
| 230 } | 230 } |
| 231 | 231 |
| 232 } // namespace WebCore | 232 } // namespace WebCore |
| OLD | NEW |