Changeset 142534 in webkit

Timestamp:

Feb 11, 2013 3:48:51 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Text Autosizing] Collect narrow descendants and process them separately. Refactoring for
a change to follow.
​https://bugs.webkit.org/show_bug.cgi?id=109054

Preparational change to combine narrow descendants of the same autosizing cluster into
groups by the width difference between the descendant and the block containing all text of
the parent autosizing cluster. The groups will be autosized with the same multiplier.

For example, on sites with a sidebar, sometimes the paragraphs next to the sidebar will have
a large margin individually applied (via a CSS selector), causing them all to individually
appear narrower than their enclosing blockContainingAllText. Rather than making each of
these paragraphs into a separate cluster, we eventually want to be able to merge them back
together into one (or a few) descendant clusters.

Patch by Anton Vayvod <​avayvod@chromium.org> on 2013-02-11
Reviewed by Julien Chaffraix.

No behavioral changes thus no new tests or test changes.

• rendering/TextAutosizer.cpp:

(TextAutosizingClusterInfo): Vector of narrow descendants.
(WebCore::TextAutosizer::processCluster): Process narrow descendants separately.
(WebCore::TextAutosizer::processContainer):

Remember narrow descendants of the parent cluster for later processing.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/TextAutosizer.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-11  Anton Vayvod  <avayvod@chromium.org>
+
+        [Text Autosizing] Collect narrow descendants and process them separately. Refactoring for
+        a change to follow.
+        https://bugs.webkit.org/show_bug.cgi?id=109054
+
+        Preparational change to combine narrow descendants of the same autosizing cluster into
+        groups by the width difference between the descendant and the block containing all text of
+        the parent autosizing cluster. The groups will be autosized with the same multiplier.
+
+        For example, on sites with a sidebar, sometimes the paragraphs next to the sidebar will have
+        a large margin individually applied (via a CSS selector), causing them all to individually
+        appear narrower than their enclosing blockContainingAllText. Rather than making each of
+        these paragraphs into a separate cluster, we eventually want to be able to merge them back
+        together into one (or a few) descendant clusters.
+
+        Reviewed by Julien Chaffraix.
+
+        No behavioral changes thus no new tests or test changes.
+
+        * rendering/TextAutosizer.cpp:
+        (TextAutosizingClusterInfo): Vector of narrow descendants.
+        (WebCore::TextAutosizer::processCluster): Process narrow descendants separately.
+        (WebCore::TextAutosizer::processContainer):
+
+            Remember narrow descendants of the parent cluster for later processing.
+
 2013-02-11  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebCore/rendering/TextAutosizer.cpp

@@ -38 +38 @@
 #include <algorithm>
 #include <wtf/StdLibExtras.h>
+#include <wtf/Vector.h>
 
 namespace WebCore {
@@ -48 +49 @@
 };
 
+// Represents cluster related data. Instances should not persist between calls to processSubtree.
 struct TextAutosizingClusterInfo {
     explicit TextAutosizingClusterInfo(RenderBlock* root)
@@ -62 +64 @@
     // text and that of a narrow child before the child becomes a separate cluster.
     float maxAllowedDifferenceFromTextWidth;
+
+    // Descendants of the cluster that are narrower than the block containing all text and must be
+    // processed together.
+    Vector<TextAutosizingClusterInfo> narrowDescendants;
 };
 
@@ -151 +157 @@
 
     processContainer(multiplier, container, clusterInfo, subtreeRoot, windowInfo);
+
+    Vector<TextAutosizingClusterInfo>& narrowDescendants = clusterInfo.narrowDescendants;
+    for (size_t i = 0; i < narrowDescendants.size(); ++i) {
+        TextAutosizingClusterInfo& descendantClusterInfo = narrowDescendants[i];
+        processCluster(descendantClusterInfo, descendantClusterInfo.root, descendantClusterInfo.root, windowInfo);
+    }
 }
 
@@ -169 +181 @@
         } else if (isAutosizingContainer(descendant)) {
             RenderBlock* descendantBlock = toRenderBlock(descendant);
-            if (isAutosizingCluster(descendantBlock, clusterInfo)) {
-                TextAutosizingClusterInfo descendantClusterInfo(descendantBlock);
+            TextAutosizingClusterInfo descendantClusterInfo(descendantBlock);
+            if (isWiderDescendant(descendantBlock, clusterInfo) || isIndependentDescendant(descendantBlock))
                 processCluster(descendantClusterInfo, descendantBlock, descendantBlock, windowInfo);
+            else if (isNarrowDescendant(descendantBlock, clusterInfo)) {
+                // Narrow descendants are processed together later to be able to apply the same multiplier
+                // to each of them if necessary.
+                clusterInfo.narrowDescendants.append(descendantClusterInfo);
             } else
                 processContainer(multiplier, descendantBlock, clusterInfo, descendantBlock, windowInfo);