<!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>[199640] 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/199640">199640</a></dd>

<dt>Author</dt> <dd>antti@apple.com</dd>

<dt>Date</dt> <dd>2016-04-17 10:56:47 -0700 (Sun, 17 Apr 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Element should be const in StyleResolver

https://bugs.webkit.org/show_bug.cgi?id=156672

Reviewed by Darin Adler.

Resolving element style shouldn't mutate it.

This patch just does Element* -&gt; const Element*, all the groundwork has been done already.

* css/StyleResolver.cpp:

(WebCore::StyleResolver::sweepMatchedPropertiesCache):

(WebCore::StyleResolver::State::State):

(WebCore::StyleResolver::State::setStyle):

(WebCore::isAtShadowBoundary):

(WebCore::StyleResolver::styleForElement):

(WebCore::doesNotInheritTextDecoration):

(WebCore::StyleResolver::adjustStyleForInterCharacterRuby):

(WebCore::StyleResolver::adjustRenderStyle):

(WebCore::StyleResolver::checkRegionStyle):

(WebCore::StyleResolver::updateFont):

(WebCore::StyleResolver::styleRulesForElement):

(WebCore::StyleResolver::pseudoStyleRulesForElement):

(WebCore::StyleResolver::applyMatchedProperties):

* css/StyleResolver.h:

(WebCore::StyleResolver::style):

(WebCore::StyleResolver::parentStyle):

(WebCore::StyleResolver::rootElementStyle):

(WebCore::StyleResolver::element):

(WebCore::StyleResolver::document):

(WebCore::StyleResolver::documentSettings):

(WebCore::StyleResolver::usesFirstLineRules):

(WebCore::StyleResolver::usesFirstLetterRules):

(WebCore::StyleResolver::State::State):

(WebCore::StyleResolver::State::document):

(WebCore::StyleResolver::State::element):

(WebCore::StyleResolver::State::style):

(WebCore::StyleResolver::hasSelectorForId):

(WebCore::checkRegionSelector):

* rendering/RenderTheme.cpp:

(WebCore::RenderTheme::RenderTheme):

(WebCore::RenderTheme::adjustStyle):

(WebCore::RenderTheme::adjustCheckboxStyle):

(WebCore::RenderTheme::adjustRadioStyle):

(WebCore::RenderTheme::adjustButtonStyle):

(WebCore::RenderTheme::adjustInnerSpinButtonStyle):

(WebCore::RenderTheme::adjustTextFieldStyle):

(WebCore::RenderTheme::adjustTextAreaStyle):

(WebCore::RenderTheme::adjustMenuListStyle):

(WebCore::RenderTheme::adjustMeterStyle):

(WebCore::RenderTheme::paintMeter):

(WebCore::RenderTheme::adjustCapsLockIndicatorStyle):

(WebCore::RenderTheme::paintCapsLockIndicator):

(WebCore::RenderTheme::adjustAttachmentStyle):

(WebCore::RenderTheme::animationDurationForProgressBar):

(WebCore::RenderTheme::adjustProgressBarStyle):

(WebCore::RenderTheme::shouldHaveCapsLockIndicator):

(WebCore::RenderTheme::adjustMenuListButtonStyle):

(WebCore::RenderTheme::adjustMediaControlStyle):

(WebCore::RenderTheme::adjustSliderTrackStyle):

(WebCore::RenderTheme::adjustSliderThumbStyle):

(WebCore::RenderTheme::adjustSliderThumbSize):

(WebCore::RenderTheme::adjustSearchFieldStyle):

(WebCore::RenderTheme::adjustSearchFieldCancelButtonStyle):

(WebCore::RenderTheme::adjustSearchFieldDecorationPartStyle):

(WebCore::RenderTheme::adjustSearchFieldResultsDecorationPartStyle):

(WebCore::RenderTheme::adjustSearchFieldResultsButtonStyle):

* rendering/RenderTheme.h:

(WebCore::RenderTheme::minimumMenuListSize):

(WebCore::RenderTheme::popupInternalPaddingBox):

(WebCore::RenderTheme::popupOptionSupportsTextIndent):

(WebCore::RenderTheme::paintRadioDecorations):

(WebCore::RenderTheme::paintButtonDecorations):

(WebCore::RenderTheme::paintTextField):

(WebCore::RenderTheme::paintTextFieldDecorations):

(WebCore::RenderTheme::paintTextArea):

(WebCore::RenderTheme::paintTextAreaDecorations):

(WebCore::RenderTheme::paintMenuList):

(WebCore::RenderTheme::paintMenuListDecorations):

(WebCore::RenderTheme::paintMenuListButtonDecorations):

(WebCore::RenderTheme::paintPushButtonDecorations):

(WebCore::RenderTheme::paintSquareButtonDecorations):

(WebCore::RenderTheme::paintProgressBar):

(WebCore::RenderTheme::paintSliderTrack):

(WebCore::RenderTheme::paintSliderThumb):

(WebCore::RenderTheme::paintSliderThumbDecorations):

(WebCore::RenderTheme::paintSearchField):

(WebCore::RenderTheme::paintSearchFieldDecorations):

(WebCore::RenderTheme::paintSearchFieldCancelButton):

(WebCore::RenderTheme::paintSearchFieldDecorationPart):

(WebCore::RenderTheme::paintSearchFieldResultsDecorationPart):

(WebCore::RenderTheme::paintSearchFieldResultsButton):

(WebCore::RenderTheme::paintMediaFullscreenButton):

(WebCore::RenderTheme::paintMediaPlayButton):

(WebCore::RenderTheme::paintMediaOverlayPlayButton):

* rendering/RenderThemeEfl.cpp:

(WebCore::RenderThemeEfl::paintSliderTrack):

(WebCore::RenderThemeEfl::adjustSliderTrackStyle):

(WebCore::RenderThemeEfl::adjustSliderThumbStyle):

(WebCore::RenderThemeEfl::adjustSliderThumbSize):

(WebCore::RenderThemeEfl::paintSliderThumb):

(WebCore::RenderThemeEfl::adjustCheckboxStyle):

(WebCore::RenderThemeEfl::paintCheckbox):

(WebCore::RenderThemeEfl::adjustRadioStyle):

(WebCore::RenderThemeEfl::paintRadio):

(WebCore::RenderThemeEfl::adjustButtonStyle):

(WebCore::RenderThemeEfl::paintButton):

(WebCore::RenderThemeEfl::adjustMenuListStyle):

(WebCore::RenderThemeEfl::paintMenuList):

(WebCore::RenderThemeEfl::adjustMenuListButtonStyle):

(WebCore::RenderThemeEfl::paintMenuListButtonDecorations):

(WebCore::RenderThemeEfl::adjustTextFieldStyle):

(WebCore::RenderThemeEfl::paintTextField):

(WebCore::RenderThemeEfl::adjustTextAreaStyle):

(WebCore::RenderThemeEfl::paintTextArea):

(WebCore::RenderThemeEfl::adjustSearchFieldResultsButtonStyle):

(WebCore::RenderThemeEfl::paintSearchFieldResultsButton):

(WebCore::RenderThemeEfl::adjustSearchFieldResultsDecorationPartStyle):

(WebCore::RenderThemeEfl::paintSearchFieldResultsDecorationPart):

(WebCore::RenderThemeEfl::adjustSearchFieldCancelButtonStyle):

(WebCore::RenderThemeEfl::paintSearchFieldCancelButton):

(WebCore::RenderThemeEfl::adjustSearchFieldStyle):

(WebCore::RenderThemeEfl::paintSearchField):

(WebCore::RenderThemeEfl::adjustInnerSpinButtonStyle):

(WebCore::RenderThemeEfl::updateCachedSystemFontDescription):

(WebCore::RenderThemeEfl::adjustProgressBarStyle):

* rendering/RenderThemeEfl.h:

* rendering/RenderThemeGtk.cpp:

(WebCore::RenderThemeGtk::adjustRepaintRect):

(WebCore::RenderThemeGtk::adjustButtonStyle):

(WebCore::RenderThemeGtk::paintButton):

(WebCore::RenderThemeGtk::adjustMenuListStyle):

(WebCore::RenderThemeGtk::adjustMenuListButtonStyle):

(WebCore::RenderThemeGtk::paintMenuListButtonDecorations):

(WebCore::RenderThemeGtk::adjustTextFieldStyle):

(WebCore::RenderThemeGtk::paintTextField):

(WebCore::RenderThemeGtk::paintTextArea):

(WebCore::RenderThemeGtk::adjustSearchFieldResultsButtonStyle):

(WebCore::RenderThemeGtk::paintSearchFieldResultsButton):

(WebCore::RenderThemeGtk::adjustSearchFieldResultsDecorationPartStyle):

(WebCore::RenderThemeGtk::adjustSearchFieldCancelButtonStyle):

(WebCore::RenderThemeGtk::paintSearchFieldCancelButton):

(WebCore::RenderThemeGtk::adjustSearchFieldStyle):

(WebCore::RenderThemeGtk::shouldHaveCapsLockIndicator):

(WebCore::RenderThemeGtk::adjustSliderTrackStyle):

(WebCore::RenderThemeGtk::adjustSliderThumbStyle):

(WebCore::RenderThemeGtk::paintSliderTrack):

(WebCore::RenderThemeGtk::adjustSliderThumbSize):

(WebCore::RenderThemeGtk::innerSpinButtonLayout):

(WebCore::RenderThemeGtk::adjustInnerSpinButtonStyle):

(WebCore::spinButtonArrowSize):

(WebCore::RenderThemeGtk::paintMediaCurrentTime):

(WebCore::RenderThemeGtk::adjustProgressBarStyle):

* rendering/RenderThemeGtk.h:

* rendering/RenderThemeIOS.h:

* rendering/RenderThemeIOS.mm:

(WebCore::RenderThemeIOS::addRoundedBorderClip):

(WebCore::RenderThemeIOS::adjustCheckboxStyle):

(WebCore::RenderThemeIOS::isControlStyled):

(WebCore::RenderThemeIOS::adjustRadioStyle):

(WebCore::adjustInputElementButtonStyle):

(WebCore::RenderThemeIOS::adjustMenuListButtonStyle):

(WebCore::RenderThemeIOS::adjustSliderTrackStyle):

(WebCore::RenderThemeIOS::paintSliderTrack):

(WebCore::RenderThemeIOS::adjustSliderThumbSize):

(WebCore::RenderThemeIOS::sliderTickOffsetFromTrackCenter):

(WebCore::RenderThemeIOS::adjustSearchFieldStyle):

(WebCore::RenderThemeIOS::paintSearchFieldDecorations):

(WebCore::RenderThemeIOS::adjustButtonStyle):

* rendering/RenderThemeMac.h:

* rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::paintTextField):

(WebCore::RenderThemeMac::adjustTextFieldStyle):

(WebCore::RenderThemeMac::paintTextArea):

(WebCore::RenderThemeMac::adjustTextAreaStyle):

(WebCore::RenderThemeMac::animationDurationForProgressBar):

(WebCore::RenderThemeMac::adjustProgressBarStyle):

(WebCore::menuListButtonSizes):

(WebCore::RenderThemeMac::adjustMenuListStyle):

(WebCore::RenderThemeMac::popupMenuSize):

(WebCore::RenderThemeMac::adjustMenuListButtonStyle):

(WebCore::RenderThemeMac::adjustSliderTrackStyle):

(WebCore::RenderThemeMac::paintSliderTrack):

(WebCore::RenderThemeMac::adjustSliderThumbStyle):

(WebCore::RenderThemeMac::setSearchFieldSize):

(WebCore::RenderThemeMac::adjustSearchFieldStyle):

(WebCore::RenderThemeMac::cancelButtonSizes):

(WebCore::RenderThemeMac::adjustSearchFieldCancelButtonStyle):

(WebCore::RenderThemeMac::resultsButtonSizes):

(WebCore::RenderThemeMac::adjustSearchFieldDecorationPartStyle):

(WebCore::RenderThemeMac::paintSearchFieldDecorationPart):

(WebCore::RenderThemeMac::adjustSearchFieldResultsDecorationPartStyle):

(WebCore::RenderThemeMac::paintSearchFieldResultsDecorationPart):

(WebCore::RenderThemeMac::adjustSearchFieldResultsButtonStyle):

(WebCore::RenderThemeMac::adjustSliderThumbSize):

* rendering/RenderThemeWin.cpp:

(WebCore::RenderThemeWin::paintButton):

(WebCore::RenderThemeWin::adjustInnerSpinButtonStyle):

(WebCore::RenderThemeWin::paintMenuList):

(WebCore::RenderThemeWin::adjustMenuListStyle):

(WebCore::RenderThemeWin::adjustMenuListButtonStyle):

(WebCore::RenderThemeWin::adjustSliderThumbSize):

(WebCore::RenderThemeWin::paintSearchField):

(WebCore::RenderThemeWin::adjustSearchFieldStyle):

(WebCore::RenderThemeWin::paintSearchFieldCancelButton):

(WebCore::RenderThemeWin::adjustSearchFieldCancelButtonStyle):

(WebCore::RenderThemeWin::adjustSearchFieldDecorationPartStyle):

(WebCore::RenderThemeWin::adjustSearchFieldResultsDecorationPartStyle):

(WebCore::RenderThemeWin::paintSearchFieldResultsDecorationPart):

(WebCore::RenderThemeWin::adjustSearchFieldResultsButtonStyle):

(WebCore::RenderThemeWin::adjustMeterStyle):

* rendering/RenderThemeWin.h:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCorecssCSSDefaultStyleSheetscpp">trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp</a></li>

<li><a href="#trunkSourceWebCorecssCSSDefaultStyleSheetsh">trunk/Source/WebCore/css/CSSDefaultStyleSheets.h</a></li>

<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>

<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderThemecpp">trunk/Source/WebCore/rendering/RenderTheme.cpp</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderThemeh">trunk/Source/WebCore/rendering/RenderTheme.h</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderThemeEflcpp">trunk/Source/WebCore/rendering/RenderThemeEfl.cpp</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderThemeEflh">trunk/Source/WebCore/rendering/RenderThemeEfl.h</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderThemeGtkcpp">trunk/Source/WebCore/rendering/RenderThemeGtk.cpp</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderThemeGtkh">trunk/Source/WebCore/rendering/RenderThemeGtk.h</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSh">trunk/Source/WebCore/rendering/RenderThemeIOS.h</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</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>

<li><a href="#trunkSourceWebCorerenderingRenderThemeWincpp">trunk/Source/WebCore/rendering/RenderThemeWin.cpp</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderThemeWinh">trunk/Source/WebCore/rendering/RenderThemeWin.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/ChangeLog        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -1,5 +1,219 @@

</span><span class="cx"> 2016-04-16  Antti Koivisto  &lt;antti@apple.com&gt;

</span><span class="cx"> 

</span><ins>+        Element should be const in StyleResolver

+        https://bugs.webkit.org/show_bug.cgi?id=156672

+

+        Reviewed by Darin Adler.

+

+        Resolving element style shouldn't mutate it.

+

+        This patch just does Element* -&gt; const Element*, all the groundwork has been done already.

+

+        * css/StyleResolver.cpp:

+        (WebCore::StyleResolver::sweepMatchedPropertiesCache):

+        (WebCore::StyleResolver::State::State):

+        (WebCore::StyleResolver::State::setStyle):

+        (WebCore::isAtShadowBoundary):

+        (WebCore::StyleResolver::styleForElement):

+        (WebCore::doesNotInheritTextDecoration):

+        (WebCore::StyleResolver::adjustStyleForInterCharacterRuby):

+        (WebCore::StyleResolver::adjustRenderStyle):

+        (WebCore::StyleResolver::checkRegionStyle):

+        (WebCore::StyleResolver::updateFont):

+        (WebCore::StyleResolver::styleRulesForElement):

+        (WebCore::StyleResolver::pseudoStyleRulesForElement):

+        (WebCore::StyleResolver::applyMatchedProperties):

+        * css/StyleResolver.h:

+        (WebCore::StyleResolver::style):

+        (WebCore::StyleResolver::parentStyle):

+        (WebCore::StyleResolver::rootElementStyle):

+        (WebCore::StyleResolver::element):

+        (WebCore::StyleResolver::document):

+        (WebCore::StyleResolver::documentSettings):

+        (WebCore::StyleResolver::usesFirstLineRules):

+        (WebCore::StyleResolver::usesFirstLetterRules):

+        (WebCore::StyleResolver::State::State):

+        (WebCore::StyleResolver::State::document):

+        (WebCore::StyleResolver::State::element):

+        (WebCore::StyleResolver::State::style):

+        (WebCore::StyleResolver::hasSelectorForId):

+        (WebCore::checkRegionSelector):

+        * rendering/RenderTheme.cpp:

+        (WebCore::RenderTheme::RenderTheme):

+        (WebCore::RenderTheme::adjustStyle):

+        (WebCore::RenderTheme::adjustCheckboxStyle):

+        (WebCore::RenderTheme::adjustRadioStyle):

+        (WebCore::RenderTheme::adjustButtonStyle):

+        (WebCore::RenderTheme::adjustInnerSpinButtonStyle):

+        (WebCore::RenderTheme::adjustTextFieldStyle):

+        (WebCore::RenderTheme::adjustTextAreaStyle):

+        (WebCore::RenderTheme::adjustMenuListStyle):

+        (WebCore::RenderTheme::adjustMeterStyle):

+        (WebCore::RenderTheme::paintMeter):

+        (WebCore::RenderTheme::adjustCapsLockIndicatorStyle):

+        (WebCore::RenderTheme::paintCapsLockIndicator):

+        (WebCore::RenderTheme::adjustAttachmentStyle):

+        (WebCore::RenderTheme::animationDurationForProgressBar):

+        (WebCore::RenderTheme::adjustProgressBarStyle):

+        (WebCore::RenderTheme::shouldHaveCapsLockIndicator):

+        (WebCore::RenderTheme::adjustMenuListButtonStyle):

+        (WebCore::RenderTheme::adjustMediaControlStyle):

+        (WebCore::RenderTheme::adjustSliderTrackStyle):

+        (WebCore::RenderTheme::adjustSliderThumbStyle):

+        (WebCore::RenderTheme::adjustSliderThumbSize):

+        (WebCore::RenderTheme::adjustSearchFieldStyle):

+        (WebCore::RenderTheme::adjustSearchFieldCancelButtonStyle):

+        (WebCore::RenderTheme::adjustSearchFieldDecorationPartStyle):

+        (WebCore::RenderTheme::adjustSearchFieldResultsDecorationPartStyle):

+        (WebCore::RenderTheme::adjustSearchFieldResultsButtonStyle):

+        * rendering/RenderTheme.h:

+        (WebCore::RenderTheme::minimumMenuListSize):

+        (WebCore::RenderTheme::popupInternalPaddingBox):

+        (WebCore::RenderTheme::popupOptionSupportsTextIndent):

+        (WebCore::RenderTheme::paintRadioDecorations):

+        (WebCore::RenderTheme::paintButtonDecorations):

+        (WebCore::RenderTheme::paintTextField):

+        (WebCore::RenderTheme::paintTextFieldDecorations):

+        (WebCore::RenderTheme::paintTextArea):

+        (WebCore::RenderTheme::paintTextAreaDecorations):

+        (WebCore::RenderTheme::paintMenuList):

+        (WebCore::RenderTheme::paintMenuListDecorations):

+        (WebCore::RenderTheme::paintMenuListButtonDecorations):

+        (WebCore::RenderTheme::paintPushButtonDecorations):

+        (WebCore::RenderTheme::paintSquareButtonDecorations):

+        (WebCore::RenderTheme::paintProgressBar):

+        (WebCore::RenderTheme::paintSliderTrack):

+        (WebCore::RenderTheme::paintSliderThumb):

+        (WebCore::RenderTheme::paintSliderThumbDecorations):

+        (WebCore::RenderTheme::paintSearchField):

+        (WebCore::RenderTheme::paintSearchFieldDecorations):

+        (WebCore::RenderTheme::paintSearchFieldCancelButton):

+        (WebCore::RenderTheme::paintSearchFieldDecorationPart):

+        (WebCore::RenderTheme::paintSearchFieldResultsDecorationPart):

+        (WebCore::RenderTheme::paintSearchFieldResultsButton):

+        (WebCore::RenderTheme::paintMediaFullscreenButton):

+        (WebCore::RenderTheme::paintMediaPlayButton):

+        (WebCore::RenderTheme::paintMediaOverlayPlayButton):

+        * rendering/RenderThemeEfl.cpp:

+        (WebCore::RenderThemeEfl::paintSliderTrack):

+        (WebCore::RenderThemeEfl::adjustSliderTrackStyle):

+        (WebCore::RenderThemeEfl::adjustSliderThumbStyle):

+        (WebCore::RenderThemeEfl::adjustSliderThumbSize):

+        (WebCore::RenderThemeEfl::paintSliderThumb):

+        (WebCore::RenderThemeEfl::adjustCheckboxStyle):

+        (WebCore::RenderThemeEfl::paintCheckbox):

+        (WebCore::RenderThemeEfl::adjustRadioStyle):

+        (WebCore::RenderThemeEfl::paintRadio):

+        (WebCore::RenderThemeEfl::adjustButtonStyle):

+        (WebCore::RenderThemeEfl::paintButton):

+        (WebCore::RenderThemeEfl::adjustMenuListStyle):

+        (WebCore::RenderThemeEfl::paintMenuList):

+        (WebCore::RenderThemeEfl::adjustMenuListButtonStyle):

+        (WebCore::RenderThemeEfl::paintMenuListButtonDecorations):

+        (WebCore::RenderThemeEfl::adjustTextFieldStyle):

+        (WebCore::RenderThemeEfl::paintTextField):

+        (WebCore::RenderThemeEfl::adjustTextAreaStyle):

+        (WebCore::RenderThemeEfl::paintTextArea):

+        (WebCore::RenderThemeEfl::adjustSearchFieldResultsButtonStyle):

+        (WebCore::RenderThemeEfl::paintSearchFieldResultsButton):

+        (WebCore::RenderThemeEfl::adjustSearchFieldResultsDecorationPartStyle):

+        (WebCore::RenderThemeEfl::paintSearchFieldResultsDecorationPart):

+        (WebCore::RenderThemeEfl::adjustSearchFieldCancelButtonStyle):

+        (WebCore::RenderThemeEfl::paintSearchFieldCancelButton):

+        (WebCore::RenderThemeEfl::adjustSearchFieldStyle):

+        (WebCore::RenderThemeEfl::paintSearchField):

+        (WebCore::RenderThemeEfl::adjustInnerSpinButtonStyle):

+        (WebCore::RenderThemeEfl::updateCachedSystemFontDescription):

+        (WebCore::RenderThemeEfl::adjustProgressBarStyle):

+        * rendering/RenderThemeEfl.h:

+        * rendering/RenderThemeGtk.cpp:

+        (WebCore::RenderThemeGtk::adjustRepaintRect):

+        (WebCore::RenderThemeGtk::adjustButtonStyle):

+        (WebCore::RenderThemeGtk::paintButton):

+        (WebCore::RenderThemeGtk::adjustMenuListStyle):

+        (WebCore::RenderThemeGtk::adjustMenuListButtonStyle):

+        (WebCore::RenderThemeGtk::paintMenuListButtonDecorations):

+        (WebCore::RenderThemeGtk::adjustTextFieldStyle):

+        (WebCore::RenderThemeGtk::paintTextField):

+        (WebCore::RenderThemeGtk::paintTextArea):

+        (WebCore::RenderThemeGtk::adjustSearchFieldResultsButtonStyle):

+        (WebCore::RenderThemeGtk::paintSearchFieldResultsButton):

+        (WebCore::RenderThemeGtk::adjustSearchFieldResultsDecorationPartStyle):

+        (WebCore::RenderThemeGtk::adjustSearchFieldCancelButtonStyle):

+        (WebCore::RenderThemeGtk::paintSearchFieldCancelButton):

+        (WebCore::RenderThemeGtk::adjustSearchFieldStyle):

+        (WebCore::RenderThemeGtk::shouldHaveCapsLockIndicator):

+        (WebCore::RenderThemeGtk::adjustSliderTrackStyle):

+        (WebCore::RenderThemeGtk::adjustSliderThumbStyle):

+        (WebCore::RenderThemeGtk::paintSliderTrack):

+        (WebCore::RenderThemeGtk::adjustSliderThumbSize):

+        (WebCore::RenderThemeGtk::innerSpinButtonLayout):

+        (WebCore::RenderThemeGtk::adjustInnerSpinButtonStyle):

+        (WebCore::spinButtonArrowSize):

+        (WebCore::RenderThemeGtk::paintMediaCurrentTime):

+        (WebCore::RenderThemeGtk::adjustProgressBarStyle):

+        * rendering/RenderThemeGtk.h:

+        * rendering/RenderThemeIOS.h:

+        * rendering/RenderThemeIOS.mm:

+        (WebCore::RenderThemeIOS::addRoundedBorderClip):

+        (WebCore::RenderThemeIOS::adjustCheckboxStyle):

+        (WebCore::RenderThemeIOS::isControlStyled):

+        (WebCore::RenderThemeIOS::adjustRadioStyle):

+        (WebCore::adjustInputElementButtonStyle):

+        (WebCore::RenderThemeIOS::adjustMenuListButtonStyle):

+        (WebCore::RenderThemeIOS::adjustSliderTrackStyle):

+        (WebCore::RenderThemeIOS::paintSliderTrack):

+        (WebCore::RenderThemeIOS::adjustSliderThumbSize):

+        (WebCore::RenderThemeIOS::sliderTickOffsetFromTrackCenter):

+        (WebCore::RenderThemeIOS::adjustSearchFieldStyle):

+        (WebCore::RenderThemeIOS::paintSearchFieldDecorations):

+        (WebCore::RenderThemeIOS::adjustButtonStyle):

+        * rendering/RenderThemeMac.h:

+        * rendering/RenderThemeMac.mm:

+        (WebCore::RenderThemeMac::paintTextField):

+        (WebCore::RenderThemeMac::adjustTextFieldStyle):

+        (WebCore::RenderThemeMac::paintTextArea):

+        (WebCore::RenderThemeMac::adjustTextAreaStyle):

+        (WebCore::RenderThemeMac::animationDurationForProgressBar):

+        (WebCore::RenderThemeMac::adjustProgressBarStyle):

+        (WebCore::menuListButtonSizes):

+        (WebCore::RenderThemeMac::adjustMenuListStyle):

+        (WebCore::RenderThemeMac::popupMenuSize):

+        (WebCore::RenderThemeMac::adjustMenuListButtonStyle):

+        (WebCore::RenderThemeMac::adjustSliderTrackStyle):

+        (WebCore::RenderThemeMac::paintSliderTrack):

+        (WebCore::RenderThemeMac::adjustSliderThumbStyle):

+        (WebCore::RenderThemeMac::setSearchFieldSize):

+        (WebCore::RenderThemeMac::adjustSearchFieldStyle):

+        (WebCore::RenderThemeMac::cancelButtonSizes):

+        (WebCore::RenderThemeMac::adjustSearchFieldCancelButtonStyle):

+        (WebCore::RenderThemeMac::resultsButtonSizes):

+        (WebCore::RenderThemeMac::adjustSearchFieldDecorationPartStyle):

+        (WebCore::RenderThemeMac::paintSearchFieldDecorationPart):

+        (WebCore::RenderThemeMac::adjustSearchFieldResultsDecorationPartStyle):

+        (WebCore::RenderThemeMac::paintSearchFieldResultsDecorationPart):

+        (WebCore::RenderThemeMac::adjustSearchFieldResultsButtonStyle):

+        (WebCore::RenderThemeMac::adjustSliderThumbSize):

+        * rendering/RenderThemeWin.cpp:

+        (WebCore::RenderThemeWin::paintButton):

+        (WebCore::RenderThemeWin::adjustInnerSpinButtonStyle):

+        (WebCore::RenderThemeWin::paintMenuList):

+        (WebCore::RenderThemeWin::adjustMenuListStyle):

+        (WebCore::RenderThemeWin::adjustMenuListButtonStyle):

+        (WebCore::RenderThemeWin::adjustSliderThumbSize):

+        (WebCore::RenderThemeWin::paintSearchField):

+        (WebCore::RenderThemeWin::adjustSearchFieldStyle):

+        (WebCore::RenderThemeWin::paintSearchFieldCancelButton):

+        (WebCore::RenderThemeWin::adjustSearchFieldCancelButtonStyle):

+        (WebCore::RenderThemeWin::adjustSearchFieldDecorationPartStyle):

+        (WebCore::RenderThemeWin::adjustSearchFieldResultsDecorationPartStyle):

+        (WebCore::RenderThemeWin::paintSearchFieldResultsDecorationPart):

+        (WebCore::RenderThemeWin::adjustSearchFieldResultsButtonStyle):

+        (WebCore::RenderThemeWin::adjustMeterStyle):

+        * rendering/RenderThemeWin.h:

+

+2016-04-16  Antti Koivisto  &lt;antti@apple.com&gt;

+

</ins><span class="cx">         CSSCursorImageValue shouldn't mutate element during style resolution

</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=156659

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCorecssCSSDefaultStyleSheetscpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -66,7 +66,7 @@

<span class="cx"> // FIXME: It would be nice to use some mechanism that guarantees this is in sync with the real UA stylesheet.

</span><span class="cx"> static const char* simpleUserAgentStyleSheet = &quot;html,body,div{display:block}head{display:none}body{margin:8px}div:focus,span:focus,a:focus{outline:auto 5px -webkit-focus-ring-color}a:any-link{color:-webkit-link;text-decoration:underline}a:any-link:active{color:-webkit-activelink}&quot;;

</span><span class="cx"> 

</span><del>-static inline bool elementCanUseSimpleDefaultStyle(Element&amp; element)

</del><ins>+static inline bool elementCanUseSimpleDefaultStyle(const Element&amp; element)

</ins><span class="cx"> {

</span><span class="cx">     return is&lt;HTMLHtmlElement&gt;(element) || is&lt;HTMLHeadElement&gt;(element)

</span><span class="cx">         || is&lt;HTMLBodyElement&gt;(element) || is&lt;HTMLDivElement&gt;(element)

</span><span class="lines">@@ -98,7 +98,7 @@

</span><span class="cx">     return parseUASheet(String(characters, size));

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void CSSDefaultStyleSheets::initDefaultStyle(Element* root)

</del><ins>+void CSSDefaultStyleSheets::initDefaultStyle(const Element* root)

</ins><span class="cx"> {

</span><span class="cx">     if (!defaultStyle) {

</span><span class="cx">         if (!root || elementCanUseSimpleDefaultStyle(*root))

</span><span class="lines">@@ -153,7 +153,7 @@

<span class="cx">     // No need to initialize quirks sheet yet as there are no quirk rules for elements allowed in simple default style.

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement(Element&amp; element)

</del><ins>+void CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement(const Element&amp; element)

</ins><span class="cx"> {

</span><span class="cx">     if (simpleDefaultStyleSheet &amp;&amp; !elementCanUseSimpleDefaultStyle(element)) {

</span><span class="cx">         loadFullDefaultStyle();

</span></span></pre></div>

<a id="trunkSourceWebCorecssCSSDefaultStyleSheetsh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSDefaultStyleSheets.h (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/css/CSSDefaultStyleSheets.h        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/css/CSSDefaultStyleSheets.h        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -46,10 +46,10 @@

</span><span class="cx">     static StyleSheetContents* plugInsStyleSheet;

</span><span class="cx">     static StyleSheetContents* imageControlsStyleSheet;

</span><span class="cx"> 

</span><del>-    static void ensureDefaultStyleSheetsForElement(Element&amp;);

</del><ins>+    static void ensureDefaultStyleSheetsForElement(const Element&amp;);

</ins><span class="cx">     static void loadFullDefaultStyle();

</span><span class="cx">     static void loadSimpleDefaultStyle();

</span><del>-    static void initDefaultStyle(Element*);

</del><ins>+    static void initDefaultStyle(const Element*);

</ins><span class="cx"> };

</span><span class="cx"> 

</span><span class="cx"> } // namespace WebCore

</span></span></pre></div>

<a id="trunkSourceWebCorecssStyleResolvercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/css/StyleResolver.cpp        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -335,7 +335,7 @@

</span><span class="cx">     m_matchedPropertiesCacheAdditionsSinceLastSweep = 0;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-StyleResolver::State::State(Element&amp; element, RenderStyle* parentStyle, RenderStyle* documentElementStyle, const RenderRegion* regionForStyling, const SelectorFilter* selectorFilter)

</del><ins>+StyleResolver::State::State(const Element&amp; element, RenderStyle* parentStyle, RenderStyle* documentElementStyle, const RenderRegion* regionForStyling, const SelectorFilter* selectorFilter)

</ins><span class="cx">     : m_element(&amp;element)

</span><span class="cx">     , m_parentStyle(parentStyle)

</span><span class="cx">     , m_regionForStyling(regionForStyling)

</span><span class="lines">@@ -366,15 +366,13 @@

</span><span class="cx">     m_style = WTFMove(style);

</span><span class="cx">     updateConversionData();

</span><span class="cx"> }

</span><del>-static inline bool isAtShadowBoundary(const Element* element)

</del><ins>+static inline bool isAtShadowBoundary(const Element&amp; element)

</ins><span class="cx"> {

</span><del>-    if (!element)

-        return false;

-    ContainerNode* parentNode = element-&gt;parentNode();

</del><ins>+    auto* parentNode = element.parentNode();

</ins><span class="cx">     return parentNode &amp;&amp; parentNode-&gt;isShadowRoot();

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-ElementStyle StyleResolver::styleForElement(Element&amp; element, RenderStyle* parentStyle, RuleMatchingBehavior matchingBehavior, const RenderRegion* regionForStyling, const SelectorFilter* selectorFilter)

</del><ins>+ElementStyle StyleResolver::styleForElement(const Element&amp; element, RenderStyle* parentStyle, RuleMatchingBehavior matchingBehavior, const RenderRegion* regionForStyling, const SelectorFilter* selectorFilter)

</ins><span class="cx"> {

</span><span class="cx">     RELEASE_ASSERT(!m_inLoadPendingImages);

</span><span class="cx"> 

</span><span class="lines">@@ -383,7 +381,7 @@

</span><span class="cx"> 

</span><span class="cx">     if (state.parentStyle()) {

</span><span class="cx">         state.setStyle(RenderStyle::create());

</span><del>-        state.style()-&gt;inheritFrom(state.parentStyle(), isAtShadowBoundary(&amp;element) ? RenderStyle::AtShadowBoundary : RenderStyle::NotAtShadowBoundary);

</del><ins>+        state.style()-&gt;inheritFrom(state.parentStyle(), isAtShadowBoundary(element) ? RenderStyle::AtShadowBoundary : RenderStyle::NotAtShadowBoundary);

</ins><span class="cx">     } else {

</span><span class="cx">         state.setStyle(defaultStyleForElement());

</span><span class="cx">         state.setParentStyle(RenderStyle::clone(state.style()));

</span><span class="lines">@@ -493,7 +491,7 @@

</span><span class="cx">     return state.takeStyle();

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void StyleResolver::keyframeStylesForAnimation(Element&amp; element, const RenderStyle* elementStyle, KeyframeList&amp; list)

</del><ins>+void StyleResolver::keyframeStylesForAnimation(const Element&amp; element, const RenderStyle* elementStyle, KeyframeList&amp; list)

</ins><span class="cx"> {

</span><span class="cx">     list.clear();

</span><span class="cx"> 

</span><span class="lines">@@ -553,7 +551,7 @@

</span><span class="cx">     }

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-PassRefPtr&lt;RenderStyle&gt; StyleResolver::pseudoStyleForElement(Element&amp; element, const PseudoStyleRequest&amp; pseudoStyleRequest, RenderStyle&amp; parentStyle)

</del><ins>+PassRefPtr&lt;RenderStyle&gt; StyleResolver::pseudoStyleForElement(const Element&amp; element, const PseudoStyleRequest&amp; pseudoStyleRequest, RenderStyle&amp; parentStyle)

</ins><span class="cx"> {

</span><span class="cx">     m_state = State(element, &amp;parentStyle);

</span><span class="cx"> 

</span><span class="lines">@@ -736,10 +734,10 @@

</span><span class="cx"> // CSS requires text-decoration to be reset at each DOM element for tables, 

</span><span class="cx"> // inline blocks, inline tables, shadow DOM crossings, floating elements,

<span class="cx"> // and absolute or relatively positioned elements.

</span><del>-static bool doesNotInheritTextDecoration(const RenderStyle&amp; style, Element* e)

</del><ins>+static bool doesNotInheritTextDecoration(const RenderStyle&amp; style, const Element&amp; element)

</ins><span class="cx"> {

</span><span class="cx">     return style.display() == TABLE || style.display() == INLINE_TABLE

</span><del>-        || style.display() == INLINE_BLOCK || style.display() == INLINE_BOX || isAtShadowBoundary(e)

</del><ins>+        || style.display() == INLINE_BLOCK || style.display() == INLINE_BOX || isAtShadowBoundary(element)

</ins><span class="cx">         || style.isFloating() || style.hasOutOfFlowPosition();

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -760,7 +758,7 @@

</span><span class="cx">         style-&gt;setWritingMode(LeftToRightWritingMode);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void StyleResolver::adjustRenderStyle(RenderStyle&amp; style, const RenderStyle&amp; parentStyle, Element *e)

</del><ins>+void StyleResolver::adjustRenderStyle(RenderStyle&amp; style, const RenderStyle&amp; parentStyle, const Element* element)

</ins><span class="cx"> {

<span class="cx">     // Cache our original display.

</span><span class="cx">     style.setOriginalDisplay(style.display());

</span><span class="lines">@@ -770,62 +768,64 @@

<span class="cx">             // FIXME: Enable for all elements.

</span><span class="cx">             bool elementSupportsDisplayContents = false;

</span><span class="cx"> #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)

</span><del>-            elementSupportsDisplayContents = is&lt;HTMLSlotElement&gt;(e);

</del><ins>+            elementSupportsDisplayContents = is&lt;HTMLSlotElement&gt;(element);

</ins><span class="cx"> #endif

</span><span class="cx">             if (!elementSupportsDisplayContents)

</span><span class="cx">                 style.setDisplay(INLINE);

</span><span class="cx">         }

</span><del>-        // If we have a &lt;td&gt; that specifies a float property, in quirks mode we just drop the float

-        // property.

-        // Sites also commonly use display:inline/block on &lt;td&gt;s and &lt;table&gt;s. In quirks mode we force

-        // these tags to retain their display types.

-        if (document().inQuirksMode() &amp;&amp; e) {

-            if (e-&gt;hasTagName(tdTag)) {

-                style.setDisplay(TABLE_CELL);

-                style.setFloating(NoFloat);

-            } else if (is&lt;HTMLTableElement&gt;(*e))

-                style.setDisplay(style.isDisplayInlineType() ? INLINE_TABLE : TABLE);

-        }

</del><ins>+        if (element) {

+            // If we have a &lt;td&gt; that specifies a float property, in quirks mode we just drop the float

+            // property.

+            // Sites also commonly use display:inline/block on &lt;td&gt;s and &lt;table&gt;s. In quirks mode we force

+            // these tags to retain their display types.

+            if (document().inQuirksMode()) {

+                if (element-&gt;hasTagName(tdTag)) {

+                    style.setDisplay(TABLE_CELL);

+                    style.setFloating(NoFloat);

+                } else if (is&lt;HTMLTableElement&gt;(*element))

+                    style.setDisplay(style.isDisplayInlineType() ? INLINE_TABLE : TABLE);

+            }

</ins><span class="cx"> 

</span><del>-        if (e &amp;&amp; (e-&gt;hasTagName(tdTag) || e-&gt;hasTagName(thTag))) {

-            if (style.whiteSpace() == KHTML_NOWRAP) {

-                // Figure out if we are really nowrapping or if we should just

-                // use normal instead. If the width of the cell is fixed, then

-                // we don't actually use NOWRAP.

-                if (style.width().isFixed())

-                    style.setWhiteSpace(NORMAL);

-                else

-                    style.setWhiteSpace(NOWRAP);

</del><ins>+            if (element-&gt;hasTagName(tdTag) || element-&gt;hasTagName(thTag)) {

+                if (style.whiteSpace() == KHTML_NOWRAP) {

+                    // Figure out if we are really nowrapping or if we should just

+                    // use normal instead. If the width of the cell is fixed, then

+                    // we don't actually use NOWRAP.

+                    if (style.width().isFixed())

+                        style.setWhiteSpace(NORMAL);

+                    else

+                        style.setWhiteSpace(NOWRAP);

+                }

</ins><span class="cx">             }

</span><del>-        }

</del><span class="cx"> 

<del>-        // Tables never support the -webkit-* values for text-align and will reset back to the default.

-        if (is&lt;HTMLTableElement&gt;(e) &amp;&amp; (style.textAlign() == WEBKIT_LEFT || style.textAlign() == WEBKIT_CENTER || style.textAlign() == WEBKIT_RIGHT))

-            style.setTextAlign(TASTART);

</del><ins>+            // Tables never support the -webkit-* values for text-align and will reset back to the default.

+            if (is&lt;HTMLTableElement&gt;(*element) &amp;&amp; (style.textAlign() == WEBKIT_LEFT || style.textAlign() == WEBKIT_CENTER || style.textAlign() == WEBKIT_RIGHT))

+                style.setTextAlign(TASTART);

</ins><span class="cx"> 

</span><del>-        // Frames and framesets never honor position:relative or position:absolute. This is necessary to

-        // fix a crash where a site tries to position these objects. They also never honor display.

-        if (e &amp;&amp; (e-&gt;hasTagName(frameTag) || e-&gt;hasTagName(framesetTag))) {

-            style.setPosition(StaticPosition);

-            style.setDisplay(BLOCK);

-        }

</del><ins>+            // Frames and framesets never honor position:relative or position:absolute. This is necessary to

+            // fix a crash where a site tries to position these objects. They also never honor display.

+            if (element-&gt;hasTagName(frameTag) || element-&gt;hasTagName(framesetTag)) {

+                style.setPosition(StaticPosition);

+                style.setDisplay(BLOCK);

+            }

</ins><span class="cx"> 

<del>-        // Ruby text does not support float or position. This might change with evolution of the specification.

-        if (e &amp;&amp; e-&gt;hasTagName(rtTag)) {

-            style.setPosition(StaticPosition);

-            style.setFloating(NoFloat);

-        }

</del><ins>+            // Ruby text does not support float or position. This might change with evolution of the specification.

+            if (element-&gt;hasTagName(rtTag)) {

+                style.setPosition(StaticPosition);

+                style.setFloating(NoFloat);

+            }

</ins><span class="cx"> 

<del>-        // FIXME: We shouldn't be overriding start/-webkit-auto like this. Do it in html.css instead.

-        // Table headers with a text-align of -webkit-auto will change the text-align to center.

-        if (e &amp;&amp; e-&gt;hasTagName(thTag) &amp;&amp; style.textAlign() == TASTART)

-            style.setTextAlign(CENTER);

</del><ins>+            // FIXME: We shouldn't be overriding start/-webkit-auto like this. Do it in html.css instead.

+            // Table headers with a text-align of -webkit-auto will change the text-align to center.

+            if (element-&gt;hasTagName(thTag) &amp;&amp; style.textAlign() == TASTART)

+                style.setTextAlign(CENTER);

</ins><span class="cx"> 

</span><del>-        if (e &amp;&amp; e-&gt;hasTagName(legendTag))

-            style.setDisplay(BLOCK);

</del><ins>+            if (element-&gt;hasTagName(legendTag))

+                style.setDisplay(BLOCK);

+        }

</ins><span class="cx"> 

<span class="cx">         // Absolute/fixed positioned elements, floating elements and the document element need block-like outside display.

</span><del>-        if (style.hasOutOfFlowPosition() || style.isFloating() || (e &amp;&amp; e-&gt;document().documentElement() == e))

</del><ins>+        if (style.hasOutOfFlowPosition() || style.isFloating() || (element &amp;&amp; element-&gt;document().documentElement() == element))

</ins><span class="cx">             style.setDisplay(equivalentBlockDisplay(style.display(), style.isFloating(), !document().inQuirksMode()));

</span><span class="cx"> 

</span><span class="cx">         // FIXME: Don't support this mutation for pseudo styles like first-letter or first-line, since it's not completely

</span><span class="lines">@@ -867,46 +867,49 @@

</span><span class="cx">     // Auto z-index becomes 0 for the root element and transparent objects. This prevents

</span><span class="cx">     // cases where objects that should be blended as a single unit end up with a non-transparent

<span class="cx">     // object wedged in between them. Auto z-index also becomes 0 for objects that specify transforms/masks/reflections.

</span><del>-    if (style.hasAutoZIndex() &amp;&amp; ((e &amp;&amp; e-&gt;document().documentElement() == e)

-        || style.opacity() &lt; 1.0f

-        || style.hasTransformRelatedProperty()

-        || style.hasMask()

-        || style.clipPath()

-        || style.boxReflect()

-        || style.hasFilter()

</del><ins>+    if (style.hasAutoZIndex()) {

+        if ((element &amp;&amp; element-&gt;document().documentElement() == element)

+            || style.opacity() &lt; 1.0f

+            || style.hasTransformRelatedProperty()

+            || style.hasMask()

+            || style.clipPath()

+            || style.boxReflect()

+            || style.hasFilter()

</ins><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)

</span><del>-        || style.hasBackdropFilter()

</del><ins>+            || style.hasBackdropFilter()

</ins><span class="cx"> #endif

</span><del>-        || style.hasBlendMode()

-        || style.hasIsolation()

-        || style.position() == StickyPosition

-        || (style.position() == FixedPosition &amp;&amp; documentSettings() &amp;&amp; documentSettings()-&gt;fixedPositionCreatesStackingContext())

-        || style.hasFlowFrom()

-        || style.willChangeCreatesStackingContext()

-        ))

-        style.setZIndex(0);

</del><ins>+            || style.hasBlendMode()

+            || style.hasIsolation()

+            || style.position() == StickyPosition

+            || (style.position() == FixedPosition &amp;&amp; documentSettings() &amp;&amp; documentSettings()-&gt;fixedPositionCreatesStackingContext())

+            || style.hasFlowFrom()

+            || style.willChangeCreatesStackingContext())

+            style.setZIndex(0);

+    }

</ins><span class="cx"> 

<del>-    // Textarea considers overflow visible as auto.

-    if (is&lt;HTMLTextAreaElement&gt;(e)) {

-        style.setOverflowX(style.overflowX() == OVISIBLE ? OAUTO : style.overflowX());

-        style.setOverflowY(style.overflowY() == OVISIBLE ? OAUTO : style.overflowY());

</del><ins>+    if (element) {

+        // Textarea considers overflow visible as auto.

+        if (is&lt;HTMLTextAreaElement&gt;(*element)) {

+            style.setOverflowX(style.overflowX() == OVISIBLE ? OAUTO : style.overflowX());

+            style.setOverflowY(style.overflowY() == OVISIBLE ? OAUTO : style.overflowY());

+        }

+

+        // Disallow -webkit-user-modify on :pseudo and ::pseudo elements.

+        if (!element-&gt;shadowPseudoId().isNull())

+            style.setUserModify(READ_ONLY);

+

+        // For now, &lt;marquee&gt; requires an overflow clip to work properly.

+        if (is&lt;HTMLMarqueeElement&gt;(*element)) {

+            style.setOverflowX(OHIDDEN);

+            style.setOverflowY(OHIDDEN);

+        }

</ins><span class="cx">     }

</span><span class="cx"> 

<del>-    // Disallow -webkit-user-modify on :pseudo and ::pseudo elements.

-    if (e &amp;&amp; !e-&gt;shadowPseudoId().isNull())

-        style.setUserModify(READ_ONLY);

-

-    if (doesNotInheritTextDecoration(style, e))

</del><ins>+    if (element &amp;&amp; doesNotInheritTextDecoration(style, *element))

</ins><span class="cx">         style.setTextDecorationsInEffect(style.textDecoration());

</span><span class="cx">     else

</span><span class="cx">         style.addToTextDecorationsInEffect(style.textDecoration());

</span><span class="cx"> 

<del>-    // For now, &lt;marquee&gt; requires an overflow clip to work properly.

-    if (is&lt;HTMLMarqueeElement&gt;(e)) {

-        style.setOverflowX(OHIDDEN);

-        style.setOverflowY(OHIDDEN);

-    }

-

</del><span class="cx">     // If either overflow value is not visible, change to auto.

</span><span class="cx">     if (style.overflowX() == OVISIBLE &amp;&amp; style.overflowY() != OVISIBLE) {

</span><span class="cx">         // FIXME: Once we implement pagination controls, overflow-x should default to hidden

</span><span class="lines">@@ -919,7 +922,7 @@

</span><span class="cx">     // Call setStylesForPaginationMode() if a pagination mode is set for any non-root elements. If these

</span><span class="cx">     // styles are specified on a root element, then they will be incorporated in

<span class="cx">     // Style::createForDocument().

</span><del>-    if ((style.overflowY() == OPAGEDX || style.overflowY() == OPAGEDY) &amp;&amp; !(e &amp;&amp; (e-&gt;hasTagName(htmlTag) || e-&gt;hasTagName(bodyTag))))

</del><ins>+    if ((style.overflowY() == OPAGEDX || style.overflowY() == OPAGEDY) &amp;&amp; !(element &amp;&amp; (element-&gt;hasTagName(htmlTag) || element-&gt;hasTagName(bodyTag))))

</ins><span class="cx">         style.setColumnStylesFromPaginationMode(WebCore::paginationModeForRenderStyle(style));

</span><span class="cx"> 

<span class="cx">     // Table rows, sections and the table itself will support overflow:hidden and will ignore scroll/auto.

</span><span class="lines">@@ -954,16 +957,16 @@

</span><span class="cx"> 

</span><span class="cx">     // Important: Intrinsic margins get added to controls before the theme has adjusted the style, since the theme will

<span class="cx">     // alter fonts and heights/widths.

</span><del>-    if (is&lt;HTMLFormControlElement&gt;(e) &amp;&amp; style.fontSize() &gt;= 11) {

</del><ins>+    if (is&lt;HTMLFormControlElement&gt;(element) &amp;&amp; style.fontSize() &gt;= 11) {

</ins><span class="cx">         // Don't apply intrinsic margins to image buttons. The designer knows how big the images are,

<span class="cx">         // so we have to treat all image buttons as though they were explicitly sized.

</span><del>-        if (!is&lt;HTMLInputElement&gt;(*e) || !downcast&lt;HTMLInputElement&gt;(*e).isImageButton())

</del><ins>+        if (!is&lt;HTMLInputElement&gt;(*element) || !downcast&lt;HTMLInputElement&gt;(*element).isImageButton())

</ins><span class="cx">             addIntrinsicMargins(style);

</span><span class="cx">     }

</span><span class="cx"> 

<span class="cx">     // Let the theme also have a crack at adjusting the style.

</span><span class="cx">     if (style.hasAppearance())

</span><del>-        RenderTheme::defaultTheme()-&gt;adjustStyle(*this, style, e, m_state.hasUAAppearance(), m_state.borderData(), m_state.backgroundData(), m_state.backgroundColor());

</del><ins>+        RenderTheme::defaultTheme()-&gt;adjustStyle(*this, style, element, m_state.hasUAAppearance(), m_state.borderData(), m_state.backgroundData(), m_state.backgroundColor());

</ins><span class="cx"> 

<span class="cx">     // If we have first-letter pseudo style, do not share this style.

</span><span class="cx">     if (style.hasPseudoStyle(FIRST_LETTER))

</span><span class="lines">@@ -979,18 +982,18 @@

</span><span class="cx">         || style.hasBlendMode()))

</span><span class="cx">         style.setTransformStyle3D(TransformStyle3DFlat);

</span><span class="cx"> 

</span><del>-    if (e &amp;&amp; e-&gt;isSVGElement()) {

</del><ins>+    if (is&lt;SVGElement&gt;(element)) {

</ins><span class="cx">         // Only the root &lt;svg&gt; element in an SVG document fragment tree honors css position

</span><del>-        if (!(e-&gt;hasTagName(SVGNames::svgTag) &amp;&amp; e-&gt;parentNode() &amp;&amp; !e-&gt;parentNode()-&gt;isSVGElement()))

</del><ins>+        if (!(element-&gt;hasTagName(SVGNames::svgTag) &amp;&amp; element-&gt;parentNode() &amp;&amp; !element-&gt;parentNode()-&gt;isSVGElement()))

</ins><span class="cx">             style.setPosition(RenderStyle::initialPosition());

</span><span class="cx"> 

</span><span class="cx">         // RenderSVGRoot handles zooming for the whole SVG subtree, so foreignObject content should

<span class="cx">         // not be scaled again.

</span><del>-        if (e-&gt;hasTagName(SVGNames::foreignObjectTag))

</del><ins>+        if (element-&gt;hasTagName(SVGNames::foreignObjectTag))

</ins><span class="cx">             style.setEffectiveZoom(RenderStyle::initialZoom());

</span><span class="cx"> 

<span class="cx">         // SVG text layout code expects us to be a block-level style element.

</span><del>-        if ((e-&gt;hasTagName(SVGNames::foreignObjectTag) || e-&gt;hasTagName(SVGNames::textTag)) &amp;&amp; style.isDisplayInlineType())

</del><ins>+        if ((element-&gt;hasTagName(SVGNames::foreignObjectTag) || element-&gt;hasTagName(SVGNames::textTag)) &amp;&amp; style.isDisplayInlineType())

</ins><span class="cx">             style.setDisplay(BLOCK);

</span><span class="cx">     }

</span><span class="cx"> 

</span><span class="lines">@@ -1000,7 +1003,7 @@

</span><span class="cx">         style.setJustifyItems(parentStyle.justifyItems());

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-bool StyleResolver::checkRegionStyle(Element* regionElement)

</del><ins>+bool StyleResolver::checkRegionStyle(const Element* regionElement)

</ins><span class="cx"> {

</span><span class="cx">     unsigned rulesSize = m_ruleSets.authorStyle()-&gt;regionSelectorsAndRuleSets().size();

</span><span class="cx">     for (unsigned i = 0; i &lt; rulesSize; ++i) {

</span><span class="lines">@@ -1055,12 +1058,12 @@

</span><span class="cx">     m_state.setFontDirty(false);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-Vector&lt;RefPtr&lt;StyleRule&gt;&gt; StyleResolver::styleRulesForElement(Element* e, unsigned rulesToInclude)

</del><ins>+Vector&lt;RefPtr&lt;StyleRule&gt;&gt; StyleResolver::styleRulesForElement(const Element* element, unsigned rulesToInclude)

</ins><span class="cx"> {

</span><del>-    return pseudoStyleRulesForElement(e, NOPSEUDO, rulesToInclude);

</del><ins>+    return pseudoStyleRulesForElement(element, NOPSEUDO, rulesToInclude);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><del>-Vector&lt;RefPtr&lt;StyleRule&gt;&gt; StyleResolver::pseudoStyleRulesForElement(Element* element, PseudoId pseudoId, unsigned rulesToInclude)

</del><ins>+Vector&lt;RefPtr&lt;StyleRule&gt;&gt; StyleResolver::pseudoStyleRulesForElement(const Element* element, PseudoId pseudoId, unsigned rulesToInclude)

</ins><span class="cx"> {

</span><span class="cx">     if (!element || !element-&gt;document().haveStylesheetsLoaded())

</span><span class="cx">         return Vector&lt;RefPtr&lt;StyleRule&gt;&gt;();

</span><span class="lines">@@ -1287,7 +1290,7 @@

</span><span class="cx">         // style declarations. We then only need to apply the inherited properties, if any, as their values can depend on the 

<span class="cx">         // element context. This is fast and saves memory by reusing the style data structures.

</span><span class="cx">         state.style()-&gt;copyNonInheritedFrom(cacheItem-&gt;renderStyle.get());

</span><del>-        if (state.parentStyle()-&gt;inheritedDataShared(cacheItem-&gt;parentRenderStyle.get()) &amp;&amp; !isAtShadowBoundary(&amp;element)) {

</del><ins>+        if (state.parentStyle()-&gt;inheritedDataShared(cacheItem-&gt;parentRenderStyle.get()) &amp;&amp; !isAtShadowBoundary(element)) {

</ins><span class="cx">             EInsideLink linkStatus = state.style()-&gt;insideLink();

</span><span class="cx">             // If the cache item parent style has identical inherited properties to the current parent style then the

<span class="cx">             // resulting style will be identical too. We copy the inherited properties over from the cache and are done.

</span></span></pre></div>

<a id="trunkSourceWebCorecssStyleResolverh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/css/StyleResolver.h        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -141,11 +141,11 @@

</span><span class="cx">     StyleResolver(Document&amp;);

</span><span class="cx">     ~StyleResolver();

</span><span class="cx"> 

</span><del>-    ElementStyle styleForElement(Element&amp;, RenderStyle* parentStyle, RuleMatchingBehavior = MatchAllRules, const RenderRegion* regionForStyling = nullptr, const SelectorFilter* = nullptr);

</del><ins>+    ElementStyle styleForElement(const Element&amp;, RenderStyle* parentStyle, RuleMatchingBehavior = MatchAllRules, const RenderRegion* regionForStyling = nullptr, const SelectorFilter* = nullptr);

</ins><span class="cx"> 

</span><del>-    void keyframeStylesForAnimation(Element&amp;, const RenderStyle*, KeyframeList&amp;);

</del><ins>+    void keyframeStylesForAnimation(const Element&amp;, const RenderStyle*, KeyframeList&amp;);

</ins><span class="cx"> 

</span><del>-    PassRefPtr&lt;RenderStyle&gt; pseudoStyleForElement(Element&amp;, const PseudoStyleRequest&amp;, RenderStyle&amp; parentStyle);

</del><ins>+    PassRefPtr&lt;RenderStyle&gt; pseudoStyleForElement(const Element&amp;, const PseudoStyleRequest&amp;, RenderStyle&amp; parentStyle);

</ins><span class="cx"> 

</span><span class="cx">     Ref&lt;RenderStyle&gt; styleForPage(int pageIndex);

</span><span class="cx">     Ref&lt;RenderStyle&gt; defaultStyleForElement();

</span><span class="lines">@@ -153,7 +153,7 @@

</span><span class="cx">     RenderStyle* style() const { return m_state.style(); }

</span><span class="cx">     RenderStyle* parentStyle() const { return m_state.parentStyle(); }

</span><span class="cx">     RenderStyle* rootElementStyle() const { return m_state.rootElementStyle(); }

</span><del>-    Element* element() { return m_state.element(); }

</del><ins>+    const Element* element() { return m_state.element(); }

</ins><span class="cx">     Document&amp; document() { return m_document; }

</span><span class="cx">     Settings* documentSettings() { return m_document.settings(); }

</span><span class="cx"> 

</span><span class="lines">@@ -179,8 +179,8 @@

</span><span class="cx">         AllButEmptyCSSRules = UAAndUserCSSRules | AuthorCSSRules | CrossOriginCSSRules,

</span><span class="cx">         AllCSSRules         = AllButEmptyCSSRules | EmptyCSSRules,

</span><span class="cx">     };

</span><del>-    Vector&lt;RefPtr&lt;StyleRule&gt;&gt; styleRulesForElement(Element*, unsigned rulesToInclude = AllButEmptyCSSRules);

-    Vector&lt;RefPtr&lt;StyleRule&gt;&gt; pseudoStyleRulesForElement(Element*, PseudoId, unsigned rulesToInclude = AllButEmptyCSSRules);

</del><ins>+    Vector&lt;RefPtr&lt;StyleRule&gt;&gt; styleRulesForElement(const Element*, unsigned rulesToInclude = AllButEmptyCSSRules);

+    Vector&lt;RefPtr&lt;StyleRule&gt;&gt; pseudoStyleRulesForElement(const Element*, PseudoId, unsigned rulesToInclude = AllButEmptyCSSRules);

</ins><span class="cx"> 

</span><span class="cx"> public:

</span><span class="cx">     struct MatchResult;

</span><span class="lines">@@ -215,7 +215,7 @@

</span><span class="cx"> 

</span><span class="cx">     void addKeyframeStyle(PassRefPtr&lt;StyleRuleKeyframes&gt;);

</span><span class="cx"> 

</span><del>-    bool checkRegionStyle(Element* regionElement);

</del><ins>+    bool checkRegionStyle(const Element* regionElement);

</ins><span class="cx"> 

</span><span class="cx">     bool usesFirstLineRules() const { return m_ruleSets.features().usesFirstLineRules; }

</span><span class="cx">     bool usesFirstLetterRules() const { return m_ruleSets.features().usesFirstLetterRules; }

</span><span class="lines">@@ -323,7 +323,7 @@

</span><span class="cx">     void checkForTextSizeAdjust(RenderStyle*);

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><del>-    void adjustRenderStyle(RenderStyle&amp; styleToAdjust, const RenderStyle&amp; parentStyle, Element*);

</del><ins>+    void adjustRenderStyle(RenderStyle&amp; styleToAdjust, const RenderStyle&amp; parentStyle, const Element*);

</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)

</span><span class="cx">     std::unique_ptr&lt;GridPosition&gt; adjustNamedGridItemPosition(const NamedGridAreaMap&amp;, const NamedGridLinesMap&amp;, const GridPosition&amp;, GridPositionSide) const;

</span><span class="cx"> #endif

</span><span class="lines">@@ -361,13 +361,13 @@

</span><span class="cx">     class State {

</span><span class="cx">     public:

</span><span class="cx">         State() { }

</span><del>-        State(Element&amp;, RenderStyle* parentStyle, RenderStyle* documentElementStyle = nullptr, const RenderRegion* regionForStyling = nullptr, const SelectorFilter* = nullptr);

</del><ins>+        State(const Element&amp;, RenderStyle* parentStyle, RenderStyle* documentElementStyle = nullptr, const RenderRegion* regionForStyling = nullptr, const SelectorFilter* = nullptr);

</ins><span class="cx"> 

</span><span class="cx">     public:

</span><span class="cx">         void clear();

</span><span class="cx"> 

</span><span class="cx">         Document&amp; document() const { return m_element-&gt;document(); }

</span><del>-        Element* element() const { return m_element; }

</del><ins>+        const Element* element() const { return m_element; }

</ins><span class="cx"> 

</span><span class="cx">         void setStyle(Ref&lt;RenderStyle&gt;&amp;&amp;);

</span><span class="cx">         RenderStyle* style() const { return m_style.get(); }

</span><span class="lines">@@ -425,7 +425,7 @@

</span><span class="cx">     private:

</span><span class="cx">         void updateConversionData();

</span><span class="cx"> 

</span><del>-        Element* m_element { nullptr };

</del><ins>+        const Element* m_element { nullptr };

</ins><span class="cx">         RefPtr&lt;RenderStyle&gt; m_style;

</span><span class="cx">         RefPtr&lt;RenderStyle&gt; m_parentStyle;

</span><span class="cx">         RenderStyle* m_rootElementStyle { nullptr };

</span><span class="lines">@@ -568,7 +568,7 @@

</span><span class="cx">     return m_ruleSets.features().idsInRules.contains(idValue.impl());

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-inline bool checkRegionSelector(const CSSSelector* regionSelector, Element* regionElement)

</del><ins>+inline bool checkRegionSelector(const CSSSelector* regionSelector, const Element* regionElement)

</ins><span class="cx"> {

</span><span class="cx">     if (!regionSelector || !regionElement)

</span><span class="cx">         return false;

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/rendering/RenderTheme.cpp        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -79,7 +79,7 @@

</span><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element, bool UAHasAppearance, const BorderData&amp; border, const FillLayer&amp; background, const Color&amp; backgroundColor)

</del><ins>+void RenderTheme::adjustStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element, bool UAHasAppearance, const BorderData&amp; border, const FillLayer&amp; background, const Color&amp; backgroundColor)

</ins><span class="cx"> {

</span><span class="cx">     // Force inline and table display styles to be inline-block (except for table- which is block)

</span><span class="cx">     ControlPart part = style.appearance();

</span><span class="lines">@@ -873,7 +873,7 @@

</span><span class="cx"> 

</span><span class="cx"> #if !USE(NEW_THEME)

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustCheckboxStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderTheme::adjustCheckboxStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     // A summary of the rules for checkbox designed to match WinIE:

</span><span class="cx">     // width/height - honored (WinIE actually scales its control for small widths, but lets it overflow for small heights.)

</span><span class="lines">@@ -890,7 +890,7 @@

</span><span class="cx">     style.setBoxShadow(nullptr);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustRadioStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderTheme::adjustRadioStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     // A summary of the rules for checkbox designed to match WinIE:

</span><span class="cx">     // width/height - honored (WinIE actually scales its control for small widths, but lets it overflow for small heights.)

</span><span class="lines">@@ -907,7 +907,7 @@

</span><span class="cx">     style.setBoxShadow(nullptr);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderTheme::adjustButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     // Most platforms will completely honor all CSS, and so we have no need to

</span><span class="cx">     // adjust the style at all by default. We will still allow the theme a crack

</span><span class="lines">@@ -915,25 +915,25 @@

</span><span class="cx">     setButtonSize(style);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustInnerSpinButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustInnerSpinButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustTextAreaStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustTextAreaStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustMenuListStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustMenuListStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> #if ENABLE(METER_ELEMENT)

</span><del>-void RenderTheme::adjustMeterStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderTheme::adjustMeterStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     style.setBoxShadow(nullptr);

</span><span class="cx"> }

</span><span class="lines">@@ -954,7 +954,7 @@

</span><span class="cx"> }

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustCapsLockIndicatorStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustCapsLockIndicatorStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -964,7 +964,7 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)

</span><del>-void RenderTheme::adjustAttachmentStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustAttachmentStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -1069,7 +1069,7 @@

</span><span class="cx">     return 0;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -1078,54 +1078,54 @@

</span><span class="cx">     return bounds;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-bool RenderTheme::shouldHaveSpinButton(HTMLInputElement&amp; inputElement) const

</del><ins>+bool RenderTheme::shouldHaveSpinButton(const HTMLInputElement&amp; inputElement) const

</ins><span class="cx"> {

</span><span class="cx">     return inputElement.isSteppable() &amp;&amp; !inputElement.isRangeControl();

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-bool RenderTheme::shouldHaveCapsLockIndicator(HTMLInputElement&amp;) const

</del><ins>+bool RenderTheme::shouldHaveCapsLockIndicator(const HTMLInputElement&amp;) const

</ins><span class="cx"> {

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustMediaControlStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustMediaControlStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustSliderThumbStyle(StyleResolver&amp;, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderTheme::adjustSliderThumbStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     adjustSliderThumbSize(style, element);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustSliderThumbSize(RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustSliderThumbSize(RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustSearchFieldDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustSearchFieldDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderTheme::adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderTheme::adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderThemeh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.h (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.h        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/rendering/RenderTheme.h        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -77,7 +77,7 @@

</span><span class="cx">     // metrics and defaults given the contents of the style.  This includes sophisticated operations like

</span><span class="cx">     // selection of control size based off the font, the disabling of appearance when certain other properties like

<span class="cx">     // &quot;border&quot; are set, or if the appearance is not supported by the theme.

</span><del>-    void adjustStyle(StyleResolver&amp;, RenderStyle&amp;, Element*,  bool UAHasAppearance, const BorderData&amp;, const FillLayer&amp;, const Color&amp; backgroundColor);

</del><ins>+    void adjustStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*,  bool UAHasAppearance, const BorderData&amp;, const FillLayer&amp;, const Color&amp; backgroundColor);

</ins><span class="cx"> 

</span><span class="cx">     // This method is called to paint the widget as a background of the RenderObject.  A widget's foreground, e.g., the

</span><span class="cx">     // text of a button, is always rendered by the engine itself.  The boolean return value indicates

</span><span class="lines">@@ -182,7 +182,7 @@

</span><span class="cx"> 

</span><span class="cx">     virtual int minimumMenuListSize(const RenderStyle&amp;) const { return 0; }

</span><span class="cx"> 

</span><del>-    virtual void adjustSliderThumbSize(RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustSliderThumbSize(RenderStyle&amp;, const Element*) const;

</ins><span class="cx"> 

</span><span class="cx">     virtual LengthBox popupInternalPaddingBox(const RenderStyle&amp;) const { return { 0, 0, 0, 0 }; }

</span><span class="cx">     virtual bool popupOptionSupportsTextIndent() const { return false; }

</span><span class="lines">@@ -229,8 +229,8 @@

</span><span class="cx">     void paintSliderTicks(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;);

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><del>-    virtual bool shouldHaveSpinButton(HTMLInputElement&amp;) const;

-    virtual bool shouldHaveCapsLockIndicator(HTMLInputElement&amp;) const;

</del><ins>+    virtual bool shouldHaveSpinButton(const HTMLInputElement&amp;) const;

+    virtual bool shouldHaveCapsLockIndicator(const HTMLInputElement&amp;) const;

</ins><span class="cx"> 

<span class="cx">     // Functions for &lt;select&gt; elements.

</span><span class="cx">     virtual bool delegatesMenuListRendering() const { return false; }

</span><span class="lines">@@ -276,19 +276,19 @@

</span><span class="cx"> 

</span><span class="cx"> #if !USE(NEW_THEME)

<span class="cx">     // Methods for each appearance value.

</span><del>-    virtual void adjustCheckboxStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustCheckboxStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintCheckbox(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx">     virtual void setCheckboxSize(RenderStyle&amp;) const { }

</span><span class="cx"> 

</span><del>-    virtual void adjustRadioStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustRadioStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintRadio(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx">     virtual void setRadioSize(RenderStyle&amp;) const { }

</span><span class="cx"> 

</span><del>-    virtual void adjustButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintButton(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx">     virtual void setButtonSize(RenderStyle&amp;) const { }

</span><span class="cx"> 

</span><del>-    virtual void adjustInnerSpinButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustInnerSpinButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintInnerSpinButton(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><span class="lines">@@ -296,64 +296,64 @@

</span><span class="cx">     virtual bool paintRadioDecorations(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx">     virtual bool paintButtonDecorations(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx"> 

</span><del>-    virtual void adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintTextField(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) { return true; }

</span><span class="cx">     virtual bool paintTextFieldDecorations(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) { return true; }

</span><span class="cx"> 

</span><del>-    virtual void adjustTextAreaStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustTextAreaStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintTextArea(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) { return true; }

</span><span class="cx">     virtual bool paintTextAreaDecorations(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) { return true; }

</span><span class="cx"> 

</span><del>-    virtual void adjustMenuListStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustMenuListStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintMenuList(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) { return true; }

</span><span class="cx">     virtual bool paintMenuListDecorations(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx"> 

</span><del>-    virtual void adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintMenuListButtonDecorations(const RenderBox&amp;, const PaintInfo&amp;, const FloatRect&amp;) { return true; }

</span><span class="cx"> 

</span><span class="cx">     virtual bool paintPushButtonDecorations(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx">     virtual bool paintSquareButtonDecorations(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx"> 

</span><span class="cx"> #if ENABLE(METER_ELEMENT)

</span><del>-    virtual void adjustMeterStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustMeterStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintMeter(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;);

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><del>-    virtual void adjustCapsLockIndicatorStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustCapsLockIndicatorStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintCapsLockIndicator(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;);

</span><span class="cx"> 

</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)

</span><del>-    virtual void adjustAttachmentStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustAttachmentStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintAttachment(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;);

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><del>-    virtual void adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintProgressBar(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx"> 

</span><del>-    virtual void adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintSliderTrack(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx"> 

</span><del>-    virtual void adjustSliderThumbStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustSliderThumbStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintSliderThumb(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx">     virtual bool paintSliderThumbDecorations(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx"> 

</span><del>-    virtual void adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintSearchField(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx">     virtual bool paintSearchFieldDecorations(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx"> 

</span><del>-    virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintSearchFieldCancelButton(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx"> 

</span><del>-    virtual void adjustSearchFieldDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustSearchFieldDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintSearchFieldDecorationPart(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx"> 

</span><del>-    virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintSearchFieldResultsDecorationPart(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx"> 

</span><del>-    virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintSearchFieldResultsButton(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx"> 

</span><del>-    virtual void adjustMediaControlStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const;

</del><ins>+    virtual void adjustMediaControlStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const;

</ins><span class="cx">     virtual bool paintMediaFullscreenButton(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx">     virtual bool paintMediaPlayButton(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span><span class="cx">     virtual bool paintMediaOverlayPlayButton(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) { return true; }

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderThemeEflcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeEfl.cpp (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeEfl.cpp        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/rendering/RenderThemeEfl.cpp        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -722,18 +722,18 @@

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeEfl::adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     style.setBoxShadow(nullptr);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustSliderThumbStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeEfl::adjustSliderThumbStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     RenderTheme::adjustSliderThumbStyle(styleResolver, style, element);

</span><span class="cx">     style.setBoxShadow(nullptr);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustSliderThumbSize(RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeEfl::adjustSliderThumbSize(RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     ControlPart part = style.appearance();

</span><span class="cx">     if (part == SliderThumbVerticalPart) {

</span><span class="lines">@@ -789,7 +789,7 @@

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustCheckboxStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeEfl::adjustCheckboxStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     if (!m_page &amp;&amp; element &amp;&amp; element-&gt;document().page()) {

</span><span class="cx">         static_cast&lt;RenderThemeEfl&amp;&gt;(element-&gt;document().page()-&gt;theme()).adjustCheckboxStyle(styleResolver, style, element);

</span><span class="lines">@@ -812,7 +812,7 @@

</span><span class="cx">     return paintThemePart(object, CheckBox, info, rect);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustRadioStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeEfl::adjustRadioStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     if (!m_page &amp;&amp; element &amp;&amp; element-&gt;document().page()) {

</span><span class="cx">         static_cast&lt;RenderThemeEfl&amp;&gt;(element-&gt;document().page()-&gt;theme()).adjustRadioStyle(styleResolver, style, element);

</span><span class="lines">@@ -835,7 +835,7 @@

</span><span class="cx">     return paintThemePart(object, RadioButton, info, rect);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeEfl::adjustButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     if (!m_page &amp;&amp; element &amp;&amp; element-&gt;document().page()) {

</span><span class="cx">         static_cast&lt;RenderThemeEfl&amp;&gt;(element-&gt;document().page()-&gt;theme()).adjustButtonStyle(styleResolver, style, element);

</span><span class="lines">@@ -852,7 +852,7 @@

</span><span class="cx">     return paintThemePart(object, Button, info, rect);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustMenuListStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeEfl::adjustMenuListStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     if (!m_page &amp;&amp; element &amp;&amp; element-&gt;document().page()) {

</span><span class="cx">         static_cast&lt;RenderThemeEfl&amp;&gt;(element-&gt;document().page()-&gt;theme()).adjustMenuListStyle(styleResolver, style, element);

</span><span class="lines">@@ -870,7 +870,7 @@

</span><span class="cx">     return paintThemePart(object, ComboBox, info, IntRect(rect));

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustMenuListButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeEfl::adjustMenuListButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

<span class="cx">     // Height is locked to auto if height is not specified.

</span><span class="cx">     style.setHeight(Length(Auto));

</span><span class="lines">@@ -891,7 +891,7 @@

</span><span class="cx">     return paintMenuList(object, info, rect);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustTextFieldStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeEfl::adjustTextFieldStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     if (!m_page &amp;&amp; element &amp;&amp; element-&gt;document().page()) {

</span><span class="cx">         static_cast&lt;RenderThemeEfl&amp;&gt;(element-&gt;document().page()-&gt;theme()).adjustTextFieldStyle(styleResolver, style, element);

</span><span class="lines">@@ -906,7 +906,7 @@

</span><span class="cx">     return paintThemePart(object, TextField, info, IntRect(rect));

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustTextAreaStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderThemeEfl::adjustTextAreaStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -915,7 +915,7 @@

</span><span class="cx">     return paintTextField(object, info, rect);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustSearchFieldResultsButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeEfl::adjustSearchFieldResultsButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     if (!m_page &amp;&amp; element &amp;&amp; element-&gt;document().page()) {

</span><span class="cx">         static_cast&lt;RenderThemeEfl&amp;&gt;(element-&gt;document().page()-&gt;theme()).adjustSearchFieldResultsButtonStyle(styleResolver, style, element);

</span><span class="lines">@@ -937,7 +937,7 @@

</span><span class="cx">     return paintThemePart(object, SearchFieldResultsButton, info, rect);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeEfl::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     if (!m_page &amp;&amp; element &amp;&amp; element-&gt;document().page()) {

</span><span class="cx">         static_cast&lt;RenderThemeEfl&amp;&gt;(element-&gt;document().page()-&gt;theme()).adjustSearchFieldResultsDecorationPartStyle(styleResolver, style, element);

</span><span class="lines">@@ -959,7 +959,7 @@

</span><span class="cx">     return paintThemePart(object, SearchFieldResultsDecoration, info, rect);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustSearchFieldCancelButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeEfl::adjustSearchFieldCancelButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     if (!m_page &amp;&amp; element &amp;&amp; element-&gt;document().page()) {

</span><span class="cx">         static_cast&lt;RenderThemeEfl&amp;&gt;(element-&gt;document().page()-&gt;theme()).adjustSearchFieldCancelButtonStyle(styleResolver, style, element);

</span><span class="lines">@@ -983,7 +983,7 @@

</span><span class="cx">     return paintThemePart(object, SearchFieldCancelButton, info, rect);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustSearchFieldStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeEfl::adjustSearchFieldStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     if (!m_page &amp;&amp; element &amp;&amp; element-&gt;document().page()) {

</span><span class="cx">         static_cast&lt;RenderThemeEfl&amp;&gt;(element-&gt;document().page()-&gt;theme()).adjustSearchFieldStyle(styleResolver, style, element);

</span><span class="lines">@@ -999,7 +999,7 @@

</span><span class="cx">     return paintThemePart(object, SearchField, info, rect);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustInnerSpinButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeEfl::adjustInnerSpinButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     if (!m_page &amp;&amp; element &amp;&amp; element-&gt;document().page()) {

</span><span class="cx">         static_cast&lt;RenderThemeEfl&amp;&gt;(element-&gt;document().page()-&gt;theme()).adjustInnerSpinButtonStyle(styleResolver, style, element);

</span><span class="lines">@@ -1029,7 +1029,7 @@

</span><span class="cx">     fontDescription.setItalic(FontItalicOff);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeEfl::adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeEfl::adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     style.setBoxShadow(nullptr);

</span><span class="cx"> }

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderThemeEflh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeEfl.h (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeEfl.h        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/rendering/RenderThemeEfl.h        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -108,45 +108,45 @@

</span><span class="cx"> 

</span><span class="cx">     void adjustSizeConstraints(RenderStyle&amp;, FormType) const;

</span><span class="cx"> 

</span><del>-    void adjustCheckboxStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustCheckboxStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintCheckbox(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustRadioStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustRadioStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintRadio(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintButton(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintTextField(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustTextAreaStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustTextAreaStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintTextArea(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustMenuListStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustMenuListStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintMenuList(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintMenuListButtonDecorations(const RenderBox&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldResultsDecorationPart(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchField(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldResultsButton(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldCancelButton(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSliderTrack(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSliderThumbStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSliderThumbStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><del>-    void adjustSliderThumbSize(RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSliderThumbSize(RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)

</span><span class="cx">     IntSize sliderTickSize() const override;

</span><span class="lines">@@ -158,12 +158,12 @@

</span><span class="cx"> 

</span><span class="cx">     bool paintSliderThumb(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustInnerSpinButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustInnerSpinButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintInnerSpinButton(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><span class="cx">     static void setDefaultFontSize(int fontsize);

</span><span class="cx"> 

</span><del>-    void adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintProgressBar(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx">     double animationRepeatIntervalForProgressBar(RenderProgress&amp;) const override;

</span><span class="cx">     double animationDurationForProgressBar(RenderProgress&amp;) const override;

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderThemeGtkcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -503,7 +503,7 @@

</span><span class="cx"> }

</span><span class="cx"> #endif // GTK_CHECK_VERSION(3, 20, 0)

</span><span class="cx"> 

</span><del>-void RenderThemeGtk::adjustButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeGtk::adjustButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

<span class="cx">     // Some layout tests check explicitly that buttons ignore line-height.

</span><span class="cx">     if (style.appearance() == PushButtonPart)

</span><span class="lines">@@ -773,7 +773,7 @@

</span><span class="cx"> }

</span><span class="cx"> #endif // GTK_CHECK_VERSION(3, 20, 0)

</span><span class="cx"> 

</span><del>-void RenderThemeGtk::adjustMenuListStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeGtk::adjustMenuListStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

<span class="cx">     // The tests check explicitly that select menu buttons ignore line height.

</span><span class="cx">     style.setLineHeight(RenderStyle::initialLineHeight());

</span><span class="lines">@@ -782,7 +782,7 @@

</span><span class="cx">     style.resetBorderRadius();

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeGtk::adjustMenuListButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* e) const

</del><ins>+void RenderThemeGtk::adjustMenuListButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* e) const

</ins><span class="cx"> {

</span><span class="cx">     adjustMenuListStyle(styleResolver, style, e);

</span><span class="cx"> }

</span><span class="lines">@@ -960,7 +960,7 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> #if GTK_CHECK_VERSION(3, 20, 0)

</span><del>-void RenderThemeGtk::adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeGtk::adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     if (!is&lt;HTMLInputElement&gt;(element) || !shouldHaveSpinButton(downcast&lt;HTMLInputElement&gt;(*element)))

</span><span class="cx">         return;

</span><span class="lines">@@ -1007,7 +1007,7 @@

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> #else

</span><del>-void RenderThemeGtk::adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderThemeGtk::adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -1121,7 +1121,7 @@

</span><span class="cx">     return paintTextField(o, i, r);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeGtk::adjustSearchFieldResultsButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* e) const

</del><ins>+void RenderThemeGtk::adjustSearchFieldResultsButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* e) const

</ins><span class="cx"> {

</span><span class="cx">     adjustSearchFieldCancelButtonStyle(styleResolver, style, e);

</span><span class="cx"> }

</span><span class="lines">@@ -1131,12 +1131,12 @@

</span><span class="cx">     return paintSearchFieldResultsDecorationPart(o, i, rect);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeGtk::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeGtk::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     adjustSearchFieldIconStyle(EntryIconLeft, style);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeGtk::adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeGtk::adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     adjustSearchFieldIconStyle(EntryIconRight, style);

</span><span class="cx"> }

</span><span class="lines">@@ -1246,7 +1246,7 @@

</span><span class="cx"> }

</span><span class="cx"> #endif // GTK_CHECK_VERSION(3, 20, 0)

</span><span class="cx"> 

</span><del>-void RenderThemeGtk::adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeGtk::adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

<span class="cx">     // We cannot give a proper rendering when border radius is active, unfortunately.

</span><span class="cx">     style.resetBorderRadius();

</span><span class="lines">@@ -1258,17 +1258,17 @@

</span><span class="cx">     return paintTextField(o, i, rect);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-bool RenderThemeGtk::shouldHaveCapsLockIndicator(HTMLInputElement&amp; element) const

</del><ins>+bool RenderThemeGtk::shouldHaveCapsLockIndicator(const HTMLInputElement&amp; element) const

</ins><span class="cx"> {

</span><span class="cx">     return element.isPasswordField();

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeGtk::adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeGtk::adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     style.setBoxShadow(nullptr);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeGtk::adjustSliderThumbStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeGtk::adjustSliderThumbStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     RenderTheme::adjustSliderThumbStyle(styleResolver, style, element);

</span><span class="cx">     style.setBoxShadow(nullptr);

</span><span class="lines">@@ -1351,7 +1351,7 @@

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeGtk::adjustSliderThumbSize(RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeGtk::adjustSliderThumbSize(RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     ControlPart part = style.appearance();

</span><span class="cx">     if (part != SliderThumbHorizontalPart &amp;&amp; part != SliderThumbVerticalPart)

</span><span class="lines">@@ -1469,7 +1469,7 @@

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeGtk::adjustSliderThumbSize(RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeGtk::adjustSliderThumbSize(RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     ControlPart part = style.appearance();

</span><span class="cx">     if (part != SliderThumbHorizontalPart &amp;&amp; part != SliderThumbVerticalPart)

</span><span class="lines">@@ -1613,7 +1613,7 @@

</span><span class="cx">     return renderObject.style().direction() == RTL ? InnerSpinButtonLayout::HorizontalUpLeft : InnerSpinButtonLayout::HorizontalUpRight;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeGtk::adjustInnerSpinButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeGtk::adjustInnerSpinButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     RenderThemeGadget::Info info = { RenderThemeGadget::Type::Generic, &quot;spinbutton&quot;, GTK_STATE_FLAG_NORMAL, { &quot;horizontal&quot; } };

</span><span class="cx">     auto spinbuttonGadget = RenderThemeGadget::create(info);

</span><span class="lines">@@ -1689,7 +1689,7 @@

</span><span class="cx">     return arrowSize - arrowSize % 2; // Force even.

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeGtk::adjustInnerSpinButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeGtk::adjustInnerSpinButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     GRefPtr&lt;GtkStyleContext&gt; context = createStyleContext(SpinButton);

</span><span class="cx"> 

</span><span class="lines">@@ -2083,7 +2083,7 @@

</span><span class="cx"> }

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><del>-void RenderThemeGtk::adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeGtk::adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     style.setBoxShadow(nullptr);

</span><span class="cx"> }

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderThemeGtkh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.h (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.h        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/rendering/RenderThemeGtk.h        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -102,7 +102,7 @@

</span><span class="cx"> #endif

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><del>-    bool shouldHaveCapsLockIndicator(HTMLInputElement&amp;) const override;

</del><ins>+    bool shouldHaveCapsLockIndicator(const HTMLInputElement&amp;) const override;

</ins><span class="cx"> 

</span><span class="cx"> private:

</span><span class="cx">     RenderThemeGtk();

</span><span class="lines">@@ -114,10 +114,10 @@

</span><span class="cx">     bool paintRadio(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx">     void setRadioSize(RenderStyle&amp;) const override;

</span><span class="cx"> 

</span><del>-    void adjustButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintButton(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintTextField(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><span class="cx">     bool paintTextArea(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><span class="cx"> 

</span><span class="lines">@@ -127,30 +127,30 @@

</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 class="cx">     // we don't maintain this differentiation.

</span><del>-    void adjustMenuListStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

-    void adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustMenuListStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

+    void adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintMenuList(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><span class="cx">     bool paintMenuListButtonDecorations(const RenderBox&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldResultsDecorationPart(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchField(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldResultsButton(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldCancelButton(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><span class="cx">     bool paintSliderTrack(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><del>-    void adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><span class="cx">     bool paintSliderThumb(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><del>-    void adjustSliderThumbStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSliderThumbStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><del>-    void adjustSliderThumbSize(RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSliderThumbSize(RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><span class="cx"> #if ENABLE(VIDEO)

</span><span class="cx">     bool hasOwnDisabledStateHandlingFor(ControlPart) const override;

</span><span class="lines">@@ -171,12 +171,12 @@

</span><span class="cx"> 

</span><span class="cx">     double animationRepeatIntervalForProgressBar(RenderProgress&amp;) const override;

</span><span class="cx">     double animationDurationForProgressBar(RenderProgress&amp;) const override;

</span><del>-    void adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     IntRect progressBarRectForBounds(const RenderObject&amp;, const IntRect&amp;) const override;

</span><span class="cx">     bool paintProgressBar(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><span class="cx">     InnerSpinButtonLayout innerSpinButtonLayout(const RenderObject&amp;) const override;

</span><del>-    void adjustInnerSpinButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustInnerSpinButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintInnerSpinButton(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><span class="cx">     String fileListNameForWidth(const FileList*, const FontCascade&amp;, int width, bool multipleFilesAllowed) const override;

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderThemeIOSh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.h (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.h        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/rendering/RenderThemeIOS.h        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -56,13 +56,13 @@

</span><span class="cx">     bool isControlStyled(const RenderStyle&amp;, const BorderData&amp;, const FillLayer&amp; background, const Color&amp; backgroundColor) const override;

</span><span class="cx"> 

<span class="cx">     // Methods for each appearance value.

</span><del>-    void adjustCheckboxStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustCheckboxStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintCheckboxDecorations(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustRadioStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustRadioStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintRadioDecorations(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintButtonDecorations(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx">     bool paintPushButtonDecorations(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx">     void setButtonSize(RenderStyle&amp;) const override;

</span><span class="lines">@@ -72,13 +72,13 @@

</span><span class="cx">     bool paintTextFieldDecorations(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><span class="cx">     bool paintTextAreaDecorations(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintMenuListButtonDecorations(const RenderBox&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSliderTrack(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSliderThumbSize(RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSliderThumbSize(RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSliderThumbDecorations(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

<span class="cx">     // Returns the repeat interval of the animation for the progress bar.

</span><span class="lines">@@ -93,7 +93,7 @@

</span><span class="cx">     int sliderTickOffsetFromTrackCenter() const override;

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldDecorations(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><span class="cx">     Color platformActiveSelectionBackgroundColor() const override;

</span><span class="lines">@@ -103,8 +103,8 @@

</span><span class="cx">     Color platformTapHighlightColor() const override { return 0x4D1A1A1A; }

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><del>-    bool shouldHaveSpinButton(HTMLInputElement&amp;) const override;

-    bool shouldHaveCapsLockIndicator(HTMLInputElement&amp;) const override;

</del><ins>+    bool shouldHaveSpinButton(const HTMLInputElement&amp;) const override;

+    bool shouldHaveCapsLockIndicator(const HTMLInputElement&amp;) const override;

</ins><span class="cx"> 

</span><span class="cx"> #if ENABLE(VIDEO)

</span><span class="cx">     String mediaControlsStyleSheet() override;

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -354,7 +354,7 @@

</span><span class="cx">     return border.rect();

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeIOS::adjustCheckboxStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeIOS::adjustCheckboxStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     if (!style.width().isIntrinsicOrAuto() &amp;&amp; !style.height().isAuto())

</span><span class="cx">         return;

</span><span class="lines">@@ -458,7 +458,7 @@

</span><span class="cx">     return RenderTheme::isControlStyled(style, border, background, backgroundColor);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeIOS::adjustRadioStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeIOS::adjustRadioStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     if (!style.width().isIntrinsicOrAuto() &amp;&amp; !style.height().isAuto())

</span><span class="cx">         return;

</span><span class="lines">@@ -546,7 +546,7 @@

</span><span class="cx">     style.setBorderRadius(LengthSize(radiusWidth, radiusHeight));

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-static void applyCommonButtonPaddingToStyle(RenderStyle&amp; style, Element&amp; element)

</del><ins>+static void applyCommonButtonPaddingToStyle(RenderStyle&amp; style, const Element&amp; element)

</ins><span class="cx"> {

</span><span class="cx">     Document&amp; document = element.document();

</span><span class="cx">     RefPtr&lt;CSSPrimitiveValue&gt; emSize = CSSPrimitiveValue::create(0.5, CSSPrimitiveValue::CSS_EMS);

</span><span class="lines">@@ -554,7 +554,7 @@

</span><span class="cx">     style.setPaddingBox(LengthBox(0, pixels, 0, pixels));

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-static void adjustSelectListButtonStyle(RenderStyle&amp; style, Element&amp; element)

</del><ins>+static void adjustSelectListButtonStyle(RenderStyle&amp; style, const Element&amp; element)

</ins><span class="cx"> {

</span><span class="cx">     // Enforce &quot;padding: 0 0.5em&quot;.

</span><span class="cx">     applyCommonButtonPaddingToStyle(style, element);

</span><span class="lines">@@ -580,7 +580,7 @@

</span><span class="cx">     const RenderStyle&amp; m_style;

</span><span class="cx"> };

</span><span class="cx"> 

</span><del>-static void adjustInputElementButtonStyle(RenderStyle&amp; style, HTMLInputElement&amp; inputElement)

</del><ins>+static void adjustInputElementButtonStyle(RenderStyle&amp; style, const HTMLInputElement&amp; inputElement)

</ins><span class="cx"> {

</span><span class="cx">     // Always Enforce &quot;padding: 0 0.5em&quot;.

</span><span class="cx">     applyCommonButtonPaddingToStyle(style, inputElement);

</span><span class="lines">@@ -608,7 +608,7 @@

</span><span class="cx">     }

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeIOS::adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeIOS::adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

<span class="cx">     // Set the min-height to be at least MenuListMinHeight.

</span><span class="cx">     if (style.height().isAuto())

</span><span class="lines">@@ -622,10 +622,10 @@

</span><span class="cx">     // Enforce some default styles in the case that this is a non-multiple &lt;select&gt; element,

</span><span class="cx">     // or a date input. We don't force these if this is just an element with

<span class="cx">     // &quot;-webkit-appearance: menulist-button&quot;.

</span><del>-    if (element-&gt;hasTagName(HTMLNames::selectTag) &amp;&amp; !element-&gt;hasAttribute(HTMLNames::multipleAttr))

</del><ins>+    if (is&lt;HTMLSelectElement&gt;(*element) &amp;&amp; !element-&gt;hasAttribute(HTMLNames::multipleAttr))

</ins><span class="cx">         adjustSelectListButtonStyle(style, *element);

</span><del>-    else if (element-&gt;hasTagName(HTMLNames::inputTag))

-        adjustInputElementButtonStyle(style, static_cast&lt;HTMLInputElement&amp;&gt;(*element));

</del><ins>+    else if (is&lt;HTMLInputElement&gt;(*element))

+        adjustInputElementButtonStyle(style, downcast&lt;HTMLInputElement&gt;(*element));

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> bool RenderThemeIOS::paintMenuListButtonDecorations(const RenderBox&amp; box, const PaintInfo&amp; paintInfo, const FloatRect&amp; rect)

</span><span class="lines">@@ -721,7 +721,7 @@

</span><span class="cx"> const CGFloat kTrackRadius = kTrackThickness / 2.0;

</span><span class="cx"> const int kDefaultSliderThumbSize = 16;

</span><span class="cx"> 

</span><del>-void RenderThemeIOS::adjustSliderTrackStyle(StyleResolver&amp; selector, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeIOS::adjustSliderTrackStyle(StyleResolver&amp; selector, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     RenderTheme::adjustSliderTrackStyle(selector, style, element);

</span><span class="cx"> 

</span><span class="lines">@@ -809,7 +809,7 @@

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeIOS::adjustSliderThumbSize(RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeIOS::adjustSliderThumbSize(RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     if (style.appearance() != SliderThumbHorizontalPart &amp;&amp; style.appearance() != SliderThumbVerticalPart)

</span><span class="cx">         return;

</span><span class="lines">@@ -948,7 +948,7 @@

</span><span class="cx"> }

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><del>-void RenderThemeIOS::adjustSearchFieldStyle(StyleResolver&amp; selector, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeIOS::adjustSearchFieldStyle(StyleResolver&amp; selector, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     RenderTheme::adjustSearchFieldStyle(selector, style, element);

</span><span class="cx"> 

</span><span class="lines">@@ -970,7 +970,7 @@

</span><span class="cx">     return paintTextFieldDecorations(box, paintInfo, rect);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeIOS::adjustButtonStyle(StyleResolver&amp; selector, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeIOS::adjustButtonStyle(StyleResolver&amp; selector, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     RenderTheme::adjustButtonStyle(selector, style, element);

</span><span class="cx"> 

</span><span class="lines">@@ -1083,12 +1083,12 @@

</span><span class="cx">     return Color::transparent;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-bool RenderThemeIOS::shouldHaveSpinButton(HTMLInputElement&amp;) const

</del><ins>+bool RenderThemeIOS::shouldHaveSpinButton(const HTMLInputElement&amp;) const

</ins><span class="cx"> {

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-bool RenderThemeIOS::shouldHaveCapsLockIndicator(HTMLInputElement&amp;) const

</del><ins>+bool RenderThemeIOS::shouldHaveCapsLockIndicator(const HTMLInputElement&amp;) const

</ins><span class="cx"> {

</span><span class="cx">     return false;

</span><span class="cx"> }

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderThemeMach"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.h        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/rendering/RenderThemeMac.h        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -68,7 +68,7 @@

</span><span class="cx"> 

</span><span class="cx">     int minimumMenuListSize(const RenderStyle&amp;) const override;

</span><span class="cx"> 

</span><del>-    void adjustSliderThumbSize(RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSliderThumbSize(RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)

</span><span class="cx">     IntSize sliderTickSize() const override;

</span><span class="lines">@@ -117,46 +117,46 @@

</span><span class="cx">     bool supportsSelectionForegroundColors() const override { return false; }

</span><span class="cx"> 

</span><span class="cx">     bool paintTextField(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><del>-    void adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><span class="cx">     bool paintTextArea(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><del>-    void adjustTextAreaStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustTextAreaStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><span class="cx">     bool paintMenuList(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><del>-    void adjustMenuListStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustMenuListStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><span class="cx">     bool paintMenuListButtonDecorations(const RenderBox&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><del>-    void adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><del>-    void adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintProgressBar(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><span class="cx">     bool paintSliderTrack(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><del>-    void adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><span class="cx">     bool paintSliderThumb(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><del>-    void adjustSliderThumbStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSliderThumbStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><span class="cx">     bool paintSearchField(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><del>-    void adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><del>-    void adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldCancelButton(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldDecorationPart(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldResultsDecorationPart(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldResultsButton(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><span class="cx"> #if ENABLE(VIDEO)

</span><span class="cx">     bool supportsClosedCaptioning() const override { return true; }

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><del>-    bool shouldHaveCapsLockIndicator(HTMLInputElement&amp;) const override;

</del><ins>+    bool shouldHaveCapsLockIndicator(const HTMLInputElement&amp;) const override;

</ins><span class="cx"> 

</span><span class="cx">     bool paintSnapshottedPluginOverlay(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -864,7 +864,7 @@

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeMac::adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderThemeMac::adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -875,7 +875,7 @@

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeMac::adjustTextAreaStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderThemeMac::adjustTextAreaStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -1098,7 +1098,7 @@

</span><span class="cx">     return progressAnimationNumFrames * progressAnimationFrameRate;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeMac::adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const

</del><ins>+void RenderThemeMac::adjustProgressBarStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -1337,7 +1337,7 @@

</span><span class="cx">     return sizes;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeMac::adjustMenuListStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* e) const

</del><ins>+void RenderThemeMac::adjustMenuListStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* e) const

</ins><span class="cx"> {

</span><span class="cx">     NSControlSize controlSize = controlSizeForFont(style);

</span><span class="cx"> 

</span><span class="lines">@@ -1403,7 +1403,7 @@

</span><span class="cx">     }

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeMac::adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeMac::adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     float fontScale = style.fontSize() / baseFontSize;

</span><span class="cx"> 

</span><span class="lines">@@ -1453,7 +1453,7 @@

</span><span class="cx"> const int trackWidth = 5;

</span><span class="cx"> const int trackRadius = 2;

</span><span class="cx"> 

</span><del>-void RenderThemeMac::adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeMac::adjustSliderTrackStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     style.setBoxShadow(nullptr);

</span><span class="cx"> }

</span><span class="lines">@@ -1499,7 +1499,7 @@

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeMac::adjustSliderThumbStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* element) const

</del><ins>+void RenderThemeMac::adjustSliderThumbStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* element) const

</ins><span class="cx"> {

</span><span class="cx">     RenderTheme::adjustSliderThumbStyle(styleResolver, style, element);

</span><span class="cx">     style.setBoxShadow(nullptr);

</span><span class="lines">@@ -1630,7 +1630,7 @@

</span><span class="cx">     setSizeFromFont(style, searchFieldSizes());

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeMac::adjustSearchFieldStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeMac::adjustSearchFieldStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

<span class="cx">     // Override border.

</span><span class="cx">     style.resetBorder();

</span><span class="lines">@@ -1722,7 +1722,7 @@

</span><span class="cx">     return sizes;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeMac::adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeMac::adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     IntSize size = sizeForSystemFont(style, cancelButtonSizes());

</span><span class="cx">     style.setWidth(Length(size.width(), Fixed));

</span><span class="lines">@@ -1738,7 +1738,7 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> const int emptyResultsOffset = 9;

</span><del>-void RenderThemeMac::adjustSearchFieldDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeMac::adjustSearchFieldDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     IntSize size = sizeForSystemFont(style, resultsButtonSizes());

</span><span class="cx">     style.setWidth(Length(size.width() - emptyResultsOffset, Fixed));

</span><span class="lines">@@ -1751,7 +1751,7 @@

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeMac::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeMac::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     IntSize size = sizeForSystemFont(style, resultsButtonSizes());

</span><span class="cx">     style.setWidth(Length(size.width(), Fixed));

</span><span class="lines">@@ -1787,7 +1787,7 @@

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeMac::adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeMac::adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     IntSize size = sizeForSystemFont(style, resultsButtonSizes());

</span><span class="cx">     style.setWidth(Length(size.width() + resultsArrowWidth, Fixed));

</span><span class="lines">@@ -1937,7 +1937,7 @@

</span><span class="cx"> const int sliderThumbWidth = 15;

</span><span class="cx"> const int sliderThumbHeight = 15;

</span><span class="cx"> 

</span><del>-void RenderThemeMac::adjustSliderThumbSize(RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeMac::adjustSliderThumbSize(RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     float zoomLevel = style.effectiveZoom();

</span><span class="cx">     if (style.appearance() == SliderThumbHorizontalPart || style.appearance() == SliderThumbVerticalPart) {

</span><span class="lines">@@ -1946,7 +1946,7 @@

</span><span class="cx">     }

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-bool RenderThemeMac::shouldHaveCapsLockIndicator(HTMLInputElement&amp; element) const

</del><ins>+bool RenderThemeMac::shouldHaveCapsLockIndicator(const HTMLInputElement&amp; element) const

</ins><span class="cx"> {

</span><span class="cx">     return element.isPasswordField();

</span><span class="cx"> }

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderThemeWincpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -687,7 +687,7 @@

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeWin::adjustInnerSpinButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeWin::adjustInnerSpinButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     int width = ::GetSystemMetrics(SM_CXVSCROLL);

</span><span class="cx">     if (width &lt;= 0)

</span><span class="lines">@@ -751,13 +751,13 @@

</span><span class="cx">     return paintMenuListButtonDecorations(downcast&lt;RenderBox&gt;(renderer), paintInfo, FloatRect(rect));

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeWin::adjustMenuListStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* e) const

</del><ins>+void RenderThemeWin::adjustMenuListStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* e) const

</ins><span class="cx"> {

</span><span class="cx">     style.resetBorder();

</span><span class="cx">     adjustMenuListButtonStyle(styleResolver, style, e);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeWin::adjustMenuListButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeWin::adjustMenuListButtonStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     // These are the paddings needed to place the text correctly in the &lt;select&gt; box

</span><span class="cx">     const int dropDownBoxPaddingTop    = 2;

</span><span class="lines">@@ -840,7 +840,7 @@

</span><span class="cx"> const int sliderThumbWidth = 7;

</span><span class="cx"> const int sliderThumbHeight = 15;

</span><span class="cx"> 

</span><del>-void RenderThemeWin::adjustSliderThumbSize(RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeWin::adjustSliderThumbSize(RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     ControlPart part = style.appearance();

</span><span class="cx">     if (part == SliderThumbVerticalPart) {

</span><span class="lines">@@ -861,7 +861,7 @@

</span><span class="cx">     return paintTextField(o, i, r);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeWin::adjustSearchFieldStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, Element* e) const

</del><ins>+void RenderThemeWin::adjustSearchFieldStyle(StyleResolver&amp; styleResolver, RenderStyle&amp; style, const Element* e) const

</ins><span class="cx"> {

<span class="cx">     // Override paddingSize to match AppKit text positioning.

</span><span class="cx">     const int padding = 1;

</span><span class="lines">@@ -896,7 +896,7 @@

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeWin::adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeWin::adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     // Scale the button size based on the font size

</span><span class="cx">     float fontScale = style.fontSize() / defaultControlFontPixelSize;

</span><span class="lines">@@ -905,14 +905,14 @@

</span><span class="cx">     style.setHeight(Length(cancelButtonSize, Fixed));

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeWin::adjustSearchFieldDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeWin::adjustSearchFieldDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     IntSize emptySize(1, 11);

</span><span class="cx">     style.setWidth(Length(emptySize.width(), Fixed));

</span><span class="cx">     style.setHeight(Length(emptySize.height(), Fixed));

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeWin::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeWin::adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     // Scale the decoration size based on the font size

</span><span class="cx">     float fontScale = style.fontSize() / defaultControlFontPixelSize;

</span><span class="lines">@@ -944,7 +944,7 @@

</span><span class="cx">     return false;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void RenderThemeWin::adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeWin::adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     // Scale the button size based on the font size

</span><span class="cx">     float fontScale = style.fontSize() / defaultControlFontPixelSize;

</span><span class="lines">@@ -1107,7 +1107,7 @@

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><span class="cx"> #if ENABLE(METER_ELEMENT)

</span><del>-void RenderThemeWin::adjustMeterStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const

</del><ins>+void RenderThemeWin::adjustMeterStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const

</ins><span class="cx"> {

</span><span class="cx">     style.setBoxShadow(nullptr);

</span><span class="cx"> }

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderThemeWinh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWin.h (199639 => 199640)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWin.h        2016-04-17 04:55:02 UTC (rev 199639)

+++ trunk/Source/WebCore/rendering/RenderThemeWin.h        2016-04-17 17:56:47 UTC (rev 199640)

</span><span class="lines">@@ -75,7 +75,7 @@

</span><span class="cx"> 

</span><span class="cx">     bool paintButton(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustInnerSpinButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustInnerSpinButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintInnerSpinButton(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><span class="cx">     bool paintTextField(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><span class="lines">@@ -83,38 +83,38 @@

</span><span class="cx">     bool paintTextArea(const RenderObject&amp; o, const PaintInfo&amp; i, const FloatRect&amp; r) override

</span><span class="cx">     { return paintTextField(o, i, r); }

</span><span class="cx"> 

</span><del>-    void adjustMenuListStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustMenuListStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintMenuList(const RenderObject&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><del>-    void adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustMenuListButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><span class="cx">     bool paintMenuListButtonDecorations(const RenderBox&amp;, const PaintInfo&amp;, const FloatRect&amp;) override;

</span><span class="cx"> 

</span><span class="cx">     bool paintSliderTrack(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx">     bool paintSliderThumb(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><del>-    void adjustSliderThumbSize(RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSliderThumbSize(RenderStyle&amp;, const Element*) const override;

</ins><span class="cx"> 

</span><span class="cx">     bool popupOptionSupportsTextIndent() const override { return true; }

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchField(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldCancelButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldCancelButton(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldDecorationPart(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override { return false; }

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldResultsDecorationPart(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><del>-    void adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustSearchFieldResultsButtonStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintSearchFieldResultsButton(const RenderBox&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> 

</span><span class="cx">     void themeChanged() override;

</span><span class="cx"> 

</span><del>-    void adjustButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const override { }

-    void adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const override { }

-    void adjustTextAreaStyle(StyleResolver&amp;, RenderStyle&amp; style, Element*) const override { }

</del><ins>+    void adjustButtonStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const override { }

+    void adjustTextFieldStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const override { }

+    void adjustTextAreaStyle(StyleResolver&amp;, RenderStyle&amp; style, const Element*) const override { }

</ins><span class="cx"> 

</span><span class="cx">     static void setWebKitIsBeingUnloaded();

</span><span class="cx"> 

</span><span class="lines">@@ -130,7 +130,7 @@

</span><span class="cx"> #if ENABLE(METER_ELEMENT)

</span><span class="cx">     IntSize meterSizeForBounds(const RenderMeter&amp;, const IntRect&amp;) const override;

</span><span class="cx">     bool supportsMeter(ControlPart) const override;

</span><del>-    void adjustMeterStyle(StyleResolver&amp;, RenderStyle&amp;, Element*) const override;

</del><ins>+    void adjustMeterStyle(StyleResolver&amp;, RenderStyle&amp;, const Element*) const override;

</ins><span class="cx">     bool paintMeter(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;

</span><span class="cx"> #endif

</span><span class="cx"> 

</span></span></pre>

</div>

</div>

</body>

</html>