Changeset 147939 in webkit


Ignore:
Timestamp:
Apr 8, 2013 11:38:26 AM (11 years ago)
Author:
robert@webkit.org
Message:

Unreviewed, rolling out r147850.
​http://trac.webkit.org/changeset/147850
​https://bugs.webkit.org/show_bug.cgi?id=113706

Changeset crossed paths with 147505, which is the same fix.

Source/WebCore:

  • rendering/RenderBlockLineLayout.cpp:

(WebCore::inlineLogicalWidth):

LayoutTests:

  • fast/inline/inline-with-empty-inline-children-expected.txt:
  • fast/inline/inline-with-empty-inline-children.html:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r147937 r147939  
     12013-04-08  Robert Hogan  <robert@webkit.org>
     2
     3        Unreviewed, rolling out r147850.
     4        http://trac.webkit.org/changeset/147850
     5        https://bugs.webkit.org/show_bug.cgi?id=113706
     6
     7        Changeset crossed paths with 147505, which is the same fix.
     8
     9        * fast/inline/inline-with-empty-inline-children-expected.txt:
     10        * fast/inline/inline-with-empty-inline-children.html:
     11
    1122013-04-08  Max Vujovic  <mvujovic@adobe.com>
    213

  • trunk/LayoutTests/fast/inline/inline-with-empty-inline-children-expected.txt

    r147850 r147939  
    1 https://bugs.webkit.org/show_bug.cgi?id=95772: There should be seven green bars below with a PASS in each.
     1https://bugs.webkit.org/show_bug.cgi?id=95772: There should be six green bars below with a PASS in each.
    22
    33 PASS
    … …  
    77 PASS
    88 PASS
    9 Words
    10 PASS
    119

  • trunk/LayoutTests/fast/inline/inline-with-empty-inline-children.html

    r147850 r147939  
    55    .block { display: block; background: green; }
    66    .inline { display: inline; margin-left: 40px; font: 30px/1 Ahem;}
    7     .white-span { width: 50%; background: white; }
     7    span { width: 50%; background: white; }
    88    .absolute { position: absolute; }
    99    .float { float: left; }
    10     .inline-span { display: inline-block; }
    1110  </style>
    1211  <script src="../../resources/check-layout.js"></script>
    1312 </head>
    1413 <body>
    15   <p> https://bugs.webkit.org/show_bug.cgi?id=95772: There should be seven green bars below with a PASS in each. </p>
     14  <p> https://bugs.webkit.org/show_bug.cgi?id=95772: There should be six green bars below with a PASS in each. </p>
    1615  <div class="block">
    17    <div class="inline" data-expected-height="30"> <span class="absolute white-span"></span> <span class="absolute white-span"></span> </div>
     16   <div class="inline" data-expected-height="30"> <span class="absolute"></span> <span class="absolute"></span> </div>
    1817  </div>
    1918  <div class="block">
    20    <div class="inline" data-expected-height="30"><span class="absolute white-span"></span><span class="absolute"></span></div>
     19   <div class="inline" data-expected-height="30"><span class="absolute"></span><span class="absolute"></span></div>
    2120  </div>
    2221  <div class="block">
    23    <div class="inline" data-expected-height="30"><span class="float white-span"></span><span class="float white-span"></span></div>
     22   <div class="inline" data-expected-height="30"><span class="float"></span><span class="float"></span></div>
    2423  </div>
    2524  <div class="block">
    26    <div class="inline" data-expected-height="30"> <span class="float white-span"></span> <span class="float white-span"></span></div>
     25   <div class="inline" data-expected-height="30"> <span class="float"></span> <span class="float"></span></div>
    2726  </div>
    2827  <div class="block">
    29    <div class="inline" data-expected-height="30"><span class="white-span"></span><span class="white-span"></span></div>
     28   <div class="inline" data-expected-height="30"><span></span><span></span></div>
    3029  </div>
    3130  <div class="block">
    32    <div class="inline" data-expected-height="30"> <span class="white-span"></span> <span class="white-span"></span></div>
    33   </div>
    34   <div class="block">
    35      <span class="inline-span" data-expected-height="30"><div class="inline"> <div class="float"> Words </div></div></span>
     31   <div class="inline" data-expected-height="30"> <span></span> <span></span></div>
    3632  </div>
    3733  <script>
    3834   checkLayout('body > div > div')
    39    checkLayout('body > div > span')
    4035  </script>
    4136 </body>

  • trunk/Source/WebCore/ChangeLog

    r147938 r147939  
     12013-04-08  Robert Hogan  <robert@webkit.org>
     2
     3        Unreviewed, rolling out r147850.
     4        http://trac.webkit.org/changeset/147850
     5        https://bugs.webkit.org/show_bug.cgi?id=113706
     6
     7        Changeset crossed paths with 147505, which is the same fix.
     8
     9        * rendering/RenderBlockLineLayout.cpp:
     10        (WebCore::inlineLogicalWidth):
     11
    1122013-04-08  Alexey Proskuryakov  <ap@apple.com>
    213

  • trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

    r147850 r147939  
    333333    LayoutUnit extraWidth = 0;
    334334    RenderObject* parent = child->parent();
    335     // Empty inline parents have added their inline border, padding and margin to the line already.
    336     while (parent->isRenderInline() && !isEmptyInline(parent) && lineDepth++ < cMaxLineDepth) {
     335    while (parent->isRenderInline() && lineDepth++ < cMaxLineDepth) {
    337336        RenderInline* parentAsRenderInline = toRenderInline(parent);
    338337        if (!isEmptyInline(parentAsRenderInline)) {
Note: See TracChangeset for help on using the changeset viewer.