Skip to site navigation (Press enter)

[webkit-changes] [169335] trunk

m . pakula Mon, 26 May 2014 02:51:13 -0700

Title: [169335] trunk

Revision: 169335
Author: [email protected]
Date: 2014-05-26 02:50:18 -0700 (Mon, 26 May 2014)

Log 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.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/efl-wk2/TestExpectations
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp
trunk/Source/WebCore/platform/efl/RenderThemeEfl.h

Diff

Modified: trunk/LayoutTests/ChangeLog (169334 => 169335)


--- trunk/LayoutTests/ChangeLog	2014-05-26 09:48:55 UTC (rev 169334)
+++ trunk/LayoutTests/ChangeLog	2014-05-26 09:50:18 UTC (rev 169335)
@@ -1,3 +1,12 @@
+2014-05-26  Michał Pakuła vel Rutka  <[email protected]>
+
+        [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.
+
+        * platform/efl-wk2/TestExpectations: Remove now passing test from test expectations.
+
 2014-05-20  Sergio Villar Senin  <[email protected]>
 
         [CSS Grid Layout] Children of grid containers must be turned into grid items

Modified: trunk/LayoutTests/platform/efl-wk2/TestExpectations (169334 => 169335)


--- trunk/LayoutTests/platform/efl-wk2/TestExpectations	2014-05-26 09:48:55 UTC (rev 169334)
+++ trunk/LayoutTests/platform/efl-wk2/TestExpectations	2014-05-26 09:50:18 UTC (rev 169335)
@@ -559,5 +559,3 @@
 webkit.org/b/131987 fast/repaint/hidpi-absolute-positioned-element-wrong-cliprect-after-move.html [ Failure ]
 
 webkit.org/b/132049 fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html [ ImageOnlyFailure ]
-
-webkit.org/b/133181 fast/forms/textarea-placeholder-wrapping.html [ ImageOnlyFailure ]

Modified: trunk/Source/WebCore/ChangeLog (169334 => 169335)


--- trunk/Source/WebCore/ChangeLog	2014-05-26 09:48:55 UTC (rev 169334)
+++ trunk/Source/WebCore/ChangeLog	2014-05-26 09:50:18 UTC (rev 169335)
@@ -1,3 +1,23 @@
+2014-05-26  Michał Pakuła vel Rutka  <[email protected]>
+
+        [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.
+
+        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):
+
 2014-05-20  Sergio Villar Senin  <[email protected]>
 
         [CSS Grid Layout] Children of grid containers must be turned into grid items

Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp (169334 => 169335)


--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp	2014-05-26 09:48:55 UTC (rev 169334)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp	2014-05-26 09:50:18 UTC (rev 169335)
@@ -878,16 +878,16 @@
     style->resetBorder();
 }
 
-bool RenderThemeEfl::paintTextField(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
+bool RenderThemeEfl::paintTextField(const RenderObject& object, const PaintInfo& info, const FloatRect& rect)
 {
-    return paintThemePart(object, TextField, info, rect);
+    return paintThemePart(object, TextField, info, IntRect(rect));
 }
 
 void RenderThemeEfl::adjustTextAreaStyle(StyleResolver*, RenderStyle*, Element*) const
 {
 }
 
-bool RenderThemeEfl::paintTextArea(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
+bool RenderThemeEfl::paintTextArea(const RenderObject& object, const PaintInfo& info, const FloatRect& rect)
 {
     return paintTextField(object, info, rect);
 }

Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.h (169334 => 169335)


--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.h	2014-05-26 09:48:55 UTC (rev 169334)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.h	2014-05-26 09:50:18 UTC (rev 169335)
@@ -60,42 +60,42 @@
     FormTypeLast
 };
 
-class RenderThemeEfl : public RenderTheme {
+class RenderThemeEfl final : public RenderTheme {
 private:
     explicit RenderThemeEfl(Page*);
-    ~RenderThemeEfl();
+    virtual ~RenderThemeEfl();
 
 public:
     static PassRefPtr<RenderTheme> create(Page*);
 
     // A method asking if the theme's controls actually care about redrawing when hovered.
-    virtual bool supportsHover(const RenderStyle*) const { return true; }
+    virtual bool supportsHover(const RenderStyle*) const override { return true; }
 
     // A method Returning whether the control is styled by css or not e.g specifying background-color.
-    virtual bool isControlStyled(const RenderStyle*, const BorderData&, const FillLayer&, const Color& backgroundColor) const;
+    virtual bool isControlStyled(const RenderStyle*, const BorderData&, const FillLayer&, const Color& backgroundColor) const override;
 
     // A method asking if the theme is able to draw the focus ring.
-    virtual bool supportsFocusRing(const RenderStyle*) const;
+    virtual bool supportsFocusRing(const RenderStyle*) const override;
 
     // A method asking if the control changes its tint when the window has focus or not.
-    virtual bool controlSupportsTints(const RenderObject&) const;
+    virtual bool controlSupportsTints(const RenderObject&) const override;
 
     // A general method asking if any control tinting is supported at all.
-    virtual bool supportsControlTints() const { return true; }
+    virtual bool supportsControlTints() const override { return true; }
 
     // A general method asking if foreground colors of selection are supported.
-    virtual bool supportsSelectionForegroundColors() const;
+    virtual bool supportsSelectionForegroundColors() const override;
 
     // A method to obtain the baseline position for a "leaf" control. This will only be used if a baseline
     // position cannot be determined by examining child content. Checkboxes and radio buttons are examples of
     // controls that need to do this.
-    virtual int baselinePosition(const RenderObject&) const;
+    virtual int baselinePosition(const RenderObject&) const override;
 
-    virtual Color platformActiveSelectionBackgroundColor() const;
-    virtual Color platformInactiveSelectionBackgroundColor() const;
-    virtual Color platformActiveSelectionForegroundColor() const;
-    virtual Color platformInactiveSelectionForegroundColor() const;
-    virtual Color platformFocusRingColor() const;
+    virtual Color platformActiveSelectionBackgroundColor() const override;
+    virtual Color platformInactiveSelectionBackgroundColor() const override;
+    virtual Color platformActiveSelectionForegroundColor() const override;
+    virtual Color platformInactiveSelectionForegroundColor() const override;
+    virtual Color platformFocusRingColor() const override;
 
     // Set platform colors; remember to call platformColorDidChange after.
     void setColorFromThemeClass(const char* colorClass);
@@ -108,47 +108,47 @@
     void adjustSizeConstraints(RenderStyle*, FormType) const;
 
     // System fonts.
-    virtual void systemFont(CSSValueID, FontDescription&) const;
+    virtual void systemFont(CSSValueID, FontDescription&) const override;
 
-    virtual void adjustCheckboxStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual void adjustCheckboxStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&) override;
 
-    virtual void adjustRadioStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual void adjustRadioStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&) override;
 
-    virtual void adjustButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual void adjustButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
 
-    virtual void adjustTextFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintTextField(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual void adjustTextFieldStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintTextField(const RenderObject&, const PaintInfo&, const FloatRect&) override;
 
-    virtual void adjustTextAreaStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual void adjustTextAreaStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const FloatRect&) override;
 
-    virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&) override;
 
-    virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&);
+    virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&) override;
 
-    virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) override;
 
-    virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&) override;
 
-    virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
 
-    virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
 
-    virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
 
-    virtual void adjustSliderThumbStyle(StyleResolver*, RenderStyle*, Element*) const;
+    virtual void adjustSliderThumbStyle(StyleResolver*, RenderStyle*, Element*) const override;
 
-    virtual void adjustSliderThumbSize(RenderStyle*, Element*) const;
+    virtual void adjustSliderThumbSize(RenderStyle*, Element*) const override;
 
 #if ENABLE(DATALIST_ELEMENT)
     virtual IntSize sliderTickSize() const override;
@@ -158,23 +158,23 @@
 
     virtual bool supportsDataListUI(const AtomicString&) const override;
 
-    virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) override;
 
-    virtual void adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintInnerSpinButton(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual void adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintInnerSpinButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
 
     static void setDefaultFontSize(int fontsize);
 
 #if ENABLE(PROGRESS_ELEMENT)
-    virtual void adjustProgressBarStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const;
-    virtual double animationDurationForProgressBar(RenderProgress*) const;
+    virtual void adjustProgressBarStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const override;
+    virtual double animationDurationForProgressBar(RenderProgress*) const override;
 #endif
 
 #if ENABLE(VIDEO)
-    virtual String mediaControlsStyleSheet();
-    virtual String mediaControlsScript();
+    virtual String mediaControlsStyleSheet() override;
+    virtual String mediaControlsScript() override;
 #endif
 #if ENABLE(VIDEO_TRACK)
     virtual bool supportsClosedCaptioning() const override { return true; }

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes