<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[168683] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/168683">168683</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-13 08:34:00 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/167771">r167771</a>): [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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGtkcpp">trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGtkh">trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGtk2cpp">trunk/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGtk3cpp">trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168682 => 168683)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2014-05-13 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ 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.
+
</ins><span class="cx"> 2014-05-13 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Move toGstClockTime to utilities
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp (168682 => 168683)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> return paintMenuList(object, info, IntRect(rect));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintTextArea(const RenderObject& o, const PaintInfo& i, const IntRect& r)
</del><ins>+bool RenderThemeGtk::paintTextArea(const RenderObject& o, const PaintInfo& i, const FloatRect& r)
</ins><span class="cx"> {
</span><span class="cx"> return paintTextField(o, i, r);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h (168682 => 168683)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class RenderThemeGtk : public RenderTheme {
</del><ins>+class RenderThemeGtk final : public RenderTheme {
</ins><span class="cx"> private:
</span><span class="cx"> RenderThemeGtk();
</span><span class="cx"> virtual ~RenderThemeGtk();
</span><span class="lines">@@ -44,63 +44,63 @@
</span><span class="cx"> static PassRefPtr<RenderTheme> create();
</span><span class="cx">
</span><span class="cx"> // A method asking if the theme's controls actually care about redrawing when hovered.
</span><del>- virtual bool supportsHover(const RenderStyle*) const { return true; }
</del><ins>+ virtual bool supportsHover(const RenderStyle*) const override { return true; }
</ins><span class="cx">
</span><span class="cx"> // A method asking if the theme is able to draw the focus ring.
</span><del>- virtual bool supportsFocusRing(const RenderStyle*) const;
</del><ins>+ virtual bool supportsFocusRing(const RenderStyle*) const override;
</ins><span class="cx">
</span><span class="cx"> // A method asking if the control changes its tint when the window has focus or not.
</span><del>- virtual bool controlSupportsTints(const RenderObject&) const;
</del><ins>+ virtual bool controlSupportsTints(const RenderObject&) const override;
</ins><span class="cx">
</span><span class="cx"> // A general method asking if any control tinting is supported at all.
</span><del>- virtual bool supportsControlTints() const { return true; }
</del><ins>+ virtual bool supportsControlTints() const override { return true; }
</ins><span class="cx">
</span><del>- virtual void adjustRepaintRect(const RenderObject&, IntRect&);
</del><ins>+ virtual void adjustRepaintRect(const RenderObject&, IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> // A method to obtain the baseline position for a "leaf" control. This will only be used if a baseline
</span><span class="cx"> // position cannot be determined by examining child content. Checkboxes and radio buttons are examples of
</span><span class="cx"> // controls that need to do this.
</span><del>- virtual int baselinePosition(const RenderObject&) const;
</del><ins>+ virtual int baselinePosition(const RenderObject&) const override;
</ins><span class="cx">
</span><span class="cx"> // The platform selection color.
</span><del>- virtual Color platformActiveSelectionBackgroundColor() const;
- virtual Color platformInactiveSelectionBackgroundColor() const;
- virtual Color platformActiveSelectionForegroundColor() const;
- virtual Color platformInactiveSelectionForegroundColor() const;
</del><ins>+ virtual Color platformActiveSelectionBackgroundColor() const override;
+ virtual Color platformInactiveSelectionBackgroundColor() const override;
+ virtual Color platformActiveSelectionForegroundColor() const override;
+ virtual Color platformInactiveSelectionForegroundColor() const override;
</ins><span class="cx">
</span><span class="cx"> // List Box selection color
</span><del>- virtual Color activeListBoxSelectionBackgroundColor() const;
- virtual Color activeListBoxSelectionForegroundColor() const;
- virtual Color inactiveListBoxSelectionBackgroundColor() const;
- virtual Color inactiveListBoxSelectionForegroundColor() const;
</del><ins>+ virtual Color platformActiveListBoxSelectionBackgroundColor() const override;
+ virtual Color platformActiveListBoxSelectionForegroundColor() const override;
+ virtual Color platformInactiveListBoxSelectionBackgroundColor() const override;
+ virtual Color platformInactiveListBoxSelectionForegroundColor() const override;
</ins><span class="cx">
</span><del>- virtual double caretBlinkInterval() const;
</del><ins>+ virtual double caretBlinkInterval() const override;
</ins><span class="cx">
</span><del>- virtual void platformColorsDidChange();
</del><ins>+ virtual void platformColorsDidChange() override;
</ins><span class="cx">
</span><span class="cx"> // System fonts and colors.
</span><del>- virtual void systemFont(CSSValueID, FontDescription&) const;
- virtual Color systemColor(CSSValueID) const;
</del><ins>+ virtual void systemFont(CSSValueID, FontDescription&) const override;
+ virtual Color systemColor(CSSValueID) const override;
</ins><span class="cx">
</span><span class="cx"> virtual bool popsMenuBySpaceOrReturn() const override { return true; }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>- virtual String extraMediaControlsStyleSheet();
- virtual String formatMediaControlsCurrentTime(float currentTime, float duration) const;
</del><ins>+ virtual String extraMediaControlsStyleSheet() override;
+ virtual String formatMediaControlsCurrentTime(float currentTime, float duration) const override;
</ins><span class="cx"> virtual bool supportsClosedCaptioning() const override { return true; }
</span><del>- virtual String mediaControlsScript();
</del><ins>+ virtual String mediaControlsScript() override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>- virtual String extraFullScreenStyleSheet();
</del><ins>+ virtual String extraFullScreenStyleSheet() override;
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span><span class="cx"> // Returns size of one slider tick mark for a horizontal track.
</span><span class="cx"> // For vertical tracks we rotate it and use it. i.e. Width is always length along the track.
</span><del>- virtual IntSize sliderTickSize() const;
</del><ins>+ virtual IntSize sliderTickSize() const override;
</ins><span class="cx"> // Returns the distance of slider tick origin from the slider track center.
</span><del>- virtual int sliderTickOffsetFromTrackCenter() const;
</del><ins>+ virtual int sliderTickOffsetFromTrackCenter() const override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifdef GTK_API_VERSION_2
</span><span class="lines">@@ -113,86 +113,85 @@
</span><span class="cx"> GtkStyleContext* gtkScrollbarStyle();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-protected:
- virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&);
- virtual void setCheckboxSize(RenderStyle* style) const;
</del><ins>+private:
+ virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&) override;
+ virtual void setCheckboxSize(RenderStyle*) const override;
</ins><span class="cx">
</span><del>- virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&);
- virtual void setRadioSize(RenderStyle* style) const;
</del><ins>+ virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&) override;
+ virtual void setRadioSize(RenderStyle*) const override;
</ins><span class="cx">
</span><del>- virtual void adjustButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
+ virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><del>- virtual bool paintTextField(const RenderObject&, const PaintInfo&, const IntRect&);
- virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintTextField(const RenderObject&, const PaintInfo&, const FloatRect&) override;
+ virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const FloatRect&) override;
</ins><span class="cx">
</span><del>- int popupInternalPaddingLeft(RenderStyle*) const;
- int popupInternalPaddingRight(RenderStyle*) const;
- int popupInternalPaddingTop(RenderStyle*) const;
- int popupInternalPaddingBottom(RenderStyle*) const;
</del><ins>+ int popupInternalPaddingLeft(RenderStyle*) const override;
+ int popupInternalPaddingRight(RenderStyle*) const override;
+ int popupInternalPaddingTop(RenderStyle*) const override;
+ int popupInternalPaddingBottom(RenderStyle*) const override;
</ins><span class="cx">
</span><span class="cx"> // The Mac port differentiates between the "menu list" and the "menu list button."
</span><span class="cx"> // The former is used when a menu list button has been styled. This is used to ensure
</span><span class="cx"> // Aqua themed controls whenever possible. We always want to use GTK+ theming, so
</span><span class="cx"> // we don't maintain this differentiation.
</span><del>- 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&);
</del><ins>+ 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;
</ins><span class="cx">
</span><del>- virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const override;
+ virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><del>- virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const override;
+ virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><del>- virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</del><ins>+ virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
</ins><span class="cx"> virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&);
</span><span class="cx">
</span><del>- virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
+ virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><del>- virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
- virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const;
</del><ins>+ virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
+ virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const override;
</ins><span class="cx">
</span><del>- virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&);
- virtual void adjustSliderThumbStyle(StyleResolver*, RenderStyle*, Element*) const;
</del><ins>+ virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) override;
+ virtual void adjustSliderThumbStyle(StyleResolver*, RenderStyle*, Element*) const override;
</ins><span class="cx">
</span><del>- virtual void adjustSliderThumbSize(RenderStyle*, Element*) const;
</del><ins>+ virtual void adjustSliderThumbSize(RenderStyle*, Element*) const override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> void initMediaColors();
</span><span class="cx"> void initMediaButtons();
</span><del>- 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&);
</del><ins>+ 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;
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- virtual bool paintMediaToggleClosedCaptionsButton(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMediaToggleClosedCaptionsButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><del>- 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&);
</del><ins>+ 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;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual bool paintCapsLockIndicator(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintCapsLockIndicator(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><del>- virtual void adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintInnerSpinButton(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
+ virtual bool paintInnerSpinButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><del>-private:
</del><span class="cx"> virtual String fileListNameForWidth(const FileList*, const Font&, int width, bool multipleFilesAllowed) const override;
</span><span class="cx">
</span><span class="cx"> void platformInit();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGtk2cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp (168682 => 168683)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintTextField(const RenderObject& renderObject, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintTextField(const RenderObject& renderObject, const PaintInfo& info, const FloatRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> GtkWidget* widget = gtkEntry();
</span><span class="cx">
</span><span class="lines">@@ -432,8 +432,8 @@
</span><span class="cx"> gtk_widget_set_direction(widget, gtkTextDirection(renderObject.style().direction()));
</span><span class="cx"> setWidgetHasFocus(widget, isFocused(renderObject));
</span><span class="cx">
</span><del>- WidgetRenderingContext widgetContext(info.context, rect);
- IntRect textFieldRect(IntPoint(), rect.size());
</del><ins>+ WidgetRenderingContext widgetContext(info.context, IntRect(rect));
+ IntRect textFieldRect(IntPoint(), IntSize(rect.size()));
</ins><span class="cx">
</span><span class="cx"> // The entry background is only painted over the interior part of the GTK+ entry, not
</span><span class="cx"> // the entire frame. This happens in the Mozilla theme drawing code as well.
</span><span class="lines">@@ -699,25 +699,25 @@
</span><span class="cx"> return gtk_widget_get_style(widget)->text[GTK_STATE_ACTIVE];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Color RenderThemeGtk::activeListBoxSelectionBackgroundColor() const
</del><ins>+Color RenderThemeGtk::platformActiveListBoxSelectionBackgroundColor() const
</ins><span class="cx"> {
</span><span class="cx"> GtkWidget* widget = gtkTreeView();
</span><span class="cx"> return gtk_widget_get_style(widget)->base[GTK_STATE_SELECTED];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Color RenderThemeGtk::inactiveListBoxSelectionBackgroundColor() const
</del><ins>+Color RenderThemeGtk::platformInactiveListBoxSelectionBackgroundColor() const
</ins><span class="cx"> {
</span><span class="cx"> GtkWidget* widget = gtkTreeView();
</span><span class="cx"> return gtk_widget_get_style(widget)->base[GTK_STATE_ACTIVE];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Color RenderThemeGtk::activeListBoxSelectionForegroundColor() const
</del><ins>+Color RenderThemeGtk::platformActiveListBoxSelectionForegroundColor() const
</ins><span class="cx"> {
</span><span class="cx"> GtkWidget* widget = gtkTreeView();
</span><span class="cx"> return gtk_widget_get_style(widget)->text[GTK_STATE_SELECTED];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Color RenderThemeGtk::inactiveListBoxSelectionForegroundColor() const
</del><ins>+Color RenderThemeGtk::platformInactiveListBoxSelectionForegroundColor() const
</ins><span class="cx"> {
</span><span class="cx"> GtkWidget* widget = gtkTreeView();
</span><span class="cx"> return gtk_widget_get_style(widget)->text[GTK_STATE_ACTIVE];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGtk3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp (168682 => 168683)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -595,7 +595,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintTextField(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintTextField(const RenderObject& renderObject, const PaintInfo& paintInfo, const FloatRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> GtkStyleContext* context = getStyleContext(GTK_TYPE_ENTRY);
</span><span class="cx"> gtk_style_context_save(context);
</span><span class="lines">@@ -961,28 +961,28 @@
</span><span class="cx"> return gdkRGBAColor;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Color RenderThemeGtk::activeListBoxSelectionBackgroundColor() const
</del><ins>+Color RenderThemeGtk::platformActiveListBoxSelectionBackgroundColor() const
</ins><span class="cx"> {
</span><span class="cx"> GdkRGBA gdkRGBAColor;
</span><span class="cx"> gtk_style_context_get_background_color(getStyleContext(GTK_TYPE_TREE_VIEW), GTK_STATE_FLAG_SELECTED, &gdkRGBAColor);
</span><span class="cx"> return gdkRGBAColor;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Color RenderThemeGtk::inactiveListBoxSelectionBackgroundColor() const
</del><ins>+Color RenderThemeGtk::platformInactiveListBoxSelectionBackgroundColor() const
</ins><span class="cx"> {
</span><span class="cx"> GdkRGBA gdkRGBAColor;
</span><span class="cx"> gtk_style_context_get_background_color(getStyleContext(GTK_TYPE_TREE_VIEW), GTK_STATE_FLAG_ACTIVE, &gdkRGBAColor);
</span><span class="cx"> return gdkRGBAColor;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Color RenderThemeGtk::activeListBoxSelectionForegroundColor() const
</del><ins>+Color RenderThemeGtk::platformActiveListBoxSelectionForegroundColor() const
</ins><span class="cx"> {
</span><span class="cx"> GdkRGBA gdkRGBAColor;
</span><span class="cx"> gtk_style_context_get_color(getStyleContext(GTK_TYPE_TREE_VIEW), GTK_STATE_FLAG_SELECTED, &gdkRGBAColor);
</span><span class="cx"> return gdkRGBAColor;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Color RenderThemeGtk::inactiveListBoxSelectionForegroundColor() const
</del><ins>+Color RenderThemeGtk::platformInactiveListBoxSelectionForegroundColor() const
</ins><span class="cx"> {
</span><span class="cx"> GdkRGBA gdkRGBAColor;
</span><span class="cx"> gtk_style_context_get_color(getStyleContext(GTK_TYPE_TREE_VIEW), GTK_STATE_FLAG_ACTIVE, &gdkRGBAColor);
</span></span></pre>
</div>
</div>
</body>
</html>