Changeset 119227 in webkit

Timestamp:

Jun 1, 2012 7:14:07 AM (12 years ago)

Author:

mitz@apple.com

Message:

Layout not updated after setting -webkit-line-clamp to none
​https://bugs.webkit.org/show_bug.cgi?id=88049

Reviewed by Abhishek Arya.

Source/WebCore:

Test: fast/flexbox/line-clamp-removed-dynamically.html

• rendering/RenderDeprecatedFlexibleBox.cpp:

(WebCore::RenderDeprecatedFlexibleBox::styleWillChange): Added. Calls clearLineClamp if
line-clamp will change to none.
(WebCore::RenderDeprecatedFlexibleBox::clearLineClamp): Added. Marks possibly-clamped
children for layout and clears truncation from blocks.

• rendering/RenderDeprecatedFlexibleBox.h:

LayoutTests:

• fast/flexbox/line-clamp-removed-dynamically-expected.html: Added.
• fast/flexbox/line-clamp-removed-dynamically.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/flexbox/line-clamp-removed-dynamically-expected.html (added)
• LayoutTests/fast/flexbox/line-clamp-removed-dynamically.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-01  Dan Bernstein  <mitz@apple.com>
+
+        Layout not updated after setting -webkit-line-clamp to none
+        https://bugs.webkit.org/show_bug.cgi?id=88049
+
+        Reviewed by Abhishek Arya.
+
+        * fast/flexbox/line-clamp-removed-dynamically-expected.html: Added.
+        * fast/flexbox/line-clamp-removed-dynamically.html: Added.
+
 2012-06-01  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-01  Dan Bernstein  <mitz@apple.com>
+
+        Layout not updated after setting -webkit-line-clamp to none
+        https://bugs.webkit.org/show_bug.cgi?id=88049
+
+        Reviewed by Abhishek Arya.
+
+        Test: fast/flexbox/line-clamp-removed-dynamically.html
+
+        * rendering/RenderDeprecatedFlexibleBox.cpp:
+        (WebCore::RenderDeprecatedFlexibleBox::styleWillChange): Added. Calls clearLineClamp if
+        line-clamp will change to none.
+        (WebCore::RenderDeprecatedFlexibleBox::clearLineClamp): Added. Marks possibly-clamped
+        children for layout and clears truncation from blocks.
+        * rendering/RenderDeprecatedFlexibleBox.h:
+
 2012-06-01  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp

@@ -151 +151 @@
 }
 
+void RenderDeprecatedFlexibleBox::styleWillChange(StyleDifference diff, const RenderStyle* newStyle)
+{
+    RenderStyle* oldStyle = style();
+    if (oldStyle && !oldStyle->lineClamp().isNone() && newStyle->lineClamp().isNone())
+        clearLineClamp();
+
+    RenderBlock::styleWillChange(diff, newStyle);
+}
+
 void RenderDeprecatedFlexibleBox::calcHorizontalPrefWidths()
 {
@@ -973 +982 @@
         lastVisibleLine->placeEllipsis(anchorBox ? ellipsisAndSpaceStr : ellipsisStr, leftToRight, blockLeftEdge, blockRightEdge, totalWidth, anchorBox);
         destBlock->setHasMarkupTruncation(true);
+    }
+}
+
+void RenderDeprecatedFlexibleBox::clearLineClamp()
+{
+    FlexBoxIterator iterator(this);
+    for (RenderBox* child = iterator.first(); child; child = iterator.next()) {
+        if (childDoesNotAffectWidthOrFlexing(child))
+            continue;
+
+        if ((child->isReplaced() && (child->style()->width().isPercent() || child->style()->height().isPercent()))
+            || (child->style()->height().isAuto() && child->isBlockFlow())) {
+            child->setChildNeedsLayout(true);
+
+            if (child->isRenderBlock()) {
+                toRenderBlock(child)->markPositionedObjectsForLayout();
+                toRenderBlock(child)->clearTruncation();
+            }
+        }
     }
 }

trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h

@@ -41 +41 @@
     void calcVerticalPrefWidths();
 
+    virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle) OVERRIDE;
+
     virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageHeight = 0);
     void layoutHorizontalBox(bool relayoutChildren);
@@ -65 +67 @@
 private:
     void applyLineClamp(FlexBoxIterator&, bool relayoutChildren);
+    void clearLineClamp();
 };