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

Unified Diff: third_party/WebKit/Source/core/layout/PaintContainmentTest.cpp

Issue 2770123003: Replace ASSERT with DCHECK in core/layout/ excluding subdirs (Closed)
Patch Set: Split some DCHECKs and add DCHECK_ops wherever possible 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/PaintContainmentTest.cpp
diff --git a/third_party/WebKit/Source/core/layout/PaintContainmentTest.cpp b/third_party/WebKit/Source/core/layout/PaintContainmentTest.cpp
index 6c4951be71fb0cb740aeb1a05b579dbd0a8c3db4..d73588c0b4e6a1340a1e7fe8651e051df0cff08d 100644
--- a/third_party/WebKit/Source/core/layout/PaintContainmentTest.cpp
+++ b/third_party/WebKit/Source/core/layout/PaintContainmentTest.cpp
@@ -26,7 +26,7 @@ static void checkIsClippingStackingContextAndContainer(
// TODO(leviw): Ideally, we wouldn't require a paint layer to handle the
// clipping and stacking performed by paint containment.
- ASSERT(obj.layer());
+ DCHECK(obj.layer());
PaintLayer* layer = obj.layer();
EXPECT_TRUE(layer->stackingNode() &&
layer->stackingNode()->isStackingContext());
@@ -35,9 +35,10 @@ static void checkIsClippingStackingContextAndContainer(
TEST_F(PaintContainmentTest, BlockPaintContainment) {
setBodyInnerHTML("<div id='div' style='contain: paint'></div>");
Element* div = document().getElementById(AtomicString("div"));
- ASSERT(div);
+ DCHECK(div);
LayoutObject* obj = div->layoutObject();
- ASSERT(obj && obj->isLayoutBlock());
+ DCHECK(obj);
+ DCHECK(obj->isLayoutBlock());
LayoutBlock& block = toLayoutBlock(*obj);
EXPECT_TRUE(block.createsNewFormattingContext());
EXPECT_FALSE(block.canBeScrolledAndHasScrollableArea());
@@ -48,10 +49,11 @@ TEST_F(PaintContainmentTest, InlinePaintContainment) {
setBodyInnerHTML(
"<div><span id='test' style='contain: paint'>Foo</span></div>");
Element* span = document().getElementById(AtomicString("test"));
- ASSERT(span);
+ DCHECK(span);
// The inline should have been coerced into a block in StyleAdjuster.
LayoutObject* obj = span->layoutObject();
- ASSERT(obj && obj->isLayoutBlock());
+ DCHECK(obj);
+ DCHECK(obj->isLayoutBlock());
LayoutBlock& layoutBlock = toLayoutBlock(*obj);
checkIsClippingStackingContextAndContainer(layoutBlock);
}

Powered by Google App Engine
This is Rietveld 408576698