Remove floating objects from descendants of subtree roots

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 2163 matching lines @@
   // instance, when descendants of the moving child is floating,
   // removeChildNode() does not clear them. In such cases, at this
   // point, FloatingObjects may contain old or even deleted objects.
   // Dealing this in markAllDescendantsWithFloatsForLayout() could
   // solve, but since that is likely to suffer the performance and
   // since the containing block of orthogonal writing mode roots
   // having floats is very rare, prefer to re-create
   // FloatingObjects.
   if (LayoutBlock* cb = root.containingBlock()) {
     if ((cb->normalChildNeedsLayout() || cb->selfNeedsLayout()) &&
-        cb->isLayoutBlockFlow())
-      toLayoutBlockFlow(cb)->removeFloatingObjects();
+        cb->isLayoutBlockFlow()) {
+      toLayoutBlockFlow(cb)->removeFloatingObjectsFromDescendants();
+    }
   }
 }
 
 static bool prepareOrthogonalWritingModeRootForLayout(LayoutObject& root) {
   DCHECK(root.isBox() && toLayoutBox(root).isOrthogonalWritingModeRoot());
   if (!root.needsLayout() || root.isOutOfFlowPositioned() ||
       root.isColumnSpanAll() ||
       !root.styleRef().logicalHeight().isIntrinsicOrAuto())
     return false;
 
@@ skipping 3064 matching lines @@
 void FrameView::setAnimationHost(
     std::unique_ptr<CompositorAnimationHost> host) {
   m_animationHost = std::move(host);
 }
 
 LayoutUnit FrameView::caretWidth() const {
   return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
 }
 
 }  // namespace blink