Changeset 13988 in webkit
- Timestamp:
- Apr 20, 2006 3:22:14 PM (18 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r13986 r13988 1 2006-04-20 Adele Peterson <adele@apple.com> 2 3 Test for http://bugzilla.opendarwin.org/show_bug.cgi?id=8273 4 REGRESSION: Read only input text field renders at the wrong height when value attribute is not present 5 6 * fast/forms/input-readonly-empty-expected.checksum: Added. 7 * fast/forms/input-readonly-empty-expected.png: Added. 8 * fast/forms/input-readonly-empty-expected.txt: Added. 9 * fast/forms/input-readonly-empty.html: Added. 10 1 11 2006-04-19 Adele Peterson <adele@apple.com> 2 12 -
trunk/WebCore/ChangeLog
r13987 r13988 1 2006-04-20 Adele Peterson <adele@apple.com> 2 3 Reviewed by Hyatt. 4 5 Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=8273 6 REGRESSION: Read only input text field renders at the wrong height when value attribute is not present 7 8 Test: fast/forms/input-readonly-empty.html 9 10 * rendering/RenderBlock.h: Added hasLineIfEmpty. 11 * rendering/RenderBlock.cpp: 12 (WebCore::RenderBlock::hasLineIfEmpty): Added. Checks for rootEditableElement as well as 13 a shadowNode who has an input element as a parent. 14 (WebCore::RenderBlock::getBaselineOfLastLineBox): Calls hasLineIfEmpty instead of just checking for the rootEditableElement. 15 * rendering/bidi.cpp: (WebCore::RenderBlock::layoutInlineChildren): ditto. 16 1 17 2006-04-20 Darin Adler <darin@apple.com> 2 18 -
trunk/WebCore/rendering/RenderBlock.cpp
r13911 r13988 3192 3192 } 3193 3193 3194 bool RenderBlock::hasLineIfEmpty() const 3195 { 3196 return element() && (element()->isContentEditable() && element()->rootEditableElement() == element() || 3197 element()->isShadowNode() && element()->shadowParentNode()->hasTagName(inputTag)); 3198 } 3199 3194 3200 short RenderBlock::lineHeight(bool b, bool isRootLineBox) const 3195 3201 { … … 3260 3266 3261 3267 if (childrenInline()) { 3262 if (!firstLineBox() && element() && element()->isContentEditable() && element()->rootEditableElement() == element())3268 if (!firstLineBox() && hasLineIfEmpty()) 3263 3269 return RenderFlow::baselinePosition(true) + borderTop() + paddingTop(); 3264 3270 if (m_lastLineBox) -
trunk/WebCore/rendering/RenderBlock.h
r13859 r13988 277 277 Position positionForRenderer(RenderObject *renderer, bool start=true) const; 278 278 279 bool hasLineIfEmpty() const; 280 279 281 protected: 280 282 struct FloatingObject { -
trunk/WebCore/rendering/bidi.cpp
r13971 r13988 1723 1723 } 1724 1724 1725 if (!firstLineBox() && element() && element()->isContentEditable() && element()->rootEditableElement() == element())1725 if (!firstLineBox() && hasLineIfEmpty()) 1726 1726 m_height += lineHeight(true); 1727 1727
Note: See TracChangeset
for help on using the changeset viewer.