Split list marker updating into two steps

Source/core/rendering/RenderListItem.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 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 24 matching lines @@
     explicit RenderListItem(Element*);
 
     int value() const { if (!m_isValueUpToDate) updateValueNow(); return m_value; }
     void updateValue();
 
     bool hasExplicitValue() const { return m_hasExplicitValue; }
     int explicitValue() const { return m_explicitValue; }
     void setExplicitValue(int value);
     void clearExplicitValue();
 
-    void setNotInList(bool notInList) { m_notInList = notInList; }
+    void setNotInList(bool);
     bool notInList() const { return m_notInList; }
 
     const String& markerText() const;
 
     void updateListMarkerNumbers();
-    void updateMarkerLocation();
 
     static void updateItemValuesForOrderedList(const HTMLOListElement*);
     static unsigned itemCountForOrderedList(const HTMLOListElement*);
 
     bool isEmpty() const;
 
 private:
     virtual const char* renderName() const OVERRIDE { return "RenderListItem"; }
 
     virtual bool isListItem() const OVERRIDE { return true; }
 
     virtual void willBeDestroyed() OVERRIDE;
 
     virtual void insertedIntoTree() OVERRIDE;
     virtual void willBeRemovedFromTree() OVERRIDE;
 
     virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
 
     virtual void layout() OVERRIDE;
 
+    // Returns true if we re-attached and updated the location of the marker.
+    bool updateMarkerLocation();
+    void updateMarkerLocationAndInvalidateWidth();
+
     void positionListMarker();
 
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
 
     virtual void addOverflowFromChildren() OVERRIDE;
 
     inline int calcValue() const;
     void updateValueNow() const;
     void explicitValueChanged();
 
     int m_explicitValue;
     RenderListMarker* m_marker;
     mutable int m_value;
 
     bool m_hasExplicitValue : 1;
     mutable bool m_isValueUpToDate : 1;
     bool m_notInList : 1;
 };
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderListItem, isListItem());
 
 } // namespace WebCore
 
 #endif // RenderListItem_h