| 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 float yi = y1 - (bounds.maxY() - marginRadiusY); | 81 float yi = y1 - (bounds.maxY() - marginRadiusY); |
| 82 float xi = ellipseXIntercept(yi, marginRadiusX, marginRadiusY); | 82 float xi = ellipseXIntercept(yi, marginRadiusX, marginRadiusY); |
| 83 x1 = bounds.x() + marginRadiusX - xi; | 83 x1 = bounds.x() + marginRadiusX - xi; |
| 84 x2 = bounds.maxX() - marginRadiusX + xi; | 84 x2 = bounds.maxX() - marginRadiusX + xi; |
| 85 } | 85 } |
| 86 } | 86 } |
| 87 | 87 |
| 88 result.append(LineSegment(x1, x2)); | 88 result.append(LineSegment(x1, x2)); |
| 89 } | 89 } |
| 90 | 90 |
| 91 void RectangleShape::buildDisplayPaths(DisplayPaths& paths) const |
| 92 { |
| 93 paths.shape.addRoundedRect(m_bounds, m_radii); |
| 94 if (shapeMargin()) |
| 95 paths.marginShape.addRoundedRect(shapeMarginBounds(), FloatSize(m_radii.
width() + shapeMargin(), m_radii.height() + shapeMargin())); |
| 96 } |
| 97 |
| 91 } // namespace WebCore | 98 } // namespace WebCore |
| OLD | NEW |