Add a choice not to crash when unexpected dirty layout is encountered

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 103 matching lines @@
 #include "platform/scroll/ScrollAnimatorBase.h"
 #include "platform/scroll/ScrollbarTheme.h"
 #include "platform/text/TextStream.h"
 #include "public/platform/WebDisplayItemList.h"
 #include "public/platform/WebFrameScheduler.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/StdLibExtras.h"
 #include <memory>
 
+// Change the the following line to "#if 0" to disable crash on unexpected
+// dirty layout (crbug.com/590856) when dcheck is off.
+#if 1
+#define CHECK_FOR_DIRTY_LAYOUT CHECK
+#else
+#define CHECK_FOR_DIRTY_LAYOUT(arg) \
+do { \
+    if (!(arg)) { \
+        NOTREACHED(); \
+        return false; \
+    } \
+} while (false)
+#endif
+
 namespace blink {
 
 using namespace HTMLNames;
 
 // The maximum number of updateWidgets iterations that should be done before returning.
 static const unsigned maxUpdateWidgetsIterations = 2;
 static const double resourcePriorityUpdateDelayAfterScroll = 0.250;
 
 static bool s_initialTrackAllPaintInvalidations = false;
 
@@ skipping 1704 matching lines @@
             || root->isOutOfFlowPositioned()
             || root->isColumnSpanAll()
             || !root->styleRef().logicalHeight().isIntrinsicOrAuto()) {
             continue;
         }
         LayoutState layoutState(*root);
         root->layout();
     }
 }
 
-void FrameView::checkLayoutInvalidationIsAllowed() const
+bool FrameView::checkLayoutInvalidationIsAllowed() const
 {
     if (m_allowsLayoutInvalidationAfterLayoutClean)
-        return;
-
-    if (!m_frame->document())
-        return;
+        return true;
 
     // If we are updating all lifecycle phases beyond LayoutClean, we don't expect dirty layout after LayoutClean.
-    CHECK(lifecycle().state() < DocumentLifecycle::LayoutClean);
+    CHECK_FOR_DIRTY_LAYOUT(lifecycle().state() < DocumentLifecycle::LayoutClean);
+
+    return true;
 }
 
 void FrameView::scheduleRelayout()
 {
     DCHECK(m_frame->view() == this);
 
     if (!m_layoutSchedulingEnabled)
         return;
-
-    checkLayoutInvalidationIsAllowed();
-
+    // TODO(crbug.com/590856): It's still broken when we choose not to crash when the check fails.
+    if (!checkLayoutInvalidationIsAllowed())
+        return;
     if (!needsLayout())
         return;
     if (!m_frame->document()->shouldScheduleLayout())
         return;
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "InvalidateLayout", TRACE_EVENT_SCOPE_THREAD, "data", InspectorInvalidateLayoutEvent::data(m_frame.get()));
 
     clearLayoutSubtreeRootsAndMarkContainingBlocks();
 
     if (m_hasPendingLayout)
         return;
     m_hasPendingLayout = true;
 
     if (!shouldThrottleRendering())
         page()->animator().scheduleVisualUpdate(m_frame.get());
 }
 
 void FrameView::scheduleRelayoutOfSubtree(LayoutObject* relayoutRoot)
 {
     DCHECK(m_frame->view() == this);
 
-    checkLayoutInvalidationIsAllowed();
+    // TODO(crbug.com/590856): It's still broken when we choose not to crash when the check fails.
+    if (!checkLayoutInvalidationIsAllowed())
+        return;
 
     // FIXME: Should this call shouldScheduleLayout instead?
     if (!m_frame->document()->isActive())
         return;
 
     LayoutView* layoutView = this->layoutView();
     if (layoutView && layoutView->needsLayout()) {
         if (relayoutRoot)
             relayoutRoot->markContainerChainForLayout(false);
         return;
@@ skipping 31 matching lines @@
     // This can return true in cases where the document does not have a body yet.
     // Document::shouldScheduleLayout takes care of preventing us from scheduling
     // layout in that case.
 
     LayoutViewItem layoutViewItem = this->layoutViewItem();
     return layoutPending()
         || (!layoutViewItem.isNull() && layoutViewItem.needsLayout())
         || isSubtreeLayout();
 }
 
-NOINLINE void FrameView::checkDoesNotNeedLayout() const
+NOINLINE bool FrameView::checkDoesNotNeedLayout() const
 {
-    CHECK(!layoutPending());
-    CHECK(layoutViewItem().isNull() || !layoutViewItem().needsLayout());
-    CHECK(!isSubtreeLayout());
+    CHECK_FOR_DIRTY_LAYOUT(!layoutPending());
+    CHECK_FOR_DIRTY_LAYOUT(layoutViewItem().isNull() || !layoutViewItem().needsLayout());
+    CHECK_FOR_DIRTY_LAYOUT(!isSubtreeLayout());
+    return true;
 }
 
 void FrameView::setNeedsLayout()
 {
-    checkLayoutInvalidationIsAllowed();
-
     LayoutViewItem layoutViewItem = this->layoutViewItem();
-    if (!layoutViewItem.isNull())
-        layoutViewItem.setNeedsLayout(LayoutInvalidationReason::Unknown);
+    if (layoutViewItem.isNull())
+        return;
+    // TODO(crbug.com/590856): It's still broken if we choose not to crash when the check fails.
+    if (!checkLayoutInvalidationIsAllowed())
+        return;
+    layoutViewItem.setNeedsLayout(LayoutInvalidationReason::Unknown);
 }
 
 bool FrameView::isTransparent() const
 {
     return m_isTransparent;
 }
 
 void FrameView::setTransparent(bool isTransparent)
 {
     m_isTransparent = isTransparent;
@@ skipping 2343 matching lines @@
 }
 
 bool FrameView::canThrottleRendering() const
 {
     if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())
         return false;
     return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrottling);
 }
 
 } // namespace blink