Changeset 141606 in webkit


Ignore:
Timestamp:
Feb 1, 2013 10:45:27 AM (11 years ago)
Author:
robert@webkit.org
Message:

Padding in a parent inline preceding an empty inline child should be counted towards width
https://bugs.webkit.org/show_bug.cgi?id=108226

Reviewed by Levi Weintraub.

Source/WebCore:

Add the border/padding/margin from an empty inline's parent inline if it is the first or last
child of the inline.

Tests: fast/inline/parent-inline-element-padding-contributes-width.html

fast/inline/positioned-element-padding-contributes-width.html

  • rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::LineBreaker::nextSegmentBreak):

LayoutTests:

  • fast/inline/parent-inline-element-padding-contributes-width-expected.txt: Added.
  • fast/inline/parent-inline-element-padding-contributes-width.html: Added.
  • fast/inline/positioned-element-padding-contributes-width-expected.txt: Added.
  • fast/inline/positioned-element-padding-contributes-width.html: Added.
Location:
trunk
Files:
4 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r141594 r141606  
     12013-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
    1132013-02-01  Pavel Feldman  <pfeldman@chromium.org>
    214
  • trunk/Source/WebCore/ChangeLog

    r141605 r141606  
     12013-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
    1172013-02-01  Tony Gentilcore  <tonyg@chromium.org>
    218
  • trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

    r141009 r141606  
    26572657            } else
    26582658                m_positionedObjects.append(box);
     2659            width.addUncommittedWidth(inlineLogicalWidth(current.m_obj));
    26592660        } else if (current.m_obj->isFloating()) {
    26602661            RenderBox* floatBox = toRenderBox(current.m_obj);
     
    27012702            }
    27022703
    2703             width.addUncommittedWidth(borderPaddingMarginStart(flowBox) + borderPaddingMarginEnd(flowBox));
     2704            width.addUncommittedWidth(inlineLogicalWidth(current.m_obj) + borderPaddingMarginStart(flowBox) + borderPaddingMarginEnd(flowBox));
    27042705        } else if (current.m_obj->isReplaced()) {
    27052706            RenderBox* replacedBox = toRenderBox(current.m_obj);
Note: See TracChangeset for help on using the changeset viewer.