Changeset 142866 in webkit

Timestamp:

Feb 14, 2013 4:09:18 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Text Autosizing] Process narrow descendants with the same multiplier for the font size.
​https://bugs.webkit.org/show_bug.cgi?id=109573

Source/WebCore:

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

Combine narrow descendants of the same autosizing cluster into a group that is 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 want them all to share the same multiplier, as
if they were a single cluster.

Test: fast/text-autosizing/narrow-descendants-combined.html

• rendering/TextAutosizer.cpp:

(WebCore::TextAutosizer::processClusterInternal):

Common implementation for processCluster() and processCompositeCluster that accepts the
text width and whether the cluster should be autosized as parameters instead of
calculating it inline.

(WebCore::TextAutosizer::processCluster):

Calculates the text width for a single cluster and whether it should be autosized, then
calls processClusterInternal() to apply the multiplier and process the cluster's
descendants.

(WebCore::TextAutosizer::processCompositeCluster):

Calculates the text width for a group of renderers and if the group should be autosized,
then calls processClusterInternal() repeatedly with the same multiplier to apply it and
process all the descendants of the group.

(WebCore::TextAutosizer::clusterShouldBeAutosized):

Calls the multiple renderers version to avoid code duplication.

(WebCore::TextAutosizer::compositeClusterShouldBeAutosized):

The multiple renderers version of clusterShouldBeAutosized.

• rendering/TextAutosizer.h:

Updated method declarations.

LayoutTests:

Test to verify that all narrow descendants of a cluster are autosized with the same
multiplier.

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

• fast/text-autosizing/narrow-descendants-combined-expected.html: Added.
• fast/text-autosizing/narrow-descendants-combined.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text-autosizing/narrow-descendants-combined-expected.html (added)
• LayoutTests/fast/text-autosizing/narrow-descendants-combined.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/TextAutosizer.cpp (modified) (4 diffs)
• Source/WebCore/rendering/TextAutosizer.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-14  Anton Vayvod  <avayvod@chromium.org>
+
+        [Text Autosizing] Process narrow descendants with the same multiplier for the font size.
+        https://bugs.webkit.org/show_bug.cgi?id=109573
+
+        Test to verify that all narrow descendants of a cluster are autosized with the same
+        multiplier.
+
+        Reviewed by Julien Chaffraix.
+
+        * fast/text-autosizing/narrow-descendants-combined-expected.html: Added.
+        * fast/text-autosizing/narrow-descendants-combined.html: Added.
+
 2013-02-14  Aivo Paas  <aivopaas@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-14  Anton Vayvod  <avayvod@chromium.org>
+
+        [Text Autosizing] Process narrow descendants with the same multiplier for the font size.
+        https://bugs.webkit.org/show_bug.cgi?id=109573
+
+        Reviewed by Julien Chaffraix.
+
+        Combine narrow descendants of the same autosizing cluster into a group that is 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 want them all to share the same multiplier, as
+        if they were a single cluster.
+
+        Test: fast/text-autosizing/narrow-descendants-combined.html
+
+        * rendering/TextAutosizer.cpp:
+        (WebCore::TextAutosizer::processClusterInternal):
+
+            Common implementation for processCluster() and processCompositeCluster that accepts the
+            text width and whether the cluster should be autosized as parameters instead of
+            calculating it inline.
+
+        (WebCore::TextAutosizer::processCluster):
+
+            Calculates the text width for a single cluster and whether it should be autosized, then
+            calls processClusterInternal() to apply the multiplier and process the cluster's
+            descendants.
+
+        (WebCore::TextAutosizer::processCompositeCluster):
+
+            Calculates the text width for a group of renderers and if the group should be autosized,
+            then calls processClusterInternal() repeatedly with the same multiplier to apply it and
+            process all the descendants of the group.
+
+        (WebCore::TextAutosizer::clusterShouldBeAutosized):
+
+            Calls the multiple renderers version to avoid code duplication.
+
+        (WebCore::TextAutosizer::compositeClusterShouldBeAutosized):
+
+            The multiple renderers version of clusterShouldBeAutosized.
+
+        * rendering/TextAutosizer.h:
+
+            Updated method declarations.
+
 2013-02-14  Andrey Adaikin  <aandrey@chromium.org>
 

trunk/Source/WebCore/rendering/TextAutosizer.cpp

@@ -134 +134 @@
 }
 
-void TextAutosizer::processCluster(TextAutosizingClusterInfo& clusterInfo, RenderBlock* container, RenderObject* subtreeRoot, const TextAutosizingWindowInfo& windowInfo)
-{
-    // Many pages set a max-width on their content. So especially for the
-    // RenderView, instead of just taking the width of |cluster| we find
-    // the lowest common ancestor of the first and last descendant text node of
-    // the cluster (i.e. the deepest wrapper block that contains all the text),
-    // and use its width instead.
-    clusterInfo.blockContainingAllText = findDeepestBlockContainingAllText(clusterInfo.root);
-    float textWidth = clusterInfo.blockContainingAllText->contentLogicalWidth();
-
+void TextAutosizer::processClusterInternal(TextAutosizingClusterInfo& clusterInfo, RenderBlock* container, RenderObject* subtreeRoot, const TextAutosizingWindowInfo& windowInfo, float textWidth, bool shouldBeAutosized)
+{
     float multiplier = 1;
-    if (clusterShouldBeAutosized(clusterInfo, textWidth)) {
+    if (shouldBeAutosized) {
         int logicalWindowWidth = clusterInfo.root->isHorizontalWritingMode() ? windowInfo.windowSize.width() : windowInfo.windowSize.height();
         int logicalLayoutWidth = clusterInfo.root->isHorizontalWritingMode() ? windowInfo.minLayoutSize.width() : windowInfo.minLayoutSize.height();
@@ -158 +150 @@
     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);
-    }
+    processCompositeCluster(clusterInfo.narrowDescendants, windowInfo);
+}
+
+void TextAutosizer::processCluster(TextAutosizingClusterInfo& clusterInfo, RenderBlock* container, RenderObject* subtreeRoot, const TextAutosizingWindowInfo& windowInfo)
+{
+    // Many pages set a max-width on their content. So especially for the RenderView, instead of
+    // just taking the width of |cluster| we find the lowest common ancestor of the first and last
+    // descendant text node of the cluster (i.e. the deepest wrapper block that contains all the
+    // text), and use its width instead.
+    clusterInfo.blockContainingAllText = findDeepestBlockContainingAllText(clusterInfo.root);
+    float textWidth = clusterInfo.blockContainingAllText->contentLogicalWidth();
+    processClusterInternal(clusterInfo, container, subtreeRoot, windowInfo, textWidth, clusterShouldBeAutosized(clusterInfo, textWidth));
+}
+
+void TextAutosizer::processCompositeCluster(Vector<TextAutosizingClusterInfo>& clusterInfos, const TextAutosizingWindowInfo& windowInfo)
+{
+    float maxTextWidth = 0;
+    for (size_t i = 0; i < clusterInfos.size(); ++i) {
+        TextAutosizingClusterInfo& clusterInfo = clusterInfos[i];
+        clusterInfo.blockContainingAllText = findDeepestBlockContainingAllText(clusterInfo.root);
+        maxTextWidth = max<float>(maxTextWidth, clusterInfo.blockContainingAllText->contentLogicalWidth());
+    }
+
+    bool shouldBeAutosized = compositeClusterShouldBeAutosized(clusterInfos, maxTextWidth);
+    for (size_t i = 0; i < clusterInfos.size(); ++i)
+        processClusterInternal(clusterInfos[i], clusterInfos[i].root, clusterInfos[i].root, windowInfo, maxTextWidth, shouldBeAutosized);
 }
 
@@ -429 +442 @@
 bool TextAutosizer::clusterShouldBeAutosized(TextAutosizingClusterInfo& clusterInfo, float blockWidth)
 {
+    Vector<TextAutosizingClusterInfo> clusterInfos(1, clusterInfo);
+    return compositeClusterShouldBeAutosized(clusterInfos, blockWidth);
+}
+
+bool TextAutosizer::compositeClusterShouldBeAutosized(Vector<TextAutosizingClusterInfo>& clusterInfos, float blockWidth)
+{
     // Don't autosize clusters that contain less than 4 lines of text (in
     // practice less lines are required, since measureDescendantTextWidth
@@ -439 +458 @@
     // in and pan from side to side to read each line, since if there are very
     // few lines of text you'll only need to pan across once or twice.
+    float totalTextWidth = 0;
     const float minLinesOfText = 4;
     float minTextWidth = blockWidth * minLinesOfText;
-    float textWidth = 0;
-    measureDescendantTextWidth(clusterInfo.blockContainingAllText, clusterInfo, minTextWidth, textWidth);
-    if (textWidth >= minTextWidth)
-        return true;
+    for (size_t i = 0; i < clusterInfos.size(); ++i) {
+        measureDescendantTextWidth(clusterInfos[i].blockContainingAllText, clusterInfos[i], minTextWidth, totalTextWidth);
+        if (totalTextWidth >= minTextWidth)
+            return true;
+    }
     return false;
 }

trunk/Source/WebCore/rendering/TextAutosizer.h

@@ -62 +62 @@
     explicit TextAutosizer(Document*);
 
+    void processClusterInternal(TextAutosizingClusterInfo&, RenderBlock* container, RenderObject* subtreeRoot, const TextAutosizingWindowInfo&, float textWidth, bool shouldBeAutosized);
     void processCluster(TextAutosizingClusterInfo&, RenderBlock* container, RenderObject* subtreeRoot, const TextAutosizingWindowInfo&);
+    void processCompositeCluster(Vector<TextAutosizingClusterInfo>&, const TextAutosizingWindowInfo&);
     void processContainer(float multiplier, RenderBlock* container, TextAutosizingClusterInfo&, RenderObject* subtreeRoot, const TextAutosizingWindowInfo&);
 
@@ -78 +80 @@
     static bool contentHeightIsConstrained(const RenderBlock* container);
     static bool clusterShouldBeAutosized(TextAutosizingClusterInfo&, float blockWidth);
+    static bool compositeClusterShouldBeAutosized(Vector<TextAutosizingClusterInfo>&, float blockWidth);
     static void measureDescendantTextWidth(const RenderBlock* container, TextAutosizingClusterInfo&, float minTextWidth, float& textWidth);