Autosize list markers.

Source/core/rendering/FastTextAutosizer.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 27 matching lines @@
 #include "core/page/Page.h"
 #include "core/rendering/InlineIterator.h"
 #include "core/rendering/RenderBlock.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/TextAutosizer.h"
 
 using namespace std;
 
 namespace WebCore {
 
+using namespace HTMLNames;
+
 FastTextAutosizer::FastTextAutosizer(const Document* document)
     : m_document(document)
 #ifndef NDEBUG
     , m_renderViewInfoPrepared(false)
 #endif
 {
 }
 
 void FastTextAutosizer::record(const RenderBlock* block)
 {
@@ skipping 27 matching lines @@
         return;
 #ifndef NDEBUG
     m_blocksThatHaveBegunLayout.add(block);
 #endif
 
     if (block->isRenderView())
         prepareRenderViewInfo(toRenderView(block));
 
     if (Cluster* cluster = maybeGetOrCreateCluster(block))
         m_clusterStack.append(cluster);
 

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

Do we need to skip inflation here for list items we've already inflated with
inflateListItem?

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

No, inflateListItem only sets the multiplier on the LI itself and the marker. 
We still want to go in and process the stuff inside the LI.

     if (block->childrenInline())
         inflate(block);
 }
 
+void FastTextAutosizer::inflateListItem(RenderBlock* listItem, RenderObject* listItemMarker)
+{
+#ifndef NDEBUG

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

These ifndef's aren't needed because the asserts will be compiled out
automatically in debug builds. I'm a hypocrite and did the same thing in
destroy() by mistake :/

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

Done.

+    ASSERT(listItem->isListItem());
+    ASSERT(listItemMarker->isListMarker());
+#endif
+    if (!enabled())
+        return;
+
+    applyMultiplier(listItem, activeMultiplier());

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

I'm not sure we can call activeMultiplier() here. We only have a valid
multiplier when we know the cluster's root has begun layout, and the lowest
block containing all text has also begun layout. In practice, this means we can
only access the multiplier if we're within a line of text because we know at
that point that both the root and the lowest block containing all text are above
us, and therefore all in layout with valid contentLogicalWidth.

For example:
<ul clusterRoot><li><div lowestBlockContainingAllText>foo</div></li></ul>

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

Fixed.

+    applyMultiplier(listItemMarker, activeMultiplier());
+}
+
 void FastTextAutosizer::endLayout(RenderBlock* block)
 {
     if (!enabled())
         return;
 #ifndef NDEBUG
     m_blocksThatHaveBegunLayout.remove(block);
 #endif
 
     Cluster* cluster = currentCluster();
     if (cluster && cluster->m_root == block)
         m_clusterStack.removeLast();
 }
 
+float FastTextAutosizer::activeMultiplier()
+{
+    Cluster* cluster = currentCluster();
+    if (!cluster)
+        return 1.0f;
+    return cluster->m_autosize ? cluster->m_multiplier : 1.0f;

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

We should add an assert that the multiplier has been calculated already:
ASSERT(cluster->m_autosize ? cluster->m_multiplier : true);
Or possibly just:
ASSERT(cluster->m_multiplier);

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

Done.

+}
+
 void FastTextAutosizer::inflate(RenderBlock* block)
 {
     Cluster* cluster = currentCluster();
     if (!cluster)
         return;
 
     float multiplier = 0;
     for (RenderObject* descendant = nextChildSkippingChildrenOfBlocks(block, block); descendant; descendant = nextChildSkippingChildrenOfBlocks(descendant, block)) {
         if (descendant->isText()) {
             // We only calculate this multiplier on-demand to ensure the parent block of this text
@@ skipping 298 matching lines @@
 }
 
 RenderObject* FastTextAutosizer::nextChildSkippingChildrenOfBlocks(const RenderObject* current, const RenderObject* stayWithin)
 {
     if (current == stayWithin || !current->isRenderBlock())
         return current->nextInPreOrder(stayWithin);
     return current->nextInPreOrderAfterChildren(stayWithin);
 }
 
 } // namespace WebCore