Changeset 60060 in webkit

Timestamp:

May 23, 2010 9:39:24 PM (14 years ago)

Author:

morrita@google.com

Message:

2010-05-23 MORITA Hajime <​morrita@google.com>

Reviewed by Kent Tamura.

Textarea shouldn't grow when you type.
​https://bugs.webkit.org/show_bug.cgi?id=32077

Add test for the case with various type of properties for vertical box size.
including height, min-height, max-height, padding-top/bottom, margin-top/bottom.

• fast/forms/script-tests/textarea-percentage-dimensions.js: Added. (heightChanged):
• fast/forms/textarea-percentage-dimensions-expected.txt: Added.
• fast/forms/textarea-percentage-dimensions.html: Added.

2010-05-23 MORITA Hajime <​morrita@google.com>

Reviewed by Kent Tamura.

Textarea shouldn't grow when you type.
​https://bugs.webkit.org/show_bug.cgi?id=32077

<textarea> with percent-specified, height-related properties did
cause partial-layout rooted from the renderer, that resulted
different box height between full-layout and partial-layout. This
is because calcHeight() assumes that the layout calculation of the
RenderBlock's parent is ongoing. But this assumption is violated
when the RenderBlock is root of the layout calculation.

So we prevent such <textarea>'s RenderObjects from being layout
root.

Test: fast/forms/textarea-percentage-dimensions.html

• rendering/RenderObject.h: (WebCore::objectIsRelayoutBoundary):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/script-tests/textarea-percentage-dimensions.js (added)
• LayoutTests/fast/forms/textarea-percentage-dimensions-expected.txt (added)
• LayoutTests/fast/forms/textarea-percentage-dimensions.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderObject.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-05-23  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Kent Tamura.
+
+        Textarea shouldn't grow when you type.
+        https://bugs.webkit.org/show_bug.cgi?id=32077
+
+        Add test for the case with various type of properties for vertical box size.
+        including height, min-height, max-height, padding-top/bottom, margin-top/bottom.
+        
+        * fast/forms/script-tests/textarea-percentage-dimensions.js: Added.
+        (heightChanged):
+        * fast/forms/textarea-percentage-dimensions-expected.txt: Added.
+        * fast/forms/textarea-percentage-dimensions.html: Added.
+
 2010-05-23  Tony Chang  <tony@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-23  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Kent Tamura.
+
+        Textarea shouldn't grow when you type.
+        https://bugs.webkit.org/show_bug.cgi?id=32077
+
+        <textarea> with percent-specified, height-related properties did
+        cause partial-layout rooted from the renderer, that resulted
+        different box height between full-layout and partial-layout. This
+        is because calcHeight() assumes that the layout calculation of the
+        RenderBlock's parent is ongoing. But this assumption is violated
+        when the RenderBlock is root of the layout calculation. 
+        
+        So we prevent such <textarea>'s RenderObjects from being layout
+        root.
+
+        Test: fast/forms/textarea-percentage-dimensions.html
+
+        * rendering/RenderObject.h:
+        (WebCore::objectIsRelayoutBoundary):
+
 2010-05-23  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/rendering/RenderObject.h

@@ -976 +976 @@
     // FIXME: In future it may be possible to broaden this condition in order to improve performance.
     // Table cells are excluded because even when their CSS height is fixed, their height()
-    // may depend on their contents.
-    return obj->isTextControl()
-        || (obj->hasOverflowClip() && !obj->style()->width().isIntrinsicOrAuto() && !obj->style()->height().isIntrinsicOrAuto() && !obj->style()->height().isPercent() && !obj->isTableCell())
+    // may also depend on their contents.
+    bool hasContentsDependHeight = ((obj->style()->height().isIntrinsicOrAuto() || obj->style()->height().isPercent()) 
+                                 || (obj->style()->minHeight().isIntrinsicOrAuto() || obj->style()->minHeight().isPercent())
+                                 || (obj->style()->maxHeight().isIntrinsicOrAuto() || obj->style()->maxHeight().isPercent()));
+
+    return !hasContentsDependHeight
+           && (obj->isTextControl() 
+               || (obj->hasOverflowClip() && !obj->style()->width().isIntrinsicOrAuto() && !obj->isTableCell() && !hasContentsDependHeight)
 #if ENABLE(SVG)
-           || obj->isSVGRoot()
-#endif
-           ;
+               || obj->isSVGRoot()
+#endif
+               );
 }