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

Unified Diff: third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp

Issue 2748103015: Replace ASSERT with DCHECK in core/layout/<sub dirs> (Closed)
Patch Set: Rebase with latest Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp
diff --git a/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp b/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp
index 400657520327f84a0842944d872b1ac077ec44af..dda1321fcf03a065e3b0ddaa2f41f6eeed050440 100644
--- a/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp
+++ b/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp
@@ -132,8 +132,8 @@ LayoutRect LayoutSVGInlineText::linesBoundingBox() const {
}
bool LayoutSVGInlineText::characterStartsNewTextChunk(int position) const {
- ASSERT(position >= 0);
- ASSERT(position < static_cast<int>(textLength()));
+ DCHECK_GE(position, 0);
+ DCHECK_LT(position, static_cast<int>(textLength()));
// Each <textPath> element starts a new text chunk, regardless of any x/y
// values.
@@ -153,7 +153,7 @@ PositionWithAffinity LayoutSVGInlineText::positionForPoint(
if (!hasTextBoxes() || !textLength())
return createPositionWithAffinity(0);
- ASSERT(m_scalingFactor);
+ DCHECK(m_scalingFactor);
const SimpleFontData* fontData = m_scaledFont.primaryFont();
DCHECK(fontData);
@@ -161,7 +161,7 @@ PositionWithAffinity LayoutSVGInlineText::positionForPoint(
fontData ? fontData->getFontMetrics().floatAscent() / m_scalingFactor : 0;
LayoutBlock* containingBlock = this->containingBlock();
- ASSERT(containingBlock);
+ DCHECK(containingBlock);
// Map local point to absolute point, as the character origins stored in the
// text fragments use absolute coordinates.
@@ -243,7 +243,7 @@ TextRun constructTextRun(LayoutSVGInlineText& text,
// Propagate the maximum length of the characters buffer to the TextRun, even
// when we're only processing a substring.
run.setCharactersLength(text.textLength() - position);
- ASSERT(run.charactersLength() >= run.length());
+ DCHECK_GE(run.charactersLength(), run.length());
return run;
}

Powered by Google App Engine
This is Rietveld 408576698