Floated elements inside a white-space:nowrap container should still wrap.

Source/core/rendering/RenderText.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * 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
@@ skipping 801 matching lines @@
         const Font& font = style()->font(); // FIXME: This ignores first-line.
         if (stripFrontSpaces) {
             const UChar space = ' ';
             float spaceWidth = font.width(RenderBlock::constructTextRun(this, font, &space, 1, style()));
             maxWidth -= spaceWidth;
         } else {
             maxWidth += font.wordSpacing();
         }
     }
 
-    stripFrontSpaces = collapseWhiteSpace && m_hasBreakableEnd;
+    stripFrontSpaces = collapseWhiteSpace && m_hasEndWhiteSpace;
 
     if (!style()->autoWrap() || minWidth > maxWidth)
         minWidth = maxWidth;
 
     // Compute our max widths by scanning the string for newlines.
     if (hasBreak) {
         const Font& f = style()->font(); // FIXME: This ignores first-line.
         bool firstLine = true;
         firstLineMaxWidth = maxWidth;
         lastLineMaxWidth = maxWidth;
@@ skipping 108 matching lines @@
     if (isBR())
         return;
 
     float currMinWidth = 0;
     float currMaxWidth = 0;
     m_hasBreakableChar = false;
     m_hasBreak = false;
     m_hasTab = false;
     m_hasBreakableStart = false;
     m_hasBreakableEnd = false;
+    m_hasEndWhiteSpace = false;
 
     RenderStyle* styleToUse = style();
     const Font& f = styleToUse->font(); // FIXME: This ignores first-line.
     float wordSpacing = styleToUse->wordSpacing();
     int len = textLength();
     LazyLineBreakIterator breakIterator(m_text, styleToUse->locale());
     bool needsWordSpacing = false;
     bool ignoringSpaces = false;
     bool isSpace = false;
     bool firstWord = true;
@@ skipping 42 matching lines @@
                 isSpace = true;
         } else if (c == '\t') {
             if (!styleToUse->collapseWhiteSpace()) {
                 m_hasTab = true;
                 isSpace = false;
             } else
                 isSpace = true;
         } else
             isSpace = c == ' ';
 
-        if ((isSpace || isNewline) && !i)
-            m_hasBreakableStart = true;
-        if ((isSpace || isNewline) && i == len - 1)
-            m_hasBreakableEnd = true;
+        bool isBreakableLocation = isNewline || (isSpace && styleToUse->autoWrap());
+        if (!i)
+            m_hasBreakableStart = isBreakableLocation;
+        if (i == len - 1) {
+            m_hasBreakableEnd = isBreakableLocation;
+            m_hasEndWhiteSpace = isNewline || isSpace;
+        }
 
         if (!ignoringSpaces && styleToUse->collapseWhiteSpace() && previousCharacterIsSpace && isSpace)
             ignoringSpaces = true;
 
         if (ignoringSpaces && !isSpace)
             ignoringSpaces = false;
 
         // Ignore spaces and soft hyphens
         if (ignoringSpaces) {
             ASSERT(lastWordBoundary == i);
@@ skipping 902 matching lines @@
 void RenderText::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering);
     RenderObject::reportMemoryUsage(memoryObjectInfo);
     info.addMember(m_text, "text");
     info.addMember(m_firstTextBox, "firstTextBox");
     info.addMember(m_lastTextBox, "lastTextBox");
 }
 
 } // namespace WebCore