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

Unified Diff: Source/core/paint/BlockPainter.cpp

Issue 1219093002: Convert a RELEASE_ASSERT into an ASSERT (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Expectations added. Created 5 years, 5 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
« no previous file with comments | « LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/BlockPainter.cpp
diff --git a/Source/core/paint/BlockPainter.cpp b/Source/core/paint/BlockPainter.cpp
index 71faef3e1b742e970feb3d0272d0631882dcc58e..063137121ed707a7061a80678f5ff877bfa04c26 100644
--- a/Source/core/paint/BlockPainter.cpp
+++ b/Source/core/paint/BlockPainter.cpp
@@ -35,20 +35,20 @@ void BlockPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOff
PaintPhase originalPhase = localPaintInfo.phase;
// Check if we need to do anything at all.
- // FIXME: Could eliminate the isDocumentElement() check if we fix background painting so that the LayoutView
- // paints the root's background.
+ // TODO(schenney): Could eliminate the isDocumentElement() check if we fix background painting so
+ // that the LayoutView paints the root's background.
+ // TODO(schenney): Test this code path, as breaking changes have failed to show up in testing.
+ // crbug.com/509737
Node* blockNode = m_layoutBlock.node();
- RELEASE_ASSERT(blockNode || m_layoutBlock.isAnonymous());
+ ASSERT(blockNode || m_layoutBlock.isAnonymous());
if (blockNode) {
- if (m_layoutBlock.isDocumentElement()) {
+ if (!m_layoutBlock.isDocumentElement()) {
LayoutRect overflowBox = overflowRectForPaintRejection();
m_layoutBlock.flipForWritingMode(overflowBox);
overflowBox.moveBy(adjustedPaintOffset);
if (!overflowBox.intersects(LayoutRect(localPaintInfo.rect)))
return;
}
- } else {
- RELEASE_ASSERT(!m_layoutBlock.isDocumentElement());
}
// There are some cases where not all clipped visual overflow is accounted for.
« no previous file with comments | « LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698