Changeset 137738 in webkit

Timestamp:

Dec 14, 2012 3:58:39 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Text Autosizing: Don't autosize unwrappable blocks
​https://bugs.webkit.org/show_bug.cgi?id=104925

Patch by John Mellor <​johnme@chromium.org> on 2012-12-14
Reviewed by Julien Chaffraix.

Source/WebCore:

If we autosize an unwrappable block (white-space:nowrap/pre), it'll
expand sideways. This doesn't actually improve its legibility, and it
can often severely break web page layouts. This patch prevents us from
autosizing unwrappable blocks. A follow-up patch will address the more
complex issue of unwrappable inline elements.

Tests: fast/text-autosizing/unwrappable-blocks.html

fast/text-autosizing/unwrappable-inlines.html

• rendering/TextAutosizer.cpp:

(WebCore::TextAutosizer::processContainer):

Use containerShouldbeAutosized instead of contentHeightIsConstrained.

(WebCore::contentHeightIsConstrained):

Unchanged, just moved lower down the file.

(WebCore::TextAutosizer::containerShouldbeAutosized):

Checks that the block is wrappable, and also that contentHeightIsConstrained is false.

(WebCore::TextAutosizer::measureDescendantTextWidth):

Use containerShouldbeAutosized instead of contentHeightIsConstrained.

• rendering/TextAutosizer.h:

Declared containerShouldbeAutosized.

LayoutTests:

Added tests verifying that this prevents unwrappable blocks from being
autosized, and that this has no effect on unwrappable inlines.

• fast/text-autosizing/unwrappable-blocks-expected.html: Added.
• fast/text-autosizing/unwrappable-blocks.html: Added.
• fast/text-autosizing/unwrappable-inlines-expected.html: Added.
• fast/text-autosizing/unwrappable-inlines.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text-autosizing/unwrappable-blocks-expected.html (added)
• LayoutTests/fast/text-autosizing/unwrappable-blocks.html (added)
• LayoutTests/fast/text-autosizing/unwrappable-inlines-expected.html (added)
• LayoutTests/fast/text-autosizing/unwrappable-inlines.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/TextAutosizer.cpp (modified) (3 diffs)
• Source/WebCore/rendering/TextAutosizer.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-12-14  John Mellor  <johnme@chromium.org>
+
+        Text Autosizing: Don't autosize unwrappable blocks
+        https://bugs.webkit.org/show_bug.cgi?id=104925
+
+        Reviewed by Julien Chaffraix.
+
+        Added tests verifying that this prevents unwrappable blocks from being
+        autosized, and that this has no effect on unwrappable inlines.
+
+        * fast/text-autosizing/unwrappable-blocks-expected.html: Added.
+        * fast/text-autosizing/unwrappable-blocks.html: Added.
+        * fast/text-autosizing/unwrappable-inlines-expected.html: Added.
+        * fast/text-autosizing/unwrappable-inlines.html: Added.
+
 2012-12-14  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-14  John Mellor  <johnme@chromium.org>
+
+        Text Autosizing: Don't autosize unwrappable blocks
+        https://bugs.webkit.org/show_bug.cgi?id=104925
+
+        Reviewed by Julien Chaffraix.
+
+        If we autosize an unwrappable block (white-space:nowrap/pre), it'll
+        expand sideways. This doesn't actually improve its legibility, and it
+        can often severely break web page layouts. This patch prevents us from
+        autosizing unwrappable blocks. A follow-up patch will address the more
+        complex issue of unwrappable inline elements.
+
+        Tests: fast/text-autosizing/unwrappable-blocks.html
+               fast/text-autosizing/unwrappable-inlines.html
+
+        * rendering/TextAutosizer.cpp:
+        (WebCore::TextAutosizer::processContainer):
+            Use containerShouldbeAutosized instead of contentHeightIsConstrained.
+        (WebCore::contentHeightIsConstrained):
+            Unchanged, just moved lower down the file.
+        (WebCore::TextAutosizer::containerShouldbeAutosized):
+            Checks that the block is wrappable, and also that contentHeightIsConstrained is false.
+        (WebCore::TextAutosizer::measureDescendantTextWidth):
+            Use containerShouldbeAutosized instead of contentHeightIsConstrained.
+        * rendering/TextAutosizer.h:
+            Declared containerShouldbeAutosized.
+
 2012-12-14  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/rendering/TextAutosizer.cpp

@@ -120 +120 @@
 }
 
-static bool contentHeightIsConstrained(const RenderBlock* container)
-{
-    // FIXME: Propagate constrainedness down the tree, to avoid inefficiently walking back up from each box.
-    // FIXME: This code needs to take into account vertical writing modes.
-    // FIXME: Consider additional heuristics, such as ignoring fixed heights if the content is already overflowing before autosizing kicks in.
-    for (; container; container = container->containingBlock()) {
-        RenderStyle* style = container->style();
-        if (style->overflowY() >= OSCROLL)
-            return false;
-        if (style->height().isSpecified() || style->maxHeight().isSpecified()) {
-            // Some sites (e.g. wikipedia) set their html and/or body elements to height:100%,
-            // without intending to constrain the height of the content within them.
-            return !container->isRoot() && !container->isBody();
-        }
-        if (container->isFloatingOrOutOfFlowPositioned())
-            return false;
-    }
-    return false;
-}
-
 void TextAutosizer::processContainer(float multiplier, RenderBlock* container, RenderObject* subtreeRoot, const TextAutosizingWindowInfo& windowInfo)
 {
     ASSERT(isAutosizingContainer(container));
 
-    float localMultiplier = contentHeightIsConstrained(container) ? 1 : multiplier;
+    float localMultiplier = containerShouldbeAutosized(container) ? multiplier: 1;
 
     RenderObject* descendant = nextInPreOrderSkippingDescendantsOfContainers(subtreeRoot, subtreeRoot);
@@ -251 +231 @@
 }
 
+static bool contentHeightIsConstrained(const RenderBlock* container)
+{
+    // FIXME: Propagate constrainedness down the tree, to avoid inefficiently walking back up from each box.
+    // FIXME: This code needs to take into account vertical writing modes.
+    // FIXME: Consider additional heuristics, such as ignoring fixed heights if the content is already overflowing before autosizing kicks in.
+    for (; container; container = container->containingBlock()) {
+        RenderStyle* style = container->style();
+        if (style->overflowY() >= OSCROLL)
+            return false;
+        if (style->height().isSpecified() || style->maxHeight().isSpecified()) {
+            // Some sites (e.g. wikipedia) set their html and/or body elements to height:100%,
+            // without intending to constrain the height of the content within them.
+            return !container->isRoot() && !container->isBody();
+        }
+        if (container->isFloatingOrOutOfFlowPositioned())
+            return false;
+    }
+    return false;
+}
+
+bool TextAutosizer::containerShouldbeAutosized(const RenderBlock* container)
+{
+    // Don't autosize block-level text that can't wrap (as it's likely to
+    // expand sideways and break the page's layout).
+    if (!container->style()->autoWrap())
+        return false;
+
+    return !contentHeightIsConstrained(container);
+}
+
 bool TextAutosizer::clusterShouldBeAutosized(const RenderBlock* lowestCommonAncestor, float commonAncestorWidth)
 {
@@ -274 +284 @@
 void TextAutosizer::measureDescendantTextWidth(const RenderBlock* container, float minTextWidth, float& textWidth)
 {
-    bool skipLocalText = contentHeightIsConstrained(container);
+    bool skipLocalText = !containerShouldbeAutosized(container);
 
     RenderObject* descendant = nextInPreOrderSkippingDescendantsOfContainers(container, container);

trunk/Source/WebCore/rendering/TextAutosizer.h

@@ -71 +71 @@
     static bool isAutosizingCluster(const RenderBlock*);
 
+    static bool containerShouldbeAutosized(const RenderBlock* container);
     static bool clusterShouldBeAutosized(const RenderBlock* lowestCommonAncestor, float commonAncestorWidth);
     static void measureDescendantTextWidth(const RenderBlock* container, float minTextWidth, float& textWidth);