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

Unified Diff: third_party/WebKit/Source/core/style/BasicShapes.cpp

Issue 2751653003: Replace ASSERT and ASSERT_NOT_REACHED in core/style/ (Closed)
Patch Set: Replace ASSERT and ASSERT_NOT_REACHED in core/style/ Created 3 years, 9 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
« no previous file with comments | « AUTHORS ('k') | third_party/WebKit/Source/core/style/BorderEdge.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/style/BasicShapes.cpp
diff --git a/third_party/WebKit/Source/core/style/BasicShapes.cpp b/third_party/WebKit/Source/core/style/BasicShapes.cpp
index 0d08171b6d42314b56dc4aaf5599069cf56e57f6..2942b13a88b2221c1154c352b60866c6ee75a13c 100644
--- a/third_party/WebKit/Source/core/style/BasicShapes.cpp
+++ b/third_party/WebKit/Source/core/style/BasicShapes.cpp
@@ -96,7 +96,7 @@ float BasicShapeCircle::floatValueForRadiusInBox(FloatSize boxSize) const {
}
void BasicShapeCircle::path(Path& path, const FloatRect& boundingBox) {
- ASSERT(path.isEmpty());
+ DCHECK(path.isEmpty());
FloatPoint center =
floatPointForCenterCoordinate(m_centerX, m_centerY, boundingBox.size());
float radius = floatValueForRadiusInBox(boundingBox.size());
@@ -107,7 +107,7 @@ void BasicShapeCircle::path(Path& path, const FloatRect& boundingBox) {
PassRefPtr<BasicShape> BasicShapeCircle::blend(const BasicShape* other,
double progress) const {
- ASSERT(type() == other->type());
+ DCHECK_EQ(type(), other->type());
const BasicShapeCircle* o = toBasicShapeCircle(other);
RefPtr<BasicShapeCircle> result = BasicShapeCircle::create();
@@ -136,12 +136,12 @@ float BasicShapeEllipse::floatValueForRadiusInBox(
if (radius.type() == BasicShapeRadius::ClosestSide)
return std::min(std::abs(center), widthOrHeightDelta);
- ASSERT(radius.type() == BasicShapeRadius::FarthestSide);
+ DCHECK_EQ(radius.type(), BasicShapeRadius::FarthestSide);
return std::max(center, widthOrHeightDelta);
}
void BasicShapeEllipse::path(Path& path, const FloatRect& boundingBox) {
- ASSERT(path.isEmpty());
+ DCHECK(path.isEmpty());
FloatPoint center =
floatPointForCenterCoordinate(m_centerX, m_centerY, boundingBox.size());
float radiusX =
@@ -155,7 +155,7 @@ void BasicShapeEllipse::path(Path& path, const FloatRect& boundingBox) {
PassRefPtr<BasicShape> BasicShapeEllipse::blend(const BasicShape* other,
double progress) const {
- ASSERT(type() == other->type());
+ DCHECK_EQ(type(), other->type());
const BasicShapeEllipse* o = toBasicShapeEllipse(other);
RefPtr<BasicShapeEllipse> result = BasicShapeEllipse::create();
@@ -178,8 +178,8 @@ PassRefPtr<BasicShape> BasicShapeEllipse::blend(const BasicShape* other,
}
void BasicShapePolygon::path(Path& path, const FloatRect& boundingBox) {
- ASSERT(path.isEmpty());
- ASSERT(!(m_values.size() % 2));
+ DCHECK(path.isEmpty());
+ DCHECK(!(m_values.size() % 2));
size_t length = m_values.size();
if (!length)
@@ -202,11 +202,12 @@ void BasicShapePolygon::path(Path& path, const FloatRect& boundingBox) {
PassRefPtr<BasicShape> BasicShapePolygon::blend(const BasicShape* other,
double progress) const {
- ASSERT(other && isSameType(*other));
+ DCHECK(other);
+ DCHECK(isSameType(*other));
const BasicShapePolygon* o = toBasicShapePolygon(other);
- ASSERT(m_values.size() == o->values().size());
- ASSERT(!(m_values.size() % 2));
+ DCHECK_EQ(m_values.size(), o->values().size());
+ DCHECK(!(m_values.size() % 2));
size_t length = m_values.size();
RefPtr<BasicShapePolygon> result = BasicShapePolygon::create();
@@ -240,7 +241,7 @@ static FloatSize floatSizeForLengthSize(const LengthSize& lengthSize,
}
void BasicShapeInset::path(Path& path, const FloatRect& boundingBox) {
- ASSERT(path.isEmpty());
+ DCHECK(path.isEmpty());
float left = floatValueForLength(m_left, boundingBox.width());
float top = floatValueForLength(m_top, boundingBox.height());
FloatRect rect(
@@ -272,7 +273,8 @@ static inline LengthSize blendLengthSize(const LengthSize& to,
PassRefPtr<BasicShape> BasicShapeInset::blend(const BasicShape* other,
double progress) const {
- ASSERT(other && isSameType(*other));
+ DCHECK(other);
+ DCHECK(isSameType(*other));
const BasicShapeInset& otherInset = toBasicShapeInset(*other);
RefPtr<BasicShapeInset> result = BasicShapeInset::create();
« no previous file with comments | « AUTHORS ('k') | third_party/WebKit/Source/core/style/BorderEdge.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698