Use the outermost float for shape-outside

Source/core/rendering/RenderBlock.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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 1163 matching lines @@
     template <FloatingObject::Type FloatTypeValue>
     class ComputeFloatOffsetAdapter {
     public:
         typedef FloatingObjectInterval IntervalType;
 
         ComputeFloatOffsetAdapter(const RenderBlock* renderer, int lineTop, int lineBottom, LayoutUnit& offset)
             : m_renderer(renderer)
             , m_lineTop(lineTop)
             , m_lineBottom(lineBottom)
             , m_offset(offset)
-            , m_last(0)
-            , m_floatForHeight(0)
+            , m_outermostFloat(0)
         {
         }
 
         inline int lowValue() const { return m_lineTop; }
         inline int highValue() const { return m_lineBottom; }
         void collectIfNeeded(const IntervalType&);
 
         // When computing the offset caused by the floats on a given line, if
         // the outermost float on that line has a shape-outside, the inline
         // content that butts up against that float must be positioned using
         // the contours of the shape, not the margin box of the float.
-        // We save the last float encountered so that the offset can be
-        // computed correctly by the code using this adapter.
-        const FloatingObject* lastFloat() const { return m_last; }
+        const FloatingObject* outermostFloat() const { return m_outermostFloat; }
 
         LayoutUnit getHeightRemaining() const;
 
     private:
         bool updateOffsetIfNeeded(const FloatingObject*);
 
         const RenderBlock* m_renderer;
         int m_lineTop;
         int m_lineBottom;
         LayoutUnit& m_offset;
-        const FloatingObject* m_last;
-        const FloatingObject* m_floatForHeight;
+        const FloatingObject* m_outermostFloat;
     };
 
     void createFloatingObjects();
 
 public:
 
     class FloatingObjects {
         WTF_MAKE_NONCOPYABLE(FloatingObjects); WTF_MAKE_FAST_ALLOCATED;
     public:
         void clear();
@@ skipping 125 matching lines @@
     static String string(const int value);
 };
 template<> struct ValueToString<RenderBlock::FloatingObject*> {
     static String string(const RenderBlock::FloatingObject*);
 };
 #endif
 
 } // namespace WebCore
 
 #endif // RenderBlock_h