| 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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 | 236 |
| 237 OwnPtr<RasterShape> rasterShape = adoptPtr(new RasterShape(intervals.release
(), marginRect.size())); | 237 OwnPtr<RasterShape> rasterShape = adoptPtr(new RasterShape(intervals.release
(), marginRect.size())); |
| 238 rasterShape->m_writingMode = writingMode; | 238 rasterShape->m_writingMode = writingMode; |
| 239 rasterShape->m_margin = margin; | 239 rasterShape->m_margin = margin; |
| 240 return rasterShape.release(); | 240 return rasterShape.release(); |
| 241 } | 241 } |
| 242 | 242 |
| 243 PassOwnPtr<Shape> Shape::createLayoutBoxShape(const FloatRoundedRect& roundedRec
t, WritingMode writingMode, float margin) | 243 PassOwnPtr<Shape> Shape::createLayoutBoxShape(const FloatRoundedRect& roundedRec
t, WritingMode writingMode, float margin) |
| 244 { | 244 { |
| 245 FloatRect rect(0, 0, roundedRect.rect().width(), roundedRect.rect().height()
); | 245 FloatRect rect(0, 0, roundedRect.rect().width(), roundedRect.rect().height()
); |
| 246 FloatRoundedRect bounds(rect, roundedRect.radii()); | 246 FloatRoundedRect bounds(rect, roundedRect.getRadii()); |
| 247 OwnPtr<Shape> shape = createInsetShape(bounds); | 247 OwnPtr<Shape> shape = createInsetShape(bounds); |
| 248 shape->m_writingMode = writingMode; | 248 shape->m_writingMode = writingMode; |
| 249 shape->m_margin = margin; | 249 shape->m_margin = margin; |
| 250 | 250 |
| 251 return shape.release(); | 251 return shape.release(); |
| 252 } | 252 } |
| 253 | 253 |
| 254 } // namespace blink | 254 } // namespace blink |
| OLD | NEW |