<!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>[169335] trunk</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/169335">169335</a></dd>
<dt>Author</dt> <dd>m.pakula@samsung.com</dd>
<dt>Date</dt> <dd>2014-05-26 02:50:18 -0700 (Mon, 26 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Input fields and text areas are not rendered correctly after <a href="http://trac.webkit.org/projects/webkit/changeset/167771">r167771</a>
https://bugs.webkit.org/show_bug.cgi?id=133181
Reviewed by Gyuyoung Kim.
Source/WebCore:
<a href="http://trac.webkit.org/projects/webkit/changeset/167771">r167771</a> 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflwk2TestExpectations">trunk/LayoutTests/platform/efl-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformeflRenderThemeEflcpp">trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformeflRenderThemeEflh">trunk/Source/WebCore/platform/efl/RenderThemeEfl.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169334 => 169335)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-26 09:48:55 UTC (rev 169334)
+++ trunk/LayoutTests/ChangeLog 2014-05-26 09:50:18 UTC (rev 169335)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-05-26 Michał Pakuła vel Rutka <m.pakula@samsung.com>
+
+ [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.
+
</ins><span class="cx"> 2014-05-20 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Children of grid containers must be turned into grid items
</span></span></pre></div>
<a id="trunkLayoutTestsplatformeflwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl-wk2/TestExpectations (169334 => 169335)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -559,5 +559,3 @@
</span><span class="cx"> webkit.org/b/131987 fast/repaint/hidpi-absolute-positioned-element-wrong-cliprect-after-move.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/132049 fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html [ ImageOnlyFailure ]
</span><del>-
-webkit.org/b/133181 fast/forms/textarea-placeholder-wrapping.html [ ImageOnlyFailure ]
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169334 => 169335)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-05-26 Michał Pakuła vel Rutka <m.pakula@samsung.com>
+
+ [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):
+
</ins><span class="cx"> 2014-05-20 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Children of grid containers must be turned into grid items
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflRenderThemeEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp (169334 => 169335)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -878,16 +878,16 @@
</span><span class="cx"> style->resetBorder();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintTextField(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintTextField(const RenderObject& object, const PaintInfo& info, const FloatRect& rect)
</ins><span class="cx"> {
</span><del>- return paintThemePart(object, TextField, info, rect);
</del><ins>+ return paintThemePart(object, TextField, info, IntRect(rect));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderThemeEfl::adjustTextAreaStyle(StyleResolver*, RenderStyle*, Element*) const
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintTextArea(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintTextArea(const RenderObject& object, const PaintInfo& info, const FloatRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintTextField(object, info, rect);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflRenderThemeEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.h (169334 => 169335)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -60,42 +60,42 @@
</span><span class="cx"> FormTypeLast
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class RenderThemeEfl : public RenderTheme {
</del><ins>+class RenderThemeEfl final : public RenderTheme {
</ins><span class="cx"> private:
</span><span class="cx"> explicit RenderThemeEfl(Page*);
</span><del>- ~RenderThemeEfl();
</del><ins>+ virtual ~RenderThemeEfl();
</ins><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<RenderTheme> create(Page*);
</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 Returning whether the control is styled by css or not e.g specifying background-color.
</span><del>- virtual bool isControlStyled(const RenderStyle*, const BorderData&, const FillLayer&, const Color& backgroundColor) const;
</del><ins>+ virtual bool isControlStyled(const RenderStyle*, const BorderData&, const FillLayer&, const Color& backgroundColor) const override;
</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><span class="cx"> // A general method asking if foreground colors of selection are supported.
</span><del>- virtual bool supportsSelectionForegroundColors() const;
</del><ins>+ virtual bool supportsSelectionForegroundColors() const 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><del>- virtual Color platformActiveSelectionBackgroundColor() const;
- virtual Color platformInactiveSelectionBackgroundColor() const;
- virtual Color platformActiveSelectionForegroundColor() const;
- virtual Color platformInactiveSelectionForegroundColor() const;
- virtual Color platformFocusRingColor() const;
</del><ins>+ 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;
</ins><span class="cx">
</span><span class="cx"> // Set platform colors; remember to call platformColorDidChange after.
</span><span class="cx"> void setColorFromThemeClass(const char* colorClass);
</span><span class="lines">@@ -108,47 +108,47 @@
</span><span class="cx"> void adjustSizeConstraints(RenderStyle*, FormType) const;
</span><span class="cx">
</span><span class="cx"> // System fonts.
</span><del>- virtual void systemFont(CSSValueID, FontDescription&) const;
</del><ins>+ virtual void systemFont(CSSValueID, FontDescription&) const override;
</ins><span class="cx">
</span><del>- virtual void adjustCheckboxStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustCheckboxStyle(StyleResolver*, RenderStyle*, Element*) const override;
+ virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><del>- virtual void adjustRadioStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustRadioStyle(StyleResolver*, RenderStyle*, Element*) const override;
+ virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&) 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 void adjustTextFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintTextField(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustTextFieldStyle(StyleResolver*, RenderStyle*, Element*) const override;
+ virtual bool paintTextField(const RenderObject&, const PaintInfo&, const FloatRect&) override;
</ins><span class="cx">
</span><del>- virtual void adjustTextAreaStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustTextAreaStyle(StyleResolver*, RenderStyle*, Element*) const override;
+ virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const FloatRect&) override;
</ins><span class="cx">
</span><del>- virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const override;
+ virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><del>- virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&);
</del><ins>+ virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const 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;
- virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
+ virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><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 void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const override;
+ virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><del>- virtual void adjustSliderThumbStyle(StyleResolver*, RenderStyle*, Element*) const;
</del><ins>+ 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(DATALIST_ELEMENT)
</span><span class="cx"> virtual IntSize sliderTickSize() const override;
</span><span class="lines">@@ -158,23 +158,23 @@
</span><span class="cx">
</span><span class="cx"> virtual bool supportsDataListUI(const AtomicString&) const override;
</span><span class="cx">
</span><del>- virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSliderThumb(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><span class="cx"> static void setDefaultFontSize(int fontsize);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><del>- 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;
</del><ins>+ 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;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>- virtual String mediaControlsStyleSheet();
- virtual String mediaControlsScript();
</del><ins>+ virtual String mediaControlsStyleSheet() override;
+ virtual String mediaControlsScript() override;
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> virtual bool supportsClosedCaptioning() const override { return true; }
</span></span></pre>
</div>
</div>
</body>
</html>