From 8afa554414b3fed2cd970249946e3986473b5580 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Tue, 22 May 2018 12:19:13 +0000 Subject: Revert "remove fragile hack in addOval to avoid computing bounds" This reverts commit bc721ba4be626e3ba753f55341a7019d98044102. Reason for revert: I think we'll want to reland with guards for layout tests. https://test-results.appspot.com/data/layout_results/linux_trusty_blink_rel/29630/layout-test-results/results.html Original change's description: > remove fragile hack in addOval to avoid computing bounds > > Bug: skia: > Change-Id: Ide917f54633370f1fce46a115fa923794b981e2e > Reviewed-on: https://skia-review.googlesource.com/129461 > Reviewed-by: Mike Klein > Commit-Queue: Mike Reed TBR=mtklein@google.com,reed@google.com Change-Id: Ibadac8bbeca2b162d696e7cca51d580121afe71f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/129442 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- src/core/SkPath.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp index 7a0f82800c..510efd6d9d 100644 --- a/src/core/SkPath.cpp +++ b/src/core/SkPath.cpp @@ -1252,9 +1252,7 @@ void SkPath::addOval(const SkRect &oval, Direction dir, unsigned startPointIndex } SkAutoDisableDirectionCheck addc(this); - // unlike addRect(), we can't use SkAutoPathBoundsUpdate here, since even with a finite - // bounds, we might (due to an overflow in intermediate calculations) create a nonfinite - // path. + SkAutoPathBoundsUpdate apbu(this, oval); SkDEBUGCODE(int initialVerbCount = this->countVerbs()); const int kVerbs = 6; // moveTo + 4x conicTo + close -- cgit v1.2.3