Autosize list markers.

Source/core/rendering/RenderListItem.cpp

 /**
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  *
  * 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "config.h"
 #include "core/rendering/RenderListItem.h"
 
 #include "HTMLNames.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/html/HTMLOListElement.h"
+#include "core/rendering/FastTextAutosizer.h"
 #include "core/rendering/LayoutRectRecorder.h"
 #include "core/rendering/RenderListMarker.h"
 #include "core/rendering/RenderView.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/text/StringBuilder.h"
 
 using namespace std;
 
 namespace WebCore {
 
@@ skipping 269 matching lines @@
             if (m_marker->isInside())
                 containingBlock()->updateLogicalWidth();
         }
     }
 }
 
 void RenderListItem::layout()
 {
     ASSERT(needsLayout());
 
+    // The marker must be autosized before calling updateMarkerLocation.
+    // It cannot be done in the parent's beginLayout because it is not yet in the render tree.
+    FastTextAutosizer* textAutosizer = document().fastTextAutosizer();
+    if (textAutosizer)
+        textAutosizer->inflateListItem(this, m_marker);
+
     LayoutRectRecorder recorder(*this);
     updateMarkerLocation();
     RenderBlockFlow::layout();

[pdr., 2014/01/25 03:50:23]

This layout call updates the RenderListItem's contentLogicalWidth which the
cluster multiplier may depend on.

[skobes, 2014/01/28 03:10:30]

Hmm... this would only be an issue if the LI had a different width from the
containing OL/UL, right?  Hopefully not very common (and the consequence is just
that the marker's size is based on the latter).

 }
 
 void RenderListItem::addOverflowFromChildren()
 {
     RenderBlockFlow::addOverflowFromChildren();
     positionListMarker();
 }
 
 void RenderListItem::positionListMarker()
 {
@@ skipping 185 matching lines @@
             // assume that all the following ones have too.
             // This gives us the opportunity to stop here and avoid
             // marking the same nodes again.
             break;
         }
         item->updateValue();
     }
 }
 
 } // namespace WebCore