| Index: third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp b/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp
|
| index 5b73defda1de5d815c8770d73f1eb73bccfb7518..89cb90a38f7a8dbf7942d291036f8dc52b4c3c5f 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp
|
| +++ b/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp
|
| @@ -41,7 +41,7 @@ CSSToLengthConversionData::FontSizes::FontSizes(float em,
|
| const Font* font)
|
| : m_em(em), m_rem(rem), m_font(font) {
|
| // FIXME: Improve RAII of StyleResolverState to use const Font&.
|
| - ASSERT(m_font);
|
| + DCHECK(m_font);
|
| }
|
|
|
| CSSToLengthConversionData::FontSizes::FontSizes(const ComputedStyle* style,
|
| @@ -51,7 +51,7 @@ CSSToLengthConversionData::FontSizes::FontSizes(const ComputedStyle* style,
|
| &style->font()) {}
|
|
|
| float CSSToLengthConversionData::FontSizes::ex() const {
|
| - ASSERT(m_font);
|
| + DCHECK(m_font);
|
| const SimpleFontData* fontData = m_font->primaryFont();
|
| DCHECK(fontData);
|
|
|
| @@ -176,7 +176,7 @@ double CSSToLengthConversionData::zoomedComputedPixels(
|
| return value * chFontSize();
|
|
|
| default:
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| return 0;
|
| }
|
| }
|
|
|