Add out-of-flow objects under the inline in a continuation chain, when possible.

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
  *               All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 553 matching lines @@
   if (beforeChild) {
     beforeChildParent = toLayoutBoxModelObject(beforeChild->parent());
   } else {
     LayoutBoxModelObject* cont = nextContinuation(flow);
     if (cont)
       beforeChildParent = cont;
     else
       beforeChildParent = flow;
   }
 
-  // TODO(rhogan): Should we treat out-of-flows and floats as through they're
-  // inline below?
-  if (newChild->isFloatingOrOutOfFlowPositioned())
-    return beforeChildParent->addChildIgnoringContinuation(newChild,
-                                                           beforeChild);
-
-  // A table part will be wrapped by an inline anonymous table when it is added
-  // to the layout tree, so treat it as inline when deciding where to add it.
-  bool childInline = newChild->isInline() || newChild->isTablePart();
-  bool bcpInline = beforeChildParent->isInline();
-  bool flowInline = flow->isInline();
-
+  // If the two candidates are the same, no further checking is necessary.
   if (flow == beforeChildParent)
     return flow->addChildIgnoringContinuation(newChild, beforeChild);
 
+  // A table part will be wrapped by an inline anonymous table when it is added
+  // to the layout tree, so treat it as inline when deciding where to add
+  // it. Floating and out-of-flow-positioned objects can also live under
+  // inlines, and since this about adding a child to an inline parent, we
+  // should not put them into a block continuation.
+  bool addInsideInline = newChild->isInline() || newChild->isTablePart() ||
+                         newChild->isFloatingOrOutOfFlowPositioned();
+
   // The goal here is to match up if we can, so that we can coalesce and create
   // the minimal # of continuations needed for the inline.
-  if (childInline == bcpInline || (beforeChild && beforeChild->isInline()))
+  if (addInsideInline == beforeChildParent->isInline() ||
+      (beforeChild && beforeChild->isInline())) {
     return beforeChildParent->addChildIgnoringContinuation(newChild,
                                                            beforeChild);
-  if (flowInline == childInline) {
+  }
+  if (addInsideInline == flow->isInline()) {
     // Just treat like an append.
-    return flow->addChildIgnoringContinuation(newChild, 0);
+    return flow->addChildIgnoringContinuation(newChild);
   }
   return beforeChildParent->addChildIgnoringContinuation(newChild, beforeChild);
 }
 
 void LayoutInline::paint(const PaintInfo& paintInfo,
                          const LayoutPoint& paintOffset) const {
   InlinePainter(*this).paint(paintInfo, paintOffset);
 }
 
 template <typename GeneratorContext>
@@ skipping 911 matching lines @@
     paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason);
 }
 
 // TODO(lunalu): Not to just dump 0, 0 as the x and y here
 LayoutRect LayoutInline::debugRect() const {
   IntRect linesBox = enclosingIntRect(linesBoundingBox());
   return LayoutRect(IntRect(0, 0, linesBox.width(), linesBox.height()));
 }
 
 }  // namespace blink