Fix SubtreeLayoutScope not to schedule relayout

third_party/WebKit/Source/core/layout/LayoutObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 738 matching lines @@
     // this object breaks across columns). Spanners may also have been added or removed since the
     // previous layout pass, which is just another way of affecting the column heights (and the
     // number of rows). Instead of identifying cases where it's safe to allow relayout roots, just
     // disallow them inside multicol.
     if (object->isInsideFlowThread())
         return false;
 
     return true;
 }
 
+void LayoutObject::markContainerChainForLayout(bool scheduleRelayout)
+{
+    markContainerChainForLayout(scheduleRelayout, nullptr);
+}
+
+void LayoutObject::markContainerChainForLayout(SubtreeLayoutScope* layouter)
+{
+    // When we have a layouter, it means that we're in layout and we're marking
+    // a descendant as needing layout with the intention of visiting it during
+    // this layout. We shouldn't be scheduling it to be laid out later.
+    markContainerChainForLayout(!layouter, layouter);
+}
+
 void LayoutObject::markContainerChainForLayout(bool scheduleRelayout, SubtreeLayoutScope* layouter)
 {
     ASSERT(!isSetNeedsLayoutForbidden());
     ASSERT(!layouter || this != layouter->root());
+    ASSERT(!scheduleRelayout || !layouter);
 
     LayoutObject* object = container();
     LayoutObject* last = this;
 
     bool simplifiedNormalFlowLayout = needsSimplifiedNormalFlowLayout() && !selfNeedsLayout() && !normalChildNeedsLayout();
 
     while (object) {
         if (object->selfNeedsLayout())
             return;
 
@@ skipping 2742 matching lines @@
         const blink::LayoutObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
     } else {
         fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
     }
 }
 
 #endif