Changeset 141606 in webkit
- Timestamp:
- Feb 1, 2013 10:45:27 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r141594 r141606 1 2013-02-01 Robert Hogan <robert@webkit.org> 2 3 Padding in a parent inline preceding an empty inline child should be counted towards width 4 https://bugs.webkit.org/show_bug.cgi?id=108226 5 6 Reviewed by Levi Weintraub. 7 8 * fast/inline/parent-inline-element-padding-contributes-width-expected.txt: Added. 9 * fast/inline/parent-inline-element-padding-contributes-width.html: Added. 10 * fast/inline/positioned-element-padding-contributes-width-expected.txt: Added. 11 * fast/inline/positioned-element-padding-contributes-width.html: Added. 12 1 13 2013-02-01 Pavel Feldman <pfeldman@chromium.org> 2 14 -
trunk/Source/WebCore/ChangeLog
r141605 r141606 1 2013-02-01 Robert Hogan <robert@webkit.org> 2 3 Padding in a parent inline preceding an empty inline child should be counted towards width 4 https://bugs.webkit.org/show_bug.cgi?id=108226 5 6 Reviewed by Levi Weintraub. 7 8 Add the border/padding/margin from an empty inline's parent inline if it is the first or last 9 child of the inline. 10 11 Tests: fast/inline/parent-inline-element-padding-contributes-width.html 12 fast/inline/positioned-element-padding-contributes-width.html 13 14 * rendering/RenderBlockLineLayout.cpp: 15 (WebCore::RenderBlock::LineBreaker::nextSegmentBreak): 16 1 17 2013-02-01 Tony Gentilcore <tonyg@chromium.org> 2 18 -
trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp
r141009 r141606 2657 2657 } else 2658 2658 m_positionedObjects.append(box); 2659 width.addUncommittedWidth(inlineLogicalWidth(current.m_obj)); 2659 2660 } else if (current.m_obj->isFloating()) { 2660 2661 RenderBox* floatBox = toRenderBox(current.m_obj); … … 2701 2702 } 2702 2703 2703 width.addUncommittedWidth( borderPaddingMarginStart(flowBox) + borderPaddingMarginEnd(flowBox));2704 width.addUncommittedWidth(inlineLogicalWidth(current.m_obj) + borderPaddingMarginStart(flowBox) + borderPaddingMarginEnd(flowBox)); 2704 2705 } else if (current.m_obj->isReplaced()) { 2705 2706 RenderBox* replacedBox = toRenderBox(current.m_obj);
Note: See TracChangeset
for help on using the changeset viewer.