<!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>[169699] 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/169699">169699</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-06-09 11:43:20 -0700 (Mon, 09 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/169681">r169681</a>): Three tests are broken
https://bugs.webkit.org/show_bug.cgi?id=133646
Reviewed by Tim Horton.
<a href="http://trac.webkit.org/projects/webkit/changeset/169681">r169681</a> removed platformFocusRingMaxWidth() override, which returned either 0 or 9
on Mac. But the cross-platform default is 3, so this changed Mac behavior.
I'm not entirely sure why the cross-platform default is 3 (it was also added in <a href="http://trac.webkit.org/projects/webkit/changeset/168397">r168397</a>),
but restoring the override to return 0 fixes test cases.
While at it, also added final/override, and removed some functions that were only
needed by subclasses, which we now have none.
* rendering/RenderThemeMac.h:
(WebCore::RenderThemeMac::supportsControlTints): Deleted.
(WebCore::RenderThemeMac::scrollbarControlSizeForPart): Deleted.
(WebCore::RenderThemeMac::supportsSelectionForegroundColors): Deleted.
(WebCore::RenderThemeMac::supportsClosedCaptioning): Deleted.
(WebCore::RenderThemeMac::updateActiveState): Deleted.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::platformFocusRingMaxWidth):
(WebCore::RenderThemeMac::setPopupButtonCellState):
(WebCore::RenderThemeMac::paintSliderThumb):
(WebCore::RenderThemeMac::setSearchCellState):
(WebCore::RenderThemeMac::paintSearchFieldCancelButton):
(WebCore::RenderThemeMac::paintSearchFieldResultsDecorationPart):
(WebCore::RenderThemeMac::paintSearchFieldResultsButton):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMach">trunk/Source/WebCore/rendering/RenderThemeMac.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169698 => 169699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-09 18:17:41 UTC (rev 169698)
+++ trunk/Source/WebCore/ChangeLog 2014-06-09 18:43:20 UTC (rev 169699)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-06-09 Alexey Proskuryakov <ap@apple.com>
+
+ REGRESSION (r169681): Three tests are broken
+ https://bugs.webkit.org/show_bug.cgi?id=133646
+
+ Reviewed by Tim Horton.
+
+ r169681 removed platformFocusRingMaxWidth() override, which returned either 0 or 9
+ on Mac. But the cross-platform default is 3, so this changed Mac behavior.
+
+ I'm not entirely sure why the cross-platform default is 3 (it was also added in r168397),
+ but restoring the override to return 0 fixes test cases.
+
+ While at it, also added final/override, and removed some functions that were only
+ needed by subclasses, which we now have none.
+
+ * rendering/RenderThemeMac.h:
+ (WebCore::RenderThemeMac::supportsControlTints): Deleted.
+ (WebCore::RenderThemeMac::scrollbarControlSizeForPart): Deleted.
+ (WebCore::RenderThemeMac::supportsSelectionForegroundColors): Deleted.
+ (WebCore::RenderThemeMac::supportsClosedCaptioning): Deleted.
+ (WebCore::RenderThemeMac::updateActiveState): Deleted.
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::platformFocusRingMaxWidth):
+ (WebCore::RenderThemeMac::setPopupButtonCellState):
+ (WebCore::RenderThemeMac::paintSliderThumb):
+ (WebCore::RenderThemeMac::setSearchCellState):
+ (WebCore::RenderThemeMac::paintSearchFieldCancelButton):
+ (WebCore::RenderThemeMac::paintSearchFieldResultsDecorationPart):
+ (WebCore::RenderThemeMac::paintSearchFieldResultsButton):
+
</ins><span class="cx"> 2014-06-09 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Bound RasterShapeInterval size to int
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (169698 => 169699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.h 2014-06-09 18:17:41 UTC (rev 169698)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h 2014-06-09 18:43:20 UTC (rev 169699)
</span><span class="lines">@@ -39,49 +39,50 @@
</span><span class="cx"> class RenderProgress;
</span><span class="cx"> class RenderStyle;
</span><span class="cx">
</span><del>-class RenderThemeMac : public RenderTheme {
</del><ins>+class RenderThemeMac final : public RenderTheme {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<RenderTheme> create();
</span><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"> virtual void adjustRepaintRect(const RenderObject&, IntRect&) override;
</span><span class="cx">
</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><del>- virtual Color platformActiveSelectionBackgroundColor() const;
- virtual Color platformInactiveSelectionBackgroundColor() const;
- virtual Color platformActiveListBoxSelectionBackgroundColor() const;
- virtual Color platformActiveListBoxSelectionForegroundColor() const;
- virtual Color platformInactiveListBoxSelectionBackgroundColor() const;
- virtual Color platformInactiveListBoxSelectionForegroundColor() const;
- virtual Color platformFocusRingColor() const;
</del><ins>+ virtual Color platformActiveSelectionBackgroundColor() const override;
+ virtual Color platformInactiveSelectionBackgroundColor() const override;
+ virtual Color platformActiveListBoxSelectionBackgroundColor() const override;
+ virtual Color platformActiveListBoxSelectionForegroundColor() const override;
+ virtual Color platformInactiveListBoxSelectionBackgroundColor() const override;
+ virtual Color platformInactiveListBoxSelectionForegroundColor() const override;
+ virtual Color platformFocusRingColor() const override;
+ virtual int platformFocusRingMaxWidth() const override;
</ins><span class="cx">
</span><del>- virtual ScrollbarControlSize scrollbarControlSizeForPart(ControlPart) { return SmallScrollbar; }
</del><ins>+ virtual ScrollbarControlSize scrollbarControlSizeForPart(ControlPart) override { return SmallScrollbar; }
</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.
</span><del>- virtual void systemFont(CSSValueID, FontDescription&) const;
</del><ins>+ virtual void systemFont(CSSValueID, FontDescription&) const override;
</ins><span class="cx">
</span><del>- virtual int minimumMenuListSize(RenderStyle*) const;
</del><ins>+ virtual int minimumMenuListSize(RenderStyle*) 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="cx"> virtual int sliderTickOffsetFromTrackCenter() const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual int popupInternalPaddingLeft(RenderStyle*) const;
- virtual int popupInternalPaddingRight(RenderStyle*) const;
- virtual int popupInternalPaddingTop(RenderStyle*) const;
- virtual int popupInternalPaddingBottom(RenderStyle*) const;
- virtual PopupMenuStyle::PopupMenuSize popupMenuSize(const RenderStyle*, IntRect&) const;
</del><ins>+ virtual int popupInternalPaddingLeft(RenderStyle*) const override;
+ virtual int popupInternalPaddingRight(RenderStyle*) const override;
+ virtual int popupInternalPaddingTop(RenderStyle*) const override;
+ virtual int popupInternalPaddingBottom(RenderStyle*) const override;
+ virtual PopupMenuStyle::PopupMenuSize popupMenuSize(const RenderStyle*, IntRect&) const override;
</ins><span class="cx">
</span><span class="cx"> virtual bool paintCapsLockIndicator(const RenderObject&, const PaintInfo&, const IntRect&) override;
</span><span class="cx">
</span><span class="lines">@@ -89,25 +90,24 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(METER_ELEMENT)
</span><span class="cx"> virtual IntSize meterSizeForBounds(const RenderMeter*, const IntRect&) const override;
</span><del>- virtual bool paintMeter(const RenderObject&, const PaintInfo&, const IntRect&);
- virtual bool supportsMeter(ControlPart) const;
</del><ins>+ virtual bool paintMeter(const RenderObject&, const PaintInfo&, const IntRect&) override;
+ virtual bool supportsMeter(ControlPart) const override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><span class="cx"> // Returns the repeat interval of the animation for the progress bar.
</span><del>- virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const;
</del><ins>+ virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const override;
</ins><span class="cx"> // Returns the duration of the animation for the progress bar.
</span><del>- virtual double animationDurationForProgressBar(RenderProgress*) const;
</del><ins>+ virtual double animationDurationForProgressBar(RenderProgress*) const override;
</ins><span class="cx"> virtual IntRect progressBarRectForBounds(const RenderObject&, const IntRect&) const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual Color systemColor(CSSValueID) const;
</del><ins>+ virtual Color systemColor(CSSValueID) const override;
</ins><span class="cx"> // Controls color values returned from platformFocusRingColor(). systemColor() will be used when false.
</span><del>- virtual bool usesTestModeFocusRingColor() const;
- // A view associated to the contained document. Subclasses may not have such a view and return a fake.
</del><ins>+ bool usesTestModeFocusRingColor() const;
+ // A view associated to the contained document.
</ins><span class="cx"> NSView* documentViewFor(const RenderObject&) const;
</span><span class="cx">
</span><del>-
</del><span class="cx"> protected:
</span><span class="cx"> RenderThemeMac();
</span><span class="cx"> virtual ~RenderThemeMac();
</span><span class="lines">@@ -122,53 +122,53 @@
</span><span class="cx"> virtual String imageControlsStyleSheet() const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual bool supportsSelectionForegroundColors() const { return false; }
</del><ins>+ virtual bool supportsSelectionForegroundColors() const override { return false; }
</ins><span class="cx">
</span><del>- virtual bool paintTextField(const RenderObject&, const PaintInfo&, const FloatRect&);
- virtual void adjustTextFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
</del><ins>+ virtual bool paintTextField(const RenderObject&, const PaintInfo&, const FloatRect&) override;
+ virtual void adjustTextFieldStyle(StyleResolver*, RenderStyle*, Element*) const override;
</ins><span class="cx">
</span><del>- virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const FloatRect&);
- virtual void adjustTextAreaStyle(StyleResolver*, RenderStyle*, Element*) const;
</del><ins>+ virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const FloatRect&) override;
+ virtual void adjustTextAreaStyle(StyleResolver*, RenderStyle*, Element*) const override;
</ins><span class="cx">
</span><del>- virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&);
- virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
</del><ins>+ virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&) override;
+ virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const override;
</ins><span class="cx">
</span><del>- virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&);
- virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</del><ins>+ virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const FloatRect&) override;
+ virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
</ins><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&);
</del><ins>+ 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 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 bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&);
- virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
</del><ins>+ virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&) override;
+ virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const 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 adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const override;
+ virtual bool paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) 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 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><span class="cx"> #if ENABLE(VIDEO)
</span><del>- virtual bool supportsClosedCaptioning() const { return true; }
</del><ins>+ virtual bool supportsClosedCaptioning() const override { return true; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual bool shouldShowPlaceholderWhenFocused() const;
</del><ins>+ virtual bool shouldShowPlaceholderWhenFocused() const override;
</ins><span class="cx">
</span><del>- virtual bool paintSnapshottedPluginOverlay(const RenderObject&, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSnapshottedPluginOverlay(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual String fileListNameForWidth(const FileList*, const Font&, int width, bool multipleFilesAllowed) const override;
</span><span class="lines">@@ -191,8 +191,6 @@
</span><span class="cx"> void updateEnabledState(NSCell*, const RenderObject&);
</span><span class="cx"> void updateFocusedState(NSCell*, const RenderObject&);
</span><span class="cx"> void updatePressedState(NSCell*, const RenderObject&);
</span><del>- // An optional hook for subclasses to update the control tint of NSCell.
- virtual void updateActiveState(NSCell*, const RenderObject&) { }
</del><span class="cx">
</span><span class="cx"> // Helpers for adjusting appearance and for painting
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (169698 => 169699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-06-09 18:17:41 UTC (rev 169698)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-06-09 18:43:20 UTC (rev 169699)
</span><span class="lines">@@ -302,6 +302,13 @@
</span><span class="cx"> return systemColor(CSSValueWebkitFocusRingColor);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+int RenderThemeMac::platformFocusRingMaxWidth() const
+{
+ // FIXME: Shouldn't this function be named platformFocusRingMinWidth? But also, I'm not sure if this function is needed - looks like
+ // all platforms just used 0 for this before <http://trac.webkit.org/changeset/168397>.
+ return 0;
+}
+
</ins><span class="cx"> Color RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor() const
</span><span class="cx"> {
</span><span class="cx"> return platformInactiveSelectionBackgroundColor();
</span><span class="lines">@@ -1434,7 +1441,6 @@
</span><span class="cx"> setControlSize(popupButton, popupButtonSizes(), r.size(), o.style().effectiveZoom());
</span><span class="cx">
</span><span class="cx"> // Update the various states we respond to.
</span><del>- updateActiveState(popupButton, o);
</del><span class="cx"> updateCheckedState(popupButton, o);
</span><span class="cx"> updateEnabledState(popupButton, o);
</span><span class="cx"> updatePressedState(popupButton, o);
</span><span class="lines">@@ -1517,7 +1523,6 @@
</span><span class="cx"> LocalCurrentGraphicsContext localContext(paintInfo.context);
</span><span class="cx">
</span><span class="cx"> // Update the various states we respond to.
</span><del>- updateActiveState(sliderThumbCell, o);
</del><span class="cx"> updateEnabledState(sliderThumbCell, o);
</span><span class="cx"> Element* focusDelegate = (o.node() && o.node()->isElementNode()) ? toElement(o.node())->focusDelegate() : 0;
</span><span class="cx"> if (focusDelegate)
</span><span class="lines">@@ -1606,7 +1611,6 @@
</span><span class="cx"> [search setControlSize:controlSizeForFont(&o.style())];
</span><span class="cx">
</span><span class="cx"> // Update the various states we respond to.
</span><del>- updateActiveState(search, o);
</del><span class="cx"> updateEnabledState(search, o);
</span><span class="cx"> updateFocusedState(search, o);
</span><span class="cx"> }
</span><span class="lines">@@ -1672,10 +1676,8 @@
</span><span class="cx">
</span><span class="cx"> NSSearchFieldCell* search = this->search();
</span><span class="cx">
</span><del>- if (!input->isDisabledFormControl() && (input->isTextFormControl() && !toHTMLTextFormControlElement(input)->isReadOnly())) {
- updateActiveState([search cancelButtonCell], o);
</del><ins>+ if (!input->isDisabledFormControl() && (input->isTextFormControl() && !toHTMLTextFormControlElement(input)->isReadOnly()))
</ins><span class="cx"> updatePressedState([search cancelButtonCell], o);
</span><del>- }
</del><span class="cx"> else if ([[search cancelButtonCell] isHighlighted])
</span><span class="cx"> [[search cancelButtonCell] setHighlighted:NO];
</span><span class="cx">
</span><span class="lines">@@ -1768,8 +1770,6 @@
</span><span class="cx"> if ([search searchMenuTemplate] != nil)
</span><span class="cx"> [search setSearchMenuTemplate:nil];
</span><span class="cx">
</span><del>- updateActiveState([search searchButtonCell], o);
-
</del><span class="cx"> FloatRect localBounds = [search searchButtonRectForBounds:NSRect(input->renderBox()->pixelSnappedBorderBoxRect())];
</span><span class="cx"> localBounds = convertToPaintingRect(*input->renderer(), o, localBounds, r);
</span><span class="cx">
</span><span class="lines">@@ -1800,8 +1800,6 @@
</span><span class="cx">
</span><span class="cx"> NSSearchFieldCell* search = this->search();
</span><span class="cx">
</span><del>- updateActiveState([search searchButtonCell], o);
-
</del><span class="cx"> if (![search searchMenuTemplate])
</span><span class="cx"> [search setSearchMenuTemplate:searchMenuTemplate()];
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>