| Index: third_party/WebKit/Source/modules/canvas2d/CanvasPathMethods.cpp
|
| diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasPathMethods.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasPathMethods.cpp
|
| index 1855b1c28786067f8a77a1c95ded3b0644fcf7dd..0cbbb74cb48bf8815ac10c92f09e5adf548d7303 100644
|
| --- a/third_party/WebKit/Source/modules/canvas2d/CanvasPathMethods.cpp
|
| +++ b/third_party/WebKit/Source/modules/canvas2d/CanvasPathMethods.cpp
|
| @@ -266,9 +266,10 @@ void degenerateEllipse(CanvasPathMethods* path,
|
| // First, if the object's path has any subpaths, then the method must add a
|
| // straight line from the last point in the subpath to the start point of the
|
| // arc.
|
| - lineToFloatPoint(path, center +
|
| - rotationMatrix.mapPoint(getPointOnEllipse(
|
| - radiusX, radiusY, startAngle)));
|
| + lineToFloatPoint(path,
|
| + center +
|
| + rotationMatrix.mapPoint(
|
| + getPointOnEllipse(radiusX, radiusY, startAngle)));
|
| if ((!radiusX && !radiusY) || startAngle == endAngle)
|
| return;
|
|
|
| @@ -279,20 +280,23 @@ void degenerateEllipse(CanvasPathMethods* path,
|
| for (float angle =
|
| startAngle - fmodf(startAngle, piOverTwoFloat) + piOverTwoFloat;
|
| angle < endAngle; angle += piOverTwoFloat)
|
| - lineToFloatPoint(path, center +
|
| - rotationMatrix.mapPoint(getPointOnEllipse(
|
| - radiusX, radiusY, angle)));
|
| + lineToFloatPoint(path,
|
| + center +
|
| + rotationMatrix.mapPoint(
|
| + getPointOnEllipse(radiusX, radiusY, angle)));
|
| } else {
|
| for (float angle = startAngle - fmodf(startAngle, piOverTwoFloat);
|
| angle > endAngle; angle -= piOverTwoFloat)
|
| - lineToFloatPoint(path, center +
|
| - rotationMatrix.mapPoint(getPointOnEllipse(
|
| - radiusX, radiusY, angle)));
|
| + lineToFloatPoint(path,
|
| + center +
|
| + rotationMatrix.mapPoint(
|
| + getPointOnEllipse(radiusX, radiusY, angle)));
|
| }
|
|
|
| - lineToFloatPoint(path, center +
|
| - rotationMatrix.mapPoint(getPointOnEllipse(
|
| - radiusX, radiusY, endAngle)));
|
| + lineToFloatPoint(path,
|
| + center +
|
| + rotationMatrix.mapPoint(
|
| + getPointOnEllipse(radiusX, radiusY, endAngle)));
|
| }
|
|
|
| } // namespace
|
| @@ -345,15 +349,17 @@ void CanvasPathMethods::ellipse(float x,
|
| return;
|
|
|
| if (radiusX < 0) {
|
| - exceptionState.throwDOMException(
|
| - IndexSizeError, "The major-axis radius provided (" +
|
| - String::number(radiusX) + ") is negative.");
|
| + exceptionState.throwDOMException(IndexSizeError,
|
| + "The major-axis radius provided (" +
|
| + String::number(radiusX) +
|
| + ") is negative.");
|
| return;
|
| }
|
| if (radiusY < 0) {
|
| - exceptionState.throwDOMException(
|
| - IndexSizeError, "The minor-axis radius provided (" +
|
| - String::number(radiusY) + ") is negative.");
|
| + exceptionState.throwDOMException(IndexSizeError,
|
| + "The minor-axis radius provided (" +
|
| + String::number(radiusY) +
|
| + ") is negative.");
|
| return;
|
| }
|
|
|
|
|