Changeset 173571 in webkit


Ignore:
Timestamp:
Sep 12, 2014 1:33:36 PM (10 years ago)
Author:
Yusuke Suzuki
Message:

ASSERTION FAILED: e in WebCore::StyleResolver::adjustRenderStyle
​https://bugs.webkit.org/show_bug.cgi?id=136366

Reviewed by Benjamin Poulain.

Source/WebCore:

Since element becomes nullptr when resolving styles for pseudo elements,
so don't do ASSERT(e) and use pointer for that.

Test: fast/css/appearance-with-pseudo-elements.html

  • css/StyleResolver.cpp:

(WebCore::StyleResolver::adjustRenderStyle):

  • html/shadow/SliderThumbElement.cpp:

(WebCore::RenderSliderThumb::updateAppearance):

  • platform/efl/RenderThemeEfl.cpp:

(WebCore::RenderThemeEfl::adjustSliderTrackStyle):
(WebCore::RenderThemeEfl::adjustSliderThumbStyle):
(WebCore::RenderThemeEfl::adjustSliderThumbSize):
(WebCore::RenderThemeEfl::adjustCheckboxStyle):
(WebCore::RenderThemeEfl::adjustRadioStyle):
(WebCore::RenderThemeEfl::adjustButtonStyle):
(WebCore::RenderThemeEfl::adjustMenuListStyle):
(WebCore::RenderThemeEfl::adjustMenuListButtonStyle):
(WebCore::RenderThemeEfl::adjustTextFieldStyle):
(WebCore::RenderThemeEfl::adjustTextAreaStyle):
(WebCore::RenderThemeEfl::adjustSearchFieldResultsButtonStyle):
(WebCore::RenderThemeEfl::adjustSearchFieldResultsDecorationPartStyle):
(WebCore::RenderThemeEfl::adjustSearchFieldCancelButtonStyle):
(WebCore::RenderThemeEfl::adjustSearchFieldStyle):
(WebCore::RenderThemeEfl::adjustInnerSpinButtonStyle):
(WebCore::RenderThemeEfl::adjustProgressBarStyle):

  • platform/efl/RenderThemeEfl.h:
  • platform/gtk/RenderThemeGtk.h:
  • rendering/RenderTheme.cpp:

(WebCore::RenderTheme::adjustStyle):
(WebCore::RenderTheme::adjustCheckboxStyle):
(WebCore::RenderTheme::adjustRadioStyle):
(WebCore::RenderTheme::adjustButtonStyle):
(WebCore::RenderTheme::adjustInnerSpinButtonStyle):
(WebCore::RenderTheme::adjustTextFieldStyle):
(WebCore::RenderTheme::adjustTextAreaStyle):
(WebCore::RenderTheme::adjustMenuListStyle):
(WebCore::RenderTheme::adjustMeterStyle):
(WebCore::RenderTheme::adjustProgressBarStyle):
(WebCore::RenderTheme::adjustMenuListButtonStyle):
(WebCore::RenderTheme::adjustMediaControlStyle):
(WebCore::RenderTheme::adjustSliderTrackStyle):
(WebCore::RenderTheme::adjustSliderThumbStyle):
(WebCore::RenderTheme::adjustSliderThumbSize):
(WebCore::RenderTheme::adjustSearchFieldStyle):
(WebCore::RenderTheme::adjustSearchFieldCancelButtonStyle):
(WebCore::RenderTheme::adjustSearchFieldDecorationPartStyle):
(WebCore::RenderTheme::adjustSearchFieldResultsDecorationPartStyle):
(WebCore::RenderTheme::adjustSearchFieldResultsButtonStyle):

  • rendering/RenderTheme.h:
  • rendering/RenderThemeGtk.cpp:

(WebCore::RenderThemeGtk::adjustButtonStyle):
(WebCore::RenderThemeGtk::adjustMenuListStyle):
(WebCore::RenderThemeGtk::adjustMenuListButtonStyle):
(WebCore::RenderThemeGtk::adjustSearchFieldResultsButtonStyle):
(WebCore::RenderThemeGtk::adjustSearchFieldResultsDecorationPartStyle):
(WebCore::RenderThemeGtk::adjustSearchFieldCancelButtonStyle):
(WebCore::RenderThemeGtk::adjustSearchFieldStyle):
(WebCore::RenderThemeGtk::adjustSliderTrackStyle):
(WebCore::RenderThemeGtk::adjustSliderThumbStyle):
(WebCore::RenderThemeGtk::adjustSliderThumbSize):
(WebCore::RenderThemeGtk::adjustInnerSpinButtonStyle):
(WebCore::RenderThemeGtk::adjustProgressBarStyle):

  • rendering/RenderThemeIOS.h:
  • rendering/RenderThemeIOS.mm:

(WebCore::RenderThemeIOS::adjustCheckboxStyle):
(WebCore::RenderThemeIOS::adjustRadioStyle):
(WebCore::RenderThemeIOS::adjustMenuListButtonStyle):
(WebCore::RenderThemeIOS::adjustSliderTrackStyle):
(WebCore::RenderThemeIOS::adjustSliderThumbSize):
(WebCore::RenderThemeIOS::adjustSearchFieldStyle):
(WebCore::RenderThemeIOS::adjustButtonStyle):

  • rendering/RenderThemeMac.h:
  • rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::adjustTextFieldStyle):
(WebCore::RenderThemeMac::adjustTextAreaStyle):
(WebCore::RenderThemeMac::adjustProgressBarStyle):
(WebCore::RenderThemeMac::adjustMenuListStyle):
(WebCore::RenderThemeMac::adjustMenuListButtonStyle):
(WebCore::RenderThemeMac::adjustSliderTrackStyle):
(WebCore::RenderThemeMac::adjustSliderThumbStyle):
(WebCore::RenderThemeMac::adjustSearchFieldStyle):
(WebCore::RenderThemeMac::adjustSearchFieldCancelButtonStyle):
(WebCore::RenderThemeMac::adjustSearchFieldDecorationPartStyle):
(WebCore::RenderThemeMac::adjustSearchFieldResultsDecorationPartStyle):
(WebCore::RenderThemeMac::adjustSearchFieldResultsButtonStyle):
(WebCore::RenderThemeMac::adjustSliderThumbSize):

  • rendering/RenderThemeSafari.cpp:

(WebCore::RenderThemeSafari::adjustButtonStyle):
(WebCore::RenderThemeSafari::adjustTextFieldStyle):
(WebCore::RenderThemeSafari::adjustTextAreaStyle):
(WebCore::RenderThemeSafari::adjustMenuListStyle):
(WebCore::RenderThemeSafari::adjustMenuListButtonStyle):
(WebCore::RenderThemeSafari::adjustSliderThumbStyle):
(WebCore::RenderThemeSafari::adjustSliderThumbSize):
(WebCore::RenderThemeSafari::adjustSearchFieldStyle):
(WebCore::RenderThemeSafari::adjustSearchFieldCancelButtonStyle):
(WebCore::RenderThemeSafari::adjustSearchFieldDecorationPartStyle):
(WebCore::RenderThemeSafari::adjustSearchFieldResultsDecorationPartStyle):
(WebCore::RenderThemeSafari::adjustSearchFieldResultsButtonStyle):
(WebCore::RenderThemeSafari::adjustMeterStyle):

  • rendering/RenderThemeSafari.h:
  • rendering/RenderThemeWin.cpp:

(WebCore::RenderThemeWin::adjustInnerSpinButtonStyle):
(WebCore::RenderThemeWin::adjustMenuListStyle):
(WebCore::RenderThemeWin::adjustMenuListButtonStyle):
(WebCore::RenderThemeWin::adjustSliderThumbSize):
(WebCore::RenderThemeWin::adjustSearchFieldStyle):
(WebCore::RenderThemeWin::adjustSearchFieldCancelButtonStyle):
(WebCore::RenderThemeWin::adjustSearchFieldDecorationPartStyle):
(WebCore::RenderThemeWin::adjustSearchFieldResultsDecorationPartStyle):
(WebCore::RenderThemeWin::adjustSearchFieldResultsButtonStyle):
(WebCore::RenderThemeWin::adjustMeterStyle):

  • rendering/RenderThemeWin.h:

LayoutTests:

  • fast/css/appearance-with-pseudo-elements-expected.html: Added.
  • fast/css/appearance-with-pseudo-elements.html: Added.
Location:
trunk
Files:
2 added
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r173556 r173571  
     12014-09-12  Yusuke Suzuki  <utatane.tea@gmail.com>
     2
     3        ASSERTION FAILED: e in WebCore::StyleResolver::adjustRenderStyle
     4        https://bugs.webkit.org/show_bug.cgi?id=136366
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * fast/css/appearance-with-pseudo-elements-expected.html: Added.
     9        * fast/css/appearance-with-pseudo-elements.html: Added.
     10
    1112014-09-11  Alexey Proskuryakov  <ap@apple.com>
    212

  • trunk/Source/WebCore/ChangeLog

    r173570 r173571  
     12014-09-12  Yusuke Suzuki  <utatane.tea@gmail.com>
     2
     3        ASSERTION FAILED: e in WebCore::StyleResolver::adjustRenderStyle
     4        https://bugs.webkit.org/show_bug.cgi?id=136366
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Since element becomes nullptr when resolving styles for pseudo elements,
     9        so don't do `ASSERT(e)` and use pointer for that.
     10
     11        Test: fast/css/appearance-with-pseudo-elements.html
     12
     13        * css/StyleResolver.cpp:
     14        (WebCore::StyleResolver::adjustRenderStyle):
     15        * html/shadow/SliderThumbElement.cpp:
     16        (WebCore::RenderSliderThumb::updateAppearance):
     17        * platform/efl/RenderThemeEfl.cpp:
     18        (WebCore::RenderThemeEfl::adjustSliderTrackStyle):
     19        (WebCore::RenderThemeEfl::adjustSliderThumbStyle):
     20        (WebCore::RenderThemeEfl::adjustSliderThumbSize):
     21        (WebCore::RenderThemeEfl::adjustCheckboxStyle):
     22        (WebCore::RenderThemeEfl::adjustRadioStyle):
     23        (WebCore::RenderThemeEfl::adjustButtonStyle):
     24        (WebCore::RenderThemeEfl::adjustMenuListStyle):
     25        (WebCore::RenderThemeEfl::adjustMenuListButtonStyle):
     26        (WebCore::RenderThemeEfl::adjustTextFieldStyle):
     27        (WebCore::RenderThemeEfl::adjustTextAreaStyle):
     28        (WebCore::RenderThemeEfl::adjustSearchFieldResultsButtonStyle):
     29        (WebCore::RenderThemeEfl::adjustSearchFieldResultsDecorationPartStyle):
     30        (WebCore::RenderThemeEfl::adjustSearchFieldCancelButtonStyle):
     31        (WebCore::RenderThemeEfl::adjustSearchFieldStyle):
     32        (WebCore::RenderThemeEfl::adjustInnerSpinButtonStyle):
     33        (WebCore::RenderThemeEfl::adjustProgressBarStyle):
     34        * platform/efl/RenderThemeEfl.h:
     35        * platform/gtk/RenderThemeGtk.h:
     36        * rendering/RenderTheme.cpp:
     37        (WebCore::RenderTheme::adjustStyle):
     38        (WebCore::RenderTheme::adjustCheckboxStyle):
     39        (WebCore::RenderTheme::adjustRadioStyle):
     40        (WebCore::RenderTheme::adjustButtonStyle):
     41        (WebCore::RenderTheme::adjustInnerSpinButtonStyle):
     42        (WebCore::RenderTheme::adjustTextFieldStyle):
     43        (WebCore::RenderTheme::adjustTextAreaStyle):
     44        (WebCore::RenderTheme::adjustMenuListStyle):
     45        (WebCore::RenderTheme::adjustMeterStyle):
     46        (WebCore::RenderTheme::adjustProgressBarStyle):
     47        (WebCore::RenderTheme::adjustMenuListButtonStyle):
     48        (WebCore::RenderTheme::adjustMediaControlStyle):
     49        (WebCore::RenderTheme::adjustSliderTrackStyle):
     50        (WebCore::RenderTheme::adjustSliderThumbStyle):
     51        (WebCore::RenderTheme::adjustSliderThumbSize):
     52        (WebCore::RenderTheme::adjustSearchFieldStyle):
     53        (WebCore::RenderTheme::adjustSearchFieldCancelButtonStyle):
     54        (WebCore::RenderTheme::adjustSearchFieldDecorationPartStyle):
     55        (WebCore::RenderTheme::adjustSearchFieldResultsDecorationPartStyle):
     56        (WebCore::RenderTheme::adjustSearchFieldResultsButtonStyle):
     57        * rendering/RenderTheme.h:
     58        * rendering/RenderThemeGtk.cpp:
     59        (WebCore::RenderThemeGtk::adjustButtonStyle):
     60        (WebCore::RenderThemeGtk::adjustMenuListStyle):
     61        (WebCore::RenderThemeGtk::adjustMenuListButtonStyle):
     62        (WebCore::RenderThemeGtk::adjustSearchFieldResultsButtonStyle):
     63        (WebCore::RenderThemeGtk::adjustSearchFieldResultsDecorationPartStyle):
     64        (WebCore::RenderThemeGtk::adjustSearchFieldCancelButtonStyle):
     65        (WebCore::RenderThemeGtk::adjustSearchFieldStyle):
     66        (WebCore::RenderThemeGtk::adjustSliderTrackStyle):
     67        (WebCore::RenderThemeGtk::adjustSliderThumbStyle):
     68        (WebCore::RenderThemeGtk::adjustSliderThumbSize):
     69        (WebCore::RenderThemeGtk::adjustInnerSpinButtonStyle):
     70        (WebCore::RenderThemeGtk::adjustProgressBarStyle):
     71        * rendering/RenderThemeIOS.h:
     72        * rendering/RenderThemeIOS.mm:
     73        (WebCore::RenderThemeIOS::adjustCheckboxStyle):
     74        (WebCore::RenderThemeIOS::adjustRadioStyle):
     75        (WebCore::RenderThemeIOS::adjustMenuListButtonStyle):
     76        (WebCore::RenderThemeIOS::adjustSliderTrackStyle):
     77        (WebCore::RenderThemeIOS::adjustSliderThumbSize):
     78        (WebCore::RenderThemeIOS::adjustSearchFieldStyle):
     79        (WebCore::RenderThemeIOS::adjustButtonStyle):
     80        * rendering/RenderThemeMac.h:
     81        * rendering/RenderThemeMac.mm:
     82        (WebCore::RenderThemeMac::adjustTextFieldStyle):
     83        (WebCore::RenderThemeMac::adjustTextAreaStyle):
     84        (WebCore::RenderThemeMac::adjustProgressBarStyle):
     85        (WebCore::RenderThemeMac::adjustMenuListStyle):
     86        (WebCore::RenderThemeMac::adjustMenuListButtonStyle):
     87        (WebCore::RenderThemeMac::adjustSliderTrackStyle):
     88        (WebCore::RenderThemeMac::adjustSliderThumbStyle):
     89        (WebCore::RenderThemeMac::adjustSearchFieldStyle):
     90        (WebCore::RenderThemeMac::adjustSearchFieldCancelButtonStyle):
     91        (WebCore::RenderThemeMac::adjustSearchFieldDecorationPartStyle):
     92        (WebCore::RenderThemeMac::adjustSearchFieldResultsDecorationPartStyle):
     93        (WebCore::RenderThemeMac::adjustSearchFieldResultsButtonStyle):
     94        (WebCore::RenderThemeMac::adjustSliderThumbSize):
     95        * rendering/RenderThemeSafari.cpp:
     96        (WebCore::RenderThemeSafari::adjustButtonStyle):
     97        (WebCore::RenderThemeSafari::adjustTextFieldStyle):
     98        (WebCore::RenderThemeSafari::adjustTextAreaStyle):
     99        (WebCore::RenderThemeSafari::adjustMenuListStyle):
     100        (WebCore::RenderThemeSafari::adjustMenuListButtonStyle):
     101        (WebCore::RenderThemeSafari::adjustSliderThumbStyle):
     102        (WebCore::RenderThemeSafari::adjustSliderThumbSize):
     103        (WebCore::RenderThemeSafari::adjustSearchFieldStyle):
     104        (WebCore::RenderThemeSafari::adjustSearchFieldCancelButtonStyle):
     105        (WebCore::RenderThemeSafari::adjustSearchFieldDecorationPartStyle):
     106        (WebCore::RenderThemeSafari::adjustSearchFieldResultsDecorationPartStyle):
     107        (WebCore::RenderThemeSafari::adjustSearchFieldResultsButtonStyle):
     108        (WebCore::RenderThemeSafari::adjustMeterStyle):
     109        * rendering/RenderThemeSafari.h:
     110        * rendering/RenderThemeWin.cpp:
     111        (WebCore::RenderThemeWin::adjustInnerSpinButtonStyle):
     112        (WebCore::RenderThemeWin::adjustMenuListStyle):
     113        (WebCore::RenderThemeWin::adjustMenuListButtonStyle):
     114        (WebCore::RenderThemeWin::adjustSliderThumbSize):
     115        (WebCore::RenderThemeWin::adjustSearchFieldStyle):
     116        (WebCore::RenderThemeWin::adjustSearchFieldCancelButtonStyle):
     117        (WebCore::RenderThemeWin::adjustSearchFieldDecorationPartStyle):
     118        (WebCore::RenderThemeWin::adjustSearchFieldResultsDecorationPartStyle):
     119        (WebCore::RenderThemeWin::adjustSearchFieldResultsButtonStyle):
     120        (WebCore::RenderThemeWin::adjustMeterStyle):
     121        * rendering/RenderThemeWin.h:
     122
    11232014-09-12  Joseph Pecoraro  <pecoraro@apple.com>
    2124

  • trunk/Source/WebCore/css/StyleResolver.cpp

    r173499 r173571  
    13421342    // Let the theme also have a crack at adjusting the style.
    13431343    if (style.hasAppearance()) {
    1344         ASSERT(e);
    1345         RenderTheme::defaultTheme()->adjustStyle(*this, style, *e, m_state.hasUAAppearance(), m_state.borderData(), m_state.backgroundData(), m_state.backgroundColor());
     1344        RenderTheme::defaultTheme()->adjustStyle(*this, style, e, m_state.hasUAAppearance(), m_state.borderData(), m_state.backgroundData(), m_state.backgroundColor());
    13461345    }
    13471346

  • trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp

    r173328 r173571  
    9797    if (style().hasAppearance()) {
    9898        ASSERT(element());
    99         theme().adjustSliderThumbSize(style(), *element());
     99        theme().adjustSliderThumbSize(style(), element());
    100100    }
    101101}

  • trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp

    r173401 r173571  
    694694}
    695695
    696 void RenderThemeEfl::adjustSliderTrackStyle(StyleResolver&, RenderStyle& style, Element&) const
     696void RenderThemeEfl::adjustSliderTrackStyle(StyleResolver&, RenderStyle& style, Element*) const
    697697{
    698698    style.setBoxShadow(nullptr);
    699699}
    700700
    701 void RenderThemeEfl::adjustSliderThumbStyle(StyleResolver& styleResolver, RenderStyle& style, Element& element) const
     701void RenderThemeEfl::adjustSliderThumbStyle(StyleResolver& styleResolver, RenderStyle& style, Element* element) const
    702702{
    703703    RenderTheme::adjustSliderThumbStyle(styleResolver, style, element);
    … …  
    705705}
    706706
    707 void RenderThemeEfl::adjustSliderThumbSize(RenderStyle& style, Element&) const
     707void RenderThemeEfl::adjustSliderThumbSize(RenderStyle& style, Element*) const
    708708{
    709709    ControlPart part = style.appearance();
    … …  
    761761}
    762762
    763 void RenderThemeEfl::adjustCheckboxStyle(StyleResolver& styleResolver, RenderStyle& style, Element& element) const
    764 {
    765     if (!m_page && element.document().page()) {
    766         static_cast<RenderThemeEfl&>(element.document().page()->theme()).adjustCheckboxStyle(styleResolver, style, element);
     763void RenderThemeEfl::adjustCheckboxStyle(StyleResolver& styleResolver, RenderStyle& style, Element* element) const
     764{
     765    if (!m_page && element && element->document().page()) {
     766        static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustCheckboxStyle(styleResolver, style, element);
    767767        return;
    768768    }
    … …  
    784784}
    785785
    786 void RenderThemeEfl::adjustRadioStyle(StyleResolver& styleResolver, RenderStyle& style, Element& element) const
    787 {
    788     if (!m_page && element.document().page()) {
    789         static_cast<RenderThemeEfl&>(element.document().page()->theme()).adjustRadioStyle(styleResolver, style, element);
     786void RenderThemeEfl::adjustRadioStyle(StyleResolver& styleResolver, RenderStyle& style, Element* element) const
     787{
     788    if (!m_page && element && element->document().page()) {
     789        static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustRadioStyle(styleResolver, style, element);
    790790        return;
    791791    }
    … …  
    807807}
    808808
    809 void RenderThemeEfl::adjustButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element& element) const
    810 {
    811     if (!m_page && element.document().page()) {
    812         static_cast<RenderThemeEfl&>(element.document().page()->theme()).adjustButtonStyle(styleResolver, style, element);
     809void RenderThemeEfl::adjustButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element* element) const
     810{
     811    if (!m_page && element && element->document().page()) {
     812        static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustButtonStyle(styleResolver, style, element);
    813813        return;
    814814    }
    … …  
    824824}
    825825
    826 void RenderThemeEfl::adjustMenuListStyle(StyleResolver& styleResolver, RenderStyle& style, Element& element) const
    827 {
    828     if (!m_page && element.document().page()) {
    829         static_cast<RenderThemeEfl&>(element.document().page()->theme()).adjustMenuListStyle(styleResolver, style, element);
     826void RenderThemeEfl::adjustMenuListStyle(StyleResolver& styleResolver, RenderStyle& style, Element* element) const
     827{
     828    if (!m_page && element && element->document().page()) {
     829        static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustMenuListStyle(styleResolver, style, element);
    830830        return;
    831831    }
    … …  
    842842}
    843843
    844 void RenderThemeEfl::adjustMenuListButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element& element) const
     844void RenderThemeEfl::adjustMenuListButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element* element) const
    845845{
    846846    // Height is locked to auto if height is not specified.
    … …  
    863863}
    864864
    865 void RenderThemeEfl::adjustTextFieldStyle(StyleResolver& styleResolver, RenderStyle& style, Element& element) const
    866 {
    867     if (!m_page && element.document().page()) {
    868         static_cast<RenderThemeEfl&>(element.document().page()->theme()).adjustTextFieldStyle(styleResolver, style, element);
     865void RenderThemeEfl::adjustTextFieldStyle(StyleResolver& styleResolver, RenderStyle& style, Element* element) const
     866{
     867    if (!m_page && element && element->document().page()) {
     868        static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustTextFieldStyle(styleResolver, style, element);
    869869        return;
    870870    }
    … …  
    878878}
    879879
    880 void RenderThemeEfl::adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element&) const
     880void RenderThemeEfl::adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element*) const
    881881{
    882882}
    … …  
    887887}
    888888
    889 void RenderThemeEfl::adjustSearchFieldResultsButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element& element) const
    890 {
    891     if (!m_page && element.document().page()) {
    892         static_cast<RenderThemeEfl&>(element.document().page()->theme()).adjustSearchFieldResultsButtonStyle(styleResolver, style, element);
     889void RenderThemeEfl::adjustSearchFieldResultsButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element* element) const
     890{
     891    if (!m_page && element && element->document().page()) {
     892        static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustSearchFieldResultsButtonStyle(styleResolver, style, element);
    893893        return;
    894894    }
    … …  
    909909}
    910910
    911 void RenderThemeEfl::adjustSearchFieldResultsDecorationPartStyle(StyleResolver& styleResolver, RenderStyle& style, Element& element) const
    912 {
    913     if (!m_page && element.document().page()) {
    914         static_cast<RenderThemeEfl&>(element.document().page()->theme()).adjustSearchFieldResultsDecorationPartStyle(styleResolver, style, element);
     911void RenderThemeEfl::adjustSearchFieldResultsDecorationPartStyle(StyleResolver& styleResolver, RenderStyle& style, Element* element) const
     912{
     913    if (!m_page && element && element->document().page()) {
     914        static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustSearchFieldResultsDecorationPartStyle(styleResolver, style, element);
    915915        return;
    916916    }
    … …  
    931931}
    932932
    933 void RenderThemeEfl::adjustSearchFieldCancelButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element& element) const
    934 {
    935     if (!m_page && element.document().page()) {
    936         static_cast<RenderThemeEfl&>(element.document().page()->theme()).adjustSearchFieldCancelButtonStyle(styleResolver, style, element);
     933void RenderThemeEfl::adjustSearchFieldCancelButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element* element) const
     934{
     935    if (!m_page && element && element->document().page()) {
     936        static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustSearchFieldCancelButtonStyle(styleResolver, style, element);
    937937        return;
    938938    }
    … …  
    955955}
    956956
    957 void RenderThemeEfl::adjustSearchFieldStyle(StyleResolver& styleResolver, RenderStyle& style, Element& element) const
    958 {
    959     if (!m_page && element.document().page()) {
    960         static_cast<RenderThemeEfl&>(element.document().page()->theme()).adjustSearchFieldStyle(styleResolver, style, element);
     957void RenderThemeEfl::adjustSearchFieldStyle(StyleResolver& styleResolver, RenderStyle& style, Element* element) const
     958{
     959    if (!m_page && element && element->document().page()) {
     960        static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustSearchFieldStyle(styleResolver, style, element);
    961961        return;
    962962    }
    … …  
    971971}
    972972
    973 void RenderThemeEfl::adjustInnerSpinButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element& element) const
    974 {
    975     if (!m_page && element.document().page()) {
    976         static_cast<RenderThemeEfl&>(element.document().page()->theme()).adjustInnerSpinButtonStyle(styleResolver, style, element);
     973void RenderThemeEfl::adjustInnerSpinButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element* element) const
     974{
     975    if (!m_page && element && element->document().page()) {
     976        static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustInnerSpinButtonStyle(styleResolver, style, element);
    977977        return;
    978978    }
    … …  
    10021002}
    10031003
    1004 void RenderThemeEfl::adjustProgressBarStyle(StyleResolver&, RenderStyle& style, Element&) const
     1004void RenderThemeEfl::adjustProgressBarStyle(StyleResolver&, RenderStyle& style, Element*) const
    10051005{
    10061006    style.setBoxShadow(nullptr);

  • trunk/Source/WebCore/platform/efl/RenderThemeEfl.h

    r170435 r173571  
    108108    virtual void systemFont(CSSValueID, FontDescription&) const override;
    109109
    110     virtual void adjustCheckboxStyle(StyleResolver&, RenderStyle&, Element&) const override;
     110    virtual void adjustCheckboxStyle(StyleResolver&, RenderStyle&, Element*) const override;
    111111    virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&) override;
    112112
    113     virtual void adjustRadioStyle(StyleResolver&, RenderStyle&, Element&) const override;
     113    virtual void adjustRadioStyle(StyleResolver&, RenderStyle&, Element*) const override;
    114114    virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&) override;
    115115
    116     virtual void adjustButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     116    virtual void adjustButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    117117    virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
    118118
    119     virtual void adjustTextFieldStyle(StyleResolver&, RenderStyle&, Element&) const override;
     119    virtual void adjustTextFieldStyle(StyleResolver&, RenderStyle&, Element*) const override;
    120120    virtual bool paintTextField(const RenderObject&, const PaintInfo&, const FloatRect&) override;
    121121
    122     virtual void adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element&) const override;
     122    virtual void adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element*) const override;
    123123    virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const FloatRect&) override;
    124124
    125     virtual void adjustMenuListStyle(StyleResolver&, RenderStyle&, Element&) const override;
     125    virtual void adjustMenuListStyle(StyleResolver&, RenderStyle&, Element*) const override;
    126126    virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const FloatRect&) override;
    127127
    128     virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     128    virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    129129    virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&) override;
    130130
    131     virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element&) const override;
     131    virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const override;
    132132    virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) override;
    133133
    134     virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element&) const override;
     134    virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element*) const override;
    135135    virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&) override;
    136136
    137     virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     137    virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    138138    virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
    139139
    140     virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     140    virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    141141    virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
    142142
    143     virtual void adjustSliderTrackStyle(StyleResolver&, RenderStyle&, Element&) const override;
     143    virtual void adjustSliderTrackStyle(StyleResolver&, RenderStyle&, Element*) const override;
    144144    virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
    145145
    146     virtual void adjustSliderThumbStyle(StyleResolver&, RenderStyle&, Element&) const override;
    147 
    148     virtual void adjustSliderThumbSize(RenderStyle&, Element&) const override;
     146    virtual void adjustSliderThumbStyle(StyleResolver&, RenderStyle&, Element*) const override;
     147
     148    virtual void adjustSliderThumbSize(RenderStyle&, Element*) const override;
    149149
    150150#if ENABLE(DATALIST_ELEMENT)
    … …  
    158158    virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) override;
    159159
    160     virtual void adjustInnerSpinButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     160    virtual void adjustInnerSpinButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    161161    virtual bool paintInnerSpinButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
    162162
    163163    static void setDefaultFontSize(int fontsize);
    164164
    165     virtual void adjustProgressBarStyle(StyleResolver&, RenderStyle&, Element&) const override;
     165    virtual void adjustProgressBarStyle(StyleResolver&, RenderStyle&, Element*) const override;
    166166    virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&) override;
    167167    virtual double animationRepeatIntervalForProgressBar(RenderProgress&) const override;

  • trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h

    r173110 r173571  
    111111    virtual void setRadioSize(RenderStyle&) const override;
    112112
    113     virtual void adjustButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     113    virtual void adjustButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    114114    virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
    115115
    … …  
    126126    // Aqua themed controls whenever possible. We always want to use GTK+ theming, so
    127127    // we don't maintain this differentiation.
    128     virtual void adjustMenuListStyle(StyleResolver&, RenderStyle&, Element&) const override;
    129     virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     128    virtual void adjustMenuListStyle(StyleResolver&, RenderStyle&, Element*) const override;
     129    virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    130130    virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const FloatRect&) override;
    131131    virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&) override;
    132132
    133     virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element&) const override;
     133    virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const override;
    134134    virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) override;
    135135
    136     virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element&) const override;
     136    virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element*) const override;
    137137    virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&) override;
    138138
    139     virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     139    virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    140140    virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&);
    141141
    142     virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     142    virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    143143    virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
    144144
    145145    virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
    146     virtual void adjustSliderTrackStyle(StyleResolver&, RenderStyle&, Element&) const override;
     146    virtual void adjustSliderTrackStyle(StyleResolver&, RenderStyle&, Element*) const override;
    147147
    148148    virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) override;
    149     virtual void adjustSliderThumbStyle(StyleResolver&, RenderStyle&, Element&) const override;
    150 
    151     virtual void adjustSliderThumbSize(RenderStyle&, Element&) const override;
     149    virtual void adjustSliderThumbStyle(StyleResolver&, RenderStyle&, Element*) const override;
     150
     151    virtual void adjustSliderThumbSize(RenderStyle&, Element*) const override;
    152152
    153153#if ENABLE(VIDEO)
    … …  
    173173    virtual double animationRepeatIntervalForProgressBar(RenderProgress&) const override;
    174174    virtual double animationDurationForProgressBar(RenderProgress&) const override;
    175     virtual void adjustProgressBarStyle(StyleResolver&, RenderStyle&, Element&) const override;
     175    virtual void adjustProgressBarStyle(StyleResolver&, RenderStyle&, Element*) const override;
    176176    virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&) override;
    177177
    178178    virtual bool paintCapsLockIndicator(const RenderObject&, const PaintInfo&, const IntRect&) override;
    179179
    180     virtual void adjustInnerSpinButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     180    virtual void adjustInnerSpinButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    181181    virtual bool paintInnerSpinButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
    182182

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

    r173441 r173571  
    7878}
    7979
    80 void RenderTheme::adjustStyle(StyleResolver& styleResolver, RenderStyle& style, Element& e, bool UAHasAppearance, const BorderData& border, const FillLayer& background, const Color& backgroundColor)
     80void RenderTheme::adjustStyle(StyleResolver& styleResolver, RenderStyle& style, Element* e, bool UAHasAppearance, const BorderData& border, const FillLayer& background, const Color& backgroundColor)
    8181{
    8282    // Force inline and table display styles to be inline-block (except for table- which is block)
    … …  
    883883#if !USE(NEW_THEME)
    884884
    885 void RenderTheme::adjustCheckboxStyle(StyleResolver&, RenderStyle& style, Element&) const
     885void RenderTheme::adjustCheckboxStyle(StyleResolver&, RenderStyle& style, Element*) const
    886886{
    887887    // A summary of the rules for checkbox designed to match WinIE:
    … …  
    900900}
    901901
    902 void RenderTheme::adjustRadioStyle(StyleResolver&, RenderStyle& style, Element&) const
     902void RenderTheme::adjustRadioStyle(StyleResolver&, RenderStyle& style, Element*) const
    903903{
    904904    // A summary of the rules for checkbox designed to match WinIE:
    … …  
    917917}
    918918
    919 void RenderTheme::adjustButtonStyle(StyleResolver&, RenderStyle& style, Element&) const
     919void RenderTheme::adjustButtonStyle(StyleResolver&, RenderStyle& style, Element*) const
    920920{
    921921    // Most platforms will completely honor all CSS, and so we have no need to
    … …  
    925925}
    926926
    927 void RenderTheme::adjustInnerSpinButtonStyle(StyleResolver&, RenderStyle&, Element&) const
    928 {
    929 }
    930 #endif
    931 
    932 void RenderTheme::adjustTextFieldStyle(StyleResolver&, RenderStyle&, Element&) const
    933 {
    934 }
    935 
    936 void RenderTheme::adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element&) const
    937 {
    938 }
    939 
    940 void RenderTheme::adjustMenuListStyle(StyleResolver&, RenderStyle&, Element&) const
     927void RenderTheme::adjustInnerSpinButtonStyle(StyleResolver&, RenderStyle&, Element*) const
     928{
     929}
     930#endif
     931
     932void RenderTheme::adjustTextFieldStyle(StyleResolver&, RenderStyle&, Element*) const
     933{
     934}
     935
     936void RenderTheme::adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element*) const
     937{
     938}
     939
     940void RenderTheme::adjustMenuListStyle(StyleResolver&, RenderStyle&, Element*) const
    941941{
    942942}
    943943
    944944#if ENABLE(METER_ELEMENT)
    945 void RenderTheme::adjustMeterStyle(StyleResolver&, RenderStyle& style, Element&) const
     945void RenderTheme::adjustMeterStyle(StyleResolver&, RenderStyle& style, Element*) const
    946946{
    947947    style.setBoxShadow(nullptr);
    … …  
    10641064}
    10651065
    1066 void RenderTheme::adjustProgressBarStyle(StyleResolver&, RenderStyle&, Element&) const
     1066void RenderTheme::adjustProgressBarStyle(StyleResolver&, RenderStyle&, Element*) const
    10671067{
    10681068}
    … …  
    10781078}
    10791079
    1080 void RenderTheme::adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element&) const
    1081 {
    1082 }
    1083 
    1084 void RenderTheme::adjustMediaControlStyle(StyleResolver&, RenderStyle&, Element&) const
    1085 {
    1086 }
    1087 
    1088 void RenderTheme::adjustSliderTrackStyle(StyleResolver&, RenderStyle&, Element&) const
    1089 {
    1090 }
    1091 
    1092 void RenderTheme::adjustSliderThumbStyle(StyleResolver&, RenderStyle& style, Element& element) const
     1080void RenderTheme::adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element*) const
     1081{
     1082}
     1083
     1084void RenderTheme::adjustMediaControlStyle(StyleResolver&, RenderStyle&, Element*) const
     1085{
     1086}
     1087
     1088void RenderTheme::adjustSliderTrackStyle(StyleResolver&, RenderStyle&, Element*) const
     1089{
     1090}
     1091
     1092void RenderTheme::adjustSliderThumbStyle(StyleResolver&, RenderStyle& style, Element* element) const
    10931093{
    10941094    adjustSliderThumbSize(style, element);
    10951095}
    10961096
    1097 void RenderTheme::adjustSliderThumbSize(RenderStyle&, Element&) const
    1098 {
    1099 }
    1100 
    1101 void RenderTheme::adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element&) const
    1102 {
    1103 }
    1104 
    1105 void RenderTheme::adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element&) const
    1106 {
    1107 }
    1108 
    1109 void RenderTheme::adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle&, Element&) const
    1110 {
    1111 }
    1112 
    1113 void RenderTheme::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element&) const
    1114 {
    1115 }
    1116 
    1117 void RenderTheme::adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element&) const
     1097void RenderTheme::adjustSliderThumbSize(RenderStyle&, Element*) const
     1098{
     1099}
     1100
     1101void RenderTheme::adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element*) const
     1102{
     1103}
     1104
     1105void RenderTheme::adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element*) const
     1106{
     1107}
     1108
     1109void RenderTheme::adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const
     1110{
     1111}
     1112
     1113void RenderTheme::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const
     1114{
     1115}
     1116
     1117void RenderTheme::adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element*) const
    11181118{
    11191119}

  • trunk/Source/WebCore/rendering/RenderTheme.h

    r172259 r173571  
    7474    // selection of control size based off the font, the disabling of appearance when certain other properties like
    7575    // "border" are set, or if the appearance is not supported by the theme.
    76     void adjustStyle(StyleResolver&, RenderStyle&, Element&,  bool UAHasAppearance, const BorderData&, const FillLayer&, const Color& backgroundColor);
     76    void adjustStyle(StyleResolver&, RenderStyle&, Element*,  bool UAHasAppearance, const BorderData&, const FillLayer&, const Color& backgroundColor);
    7777
    7878    // This method is called to paint the widget as a background of the RenderObject.  A widget's foreground, e.g., the
    … …  
    178178    virtual int minimumMenuListSize(RenderStyle&) const { return 0; }
    179179
    180     virtual void adjustSliderThumbSize(RenderStyle&, Element&) const;
     180    virtual void adjustSliderThumbSize(RenderStyle&, Element*) const;
    181181
    182182    virtual int popupInternalPaddingLeft(RenderStyle&) const { return 0; }
    … …  
    269269#if !USE(NEW_THEME)
    270270    // Methods for each appearance value.
    271     virtual void adjustCheckboxStyle(StyleResolver&, RenderStyle&, Element&) const;
     271    virtual void adjustCheckboxStyle(StyleResolver&, RenderStyle&, Element*) const;
    272272    virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    273273    virtual void setCheckboxSize(RenderStyle&) const { }
    274274
    275     virtual void adjustRadioStyle(StyleResolver&, RenderStyle&, Element&) const;
     275    virtual void adjustRadioStyle(StyleResolver&, RenderStyle&, Element*) const;
    276276    virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    277277    virtual void setRadioSize(RenderStyle&) const { }
    278278
    279     virtual void adjustButtonStyle(StyleResolver&, RenderStyle&, Element&) const;
     279    virtual void adjustButtonStyle(StyleResolver&, RenderStyle&, Element*) const;
    280280    virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    281281    virtual void setButtonSize(RenderStyle&) const { }
    282282
    283     virtual void adjustInnerSpinButtonStyle(StyleResolver&, RenderStyle&, Element&) const;
     283    virtual void adjustInnerSpinButtonStyle(StyleResolver&, RenderStyle&, Element*) const;
    284284    virtual bool paintInnerSpinButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    285285#endif
    … …  
    289289    virtual bool paintButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    290290
    291     virtual void adjustTextFieldStyle(StyleResolver&, RenderStyle&, Element&) const;
     291    virtual void adjustTextFieldStyle(StyleResolver&, RenderStyle&, Element*) const;
    292292    virtual bool paintTextField(const RenderObject&, const PaintInfo&, const FloatRect&) { return true; }
    293293    virtual bool paintTextFieldDecorations(const RenderObject&, const PaintInfo&, const FloatRect&) { return true; }
    294294
    295     virtual void adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element&) const;
     295    virtual void adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element*) const;
    296296    virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const FloatRect&) { return true; }
    297297    virtual bool paintTextAreaDecorations(const RenderObject&, const PaintInfo&, const FloatRect&) { return true; }
    298298
    299     virtual void adjustMenuListStyle(StyleResolver&, RenderStyle&, Element&) const;
     299    virtual void adjustMenuListStyle(StyleResolver&, RenderStyle&, Element*) const;
    300300    virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const FloatRect&) { return true; }
    301301    virtual bool paintMenuListDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    302302
    303     virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element&) const;
     303    virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element*) const;
    304304    virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&) { return true; }
    305305
    … …  
    308308
    309309#if ENABLE(METER_ELEMENT)
    310     virtual void adjustMeterStyle(StyleResolver&, RenderStyle&, Element&) const;
     310    virtual void adjustMeterStyle(StyleResolver&, RenderStyle&, Element*) const;
    311311    virtual bool paintMeter(const RenderObject&, const PaintInfo&, const IntRect&);
    312312#endif
    313313
    314     virtual void adjustProgressBarStyle(StyleResolver&, RenderStyle&, Element&) const;
     314    virtual void adjustProgressBarStyle(StyleResolver&, RenderStyle&, Element*) const;
    315315    virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    316316
    317     virtual void adjustSliderTrackStyle(StyleResolver&, RenderStyle&, Element&) const;
     317    virtual void adjustSliderTrackStyle(StyleResolver&, RenderStyle&, Element*) const;
    318318    virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    319319
    320     virtual void adjustSliderThumbStyle(StyleResolver&, RenderStyle&, Element&) const;
     320    virtual void adjustSliderThumbStyle(StyleResolver&, RenderStyle&, Element*) const;
    321321    virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    322322    virtual bool paintSliderThumbDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    323323
    324     virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element&) const;
     324    virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element*) const;
    325325    virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    326326    virtual bool paintSearchFieldDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    327327
    328     virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element&) const;
     328    virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element*) const;
    329329    virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    330330
    331     virtual void adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle&, Element&) const;
     331    virtual void adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const;
    332332    virtual bool paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    333333
    334     virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element&) const;
     334    virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const;
    335335    virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    336336
    337     virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element&) const;
     337    virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element*) const;
    338338    virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    339339
    340     virtual void adjustMediaControlStyle(StyleResolver&, RenderStyle&, Element&) const;
     340    virtual void adjustMediaControlStyle(StyleResolver&, RenderStyle&, Element*) const;
    341341    virtual bool paintMediaFullscreenButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
    342342    virtual bool paintMediaPlayButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }

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

    r173559 r173571  
    464464}
    465465
    466 void RenderThemeGtk::adjustButtonStyle(StyleResolver&, RenderStyle& style, WebCore::Element&) const
     466void RenderThemeGtk::adjustButtonStyle(StyleResolver&, RenderStyle& style, Element*) const
    467467{
    468468    // Some layout tests check explicitly that buttons ignore line-height.
    … …  
    652652}
    653653
    654 void RenderThemeGtk::adjustMenuListStyle(StyleResolver&, RenderStyle& style, Element&) const
     654void RenderThemeGtk::adjustMenuListStyle(StyleResolver&, RenderStyle& style, Element*) const
    655655{
    656656    // The tests check explicitly that select menu buttons ignore line height.
    … …  
    661661}
    662662
    663 void RenderThemeGtk::adjustMenuListButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element& e) const
     663void RenderThemeGtk::adjustMenuListButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element* e) const
    664664{
    665665    adjustMenuListStyle(styleResolver, style, e);
    … …  
    952952}
    953953
    954 void RenderThemeGtk::adjustSearchFieldResultsButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element& e) const
     954void RenderThemeGtk::adjustSearchFieldResultsButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element* e) const
    955955{
    956956    adjustSearchFieldCancelButtonStyle(styleResolver, style, e);
    … …  
    980980}
    981981
    982 void RenderThemeGtk::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle& style, Element&) const
     982void RenderThemeGtk::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle& style, Element*) const
    983983{
    984984    adjustSearchFieldIconStyle(style);
    … …  
    10191019}
    10201020
    1021 void RenderThemeGtk::adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle& style, Element&) const
     1021void RenderThemeGtk::adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle& style, Element*) const
    10221022{
    10231023    adjustSearchFieldIconStyle(style);
    … …  
    10381038}
    10391039
    1040 void RenderThemeGtk::adjustSearchFieldStyle(StyleResolver&, RenderStyle& style, Element&) const
     1040void RenderThemeGtk::adjustSearchFieldStyle(StyleResolver&, RenderStyle& style, Element*) const
    10411041{
    10421042    // We cannot give a proper rendering when border radius is active, unfortunately.
    … …  
    10741074}
    10751075
    1076 void RenderThemeGtk::adjustSliderTrackStyle(StyleResolver&, RenderStyle& style, Element&) const
     1076void RenderThemeGtk::adjustSliderTrackStyle(StyleResolver&, RenderStyle& style, Element*) const
    10771077{
    10781078    style.setBoxShadow(nullptr);
    10791079}
    10801080
    1081 void RenderThemeGtk::adjustSliderThumbStyle(StyleResolver& styleResolver, RenderStyle& style, Element& element) const
     1081void RenderThemeGtk::adjustSliderThumbStyle(StyleResolver& styleResolver, RenderStyle& style, Element* element) const
    10821082{
    10831083    RenderTheme::adjustSliderThumbStyle(styleResolver, style, element);
    … …  
    11531153}
    11541154
    1155 void RenderThemeGtk::adjustSliderThumbSize(RenderStyle& style, Element&) const
     1155void RenderThemeGtk::adjustSliderThumbSize(RenderStyle& style, Element*) const
    11561156{
    11571157    ControlPart part = style.appearance();
    … …  
    12171217}
    12181218
    1219 void RenderThemeGtk::adjustInnerSpinButtonStyle(StyleResolver&, RenderStyle& style, Element&) const
     1219void RenderThemeGtk::adjustInnerSpinButtonStyle(StyleResolver&, RenderStyle& style, Element*) const
    12201220{
    12211221    GtkStyleContext* context = getStyleContext(GTK_TYPE_SPIN_BUTTON);
    … …  
    16001600#endif
    16011601
    1602 void RenderThemeGtk::adjustProgressBarStyle(StyleResolver&, RenderStyle& style, Element&) const
     1602void RenderThemeGtk::adjustProgressBarStyle(StyleResolver&, RenderStyle& style, Element*) const
    16031603{
    16041604    style.setBoxShadow(nullptr);

  • trunk/Source/WebCore/rendering/RenderThemeIOS.h

    r172849 r173571  
    5656
    5757    // Methods for each appearance value.
    58     virtual void adjustCheckboxStyle(StyleResolver&, RenderStyle&, Element&) const override;
     58    virtual void adjustCheckboxStyle(StyleResolver&, RenderStyle&, Element*) const override;
    5959    virtual bool paintCheckboxDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
    6060
    61     virtual void adjustRadioStyle(StyleResolver&, RenderStyle&, Element&) const override;
     61    virtual void adjustRadioStyle(StyleResolver&, RenderStyle&, Element*) const override;
    6262    virtual bool paintRadioDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
    6363
    64     virtual void adjustButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     64    virtual void adjustButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    6565    virtual bool paintButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
    6666    virtual bool paintPushButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
    … …  
    7272    virtual bool paintTextAreaDecorations(const RenderObject&, const PaintInfo&, const FloatRect&) override;
    7373
    74     virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     74    virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    7575    virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&) override;
    7676
    77     virtual void adjustSliderTrackStyle(StyleResolver&, RenderStyle&, Element&) const override;
     77    virtual void adjustSliderTrackStyle(StyleResolver&, RenderStyle&, Element*) const override;
    7878    virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
    7979
    80     virtual void adjustSliderThumbSize(RenderStyle&, Element&) const override;
     80    virtual void adjustSliderThumbSize(RenderStyle&, Element*) const override;
    8181    virtual bool paintSliderThumbDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
    8282
    … …  
    9393#endif
    9494
    95     virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element&) const override;
     95    virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element*) const override;
    9696    virtual bool paintSearchFieldDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
    9797

  • trunk/Source/WebCore/rendering/RenderThemeIOS.mm

    r170880 r173571  
    351351}
    352352
    353 void RenderThemeIOS::adjustCheckboxStyle(StyleResolver&, RenderStyle& style, Element&) const
     353void RenderThemeIOS::adjustCheckboxStyle(StyleResolver&, RenderStyle& style, Element*) const
    354354{
    355355    if (!style.width().isIntrinsicOrAuto() && !style.height().isAuto())
    … …  
    447447}
    448448
    449 void RenderThemeIOS::adjustRadioStyle(StyleResolver&, RenderStyle& style, Element&) const
     449void RenderThemeIOS::adjustRadioStyle(StyleResolver&, RenderStyle& style, Element*) const
    450450{
    451451    if (!style.width().isIntrinsicOrAuto() && !style.height().isAuto())
    … …  
    604604}
    605605
    606 void RenderThemeIOS::adjustMenuListButtonStyle(StyleResolver&, RenderStyle& style, Element& element) const
     606void RenderThemeIOS::adjustMenuListButtonStyle(StyleResolver&, RenderStyle& style, Element* element) const
    607607{
    608608    // Set the min-height to be at least MenuListMinHeight.
    … …  
    612612        style.setMinHeight(Length(MenuListMinHeight, Fixed));
    613613
     614    if (!element)
     615        return;
     616
    614617    // Enforce some default styles in the case that this is a non-multiple <select> element,
    615618    // or a date input. We don't force these if this is just an element with
    616619    // "-webkit-appearance: menulist-button".
    617     if (element.hasTagName(HTMLNames::selectTag) && !element.hasAttribute(HTMLNames::multipleAttr))
    618         adjustSelectListButtonStyle(style, element);
    619     else if (element.hasTagName(HTMLNames::inputTag))
    620         adjustInputElementButtonStyle(style, static_cast<HTMLInputElement&>(element));
     620    if (element->hasTagName(HTMLNames::selectTag) && !element->hasAttribute(HTMLNames::multipleAttr))
     621        adjustSelectListButtonStyle(style, *element);
     622    else if (element->hasTagName(HTMLNames::inputTag))
     623        adjustInputElementButtonStyle(style, static_cast<HTMLInputElement&>(*element));
    621624}
    622625
    … …  
    713716const int kDefaultSliderThumbSize = 16;
    714717
    715 void RenderThemeIOS::adjustSliderTrackStyle(StyleResolver& selector, RenderStyle& style, Element& element) const
     718void RenderThemeIOS::adjustSliderTrackStyle(StyleResolver& selector, RenderStyle& style, Element* element) const
    716719{
    717720    RenderTheme::adjustSliderTrackStyle(selector, style, element);
    … …  
    801804}
    802805
    803 void RenderThemeIOS::adjustSliderThumbSize(RenderStyle& style, Element&) const
     806void RenderThemeIOS::adjustSliderThumbSize(RenderStyle& style, Element*) const
    804807{
    805808    if (style.appearance() != SliderThumbHorizontalPart && style.appearance() != SliderThumbVerticalPart)
    … …  
    941944#endif
    942945
    943 void RenderThemeIOS::adjustSearchFieldStyle(StyleResolver& selector, RenderStyle& style, Element& element) const
     946void RenderThemeIOS::adjustSearchFieldStyle(StyleResolver& selector, RenderStyle& style, Element* element) const
    944947{
    945948    RenderTheme::adjustSearchFieldStyle(selector, style, element);
    946949
     950    if (!element)
     951        return;
     952
    947953    if (!style.hasBorder())
    948954        return;
    949955
    950     RenderBox* box = element.renderBox();
     956    RenderBox* box = element->renderBox();
    951957    if (!box)
    952958        return;
    … …  
    960966}
    961967
    962 void RenderThemeIOS::adjustButtonStyle(StyleResolver& selector, RenderStyle& style, Element& element) const
     968void RenderThemeIOS::adjustButtonStyle(StyleResolver& selector, RenderStyle& style, Element* element) const
    963969{
    964970    RenderTheme::adjustButtonStyle(selector, style, element);
    … …  
    972978    style.setPaddingBox(LengthBox(0, pixels, 0, pixels));
    973979
    974     RenderBox* box = element.renderBox();
     980    if (!element)
     981        return;
     982
     983    RenderBox* box = element->renderBox();
    975984    if (!box)
    976985        return;

  • trunk/Source/WebCore/rendering/RenderThemeMac.h

    r171890 r173571  
    7272    virtual int minimumMenuListSize(RenderStyle&) const override;
    7373
    74     virtual void adjustSliderThumbSize(RenderStyle&, Element&) const override;
     74    virtual void adjustSliderThumbSize(RenderStyle&, Element*) const override;
    7575
    7676#if ENABLE(DATALIST_ELEMENT)
    … …  
    126126
    127127    virtual bool paintTextField(const RenderObject&, const PaintInfo&, const FloatRect&) override;
    128     virtual void adjustTextFieldStyle(StyleResolver&, RenderStyle&, Element&) const override;
     128    virtual void adjustTextFieldStyle(StyleResolver&, RenderStyle&, Element*) const override;
    129129
    130130    virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const FloatRect&) override;
    131     virtual void adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element&) const override;
     131    virtual void adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element*) const override;
    132132
    133133    virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const FloatRect&) override;
    134     virtual void adjustMenuListStyle(StyleResolver&, RenderStyle&, Element&) const override;
     134    virtual void adjustMenuListStyle(StyleResolver&, RenderStyle&, Element*) const override;
    135135
    136136    virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&) override;
    137     virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
    138 
    139     virtual void adjustProgressBarStyle(StyleResolver&, RenderStyle&, Element&) const override;
     137    virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
     138
     139    virtual void adjustProgressBarStyle(StyleResolver&, RenderStyle&, Element*) const override;
    140140    virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&) override;
    141141
    142142    virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
    143     virtual void adjustSliderTrackStyle(StyleResolver&, RenderStyle&, Element&) const override;
     143    virtual void adjustSliderTrackStyle(StyleResolver&, RenderStyle&, Element*) const override;
    144144
    145145    virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) override;
    146     virtual void adjustSliderThumbStyle(StyleResolver&, RenderStyle&, Element&) const override;
     146    virtual void adjustSliderThumbStyle(StyleResolver&, RenderStyle&, Element*) const override;
    147147
    148148    virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&) override;
    149     virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element&) const override;
    150 
    151     virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     149    virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element*) const override;
     150
     151    virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    152152    virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
    153153
    154     virtual void adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle&, Element&) const override;
     154    virtual void adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const override;
    155155    virtual bool paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) override;
    156156
    157     virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element&) const override;
     157    virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const override;
    158158    virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) override;
    159159
    160     virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     160    virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    161161    virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
    162162

  • trunk/Source/WebCore/rendering/RenderThemeMac.mm

    r173161 r173571  
    850850}
    851851
    852 void RenderThemeMac::adjustTextFieldStyle(StyleResolver&, RenderStyle&, Element&) const
     852void RenderThemeMac::adjustTextFieldStyle(StyleResolver&, RenderStyle&, Element*) const
    853853{
    854854}
    … …  
    872872}
    873873
    874 void RenderThemeMac::adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element&) const
     874void RenderThemeMac::adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element*) const
    875875{
    876876}
    … …  
    11041104}
    11051105
    1106 void RenderThemeMac::adjustProgressBarStyle(StyleResolver&, RenderStyle&, Element&) const
     1106void RenderThemeMac::adjustProgressBarStyle(StyleResolver&, RenderStyle&, Element*) const
    11071107{
    11081108}
    … …  
    13401340}
    13411341
    1342 void RenderThemeMac::adjustMenuListStyle(StyleResolver& styleResolver, RenderStyle& style, Element& e) const
     1342void RenderThemeMac::adjustMenuListStyle(StyleResolver& styleResolver, RenderStyle& style, Element* e) const
    13431343{
    13441344    NSControlSize controlSize = controlSizeForFont(style);
    … …  
    13551355    // Set the foreground color to black or gray when we have the aqua look.
    13561356    // Cast to RGB32 is to work around a compiler bug.
    1357     style.setColor(!e.isDisabledFormControl() ? static_cast<RGBA32>(Color::black) : Color::darkGray);
     1357    style.setColor(e && !e->isDisabledFormControl() ? static_cast<RGBA32>(Color::black) : Color::darkGray);
    13581358
    13591359    // Set the button's vertical size.
    … …  
    14231423}
    14241424
    1425 void RenderThemeMac::adjustMenuListButtonStyle(StyleResolver&, RenderStyle& style, Element&) const
     1425void RenderThemeMac::adjustMenuListButtonStyle(StyleResolver&, RenderStyle& style, Element*) const
    14261426{
    14271427    float fontScale = style.fontSize() / baseFontSize;
    … …  
    14631463const int trackRadius = 2;
    14641464
    1465 void RenderThemeMac::adjustSliderTrackStyle(StyleResolver&, RenderStyle& style, Element&) const
     1465void RenderThemeMac::adjustSliderTrackStyle(StyleResolver&, RenderStyle& style, Element*) const
    14661466{
    14671467    style.setBoxShadow(nullptr);
    … …  
    15091509}
    15101510
    1511 void RenderThemeMac::adjustSliderThumbStyle(StyleResolver& styleResolver, RenderStyle& style, Element& element) const
     1511void RenderThemeMac::adjustSliderThumbStyle(StyleResolver& styleResolver, RenderStyle& style, Element* element) const
    15121512{
    15131513    RenderTheme::adjustSliderThumbStyle(styleResolver, style, element);
    … …  
    16341634}
    16351635
    1636 void RenderThemeMac::adjustSearchFieldStyle(StyleResolver& styleResolver, RenderStyle& style, Element&) const
     1636void RenderThemeMac::adjustSearchFieldStyle(StyleResolver& styleResolver, RenderStyle& style, Element*) const
    16371637{
    16381638    // Override border.
    … …  
    17111711}
    17121712
    1713 void RenderThemeMac::adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle& style, Element&) const
     1713void RenderThemeMac::adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle& style, Element*) const
    17141714{
    17151715    IntSize size = sizeForSystemFont(style, cancelButtonSizes());
    … …  
    17261726
    17271727const int emptyResultsOffset = 9;
    1728 void RenderThemeMac::adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle& style, Element&) const
     1728void RenderThemeMac::adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle& style, Element*) const
    17291729{
    17301730    IntSize size = sizeForSystemFont(style, resultsButtonSizes());
    … …  
    17391739}
    17401740
    1741 void RenderThemeMac::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle& style, Element&) const
     1741void RenderThemeMac::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle& style, Element*) const
    17421742{
    17431743    IntSize size = sizeForSystemFont(style, resultsButtonSizes());
    … …  
    17721772
    17731773const int resultsArrowWidth = 5;
    1774 void RenderThemeMac::adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle& style, Element&) const
     1774void RenderThemeMac::adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle& style, Element*) const
    17751775{
    17761776    IntSize size = sizeForSystemFont(style, resultsButtonSizes());
    … …  
    19091909const int sliderThumbHeight = 15;
    19101910
    1911 void RenderThemeMac::adjustSliderThumbSize(RenderStyle& style, Element&) const
     1911void RenderThemeMac::adjustSliderThumbSize(RenderStyle& style, Element*) const
    19121912{
    19131913    float zoomLevel = style.effectiveZoom();

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

    r170435 r173571  
    509509}
    510510
    511 void RenderThemeSafari::adjustButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element& e) const
     511void RenderThemeSafari::adjustButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element*) const
    512512{
    513513    // There are three appearance constants for buttons.
    … …  
    621621}
    622622
    623 void RenderThemeSafari::adjustTextFieldStyle(StyleResolver&, RenderStyle&, Element&) const
     623void RenderThemeSafari::adjustTextFieldStyle(StyleResolver&, RenderStyle&, Element*) const
    624624{
    625625}
    … …  
    649649}
    650650
    651 void RenderThemeSafari::adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element&) const
     651void RenderThemeSafari::adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element*) const
    652652{
    653653}
    … …  
    865865}
    866866
    867 void RenderThemeSafari::adjustMenuListStyle(StyleResolver& styleResolver, RenderStyle& style, Element& e) const
     867void RenderThemeSafari::adjustMenuListStyle(StyleResolver& styleResolver, RenderStyle& style, Element* e) const
    868868{
    869869    NSControlSize controlSize = controlSizeForFont(style);
    … …  
    880880    // Set the foreground color to black or gray when we have the aqua look.
    881881    // Cast to RGB32 is to work around a compiler bug.
    882     style.setColor(!e.isDisabledFormControl() ? static_cast<RGBA32>(Color::black) : Color::darkGray);
     882    style.setColor(e && !e->isDisabledFormControl() ? static_cast<RGBA32>(Color::black) : Color::darkGray);
    883883
    884884    // Set the button's vertical size.
    … …  
    930930}
    931931
    932 void RenderThemeSafari::adjustMenuListButtonStyle(StyleResolver&, RenderStyle& style, Element&) const
     932void RenderThemeSafari::adjustMenuListButtonStyle(StyleResolver&, RenderStyle& style, Element*) const
    933933{
    934934    float fontScale = style.fontSize() / baseFontSize;
    … …  
    988988}
    989989
    990 void RenderThemeSafari::adjustSliderThumbStyle(StyleResolver& styleResolver, RenderStyle& style, Element& e) const
     990void RenderThemeSafari::adjustSliderThumbStyle(StyleResolver& styleResolver, RenderStyle& style, Element* e) const
    991991{
    992992    RenderTheme::adjustSliderThumbStyle(styleResolver, style, e);
    … …  
    10061006const int sliderThumbHeight = 15;
    10071007
    1008 void RenderThemeSafari::adjustSliderThumbSize(RenderStyle& style, Element&) const
     1008void RenderThemeSafari::adjustSliderThumbSize(RenderStyle& style, Element*) const
    10091009{
    10101010    if (style.appearance() == SliderThumbHorizontalPart || style.appearance() == SliderThumbVerticalPart) {
    … …  
    10421042}
    10431043
    1044 void RenderThemeSafari::adjustSearchFieldStyle(StyleResolver& styleResolver, RenderStyle& style, Element& e) const
     1044void RenderThemeSafari::adjustSearchFieldStyle(StyleResolver& styleResolver, RenderStyle& style, Element*) const
    10451045{
    10461046    // Override border.
    … …  
    10541054    style.setBorderBottomStyle(INSET);
    10551055    style.setBorderTopWidth(borderWidth);
    1056     style.setBorderTopStyle(INSET);   
    1057    
     1056    style.setBorderTopStyle(INSET);
     1057
    10581058    // Override height.
    10591059    style.setHeight(Length(Auto));
    10601060    setSearchFieldSize(style);
    1061    
     1061
    10621062    // Override padding size to match AppKit text positioning.
    10631063    const int padding = 1;
    … …  
    10661066    style.setPaddingTop(Length(padding, Fixed));
    10671067    style.setPaddingBottom(Length(padding, Fixed));
    1068    
     1068
    10691069    NSControlSize controlSize = controlSizeForFont(style);
    10701070    setFontFromControlSize(styleResolver, style, controlSize);
    … …  
    10931093}
    10941094
    1095 void RenderThemeSafari::adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle& style, Element&) const
     1095void RenderThemeSafari::adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle& style, Element*) const
    10961096{
    10971097    IntSize size = sizeForSystemFont(style, cancelButtonSizes());
    … …  
    11071107
    11081108const int emptyResultsOffset = 9;
    1109 void RenderThemeSafari::adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle& style, Element&) const
     1109void RenderThemeSafari::adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle& style, Element*) const
    11101110{
    11111111    IntSize size = sizeForSystemFont(style, resultsButtonSizes());
    … …  
    11191119}
    11201120
    1121 void RenderThemeSafari::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle& style, Element&) const
     1121void RenderThemeSafari::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle& style, Element*) const
    11221122{
    11231123    IntSize size = sizeForSystemFont(style, resultsButtonSizes());
    … …  
    11431143
    11441144const int resultsArrowWidth = 5;
    1145 void RenderThemeSafari::adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle& style, Element&) const
     1145void RenderThemeSafari::adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle& style, Element*) const
    11461146{
    11471147    IntSize size = sizeForSystemFont(style, resultsButtonSizes());
    … …  
    11911191
    11921192#if ENABLE(METER_ELEMENT)
    1193 void RenderThemeSafari::adjustMeterStyle(StyleResolver&, RenderStyle& style, Element&) const
     1193void RenderThemeSafari::adjustMeterStyle(StyleResolver&, RenderStyle& style, Element*) const
    11941194{
    11951195    style.setBoxShadow(nullptr);

  • trunk/Source/WebCore/rendering/RenderThemeSafari.h

    r170435 r173571  
    7777    virtual int minimumMenuListSize(RenderStyle&) const;
    7878
    79     virtual void adjustSliderThumbSize(RenderStyle&, Element&) const;
    80     virtual void adjustSliderThumbStyle(StyleResolver&, RenderStyle&, Element&) const;
     79    virtual void adjustSliderThumbSize(RenderStyle&, Element*) const;
     80    virtual void adjustSliderThumbStyle(StyleResolver&, RenderStyle&, Element*) const;
    8181   
    8282    virtual int popupInternalPaddingLeft(RenderStyle&) const;
    … …  
    9393    virtual void setRadioSize(RenderStyle&) const;
    9494
    95     virtual void adjustButtonStyle(StyleResolver&, RenderStyle&, WebCore::Element&) const;
     95    virtual void adjustButtonStyle(StyleResolver&, RenderStyle&, Element*) const;
    9696    virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&);
    9797    virtual void setButtonSize(RenderStyle&) const;
    9898
    9999    virtual bool paintTextField(const RenderObject&, const PaintInfo&, const IntRect&);
    100     virtual void adjustTextFieldStyle(StyleResolver&, RenderStyle&, Element&) const;
     100    virtual void adjustTextFieldStyle(StyleResolver&, RenderStyle&, Element*) const;
    101101
    102102    virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const IntRect&);
    103     virtual void adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element&) const;
     103    virtual void adjustTextAreaStyle(StyleResolver&, RenderStyle&, Element*) const;
    104104
    105105    virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&);
    106     virtual void adjustMenuListStyle(StyleResolver&, RenderStyle&, Element&) const;
     106    virtual void adjustMenuListStyle(StyleResolver&, RenderStyle&, Element*) const;
    107107
    108108    virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&);
    109     virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element&) const;
     109    virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element*) const;
    110110
    111111    virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
    … …  
    113113
    114114    virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&);
    115     virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element&) const;
     115    virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element*) const;
    116116
    117     virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element&) const;
     117    virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element*) const;
    118118    virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&);
    119119
    120     virtual void adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle&, Element&) const;
     120    virtual void adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const;
    121121    virtual bool paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&);
    122122
    123     virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element&) const;
     123    virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const;
    124124    virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&);
    125125
    126     virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element&) const;
     126    virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element*) const;
    127127    virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&);
    128128 
    … …  
    137137    virtual IntSize meterSizeForBounds(const RenderMeter&, const IntRect&) const override;
    138138    virtual bool supportsMeter(ControlPart) const override;
    139     virtual void adjustMeterStyle(StyleResolver&, RenderStyle&, Element&) const override;
     139    virtual void adjustMeterStyle(StyleResolver&, RenderStyle&, Element*) const override;
    140140    virtual bool paintMeter(const RenderObject&, const PaintInfo&, const IntRect&) override;
    141141#endif

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

    r170435 r173571  
    731731}
    732732
    733 void RenderThemeWin::adjustInnerSpinButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element& e) const
     733void RenderThemeWin::adjustInnerSpinButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element*) const
    734734{
    735735    int width = ::GetSystemMetrics(SM_CXVSCROLL);
    … …  
    798798}
    799799
    800 void RenderThemeWin::adjustMenuListStyle(StyleResolver& styleResolver, RenderStyle& style, Element& e) const
     800void RenderThemeWin::adjustMenuListStyle(StyleResolver& styleResolver, RenderStyle& style, Element* e) const
    801801{
    802802    style.resetBorder();
    … …  
    804804}
    805805
    806 void RenderThemeWin::adjustMenuListButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element& e) const
     806void RenderThemeWin::adjustMenuListButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element*) const
    807807{
    808808    // These are the paddings needed to place the text correctly in the <select> box
    … …  
    887887const int sliderThumbHeight = 15;
    888888
    889 void RenderThemeWin::adjustSliderThumbSize(RenderStyle& style, Element&) const
     889void RenderThemeWin::adjustSliderThumbSize(RenderStyle& style, Element*) const
    890890{
    891891    ControlPart part = style.appearance();
    … …  
    908908}
    909909
    910 void RenderThemeWin::adjustSearchFieldStyle(StyleResolver& styleResolver, RenderStyle& style, Element& e) const
     910void RenderThemeWin::adjustSearchFieldStyle(StyleResolver& styleResolver, RenderStyle& style, Element* e) const
    911911{
    912912    // Override paddingSize to match AppKit text positioning.
    … …  
    916916    style.setPaddingTop(Length(padding, Fixed));
    917917    style.setPaddingBottom(Length(padding, Fixed));
    918     if (e.focused() && e.document().frame()->selection().isFocusedAndActive())
     918    if (e && e->focused() && e->document().frame()->selection().isFocusedAndActive())
    919919        style.setOutlineOffset(-2);
    920920}
    … …  
    945945}
    946946
    947 void RenderThemeWin::adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle& style, Element&) const
     947void RenderThemeWin::adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle& style, Element*) const
    948948{
    949949    // Scale the button size based on the font size
    … …  
    954954}
    955955
    956 void RenderThemeWin::adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle& style, Element&) const
     956void RenderThemeWin::adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle& style, Element*) const
    957957{
    958958    IntSize emptySize(1, 11);
    … …  
    961961}
    962962
    963 void RenderThemeWin::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle& style, Element&) const
     963void RenderThemeWin::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle& style, Element*) const
    964964{
    965965    // Scale the decoration size based on the font size
    … …  
    994994}
    995995
    996 void RenderThemeWin::adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle& style, Element&) const
     996void RenderThemeWin::adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle& style, Element*) const
    997997{
    998998    // Scale the button size based on the font size
    … …  
    11581158
    11591159#if ENABLE(METER_ELEMENT)
    1160 void RenderThemeWin::adjustMeterStyle(StyleResolver&, RenderStyle& style, Element&) const
     1160void RenderThemeWin::adjustMeterStyle(StyleResolver&, RenderStyle& style, Element*) const
    11611161{
    11621162    style.setBoxShadow(nullptr);

  • trunk/Source/WebCore/rendering/RenderThemeWin.h

    r170435 r173571  
    7878    virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
    7979
    80     virtual void adjustInnerSpinButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     80    virtual void adjustInnerSpinButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    8181    virtual bool paintInnerSpinButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
    8282
    … …  
    8686    { return paintTextField(o, i, r); }
    8787
    88     virtual void adjustMenuListStyle(StyleResolver&, RenderStyle&, Element&) const override;
     88    virtual void adjustMenuListStyle(StyleResolver&, RenderStyle&, Element*) const override;
    8989    virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const FloatRect&) override;
    90     virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     90    virtual void adjustMenuListButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    9191
    9292    virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&) override;
    … …  
    9494    virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
    9595    virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) override;
    96     virtual void adjustSliderThumbSize(RenderStyle&, Element&) const override;
     96    virtual void adjustSliderThumbSize(RenderStyle&, Element*) const override;
    9797
    9898    virtual bool popupOptionSupportsTextIndent() const override { return true; }
    9999
    100     virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element&) const override;
     100    virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element*) const override;
    101101    virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&) override;
    102102
    103     virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     103    virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    104104    virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
    105105
    106     virtual void adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle&, Element&) const override;
     106    virtual void adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const override;
    107107    virtual bool paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) override { return false; }
    108108
    109     virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element&) const override;
     109    virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const override;
    110110    virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) override;
    111111
    112     virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element&) const override;
     112    virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
    113113    virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
    114114
    115115    virtual void themeChanged() override;
    116116
    117     virtual void adjustButtonStyle(StyleResolver&, RenderStyle& style, Element&) const override { }
    118     virtual void adjustTextFieldStyle(StyleResolver&, RenderStyle& style, Element&) const override { }
    119     virtual void adjustTextAreaStyle(StyleResolver&, RenderStyle& style, Element&) const override { }
     117    virtual void adjustButtonStyle(StyleResolver&, RenderStyle& style, Element*) const override { }
     118    virtual void adjustTextFieldStyle(StyleResolver&, RenderStyle& style, Element*) const override { }
     119    virtual void adjustTextAreaStyle(StyleResolver&, RenderStyle& style, Element*) const override { }
    120120
    121121    static void setWebKitIsBeingUnloaded();
    … …  
    133133    virtual IntSize meterSizeForBounds(const RenderMeter&, const IntRect&) const override;
    134134    virtual bool supportsMeter(ControlPart) const override;
    135     virtual void adjustMeterStyle(StyleResolver&, RenderStyle&, Element&) const override;
     135    virtual void adjustMeterStyle(StyleResolver&, RenderStyle&, Element*) const override;
    136136    virtual bool paintMeter(const RenderObject&, const PaintInfo&, const IntRect&) override;
    137137#endif
Note: See TracChangeset for help on using the changeset viewer.