Merge 85705

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 698 matching lines @@
         trailingSpaceRun->m_level = 0;
     } else {
         bidiRuns.moveRunToBeginning(trailingSpaceRun);
         trailingSpaceRun->m_level = 1;
     }
     return trailingSpaceRun;
 }
 
 void RenderBlock::appendFloatingObjectToLastLine(FloatingObject* floatingObject)
 {
-    // Ensure that the float touches the line.
-    if (RootInlineBox* previousLine = lastRootBox()->prevRootBox()) {
-        if (logicalBottomForFloat(floatingObject) < previousLine->blockLogicalHeight())
-            setLogicalHeightForFloat(floatingObject, previousLine->blockLogicalHeight() - logicalTopForFloat(floatingObject));
-    }
-
+    ASSERT(!floatingObject->m_originatingLine);
+    floatingObject->m_originatingLine = lastRootBox();
     lastRootBox()->appendFloat(floatingObject->renderer());
 }
 
 void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogicalTop, int& repaintLogicalBottom)
 {
     bool useRepaintBounds = false;
     
     m_overflow.clear();
         
     setLogicalHeight(borderBefore() + paddingBefore());
@@ skipping 299 matching lines @@
                         adjustLinePositionForPagination(line, delta);
                     }
                     if (delta) {
                         repaintLogicalTop = min(repaintLogicalTop, line->logicalTopVisualOverflow() + min(delta, 0));
                         repaintLogicalBottom = max(repaintLogicalBottom, line->logicalBottomVisualOverflow() + max(delta, 0));
                         line->adjustBlockDirectionPosition(delta);
                     }
                     if (Vector<RenderBox*>* cleanLineFloats = line->floatsPtr()) {
                         Vector<RenderBox*>::iterator end = cleanLineFloats->end();
                         for (Vector<RenderBox*>::iterator f = cleanLineFloats->begin(); f != end; ++f) {
-                            insertFloatingObject(*f);
+                            FloatingObject* floatingObject = insertFloatingObject(*f);
+                            ASSERT(!floatingObject->m_originatingLine);
+                            floatingObject->m_originatingLine = line;
                             setLogicalHeight(logicalTopForChild(*f) - marginBeforeForChild(*f) + delta);
                             positionNewFloats();
                         }
                     }
                 }
                 setLogicalHeight(lastRootBox()->blockLogicalHeight());
             } else {
                 // Delete all the remaining lines.
                 RootInlineBox* line = endLine;
                 RenderArena* arena = renderArena();
@@ skipping 182 matching lines @@
 
     numCleanFloats = 0;
     if (!floats.isEmpty()) {
         int savedLogicalHeight = logicalHeight();
         // Restore floats from clean lines.
         RootInlineBox* line = firstRootBox();
         while (line != curr) {
             if (Vector<RenderBox*>* cleanLineFloats = line->floatsPtr()) {
                 Vector<RenderBox*>::iterator end = cleanLineFloats->end();
                 for (Vector<RenderBox*>::iterator f = cleanLineFloats->begin(); f != end; ++f) {
-                    insertFloatingObject(*f);
+                    FloatingObject* floatingObject = insertFloatingObject(*f);
+                    ASSERT(!floatingObject->m_originatingLine);
+                    floatingObject->m_originatingLine = line;
                     setLogicalHeight(logicalTopForChild(*f) - marginBeforeForChild(*f));
                     positionNewFloats();
                     ASSERT(floats[numCleanFloats].object == *f);
                     numCleanFloats++;
                 }
             }
             line = line->nextRootBox();
         }
         setLogicalHeight(savedLogicalHeight);
     }
@@ skipping 1122 matching lines @@
         }
     }
 
     setLogicalHeight(logicalHeight() + paginationStrut);
     width.updateAvailableWidth();
 
     return true;
 }
 
 }