Chromium Code Reviews| Index: third_party/WebKit/Source/platform/fonts/ScriptRunIteratorTest.cpp |
| diff --git a/third_party/WebKit/Source/platform/fonts/ScriptRunIteratorTest.cpp b/third_party/WebKit/Source/platform/fonts/ScriptRunIteratorTest.cpp |
| index 5eaa494892f92766a91ad7f407b4e7be33d85cc6..76230b48ddaeb91fcc23b31526fb1725a7376370 100644 |
| --- a/third_party/WebKit/Source/platform/fonts/ScriptRunIteratorTest.cpp |
| +++ b/third_party/WebKit/Source/platform/fonts/ScriptRunIteratorTest.cpp |
| @@ -37,8 +37,8 @@ class MockScriptData : public ScriptData { |
| } |
| void getScripts(UChar32 ch, Vector<UScriptCode>& dst) const override { |
| - ASSERT(ch >= kMockCharMin); |
| - ASSERT(ch < kMockCharLimit); |
| + DCHECK_GE(ch, kMockCharMin); |
| + DCHECK_LT(ch, kMockCharLimit); |
| int code = ch - kMockCharMin; |
| dst.clear(); |
| @@ -87,7 +87,7 @@ class MockScriptData : public ScriptData { |
| } |
| PairedBracketType getPairedBracketType(UChar32 ch) const override { |
| - ASSERT(ch >= kMockCharMin && ch < kMockCharLimit); |
| + DCHECK(ch >= kMockCharMin && ch < kMockCharLimit); |
|
tkent
2017/04/09 23:13:23
Split this into two DCHECKs
Hwanseung Lee
2017/04/11 22:25:09
Done.
|
| int code = ch - kMockCharMin; |
| if ((code & kCodeBracketBit) == 0) { |
| return PairedBracketType::BracketTypeNone; |
| @@ -119,56 +119,56 @@ class MockScriptData : public ScriptData { |
| if (inSet) { |
| switch (c) { |
| case '(': |
| - ASSERT(seen == 0); |
| + DCHECK_EQ(seen, 0); |
| seen |= kSawBracket; |
| code |= kCodeBracketBit; |
| break; |
| case '[': |
| - ASSERT(seen == 0); |
| + DCHECK_EQ(seen, 0); |
| seen |= kSawBracket; |
| code |= kCodeBracketBit | kCodeSquareBracketBit; |
| break; |
| case ')': |
| - ASSERT(seen == 0); |
| + DCHECK_EQ(seen, 0); |
| seen |= kSawBracket; |
| code |= kCodeBracketBit | kCodeBracketCloseBit; |
| break; |
| case ']': |
| - ASSERT(seen == 0); |
| + DCHECK_EQ(seen, 0); |
| seen |= kSawBracket; |
| code |= |
| kCodeBracketBit | kCodeSquareBracketBit | kCodeBracketCloseBit; |
| break; |
| case 'i': |
| - ASSERT(seen == 0); // brackets can't be inherited |
| + DCHECK_EQ(seen, 0); // brackets can't be inherited |
| seen |= kSawSpecial; |
| code |= kCodeSpecialInherited; |
| break; |
| case 'c': |
| - ASSERT((seen & ~kSawBracket) == 0); |
| + DCHECK_EQ((seen & ~kSawBracket), 0); |
| seen |= kSawSpecial; |
| code |= kCodeSpecialCommon; |
| break; |
| case 'l': |
| - ASSERT((seen & kSawLatin) == 0); |
| - ASSERT(currentShift < 3); |
| + DCHECK_EQ((seen & kSawLatin), 0); |
| + DCHECK_LT(currentShift, 3); |
| seen |= kSawLatin; |
| list |= kLatin << (2 * currentShift++); |
| break; |
| case 'h': |
| - ASSERT((seen & kSawHan) == 0); |
| - ASSERT(currentShift < 3); |
| + DCHECK_EQ((seen & kSawHan), 0); |
| + DCHECK_LT(currentShift, 3); |
| seen |= kSawHan; |
| list |= kHan << (2 * currentShift++); |
| break; |
| case 'g': |
| - ASSERT((seen & kSawGreek) == 0); |
| - ASSERT(currentShift < 3); |
| + DCHECK_EQ((seen & kSawGreek), 0); |
| + DCHECK_LT(currentShift, 3); |
| seen |= kSawGreek; |
| list |= kGreek << (2 * currentShift++); |
| break; |
| case '>': |
| - ASSERT(seen != 0); |
| + DCHECK_NE(seen, 0); |
| code |= TableLookup(list); |
| result.append(static_cast<UChar>(kMockCharMin + code)); |
| inSet = false; |
| @@ -333,7 +333,7 @@ TEST_F(ScriptRunIteratorTest, Empty) { |
| ScriptRunIterator scriptRunIterator(empty.characters16(), empty.length()); |
| unsigned limit = 0; |
| UScriptCode code = USCRIPT_INVALID_CODE; |
| - ASSERT(!scriptRunIterator.consume(limit, code)); |
| + DCHECK(!scriptRunIterator.consume(limit, code)); |
| ASSERT_EQ(limit, 0u); |
| ASSERT_EQ(code, USCRIPT_INVALID_CODE); |
| } |