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

Unified Diff: third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp

Issue 2640163004: Replace ENABLE(ASSERT) with DCHECK_IS_ON(). (Closed)
Patch Set: Created 3 years, 11 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/compositing/PaintLayerCompositor.cpp
diff --git a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
index 0938032a6e575dd7c782e5cc1f0dd80e253342ae..d649037a7cd217fa4e122df63a8bcfcb876a4738 100644
--- a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp
@@ -234,7 +234,7 @@ void PaintLayerCompositor::updateIfNeededRecursiveInternal() {
scrollableArea->updateCompositorScrollAnimations();
}
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
ASSERT(lifecycle().state() == DocumentLifecycle::CompositingClean);
assertNoUnresolvedDirtyBits();
for (Frame* child = m_layoutView.frameView()->frame().tree().firstChild();
@@ -271,7 +271,7 @@ void PaintLayerCompositor::didLayout() {
rootLayer()->setNeedsCompositingInputsUpdate();
}
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
void PaintLayerCompositor::assertNoUnresolvedDirtyBits() {
ASSERT(m_pendingUpdateType == CompositingUpdateNone);
@@ -325,7 +325,7 @@ void PaintLayerCompositor::updateWithoutAcceleratedCompositing(
if (updateType >= CompositingUpdateAfterCompositingInputChange)
CompositingInputsUpdater(rootLayer()).update();
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
CompositingInputsUpdater::assertNeedsCompositingInputsUpdateBitsCleared(
rootLayer());
#endif
@@ -366,7 +366,7 @@ void PaintLayerCompositor::updateIfNeeded() {
if (updateType >= CompositingUpdateAfterCompositingInputChange) {
CompositingInputsUpdater(updateRoot).update();
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
// FIXME: Move this check to the end of the compositing update.
CompositingInputsUpdater::assertNeedsCompositingInputsUpdateBitsCleared(
updateRoot);
@@ -423,7 +423,7 @@ void PaintLayerCompositor::updateIfNeeded() {
if (updater.needsRebuildTree())
updateType = std::max(updateType, CompositingUpdateRebuildTree);
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
// FIXME: Move this check to the end of the compositing update.
GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(
*updateRoot);
@@ -1003,7 +1003,7 @@ static void setTracksRasterInvalidationsRecursive(
void PaintLayerCompositor::setTracksRasterInvalidations(
bool tracksRasterInvalidations) {
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
FrameView* view = m_layoutView.frameView();
ASSERT(lifecycle().state() == DocumentLifecycle::PaintClean ||
(view && view->shouldThrottleRendering()));

Powered by Google App Engine
This is Rietveld 408576698