[webkit-changes] [168683] trunk/Source/WebCore

Tue, 13 May 2014 08:34:54 -0700

Title: [168683] trunk/Source/WebCore
Revision
168683
Author
[email protected]
Date
2014-05-13 08:34:00 -0700 (Tue, 13 May 2014)

Log Message

REGRESSION(r167771): [GTK] Text fields and areas are rendered unthemed
https://bugs.webkit.org/show_bug.cgi?id=132864

Reviewed by Philippe Normand.

This is because the virtual methods changed the API in the parent,
and since we don't have the methods marked as override we didn't
noticed it. After using override keyword for all virtual methods
in the derived class another problem showed up, the ActiveListBox
selection methods were incorrectly named.

* platform/gtk/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::paintTextArea): Update to API changes in the
parent class.
* platform/gtk/RenderThemeGtk.h: Mark all virtual methods as
override and the class as final.
* platform/gtk/RenderThemeGtk2.cpp:
(WebCore::RenderThemeGtk::paintTextField): Update to API changes
in the parent class.
(WebCore::RenderThemeGtk::platformActiveListBoxSelectionBackgroundColor):
(WebCore::RenderThemeGtk::platformInactiveListBoxSelectionBackgroundColor):
(WebCore::RenderThemeGtk::platformActiveListBoxSelectionForegroundColor):
(WebCore::RenderThemeGtk::platformInactiveListBoxSelectionForegroundColor):
(WebCore::RenderThemeGtk::activeListBoxSelectionBackgroundColor): Deleted.
(WebCore::RenderThemeGtk::inactiveListBoxSelectionBackgroundColor): Deleted.
(WebCore::RenderThemeGtk::activeListBoxSelectionForegroundColor): Deleted.
(WebCore::RenderThemeGtk::inactiveListBoxSelectionForegroundColor): Deleted.
* platform/gtk/RenderThemeGtk3.cpp:
(WebCore::RenderThemeGtk::paintTextField): Update to API changes
in the parent class.
(WebCore::RenderThemeGtk::platformActiveListBoxSelectionBackgroundColor):
(WebCore::RenderThemeGtk::platformInactiveListBoxSelectionBackgroundColor):
(WebCore::RenderThemeGtk::platformActiveListBoxSelectionForegroundColor):
(WebCore::RenderThemeGtk::platformInactiveListBoxSelectionForegroundColor):
(WebCore::RenderThemeGtk::activeListBoxSelectionBackgroundColor): Deleted.
(WebCore::RenderThemeGtk::inactiveListBoxSelectionBackgroundColor): Deleted.
(WebCore::RenderThemeGtk::activeListBoxSelectionForegroundColor): Deleted.
(WebCore::RenderThemeGtk::inactiveListBoxSelectionForegroundColor): Deleted.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (168682 => 168683)


--- trunk/Source/WebCore/ChangeLog	2014-05-13 15:30:29 UTC (rev 168682)
+++ trunk/Source/WebCore/ChangeLog	2014-05-13 15:34:00 UTC (rev 168683)
@@ -1,3 +1,44 @@
+2014-05-13  Carlos Garcia Campos  <[email protected]>
+
+        REGRESSION(r167771): [GTK] Text fields and areas are rendered unthemed
+        https://bugs.webkit.org/show_bug.cgi?id=132864
+
+        Reviewed by Philippe Normand.
+
+        This is because the virtual methods changed the API in the parent,
+        and since we don't have the methods marked as override we didn't
+        noticed it. After using override keyword for all virtual methods
+        in the derived class another problem showed up, the ActiveListBox
+        selection methods were incorrectly named.
+
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::RenderThemeGtk::paintTextArea): Update to API changes in the
+        parent class.
+        * platform/gtk/RenderThemeGtk.h: Mark all virtual methods as
+        override and the class as final.
+        * platform/gtk/RenderThemeGtk2.cpp:
+        (WebCore::RenderThemeGtk::paintTextField): Update to API changes
+        in the parent class.
+        (WebCore::RenderThemeGtk::platformActiveListBoxSelectionBackgroundColor):
+        (WebCore::RenderThemeGtk::platformInactiveListBoxSelectionBackgroundColor):
+        (WebCore::RenderThemeGtk::platformActiveListBoxSelectionForegroundColor):
+        (WebCore::RenderThemeGtk::platformInactiveListBoxSelectionForegroundColor):
+        (WebCore::RenderThemeGtk::activeListBoxSelectionBackgroundColor): Deleted.
+        (WebCore::RenderThemeGtk::inactiveListBoxSelectionBackgroundColor): Deleted.
+        (WebCore::RenderThemeGtk::activeListBoxSelectionForegroundColor): Deleted.
+        (WebCore::RenderThemeGtk::inactiveListBoxSelectionForegroundColor): Deleted.
+        * platform/gtk/RenderThemeGtk3.cpp:
+        (WebCore::RenderThemeGtk::paintTextField): Update to API changes
+        in the parent class.
+        (WebCore::RenderThemeGtk::platformActiveListBoxSelectionBackgroundColor):
+        (WebCore::RenderThemeGtk::platformInactiveListBoxSelectionBackgroundColor):
+        (WebCore::RenderThemeGtk::platformActiveListBoxSelectionForegroundColor):
+        (WebCore::RenderThemeGtk::platformInactiveListBoxSelectionForegroundColor):
+        (WebCore::RenderThemeGtk::activeListBoxSelectionBackgroundColor): Deleted.
+        (WebCore::RenderThemeGtk::inactiveListBoxSelectionBackgroundColor): Deleted.
+        (WebCore::RenderThemeGtk::activeListBoxSelectionForegroundColor): Deleted.
+        (WebCore::RenderThemeGtk::inactiveListBoxSelectionForegroundColor): Deleted.
+
 2014-05-13  Xabier Rodriguez Calvar  <[email protected]>
 
         [GStreamer] Move toGstClockTime to utilities

Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp (168682 => 168683)


--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp	2014-05-13 15:30:29 UTC (rev 168682)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp	2014-05-13 15:34:00 UTC (rev 168683)
@@ -246,7 +246,7 @@
     return paintMenuList(object, info, IntRect(rect));
 }
 
-bool RenderThemeGtk::paintTextArea(const RenderObject& o, const PaintInfo& i, const IntRect& r)
+bool RenderThemeGtk::paintTextArea(const RenderObject& o, const PaintInfo& i, const FloatRect& r)
 {
     return paintTextField(o, i, r);
 }

Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h (168682 => 168683)


--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h	2014-05-13 15:30:29 UTC (rev 168682)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h	2014-05-13 15:34:00 UTC (rev 168683)
@@ -35,7 +35,7 @@
 
 namespace WebCore {
 
-class RenderThemeGtk : public RenderTheme {
+class RenderThemeGtk final : public RenderTheme {
 private:
     RenderThemeGtk();
     virtual ~RenderThemeGtk();
@@ -44,63 +44,63 @@
     static PassRefPtr<RenderTheme> create();
 
     // 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 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; }
 
-    virtual void adjustRepaintRect(const RenderObject&, IntRect&);
+    virtual void adjustRepaintRect(const RenderObject&, IntRect&) 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;
 
     // The platform selection color.
-    virtual Color platformActiveSelectionBackgroundColor() const;
-    virtual Color platformInactiveSelectionBackgroundColor() const;
-    virtual Color platformActiveSelectionForegroundColor() const;
-    virtual Color platformInactiveSelectionForegroundColor() const;
+    virtual Color platformActiveSelectionBackgroundColor() const override;
+    virtual Color platformInactiveSelectionBackgroundColor() const override;
+    virtual Color platformActiveSelectionForegroundColor() const override;
+    virtual Color platformInactiveSelectionForegroundColor() const override;
 
     // List Box selection color
-    virtual Color activeListBoxSelectionBackgroundColor() const;
-    virtual Color activeListBoxSelectionForegroundColor() const;
-    virtual Color inactiveListBoxSelectionBackgroundColor() const;
-    virtual Color inactiveListBoxSelectionForegroundColor() const;
+    virtual Color platformActiveListBoxSelectionBackgroundColor() const override;
+    virtual Color platformActiveListBoxSelectionForegroundColor() const override;
+    virtual Color platformInactiveListBoxSelectionBackgroundColor() const override;
+    virtual Color platformInactiveListBoxSelectionForegroundColor() const override;
 
-    virtual double caretBlinkInterval() const;
+    virtual double caretBlinkInterval() const override;
 
-    virtual void platformColorsDidChange();
+    virtual void platformColorsDidChange() override;
 
     // System fonts and colors.
-    virtual void systemFont(CSSValueID, FontDescription&) const;
-    virtual Color systemColor(CSSValueID) const;
+    virtual void systemFont(CSSValueID, FontDescription&) const override;
+    virtual Color systemColor(CSSValueID) const override;
 
     virtual bool popsMenuBySpaceOrReturn() const override { return true; }
 
 #if ENABLE(VIDEO)
-    virtual String extraMediaControlsStyleSheet();
-    virtual String formatMediaControlsCurrentTime(float currentTime, float duration) const;
+    virtual String extraMediaControlsStyleSheet() override;
+    virtual String formatMediaControlsCurrentTime(float currentTime, float duration) const override;
     virtual bool supportsClosedCaptioning() const override { return true; }
-    virtual String mediaControlsScript();
+    virtual String mediaControlsScript() override;
 
 #if ENABLE(FULLSCREEN_API)
-    virtual String extraFullScreenStyleSheet();
+    virtual String extraFullScreenStyleSheet() override;
 #endif
 #endif
 
 #if ENABLE(DATALIST_ELEMENT)
     // Returns size of one slider tick mark for a horizontal track.
     // For vertical tracks we rotate it and use it. i.e. Width is always length along the track.
-    virtual IntSize sliderTickSize() const;
+    virtual IntSize sliderTickSize() const override;
     // Returns the distance of slider tick origin from the slider track center.
-    virtual int sliderTickOffsetFromTrackCenter() const;
+    virtual int sliderTickOffsetFromTrackCenter() const override;
 #endif
 
 #ifdef GTK_API_VERSION_2
@@ -113,86 +113,85 @@
     GtkStyleContext* gtkScrollbarStyle();
 #endif
 
-protected:
-    virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual void setCheckboxSize(RenderStyle* style) const;
+private:
+    virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual void setCheckboxSize(RenderStyle*) const override;
 
-    virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual void setRadioSize(RenderStyle* style) const;
+    virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual void setRadioSize(RenderStyle*) const 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 bool paintTextField(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual bool paintTextField(const RenderObject&, const PaintInfo&, const FloatRect&) override;
+    virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const FloatRect&) override;
 
-    int popupInternalPaddingLeft(RenderStyle*) const;
-    int popupInternalPaddingRight(RenderStyle*) const;
-    int popupInternalPaddingTop(RenderStyle*) const;
-    int popupInternalPaddingBottom(RenderStyle*) const;
+    int popupInternalPaddingLeft(RenderStyle*) const override;
+    int popupInternalPaddingRight(RenderStyle*) const override;
+    int popupInternalPaddingTop(RenderStyle*) const override;
+    int popupInternalPaddingBottom(RenderStyle*) const override;
 
     // The Mac port differentiates between the "menu list" and the "menu list button."
     // The former is used when a menu list button has been styled. This is used to ensure
     // Aqua themed controls whenever possible. We always want to use GTK+ theming, so
     // we don't maintain this differentiation.
-    virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&);
+    virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&) 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 void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
     virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&);
 
-    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 bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const;
+    virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const override;
 
-    virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual void adjustSliderThumbStyle(StyleResolver*, RenderStyle*, Element*) const;
+    virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual void adjustSliderThumbStyle(StyleResolver*, RenderStyle*, Element*) const override;
 
-    virtual void adjustSliderThumbSize(RenderStyle*, Element*) const;
+    virtual void adjustSliderThumbSize(RenderStyle*, Element*) const override;
 
 #if ENABLE(VIDEO)
     void initMediaColors();
     void initMediaButtons();
-    virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const;
-    virtual bool paintMediaFullscreenButton(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaPlayButton(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaMuteButton(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaSeekBackButton(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaSeekForwardButton(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaVolumeSliderContainer(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaVolumeSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaVolumeSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&);
-    virtual bool paintMediaCurrentTime(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const override;
+    virtual bool paintMediaFullscreenButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual bool paintMediaPlayButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual bool paintMediaMuteButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual bool paintMediaSeekBackButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual bool paintMediaSeekForwardButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual bool paintMediaSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual bool paintMediaSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual bool paintMediaVolumeSliderContainer(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual bool paintMediaVolumeSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual bool paintMediaVolumeSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) override;
+    virtual bool paintMediaCurrentTime(const RenderObject&, const PaintInfo&, const IntRect&) override;
 #if ENABLE(VIDEO_TRACK)
-    virtual bool paintMediaToggleClosedCaptionsButton(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual bool paintMediaToggleClosedCaptionsButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
 #endif
 #endif
 
 #if ENABLE(PROGRESS_ELEMENT)
-    virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const;
-    virtual double animationDurationForProgressBar(RenderProgress*) const;
-    virtual void adjustProgressBarStyle(StyleResolver*, RenderStyle*, Element*) const;
-    virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const override;
+    virtual double animationDurationForProgressBar(RenderProgress*) const override;
+    virtual void adjustProgressBarStyle(StyleResolver*, RenderStyle*, Element*) const override;
+    virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&) override;
 #endif
 
-    virtual bool paintCapsLockIndicator(const RenderObject&, const PaintInfo&, const IntRect&);
+    virtual bool paintCapsLockIndicator(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;
 
-private:
     virtual String fileListNameForWidth(const FileList*, const Font&, int width, bool multipleFilesAllowed) const override;
 
     void platformInit();

Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp (168682 => 168683)


--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp	2014-05-13 15:30:29 UTC (rev 168682)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp	2014-05-13 15:34:00 UTC (rev 168683)
@@ -422,7 +422,7 @@
     return false;
 }
 
-bool RenderThemeGtk::paintTextField(const RenderObject& renderObject, const PaintInfo& info, const IntRect& rect)
+bool RenderThemeGtk::paintTextField(const RenderObject& renderObject, const PaintInfo& info, const FloatRect& rect)
 {
     GtkWidget* widget = gtkEntry();
 
@@ -432,8 +432,8 @@
     gtk_widget_set_direction(widget, gtkTextDirection(renderObject.style().direction()));
     setWidgetHasFocus(widget, isFocused(renderObject));
 
-    WidgetRenderingContext widgetContext(info.context, rect);
-    IntRect textFieldRect(IntPoint(), rect.size());
+    WidgetRenderingContext widgetContext(info.context, IntRect(rect));
+    IntRect textFieldRect(IntPoint(), IntSize(rect.size()));
 
     // The entry background is only painted over the interior part of the GTK+ entry, not
     // the entire frame. This happens in the Mozilla theme drawing code as well.
@@ -699,25 +699,25 @@
     return gtk_widget_get_style(widget)->text[GTK_STATE_ACTIVE];
 }
 
-Color RenderThemeGtk::activeListBoxSelectionBackgroundColor() const
+Color RenderThemeGtk::platformActiveListBoxSelectionBackgroundColor() const
 {
     GtkWidget* widget = gtkTreeView();
     return gtk_widget_get_style(widget)->base[GTK_STATE_SELECTED];
 }
 
-Color RenderThemeGtk::inactiveListBoxSelectionBackgroundColor() const
+Color RenderThemeGtk::platformInactiveListBoxSelectionBackgroundColor() const
 {
     GtkWidget* widget = gtkTreeView();
     return gtk_widget_get_style(widget)->base[GTK_STATE_ACTIVE];
 }
 
-Color RenderThemeGtk::activeListBoxSelectionForegroundColor() const
+Color RenderThemeGtk::platformActiveListBoxSelectionForegroundColor() const
 {
     GtkWidget* widget = gtkTreeView();
     return gtk_widget_get_style(widget)->text[GTK_STATE_SELECTED];
 }
 
-Color RenderThemeGtk::inactiveListBoxSelectionForegroundColor() const
+Color RenderThemeGtk::platformInactiveListBoxSelectionForegroundColor() const
 {
     GtkWidget* widget = gtkTreeView();
     return gtk_widget_get_style(widget)->text[GTK_STATE_ACTIVE];

Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp (168682 => 168683)


--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp	2014-05-13 15:30:29 UTC (rev 168682)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp	2014-05-13 15:34:00 UTC (rev 168683)
@@ -595,7 +595,7 @@
     return false;
 }
 
-bool RenderThemeGtk::paintTextField(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderThemeGtk::paintTextField(const RenderObject& renderObject, const PaintInfo& paintInfo, const FloatRect& rect)
 {
     GtkStyleContext* context = getStyleContext(GTK_TYPE_ENTRY);
     gtk_style_context_save(context);
@@ -961,28 +961,28 @@
     return gdkRGBAColor;
 }
 
-Color RenderThemeGtk::activeListBoxSelectionBackgroundColor() const
+Color RenderThemeGtk::platformActiveListBoxSelectionBackgroundColor() const
 {
     GdkRGBA gdkRGBAColor;
     gtk_style_context_get_background_color(getStyleContext(GTK_TYPE_TREE_VIEW), GTK_STATE_FLAG_SELECTED, &gdkRGBAColor);
     return gdkRGBAColor;
 }
 
-Color RenderThemeGtk::inactiveListBoxSelectionBackgroundColor() const
+Color RenderThemeGtk::platformInactiveListBoxSelectionBackgroundColor() const
 {
     GdkRGBA gdkRGBAColor;
     gtk_style_context_get_background_color(getStyleContext(GTK_TYPE_TREE_VIEW), GTK_STATE_FLAG_ACTIVE, &gdkRGBAColor);
     return gdkRGBAColor;
 }
 
-Color RenderThemeGtk::activeListBoxSelectionForegroundColor() const
+Color RenderThemeGtk::platformActiveListBoxSelectionForegroundColor() const
 {
     GdkRGBA gdkRGBAColor;
     gtk_style_context_get_color(getStyleContext(GTK_TYPE_TREE_VIEW), GTK_STATE_FLAG_SELECTED, &gdkRGBAColor);
     return gdkRGBAColor;
 }
 
-Color RenderThemeGtk::inactiveListBoxSelectionForegroundColor() const
+Color RenderThemeGtk::platformInactiveListBoxSelectionForegroundColor() const
 {
     GdkRGBA gdkRGBAColor;
     gtk_style_context_get_color(getStyleContext(GTK_TYPE_TREE_VIEW), GTK_STATE_FLAG_ACTIVE, &gdkRGBAColor);

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

Reply via email to