Index: third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp |
diff --git a/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp b/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp |
index 46b10154b34393a06765d14b5c2a1e12508242a0..ddca66314ed6a054e8263c1da814af41fd022544 100644 |
--- a/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp |
@@ -86,7 +86,7 @@ String pointModeName(SkCanvas::PointMode mode) { |
case SkCanvas::kPolygon_PointMode: |
return "Polygon"; |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return "?"; |
}; |
} |
@@ -130,7 +130,7 @@ String rrectTypeName(SkRRect::Type type) { |
case SkRRect::kComplex_Type: |
return "Complex"; |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return "?"; |
}; |
} |
@@ -146,7 +146,7 @@ String radiusName(SkRRect::Corner corner) { |
case SkRRect::kLowerLeft_Corner: |
return "lowerLeftRadius"; |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return "?"; |
} |
} |
@@ -175,7 +175,7 @@ String fillTypeName(SkPath::FillType type) { |
case SkPath::kInverseEvenOdd_FillType: |
return "InverseEvenOdd"; |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return "?"; |
}; |
} |
@@ -189,7 +189,7 @@ String convexityName(SkPath::Convexity convexity) { |
case SkPath::kConcave_Convexity: |
return "Concave"; |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return "?"; |
}; |
} |
@@ -211,7 +211,7 @@ VerbParams segmentParams(SkPath::Verb verb) { |
case SkPath::kDone_Verb: |
return VerbParams("Done", 0, 0); |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return VerbParams("?", 0, 0); |
}; |
} |
@@ -229,8 +229,8 @@ std::unique_ptr<JSONObject> objectForSkPath(const SkPath& path) { |
VerbParams verbParams = segmentParams(verb); |
std::unique_ptr<JSONObject> pathPointItem = JSONObject::create(); |
pathPointItem->setString("verb", verbParams.name); |
- ASSERT(verbParams.pointCount + verbParams.pointOffset <= |
- WTF_ARRAY_LENGTH(points)); |
+ DCHECK_LE(verbParams.pointCount + verbParams.pointOffset, |
+ WTF_ARRAY_LENGTH(points)); |
pathPointItem->setArray("points", |
arrayForSkPoints(verbParams.pointCount, |
points + verbParams.pointOffset)); |
@@ -258,7 +258,7 @@ String colorTypeName(SkColorType colorType) { |
case kN32_SkColorType: |
return "ARGB8888"; |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return "?"; |
}; |
} |
@@ -366,7 +366,7 @@ String filterQualityName(SkFilterQuality filterQuality) { |
case kHigh_SkFilterQuality: |
return "High"; |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return "?"; |
}; |
} |
@@ -380,7 +380,7 @@ String textAlignName(SkPaint::Align align) { |
case SkPaint::kRight_Align: |
return "Right"; |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return "?"; |
}; |
} |
@@ -394,7 +394,7 @@ String strokeCapName(SkPaint::Cap cap) { |
case SkPaint::kSquare_Cap: |
return "Square"; |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return "?"; |
}; |
} |
@@ -408,7 +408,7 @@ String strokeJoinName(SkPaint::Join join) { |
case SkPaint::kBevel_Join: |
return "Bevel"; |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return "?"; |
}; |
} |
@@ -422,7 +422,7 @@ String styleName(SkPaint::Style style) { |
case SkPaint::kStrokeAndFill_Style: |
return "StrokeAndFill"; |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return "?"; |
}; |
} |
@@ -438,7 +438,7 @@ String textEncodingName(SkPaint::TextEncoding encoding) { |
case SkPaint::kGlyphID_TextEncoding: |
return "GlyphID"; |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return "?"; |
}; |
} |
@@ -454,7 +454,7 @@ String hintingName(SkPaint::Hinting hinting) { |
case SkPaint::kFull_Hinting: |
return "Full"; |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return "?"; |
}; |
} |
@@ -543,7 +543,7 @@ String stringForText(const void* text, |
reinterpret_cast<const char*>(textData), byteLength * 2); |
} |
default: |
- ASSERT_NOT_REACHED(); |
+ NOTREACHED(); |
return "?"; |
} |
} |