Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1021)

Unified Diff: third_party/WebKit/Source/platform/graphics/Path.cpp

Issue 2807923002: Replace ASSERT, ASSERT_NOT_REACHED, and RELEASE_ASSERT in platform/graphics (Closed)
Patch Set: Replace ASSERT, ASSERT_NOT_REACHED, and RELEASE_ASSERT in platform/graphics Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/graphics/Path.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/Path.cpp b/third_party/WebKit/Source/platform/graphics/Path.cpp
index 636149324626e04ffc3c993cfb4da701d38fd327..e858d97dc4de1e1c33026f8d754334ae3e0291d8 100644
--- a/third_party/WebKit/Source/platform/graphics/Path.cpp
+++ b/third_party/WebKit/Source/platform/graphics/Path.cpp
@@ -364,9 +364,11 @@ void Path::addEllipse(const FloatPoint& p,
float startAngle,
float endAngle,
bool anticlockwise) {
- ASSERT(ellipseIsRenderable(startAngle, endAngle));
- ASSERT(startAngle >= 0 && startAngle < twoPiFloat);
- ASSERT((anticlockwise && (startAngle - endAngle) >= 0) ||
+#if DCHECK_IS_ON()
+ DCHECK(ellipseIsRenderable(startAngle, endAngle));
+#endif
+ DCHECK(startAngle >= 0 && startAngle < twoPiFloat);
tkent 2017/04/09 23:17:27 Split this into two DCHECKs.
Hwanseung Lee 2017/04/11 22:24:10 Done.
+ DCHECK((anticlockwise && (startAngle - endAngle) >= 0) ||
(!anticlockwise && (endAngle - startAngle) >= 0));
SkScalar cx = WebCoreFloatToSkScalar(p.x());
@@ -425,9 +427,11 @@ void Path::addEllipse(const FloatPoint& p,
float startAngle,
float endAngle,
bool anticlockwise) {
- ASSERT(ellipseIsRenderable(startAngle, endAngle));
- ASSERT(startAngle >= 0 && startAngle < twoPiFloat);
- ASSERT((anticlockwise && (startAngle - endAngle) >= 0) ||
+#if DCHECK_IS_ON()
+ DCHECK(ellipseIsRenderable(startAngle, endAngle));
+#endif
+ DCHECK(startAngle >= 0 && startAngle < twoPiFloat);
tkent 2017/04/09 23:17:27 Split this into two DCHECKs.
Hwanseung Lee 2017/04/11 22:24:10 Done.
+ DCHECK((anticlockwise && (startAngle - endAngle) >= 0) ||
(!anticlockwise && (endAngle - startAngle) >= 0));
if (!rotation) {
@@ -439,7 +443,7 @@ void Path::addEllipse(const FloatPoint& p,
// Add an arc after the relevant transform.
AffineTransform ellipseTransform =
AffineTransform::translation(p.x(), p.y()).rotateRadians(rotation);
- ASSERT(ellipseTransform.isInvertible());
+ DCHECK(ellipseTransform.isInvertible());
AffineTransform inverseEllipseTransform = ellipseTransform.inverse();
transform(inverseEllipseTransform);
addEllipse(FloatPoint::zero(), radiusX, radiusY, startAngle, endAngle,

Powered by Google App Engine
This is Rietveld 408576698