Changeset 21847 in webkit


Ignore:
Timestamp:
May 28, 2007 1:15:38 PM (17 years ago)
Author:
weinig
Message:

LayoutTests:

Reviewed by Darin.

  • fast/forms/select-display-none-style-resolve-expected.checksum: Added.
  • fast/forms/select-display-none-style-resolve-expected.png: Added.
  • fast/forms/select-display-none-style-resolve-expected.txt: Added.
  • fast/forms/select-display-none-style-resolve.html: Added.

WebCore:

Reviewed by Darin.

Test: fast/forms/select-display-none-style-resolve.html

  • html/HTMLOptGroupElement.cpp: (WebCore::HTMLOptGroupElement::attach): Do not compute style if the parent does not have style.
  • html/HTMLOptionElement.cpp: (WebCore::HTMLOptionElement::attach): Ditto.
Location:
trunk
Files:
4 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r21842 r21847  
     12007-05-28  Mitz Pettel  <mitz@webkit.org>
     2
     3        Reviewed by Darin.
     4
     5        - test for http://bugs.webkit.org/show_bug.cgi?id=13896
     6          REGRESSION (NativePopup): Reproductible crasher on Google Coop control panel
     7
     8        * fast/forms/select-display-none-style-resolve-expected.checksum: Added.
     9        * fast/forms/select-display-none-style-resolve-expected.png: Added.
     10        * fast/forms/select-display-none-style-resolve-expected.txt: Added.
     11        * fast/forms/select-display-none-style-resolve.html: Added.
     12
    1132007-05-28  Sam Weinig  <sam@webkit.org>
    214
  • trunk/WebCore/ChangeLog

    r21843 r21847  
     12007-05-28  Mitz Pettel  <mitz@webkit.org>
     2
     3        Reviewed by Darin.
     4
     5        - fix http://bugs.webkit.org/show_bug.cgi?id=13896
     6          REGRESSION (NativePopup): Reproductible crasher on Google Coop control panel
     7
     8        Test: fast/forms/select-display-none-style-resolve.html
     9
     10        * html/HTMLOptGroupElement.cpp:
     11        (WebCore::HTMLOptGroupElement::attach): Do not compute style if the parent
     12        does not have style.
     13        * html/HTMLOptionElement.cpp:
     14        (WebCore::HTMLOptionElement::attach): Ditto.
     15
    1162007-05-28  Sam Weinig  <sam@webkit.org>
    217
  • trunk/WebCore/html/HTMLOptGroupElement.cpp

    r21696 r21847  
    128128void HTMLOptGroupElement::attach()
    129129{
    130     RenderStyle* style = styleForRenderer(0);
    131     setRenderStyle(style);
    132     style->deref(document()->renderArena());
     130    if (parentNode()->renderStyle()) {
     131        RenderStyle* style = styleForRenderer(0);
     132        setRenderStyle(style);
     133        style->deref(document()->renderArena());
     134    }
    133135    HTMLGenericFormElement::attach();
    134136}
  • trunk/WebCore/html/HTMLOptionElement.cpp

    r21410 r21847  
    5757void HTMLOptionElement::attach()
    5858{
    59     RenderStyle* style = styleForRenderer(0);
    60     setRenderStyle(style);
    61     style->deref(document()->renderArena());
     59    if (parentNode()->renderStyle()) {
     60        RenderStyle* style = styleForRenderer(0);
     61        setRenderStyle(style);
     62        style->deref(document()->renderArena());
     63    }
    6264    HTMLGenericFormElement::attach();
    6365}
Note: See TracChangeset for help on using the changeset viewer.