Changeset 81088 in webkit


Ignore:
Timestamp:
Mar 14, 2011, 5:53:53 PM (14 years ago)
Author:
tkent@chromium.org
Message:

Assertion failure by form validation message for <select required> with float:left
​https://bugs.webkit.org/show_bug.cgi?id=55995

Reviewed by James Robinson.

Source/WebCore:

Test: fast/forms/interactive-validation-select-crash.html

  • rendering/RenderBlock.cpp:

(WebCore::canMergeContiguousAnonymousBlocks):

isAnonymousBlock() doesn't mean it is a RenderBlock. We need to check isRenderBlock().

LayoutTests:

  • fast/forms/interactive-validation-select-crash-expected.txt: Added.
  • fast/forms/interactive-validation-select-crash.html: Added.
  • platform/gtk/Skipped:
  • platform/mac/Skipped:
  • platform/qt/Skipped:
  • platform/win/Skipped:
Location:
trunk
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r81085 r81088  
     12011-03-14  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by James Robinson.
     4
     5        Assertion failure by form validation message for <select required> with float:left
     6        https://bugs.webkit.org/show_bug.cgi?id=55995
     7
     8        * fast/forms/interactive-validation-select-crash-expected.txt: Added.
     9        * fast/forms/interactive-validation-select-crash.html: Added.
     10        * platform/gtk/Skipped:
     11        * platform/mac/Skipped:
     12        * platform/qt/Skipped:
     13        * platform/win/Skipped:
     14
    1152011-03-14  Michael Saboff  <msaboff@apple.com>
    216

  • trunk/LayoutTests/platform/gtk/Skipped

    r81030 r81088  
    11181118fast/forms/interactive-validation-attach-assertion.html
    11191119fast/forms/interactive-validation-assertion-by-validate-twice.html
     1120fast/forms/interactive-validation-select-crash.html
    11201121
    11211122# Tests that seem to be Mac only, assume that smart drag-and-drop

  • trunk/LayoutTests/platform/mac/Skipped

    r81030 r81088  
    207207fast/forms/interactive-validation-attach-assertion.html
    208208fast/forms/interactive-validation-assertion-by-validate-twice.html
     209fast/forms/interactive-validation-select-crash.html
    209210
    210211# Web Timing is not enabled.

  • trunk/LayoutTests/platform/qt/Skipped

    r81030 r81088  
    29702970fast/forms/interactive-validation-attach-assertion.html
    29712971fast/forms/interactive-validation-assertion-by-validate-twice.html
     2972fast/forms/interactive-validation-select-crash.html
    29722973
    29732974# [Qt] REGRESSION(63862): animations/play-state.html fails intermittently

  • trunk/LayoutTests/platform/win/Skipped

    r81030 r81088  
    10671067fast/forms/interactive-validation-attach-assertion.html
    10681068fast/forms/interactive-validation-assertion-by-validate-twice.html
     1069fast/forms/interactive-validation-select-crash.html
    10691070
    10701071# Web Timing is not enabled.

  • trunk/Source/WebCore/ChangeLog

    r81084 r81088  
     12011-03-14  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by James Robinson.
     4
     5        Assertion failure by form validation message for <select required> with float:left
     6        https://bugs.webkit.org/show_bug.cgi?id=55995
     7
     8        Test: fast/forms/interactive-validation-select-crash.html
     9
     10        * rendering/RenderBlock.cpp:
     11        (WebCore::canMergeContiguousAnonymousBlocks):
     12          isAnonymousBlock() doesn't mean it is a RenderBlock. We need to check isRenderBlock().
     13
    1142011-03-14  Balazs Kelemen  <kbalazs@webkit.org>
    215

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

    r80883 r81088  
    934934        return false;
    935935
    936     if ((prev && (!prev->isAnonymousBlock() || toRenderBlock(prev)->continuation() || toRenderBlock(prev)->beingDestroyed()))
    937         || (next && (!next->isAnonymousBlock() || toRenderBlock(next)->continuation() || toRenderBlock(next)->beingDestroyed())))
     936    if ((prev && (!prev->isAnonymousBlock() || !prev->isRenderBlock() || toRenderBlock(prev)->continuation() || toRenderBlock(prev)->beingDestroyed()))
     937        || (next && (!next->isAnonymousBlock() || !next->isRenderBlock() || toRenderBlock(next)->continuation() || toRenderBlock(next)->beingDestroyed())))
    938938        return false;
    939939
Note: See TracChangeset for help on using the changeset viewer.