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

Side by Side Diff: third_party/WebKit/Source/platform/fonts/Font.cpp

Issue 2807913002: Replace ASSERT, ASSERT_NOT_REACHED, and RELEASE_ASSERT in platform/fonts (Closed)
Patch Set: Replace ASSERT, ASSERT_NOT_REACHED, and RELEASE_ASSERT in platform/fonts Created 3 years, 8 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved. 6 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 const PaintFlags& flags) const { 152 const PaintFlags& flags) const {
153 // Don't draw anything while we are using custom fonts that are in the process 153 // Don't draw anything while we are using custom fonts that are in the process
154 // of loading, except if the 'force' argument is set to true (in which case it 154 // of loading, except if the 'force' argument is set to true (in which case it
155 // will use a fallback font). 155 // will use a fallback font).
156 if (shouldSkipDrawing() && 156 if (shouldSkipDrawing() &&
157 customFontNotReadyAction == DoNotPaintIfFontNotReady) 157 customFontNotReadyAction == DoNotPaintIfFontNotReady)
158 return false; 158 return false;
159 159
160 // sub-run painting is not supported for Bidi text. 160 // sub-run painting is not supported for Bidi text.
161 const TextRun& run = runInfo.run; 161 const TextRun& run = runInfo.run;
162 ASSERT((runInfo.from == 0) && (runInfo.to == run.length())); 162 DCHECK((runInfo.from == 0) && (runInfo.to == run.length()));
tkent 2017/04/09 23:13:23 Split this into two DCHECK_EQs
Hwanseung Lee 2017/04/11 22:25:09 Done.
163 BidiResolver<TextRunIterator, BidiCharacterRun> bidiResolver; 163 BidiResolver<TextRunIterator, BidiCharacterRun> bidiResolver;
164 bidiResolver.setStatus( 164 bidiResolver.setStatus(
165 BidiStatus(run.direction(), run.directionalOverride())); 165 BidiStatus(run.direction(), run.directionalOverride()));
166 bidiResolver.setPositionIgnoringNestedIsolates(TextRunIterator(&run, 0)); 166 bidiResolver.setPositionIgnoringNestedIsolates(TextRunIterator(&run, 0));
167 167
168 // FIXME: This ownership should be reversed. We should pass BidiRunList 168 // FIXME: This ownership should be reversed. We should pass BidiRunList
169 // to BidiResolver in createBidiRunsForLine. 169 // to BidiResolver in createBidiRunsForLine.
170 BidiRunList<BidiCharacterRun>& bidiRuns = bidiResolver.runs(); 170 BidiRunList<BidiCharacterRun>& bidiRuns = bidiResolver.runs();
171 bidiResolver.createBidiRunsForLine(TextRunIterator(&run, run.length())); 171 bidiResolver.createBidiRunsForLine(TextRunIterator(&run, run.length()));
172 if (!bidiRuns.runCount()) 172 if (!bidiRuns.runCount())
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 415
416 bool Font::loadingCustomFonts() const { 416 bool Font::loadingCustomFonts() const {
417 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts(); 417 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts();
418 } 418 }
419 419
420 bool Font::isFallbackValid() const { 420 bool Font::isFallbackValid() const {
421 return !m_fontFallbackList || m_fontFallbackList->isValid(); 421 return !m_fontFallbackList || m_fontFallbackList->isValid();
422 } 422 }
423 423
424 } // namespace blink 424 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698