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

Unified Diff: third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.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/shapes/ShapeOutsideInfo.cpp
diff --git a/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp b/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp
index 0ab44e9ec15e990faace64d2e6f39f1ce3f41d09..3a7975a2f7652fc931556dab897d83ed348fc109 100644
--- a/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp
+++ b/third_party/WebKit/Source/core/layout/shapes/ShapeOutsideInfo.cpp
@@ -97,7 +97,7 @@ static bool checkShapeImageOrigin(Document& document,
if (styleImage.isGeneratedImage())
return true;
- ASSERT(styleImage.cachedImage());
+ DCHECK(styleImage.cachedImage());
ImageResourceContent& imageResource = *(styleImage.cachedImage());
if (imageResource.isAccessAllowed(document.getSecurityOrigin()))
return true;
@@ -163,7 +163,7 @@ std::unique_ptr<Shape> ShapeOutsideInfo::createShapeForImage(
return Shape::createEmptyRasterShape(writingMode, margin);
}
- ASSERT(!styleImage->isPendingImage());
+ DCHECK(!styleImage->isPendingImage());
RefPtr<Image> image =
styleImage->image(m_layoutBox, flooredIntSize(imageSize),
m_layoutBox.style()->effectiveZoom());
@@ -179,7 +179,7 @@ const Shape& ShapeOutsideInfo::computedShape() const {
AutoReset<bool> isInComputingShape(&m_isComputingShape, true);
const ComputedStyle& style = *m_layoutBox.style();
- ASSERT(m_layoutBox.containingBlock());
+ DCHECK(m_layoutBox.containingBlock());
const ComputedStyle& containingBlockStyle =
*m_layoutBox.containingBlock()->style();
@@ -196,17 +196,17 @@ const Shape& ShapeOutsideInfo::computedShape() const {
maximumValue.toFloat());
float shapeImageThreshold = style.shapeImageThreshold();
- ASSERT(style.shapeOutside());
+ DCHECK(style.shapeOutside());
const ShapeValue& shapeValue = *style.shapeOutside();
switch (shapeValue.type()) {
case ShapeValue::Shape:
- ASSERT(shapeValue.shape());
+ DCHECK(shapeValue.shape());
m_shape = Shape::createShape(
shapeValue.shape(), m_referenceBoxLogicalSize, writingMode, margin);
break;
case ShapeValue::Image:
- ASSERT(shapeValue.isImageValid());
+ DCHECK(shapeValue.isImageValid());
m_shape = createShapeForImage(shapeValue.image(), shapeImageThreshold,
writingMode, margin);
break;
@@ -219,7 +219,7 @@ const Shape& ShapeOutsideInfo::computedShape() const {
}
}
- ASSERT(m_shape);
+ DCHECK(m_shape);
return *m_shape;
}
@@ -349,7 +349,7 @@ ShapeOutsideDeltas ShapeOutsideInfo::computeDeltasForContainingBlockLine(
const FloatingObject& floatingObject,
LayoutUnit lineTop,
LayoutUnit lineHeight) {
- ASSERT(lineHeight >= 0);
+ DCHECK_GE(lineHeight, 0);
LayoutUnit borderBoxTop = containingBlock.logicalTopForFloat(floatingObject) +
containingBlock.marginBeforeForChild(m_layoutBox);

Powered by Google App Engine
This is Rietveld 408576698