Optimize FloatIntervalSearchAdapter::collectIfNeeded

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 1150 matching lines @@
     typedef FloatingObjectSet::const_iterator FloatingObjectSetIterator;
     typedef PODInterval<int, FloatingObject*> FloatingObjectInterval;
     typedef PODIntervalTree<int, FloatingObject*> FloatingObjectTree;
     typedef PODFreeListArena<PODRedBlackTree<FloatingObjectInterval>::Node> IntervalArena;
 
     template <FloatingObject::Type FloatTypeValue>
     class FloatIntervalSearchAdapter {
     public:
         typedef FloatingObjectInterval IntervalType;
 
-        FloatIntervalSearchAdapter(const RenderBlock* renderer, int lowValue, int highValue, LayoutUnit& offset, LayoutUnit* heightRemaining)
+        FloatIntervalSearchAdapter(const RenderBlock* renderer, int lowValue, int highValue, LayoutUnit& offset)
             : m_renderer(renderer)
             , m_lowValue(lowValue)
             , m_highValue(highValue)
             , m_offset(offset)
-            , m_heightRemaining(heightRemaining)
             , m_last(0)
+            , m_floatForHeight(0)
         {
         }
 
         inline int lowValue() const { return m_lowValue; }
         inline int highValue() const { return m_highValue; }
-        void collectIfNeeded(const IntervalType&) const;
+        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; }
 
+        LayoutUnit getHeightRemaining() const;
+
     private:
         bool updateOffsetIfNeeded(const FloatingObject*) const;
 
         const RenderBlock* m_renderer;
         int m_lowValue;
         int m_highValue;
         LayoutUnit& m_offset;
-        LayoutUnit* m_heightRemaining;
-        // This member variable is mutable because the collectIfNeeded method
-        // is declared as const, even though it doesn't actually respect that
-        // contract. It modifies other member variables via loopholes in the
-        // const behavior. Instead of using loopholes, I decided it was better
-        // to make the fact that this is modified in a const method explicit.
-        mutable const FloatingObject* m_last;
+        const FloatingObject* m_last;
+        const FloatingObject* m_floatForHeight;
     };
 
     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