Changeset 168271 in webkit


Ignore:
Timestamp:
May 5, 2014 3:05:16 AM (10 years ago)
Author:
Carlos Garcia Campos
Message:

Merge r166428 - In some situations, partial layouts of floating elements produce incorrect results.
​https://bugs.webkit.org/show_bug.cgi?id=122668

Reviewed by David Hyatt.

Source/WebCore:

When performing partial layout of float elements and checking if other float
elements are encountered, incorrect results were obtained by not checking
the size of the existing floats vector.

Test: fast/block/float/floats-in-clean-line-crash.html

  • rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlockFlow::checkFloatsInCleanLine):

LayoutTests:

Added test to ensure an assertion is not reached when performing a partial
layout of float elements in certain situations.

  • fast/block/float/floats-in-clean-line-crash-expected.txt: Added.
  • fast/block/float/floats-in-clean-line-crash.html: Added.
Location:
releases/WebKitGTK/webkit-2.4
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog

    r168270 r168271  
     12014-03-28  Radu Stavila  <stavila@adobe.com>
     2
     3        In some situations, partial layouts of floating elements produce incorrect results.
     4        https://bugs.webkit.org/show_bug.cgi?id=122668
     5
     6        Reviewed by David Hyatt.
     7
     8        Added test to ensure an assertion is not reached when performing a partial
     9        layout of float elements in certain situations.
     10
     11        * fast/block/float/floats-in-clean-line-crash-expected.txt: Added.
     12        * fast/block/float/floats-in-clean-line-crash.html: Added.
     13
    1142014-03-28  Myles C. Maxfield  <mmaxfield@apple.com>
    215

  • releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog

    r168270 r168271  
     12014-03-28  Radu Stavila  <stavila@adobe.com>
     2
     3        In some situations, partial layouts of floating elements produce incorrect results.
     4        https://bugs.webkit.org/show_bug.cgi?id=122668
     5
     6        Reviewed by David Hyatt.
     7
     8        When performing partial layout of float elements and checking if other float
     9        elements are encountered, incorrect results were obtained by not checking
     10        the size of the existing floats vector.
     11
     12        Test: fast/block/float/floats-in-clean-line-crash.html
     13
     14        * rendering/RenderBlockLineLayout.cpp:
     15        (WebCore::RenderBlockFlow::checkFloatsInCleanLine):
     16
    1172014-03-28  Myles C. Maxfield  <mmaxfield@apple.com>
    218

  • releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderBlockLineLayout.cpp

    r162957 r168271  
    17311731    if (!cleanLineFloats)
    17321732        return;
     1733   
     1734    if (!floats.size()) {
     1735        encounteredNewFloat = true;
     1736        return;
     1737    }
    17331738
    17341739    for (auto it = cleanLineFloats->begin(), end = cleanLineFloats->end(); it != end; ++it) {
Note: See TracChangeset for help on using the changeset viewer.