Merge 92692

Source/WebCore/rendering/RenderBlockLineLayout.cpp

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All right reserved.
  * Copyright (C) 2010 Google 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 1190 matching lines @@
                     o->containingBlock()->insertPositionedObject(box);
                 else if (o->isFloating())
                     floats.append(FloatWithRect(box));
                 else if (layoutState.isFullLayout() || o->needsLayout()) {
                     // Replaced elements
                     toRenderBox(o)->dirtyLineBoxes(layoutState.isFullLayout());
                     o->layoutIfNeeded();
                 }
             } else if (o->isText() || (o->isRenderInline() && !walker.atEndOfInline())) {
                 if (!o->isText())
-                    toRenderInline(o)->updateAlwaysCreateLineBoxes();
+                    toRenderInline(o)->updateAlwaysCreateLineBoxes(layoutState.isFullLayout());
                 if (layoutState.isFullLayout() || o->selfNeedsLayout())
                     dirtyLineBoxesForRenderer(o, layoutState.isFullLayout());
                 o->setNeedsLayout(false);
             }
         }
 
         layoutRunsAndFloats(layoutState, hasInlineChild, floats);
     }
 
     // Expand the last line to accommodate Ruby and emphasis marks.
@@ skipping 1307 matching lines @@
         }
     }
 
     setLogicalHeight(logicalHeight() + paginationStrut);
     width.updateAvailableWidth();
 
     return true;
 }
 
 }