| Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| index dd686597bdff2afb4b06c8140f040842bc7f7919..ebcf49f4e31f7588c7beb1498a49db949245ee6a 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| @@ -460,7 +460,7 @@ ComputedStyle* ComputedStyle::addCachedPseudoStyle(
|
| if (!pseudo)
|
| return 0;
|
|
|
| - ASSERT(pseudo->styleType() > PseudoIdNone);
|
| + DCHECK_GT(pseudo->styleType(), PseudoIdNone);
|
|
|
| ComputedStyle* result = pseudo.get();
|
|
|
| @@ -1662,11 +1662,11 @@ const AtomicString& ComputedStyle::textEmphasisMarkString() const {
|
| : openSesameString;
|
| }
|
| case TextEmphasisMarkAuto:
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| return nullAtom;
|
| }
|
|
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| return nullAtom;
|
| }
|
|
|
| @@ -1969,7 +1969,7 @@ void ComputedStyle::setTextAutosizingMultiplier(float multiplier) {
|
|
|
| float size = specifiedFontSize();
|
|
|
| - ASSERT(std::isfinite(size));
|
| + DCHECK(std::isfinite(size));
|
| if (!std::isfinite(size) || size < 0)
|
| size = 0;
|
| else
|
| @@ -2163,7 +2163,7 @@ Color ComputedStyle::colorIncludingFallback(int colorProperty,
|
| result = decorationColorIncludingFallback(visitedLink);
|
| break;
|
| default:
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| break;
|
| }
|
|
|
| @@ -2212,7 +2212,7 @@ const BorderValue& ComputedStyle::borderBefore() const {
|
| case WritingMode::kVerticalRl:
|
| return borderRight();
|
| }
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| return borderTop();
|
| }
|
|
|
| @@ -2225,7 +2225,7 @@ const BorderValue& ComputedStyle::borderAfter() const {
|
| case WritingMode::kVerticalRl:
|
| return borderLeft();
|
| }
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| return borderBottom();
|
| }
|
|
|
| @@ -2250,7 +2250,7 @@ float ComputedStyle::borderBeforeWidth() const {
|
| case WritingMode::kVerticalRl:
|
| return borderRightWidth();
|
| }
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| return borderTopWidth();
|
| }
|
|
|
| @@ -2263,7 +2263,7 @@ float ComputedStyle::borderAfterWidth() const {
|
| case WritingMode::kVerticalRl:
|
| return borderLeftWidth();
|
| }
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| return borderBottomWidth();
|
| }
|
|
|
|
|