aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrShape.cpp
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2017-09-14 14:08:45 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-09-14 18:35:51 +0000
commitd27392f8a43c5efe2fdb40387aa5c03e611dbea4 (patch)
tree8228401714fce4a005be44d7be4847f511671619 /src/gpu/GrShape.cpp
parent5bfd3c48382d16fa17f43ba3cf5dc5e90f5560e8 (diff)
Remove invalid SkRRect asserts in GrShape
Due to floating point math, it's possible to add a round-rect to a path, then pull it back out and have the type change. Bug: skia:7037 Change-Id: I071b77378da08b873ff9d68fdac2373370faa71c Reviewed-on: https://skia-review.googlesource.com/46585 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/GrShape.cpp')
-rw-r--r--src/gpu/GrShape.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gpu/GrShape.cpp b/src/gpu/GrShape.cpp
index 4691ede621..f7ed18f768 100644
--- a/src/gpu/GrShape.cpp
+++ b/src/gpu/GrShape.cpp
@@ -456,10 +456,7 @@ void GrShape::attemptToSimplifyPath() {
fRRectData.fDir = rrectDir;
fRRectData.fStart = rrectStart;
fRRectData.fInverted = inverted;
- // Currently SkPath does not acknowledge that empty, rect, or oval subtypes as rrects.
SkASSERT(!fRRectData.fRRect.isEmpty());
- SkASSERT(fRRectData.fRRect.getType() != SkRRect::kRect_Type);
- SkASSERT(fRRectData.fRRect.getType() != SkRRect::kOval_Type);
} else if (this->path().isOval(&rect, &rrectDir, &rrectStart)) {
this->changeType(Type::kRRect);
fRRectData.fRRect.setOval(rect);