Changeset 169335 in webkit


Ignore:
Timestamp:
May 26, 2014 2:50:18 AM (10 years ago)
Author:
Michał Pakuła vel Rutka
Message:

[EFL] Input fields and text areas are not rendered correctly after r167771
​https://bugs.webkit.org/show_bug.cgi?id=133181

Reviewed by Gyuyoung Kim.

Source/WebCore:
r167771 changed arguments of RenderTheme two virtual method arguments which were not reflected
in changes in derived classes, which caused parent method to be called. Arguments in derived class
were updated, also 'override' specifiers were added to all virtual methods to prevent similar errors.

Already covered by fast/forms/textarea-placeholder-wrapping.html

  • platform/efl/RenderThemeEfl.cpp:

(WebCore::RenderThemeEfl::paintTextField):
(WebCore::RenderThemeEfl::paintTextArea):

  • platform/efl/RenderThemeEfl.h:

(WebCore::RenderThemeEfl::supportsHover):
(WebCore::RenderThemeEfl::supportsControlTints):

LayoutTests:

  • platform/efl-wk2/TestExpectations: Remove now passing test from test expectations.
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r169334 r169335  
     12014-05-26  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
     2
     3        [EFL] Input fields and text areas are not rendered correctly after r167771
     4        https://bugs.webkit.org/show_bug.cgi?id=133181
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        * platform/efl-wk2/TestExpectations: Remove now passing test from test expectations.
     9
    1102014-05-20  Sergio Villar Senin  <svillar@igalia.com>
    211

  • trunk/LayoutTests/platform/efl-wk2/TestExpectations

    r169202 r169335  
    560560
    561561webkit.org/b/132049 fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html [ ImageOnlyFailure ]
    562 
    563 webkit.org/b/133181 fast/forms/textarea-placeholder-wrapping.html [ ImageOnlyFailure ]

  • trunk/Source/WebCore/ChangeLog

    r169334 r169335  
     12014-05-26  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
     2
     3        [EFL] Input fields and text areas are not rendered correctly after r167771
     4        https://bugs.webkit.org/show_bug.cgi?id=133181
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        r167771 changed arguments of RenderTheme two virtual method arguments which were not reflected
     9        in changes in derived classes, which caused parent method to be called. Arguments in derived class
     10        were updated, also 'override' specifiers were added to all virtual methods to prevent similar errors.
     11
     12        Already covered by fast/forms/textarea-placeholder-wrapping.html
     13
     14        * platform/efl/RenderThemeEfl.cpp:
     15        (WebCore::RenderThemeEfl::paintTextField):
     16        (WebCore::RenderThemeEfl::paintTextArea):
     17        * platform/efl/RenderThemeEfl.h:
     18        (WebCore::RenderThemeEfl::supportsHover):
     19        (WebCore::RenderThemeEfl::supportsControlTints):
     20
    1212014-05-20  Sergio Villar Senin  <svillar@igalia.com>
    222

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

    r168601 r169335  
    879879}
    880880
    881 bool RenderThemeEfl::paintTextField(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
    882 {
    883     return paintThemePart(object, TextField, info, rect);
     881bool RenderThemeEfl::paintTextField(const RenderObject& object, const PaintInfo& info, const FloatRect& rect)
     882{
     883    return paintThemePart(object, TextField, info, IntRect(rect));
    884884}
    885885
    … …  
    888888}
    889889
    890 bool RenderThemeEfl::paintTextArea(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
     890bool RenderThemeEfl::paintTextArea(const RenderObject& object, const PaintInfo& info, const FloatRect& rect)
    891891{
    892892    return paintTextField(object, info, rect);

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

    r168601 r169335  
    6161};
    6262
    63 class RenderThemeEfl : public RenderTheme {
     63class RenderThemeEfl final : public RenderTheme {
    6464private:
    6565    explicit RenderThemeEfl(Page*);
    66     ~RenderThemeEfl();
     66    virtual ~RenderThemeEfl();
    6767
    6868public:
    … …  
    7070
    7171    // A method asking if the theme's controls actually care about redrawing when hovered.
    72     virtual bool supportsHover(const RenderStyle*) const { return true; }
     72    virtual bool supportsHover(const RenderStyle*) const override { return true; }
    7373
    7474    // A method Returning whether the control is styled by css or not e.g specifying background-color.
    75     virtual bool isControlStyled(const RenderStyle*, const BorderData&, const FillLayer&, const Color& backgroundColor) const;
     75    virtual bool isControlStyled(const RenderStyle*, const BorderData&, const FillLayer&, const Color& backgroundColor) const override;
    7676
    7777    // A method asking if the theme is able to draw the focus ring.
    78     virtual bool supportsFocusRing(const RenderStyle*) const;
     78    virtual bool supportsFocusRing(const RenderStyle*) const override;
    7979
    8080    // A method asking if the control changes its tint when the window has focus or not.
    81     virtual bool controlSupportsTints(const RenderObject&) const;
     81    virtual bool controlSupportsTints(const RenderObject&) const override;
    8282
    8383    // A general method asking if any control tinting is supported at all.
    84     virtual bool supportsControlTints() const { return true; }
     84    virtual bool supportsControlTints() const override { return true; }
    8585
    8686    // A general method asking if foreground colors of selection are supported.
    87     virtual bool supportsSelectionForegroundColors() const;
     87    virtual bool supportsSelectionForegroundColors() const override;
    8888
    8989    // A method to obtain the baseline position for a "leaf" control. This will only be used if a baseline
    9090    // position cannot be determined by examining child content. Checkboxes and radio buttons are examples of
    9191    // controls that need to do this.
    92     virtual int baselinePosition(const RenderObject&) const;
    93 
    94     virtual Color platformActiveSelectionBackgroundColor() const;
    95     virtual Color platformInactiveSelectionBackgroundColor() const;
    96     virtual Color platformActiveSelectionForegroundColor() const;
    97     virtual Color platformInactiveSelectionForegroundColor() const;
    98     virtual Color platformFocusRingColor() const;
     92    virtual int baselinePosition(const RenderObject&) const override;
     93
     94    virtual Color platformActiveSelectionBackgroundColor() const override;
     95    virtual Color platformInactiveSelectionBackgroundColor() const override;
     96    virtual Color platformActiveSelectionForegroundColor() const override;
     97    virtual Color platformInactiveSelectionForegroundColor() const override;
     98    virtual Color platformFocusRingColor() const override;
    9999
    100100    // Set platform colors; remember to call platformColorDidChange after.
    … …  
    109109
    110110    // System fonts.
    111     virtual void systemFont(CSSValueID, FontDescription&) const;
    112 
    113     virtual void adjustCheckboxStyle(StyleResolver*, RenderStyle*, Element*) const;
    114     virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&);
    115 
    116     virtual void adjustRadioStyle(StyleResolver*, RenderStyle*, Element*) const;
    117     virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&);
    118 
    119     virtual void adjustButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
    120     virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&);
    121 
    122     virtual void adjustTextFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
    123     virtual bool paintTextField(const RenderObject&, const PaintInfo&, const IntRect&);
    124 
    125     virtual void adjustTextAreaStyle(StyleResolver*, RenderStyle*, Element*) const;
    126     virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const IntRect&);
    127 
    128     virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
    129     virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&);
    130 
    131     virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
    132     virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&);
    133 
    134     virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
    135     virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&);
    136 
    137     virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
    138     virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&);
    139 
    140     virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
    141     virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&);
    142 
    143     virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
    144     virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&);
    145 
    146     virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const;
    147     virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
    148 
    149     virtual void adjustSliderThumbStyle(StyleResolver*, RenderStyle*, Element*) const;
    150 
    151     virtual void adjustSliderThumbSize(RenderStyle*, Element*) const;
     111    virtual void systemFont(CSSValueID, FontDescription&) const override;
     112
     113    virtual void adjustCheckboxStyle(StyleResolver*, RenderStyle*, Element*) const override;
     114    virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&) override;
     115
     116    virtual void adjustRadioStyle(StyleResolver*, RenderStyle*, Element*) const override;
     117    virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&) override;
     118
     119    virtual void adjustButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
     120    virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
     121
     122    virtual void adjustTextFieldStyle(StyleResolver*, RenderStyle*, Element*) const override;
     123    virtual bool paintTextField(const RenderObject&, const PaintInfo&, const FloatRect&) override;
     124
     125    virtual void adjustTextAreaStyle(StyleResolver*, RenderStyle*, Element*) const override;
     126    virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const FloatRect&) override;
     127
     128    virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const override;
     129    virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&) override;
     130
     131    virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
     132    virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&) override;
     133
     134    virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const override;
     135    virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) override;
     136
     137    virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const override;
     138    virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&) override;
     139
     140    virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
     141    virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
     142
     143    virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
     144    virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
     145
     146    virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const override;
     147    virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
     148
     149    virtual void adjustSliderThumbStyle(StyleResolver*, RenderStyle*, Element*) const override;
     150
     151    virtual void adjustSliderThumbSize(RenderStyle*, Element*) const override;
    152152
    153153#if ENABLE(DATALIST_ELEMENT)
    … …  
    159159    virtual bool supportsDataListUI(const AtomicString&) const override;
    160160
    161     virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&);
    162 
    163     virtual void adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
    164     virtual bool paintInnerSpinButton(const RenderObject&, const PaintInfo&, const IntRect&);
     161    virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) override;
     162
     163    virtual void adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
     164    virtual bool paintInnerSpinButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
    165165
    166166    static void setDefaultFontSize(int fontsize);
    167167
    168168#if ENABLE(PROGRESS_ELEMENT)
    169     virtual void adjustProgressBarStyle(StyleResolver*, RenderStyle*, Element*) const;
    170     virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&);
    171     virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const;
    172     virtual double animationDurationForProgressBar(RenderProgress*) const;
     169    virtual void adjustProgressBarStyle(StyleResolver*, RenderStyle*, Element*) const override;
     170    virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&) override;
     171    virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const override;
     172    virtual double animationDurationForProgressBar(RenderProgress*) const override;
    173173#endif
    174174
    175175#if ENABLE(VIDEO)
    176     virtual String mediaControlsStyleSheet();
    177     virtual String mediaControlsScript();
     176    virtual String mediaControlsStyleSheet() override;
     177    virtual String mediaControlsScript() override;
    178178#endif
    179179#if ENABLE(VIDEO_TRACK)
Note: See TracChangeset for help on using the changeset viewer.