<!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>[167755] 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/167755">167755</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-04-24 07:27:54 -0700 (Thu, 24 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Transition RenderTheme API from RenderObject* to const RenderObject&
https://bugs.webkit.org/show_bug.cgi?id=132037
Reviewed by Andreas Kling.
Using const references provides better encapsulation and improve security.
No change in behavior.
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::boundingBoxForQuads):
* dom/Element.cpp:
(WebCore::Element::setActive):
(WebCore::Element::setHovered):
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::focusedOrActiveStateChanged):
* html/HTMLFormControlElement.cpp:
(WebCore::HTMLFormControlElement::disabledStateChanged):
(WebCore::HTMLFormControlElement::readOnlyAttributeChanged):
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::setChecked):
(WebCore::HTMLInputElement::setIndeterminate):
* html/HTMLOptionElement.cpp:
(WebCore::HTMLOptionElement::parseAttribute):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::addVisualOverflowFromTheme):
(WebCore::RenderBlock::baselinePosition):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::paintBoxDecorations):
* rendering/RenderButton.cpp:
(WebCore::RenderButton::styleDidChange):
* rendering/RenderFileUploadControl.cpp:
(WebCore::RenderFileUploadControl::paintObject):
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::addRegionsVisualOverflowFromTheme):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::drawLineForBoxSide):
* rendering/RenderObject.h:
* rendering/RenderProgress.cpp:
(WebCore::RenderProgress::computeLogicalHeight):
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::paint):
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::paint):
(WebCore::RenderTheme::paintBorderOnly):
(WebCore::RenderTheme::paintDecorations):
(WebCore::RenderTheme::baselinePosition):
(WebCore::RenderTheme::adjustRepaintRect):
(WebCore::RenderTheme::stateChanged):
(WebCore::RenderTheme::updateControlStatesForRenderer):
(WebCore::RenderTheme::extractControlStatesForRenderer):
(WebCore::RenderTheme::isActive):
(WebCore::RenderTheme::isChecked):
(WebCore::RenderTheme::isIndeterminate):
(WebCore::RenderTheme::isEnabled):
(WebCore::RenderTheme::isFocused):
(WebCore::RenderTheme::isPressed):
(WebCore::RenderTheme::isSpinUpButtonPartPressed):
(WebCore::RenderTheme::isReadOnlyControl):
(WebCore::RenderTheme::isHovered):
(WebCore::RenderTheme::isSpinUpButtonPartHovered):
(WebCore::RenderTheme::isDefault):
(WebCore::RenderTheme::paintInputFieldSpeechButton):
(WebCore::RenderTheme::paintMeter):
(WebCore::RenderTheme::paintSliderTicks):
(WebCore::RenderTheme::progressBarRectForBounds):
* rendering/RenderTheme.h:
(WebCore::RenderTheme::controlSupportsTints):
(WebCore::RenderTheme::paintCapsLockIndicator):
(WebCore::RenderTheme::paintFileUploadIconDecorations):
(WebCore::RenderTheme::imageControlsButtonSize):
(WebCore::RenderTheme::paintCheckbox):
(WebCore::RenderTheme::paintRadio):
(WebCore::RenderTheme::paintButton):
(WebCore::RenderTheme::paintInnerSpinButton):
(WebCore::RenderTheme::paintCheckboxDecorations):
(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):
(WebCore::RenderTheme::paintMediaMuteButton):
(WebCore::RenderTheme::paintMediaSeekBackButton):
(WebCore::RenderTheme::paintMediaSeekForwardButton):
(WebCore::RenderTheme::paintMediaSliderTrack):
(WebCore::RenderTheme::paintMediaSliderThumb):
(WebCore::RenderTheme::paintMediaVolumeSliderContainer):
(WebCore::RenderTheme::paintMediaVolumeSliderTrack):
(WebCore::RenderTheme::paintMediaVolumeSliderThumb):
(WebCore::RenderTheme::paintMediaRewindButton):
(WebCore::RenderTheme::paintMediaReturnToRealtimeButton):
(WebCore::RenderTheme::paintMediaToggleClosedCaptionsButton):
(WebCore::RenderTheme::paintMediaControlsBackground):
(WebCore::RenderTheme::paintMediaCurrentTime):
(WebCore::RenderTheme::paintMediaTimeRemaining):
(WebCore::RenderTheme::paintMediaFullScreenVolumeSliderTrack):
(WebCore::RenderTheme::paintMediaFullScreenVolumeSliderThumb):
(WebCore::RenderTheme::paintSnapshottedPluginOverlay):
(WebCore::RenderTheme::paintImageControlsButton):
* rendering/RenderThemeIOS.h:
* rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::addRoundedBorderClip):
(WebCore::RenderThemeIOS::paintCheckboxDecorations):
(WebCore::RenderThemeIOS::baselinePosition):
(WebCore::RenderThemeIOS::paintRadioDecorations):
(WebCore::RenderThemeIOS::paintTextFieldDecorations):
(WebCore::RenderThemeIOS::paintTextAreaDecorations):
(WebCore::RenderThemeIOS::paintMenuListButtonDecorations):
(WebCore::RenderThemeIOS::paintSliderTrack):
(WebCore::RenderThemeIOS::paintSliderThumbDecorations):
(WebCore::RenderThemeIOS::paintProgressBar):
(WebCore::RenderThemeIOS::paintSearchFieldDecorations):
(WebCore::RenderThemeIOS::paintButtonDecorations):
(WebCore::RenderThemeIOS::paintPushButtonDecorations):
(WebCore::RenderThemeIOS::paintFileUploadIconDecorations):
* rendering/RenderThemeMac.h:
(WebCore::RenderThemeMac::updateActiveState):
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::documentViewFor):
(WebCore::RenderThemeMac::adjustRepaintRect):
(WebCore::RenderThemeMac::convertToPaintingRect):
(WebCore::RenderThemeMac::updateCheckedState):
(WebCore::RenderThemeMac::updateEnabledState):
(WebCore::RenderThemeMac::updateFocusedState):
(WebCore::RenderThemeMac::updatePressedState):
(WebCore::RenderThemeMac::controlSupportsTints):
(WebCore::RenderThemeMac::paintTextField):
(WebCore::RenderThemeMac::paintCapsLockIndicator):
(WebCore::RenderThemeMac::paintTextArea):
(WebCore::RenderThemeMac::paintMenuList):
(WebCore::RenderThemeMac::paintMeter):
(WebCore::RenderThemeMac::progressBarRectForBounds):
(WebCore::RenderThemeMac::paintProgressBar):
(WebCore::RenderThemeMac::paintMenuListButtonGradients):
(WebCore::RenderThemeMac::paintMenuListButtonDecorations):
(WebCore::RenderThemeMac::setPopupButtonCellState):
(WebCore::RenderThemeMac::paintSliderTrack):
(WebCore::RenderThemeMac::paintSliderThumb):
(WebCore::RenderThemeMac::paintSearchField):
(WebCore::RenderThemeMac::setSearchCellState):
(WebCore::RenderThemeMac::paintSearchFieldCancelButton):
(WebCore::RenderThemeMac::paintSearchFieldDecorationPart):
(WebCore::RenderThemeMac::paintSearchFieldResultsDecorationPart):
(WebCore::RenderThemeMac::paintSearchFieldResultsButton):
(WebCore::RenderThemeMac::paintSnapshottedPluginOverlay):
(WebCore::RenderThemeMac::paintImageControlsButton):
(WebCore::RenderThemeMac::imageControlsButtonSize):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementcpp">trunk/Source/WebCore/html/HTMLFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionElementcpp">trunk/Source/WebCore/html/HTMLOptionElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementTypesh">trunk/Source/WebCore/html/shadow/MediaControlElementTypes.h</a></li>
<li><a href="#trunkSourceWebCoreplatformeflRenderThemeEflcpp">trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformeflRenderThemeEflh">trunk/Source/WebCore/platform/efl/RenderThemeEfl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGtkcpp">trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGtkh">trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGtk2cpp">trunk/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGtk3cpp">trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderButtoncpp">trunk/Source/WebCore/rendering/RenderButton.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFileUploadControlcpp">trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadcpp">trunk/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMediaControlscpp">trunk/Source/WebCore/rendering/RenderMediaControls.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMediaControlsh">trunk/Source/WebCore/rendering/RenderMediaControls.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderProgresscpp">trunk/Source/WebCore/rendering/RenderProgress.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlSingleLinecpp">trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp</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="#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="#trunkSourceWebCorerenderingRenderThemeSafaricpp">trunk/Source/WebCore/rendering/RenderThemeSafari.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeSafarih">trunk/Source/WebCore/rendering/RenderThemeSafari.h</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 (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/ChangeLog 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -1,3 +1,172 @@
</span><ins>+2014-04-24 Zalan Bujtas <zalan@apple.com>
+
+ Transition RenderTheme API from RenderObject* to const RenderObject&
+ https://bugs.webkit.org/show_bug.cgi?id=132037
+
+ Reviewed by Andreas Kling.
+
+ Using const references provides better encapsulation and improve security.
+
+ No change in behavior.
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::boundingBoxForQuads):
+ * dom/Element.cpp:
+ (WebCore::Element::setActive):
+ (WebCore::Element::setHovered):
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::focusedOrActiveStateChanged):
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::disabledStateChanged):
+ (WebCore::HTMLFormControlElement::readOnlyAttributeChanged):
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::setChecked):
+ (WebCore::HTMLInputElement::setIndeterminate):
+ * html/HTMLOptionElement.cpp:
+ (WebCore::HTMLOptionElement::parseAttribute):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::addVisualOverflowFromTheme):
+ (WebCore::RenderBlock::baselinePosition):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::paintBoxDecorations):
+ * rendering/RenderButton.cpp:
+ (WebCore::RenderButton::styleDidChange):
+ * rendering/RenderFileUploadControl.cpp:
+ (WebCore::RenderFileUploadControl::paintObject):
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::addRegionsVisualOverflowFromTheme):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::drawLineForBoxSide):
+ * rendering/RenderObject.h:
+ * rendering/RenderProgress.cpp:
+ (WebCore::RenderProgress::computeLogicalHeight):
+ * rendering/RenderTextControlSingleLine.cpp:
+ (WebCore::RenderTextControlSingleLine::paint):
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::paint):
+ (WebCore::RenderTheme::paintBorderOnly):
+ (WebCore::RenderTheme::paintDecorations):
+ (WebCore::RenderTheme::baselinePosition):
+ (WebCore::RenderTheme::adjustRepaintRect):
+ (WebCore::RenderTheme::stateChanged):
+ (WebCore::RenderTheme::updateControlStatesForRenderer):
+ (WebCore::RenderTheme::extractControlStatesForRenderer):
+ (WebCore::RenderTheme::isActive):
+ (WebCore::RenderTheme::isChecked):
+ (WebCore::RenderTheme::isIndeterminate):
+ (WebCore::RenderTheme::isEnabled):
+ (WebCore::RenderTheme::isFocused):
+ (WebCore::RenderTheme::isPressed):
+ (WebCore::RenderTheme::isSpinUpButtonPartPressed):
+ (WebCore::RenderTheme::isReadOnlyControl):
+ (WebCore::RenderTheme::isHovered):
+ (WebCore::RenderTheme::isSpinUpButtonPartHovered):
+ (WebCore::RenderTheme::isDefault):
+ (WebCore::RenderTheme::paintInputFieldSpeechButton):
+ (WebCore::RenderTheme::paintMeter):
+ (WebCore::RenderTheme::paintSliderTicks):
+ (WebCore::RenderTheme::progressBarRectForBounds):
+ * rendering/RenderTheme.h:
+ (WebCore::RenderTheme::controlSupportsTints):
+ (WebCore::RenderTheme::paintCapsLockIndicator):
+ (WebCore::RenderTheme::paintFileUploadIconDecorations):
+ (WebCore::RenderTheme::imageControlsButtonSize):
+ (WebCore::RenderTheme::paintCheckbox):
+ (WebCore::RenderTheme::paintRadio):
+ (WebCore::RenderTheme::paintButton):
+ (WebCore::RenderTheme::paintInnerSpinButton):
+ (WebCore::RenderTheme::paintCheckboxDecorations):
+ (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):
+ (WebCore::RenderTheme::paintMediaMuteButton):
+ (WebCore::RenderTheme::paintMediaSeekBackButton):
+ (WebCore::RenderTheme::paintMediaSeekForwardButton):
+ (WebCore::RenderTheme::paintMediaSliderTrack):
+ (WebCore::RenderTheme::paintMediaSliderThumb):
+ (WebCore::RenderTheme::paintMediaVolumeSliderContainer):
+ (WebCore::RenderTheme::paintMediaVolumeSliderTrack):
+ (WebCore::RenderTheme::paintMediaVolumeSliderThumb):
+ (WebCore::RenderTheme::paintMediaRewindButton):
+ (WebCore::RenderTheme::paintMediaReturnToRealtimeButton):
+ (WebCore::RenderTheme::paintMediaToggleClosedCaptionsButton):
+ (WebCore::RenderTheme::paintMediaControlsBackground):
+ (WebCore::RenderTheme::paintMediaCurrentTime):
+ (WebCore::RenderTheme::paintMediaTimeRemaining):
+ (WebCore::RenderTheme::paintMediaFullScreenVolumeSliderTrack):
+ (WebCore::RenderTheme::paintMediaFullScreenVolumeSliderThumb):
+ (WebCore::RenderTheme::paintSnapshottedPluginOverlay):
+ (WebCore::RenderTheme::paintImageControlsButton):
+ * rendering/RenderThemeIOS.h:
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::RenderThemeIOS::addRoundedBorderClip):
+ (WebCore::RenderThemeIOS::paintCheckboxDecorations):
+ (WebCore::RenderThemeIOS::baselinePosition):
+ (WebCore::RenderThemeIOS::paintRadioDecorations):
+ (WebCore::RenderThemeIOS::paintTextFieldDecorations):
+ (WebCore::RenderThemeIOS::paintTextAreaDecorations):
+ (WebCore::RenderThemeIOS::paintMenuListButtonDecorations):
+ (WebCore::RenderThemeIOS::paintSliderTrack):
+ (WebCore::RenderThemeIOS::paintSliderThumbDecorations):
+ (WebCore::RenderThemeIOS::paintProgressBar):
+ (WebCore::RenderThemeIOS::paintSearchFieldDecorations):
+ (WebCore::RenderThemeIOS::paintButtonDecorations):
+ (WebCore::RenderThemeIOS::paintPushButtonDecorations):
+ (WebCore::RenderThemeIOS::paintFileUploadIconDecorations):
+ * rendering/RenderThemeMac.h:
+ (WebCore::RenderThemeMac::updateActiveState):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::documentViewFor):
+ (WebCore::RenderThemeMac::adjustRepaintRect):
+ (WebCore::RenderThemeMac::convertToPaintingRect):
+ (WebCore::RenderThemeMac::updateCheckedState):
+ (WebCore::RenderThemeMac::updateEnabledState):
+ (WebCore::RenderThemeMac::updateFocusedState):
+ (WebCore::RenderThemeMac::updatePressedState):
+ (WebCore::RenderThemeMac::controlSupportsTints):
+ (WebCore::RenderThemeMac::paintTextField):
+ (WebCore::RenderThemeMac::paintCapsLockIndicator):
+ (WebCore::RenderThemeMac::paintTextArea):
+ (WebCore::RenderThemeMac::paintMenuList):
+ (WebCore::RenderThemeMac::paintMeter):
+ (WebCore::RenderThemeMac::progressBarRectForBounds):
+ (WebCore::RenderThemeMac::paintProgressBar):
+ (WebCore::RenderThemeMac::paintMenuListButtonGradients):
+ (WebCore::RenderThemeMac::paintMenuListButtonDecorations):
+ (WebCore::RenderThemeMac::setPopupButtonCellState):
+ (WebCore::RenderThemeMac::paintSliderTrack):
+ (WebCore::RenderThemeMac::paintSliderThumb):
+ (WebCore::RenderThemeMac::paintSearchField):
+ (WebCore::RenderThemeMac::setSearchCellState):
+ (WebCore::RenderThemeMac::paintSearchFieldCancelButton):
+ (WebCore::RenderThemeMac::paintSearchFieldDecorationPart):
+ (WebCore::RenderThemeMac::paintSearchFieldResultsDecorationPart):
+ (WebCore::RenderThemeMac::paintSearchFieldResultsButton):
+ (WebCore::RenderThemeMac::paintSnapshottedPluginOverlay):
+ (WebCore::RenderThemeMac::paintImageControlsButton):
+ (WebCore::RenderThemeMac::imageControlsButtonSize):
+
</ins><span class="cx"> 2014-04-23 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] HTML Media capture attribute is a boolean since r163958
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx"> IntRect r = quad.enclosingBoundingBox();
</span><span class="cx"> if (!r.isEmpty()) {
</span><span class="cx"> if (obj->style().hasAppearance())
</span><del>- obj->theme().adjustRepaintRect(obj, r);
</del><ins>+ obj->theme().adjustRepaintRect(*obj, r);
</ins><span class="cx"> result.unite(r);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -488,7 +488,7 @@
</span><span class="cx"> if (reactsToPress)
</span><span class="cx"> setNeedsStyleRecalc();
</span><span class="cx">
</span><del>- if (renderer()->style().hasAppearance() && renderer()->theme().stateChanged(renderer(), ControlStates::PressedState))
</del><ins>+ if (renderer()->style().hasAppearance() && renderer()->theme().stateChanged(*renderer(), ControlStates::PressedState))
</ins><span class="cx"> reactsToPress = true;
</span><span class="cx">
</span><span class="cx"> // The rest of this function implements a feature that only works if the
</span><span class="lines">@@ -554,7 +554,7 @@
</span><span class="cx"> setNeedsStyleRecalc();
</span><span class="cx">
</span><span class="cx"> if (renderer()->style().hasAppearance())
</span><del>- renderer()->theme().stateChanged(renderer(), ControlStates::HoverState);
</del><ins>+ renderer()->theme().stateChanged(*renderer(), ControlStates::HoverState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::scrollIntoView(bool alignToTop)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -1749,7 +1749,7 @@
</span><span class="cx"> element->setNeedsStyleRecalc();
</span><span class="cx"> if (RenderObject* renderer = element->renderer())
</span><span class="cx"> if (renderer && renderer->style().hasAppearance())
</span><del>- renderer->theme().stateChanged(renderer, ControlStates::FocusState);
</del><ins>+ renderer->theme().stateChanged(*renderer, ControlStates::FocusState);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> setNeedsWillValidateCheck();
</span><span class="cx"> didAffectSelector(AffectedSelectorDisabled | AffectedSelectorEnabled);
</span><span class="cx"> if (renderer() && renderer()->style().hasAppearance())
</span><del>- renderer()->theme().stateChanged(renderer(), ControlStates::EnabledState);
</del><ins>+ renderer()->theme().stateChanged(*renderer(), ControlStates::EnabledState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLFormControlElement::readOnlyAttributeChanged()
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> setNeedsWillValidateCheck();
</span><span class="cx"> setNeedsStyleRecalc();
</span><span class="cx"> if (renderer() && renderer()->style().hasAppearance())
</span><del>- renderer()->theme().stateChanged(renderer(), ControlStates::ReadOnlyState);
</del><ins>+ renderer()->theme().stateChanged(*renderer(), ControlStates::ReadOnlyState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLFormControlElement::requiredAttributeChanged()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -858,7 +858,7 @@
</span><span class="cx"> if (CheckedRadioButtons* buttons = checkedRadioButtons())
</span><span class="cx"> buttons->updateCheckedState(this);
</span><span class="cx"> if (renderer() && renderer()->style().hasAppearance())
</span><del>- renderer()->theme().stateChanged(renderer(), ControlStates::CheckedState);
</del><ins>+ renderer()->theme().stateChanged(*renderer(), ControlStates::CheckedState);
</ins><span class="cx"> setNeedsValidityCheck();
</span><span class="cx">
</span><span class="cx"> // Ideally we'd do this from the render tree (matching
</span><span class="lines">@@ -892,7 +892,7 @@
</span><span class="cx"> didAffectSelector(AffectedSelectorIndeterminate);
</span><span class="cx">
</span><span class="cx"> if (renderer() && renderer()->style().hasAppearance())
</span><del>- renderer()->theme().stateChanged(renderer(), ControlStates::CheckedState);
</del><ins>+ renderer()->theme().stateChanged(*renderer(), ControlStates::CheckedState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int HTMLInputElement::size() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionElement.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionElement.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/html/HTMLOptionElement.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> if (oldDisabled != m_disabled) {
</span><span class="cx"> didAffectSelector(AffectedSelectorDisabled | AffectedSelectorEnabled);
</span><span class="cx"> if (renderer() && renderer()->style().hasAppearance())
</span><del>- renderer()->theme().stateChanged(renderer(), ControlStates::EnabledState);
</del><ins>+ renderer()->theme().stateChanged(*renderer(), ControlStates::EnabledState);
</ins><span class="cx"> }
</span><span class="cx"> } else if (name == selectedAttr) {
</span><span class="cx"> // FIXME: This doesn't match what the HTML specification says.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElementTypes.h (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElementTypes.h 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/html/shadow/MediaControlElementTypes.h 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> HTMLMediaElement* parentMediaElement(Node*);
</span><del>-inline HTMLMediaElement* parentMediaElement(RenderObject& renderer) { return parentMediaElement(renderer.node()); }
</del><ins>+inline HTMLMediaElement* parentMediaElement(const RenderObject& renderer) { return parentMediaElement(renderer.node()); }
</ins><span class="cx">
</span><span class="cx"> MediaControlElementType mediaControlElementType(Node*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflRenderThemeEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -299,13 +299,13 @@
</span><span class="cx"> edje_object_signal_emit(object, "styled", "");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeEfl::applyEdjeRTLState(Evas_Object* edje, RenderObject* object, FormType type, const IntRect& rect)
</del><ins>+void RenderThemeEfl::applyEdjeRTLState(Evas_Object* edje, const RenderObject& object, FormType type, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> if (type == SliderVertical || type == SliderHorizontal) {
</span><del>- if (!object->isSlider())
</del><ins>+ if (!object.isSlider())
</ins><span class="cx"> return; // probably have -webkit-appearance: slider..
</span><span class="cx">
</span><del>- RenderSlider* renderSlider = toRenderSlider(object);
</del><ins>+ const RenderSlider* renderSlider = toRenderSlider(&object);
</ins><span class="cx"> HTMLInputElement& input = renderSlider->element();
</span><span class="cx"> double valueRange = input.maximum() - input.minimum();
</span><span class="cx">
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> // grows from the end of the slider or from the beginning. On vertical
</span><span class="cx"> // sliders, it should always be the same and will not be affected by
</span><span class="cx"> // text direction settings.
</span><del>- if (object->style().direction() == RTL || type == SliderVertical)
</del><ins>+ if (object.style().direction() == RTL || type == SliderVertical)
</ins><span class="cx"> msg->val[0] = 1;
</span><span class="cx"> else
</span><span class="cx"> msg->val[0] = 0;
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> edje_object_message_send(edje, EDJE_MESSAGE_FLOAT_SET, 0, msg.get());
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><span class="cx"> } else if (type == ProgressBar) {
</span><del>- RenderProgress* renderProgress = toRenderProgress(object);
</del><ins>+ const RenderProgress* renderProgress = toRenderProgress(&object);
</ins><span class="cx">
</span><span class="cx"> int max = rect.width();
</span><span class="cx"> double value = renderProgress->position();
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> OwnPtr<Edje_Message_Float_Set> msg = adoptPtr(static_cast<Edje_Message_Float_Set*>(::operator new (sizeof(Edje_Message_Float_Set) + sizeof(double))));
</span><span class="cx"> msg->count = 2;
</span><span class="cx">
</span><del>- if (object->style().direction() == RTL)
</del><ins>+ if (object.style().direction() == RTL)
</ins><span class="cx"> msg->val[0] = (1.0 - value) * max;
</span><span class="cx"> else
</span><span class="cx"> msg->val[0] = 0;
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> return RenderTheme::isControlStyled(style, border, background, backgroundColor) || style->appearance() == MenulistButtonPart;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintThemePart(RenderObject* object, FormType type, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintThemePart(const RenderObject& object, FormType type, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> loadThemeIfNeeded();
</span><span class="cx"> _ASSERT_ON_RELEASE_RETURN_VAL(edje(), false, "Could not paint native HTML part due to missing theme.");
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx"> if (!entry)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- bool haveBackgroundColor = isControlStyled(&object->style(), object->style().border(), *object->style().backgroundLayers(), Color::white);
</del><ins>+ bool haveBackgroundColor = isControlStyled(&object.style(), object.style().border(), *object.style().backgroundLayers(), Color::white);
</ins><span class="cx"> ControlStates states(extractControlStatesForRenderer(object));
</span><span class="cx"> applyEdjeStateFromForm(entry->edje(), &states, haveBackgroundColor);
</span><span class="cx">
</span><span class="lines">@@ -631,19 +631,19 @@
</span><span class="cx"> return supportsFocus(style->appearance());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::controlSupportsTints(const RenderObject* object) const
</del><ins>+bool RenderThemeEfl::controlSupportsTints(const RenderObject& object) const
</ins><span class="cx"> {
</span><span class="cx"> return isEnabled(object);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderThemeEfl::baselinePosition(const RenderObject* object) const
</del><ins>+int RenderThemeEfl::baselinePosition(const RenderObject& object) const
</ins><span class="cx"> {
</span><del>- if (!object->isBox())
</del><ins>+ if (!object.isBox())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><del>- if (object->style().appearance() == CheckboxPart
- || object->style().appearance() == RadioPart)
- return toRenderBox(object)->marginTop() + toRenderBox(object)->height() - 3;
</del><ins>+ if (object.style().appearance() == CheckboxPart
+ || object.style().appearance() == RadioPart)
+ return toRenderBox(&object)->marginTop() + toRenderBox(&object)->height() - 3;
</ins><span class="cx">
</span><span class="cx"> return RenderTheme::baselinePosition(object);
</span><span class="cx"> }
</span><span class="lines">@@ -684,9 +684,9 @@
</span><span class="cx"> return m_supportsSelectionForegroundColor;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintSliderTrack(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- if (object->style().appearance() == SliderHorizontalPart)
</del><ins>+ if (object.style().appearance() == SliderHorizontalPart)
</ins><span class="cx"> paintThemePart(object, SliderHorizontal, info, rect);
</span><span class="cx"> else
</span><span class="cx"> paintThemePart(object, SliderVertical, info, rect);
</span><span class="lines">@@ -755,9 +755,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintSliderThumb(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- if (object->style().appearance() == SliderThumbHorizontalPart)
</del><ins>+ if (object.style().appearance() == SliderThumbHorizontalPart)
</ins><span class="cx"> paintThemePart(object, SliderThumbHorizontal, info, rect);
</span><span class="cx"> else
</span><span class="cx"> paintThemePart(object, SliderThumbVertical, info, rect);
</span><span class="lines">@@ -783,7 +783,7 @@
</span><span class="cx"> style->setHeight(desc->min.height());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintCheckbox(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintCheckbox(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintThemePart(object, CheckBox, info, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -806,7 +806,7 @@
</span><span class="cx"> style->setHeight(desc->min.height());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintRadio(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintRadio(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintThemePart(object, RadioButton, info, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -823,7 +823,7 @@
</span><span class="cx"> adjustSizeConstraints(style, Button);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintButton(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintThemePart(object, Button, info, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -841,7 +841,7 @@
</span><span class="cx"> style->setLineHeight(RenderStyle::initialLineHeight());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintMenuList(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintMenuList(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintThemePart(object, ComboBox, info, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -862,7 +862,7 @@
</span><span class="cx"> adjustMenuListStyle(styleResolver, style, element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintMenuListButtonDecorations(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintMenuListButtonDecorations(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintMenuList(object, info, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -877,7 +877,7 @@
</span><span class="cx"> style->resetBorder();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintTextField(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintTextField(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintThemePart(object, TextField, info, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -886,7 +886,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintTextArea(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintTextArea(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintTextField(object, info, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -908,7 +908,7 @@
</span><span class="cx"> style->setHeight(Length(decorationSize, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintSearchFieldResultsButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintSearchFieldResultsButton(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintThemePart(object, SearchFieldResultsButton, info, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -930,7 +930,7 @@
</span><span class="cx"> style->setHeight(Length(decorationSize, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintSearchFieldResultsDecorationPart(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintSearchFieldResultsDecorationPart(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintThemePart(object, SearchFieldResultsDecoration, info, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -954,7 +954,7 @@
</span><span class="cx"> style->setHeight(Length(cancelButtonSize, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintSearchFieldCancelButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintSearchFieldCancelButton(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintThemePart(object, SearchFieldCancelButton, info, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -970,7 +970,7 @@
</span><span class="cx"> style->setWhiteSpace(PRE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintSearchField(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintSearchField(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintThemePart(object, SearchField, info, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -984,7 +984,7 @@
</span><span class="cx"> adjustSizeConstraints(style, Spinner);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintInnerSpinButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintInnerSpinButton(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintThemePart(object, Spinner, info, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -1022,9 +1022,9 @@
</span><span class="cx"> return progressAnimationInterval * progressAnimationFrames * 2; // "2" for back and forth;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintProgressBar(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintProgressBar(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- if (!object->isProgress())
</del><ins>+ if (!object.isProgress())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return paintThemePart(object, ProgressBar, info, rect);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflRenderThemeEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.h (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.h 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.h 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> virtual bool supportsFocusRing(const RenderStyle*) const;
</span><span class="cx">
</span><span class="cx"> // A method asking if the control changes its tint when the window has focus or not.
</span><del>- virtual bool controlSupportsTints(const RenderObject*) const;
</del><ins>+ virtual bool controlSupportsTints(const RenderObject&) const;
</ins><span class="cx">
</span><span class="cx"> // A general method asking if any control tinting is supported at all.
</span><span class="cx"> virtual bool supportsControlTints() const { return true; }
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> // A method to obtain the baseline position for a "leaf" control. This will only be used if a baseline
</span><span class="cx"> // position cannot be determined by examining child content. Checkboxes and radio buttons are examples of
</span><span class="cx"> // controls that need to do this.
</span><del>- virtual int baselinePosition(const RenderObject*) const;
</del><ins>+ virtual int baselinePosition(const RenderObject&) const;
</ins><span class="cx">
</span><span class="cx"> virtual Color platformActiveSelectionBackgroundColor() const;
</span><span class="cx"> virtual Color platformInactiveSelectionBackgroundColor() const;
</span><span class="lines">@@ -111,40 +111,40 @@
</span><span class="cx"> virtual void systemFont(CSSValueID, FontDescription&) const;
</span><span class="cx">
</span><span class="cx"> virtual void adjustCheckboxStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintCheckbox(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustRadioStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintRadio(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustTextFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintTextField(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustTextAreaStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintTextArea(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldResultsDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchField(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldResultsButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSliderThumbStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><span class="lines">@@ -158,16 +158,16 @@
</span><span class="cx">
</span><span class="cx"> virtual bool supportsDataListUI(const AtomicString&) const override;
</span><span class="cx">
</span><del>- virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintInnerSpinButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintInnerSpinButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> static void setDefaultFontSize(int fontsize);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><span class="cx"> virtual void adjustProgressBarStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const;
</span><span class="cx"> virtual double animationDurationForProgressBar(RenderProgress*) const;
</span><span class="cx"> #endif
</span><span class="lines">@@ -200,8 +200,8 @@
</span><span class="cx"> void applyPartDescriptionsFrom(const String& themePath);
</span><span class="cx">
</span><span class="cx"> void applyEdjeStateFromForm(Evas_Object*, const ControlStates*, bool);
</span><del>- void applyEdjeRTLState(Evas_Object*, RenderObject*, FormType, const IntRect&);
- bool paintThemePart(RenderObject*, FormType, const PaintInfo&, const IntRect&);
</del><ins>+ void applyEdjeRTLState(Evas_Object*, const RenderObject&, FormType, const IntRect&);
+ bool paintThemePart(const RenderObject&, FormType, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> Page* m_page;
</span><span class="cx"> Color m_activeSelectionBackgroundColor;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -65,9 +65,9 @@
</span><span class="cx"> extern GRefPtr<GdkPixbuf> getStockSymbolicIconForWidgetType(GType widgetType, const char* symbolicIconName, const char* fallbackStockIconName, gint direction, gint state, gint iconSize);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>-static HTMLMediaElement* getMediaElementFromRenderObject(RenderObject* o)
</del><ins>+static HTMLMediaElement* getMediaElementFromRenderObject(const RenderObject& o)
</ins><span class="cx"> {
</span><del>- Node* node = o->node();
</del><ins>+ Node* node = o.node();
</ins><span class="cx"> Node* mediaNode = node ? node->shadowHost() : 0;
</span><span class="cx"> if (!mediaNode)
</span><span class="cx"> mediaNode = node;
</span><span class="lines">@@ -173,20 +173,20 @@
</span><span class="cx"> return supportsFocus(style->appearance());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::controlSupportsTints(const RenderObject* o) const
</del><ins>+bool RenderThemeGtk::controlSupportsTints(const RenderObject& o) const
</ins><span class="cx"> {
</span><span class="cx"> return isEnabled(o);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderThemeGtk::baselinePosition(const RenderObject* o) const
</del><ins>+int RenderThemeGtk::baselinePosition(const RenderObject& o) const
</ins><span class="cx"> {
</span><del>- if (!o->isBox())
</del><ins>+ if (!o.isBox())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // FIXME: This strategy is possibly incorrect for the GTK+ port.
</span><del>- if (o->style().appearance() == CheckboxPart
- || o->style().appearance() == RadioPart) {
- const RenderBox* box = toRenderBox(o);
</del><ins>+ if (o.style().appearance() == CheckboxPart
+ || o.style().appearance() == RadioPart) {
+ const RenderBox* box = toRenderBox(&o);
</ins><span class="cx"> return box->marginTop() + box->height() - 2;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static GtkStateType gtkIconState(RenderTheme* theme, RenderObject* renderObject)
</del><ins>+static GtkStateType gtkIconState(RenderTheme* theme, const RenderObject& renderObject)
</ins><span class="cx"> {
</span><span class="cx"> if (!theme->isEnabled(renderObject))
</span><span class="cx"> return GTK_STATE_INSENSITIVE;
</span><span class="lines">@@ -241,12 +241,12 @@
</span><span class="cx"> adjustMenuListStyle(styleResolver, style, e);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMenuListButtonDecorations(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintMenuListButtonDecorations(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintMenuList(object, info, rect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintTextArea(RenderObject* o, const PaintInfo& i, const IntRect& r)
</del><ins>+bool RenderThemeGtk::paintTextArea(const RenderObject& o, const PaintInfo& i, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> return paintTextField(o, i, r);
</span><span class="cx"> }
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> adjustSearchFieldCancelButtonStyle(styleResolver, style, e);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintSearchFieldResultsButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintSearchFieldResultsButton(const RenderObject& o, const PaintInfo& i, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintSearchFieldResultsDecorationPart(o, i, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -326,12 +326,12 @@
</span><span class="cx"> adjustSearchFieldIconStyle(style);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static IntRect centerRectVerticallyInParentInputElement(RenderObject* renderObject, const IntRect& rect)
</del><ins>+static IntRect centerRectVerticallyInParentInputElement(const RenderObject& renderObject, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> // Get the renderer of <input> element.
</span><del>- Node* input = renderObject->node()->shadowHost();
</del><ins>+ Node* input = renderObject.node()->shadowHost();
</ins><span class="cx"> if (!input)
</span><del>- input = renderObject->node();
</del><ins>+ input = renderObject.node();
</ins><span class="cx"> if (!input->renderer()->isBox())
</span><span class="cx"> return IntRect();
</span><span class="cx">
</span><span class="lines">@@ -346,16 +346,16 @@
</span><span class="cx"> return scaledRect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintSearchFieldResultsDecorationPart(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintSearchFieldResultsDecorationPart(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> IntRect iconRect = centerRectVerticallyInParentInputElement(renderObject, rect);
</span><span class="cx"> if (iconRect.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> GRefPtr<GdkPixbuf> icon = getStockIconForWidgetType(GTK_TYPE_ENTRY, GTK_STOCK_FIND,
</span><del>- gtkTextDirection(renderObject->style().direction()),
- gtkIconState(this, renderObject),
- getIconSizeForPixelSize(rect.height()));
</del><ins>+ gtkTextDirection(renderObject.style().direction()),
+ gtkIconState(this, renderObject),
+ getIconSizeForPixelSize(rect.height()));
</ins><span class="cx"> paintGdkPixbuf(paintInfo.context, icon.get(), iconRect);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -365,16 +365,16 @@
</span><span class="cx"> adjustSearchFieldIconStyle(style);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintSearchFieldCancelButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintSearchFieldCancelButton(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> IntRect iconRect = centerRectVerticallyInParentInputElement(renderObject, rect);
</span><span class="cx"> if (iconRect.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> GRefPtr<GdkPixbuf> icon = getStockIconForWidgetType(GTK_TYPE_ENTRY, GTK_STOCK_CLEAR,
</span><del>- gtkTextDirection(renderObject->style().direction()),
- gtkIconState(this, renderObject),
- getIconSizeForPixelSize(rect.height()));
</del><ins>+ gtkTextDirection(renderObject.style().direction()),
+ gtkIconState(this, renderObject),
+ getIconSizeForPixelSize(rect.height()));
</ins><span class="cx"> paintGdkPixbuf(paintInfo.context, icon.get(), iconRect);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -386,12 +386,12 @@
</span><span class="cx"> style->setLineHeight(RenderStyle::initialLineHeight());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintSearchField(RenderObject* o, const PaintInfo& i, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintSearchField(const RenderObject& o, const PaintInfo& i, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintTextField(o, i, rect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintCapsLockIndicator(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintCapsLockIndicator(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> // The other paint methods don't need to check whether painting is disabled because RenderTheme already checks it
</span><span class="cx"> // before calling them, but paintCapsLockIndicator() is called by RenderTextControlSingleLine which doesn't check it.
</span><span class="lines">@@ -399,9 +399,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> int iconSize = std::min(rect.width(), rect.height());
</span><del>- GRefPtr<GdkPixbuf> icon = getStockIconForWidgetType(GTK_TYPE_ENTRY, GTK_STOCK_CAPS_LOCK_WARNING,
- gtkTextDirection(renderObject->style().direction()),
- 0, getIconSizeForPixelSize(iconSize));
</del><ins>+ GRefPtr<GdkPixbuf> icon = getStockIconForWidgetType(GTK_TYPE_ENTRY, GTK_STOCK_CAPS_LOCK_WARNING, gtkTextDirection(renderObject.style().direction()), 0, getIconSizeForPixelSize(iconSize));
</ins><span class="cx">
</span><span class="cx"> // Only re-scale the icon when it's smaller than the minimum icon size.
</span><span class="cx"> if (iconSize >= gtkIconSizeMenu)
</span><span class="lines">@@ -505,13 +503,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMediaButton(RenderObject* renderObject, GraphicsContext* context, const IntRect& rect, const char* symbolicIconName, const char* fallbackStockIconName)
</del><ins>+bool RenderThemeGtk::paintMediaButton(const RenderObject& renderObject, GraphicsContext* context, const IntRect& rect, const char* symbolicIconName, const char* fallbackStockIconName)
</ins><span class="cx"> {
</span><span class="cx"> IntRect iconRect(rect.x() + (rect.width() - m_mediaIconSize) / 2,
</span><span class="cx"> rect.y() + (rect.height() - m_mediaIconSize) / 2,
</span><span class="cx"> m_mediaIconSize, m_mediaIconSize);
</span><span class="cx"> GRefPtr<GdkPixbuf> icon = getStockSymbolicIconForWidgetType(GTK_TYPE_CONTAINER, symbolicIconName, fallbackStockIconName,
</span><del>- gtkTextDirection(renderObject->style().direction()), gtkIconState(this, renderObject), iconRect.width());
</del><ins>+ gtkTextDirection(renderObject.style().direction()), gtkIconState(this, renderObject), iconRect.width());
</ins><span class="cx"> paintGdkPixbuf(context, icon.get(), iconRect);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -521,12 +519,12 @@
</span><span class="cx"> return (part != MediaMuteButtonPart);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMediaFullscreenButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintMediaFullscreenButton(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintMediaButton(renderObject, paintInfo.context, rect, "view-fullscreen-symbolic", GTK_STOCK_FULLSCREEN);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMediaMuteButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintMediaMuteButton(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> HTMLMediaElement* mediaElement = getMediaElementFromRenderObject(renderObject);
</span><span class="cx"> if (!mediaElement)
</span><span class="lines">@@ -538,9 +536,9 @@
</span><span class="cx"> muted ? "audio-volume-muted" : "audio-volume-high");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMediaPlayButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintMediaPlayButton(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- Node* node = renderObject->node();
</del><ins>+ Node* node = renderObject.node();
</ins><span class="cx"> if (!node)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -553,26 +551,26 @@
</span><span class="cx"> showPlayButton ? GTK_STOCK_MEDIA_PLAY : GTK_STOCK_MEDIA_PAUSE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMediaSeekBackButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintMediaSeekBackButton(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintMediaButton(renderObject, paintInfo.context, rect, "media-seek-backward-symbolic", GTK_STOCK_MEDIA_REWIND);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMediaSeekForwardButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintMediaSeekForwardButton(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintMediaButton(renderObject, paintInfo.context, rect, "media-seek-forward-symbolic", GTK_STOCK_MEDIA_FORWARD);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>-bool RenderThemeGtk::paintMediaToggleClosedCaptionsButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintMediaToggleClosedCaptionsButton(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> IntRect iconRect(rect.x() + (rect.width() - m_mediaIconSize) / 2, rect.y() + (rect.height() - m_mediaIconSize) / 2,
</span><span class="cx"> m_mediaIconSize, m_mediaIconSize);
</span><span class="cx"> GRefPtr<GdkPixbuf> icon = getStockSymbolicIconForWidgetType(GTK_TYPE_CONTAINER, "media-view-subtitles-symbolic", nullptr,
</span><del>- gtkTextDirection(renderObject->style().direction()), gtkIconState(this, renderObject), iconRect.width());
</del><ins>+ gtkTextDirection(renderObject.style().direction()), gtkIconState(this, renderObject), iconRect.width());
</ins><span class="cx"> if (!icon)
</span><span class="cx"> icon = getStockSymbolicIconForWidgetType(GTK_TYPE_CONTAINER, "user-invisible-symbolic", GTK_STOCK_JUSTIFY_FILL,
</span><del>- gtkTextDirection(renderObject->style().direction()), gtkIconState(this, renderObject), iconRect.width());
</del><ins>+ gtkTextDirection(renderObject.style().direction()), gtkIconState(this, renderObject), iconRect.width());
</ins><span class="cx"> paintGdkPixbuf(paintInfo.context, icon.get(), iconRect);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -587,9 +585,9 @@
</span><span class="cx"> IntSize(style->borderBottomRightRadius().width().intValue(), style->borderBottomRightRadius().height().intValue()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMediaSliderTrack(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeGtk::paintMediaSliderTrack(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><del>- HTMLMediaElement* mediaElement = parentMediaElement(*o);
</del><ins>+ HTMLMediaElement* mediaElement = parentMediaElement(o);
</ins><span class="cx"> if (!mediaElement)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -599,7 +597,7 @@
</span><span class="cx">
</span><span class="cx"> float mediaDuration = mediaElement->duration();
</span><span class="cx"> float totalTrackWidth = r.width();
</span><del>- RenderStyle* style = &o->style();
</del><ins>+ RenderStyle* style = &o.style();
</ins><span class="cx"> RefPtr<TimeRanges> timeRanges = mediaElement->buffered();
</span><span class="cx"> for (unsigned index = 0; index < timeRanges->length(); ++index) {
</span><span class="cx"> float start = timeRanges->start(index, IGNORE_EXCEPTION);
</span><span class="lines">@@ -620,21 +618,21 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMediaSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeGtk::paintMediaSliderThumb(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><del>- RenderStyle* style = &o->style();
</del><ins>+ RenderStyle* style = &o.style();
</ins><span class="cx"> paintInfo.context->fillRoundedRect(FloatRoundedRect(r, borderRadiiFromStyle(style)), style->visitedDependentColor(CSSPropertyColor), style->colorSpace());
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&)
</del><ins>+bool RenderThemeGtk::paintMediaVolumeSliderContainer(const RenderObject&, const PaintInfo&, const IntRect&)
</ins><span class="cx"> {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMediaVolumeSliderTrack(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintMediaVolumeSliderTrack(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- HTMLMediaElement* mediaElement = parentMediaElement(*renderObject);
</del><ins>+ HTMLMediaElement* mediaElement = parentMediaElement(renderObject);
</ins><span class="cx"> if (!mediaElement)
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -648,7 +646,7 @@
</span><span class="cx">
</span><span class="cx"> int rectHeight = rect.height();
</span><span class="cx"> float trackHeight = rectHeight * volume;
</span><del>- RenderStyle* style = &renderObject->style();
</del><ins>+ RenderStyle* style = &renderObject.style();
</ins><span class="cx"> IntRect volumeRect(rect);
</span><span class="cx"> volumeRect.move(0, rectHeight - trackHeight);
</span><span class="cx"> volumeRect.setHeight(ceil(trackHeight));
</span><span class="lines">@@ -660,7 +658,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMediaVolumeSliderThumb(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintMediaVolumeSliderThumb(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintMediaSliderThumb(renderObject, paintInfo, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -670,7 +668,7 @@
</span><span class="cx"> return formatMediaControlsTime(currentTime) + " / " + formatMediaControlsTime(duration);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMediaCurrentTime(RenderObject*, const PaintInfo&, const IntRect&)
</del><ins>+bool RenderThemeGtk::paintMediaCurrentTime(const RenderObject&, const PaintInfo&, const IntRect&)
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -696,13 +694,13 @@
</span><span class="cx"> return progressAnimationInterval * progressAnimationFrames * 2; // "2" for back and forth;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect RenderThemeGtk::calculateProgressRect(RenderObject* renderObject, const IntRect& fullBarRect)
</del><ins>+IntRect RenderThemeGtk::calculateProgressRect(const RenderObject& renderObject, const IntRect& fullBarRect)
</ins><span class="cx"> {
</span><span class="cx"> IntRect progressRect(fullBarRect);
</span><del>- RenderProgress* renderProgress = toRenderProgress(renderObject);
</del><ins>+ const RenderProgress* renderProgress = toRenderProgress(&renderObject);
</ins><span class="cx"> if (renderProgress->isDeterminate()) {
</span><span class="cx"> int progressWidth = progressRect.width() * renderProgress->position();
</span><del>- if (renderObject->style().direction() == RTL)
</del><ins>+ if (renderObject.style().direction() == RTL)
</ins><span class="cx"> progressRect.setX(progressRect.x() + progressRect.width() - progressWidth);
</span><span class="cx"> progressRect.setWidth(progressWidth);
</span><span class="cx"> return progressRect;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -50,17 +50,17 @@
</span><span class="cx"> virtual bool supportsFocusRing(const RenderStyle*) const;
</span><span class="cx">
</span><span class="cx"> // A method asking if the control changes its tint when the window has focus or not.
</span><del>- virtual bool controlSupportsTints(const RenderObject*) const;
</del><ins>+ virtual bool controlSupportsTints(const RenderObject&) const;
</ins><span class="cx">
</span><span class="cx"> // A general method asking if any control tinting is supported at all.
</span><span class="cx"> virtual bool supportsControlTints() const { return true; }
</span><span class="cx">
</span><del>- virtual void adjustRepaintRect(const RenderObject*, IntRect&);
</del><ins>+ virtual void adjustRepaintRect(const RenderObject&, IntRect&);
</ins><span class="cx">
</span><span class="cx"> // A method to obtain the baseline position for a "leaf" control. This will only be used if a baseline
</span><span class="cx"> // position cannot be determined by examining child content. Checkboxes and radio buttons are examples of
</span><span class="cx"> // controls that need to do this.
</span><del>- virtual int baselinePosition(const RenderObject*) const;
</del><ins>+ virtual int baselinePosition(const RenderObject&) const;
</ins><span class="cx">
</span><span class="cx"> // The platform selection color.
</span><span class="cx"> virtual Color platformActiveSelectionBackgroundColor() const;
</span><span class="lines">@@ -114,17 +114,17 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual bool paintCheckbox(RenderObject* o, const PaintInfo& i, const IntRect& r);
</del><ins>+ virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void setCheckboxSize(RenderStyle* style) const;
</span><span class="cx">
</span><del>- virtual bool paintRadio(RenderObject* o, const PaintInfo& i, const IntRect& r);
</del><ins>+ virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void setRadioSize(RenderStyle* style) const;
</span><span class="cx">
</span><span class="cx"> virtual void adjustButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><del>- virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintTextArea(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintTextField(const RenderObject&, const PaintInfo&, const IntRect&);
+ virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> int popupInternalPaddingLeft(RenderStyle*) const;
</span><span class="cx"> int popupInternalPaddingRight(RenderStyle*) const;
</span><span class="lines">@@ -137,25 +137,25 @@
</span><span class="cx"> // we don't maintain this differentiation.
</span><span class="cx"> virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&);
+ virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldResultsDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchField(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldResultsButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><del>- virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustSliderThumbStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><span class="cx"> virtual void adjustSliderThumbSize(RenderStyle*, Element*) const;
</span><span class="lines">@@ -164,19 +164,19 @@
</span><span class="cx"> void initMediaColors();
</span><span class="cx"> void initMediaButtons();
</span><span class="cx"> virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const;
</span><del>- virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaSeekBackButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaSeekForwardButton(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaCurrentTime(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMediaFullscreenButton(const RenderObject&, const PaintInfo&, const IntRect&);
+ virtual bool paintMediaPlayButton(const RenderObject&, const PaintInfo&, const IntRect&);
+ virtual bool paintMediaMuteButton(const RenderObject&, const PaintInfo&, const IntRect&);
+ virtual bool paintMediaSeekBackButton(const RenderObject&, const PaintInfo&, const IntRect&);
+ virtual bool paintMediaSeekForwardButton(const RenderObject&, const PaintInfo&, const IntRect&);
+ virtual bool paintMediaSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
+ virtual bool paintMediaSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&);
+ virtual bool paintMediaVolumeSliderContainer(const RenderObject&, const PaintInfo&, const IntRect&);
+ virtual bool paintMediaVolumeSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
+ virtual bool paintMediaVolumeSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&);
+ virtual bool paintMediaCurrentTime(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- virtual bool paintMediaToggleClosedCaptionsButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMediaToggleClosedCaptionsButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -184,13 +184,13 @@
</span><span class="cx"> virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const;
</span><span class="cx"> virtual double animationDurationForProgressBar(RenderProgress*) const;
</span><span class="cx"> virtual void adjustProgressBarStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual bool paintCapsLockIndicator(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintCapsLockIndicator(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintInnerSpinButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintInnerSpinButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual String fileListNameForWidth(const FileList*, const Font&, int width, bool multipleFilesAllowed) const override;
</span><span class="lines">@@ -200,11 +200,11 @@
</span><span class="cx"> static double getScreenDPI();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>- bool paintMediaButton(RenderObject*, GraphicsContext*, const IntRect&, const char* symbolicIconName, const char* fallbackStockIconName);
</del><ins>+ bool paintMediaButton(const RenderObject&, GraphicsContext*, const IntRect&, const char* symbolicIconName, const char* fallbackStockIconName);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><del>- static IntRect calculateProgressRect(RenderObject*, const IntRect&);
</del><ins>+ static IntRect calculateProgressRect(const RenderObject&, const IntRect&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> mutable Color m_panelColor;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGtk2cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -110,9 +110,9 @@
</span><span class="cx"> rect.inflate(focusWidth + focusPad);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeGtk::adjustRepaintRect(const RenderObject* renderObject, IntRect& rect)
</del><ins>+void RenderThemeGtk::adjustRepaintRect(const RenderObject& renderObject, IntRect& rect)
</ins><span class="cx"> {
</span><del>- ControlPart part = renderObject->style().appearance();
</del><ins>+ ControlPart part = renderObject.style().appearance();
</ins><span class="cx"> switch (part) {
</span><span class="cx"> case CheckboxPart:
</span><span class="cx"> case RadioPart: {
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static GtkStateType getGtkStateType(RenderThemeGtk* theme, RenderObject* object)
</del><ins>+static GtkStateType getGtkStateType(RenderThemeGtk* theme, const RenderObject& object)
</ins><span class="cx"> {
</span><span class="cx"> if (!theme->isEnabled(object) || theme->isReadOnlyControl(object))
</span><span class="cx"> return GTK_STATE_INSENSITIVE;
</span><span class="lines">@@ -156,14 +156,14 @@
</span><span class="cx"> style->setHeight(Length(indicatorSize, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void paintToggle(RenderThemeGtk* theme, RenderObject* renderObject, const PaintInfo& info, const IntRect& rect, GtkWidget* widget)
</del><ins>+static void paintToggle(RenderThemeGtk* theme, const RenderObject& renderObject, const PaintInfo& info, const IntRect& rect, GtkWidget* widget)
</ins><span class="cx"> {
</span><span class="cx"> // We do not call gtk_toggle_button_set_active here, because some themes begin a series of
</span><span class="cx"> // animation frames in a "toggled" signal handler. This puts some checkboxes in a half-way
</span><span class="cx"> // checked state. Every GTK+ theme I tested merely looks at the shadow type (and not the
</span><span class="cx"> // 'active' property) to determine whether or not to draw the check.
</span><span class="cx"> gtk_widget_set_sensitive(widget, theme->isEnabled(renderObject) && !theme->isReadOnlyControl(renderObject));
</span><del>- gtk_widget_set_direction(widget, gtkTextDirection(renderObject->style().direction()));
</del><ins>+ gtk_widget_set_direction(widget, gtkTextDirection(renderObject.style().direction()));
</ins><span class="cx">
</span><span class="cx"> bool indeterminate = theme->isIndeterminate(renderObject);
</span><span class="cx"> gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(widget), indeterminate);
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> setToggleSize(this, style, gtkCheckButton());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintCheckbox(RenderObject* renderObject, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintCheckbox(const RenderObject& renderObject, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> paintToggle(this, renderObject, info, rect, gtkCheckButton());
</span><span class="cx"> return false;
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> setToggleSize(this, style, gtkRadioButton());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintRadio(RenderObject* renderObject, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintRadio(const RenderObject& renderObject, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> paintToggle(this, renderObject, info, rect, gtkRadioButton());
</span><span class="cx"> return false;
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> GTK_WIDGET_UNSET_FLAGS(widget, GTK_HAS_FOCUS);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintButton(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> if (info.context->paintingDisabled())
</span><span class="cx"> return false;
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> GtkStateType state = getGtkStateType(this, object);
</span><span class="cx"> gtk_widget_set_state(widget, state);
</span><del>- gtk_widget_set_direction(widget, gtkTextDirection(object->style().direction()));
</del><ins>+ gtk_widget_set_direction(widget, gtkTextDirection(object.style().direction()));
</ins><span class="cx">
</span><span class="cx"> if (isFocused(object)) {
</span><span class="cx"> setWidgetHasFocus(widget, TRUE);
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> return bottom;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMenuList(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintMenuList(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> if (paintButton(object, info, rect))
</span><span class="cx"> return true;
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx">
</span><span class="cx"> int leftBorder = 0, rightBorder = 0, bottomBorder = 0, topBorder = 0;
</span><span class="cx"> getButtonInnerBorder(gtkComboBoxButton(), leftBorder, topBorder, rightBorder, bottomBorder);
</span><del>- RenderStyle* style = &object->style();
</del><ins>+ RenderStyle* style = &object.style();
</ins><span class="cx"> int arrowSize = comboBoxArrowSize(style);
</span><span class="cx"> GtkStyle* buttonStyle = gtk_widget_get_style(gtkComboBoxButton());
</span><span class="cx">
</span><span class="lines">@@ -422,14 +422,14 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintTextField(RenderObject* renderObject, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintTextField(const RenderObject& renderObject, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> GtkWidget* widget = gtkEntry();
</span><span class="cx">
</span><span class="cx"> bool enabled = isEnabled(renderObject) && !isReadOnlyControl(renderObject);
</span><span class="cx"> GtkStateType backgroundState = enabled ? GTK_STATE_NORMAL : GTK_STATE_INSENSITIVE;
</span><span class="cx"> gtk_widget_set_sensitive(widget, enabled);
</span><del>- gtk_widget_set_direction(widget, gtkTextDirection(renderObject->style().direction()));
</del><ins>+ gtk_widget_set_direction(widget, gtkTextDirection(renderObject.style().direction()));
</ins><span class="cx"> setWidgetHasFocus(widget, isFocused(renderObject));
</span><span class="cx">
</span><span class="cx"> WidgetRenderingContext widgetContext(info.context, rect);
</span><span class="lines">@@ -465,12 +465,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintSliderTrack(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> if (info.context->paintingDisabled())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ControlPart part = object->style().appearance();
</del><ins>+ ControlPart part = object.style().appearance();
</ins><span class="cx"> ASSERT(part == SliderHorizontalPart || part == SliderVerticalPart || part == MediaVolumeSliderPart);
</span><span class="cx">
</span><span class="cx"> // We shrink the trough rect slightly to make room for the focus indicator.
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx"> widget = gtkVScale();
</span><span class="cx"> troughRect.inflateY(-gtk_widget_get_style(widget)->ythickness);
</span><span class="cx"> }
</span><del>- gtk_widget_set_direction(widget, gtkTextDirection(object->style().direction()));
</del><ins>+ gtk_widget_set_direction(widget, gtkTextDirection(object.style().direction()));
</ins><span class="cx">
</span><span class="cx"> WidgetRenderingContext widgetContext(info.context, rect);
</span><span class="cx"> widgetContext.gtkPaintBox(troughRect, widget, GTK_STATE_ACTIVE, GTK_SHADOW_OUT, "trough");
</span><span class="lines">@@ -493,12 +493,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintSliderThumb(const RenderObject& object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> if (info.context->paintingDisabled())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ControlPart part = object->style().appearance();
</del><ins>+ ControlPart part = object.style().appearance();
</ins><span class="cx"> ASSERT(part == SliderThumbHorizontalPart || part == SliderThumbVerticalPart || part == MediaVolumeSliderThumbPart);
</span><span class="cx">
</span><span class="cx"> GtkWidget* widget = 0;
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx"> detail = "vscale";
</span><span class="cx"> orientation = GTK_ORIENTATION_VERTICAL;
</span><span class="cx"> }
</span><del>- gtk_widget_set_direction(widget, gtkTextDirection(object->style().direction()));
</del><ins>+ gtk_widget_set_direction(widget, gtkTextDirection(object.style().direction()));
</ins><span class="cx">
</span><span class="cx"> // Only some themes have slider thumbs respond to clicks and some don't. This information is
</span><span class="cx"> // gathered via the 'activate-slider' property, but it's deprecated in GTK+ 2.22 and removed in
</span><span class="lines">@@ -549,10 +549,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><del>-bool RenderThemeGtk::paintProgressBar(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintProgressBar(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> GtkWidget* widget = gtkProgressBar();
</span><del>- gtk_widget_set_direction(widget, gtkTextDirection(renderObject->style().direction()));
</del><ins>+ gtk_widget_set_direction(widget, gtkTextDirection(renderObject.style().direction()));
</ins><span class="cx">
</span><span class="cx"> WidgetRenderingContext widgetContext(paintInfo.context, rect);
</span><span class="cx"> IntRect fullProgressBarRect(IntPoint(), rect.size());
</span><span class="lines">@@ -586,7 +586,7 @@
</span><span class="cx"> style->setMinWidth(Length(width, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintInnerSpinButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintInnerSpinButton(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> // We expand the painted area by 2 pixels on the top and bottom and 2 pixels on the right. This
</span><span class="cx"> // is because GTK+ themes want to draw over the text box borders, but WebCore renders the inner
</span><span class="lines">@@ -597,7 +597,7 @@
</span><span class="cx">
</span><span class="cx"> WidgetRenderingContext widgetContext(paintInfo.context, expandedRect);
</span><span class="cx"> GtkWidget* widget = gtkSpinButton();
</span><del>- gtk_widget_set_direction(widget, gtkTextDirection(renderObject->style().direction()));
</del><ins>+ gtk_widget_set_direction(widget, gtkTextDirection(renderObject.style().direction()));
</ins><span class="cx">
</span><span class="cx"> IntRect fullSpinButtonRect(IntPoint(), expandedRect.size());
</span><span class="cx"> widgetContext.gtkPaintBox(fullSpinButtonRect, widget, GTK_STATE_NORMAL, GTK_SHADOW_IN, "spinbutton");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGtk3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -157,11 +157,11 @@
</span><span class="cx"> rect.inflate(focusWidth + focusPad);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeGtk::adjustRepaintRect(const RenderObject* renderObject, IntRect& rect)
</del><ins>+void RenderThemeGtk::adjustRepaintRect(const RenderObject& renderObject, IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> GtkStyleContext* context = 0;
</span><span class="cx"> bool checkInteriorFocus = false;
</span><del>- ControlPart part = renderObject->style().appearance();
</del><ins>+ ControlPart part = renderObject.style().appearance();
</ins><span class="cx"> switch (part) {
</span><span class="cx"> case CheckboxPart:
</span><span class="cx"> case RadioPart:
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> style->setHeight(Length(indicatorSize, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void paintToggle(const RenderThemeGtk* theme, GType widgetType, RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& fullRect)
</del><ins>+static void paintToggle(const RenderThemeGtk* theme, GType widgetType, const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& fullRect)
</ins><span class="cx"> {
</span><span class="cx"> GtkStyleContext* context = getStyleContext(widgetType);
</span><span class="cx"> gtk_style_context_save(context);
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> rect.setHeight(indicatorSize); // In case rect.height() was equal to indicatorSize + 1.
</span><span class="cx"> }
</span><span class="cx">
</span><del>- gtk_style_context_set_direction(context, static_cast<GtkTextDirection>(gtkTextDirection(renderObject->style().direction())));
</del><ins>+ gtk_style_context_set_direction(context, static_cast<GtkTextDirection>(gtkTextDirection(renderObject.style().direction())));
</ins><span class="cx"> gtk_style_context_add_class(context, widgetType == GTK_TYPE_CHECK_BUTTON ? GTK_STYLE_CLASS_CHECK : GTK_STYLE_CLASS_RADIO);
</span><span class="cx">
</span><span class="cx"> guint flags = 0;
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> setToggleSize(getStyleContext(GTK_TYPE_CHECK_BUTTON), style);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintCheckbox(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintCheckbox(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> paintToggle(this, GTK_TYPE_CHECK_BUTTON, renderObject, paintInfo, rect);
</span><span class="cx"> return false;
</span><span class="lines">@@ -291,13 +291,13 @@
</span><span class="cx"> setToggleSize(getStyleContext(GTK_TYPE_RADIO_BUTTON), style);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintRadio(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintRadio(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> paintToggle(this, GTK_TYPE_RADIO_BUTTON, renderObject, paintInfo, rect);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void renderButton(RenderTheme* theme, GtkStyleContext* context, RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+static void renderButton(RenderTheme* theme, GtkStyleContext* context, const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> IntRect buttonRect(rect);
</span><span class="cx">
</span><span class="lines">@@ -363,12 +363,12 @@
</span><span class="cx"> gtk_render_focus(context, paintInfo.context->platformContext()->cr(), buttonRect.x(), buttonRect.y(), buttonRect.width(), buttonRect.height());
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-bool RenderThemeGtk::paintButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintButton(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> GtkStyleContext* context = getStyleContext(GTK_TYPE_BUTTON);
</span><span class="cx"> gtk_style_context_save(context);
</span><span class="cx">
</span><del>- gtk_style_context_set_direction(context, static_cast<GtkTextDirection>(gtkTextDirection(renderObject->style().direction())));
</del><ins>+ gtk_style_context_set_direction(context, static_cast<GtkTextDirection>(gtkTextDirection(renderObject.style().direction())));
</ins><span class="cx"> gtk_style_context_add_class(context, GTK_STYLE_CLASS_BUTTON);
</span><span class="cx">
</span><span class="cx"> renderButton(this, context, renderObject, paintInfo, rect);
</span><span class="lines">@@ -464,10 +464,10 @@
</span><span class="cx"> return borderWidth.bottom + focusWidth;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMenuList(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintMenuList(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> cairo_t* cairoContext = paintInfo.context->platformContext()->cr();
</span><del>- GtkTextDirection direction = static_cast<GtkTextDirection>(gtkTextDirection(renderObject->style().direction()));
</del><ins>+ GtkTextDirection direction = static_cast<GtkTextDirection>(gtkTextDirection(renderObject.style().direction()));
</ins><span class="cx">
</span><span class="cx"> // Paint the button.
</span><span class="cx"> GtkStyleContext* buttonStyleContext = getStyleContext(GTK_TYPE_BUTTON);
</span><span class="lines">@@ -595,12 +595,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintTextField(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintTextField(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> GtkStyleContext* context = getStyleContext(GTK_TYPE_ENTRY);
</span><span class="cx"> gtk_style_context_save(context);
</span><span class="cx">
</span><del>- gtk_style_context_set_direction(context, static_cast<GtkTextDirection>(gtkTextDirection(renderObject->style().direction())));
</del><ins>+ gtk_style_context_set_direction(context, static_cast<GtkTextDirection>(gtkTextDirection(renderObject.style().direction())));
</ins><span class="cx"> gtk_style_context_add_class(context, GTK_STYLE_CLASS_ENTRY);
</span><span class="cx">
</span><span class="cx"> guint flags = 0;
</span><span class="lines">@@ -643,15 +643,15 @@
</span><span class="cx"> gtk_style_context_add_class(context, GTK_STYLE_CLASS_VERTICAL);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintSliderTrack(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintSliderTrack(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- ControlPart part = renderObject->style().appearance();
</del><ins>+ ControlPart part = renderObject.style().appearance();
</ins><span class="cx"> ASSERT_UNUSED(part, part == SliderHorizontalPart || part == SliderVerticalPart || part == MediaVolumeSliderPart);
</span><span class="cx">
</span><span class="cx"> GtkStyleContext* context = getStyleContext(GTK_TYPE_SCALE);
</span><span class="cx"> gtk_style_context_save(context);
</span><span class="cx">
</span><del>- gtk_style_context_set_direction(context, gtkTextDirection(renderObject->style().direction()));
</del><ins>+ gtk_style_context_set_direction(context, gtkTextDirection(renderObject.style().direction()));
</ins><span class="cx"> applySliderStyleContextClasses(context, part);
</span><span class="cx"> gtk_style_context_add_class(context, GTK_STYLE_CLASS_TROUGH);
</span><span class="cx">
</span><span class="lines">@@ -678,15 +678,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintSliderThumb(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintSliderThumb(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- ControlPart part = renderObject->style().appearance();
</del><ins>+ ControlPart part = renderObject.style().appearance();
</ins><span class="cx"> ASSERT(part == SliderThumbHorizontalPart || part == SliderThumbVerticalPart || part == MediaVolumeSliderThumbPart);
</span><span class="cx">
</span><span class="cx"> GtkStyleContext* context = getStyleContext(GTK_TYPE_SCALE);
</span><span class="cx"> gtk_style_context_save(context);
</span><span class="cx">
</span><del>- gtk_style_context_set_direction(context, gtkTextDirection(renderObject->style().direction()));
</del><ins>+ gtk_style_context_set_direction(context, gtkTextDirection(renderObject.style().direction()));
</ins><span class="cx"> applySliderStyleContextClasses(context, part);
</span><span class="cx"> gtk_style_context_add_class(context, GTK_STYLE_CLASS_SLIDER);
</span><span class="cx">
</span><span class="lines">@@ -729,9 +729,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><del>-bool RenderThemeGtk::paintProgressBar(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintProgressBar(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- if (!renderObject->isProgress())
</del><ins>+ if (!renderObject.isProgress())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> GtkStyleContext* context = getStyleContext(GTK_TYPE_PROGRESS_BAR);
</span><span class="lines">@@ -786,7 +786,7 @@
</span><span class="cx"> style->setMinWidth(Length(width, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void paintSpinArrowButton(RenderTheme* theme, GtkStyleContext* context, RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect, GtkArrowType arrowType)
</del><ins>+static void paintSpinArrowButton(RenderTheme* theme, GtkStyleContext* context, const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect, GtkArrowType arrowType)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(arrowType == GTK_ARROW_UP || arrowType == GTK_ARROW_DOWN);
</span><span class="cx">
</span><span class="lines">@@ -852,12 +852,12 @@
</span><span class="cx"> gtk_style_context_restore(context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintInnerSpinButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintInnerSpinButton(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> GtkStyleContext* context = getStyleContext(GTK_TYPE_SPIN_BUTTON);
</span><span class="cx"> gtk_style_context_save(context);
</span><span class="cx">
</span><del>- GtkTextDirection direction = static_cast<GtkTextDirection>(gtkTextDirection(renderObject->style().direction()));
</del><ins>+ GtkTextDirection direction = static_cast<GtkTextDirection>(gtkTextDirection(renderObject.style().direction()));
</ins><span class="cx"> gtk_style_context_set_direction(context, direction);
</span><span class="cx">
</span><span class="cx"> guint flags = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -1438,7 +1438,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> IntRect inflatedRect = pixelSnappedBorderBoxRect();
</span><del>- theme().adjustRepaintRect(this, inflatedRect);
</del><ins>+ theme().adjustRepaintRect(*this, inflatedRect);
</ins><span class="cx"> addVisualOverflow(inflatedRect);
</span><span class="cx">
</span><span class="cx"> if (RenderFlowThread* flowThread = flowThreadContainingBlock())
</span><span class="lines">@@ -4294,7 +4294,7 @@
</span><span class="cx"> // is turned off, checkboxes/radios will still have decent baselines.
</span><span class="cx"> // FIXME: Need to patch form controls to deal with vertical lines.
</span><span class="cx"> if (style().hasAppearance() && !theme().isControlContainer(style().appearance()))
</span><del>- return theme().baselinePosition(this);
</del><ins>+ return theme().baselinePosition(*this);
</ins><span class="cx">
</span><span class="cx"> // CSS2.1 states that the baseline of an inline block is the baseline of the last line box in
</span><span class="cx"> // the normal flow. We make an exception for marquees, since their baselines are meaningless
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -1227,7 +1227,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool themePainted = style().hasAppearance() && !theme().paint(this, controlStates, paintInfo, snappedPaintRect);
</del><ins>+ bool themePainted = style().hasAppearance() && !theme().paint(*this, controlStates, paintInfo, snappedPaintRect);
</ins><span class="cx">
</span><span class="cx"> if (controlStates && controlStates->needsRepaint())
</span><span class="cx"> m_repaintTimer.startOneShot(0);
</span><span class="lines">@@ -1239,12 +1239,12 @@
</span><span class="cx"> paintBackground(paintInfo, paintRect, bleedAvoidance);
</span><span class="cx">
</span><span class="cx"> if (style().hasAppearance())
</span><del>- theme().paintDecorations(this, paintInfo, snappedPaintRect);
</del><ins>+ theme().paintDecorations(*this, paintInfo, snappedPaintRect);
</ins><span class="cx"> }
</span><span class="cx"> paintBoxShadow(paintInfo, paintRect, style(), Inset);
</span><span class="cx">
</span><span class="cx"> // The theme will tell us whether or not we should also paint the CSS border.
</span><del>- if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && (!style().hasAppearance() || (!themePainted && theme().paintBorderOnly(this, paintInfo, snappedPaintRect))) && style().hasBorder())
</del><ins>+ if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && (!style().hasAppearance() || (!themePainted && theme().paintBorderOnly(*this, paintInfo, snappedPaintRect))) && style().hasBorder())
</ins><span class="cx"> paintBorder(paintInfo, paintRect, style(), bleedAvoidance);
</span><span class="cx">
</span><span class="cx"> if (bleedAvoidance == BackgroundBleedUseTransparencyLayer)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderButtoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderButton.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderButton.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderButton.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -112,12 +112,12 @@
</span><span class="cx"> if (m_inner) // RenderBlock handled updating the anonymous block's style.
</span><span class="cx"> setupInnerStyle(&m_inner->style());
</span><span class="cx">
</span><del>- if (!m_default && theme().isDefault(this)) {
</del><ins>+ if (!m_default && theme().isDefault(*this)) {
</ins><span class="cx"> if (!m_timer)
</span><span class="cx"> m_timer = std::make_unique<Timer<RenderButton>>(this, &RenderButton::timerFired);
</span><span class="cx"> m_timer->startRepeating(0.03);
</span><span class="cx"> m_default = true;
</span><del>- } else if (m_default && !theme().isDefault(this)) {
</del><ins>+ } else if (m_default && !theme().isDefault(*this)) {
</ins><span class="cx"> m_default = false;
</span><span class="cx"> m_timer = nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFileUploadControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> // Draw the file icon and decorations.
</span><span class="cx"> IntRect iconRect(iconX, iconY, iconWidth, iconHeight);
</span><span class="cx"> RenderTheme::FileUploadDecorations decorationsType = inputElement().files()->length() == 1 ? RenderTheme::SingleFile : RenderTheme::MultipleFiles;
</span><del>- theme().paintFileUploadIconDecorations(this, buttonRenderer, paintInfo, iconRect, inputElement().icon(), decorationsType);
</del><ins>+ theme().paintFileUploadIconDecorations(*this, *buttonRenderer, paintInfo, iconRect, inputElement().icon(), decorationsType);
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> // Draw the file icon
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -1278,7 +1278,7 @@
</span><span class="cx"> borderBox = region->rectFlowPortionForBox(block, borderBox);
</span><span class="cx">
</span><span class="cx"> IntRect inflatedRect = pixelSnappedIntRect(borderBox);
</span><del>- block->theme().adjustRepaintRect(block, inflatedRect);
</del><ins>+ block->theme().adjustRepaintRect(*block, inflatedRect);
</ins><span class="cx">
</span><span class="cx"> region->addVisualOverflowForBox(block, inflatedRect);
</span><span class="cx"> if (region == endRegion)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMediaControlscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMediaControls.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMediaControls.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderMediaControls.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -70,10 +70,10 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN) && USE(CG)
</span><span class="cx">
</span><del>-static WKMediaControllerThemeState determineState(RenderObject* o)
</del><ins>+static WKMediaControllerThemeState determineState(const RenderObject& o)
</ins><span class="cx"> {
</span><span class="cx"> int result = 0;
</span><del>- const RenderTheme& theme = o->theme();
</del><ins>+ const RenderTheme& theme = o.theme();
</ins><span class="cx"> if (!theme.isEnabled(o) || theme.isReadOnlyControl(o))
</span><span class="cx"> result |= WKMediaControllerFlagDisabled;
</span><span class="cx"> if (theme.isPressed(o))
</span><span class="lines">@@ -84,9 +84,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Utility to scale when the UI part are not scaled by wkDrawMediaUIPart
</span><del>-static FloatRect getUnzoomedRectAndAdjustCurrentContext(RenderObject* o, const PaintInfo& paintInfo, const IntRect &originalRect)
</del><ins>+static FloatRect getUnzoomedRectAndAdjustCurrentContext(const RenderObject& o, const PaintInfo& paintInfo, const IntRect &originalRect)
</ins><span class="cx"> {
</span><del>- float zoomLevel = o->style().effectiveZoom();
</del><ins>+ float zoomLevel = o.style().effectiveZoom();
</ins><span class="cx"> FloatRect unzoomedRect(originalRect);
</span><span class="cx"> if (zoomLevel != 1.0f) {
</span><span class="cx"> unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
</span><span class="lines">@@ -126,35 +126,35 @@
</span><span class="cx"> style->setHeight(Length(static_cast<int>(size.height * zoomLevel), Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderMediaControls::paintMediaControlsPart(MediaControlElementType part, RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderMediaControls::paintMediaControlsPart(MediaControlElementType part, const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx">
</span><span class="cx"> switch (part) {
</span><span class="cx"> case MediaEnterFullscreenButton:
</span><span class="cx"> case MediaExitFullscreenButton:
</span><del>- if (MediaControlFullscreenButtonElement* btn = static_cast<MediaControlFullscreenButtonElement*>(o->node())) {
</del><ins>+ if (MediaControlFullscreenButtonElement* btn = static_cast<MediaControlFullscreenButtonElement*>(o.node())) {
</ins><span class="cx"> bool enterButton = btn->displayType() == MediaEnterFullscreenButton;
</span><span class="cx"> wkDrawMediaUIPart(enterButton ? WKMediaUIPartFullscreenButton : WKMediaUIPartExitFullscreenButton, paintInfo.context->platformContext(), r, determineState(o));
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case MediaShowClosedCaptionsButton:
</span><span class="cx"> case MediaHideClosedCaptionsButton:
</span><del>- if (MediaControlToggleClosedCaptionsButtonElement* btn = static_cast<MediaControlToggleClosedCaptionsButtonElement*>(o->node())) {
</del><ins>+ if (MediaControlToggleClosedCaptionsButtonElement* btn = static_cast<MediaControlToggleClosedCaptionsButtonElement*>(o.node())) {
</ins><span class="cx"> bool captionsVisible = btn->displayType() == MediaHideClosedCaptionsButton;
</span><span class="cx"> wkDrawMediaUIPart(captionsVisible ? WKMediaUIPartHideClosedCaptionsButton : WKMediaUIPartShowClosedCaptionsButton, paintInfo.context->platformContext(), r, determineState(o));
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case MediaMuteButton:
</span><span class="cx"> case MediaUnMuteButton:
</span><del>- if (MediaControlMuteButtonElement* btn = static_cast<MediaControlMuteButtonElement*>(o->node())) {
</del><ins>+ if (MediaControlMuteButtonElement* btn = static_cast<MediaControlMuteButtonElement*>(o.node())) {
</ins><span class="cx"> bool audioEnabled = btn->displayType() == MediaMuteButton;
</span><span class="cx"> wkDrawMediaUIPart(audioEnabled ? WKMediaUIPartMuteButton : WKMediaUIPartUnMuteButton, paintInfo.context->platformContext(), r, determineState(o));
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case MediaPauseButton:
</span><span class="cx"> case MediaPlayButton:
</span><del>- if (MediaControlPlayButtonElement* btn = static_cast<MediaControlPlayButtonElement*>(o->node())) {
</del><ins>+ if (MediaControlPlayButtonElement* btn = static_cast<MediaControlPlayButtonElement*>(o.node())) {
</ins><span class="cx"> bool canPlay = btn->displayType() == MediaPlayButton;
</span><span class="cx"> wkDrawMediaUIPart(canPlay ? WKMediaUIPartPlayButton : WKMediaUIPartPauseButton, paintInfo.context->platformContext(), r, determineState(o));
</span><span class="cx"> }
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> wkDrawMediaUIPart(WKMediaUIPartSeekForwardButton, paintInfo.context->platformContext(), r, determineState(o));
</span><span class="cx"> break;
</span><span class="cx"> case MediaSlider: {
</span><del>- if (HTMLMediaElement* mediaElement = parentMediaElement(*o)) {
</del><ins>+ if (HTMLMediaElement* mediaElement = parentMediaElement(o)) {
</ins><span class="cx"> FloatRect unzoomedRect = getUnzoomedRectAndAdjustCurrentContext(o, paintInfo, r);
</span><span class="cx"> wkDrawMediaSliderTrack(paintInfo.context->platformContext(), unzoomedRect, mediaElement->percentLoaded() * mediaElement->duration(), mediaElement->currentTime(), mediaElement->duration(), determineState(o));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMediaControlsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMediaControls.h (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMediaControls.h 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderMediaControls.h 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> public:
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>- static bool paintMediaControlsPart(MediaControlElementType, RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ static bool paintMediaControlsPart(MediaControlElementType, const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> static void adjustMediaSliderThumbSize(RenderStyle*);
</span><span class="cx"> #endif
</span><span class="cx"> static IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -725,7 +725,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderObject::drawLineForBoxSide(GraphicsContext* graphicsContext, float x1, float y1, float x2, float y2,
</span><del>- BoxSide side, Color color, EBorderStyle borderStyle, float adjacentWidth1, float adjacentWidth2, bool antialias)
</del><ins>+ BoxSide side, Color color, EBorderStyle borderStyle, float adjacentWidth1, float adjacentWidth2, bool antialias) const
</ins><span class="cx"> {
</span><span class="cx"> float deviceScaleFactor = document().deviceScaleFactor();
</span><span class="cx"> float thickness;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -879,7 +879,7 @@
</span><span class="cx">
</span><span class="cx"> RespectImageOrientationEnum shouldRespectImageOrientation() const;
</span><span class="cx">
</span><del>- void drawLineForBoxSide(GraphicsContext*, float x1, float y1, float x2, float y2, BoxSide, Color, EBorderStyle, float adjbw1, float adjbw2, bool antialias = false);
</del><ins>+ void drawLineForBoxSide(GraphicsContext*, float x1, float y1, float x2, float y2, BoxSide, Color, EBorderStyle, float adjbw1, float adjbw2, bool antialias = false) const;
</ins><span class="cx"> protected:
</span><span class="cx"> void paintFocusRing(PaintInfo&, const LayoutPoint&, RenderStyle*);
</span><span class="cx"> void paintOutline(PaintInfo&, const LayoutRect&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderProgresscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderProgress.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderProgress.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderProgress.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> frame.setHeight(computedValues.m_extent);
</span><span class="cx"> else
</span><span class="cx"> frame.setWidth(computedValues.m_extent);
</span><del>- IntSize frameSize = theme().progressBarRectForBounds(this, pixelSnappedIntRect(frame)).size();
</del><ins>+ IntSize frameSize = theme().progressBarRectForBounds(*this, pixelSnappedIntRect(frame)).size();
</ins><span class="cx"> computedValues.m_extent = isHorizontalWritingMode() ? frameSize.height() : frameSize.width();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlSingleLinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> // Convert the rect into the coords used for painting the content
</span><span class="cx"> contentsRect.moveBy(paintOffset + location());
</span><del>- theme().paintCapsLockIndicator(this, paintInfo, pixelSnappedIntRect(contentsRect));
</del><ins>+ theme().paintCapsLockIndicator(*this, paintInfo, pixelSnappedIntRect(contentsRect));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -263,20 +263,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::paint(RenderObject* o, ControlStates* controlStates, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderTheme::paint(const RenderObject& o, ControlStates* controlStates, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> // If painting is disabled, but we aren't updating control tints, then just bail.
</span><span class="cx"> // If we are updating control tints, just schedule a repaint if the theme supports tinting
</span><span class="cx"> // for that control.
</span><span class="cx"> if (paintInfo.context->updatingControlTints()) {
</span><span class="cx"> if (controlSupportsTints(o))
</span><del>- o->repaint();
</del><ins>+ o.repaint();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> if (paintInfo.context->paintingDisabled())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ControlPart part = o->style().appearance();
</del><ins>+ ControlPart part = o.style().appearance();
</ins><span class="cx">
</span><span class="cx"> #if USE(NEW_THEME)
</span><span class="cx"> switch (part) {
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> case ButtonPart:
</span><span class="cx"> case InnerSpinButtonPart:
</span><span class="cx"> updateControlStatesForRenderer(o, controlStates);
</span><del>- m_theme->paint(part, controlStates, const_cast<GraphicsContext*>(paintInfo.context), r, o->style().effectiveZoom(), &o->view().frameView());
</del><ins>+ m_theme->paint(part, controlStates, const_cast<GraphicsContext*>(paintInfo.context), r, o.style().effectiveZoom(), &o.view().frameView());
</ins><span class="cx"> return false;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="lines">@@ -405,17 +405,17 @@
</span><span class="cx"> return true; // We don't support the appearance, so let the normal background/border paint.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::paintBorderOnly(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderTheme::paintBorderOnly(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> if (paintInfo.context->paintingDisabled())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> UNUSED_PARAM(r);
</span><del>- return o->style().appearance() != NoControlPart;
</del><ins>+ return o.style().appearance() != NoControlPart;
</ins><span class="cx"> #else
</span><span class="cx"> // Call the appropriate paint method based off the appearance value.
</span><del>- switch (o->style().appearance()) {
</del><ins>+ switch (o.style().appearance()) {
</ins><span class="cx"> case TextFieldPart:
</span><span class="cx"> return paintTextField(o, paintInfo, r);
</span><span class="cx"> case ListboxPart:
</span><span class="lines">@@ -463,13 +463,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::paintDecorations(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderTheme::paintDecorations(const RenderObject& renderer, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> if (paintInfo.context->paintingDisabled())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Call the appropriate paint method based off the appearance value.
</span><del>- switch (renderer->style().appearance()) {
</del><ins>+ switch (renderer.style().appearance()) {
</ins><span class="cx"> case MenulistButtonPart:
</span><span class="cx"> return paintMenuListButtonDecorations(renderer, paintInfo, rect);
</span><span class="cx"> case TextFieldPart:
</span><span class="lines">@@ -666,17 +666,17 @@
</span><span class="cx"> return platformInactiveSelectionForegroundColor();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderTheme::baselinePosition(const RenderObject* o) const
</del><ins>+int RenderTheme::baselinePosition(const RenderObject& o) const
</ins><span class="cx"> {
</span><del>- if (!o->isBox())
</del><ins>+ if (!o.isBox())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><del>- const RenderBox* box = toRenderBox(o);
</del><ins>+ const RenderBox& box = *toRenderBox(&o);
</ins><span class="cx">
</span><span class="cx"> #if USE(NEW_THEME)
</span><del>- return box->height() + box->marginTop() + m_theme->baselinePositionAdjustment(o->style().appearance()) * o->style().effectiveZoom();
</del><ins>+ return box.height() + box.marginTop() + m_theme->baselinePositionAdjustment(o.style().appearance()) * o.style().effectiveZoom();
</ins><span class="cx"> #else
</span><del>- return box->height() + box->marginTop();
</del><ins>+ return box.height() + box.marginTop();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -714,11 +714,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderTheme::adjustRepaintRect(const RenderObject* o, IntRect& r)
</del><ins>+void RenderTheme::adjustRepaintRect(const RenderObject& o, IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> #if USE(NEW_THEME)
</span><span class="cx"> ControlStates states(extractControlStatesForRenderer(o));
</span><del>- m_theme->inflateControlPaintRect(o->style().appearance(), &states, r, o->style().effectiveZoom());
</del><ins>+ m_theme->inflateControlPaintRect(o.style().appearance(), &states, r, o.style().effectiveZoom());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(o);
</span><span class="cx"> UNUSED_PARAM(r);
</span><span class="lines">@@ -730,10 +730,10 @@
</span><span class="cx"> return (style->hasAppearance() && style->appearance() != TextFieldPart && style->appearance() != TextAreaPart && style->appearance() != MenulistButtonPart && style->appearance() != ListboxPart);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::stateChanged(RenderObject* o, ControlStates::States state) const
</del><ins>+bool RenderTheme::stateChanged(const RenderObject& o, ControlStates::States state) const
</ins><span class="cx"> {
</span><span class="cx"> // Default implementation assumes the controls don't respond to changes in :hover state
</span><del>- if (state == ControlStates::HoverState && !supportsHover(&o->style()))
</del><ins>+ if (state == ControlStates::HoverState && !supportsHover(&o.style()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Assume pressed state is only responded to if the control is enabled.
</span><span class="lines">@@ -741,17 +741,17 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Repaint the control.
</span><del>- o->repaint();
</del><ins>+ o.repaint();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderTheme::updateControlStatesForRenderer(const RenderObject* o, ControlStates* controlStates) const
</del><ins>+void RenderTheme::updateControlStatesForRenderer(const RenderObject& o, ControlStates* controlStates) const
</ins><span class="cx"> {
</span><span class="cx"> ControlStates newStates = extractControlStatesForRenderer(o);
</span><span class="cx"> controlStates->setStates(newStates.states());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ControlStates::States RenderTheme::extractControlStatesForRenderer(const RenderObject* o) const
</del><ins>+ControlStates::States RenderTheme::extractControlStatesForRenderer(const RenderObject& o) const
</ins><span class="cx"> {
</span><span class="cx"> ControlStates::States states = 0;
</span><span class="cx"> if (isHovered(o)) {
</span><span class="lines">@@ -764,7 +764,7 @@
</span><span class="cx"> if (isSpinUpButtonPartPressed(o))
</span><span class="cx"> states |= ControlStates::SpinUpState;
</span><span class="cx"> }
</span><del>- if (isFocused(o) && o->style().outlineStyleIsAuto())
</del><ins>+ if (isFocused(o) && o.style().outlineStyleIsAuto())
</ins><span class="cx"> states |= ControlStates::FocusState;
</span><span class="cx"> if (isEnabled(o))
</span><span class="cx"> states |= ControlStates::EnabledState;
</span><span class="lines">@@ -781,9 +781,9 @@
</span><span class="cx"> return states;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::isActive(const RenderObject* o) const
</del><ins>+bool RenderTheme::isActive(const RenderObject& o) const
</ins><span class="cx"> {
</span><del>- Node* node = o->node();
</del><ins>+ Node* node = o.node();
</ins><span class="cx"> if (!node)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -798,41 +798,41 @@
</span><span class="cx"> return page->focusController().isActive();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::isChecked(const RenderObject* o) const
</del><ins>+bool RenderTheme::isChecked(const RenderObject& o) const
</ins><span class="cx"> {
</span><del>- if (!o->node())
</del><ins>+ if (!o.node())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- HTMLInputElement* inputElement = o->node()->toInputElement();
</del><ins>+ HTMLInputElement* inputElement = o.node()->toInputElement();
</ins><span class="cx"> if (!inputElement)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return inputElement->shouldAppearChecked();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::isIndeterminate(const RenderObject* o) const
</del><ins>+bool RenderTheme::isIndeterminate(const RenderObject& o) const
</ins><span class="cx"> {
</span><del>- if (!o->node())
</del><ins>+ if (!o.node())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- HTMLInputElement* inputElement = o->node()->toInputElement();
</del><ins>+ HTMLInputElement* inputElement = o.node()->toInputElement();
</ins><span class="cx"> if (!inputElement)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return inputElement->shouldAppearIndeterminate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::isEnabled(const RenderObject* o) const
</del><ins>+bool RenderTheme::isEnabled(const RenderObject& o) const
</ins><span class="cx"> {
</span><del>- Node* node = o->node();
</del><ins>+ Node* node = o.node();
</ins><span class="cx"> if (!node || !node->isElementNode())
</span><span class="cx"> return true;
</span><span class="cx"> return !toElement(node)->isDisabledFormControl();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::isFocused(const RenderObject* o) const
</del><ins>+bool RenderTheme::isFocused(const RenderObject& o) const
</ins><span class="cx"> {
</span><del>- Node* node = o->node();
</del><ins>+ Node* node = o.node();
</ins><span class="cx"> if (!node || !node->isElementNode())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -842,16 +842,16 @@
</span><span class="cx"> return focusDelegate == document.focusedElement() && frame && frame->selection().isFocusedAndActive();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::isPressed(const RenderObject* o) const
</del><ins>+bool RenderTheme::isPressed(const RenderObject& o) const
</ins><span class="cx"> {
</span><del>- if (!o->node() || !o->node()->isElementNode())
</del><ins>+ if (!o.node() || !o.node()->isElementNode())
</ins><span class="cx"> return false;
</span><del>- return toElement(o->node())->active();
</del><ins>+ return toElement(o.node())->active();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::isSpinUpButtonPartPressed(const RenderObject* o) const
</del><ins>+bool RenderTheme::isSpinUpButtonPartPressed(const RenderObject& o) const
</ins><span class="cx"> {
</span><del>- Node* node = o->node();
</del><ins>+ Node* node = o.node();
</ins><span class="cx"> if (!node || !node->isElementNode())
</span><span class="cx"> return false;
</span><span class="cx"> Element* element = toElement(node);
</span><span class="lines">@@ -860,17 +860,17 @@
</span><span class="cx"> return static_cast<SpinButtonElement*>(element)->upDownState() == SpinButtonElement::Up;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::isReadOnlyControl(const RenderObject* o) const
</del><ins>+bool RenderTheme::isReadOnlyControl(const RenderObject& o) const
</ins><span class="cx"> {
</span><del>- Node* node = o->node();
</del><ins>+ Node* node = o.node();
</ins><span class="cx"> if (!node || !node->isElementNode())
</span><span class="cx"> return false;
</span><span class="cx"> return toElement(node)->matchesReadOnlyPseudoClass();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::isHovered(const RenderObject* o) const
</del><ins>+bool RenderTheme::isHovered(const RenderObject& o) const
</ins><span class="cx"> {
</span><del>- Node* node = o->node();
</del><ins>+ Node* node = o.node();
</ins><span class="cx"> if (!node || !node->isElementNode())
</span><span class="cx"> return false;
</span><span class="cx"> if (!toElement(node)->isSpinButtonElement())
</span><span class="lines">@@ -879,25 +879,25 @@
</span><span class="cx"> return element->hovered() && element->upDownState() != SpinButtonElement::Indeterminate;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::isSpinUpButtonPartHovered(const RenderObject* o) const
</del><ins>+bool RenderTheme::isSpinUpButtonPartHovered(const RenderObject& o) const
</ins><span class="cx"> {
</span><del>- Node* node = o->node();
</del><ins>+ Node* node = o.node();
</ins><span class="cx"> if (!node || !node->isElementNode() || !toElement(node)->isSpinButtonElement())
</span><span class="cx"> return false;
</span><span class="cx"> SpinButtonElement* element = static_cast<SpinButtonElement*>(node);
</span><span class="cx"> return element->upDownState() == SpinButtonElement::Up;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::isDefault(const RenderObject* o) const
</del><ins>+bool RenderTheme::isDefault(const RenderObject& o) const
</ins><span class="cx"> {
</span><span class="cx"> // A button should only have the default appearance if the page is active
</span><span class="cx"> if (!isActive(o))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!o->frame().settings().applicationChromeMode())
</del><ins>+ if (!o.frame().settings().applicationChromeMode())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- return o->style().appearance() == DefaultButtonPart;
</del><ins>+ return o.style().appearance() == DefaultButtonPart;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !USE(NEW_THEME)
</span><span class="lines">@@ -967,7 +967,7 @@
</span><span class="cx"> RenderInputSpeech::adjustInputFieldSpeechButtonStyle(styleResolver, style, element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::paintInputFieldSpeechButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderTheme::paintInputFieldSpeechButton(const RenderObject& object, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return RenderInputSpeech::paintInputFieldSpeechButton(object, paintInfo, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -989,7 +989,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::paintMeter(RenderObject*, const PaintInfo&, const IntRect&)
</del><ins>+bool RenderTheme::paintMeter(const RenderObject&, const PaintInfo&, const IntRect&)
</ins><span class="cx"> {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1002,9 +1002,9 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderTheme::paintSliderTicks(RenderObject* o, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+void RenderTheme::paintSliderTicks(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- Node* node = o->node();
</del><ins>+ Node* node = o.node();
</ins><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1018,14 +1018,14 @@
</span><span class="cx">
</span><span class="cx"> double min = input->minimum();
</span><span class="cx"> double max = input->maximum();
</span><del>- ControlPart part = o->style().appearance();
</del><ins>+ ControlPart part = o.style().appearance();
</ins><span class="cx"> // We don't support ticks on alternate sliders like MediaVolumeSliders.
</span><span class="cx"> if (part != SliderHorizontalPart && part != SliderVerticalPart)
</span><span class="cx"> return;
</span><span class="cx"> bool isHorizontal = part == SliderHorizontalPart;
</span><span class="cx">
</span><span class="cx"> IntSize thumbSize;
</span><del>- RenderObject* thumbRenderer = input->sliderThumbElement()->renderer();
</del><ins>+ const RenderObject* thumbRenderer = input->sliderThumbElement()->renderer();
</ins><span class="cx"> if (thumbRenderer) {
</span><span class="cx"> const RenderStyle& thumbStyle = thumbRenderer->style();
</span><span class="cx"> int thumbWidth = thumbStyle.width().intValue();
</span><span class="lines">@@ -1035,7 +1035,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntSize tickSize = sliderTickSize();
</span><del>- float zoomFactor = o->style().effectiveZoom();
</del><ins>+ float zoomFactor = o.style().effectiveZoom();
</ins><span class="cx"> FloatRect tickRect;
</span><span class="cx"> int tickRegionSideMargin = 0;
</span><span class="cx"> int tickRegionWidth = 0;
</span><span class="lines">@@ -1044,7 +1044,7 @@
</span><span class="cx"> // We can ignoring transforms because transform is handled by the graphics context.
</span><span class="cx"> if (trackRenderer)
</span><span class="cx"> trackBounds = trackRenderer->absoluteBoundingBoxRectIgnoringTransforms();
</span><del>- IntRect sliderBounds = o->absoluteBoundingBoxRectIgnoringTransforms();
</del><ins>+ IntRect sliderBounds = o.absoluteBoundingBoxRectIgnoringTransforms();
</ins><span class="cx">
</span><span class="cx"> // Make position relative to the transformed ancestor element.
</span><span class="cx"> trackBounds.setX(trackBounds.x() - sliderBounds.x() + rect.x());
</span><span class="lines">@@ -1065,7 +1065,7 @@
</span><span class="cx"> }
</span><span class="cx"> RefPtr<HTMLCollection> options = dataList->options();
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><del>- paintInfo.context->setFillColor(o->style().visitedDependentColor(CSSPropertyColor), ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context->setFillColor(o.style().visitedDependentColor(CSSPropertyColor), ColorSpaceDeviceRGB);
</ins><span class="cx"> for (unsigned i = 0; Node* node = options->item(i); i++) {
</span><span class="cx"> ASSERT(isHTMLOptionElement(node));
</span><span class="cx"> HTMLOptionElement* optionElement = toHTMLOptionElement(node);
</span><span class="lines">@@ -1074,7 +1074,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> double parsedValue = parseToDoubleForNumberType(input->sanitizeValue(value));
</span><span class="cx"> double tickFraction = (parsedValue - min) / (max - min);
</span><del>- double tickRatio = isHorizontal && o->style().isLeftToRightDirection() ? tickFraction : 1.0 - tickFraction;
</del><ins>+ double tickRatio = isHorizontal && o.style().isLeftToRightDirection() ? tickFraction : 1.0 - tickFraction;
</ins><span class="cx"> double tickPosition = round(tickRegionSideMargin + tickRegionWidth * tickRatio);
</span><span class="cx"> if (isHorizontal)
</span><span class="cx"> tickRect.setX(tickPosition);
</span><span class="lines">@@ -1100,7 +1100,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect RenderTheme::progressBarRectForBounds(const RenderObject*, const IntRect& bounds) const
</del><ins>+IntRect RenderTheme::progressBarRectForBounds(const RenderObject&, const IntRect& bounds) const
</ins><span class="cx"> {
</span><span class="cx"> return bounds;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.h (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.h 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderTheme.h 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -79,9 +79,9 @@
</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="cx"> // whether the CSS border/background should also be painted.
</span><del>- bool paint(RenderObject*, ControlStates*, const PaintInfo&, const IntRect&);
- bool paintBorderOnly(RenderObject*, const PaintInfo&, const IntRect&);
- bool paintDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ bool paint(const RenderObject&, ControlStates*, const PaintInfo&, const IntRect&);
+ bool paintBorderOnly(const RenderObject&, const PaintInfo&, const IntRect&);
+ bool paintDecorations(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> // The remaining methods should be implemented by the platform-specific portion of the theme, e.g.,
</span><span class="cx"> // RenderThemeMac.cpp for Mac OS X.
</span><span class="lines">@@ -106,14 +106,14 @@
</span><span class="cx"> // A method to obtain the baseline position for a "leaf" control. This will only be used if a baseline
</span><span class="cx"> // position cannot be determined by examining child content. Checkboxes and radio buttons are examples of
</span><span class="cx"> // controls that need to do this.
</span><del>- virtual int baselinePosition(const RenderObject*) const;
</del><ins>+ virtual int baselinePosition(const RenderObject&) const;
</ins><span class="cx">
</span><span class="cx"> // A method for asking if a control is a container or not. Leaf controls have to have some special behavior (like
</span><span class="cx"> // the baseline position API above).
</span><span class="cx"> bool isControlContainer(ControlPart) const;
</span><span class="cx">
</span><span class="cx"> // A method asking if the control changes its tint when the window has focus or not.
</span><del>- virtual bool controlSupportsTints(const RenderObject*) const { return false; }
</del><ins>+ virtual bool controlSupportsTints(const RenderObject&) const { return false; }
</ins><span class="cx">
</span><span class="cx"> // Whether or not the control has been styled enough by the author to disable the native appearance.
</span><span class="cx"> virtual bool isControlStyled(const RenderStyle*, const BorderData&, const FillLayer&, const Color& backgroundColor) const;
</span><span class="lines">@@ -123,11 +123,11 @@
</span><span class="cx">
</span><span class="cx"> // Some controls may spill out of their containers (e.g., the check on an OS X checkbox). When these controls repaint,
</span><span class="cx"> // the theme needs to communicate this inflated rect to the engine so that it can invalidate the whole control.
</span><del>- virtual void adjustRepaintRect(const RenderObject*, IntRect&);
</del><ins>+ virtual void adjustRepaintRect(const RenderObject&, IntRect&);
</ins><span class="cx">
</span><span class="cx"> // This method is called whenever a relevant state changes on a particular themed object, e.g., the mouse becomes pressed
</span><span class="cx"> // or a control becomes disabled.
</span><del>- virtual bool stateChanged(RenderObject*, ControlStates::States) const;
</del><ins>+ virtual bool stateChanged(const RenderObject&, ControlStates::States) const;
</ins><span class="cx">
</span><span class="cx"> // This method is called whenever the theme changes on the system in order to flush cached resources from the
</span><span class="cx"> // old theme.
</span><span class="lines">@@ -188,14 +188,14 @@
</span><span class="cx"> virtual ScrollbarControlSize scrollbarControlSizeForPart(ControlPart) { return RegularScrollbar; }
</span><span class="cx">
</span><span class="cx"> // Method for painting the caps lock indicator
</span><del>- virtual bool paintCapsLockIndicator(RenderObject*, const PaintInfo&, const IntRect&) { return 0; };
</del><ins>+ virtual bool paintCapsLockIndicator(const RenderObject&, const PaintInfo&, const IntRect&) { return 0; };
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><span class="cx"> // Returns the repeat interval of the animation for the progress bar.
</span><span class="cx"> virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const;
</span><span class="cx"> // Returns the duration of the animation for the progress bar.
</span><span class="cx"> virtual double animationDurationForProgressBar(RenderProgress*) const;
</span><del>- virtual IntRect progressBarRectForBounds(const RenderObject*, const IntRect&) const;
</del><ins>+ virtual IntRect progressBarRectForBounds(const RenderObject&, const IntRect&) const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> virtual IntSize sliderTickSize() const = 0;
</span><span class="cx"> // Returns the distance of slider tick origin from the slider track center.
</span><span class="cx"> virtual int sliderTickOffsetFromTrackCenter() const = 0;
</span><del>- void paintSliderTicks(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ void paintSliderTicks(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual bool shouldShowPlaceholderWhenFocused() const { return false; }
</span><span class="lines">@@ -243,10 +243,10 @@
</span><span class="cx"> virtual String fileListNameForWidth(const FileList*, const Font&, int width, bool multipleFilesAllowed) const;
</span><span class="cx">
</span><span class="cx"> enum FileUploadDecorations { SingleFile, MultipleFiles };
</span><del>- virtual bool paintFileUploadIconDecorations(RenderObject* /*inputRenderer*/, RenderObject* /*buttonRenderer*/, const PaintInfo&, const IntRect&, Icon*, FileUploadDecorations) { return true; }
</del><ins>+ virtual bool paintFileUploadIconDecorations(const RenderObject& /*inputRenderer*/, const RenderObject& /*buttonRenderer*/, const PaintInfo&, const IntRect&, Icon*, FileUploadDecorations) { return true; }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(IMAGE_CONTROLS)
</span><del>- virtual IntSize imageControlsButtonSize(const RenderObject*) const { return IntSize(); }
</del><ins>+ virtual IntSize imageControlsButtonSize(const RenderObject&) const { return IntSize(); }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -267,122 +267,122 @@
</span><span class="cx"> #if !USE(NEW_THEME)
</span><span class="cx"> // Methods for each appearance value.
</span><span class="cx"> virtual void adjustCheckboxStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintCheckbox(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx"> virtual void setCheckboxSize(RenderStyle*) const { }
</span><span class="cx">
</span><span class="cx"> virtual void adjustRadioStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintRadio(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx"> virtual void setRadioSize(RenderStyle*) const { }
</span><span class="cx">
</span><span class="cx"> virtual void adjustButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx"> virtual void setButtonSize(RenderStyle*) const { }
</span><span class="cx">
</span><span class="cx"> virtual void adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintInnerSpinButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintInnerSpinButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual bool paintCheckboxDecorations(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintRadioDecorations(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintCheckboxDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintRadioDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustTextFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintTextFieldDecorations(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintTextField(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintTextFieldDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustTextAreaStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintTextArea(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintTextAreaDecorations(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintTextAreaDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMenuListDecorations(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMenuListDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><del>- virtual bool paintPushButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintSquareButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintPushButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintSquareButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(METER_ELEMENT)
</span><span class="cx"> virtual void adjustMeterStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintMeter(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMeter(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><span class="cx"> virtual void adjustProgressBarStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_SPEECH)
</span><span class="cx"> virtual void adjustInputFieldSpeechButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintInputFieldSpeechButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintInputFieldSpeechButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSliderThumbStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintSliderThumbDecorations(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintSliderThumbDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchField(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintSearchFieldDecorations(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintSearchFieldDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldDecorationPart(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldResultsDecorationPart(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldResultsButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustMediaControlStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaOverlayPlayButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaSeekBackButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaSeekForwardButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaRewindButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaReturnToRealtimeButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaToggleClosedCaptionsButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaControlsBackground(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaCurrentTime(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaTimeRemaining(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaFullScreenVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
- virtual bool paintMediaFullScreenVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintMediaFullscreenButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaPlayButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaOverlayPlayButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaMuteButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaSeekBackButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaSeekForwardButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaVolumeSliderContainer(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaVolumeSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaVolumeSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaRewindButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaReturnToRealtimeButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaToggleClosedCaptionsButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaControlsBackground(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaCurrentTime(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaTimeRemaining(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaFullScreenVolumeSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
+ virtual bool paintMediaFullScreenVolumeSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><del>- virtual bool paintSnapshottedPluginOverlay(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintSnapshottedPluginOverlay(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(IMAGE_CONTROLS)
</span><del>- virtual bool paintImageControlsButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintImageControlsButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- void updateControlStatesForRenderer(const RenderObject*, ControlStates*) const;
- ControlStates::States extractControlStatesForRenderer(const RenderObject*) const;
- bool isActive(const RenderObject*) const;
- bool isChecked(const RenderObject*) const;
- bool isIndeterminate(const RenderObject*) const;
- bool isEnabled(const RenderObject*) const;
- bool isFocused(const RenderObject*) const;
- bool isPressed(const RenderObject*) const;
- bool isSpinUpButtonPartPressed(const RenderObject*) const;
- bool isHovered(const RenderObject*) const;
- bool isSpinUpButtonPartHovered(const RenderObject*) const;
- bool isReadOnlyControl(const RenderObject*) const;
- bool isDefault(const RenderObject*) const;
</del><ins>+ void updateControlStatesForRenderer(const RenderObject&, ControlStates*) const;
+ ControlStates::States extractControlStatesForRenderer(const RenderObject&) const;
+ bool isActive(const RenderObject&) const;
+ bool isChecked(const RenderObject&) const;
+ bool isIndeterminate(const RenderObject&) const;
+ bool isEnabled(const RenderObject&) const;
+ bool isFocused(const RenderObject&) const;
+ bool isPressed(const RenderObject&) const;
+ bool isSpinUpButtonPartPressed(const RenderObject&) const;
+ bool isHovered(const RenderObject&) const;
+ bool isSpinUpButtonPartHovered(const RenderObject&) const;
+ bool isReadOnlyControl(const RenderObject&) const;
+ bool isDefault(const RenderObject&) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> mutable Color m_activeSelectionBackgroundColor;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.h (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.h 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.h 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -48,35 +48,35 @@
</span><span class="cx"> static CFStringRef contentSizeCategory();
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual int baselinePosition(const RenderObject*) const override;
</del><ins>+ virtual int baselinePosition(const RenderObject&) const override;
</ins><span class="cx">
</span><span class="cx"> virtual bool isControlStyled(const RenderStyle*, const BorderData&, const FillLayer& background, const Color& backgroundColor) const override;
</span><span class="cx">
</span><span class="cx"> // Methods for each appearance value.
</span><span class="cx"> virtual void adjustCheckboxStyle(StyleResolver*, RenderStyle*, Element*) const override;
</span><del>- virtual bool paintCheckboxDecorations(RenderObject*, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintCheckboxDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void adjustRadioStyle(StyleResolver*, RenderStyle*, Element*) const override;
</span><del>- virtual bool paintRadioDecorations(RenderObject*, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintRadioDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void adjustButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
</span><del>- virtual bool paintButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&) override;
- virtual bool paintPushButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
+ virtual bool paintPushButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx"> virtual void setButtonSize(RenderStyle*) const override;
</span><span class="cx">
</span><del>- virtual bool paintFileUploadIconDecorations(RenderObject* inputRenderer, RenderObject* buttonRenderer, const PaintInfo&, const IntRect&, Icon*, FileUploadDecorations) override;
</del><ins>+ virtual bool paintFileUploadIconDecorations(const RenderObject& inputRenderer, const RenderObject& buttonRenderer, const PaintInfo&, const IntRect&, Icon*, FileUploadDecorations) override;
</ins><span class="cx">
</span><del>- virtual bool paintTextFieldDecorations(RenderObject*, const PaintInfo&, const IntRect&) override;
- virtual bool paintTextAreaDecorations(RenderObject*, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintTextFieldDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
+ virtual bool paintTextAreaDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const override;
</span><del>- virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const override;
</span><del>- virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSliderThumbSize(RenderStyle*, Element*) const override;
</span><del>- virtual bool paintSliderThumbDecorations(RenderObject*, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintSliderThumbDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><span class="cx"> // Returns the repeat interval of the animation for the progress bar.
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> // Returns the duration of the animation for the progress bar.
</span><span class="cx"> virtual double animationDurationForProgressBar(RenderProgress*) const override;
</span><span class="cx">
</span><del>- virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const override;
</span><del>- virtual bool paintSearchFieldDecorations(RenderObject*, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintSearchFieldDecorations(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual Color platformActiveSelectionBackgroundColor() const override;
</span><span class="cx"> virtual Color platformInactiveSelectionBackgroundColor() const override;
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> virtual ~RenderThemeIOS() { }
</span><span class="cx">
</span><span class="cx"> const Color& shadowColor() const;
</span><del>- FloatRect addRoundedBorderClip(RenderObject* box, GraphicsContext*, const IntRect&);
</del><ins>+ FloatRect addRoundedBorderClip(const RenderObject& box, GraphicsContext*, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> String m_mediaControlsScript;
</span><span class="cx"> String m_mediaControlsStyleSheet;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -316,11 +316,11 @@
</span><span class="cx"> return color;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatRect RenderThemeIOS::addRoundedBorderClip(RenderObject* box, GraphicsContext* context, const IntRect& rect)
</del><ins>+FloatRect RenderThemeIOS::addRoundedBorderClip(const RenderObject& box, GraphicsContext* context, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> // To fix inner border bleeding issues <rdar://problem/9812507>, we clip to the outer border and assert that
</span><span class="cx"> // the border is opaque or transparent, unless we're checked because checked radio/checkboxes show no bleeding.
</span><del>- RenderStyle& style = box->style();
</del><ins>+ RenderStyle& style = box.style();
</ins><span class="cx"> RoundedRect border = isChecked(box) ? style.getRoundedInnerBorderFor(rect) : style.getRoundedBorderFor(rect);
</span><span class="cx">
</span><span class="cx"> if (border.isRounded())
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> return CGPointMake(start.x + x * ratio, start.y + y * ratio);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeIOS::paintCheckboxDecorations(RenderObject* box, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeIOS::paintCheckboxDecorations(const RenderObject& box, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx"> FloatRect clip = addRoundedBorderClip(box, paintInfo.context, rect);
</span><span class="lines">@@ -408,17 +408,17 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderThemeIOS::baselinePosition(const RenderObject* renderer) const
</del><ins>+int RenderThemeIOS::baselinePosition(const RenderObject& renderer) const
</ins><span class="cx"> {
</span><del>- if (!renderer->isBox())
</del><ins>+ if (!renderer.isBox())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><del>- const RenderBox* box = toRenderBox(renderer);
</del><ins>+ const RenderBox& box = *toRenderBox(&renderer);
</ins><span class="cx">
</span><del>- if (box->style().appearance() == CheckboxPart || box->style().appearance() == RadioPart)
- return box->marginTop() + box->height() - 2; // The baseline is 2px up from the bottom of the checkbox/radio in AppKit.
- if (box->style().appearance() == MenulistPart)
- return box->marginTop() + box->height() - 5; // This is to match AppKit. There might be a better way to calculate this though.
</del><ins>+ if (box.style().appearance() == CheckboxPart || box.style().appearance() == RadioPart)
+ return box.marginTop() + box.height() - 2; // The baseline is 2px up from the bottom of the checkbox/radio in AppKit.
+ if (box.style().appearance() == MenulistPart)
+ return box.marginTop() + box.height() - 5; // This is to match AppKit. There might be a better way to calculate this though.
</ins><span class="cx"> return RenderTheme::baselinePosition(box);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -445,7 +445,7 @@
</span><span class="cx"> style->setBorderRadius(IntSize(length.value() / 2.0f, length.value() / 2.0f));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeIOS::paintRadioDecorations(RenderObject* box, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeIOS::paintRadioDecorations(const RenderObject& box, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx"> FloatRect clip = addRoundedBorderClip(box, paintInfo.context, rect);
</span><span class="lines">@@ -473,9 +473,9 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeIOS::paintTextFieldDecorations(RenderObject* box, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeIOS::paintTextFieldDecorations(const RenderObject& box, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- RenderStyle& style = box->style();
</del><ins>+ RenderStyle& style = box.style();
</ins><span class="cx"> IntPoint point(rect.x() + style.borderLeftWidth(), rect.y() + style.borderTopWidth());
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="lines">@@ -485,14 +485,14 @@
</span><span class="cx"> // This gradient gets drawn black when printing.
</span><span class="cx"> // Do not draw the gradient if there is no visible top border.
</span><span class="cx"> bool topBorderIsInvisible = !style.hasBorder() || !style.borderTopWidth() || style.borderTopIsTransparent();
</span><del>- if (!box->view().printing() && !topBorderIsInvisible)
</del><ins>+ if (!box.view().printing() && !topBorderIsInvisible)
</ins><span class="cx"> drawAxialGradient(paintInfo.context->platformContext(), gradientWithName(InsetGradient), point, FloatPoint(CGPointMake(point.x(), point.y() + 3.0f)), LinearInterpolation);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeIOS::paintTextAreaDecorations(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeIOS::paintTextAreaDecorations(const RenderObject& box, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- return paintTextFieldDecorations(renderer, paintInfo, rect);
</del><ins>+ return paintTextFieldDecorations(box, paintInfo, rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const int MenuListMinHeight = 15;
</span><span class="lines">@@ -582,9 +582,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeIOS::paintMenuListButtonDecorations(RenderObject* box, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeIOS::paintMenuListButtonDecorations(const RenderObject& box, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- RenderStyle& style = box->style();
</del><ins>+ RenderStyle& style = box.style();
</ins><span class="cx"> float borderTopWidth = style.borderTopWidth();
</span><span class="cx"> FloatRect clip(rect.x() + style.borderLeftWidth(), rect.y() + style.borderTopWidth(), rect.width() - style.borderLeftWidth() - style.borderRightWidth(), rect.height() - style.borderTopWidth() - style.borderBottomWidth());
</span><span class="cx"> CGContextRef cgContext = paintInfo.context->platformContext();
</span><span class="lines">@@ -612,7 +612,7 @@
</span><span class="cx">
</span><span class="cx"> float separator = clip.maxX() - MenuListButtonPaddingRight;
</span><span class="cx">
</span><del>- box->drawLineForBoxSide(paintInfo.context, separator - borderTopWidth, clip.y(), separator, clip.maxY(), BSRight, style.visitedDependentColor(CSSPropertyBorderTopColor), style.borderTopStyle(), 0, 0);
</del><ins>+ box.drawLineForBoxSide(paintInfo.context, separator - borderTopWidth, clip.y(), separator, clip.maxY(), BSRight, style.visitedDependentColor(CSSPropertyBorderTopColor), style.borderTopStyle(), 0, 0);
</ins><span class="cx">
</span><span class="cx"> FloatRect buttonClip(separator - adjustTop, clip.y() - adjustTop, MenuListButtonPaddingRight + adjustTop + adjustRight, clip.height() + adjustTop + adjustBottom);
</span><span class="cx">
</span><span class="lines">@@ -631,7 +631,7 @@
</span><span class="cx">
</span><span class="cx"> // Paint Indicators.
</span><span class="cx">
</span><del>- if (box->isMenuList() && toHTMLSelectElement(box->node())->multiple()) {
</del><ins>+ if (box.isMenuList() && toHTMLSelectElement(box.node())->multiple()) {
</ins><span class="cx"> int size = 2;
</span><span class="cx"> int count = 3;
</span><span class="cx"> int padding = 3;
</span><span class="lines">@@ -684,10 +684,10 @@
</span><span class="cx"> style->setBorderRadius(LengthSize(radiusWidth, radiusHeight));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeIOS::paintSliderTrack(RenderObject* box, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeIOS::paintSliderTrack(const RenderObject& box, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> IntRect trackClip = rect;
</span><del>- RenderStyle& style = box->style();
</del><ins>+ RenderStyle& style = box.style();
</ins><span class="cx">
</span><span class="cx"> bool isHorizontal = true;
</span><span class="cx"> switch (style.appearance()) {
</span><span class="lines">@@ -779,7 +779,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeIOS::paintSliderThumbDecorations(RenderObject* box, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeIOS::paintSliderThumbDecorations(const RenderObject& box, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx"> FloatRect clip = addRoundedBorderClip(box, paintInfo.context, rect);
</span><span class="lines">@@ -807,9 +807,9 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeIOS::paintProgressBar(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeIOS::paintProgressBar(const RenderObject& renderer, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- if (!renderer->isProgress())
</del><ins>+ if (!renderer.isProgress())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> const int progressBarHeight = 9;
</span><span class="lines">@@ -836,7 +836,7 @@
</span><span class="cx"> strokeGradient->addColorStop(1.0, Color(0x8d, 0x8d, 0x8d));
</span><span class="cx"> context->setStrokeGradient(strokeGradient.release());
</span><span class="cx">
</span><del>- ColorSpace colorSpace = renderer->style().colorSpace();
</del><ins>+ ColorSpace colorSpace = renderer.style().colorSpace();
</ins><span class="cx"> context->setFillColor(Color(255, 255, 255), colorSpace);
</span><span class="cx">
</span><span class="cx"> Path trackPath;
</span><span class="lines">@@ -857,10 +857,10 @@
</span><span class="cx">
</span><span class="cx"> context->fillRect(FloatRect(rect.x(), verticalRenderingPosition, rect.width(), upperGradientHeight));
</span><span class="cx">
</span><del>- RenderProgress* renderProgress = toRenderProgress(renderer);
- if (renderProgress->isDeterminate()) {
</del><ins>+ const RenderProgress& renderProgress = *toRenderProgress(&renderer);
+ if (renderProgress.isDeterminate()) {
</ins><span class="cx"> // 2) Draw the progress bar.
</span><del>- double position = clampTo(renderProgress->position(), 0.0, 1.0);
</del><ins>+ double position = clampTo(renderProgress.position(), 0.0, 1.0);
</ins><span class="cx"> double barWidth = position * rect.width();
</span><span class="cx"> RefPtr<Gradient> barGradient = Gradient::create(FloatPoint(rect.x(), verticalRenderingPosition + 0.5), FloatPoint(rect.x(), verticalRenderingPosition + progressBarHeight - 1));
</span><span class="cx"> barGradient->addColorStop(0.0, Color(195, 217, 247));
</span><span class="lines">@@ -879,7 +879,7 @@
</span><span class="cx">
</span><span class="cx"> Path barPath;
</span><span class="cx"> int left = rect.x();
</span><del>- if (!renderProgress->style().isLeftToRightDirection())
</del><ins>+ if (!renderProgress.style().isLeftToRightDirection())
</ins><span class="cx"> left = rect.maxX() - barWidth;
</span><span class="cx"> FloatRect barRect(left + 0.25, verticalRenderingPosition + 0.25, std::max(barWidth - 0.5, 0.0), progressBarHeight - 0.5);
</span><span class="cx"> barPath.addRoundedRect(barRect, roundedCornerRadius);
</span><span class="lines">@@ -921,7 +921,7 @@
</span><span class="cx"> adjustRoundBorderRadius(*style, box);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeIOS::paintSearchFieldDecorations(RenderObject* box, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeIOS::paintSearchFieldDecorations(const RenderObject& box, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintTextFieldDecorations(box, paintInfo, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -947,18 +947,18 @@
</span><span class="cx"> adjustRoundBorderRadius(*style, box);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeIOS::paintButtonDecorations(RenderObject* box, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeIOS::paintButtonDecorations(const RenderObject& box, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintPushButtonDecorations(box, paintInfo, rect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeIOS::paintPushButtonDecorations(RenderObject* box, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeIOS::paintPushButtonDecorations(const RenderObject& box, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx"> FloatRect clip = addRoundedBorderClip(box, paintInfo.context, rect);
</span><span class="cx">
</span><span class="cx"> CGContextRef cgContext = paintInfo.context->platformContext();
</span><del>- if (box->style().visitedDependentColor(CSSPropertyBackgroundColor).isDark())
</del><ins>+ if (box.style().visitedDependentColor(CSSPropertyBackgroundColor).isDark())
</ins><span class="cx"> drawAxialGradient(cgContext, gradientWithName(ConvexGradient), clip.location(), FloatPoint(clip.x(), clip.maxY()), LinearInterpolation);
</span><span class="cx"> else {
</span><span class="cx"> drawAxialGradient(cgContext, gradientWithName(ShadeGradient), clip.location(), FloatPoint(clip.x(), clip.maxY()), LinearInterpolation);
</span><span class="lines">@@ -982,12 +982,12 @@
</span><span class="cx"> const int kVisibleBackgroundImageWidth = 1;
</span><span class="cx"> const int kMultipleThumbnailShrinkSize = 2;
</span><span class="cx">
</span><del>-bool RenderThemeIOS::paintFileUploadIconDecorations(RenderObject*, RenderObject* buttonRenderer, const PaintInfo& paintInfo, const IntRect& rect, Icon* icon, FileUploadDecorations fileUploadDecorations)
</del><ins>+bool RenderThemeIOS::paintFileUploadIconDecorations(const RenderObject&, const RenderObject& buttonRenderer, const PaintInfo& paintInfo, const IntRect& rect, Icon* icon, FileUploadDecorations fileUploadDecorations)
</ins><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx">
</span><span class="cx"> IntSize cornerSize(kThumbnailBorderCornerRadius, kThumbnailBorderCornerRadius);
</span><del>- Color pictureFrameColor = buttonRenderer ? buttonRenderer->style().visitedDependentColor(CSSPropertyBorderTopColor) : Color(76.0f, 76.0f, 76.0f);
</del><ins>+ Color pictureFrameColor = buttonRenderer.style().visitedDependentColor(CSSPropertyBorderTopColor);
</ins><span class="cx">
</span><span class="cx"> IntRect thumbnailPictureFrameRect = rect;
</span><span class="cx"> IntRect thumbnailRect = rect;
</span><span class="lines">@@ -1000,7 +1000,7 @@
</span><span class="cx"> thumbnailRect.contract(kMultipleThumbnailShrinkSize, kMultipleThumbnailShrinkSize);
</span><span class="cx">
</span><span class="cx"> // Background picture frame and simple background icon with a gradient matching the button.
</span><del>- Color backgroundImageColor = buttonRenderer ? Color(buttonRenderer->style().visitedDependentColor(CSSPropertyBackgroundColor).rgb()) : Color(206.0f, 206.0f, 206.0f);
</del><ins>+ Color backgroundImageColor = Color(buttonRenderer.style().visitedDependentColor(CSSPropertyBackgroundColor).rgb());
</ins><span class="cx"> paintInfo.context->fillRoundedRect(FloatRoundedRect(thumbnailPictureFrameRect, cornerSize, cornerSize, cornerSize, cornerSize), pictureFrameColor, ColorSpaceDeviceRGB);
</span><span class="cx"> paintInfo.context->fillRect(thumbnailRect, backgroundImageColor, ColorSpaceDeviceRGB);
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.h 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -44,12 +44,12 @@
</span><span class="cx"> static PassRefPtr<RenderTheme> create();
</span><span class="cx">
</span><span class="cx"> // A method asking if the control changes its tint when the window has focus or not.
</span><del>- virtual bool controlSupportsTints(const RenderObject*) const;
</del><ins>+ virtual bool controlSupportsTints(const RenderObject&) const;
</ins><span class="cx">
</span><span class="cx"> // A general method asking if any control tinting is supported at all.
</span><span class="cx"> virtual bool supportsControlTints() const { return true; }
</span><span class="cx">
</span><del>- virtual void adjustRepaintRect(const RenderObject*, IntRect&) override;
</del><ins>+ virtual void adjustRepaintRect(const RenderObject&, IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool isControlStyled(const RenderStyle*, const BorderData&, const FillLayer&, const Color& backgroundColor) const;
</span><span class="cx">
</span><span class="lines">@@ -82,13 +82,13 @@
</span><span class="cx"> virtual int popupInternalPaddingTop(RenderStyle*) const;
</span><span class="cx"> virtual int popupInternalPaddingBottom(RenderStyle*) const;
</span><span class="cx">
</span><del>- virtual bool paintCapsLockIndicator(RenderObject*, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintCapsLockIndicator(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool popsMenuByArrowKeys() const override { return true; }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(METER_ELEMENT)
</span><span class="cx"> virtual IntSize meterSizeForBounds(const RenderMeter*, const IntRect&) const override;
</span><del>- virtual bool paintMeter(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMeter(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual bool supportsMeter(ControlPart) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -97,14 +97,14 @@
</span><span class="cx"> virtual double animationRepeatIntervalForProgressBar(RenderProgress*) const;
</span><span class="cx"> // Returns the duration of the animation for the progress bar.
</span><span class="cx"> virtual double animationDurationForProgressBar(RenderProgress*) const;
</span><del>- virtual IntRect progressBarRectForBounds(const RenderObject*, const IntRect&) const override;
</del><ins>+ virtual IntRect progressBarRectForBounds(const RenderObject&, const IntRect&) const override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual Color systemColor(CSSValueID) const;
</span><span class="cx"> // Controls color values returned from platformFocusRingColor(). systemColor() will be used when false.
</span><span class="cx"> virtual bool usesTestModeFocusRingColor() const;
</span><span class="cx"> // A view associated to the contained document. Subclasses may not have such a view and return a fake.
</span><del>- NSView* documentViewFor(RenderObject*) const;
</del><ins>+ NSView* documentViewFor(const RenderObject&) const;
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -123,43 +123,43 @@
</span><span class="cx">
</span><span class="cx"> virtual bool supportsSelectionForegroundColors() const { return false; }
</span><span class="cx">
</span><del>- virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintTextField(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustTextFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintTextArea(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustTextAreaStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><span class="cx"> virtual void adjustProgressBarStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintProgressBar(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustSliderTrackStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustSliderThumbStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintSearchField(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldResultsDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldResultsButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> virtual bool supportsClosedCaptioning() const { return true; }
</span><span class="lines">@@ -167,14 +167,14 @@
</span><span class="cx">
</span><span class="cx"> virtual bool shouldShowPlaceholderWhenFocused() const;
</span><span class="cx">
</span><del>- virtual bool paintSnapshottedPluginOverlay(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSnapshottedPluginOverlay(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual String fileListNameForWidth(const FileList*, const Font&, int width, bool multipleFilesAllowed) const override;
</span><span class="cx">
</span><span class="cx"> IntRect inflateRect(const IntRect&, const IntSize&, const int* margins, float zoomLevel = 1.0f) const;
</span><span class="cx">
</span><del>- FloatRect convertToPaintingRect(const RenderObject* inputRenderer, const RenderObject* partRenderer, const FloatRect& inputRect, const IntRect&) const;
</del><ins>+ FloatRect convertToPaintingRect(const RenderObject& inputRenderer, const RenderObject& partRenderer, const FloatRect& inputRect, const IntRect&) const;
</ins><span class="cx">
</span><span class="cx"> // Get the control size based off the font. Used by some of the controls (like buttons).
</span><span class="cx"> NSControlSize controlSizeForFont(RenderStyle*) const;
</span><span class="lines">@@ -185,26 +185,26 @@
</span><span class="cx"> IntSize sizeForSystemFont(RenderStyle*, const IntSize* sizes) const;
</span><span class="cx"> void setFontFromControlSize(StyleResolver*, RenderStyle*, NSControlSize) const;
</span><span class="cx">
</span><del>- void updateCheckedState(NSCell*, const RenderObject*);
- void updateEnabledState(NSCell*, const RenderObject*);
- void updateFocusedState(NSCell*, const RenderObject*);
- void updatePressedState(NSCell*, const RenderObject*);
</del><ins>+ void updateCheckedState(NSCell*, const RenderObject&);
+ void updateEnabledState(NSCell*, const RenderObject&);
+ void updateFocusedState(NSCell*, const RenderObject&);
+ void updatePressedState(NSCell*, const RenderObject&);
</ins><span class="cx"> // An optional hook for subclasses to update the control tint of NSCell.
</span><del>- virtual void updateActiveState(NSCell*, const RenderObject*) { }
</del><ins>+ virtual void updateActiveState(NSCell*, const RenderObject&) { }
</ins><span class="cx">
</span><span class="cx"> // Helpers for adjusting appearance and for painting
</span><span class="cx">
</span><del>- void setPopupButtonCellState(const RenderObject*, const IntRect&);
</del><ins>+ void setPopupButtonCellState(const RenderObject&, const IntRect&);
</ins><span class="cx"> const IntSize* popupButtonSizes() const;
</span><span class="cx"> const int* popupButtonMargins() const;
</span><span class="cx"> const int* popupButtonPadding(NSControlSize) const;
</span><del>- void paintMenuListButtonGradients(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ void paintMenuListButtonGradients(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> const IntSize* menuListSizes() const;
</span><span class="cx">
</span><span class="cx"> const IntSize* searchFieldSizes() const;
</span><span class="cx"> const IntSize* cancelButtonSizes() const;
</span><span class="cx"> const IntSize* resultsButtonSizes() const;
</span><del>- void setSearchCellState(RenderObject*, const IntRect&);
</del><ins>+ void setSearchCellState(const RenderObject&, const IntRect&);
</ins><span class="cx"> void setSearchFieldSize(RenderStyle*) const;
</span><span class="cx">
</span><span class="cx"> NSPopUpButtonCell *popupButton() const;
</span><span class="lines">@@ -226,8 +226,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IMAGE_CONTROLS)
</span><del>- virtual bool paintImageControlsButton(RenderObject*, const PaintInfo&, const IntRect&) override;
- virtual IntSize imageControlsButtonSize(const RenderObject*) const override;
</del><ins>+ virtual bool paintImageControlsButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
+ virtual IntSize imageControlsButtonSize(const const RenderObject&) const override;
</ins><span class="cx"> NSServicesRolloverButtonCell *servicesRolloverButtonCell() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -217,10 +217,10 @@
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:m_notificationObserver.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NSView* RenderThemeMac::documentViewFor(RenderObject* o) const
</del><ins>+NSView* RenderThemeMac::documentViewFor(const RenderObject& o) const
</ins><span class="cx"> {
</span><span class="cx"> ControlStates states(extractControlStatesForRenderer(o));
</span><del>- return ThemeMac::ensuredView(&o->view().frameView(), &states);
</del><ins>+ return ThemeMac::ensuredView(&o.view().frameView(), &states);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="lines">@@ -602,9 +602,9 @@
</span><span class="cx"> return RenderTheme::isControlStyled(style, border, background, backgroundColor);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeMac::adjustRepaintRect(const RenderObject* o, IntRect& r)
</del><ins>+void RenderThemeMac::adjustRepaintRect(const RenderObject& o, IntRect& r)
</ins><span class="cx"> {
</span><del>- ControlPart part = o->style().appearance();
</del><ins>+ ControlPart part = o.style().appearance();
</ins><span class="cx">
</span><span class="cx"> #if USE(NEW_THEME)
</span><span class="cx"> switch (part) {
</span><span class="lines">@@ -621,7 +621,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- float zoomLevel = o->style().effectiveZoom();
</del><ins>+ float zoomLevel = o.style().effectiveZoom();
</ins><span class="cx">
</span><span class="cx"> if (part == MenulistPart) {
</span><span class="cx"> setPopupButtonCellState(o, r);
</span><span class="lines">@@ -650,20 +650,20 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatRect RenderThemeMac::convertToPaintingRect(const RenderObject* inputRenderer, const RenderObject* partRenderer, const FloatRect& inputRect, const IntRect& r) const
</del><ins>+FloatRect RenderThemeMac::convertToPaintingRect(const RenderObject& inputRenderer, const RenderObject& partRenderer, const FloatRect& inputRect, const IntRect& r) const
</ins><span class="cx"> {
</span><span class="cx"> FloatRect partRect(inputRect);
</span><span class="cx">
</span><span class="cx"> // Compute an offset between the part renderer and the input renderer
</span><span class="cx"> FloatSize offsetFromInputRenderer;
</span><del>- const RenderObject* renderer = partRenderer;
- while (renderer && renderer != inputRenderer) {
</del><ins>+ const RenderObject* renderer = &partRenderer;
+ while (renderer && renderer != &inputRenderer) {
</ins><span class="cx"> RenderElement* containingRenderer = renderer->container();
</span><span class="cx"> offsetFromInputRenderer -= roundedIntSize(renderer->offsetFromContainer(containingRenderer, LayoutPoint()));
</span><span class="cx"> renderer = containingRenderer;
</span><span class="cx"> }
</span><span class="cx"> // If the input renderer was not a container, something went wrong
</span><del>- ASSERT(renderer == inputRenderer);
</del><ins>+ ASSERT(renderer == &inputRenderer);
</ins><span class="cx"> // Move the rect into partRenderer's coords
</span><span class="cx"> partRect.move(offsetFromInputRenderer);
</span><span class="cx"> // Account for the local drawing offset (tx, ty)
</span><span class="lines">@@ -672,7 +672,7 @@
</span><span class="cx"> return partRect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeMac::updateCheckedState(NSCell* cell, const RenderObject* o)
</del><ins>+void RenderThemeMac::updateCheckedState(NSCell* cell, const RenderObject& o)
</ins><span class="cx"> {
</span><span class="cx"> bool oldIndeterminate = [cell state] == NSMixedState;
</span><span class="cx"> bool indeterminate = isIndeterminate(o);
</span><span class="lines">@@ -688,7 +688,7 @@
</span><span class="cx"> [cell setState:checked ? NSOnState : NSOffState];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeMac::updateEnabledState(NSCell* cell, const RenderObject* o)
</del><ins>+void RenderThemeMac::updateEnabledState(NSCell* cell, const RenderObject& o)
</ins><span class="cx"> {
</span><span class="cx"> bool oldEnabled = [cell isEnabled];
</span><span class="cx"> bool enabled = isEnabled(o);
</span><span class="lines">@@ -696,23 +696,23 @@
</span><span class="cx"> [cell setEnabled:enabled];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeMac::updateFocusedState(NSCell* cell, const RenderObject* o)
</del><ins>+void RenderThemeMac::updateFocusedState(NSCell* cell, const RenderObject& o)
</ins><span class="cx"> {
</span><span class="cx"> bool oldFocused = [cell showsFirstResponder];
</span><del>- bool focused = isFocused(o) && o->style().outlineStyleIsAuto();
</del><ins>+ bool focused = isFocused(o) && o.style().outlineStyleIsAuto();
</ins><span class="cx"> if (focused != oldFocused)
</span><span class="cx"> [cell setShowsFirstResponder:focused];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeMac::updatePressedState(NSCell* cell, const RenderObject* o)
</del><ins>+void RenderThemeMac::updatePressedState(NSCell* cell, const RenderObject& o)
</ins><span class="cx"> {
</span><span class="cx"> bool oldPressed = [cell isHighlighted];
</span><del>- bool pressed = o->node() && o->node()->isElementNode() && toElement(o->node())->active();
</del><ins>+ bool pressed = o.node() && o.node()->isElementNode() && toElement(o.node())->active();
</ins><span class="cx"> if (pressed != oldPressed)
</span><span class="cx"> [cell setHighlighted:pressed];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::controlSupportsTints(const RenderObject* o) const
</del><ins>+bool RenderThemeMac::controlSupportsTints(const RenderObject& o) const
</ins><span class="cx"> {
</span><span class="cx"> // An alternate way to implement this would be to get the appropriate cell object
</span><span class="cx"> // and call the private _needRedrawOnWindowChangedKeyState method. An advantage of
</span><span class="lines">@@ -723,7 +723,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Checkboxes only have tint when checked.
</span><del>- if (o->style().appearance() == CheckboxPart)
</del><ins>+ if (o.style().appearance() == CheckboxPart)
</ins><span class="cx"> return isChecked(o);
</span><span class="cx">
</span><span class="cx"> // For now assume other controls have tint if enabled.
</span><span class="lines">@@ -811,7 +811,7 @@
</span><span class="cx"> return NSMiniControlSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintTextField(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeMac::paintTextField(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> LocalCurrentGraphicsContext localContext(paintInfo.context);
</span><span class="cx">
</span><span class="lines">@@ -831,7 +831,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintCapsLockIndicator(RenderObject*, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeMac::paintCapsLockIndicator(const RenderObject&, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> if (paintInfo.context->paintingDisabled())
</span><span class="cx"> return true;
</span><span class="lines">@@ -842,7 +842,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintTextArea(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeMac::paintTextArea(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> LocalCurrentGraphicsContext localContext(paintInfo.context);
</span><span class="cx"> wkDrawBezeledTextArea(r, isEnabled(o) && !isReadOnlyControl(o));
</span><span class="lines">@@ -881,21 +881,21 @@
</span><span class="cx"> return padding[size];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintMenuList(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeMac::paintMenuList(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> LocalCurrentGraphicsContext localContext(paintInfo.context);
</span><span class="cx"> setPopupButtonCellState(o, r);
</span><span class="cx">
</span><span class="cx"> NSPopUpButtonCell* popupButton = this->popupButton();
</span><span class="cx">
</span><del>- float zoomLevel = o->style().effectiveZoom();
</del><ins>+ float zoomLevel = o.style().effectiveZoom();
</ins><span class="cx"> IntSize size = popupButtonSizes()[[popupButton controlSize]];
</span><span class="cx"> size.setHeight(size.height() * zoomLevel);
</span><span class="cx"> size.setWidth(r.width());
</span><span class="cx">
</span><span class="cx"> // Now inflate it to account for the shadow.
</span><span class="cx"> IntRect inflatedRect = r;
</span><del>- if (r.width() >= minimumMenuListSize(&o->style()))
</del><ins>+ if (r.width() >= minimumMenuListSize(&o.style()))
</ins><span class="cx"> inflatedRect = inflateRect(inflatedRect, size, popupButtonMargins(), zoomLevel);
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="lines">@@ -913,7 +913,7 @@
</span><span class="cx">
</span><span class="cx"> NSView *view = documentViewFor(o);
</span><span class="cx"> [popupButton drawWithFrame:inflatedRect inView:view];
</span><del>- if (isFocused(o) && o->style().outlineStyleIsAuto())
</del><ins>+ if (isFocused(o) && o.style().outlineStyleIsAuto())
</ins><span class="cx"> [popupButton _web_drawFocusRingWithFrame:inflatedRect inView:view];
</span><span class="cx"> [popupButton setControlView:nil];
</span><span class="cx">
</span><span class="lines">@@ -934,14 +934,14 @@
</span><span class="cx"> bounds.height() < cellSize.height ? cellSize.height : bounds.height());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintMeter(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeMac::paintMeter(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- if (!renderObject->isMeter())
</del><ins>+ if (!renderObject.isMeter())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> LocalCurrentGraphicsContext localContext(paintInfo.context);
</span><span class="cx">
</span><del>- NSLevelIndicatorCell* cell = levelIndicatorFor(toRenderMeter(renderObject));
</del><ins>+ NSLevelIndicatorCell* cell = levelIndicatorFor(toRenderMeter(&renderObject));
</ins><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx">
</span><span class="cx"> [cell drawWithFrame:rect inView:documentViewFor(renderObject)];
</span><span class="lines">@@ -1042,23 +1042,23 @@
</span><span class="cx"> return margins[controlSize];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect RenderThemeMac::progressBarRectForBounds(const RenderObject* renderObject, const IntRect& bounds) const
</del><ins>+IntRect RenderThemeMac::progressBarRectForBounds(const RenderObject& renderObject, const IntRect& bounds) const
</ins><span class="cx"> {
</span><span class="cx"> // Workaround until <rdar://problem/15855086> is fixed.
</span><span class="cx"> int maxDimension = static_cast<int>(std::numeric_limits<ushort>::max());
</span><span class="cx"> IntRect progressBarBounds(bounds.x(), bounds.y(), std::min(bounds.width(), maxDimension), std::min(bounds.height(), maxDimension));
</span><del>- if (NoControlPart == renderObject->style().appearance())
</del><ins>+ if (NoControlPart == renderObject.style().appearance())
</ins><span class="cx"> return progressBarBounds;
</span><span class="cx">
</span><del>- float zoomLevel = renderObject->style().effectiveZoom();
- NSControlSize controlSize = controlSizeForFont(&renderObject->style());
</del><ins>+ float zoomLevel = renderObject.style().effectiveZoom();
+ NSControlSize controlSize = controlSizeForFont(&renderObject.style());
</ins><span class="cx"> IntSize size = progressBarSizes()[controlSize];
</span><span class="cx"> size.setHeight(size.height() * zoomLevel);
</span><span class="cx"> size.setWidth(progressBarBounds.width());
</span><span class="cx">
</span><span class="cx"> // Now inflate it to account for the shadow.
</span><span class="cx"> IntRect inflatedRect = progressBarBounds;
</span><del>- if (progressBarBounds.height() <= minimumProgressBarHeight(&renderObject->style()))
</del><ins>+ if (progressBarBounds.height() <= minimumProgressBarHeight(&renderObject.style()))
</ins><span class="cx"> inflatedRect = inflateRect(inflatedRect, size, progressBarMargins(controlSize), zoomLevel);
</span><span class="cx">
</span><span class="cx"> return inflatedRect;
</span><span class="lines">@@ -1083,28 +1083,28 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintProgressBar(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeMac::paintProgressBar(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- if (!renderObject->isProgress())
</del><ins>+ if (!renderObject.isProgress())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> IntRect inflatedRect = progressBarRectForBounds(renderObject, rect);
</span><del>- NSControlSize controlSize = controlSizeForFont(&renderObject->style());
</del><ins>+ NSControlSize controlSize = controlSizeForFont(&renderObject.style());
</ins><span class="cx">
</span><del>- RenderProgress* renderProgress = toRenderProgress(renderObject);
</del><ins>+ const RenderProgress& renderProgress = *toRenderProgress(&renderObject);
</ins><span class="cx"> HIThemeTrackDrawInfo trackInfo;
</span><span class="cx"> trackInfo.version = 0;
</span><span class="cx"> if (controlSize == NSRegularControlSize)
</span><del>- trackInfo.kind = renderProgress->position() < 0 ? kThemeLargeIndeterminateBar : kThemeLargeProgressBar;
</del><ins>+ trackInfo.kind = renderProgress.position() < 0 ? kThemeLargeIndeterminateBar : kThemeLargeProgressBar;
</ins><span class="cx"> else
</span><del>- trackInfo.kind = renderProgress->position() < 0 ? kThemeMediumIndeterminateBar : kThemeMediumProgressBar;
</del><ins>+ trackInfo.kind = renderProgress.position() < 0 ? kThemeMediumIndeterminateBar : kThemeMediumProgressBar;
</ins><span class="cx">
</span><del>- float deviceScaleFactor = renderObject->document().deviceScaleFactor();
</del><ins>+ float deviceScaleFactor = renderObject.document().deviceScaleFactor();
</ins><span class="cx"> trackInfo.bounds = IntRect(IntPoint(), inflatedRect.size());
</span><span class="cx"> trackInfo.min = 0;
</span><span class="cx"> trackInfo.max = std::numeric_limits<SInt32>::max();
</span><del>- trackInfo.value = lround(renderProgress->position() * nextafter(trackInfo.max, 0));
- trackInfo.trackInfo.progress.phase = lround(renderProgress->animationProgress() * nextafter(progressAnimationNumFrames, 0) * deviceScaleFactor);
</del><ins>+ trackInfo.value = lround(renderProgress.position() * nextafter(trackInfo.max, 0));
+ trackInfo.trackInfo.progress.phase = lround(renderProgress.animationProgress() * nextafter(progressAnimationNumFrames, 0) * deviceScaleFactor);
</ins><span class="cx"> trackInfo.attributes = kThemeTrackHorizontal;
</span><span class="cx"> trackInfo.enableState = isActive(renderObject) ? kThemeTrackActive : kThemeTrackInactive;
</span><span class="cx"> trackInfo.reserved = 0;
</span><span class="lines">@@ -1120,7 +1120,7 @@
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx">
</span><del>- if (!renderProgress->style().isLeftToRightDirection()) {
</del><ins>+ if (!renderProgress.style().isLeftToRightDirection()) {
</ins><span class="cx"> paintInfo.context->translate(2 * inflatedRect.x() + inflatedRect.width(), 0);
</span><span class="cx"> paintInfo.context->scale(FloatSize(-1, 1));
</span><span class="cx"> }
</span><span class="lines">@@ -1182,7 +1182,7 @@
</span><span class="cx"> outData[i] = (1.0f - a) * dark[i] + a * light[i];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeMac::paintMenuListButtonGradients(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+void RenderThemeMac::paintMenuListButtonGradients(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> if (r.isEmpty())
</span><span class="cx"> return;
</span><span class="lines">@@ -1192,7 +1192,7 @@
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx">
</span><del>- FloatRoundedRect border = FloatRoundedRect(o->style().getRoundedBorderFor(r, &o->view()));
</del><ins>+ FloatRoundedRect border = FloatRoundedRect(o.style().getRoundedBorderFor(r, &o.view()));
</ins><span class="cx"> int radius = border.radii().topLeft().width();
</span><span class="cx">
</span><span class="cx"> CGColorSpaceRef cspace = deviceRGBColorSpaceRef();
</span><span class="lines">@@ -1249,29 +1249,29 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintMenuListButtonDecorations(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeMac::paintMenuListButtonDecorations(const RenderObject& renderer, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- IntRect bounds = IntRect(rect.x() + renderer->style().borderLeftWidth(),
- rect.y() + renderer->style().borderTopWidth(),
- rect.width() - renderer->style().borderLeftWidth() - renderer->style().borderRightWidth(),
- rect.height() - renderer->style().borderTopWidth() - renderer->style().borderBottomWidth());
</del><ins>+ IntRect bounds = IntRect(rect.x() + renderer.style().borderLeftWidth(),
+ rect.y() + renderer.style().borderTopWidth(),
+ rect.width() - renderer.style().borderLeftWidth() - renderer.style().borderRightWidth(),
+ rect.height() - renderer.style().borderTopWidth() - renderer.style().borderBottomWidth());
</ins><span class="cx"> // Draw the gradients to give the styled popup menu a button appearance
</span><span class="cx"> paintMenuListButtonGradients(renderer, paintInfo, bounds);
</span><span class="cx">
</span><span class="cx"> // Since we actually know the size of the control here, we restrict the font scale to make sure the arrows will fit vertically in the bounds
</span><del>- float fontScale = std::min(renderer->style().fontSize() / baseFontSize, bounds.height() / (baseArrowHeight * 2 + baseSpaceBetweenArrows));
</del><ins>+ float fontScale = std::min(renderer.style().fontSize() / baseFontSize, bounds.height() / (baseArrowHeight * 2 + baseSpaceBetweenArrows));
</ins><span class="cx"> float centerY = bounds.y() + bounds.height() / 2.0f;
</span><span class="cx"> float arrowHeight = baseArrowHeight * fontScale;
</span><span class="cx"> float arrowWidth = baseArrowWidth * fontScale;
</span><del>- float leftEdge = bounds.maxX() - arrowPaddingRight * renderer->style().effectiveZoom() - arrowWidth;
</del><ins>+ float leftEdge = bounds.maxX() - arrowPaddingRight * renderer.style().effectiveZoom() - arrowWidth;
</ins><span class="cx"> float spaceBetweenArrows = baseSpaceBetweenArrows * fontScale;
</span><span class="cx">
</span><del>- if (bounds.width() < arrowWidth + arrowPaddingLeft * renderer->style().effectiveZoom())
</del><ins>+ if (bounds.width() < arrowWidth + arrowPaddingLeft * renderer.style().effectiveZoom())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx">
</span><del>- paintInfo.context->setFillColor(renderer->style().visitedDependentColor(CSSPropertyColor), renderer->style().colorSpace());
</del><ins>+ paintInfo.context->setFillColor(renderer.style().visitedDependentColor(CSSPropertyColor), renderer.style().colorSpace());
</ins><span class="cx"> paintInfo.context->setStrokeStyle(NoStroke);
</span><span class="cx">
</span><span class="cx"> FloatPoint arrow1[3];
</span><span class="lines">@@ -1295,7 +1295,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Should the separator thickness and space be scaled up by fontScale?
</span><span class="cx"> int separatorSpace = 2; // Deliberately ignores zoom since it looks nicer if it stays thin.
</span><del>- int leftEdgeOfSeparator = static_cast<int>(leftEdge - arrowPaddingLeft * renderer->style().effectiveZoom()); // FIXME: Round?
</del><ins>+ int leftEdgeOfSeparator = static_cast<int>(leftEdge - arrowPaddingLeft * renderer.style().effectiveZoom()); // FIXME: Round?
</ins><span class="cx">
</span><span class="cx"> // Draw the separator to the left of the arrows
</span><span class="cx"> paintInfo.context->setStrokeThickness(1); // Deliberately ignores zoom since it looks nicer if it stays thin.
</span><span class="lines">@@ -1396,12 +1396,12 @@
</span><span class="cx"> style->setLineHeight(RenderStyle::initialLineHeight());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeMac::setPopupButtonCellState(const RenderObject* o, const IntRect& r)
</del><ins>+void RenderThemeMac::setPopupButtonCellState(const RenderObject& o, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> NSPopUpButtonCell* popupButton = this->popupButton();
</span><span class="cx">
</span><span class="cx"> // Set the control size based off the rectangle we're painting into.
</span><del>- setControlSize(popupButton, popupButtonSizes(), r.size(), o->style().effectiveZoom());
</del><ins>+ setControlSize(popupButton, popupButtonSizes(), r.size(), o.style().effectiveZoom());
</ins><span class="cx">
</span><span class="cx"> // Update the various states we respond to.
</span><span class="cx"> updateActiveState(popupButton, o);
</span><span class="lines">@@ -1429,16 +1429,16 @@
</span><span class="cx"> style->setBoxShadow(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintSliderTrack(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeMac::paintSliderTrack(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> IntRect bounds = r;
</span><del>- float zoomLevel = o->style().effectiveZoom();
</del><ins>+ float zoomLevel = o.style().effectiveZoom();
</ins><span class="cx"> float zoomedTrackWidth = trackWidth * zoomLevel;
</span><span class="cx">
</span><del>- if (o->style().appearance() == SliderHorizontalPart || o->style().appearance() == MediaSliderPart) {
</del><ins>+ if (o.style().appearance() == SliderHorizontalPart || o.style().appearance() == MediaSliderPart) {
</ins><span class="cx"> bounds.setHeight(zoomedTrackWidth);
</span><span class="cx"> bounds.setY(r.y() + r.height() / 2 - zoomedTrackWidth / 2);
</span><del>- } else if (o->style().appearance() == SliderVerticalPart) {
</del><ins>+ } else if (o.style().appearance() == SliderVerticalPart) {
</ins><span class="cx"> bounds.setWidth(zoomedTrackWidth);
</span><span class="cx"> bounds.setX(r.x() + r.width() / 2 - zoomedTrackWidth / 2);
</span><span class="cx"> }
</span><span class="lines">@@ -1457,7 +1457,7 @@
</span><span class="cx"> struct CGFunctionCallbacks mainCallbacks = { 0, TrackGradientInterpolate, NULL };
</span><span class="cx"> RetainPtr<CGFunctionRef> mainFunction = adoptCF(CGFunctionCreate(NULL, 1, NULL, 4, NULL, &mainCallbacks));
</span><span class="cx"> RetainPtr<CGShadingRef> mainShading;
</span><del>- if (o->style().appearance() == SliderVerticalPart)
</del><ins>+ if (o.style().appearance() == SliderVerticalPart)
</ins><span class="cx"> mainShading = adoptCF(CGShadingCreateAxial(cspace, CGPointMake(bounds.x(), bounds.maxY()), CGPointMake(bounds.maxX(), bounds.maxY()), mainFunction.get(), false, false));
</span><span class="cx"> else
</span><span class="cx"> mainShading = adoptCF(CGShadingCreateAxial(cspace, CGPointMake(bounds.x(), bounds.y()), CGPointMake(bounds.x(), bounds.maxY()), mainFunction.get(), false, false));
</span><span class="lines">@@ -1478,9 +1478,9 @@
</span><span class="cx">
</span><span class="cx"> const float verticalSliderHeightPadding = 0.1f;
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeMac::paintSliderThumb(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><del>- NSSliderCell* sliderThumbCell = o->style().appearance() == SliderThumbVerticalPart
</del><ins>+ NSSliderCell* sliderThumbCell = o.style().appearance() == SliderThumbVerticalPart
</ins><span class="cx"> ? sliderThumbVertical()
</span><span class="cx"> : sliderThumbHorizontal();
</span><span class="cx">
</span><span class="lines">@@ -1489,19 +1489,20 @@
</span><span class="cx"> // Update the various states we respond to.
</span><span class="cx"> updateActiveState(sliderThumbCell, o);
</span><span class="cx"> updateEnabledState(sliderThumbCell, o);
</span><del>- Element* focusDelegate = (o->node() && o->node()->isElementNode()) ? toElement(o->node())->focusDelegate() : 0;
- updateFocusedState(sliderThumbCell, focusDelegate ? focusDelegate->renderer() : 0);
</del><ins>+ Element* focusDelegate = (o.node() && o.node()->isElementNode()) ? toElement(o.node())->focusDelegate() : 0;
+ if (focusDelegate)
+ updateFocusedState(sliderThumbCell, *focusDelegate->renderer());
</ins><span class="cx">
</span><span class="cx"> // Update the pressed state using the NSCell tracking methods, since that's how NSSliderCell keeps track of it.
</span><span class="cx"> bool oldPressed;
</span><del>- if (o->style().appearance() == SliderThumbVerticalPart)
</del><ins>+ if (o.style().appearance() == SliderThumbVerticalPart)
</ins><span class="cx"> oldPressed = m_isSliderThumbVerticalPressed;
</span><span class="cx"> else
</span><span class="cx"> oldPressed = m_isSliderThumbHorizontalPressed;
</span><span class="cx">
</span><span class="cx"> bool pressed = isPressed(o);
</span><span class="cx">
</span><del>- if (o->style().appearance() == SliderThumbVerticalPart)
</del><ins>+ if (o.style().appearance() == SliderThumbVerticalPart)
</ins><span class="cx"> m_isSliderThumbVerticalPressed = pressed;
</span><span class="cx"> else
</span><span class="cx"> m_isSliderThumbHorizontalPressed = pressed;
</span><span class="lines">@@ -1515,11 +1516,11 @@
</span><span class="cx">
</span><span class="cx"> FloatRect bounds = r;
</span><span class="cx"> // Make the height of the vertical slider slightly larger so NSSliderCell will draw a vertical slider.
</span><del>- if (o->style().appearance() == SliderThumbVerticalPart)
- bounds.setHeight(bounds.height() + verticalSliderHeightPadding * o->style().effectiveZoom());
</del><ins>+ if (o.style().appearance() == SliderThumbVerticalPart)
+ bounds.setHeight(bounds.height() + verticalSliderHeightPadding * o.style().effectiveZoom());
</ins><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><del>- float zoomLevel = o->style().effectiveZoom();
</del><ins>+ float zoomLevel = o.style().effectiveZoom();
</ins><span class="cx">
</span><span class="cx"> FloatRect unzoomedRect = bounds;
</span><span class="cx"> if (zoomLevel != 1.0f) {
</span><span class="lines">@@ -1536,7 +1537,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintSearchField(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeMac::paintSearchField(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> LocalCurrentGraphicsContext localContext(paintInfo.context);
</span><span class="cx"> NSSearchFieldCell* search = this->search();
</span><span class="lines">@@ -1545,7 +1546,7 @@
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx">
</span><del>- float zoomLevel = o->style().effectiveZoom();
</del><ins>+ float zoomLevel = o.style().effectiveZoom();
</ins><span class="cx">
</span><span class="cx"> IntRect unzoomedRect = r;
</span><span class="cx">
</span><span class="lines">@@ -1568,11 +1569,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeMac::setSearchCellState(RenderObject* o, const IntRect&)
</del><ins>+void RenderThemeMac::setSearchCellState(const RenderObject& o, const IntRect&)
</ins><span class="cx"> {
</span><span class="cx"> NSSearchFieldCell* search = this->search();
</span><span class="cx">
</span><del>- [search setControlSize:controlSizeForFont(&o->style())];
</del><ins>+ [search setControlSize:controlSizeForFont(&o.style())];
</ins><span class="cx">
</span><span class="cx"> // Update the various states we respond to.
</span><span class="cx"> updateActiveState(search, o);
</span><span class="lines">@@ -1627,17 +1628,17 @@
</span><span class="cx"> style->setBoxShadow(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeMac::paintSearchFieldCancelButton(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><del>- Element* input = o->node()->shadowHost();
</del><ins>+ Element* input = o.node()->shadowHost();
</ins><span class="cx"> if (!input)
</span><del>- input = toElement(o->node());
</del><ins>+ input = toElement(o.node());
</ins><span class="cx">
</span><span class="cx"> if (!input->renderer()->isBox())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> LocalCurrentGraphicsContext localContext(paintInfo.context);
</span><del>- setSearchCellState(input->renderer(), r);
</del><ins>+ setSearchCellState(*input->renderer(), r);
</ins><span class="cx">
</span><span class="cx"> NSSearchFieldCell* search = this->search();
</span><span class="cx">
</span><span class="lines">@@ -1650,7 +1651,7 @@
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx">
</span><del>- float zoomLevel = o->style().effectiveZoom();
</del><ins>+ float zoomLevel = o.style().effectiveZoom();
</ins><span class="cx">
</span><span class="cx"> FloatRect localBounds = [search cancelButtonRectForBounds:NSRect(input->renderBox()->pixelSnappedBorderBoxRect())];
</span><span class="cx">
</span><span class="lines">@@ -1663,7 +1664,7 @@
</span><span class="cx"> localBounds.setX(localBounds.x() - spaceToRightOfCancelButton);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- localBounds = convertToPaintingRect(input->renderer(), o, localBounds, r);
</del><ins>+ localBounds = convertToPaintingRect(*input->renderer(), o, localBounds, r);
</ins><span class="cx">
</span><span class="cx"> FloatRect unzoomedRect(localBounds);
</span><span class="cx"> if (zoomLevel != 1.0f) {
</span><span class="lines">@@ -1708,7 +1709,7 @@
</span><span class="cx"> style->setBoxShadow(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintSearchFieldDecorationPart(RenderObject*, const PaintInfo&, const IntRect&)
</del><ins>+bool RenderThemeMac::paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&)
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -1721,16 +1722,16 @@
</span><span class="cx"> style->setBoxShadow(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintSearchFieldResultsDecorationPart(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeMac::paintSearchFieldResultsDecorationPart(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><del>- Node* input = o->node()->shadowHost();
</del><ins>+ Node* input = o.node()->shadowHost();
</ins><span class="cx"> if (!input)
</span><del>- input = o->node();
</del><ins>+ input = o.node();
</ins><span class="cx"> if (!input->renderer()->isBox())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> LocalCurrentGraphicsContext localContext(paintInfo.context);
</span><del>- setSearchCellState(input->renderer(), r);
</del><ins>+ setSearchCellState(*input->renderer(), r);
</ins><span class="cx">
</span><span class="cx"> NSSearchFieldCell* search = this->search();
</span><span class="cx">
</span><span class="lines">@@ -1740,7 +1741,7 @@
</span><span class="cx"> updateActiveState([search searchButtonCell], o);
</span><span class="cx">
</span><span class="cx"> FloatRect localBounds = [search searchButtonRectForBounds:NSRect(input->renderBox()->pixelSnappedBorderBoxRect())];
</span><del>- localBounds = convertToPaintingRect(input->renderer(), o, localBounds, r);
</del><ins>+ localBounds = convertToPaintingRect(*input->renderer(), o, localBounds, r);
</ins><span class="cx">
</span><span class="cx"> [[search searchButtonCell] drawWithFrame:localBounds inView:documentViewFor(o)];
</span><span class="cx"> [[search searchButtonCell] setControlView:nil];
</span><span class="lines">@@ -1756,16 +1757,16 @@
</span><span class="cx"> style->setBoxShadow(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintSearchFieldResultsButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeMac::paintSearchFieldResultsButton(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><del>- Node* input = o->node()->shadowHost();
</del><ins>+ Node* input = o.node()->shadowHost();
</ins><span class="cx"> if (!input)
</span><del>- input = o->node();
</del><ins>+ input = o.node();
</ins><span class="cx"> if (!input->renderer()->isBox())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> LocalCurrentGraphicsContext localContext(paintInfo.context);
</span><del>- setSearchCellState(input->renderer(), r);
</del><ins>+ setSearchCellState(*input->renderer(), r);
</ins><span class="cx">
</span><span class="cx"> NSSearchFieldCell* search = this->search();
</span><span class="cx">
</span><span class="lines">@@ -1775,10 +1776,10 @@
</span><span class="cx"> [search setSearchMenuTemplate:searchMenuTemplate()];
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><del>- float zoomLevel = o->style().effectiveZoom();
</del><ins>+ float zoomLevel = o.style().effectiveZoom();
</ins><span class="cx">
</span><span class="cx"> FloatRect localBounds = [search searchButtonRectForBounds:NSRect(input->renderBox()->pixelSnappedBorderBoxRect())];
</span><del>- localBounds = convertToPaintingRect(input->renderer(), o, localBounds, r);
</del><ins>+ localBounds = convertToPaintingRect(*input->renderer(), o, localBounds, r);
</ins><span class="cx">
</span><span class="cx"> IntRect unzoomedRect(localBounds);
</span><span class="cx"> if (zoomLevel != 1.0f) {
</span><span class="lines">@@ -1795,26 +1796,26 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintSnapshottedPluginOverlay(RenderObject* o, const PaintInfo& paintInfo, const IntRect&)
</del><ins>+bool RenderThemeMac::paintSnapshottedPluginOverlay(const RenderObject& o, const PaintInfo& paintInfo, const IntRect&)
</ins><span class="cx"> {
</span><span class="cx"> if (paintInfo.phase != PaintPhaseBlockBackground)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (!o->isRenderBlock())
</del><ins>+ if (!o.isRenderBlock())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- RenderBlock* renderBlock = toRenderBlock(o);
</del><ins>+ const RenderBlock& renderBlock = *toRenderBlock(&o);
</ins><span class="cx">
</span><del>- LayoutUnit contentWidth = renderBlock->contentWidth();
- LayoutUnit contentHeight = renderBlock->contentHeight();
</del><ins>+ LayoutUnit contentWidth = renderBlock.contentWidth();
+ LayoutUnit contentHeight = renderBlock.contentHeight();
</ins><span class="cx"> if (!contentWidth || !contentHeight)
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> GraphicsContext* context = paintInfo.context;
</span><span class="cx">
</span><span class="cx"> LayoutSize contentSize(contentWidth, contentHeight);
</span><del>- LayoutPoint contentLocation = renderBlock->location();
- contentLocation.move(renderBlock->borderLeft() + renderBlock->paddingLeft(), renderBlock->borderTop() + renderBlock->paddingTop());
</del><ins>+ LayoutPoint contentLocation = renderBlock.location();
+ contentLocation.move(renderBlock.borderLeft() + renderBlock.paddingLeft(), renderBlock.borderTop() + renderBlock.paddingTop());
</ins><span class="cx">
</span><span class="cx"> LayoutRect rect(contentLocation, contentSize);
</span><span class="cx"> IntRect alignedRect = pixelSnappedIntRect(rect);
</span><span class="lines">@@ -1825,10 +1826,10 @@
</span><span class="cx"> // from our node. Assuming this node is the plugin overlay element, we should get to the
</span><span class="cx"> // plugin itself by asking for the shadow root parent, and then its parent.
</span><span class="cx">
</span><del>- if (!renderBlock->element()->isHTMLElement())
</del><ins>+ if (!renderBlock.element()->isHTMLElement())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- HTMLElement* plugInOverlay = toHTMLElement(renderBlock->element());
</del><ins>+ HTMLElement* plugInOverlay = toHTMLElement(renderBlock.element());
</ins><span class="cx"> Element* parent = plugInOverlay->parentOrShadowHostElement();
</span><span class="cx"> while (parent && !parent->isPluginElement())
</span><span class="cx"> parent = parent->parentOrShadowHostElement();
</span><span class="lines">@@ -1852,7 +1853,7 @@
</span><span class="cx">
</span><span class="cx"> // We could draw the snapshot with that coordinates, but we need to make sure there
</span><span class="cx"> // isn't a composited layer between us and the plugInRenderer.
</span><del>- RenderBox* renderBox = toRenderBox(o);
</del><ins>+ const RenderBox* renderBox = toRenderBox(&o);
</ins><span class="cx"> while (renderBox != plugInRenderer) {
</span><span class="cx"> if (renderBox->hasLayer() && renderBox->layer() && renderBox->layer()->isComposited()) {
</span><span class="cx"> snapshotAbsPos = -renderBox->location();
</span><span class="lines">@@ -2004,7 +2005,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintImageControlsButton(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeMac::paintImageControlsButton(const RenderObject& renderer, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> if (paintInfo.phase != PaintPhaseBlockBackground)
</span><span class="cx"> return true;
</span><span class="lines">@@ -2029,7 +2030,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntSize RenderThemeMac::imageControlsButtonSize(const RenderObject*) const
</del><ins>+IntSize RenderThemeMac::imageControlsButtonSize(const RenderObject&) const
</ins><span class="cx"> {
</span><span class="cx"> #if HAVE(APPKIT_IMAGE_CONTROLS_SUPPORT)
</span><span class="cx"> return IntSize(servicesRolloverButtonCell().cellSize);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeSafaricpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> return makeRGBA(255 * components[0], 255 * components[1], 255 * components[2], 255 * components[3]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ThemeControlState RenderThemeSafari::determineState(RenderObject* o) const
</del><ins>+ThemeControlState RenderThemeSafari::determineState(const RenderObject& o) const
</ins><span class="cx"> {
</span><span class="cx"> ThemeControlState result = 0;
</span><span class="cx"> if (isActive(o))
</span><span class="lines">@@ -264,11 +264,11 @@
</span><span class="cx"> return RenderTheme::isControlStyled(style, border, background, backgroundColor);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeSafari::adjustRepaintRect(const RenderObject* o, IntRect& r)
</del><ins>+void RenderThemeSafari::adjustRepaintRect(const RenderObject& o, IntRect& r)
</ins><span class="cx"> {
</span><del>- NSControlSize controlSize = controlSizeForFont(&o->style());
</del><ins>+ NSControlSize controlSize = controlSizeForFont(&o.style());
</ins><span class="cx">
</span><del>- switch (o->style().appearance()) {
</del><ins>+ switch (o.style().appearance()) {
</ins><span class="cx"> case CheckboxPart: {
</span><span class="cx"> // We inflate the rect as needed to account for padding included in the cell to accommodate the checkbox
</span><span class="cx"> // shadow" and the check. We don't consider this part of the bounds of the control in WebKit.
</span><span class="lines">@@ -317,26 +317,26 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderThemeSafari::baselinePosition(const RenderObject* o) const
</del><ins>+int RenderThemeSafari::baselinePosition(const RenderObject& o) const
</ins><span class="cx"> {
</span><del>- if (!o->isBox())
</del><ins>+ if (!o.isBox())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><del>- if (o->style().appearance() == CheckboxPart || o->style().appearance() == RadioPart) {
- const RenderBox* box = toRenderBox(o);
</del><ins>+ if (o.style().appearance() == CheckboxPart || o.style().appearance() == RadioPart) {
+ const RenderBox* box = toRenderBox(&o);
</ins><span class="cx"> return box->marginTop() + box->height() - 2; // The baseline is 2px up from the bottom of the checkbox/radio in AppKit.
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return RenderTheme::baselinePosition(o);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::controlSupportsTints(const RenderObject* o) const
</del><ins>+bool RenderThemeSafari::controlSupportsTints(const RenderObject& o) const
</ins><span class="cx"> {
</span><span class="cx"> if (!isEnabled(o))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Checkboxes only have tint when checked.
</span><del>- if (o->style().appearance() == CheckboxPart)
</del><ins>+ if (o.style().appearance() == CheckboxPart)
</ins><span class="cx"> return isChecked(o);
</span><span class="cx">
</span><span class="cx"> // For now assume other controls have tint if enabled.
</span><span class="lines">@@ -416,11 +416,11 @@
</span><span class="cx"> return NSMiniControlSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintCheckbox(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeSafari::paintCheckbox(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(SafariThemeLibrary());
</span><span class="cx">
</span><del>- NSControlSize controlSize = controlSizeForFont(&o->style());
</del><ins>+ NSControlSize controlSize = controlSizeForFont(&o.style());
</ins><span class="cx">
</span><span class="cx"> IntRect inflatedRect = inflateRect(r, checkboxSizes()[controlSize], checkboxMargins(controlSize));
</span><span class="cx"> paintThemePart(SafariTheme::CheckboxPart, paintInfo.context->platformContext(), inflatedRect, controlSize, determineState(o));
</span><span class="lines">@@ -455,11 +455,11 @@
</span><span class="cx"> setSizeFromFont(style, checkboxSizes());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintRadio(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeSafari::paintRadio(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(SafariThemeLibrary());
</span><span class="cx">
</span><del>- NSControlSize controlSize = controlSizeForFont(&o->style());
</del><ins>+ NSControlSize controlSize = controlSizeForFont(&o.style());
</ins><span class="cx">
</span><span class="cx"> IntRect inflatedRect = inflateRect(r, radioSizes()[controlSize], radioMargins(controlSize));
</span><span class="cx"> paintThemePart(RadioButtonPart, paintInfo.context->platformContext(), inflatedRect, controlSize, determineState(o));
</span><span class="lines">@@ -579,7 +579,7 @@
</span><span class="cx"> setSizeFromFont(style, buttonSizes());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeSafari::paintButton(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(SafariThemeLibrary());
</span><span class="cx">
</span><span class="lines">@@ -612,7 +612,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintTextField(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeSafari::paintTextField(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(SafariThemeLibrary());
</span><span class="cx">
</span><span class="lines">@@ -624,7 +624,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintCapsLockIndicator(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeSafari::paintCapsLockIndicator(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> #if defined(SAFARI_THEME_VERSION) && SAFARI_THEME_VERSION >= 1
</span><span class="cx"> ASSERT(SafariThemeLibrary());
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintTextArea(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeSafari::paintTextArea(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(SafariThemeLibrary());
</span><span class="cx">
</span><span class="lines">@@ -680,7 +680,7 @@
</span><span class="cx"> return padding[size];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintMenuList(RenderObject* o, const PaintInfo& info, const IntRect& r)
</del><ins>+bool RenderThemeSafari::paintMenuList(const RenderObject& o, const PaintInfo& info, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(SafariThemeLibrary());
</span><span class="cx">
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx"> size.setWidth(r.width());
</span><span class="cx">
</span><span class="cx"> // Now inflate it to account for the shadow.
</span><del>- if (r.width() >= minimumMenuListSize(&o->style()))
</del><ins>+ if (r.width() >= minimumMenuListSize(&o.style()))
</ins><span class="cx"> inflatedRect = inflateRect(inflatedRect, size, popupButtonMargins(controlSize));
</span><span class="cx">
</span><span class="cx"> paintThemePart(DropDownButtonPart, info.context->platformContext(), inflatedRect, controlSize, determineState(o));
</span><span class="lines">@@ -749,7 +749,7 @@
</span><span class="cx"> outData[i] = (1.0f - a) * dark[i] + a * light[i];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeSafari::paintMenuListButtonGradients(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+void RenderThemeSafari::paintMenuListButtonGradients(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> if (r.isEmpty())
</span><span class="cx"> return;
</span><span class="lines">@@ -758,7 +758,7 @@
</span><span class="cx">
</span><span class="cx"> paintInfo.context->save();
</span><span class="cx">
</span><del>- FloatRoundedRect bound = FloatRoundedRect(o->style().getRoundedBorderFor(r));
</del><ins>+ FloatRoundedRect bound = FloatRoundedRect(o.style().getRoundedBorderFor(r));
</ins><span class="cx"> int radius = bound.radii().topLeft().width();
</span><span class="cx">
</span><span class="cx"> CGColorSpaceRef cspace = deviceRGBColorSpaceRef();
</span><span class="lines">@@ -810,17 +810,17 @@
</span><span class="cx"> paintInfo.context->restore();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintMenuListButtonDecorations(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeSafari::paintMenuListButtonDecorations(const RenderObject& renderer, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- IntRect bounds = IntRect(rect.x() + renderer->style().borderLeftWidth(),
- rect.y() + renderer->style().borderTopWidth(),
- rect.width() - renderer->style().borderLeftWidth() - renderer->style().borderRightWidth(),
- rect.height() - renderer->style().borderTopWidth() - renderer->style().borderBottomWidth());
</del><ins>+ IntRect bounds = IntRect(rect.x() + renderer.style().borderLeftWidth(),
+ rect.y() + renderer.style().borderTopWidth(),
+ rect.width() - renderer.style().borderLeftWidth() - renderer.style().borderRightWidth(),
+ rect.height() - renderer.style().borderTopWidth() - renderer.style().borderBottomWidth());
</ins><span class="cx"> // Draw the gradients to give the styled popup menu a button appearance
</span><span class="cx"> paintMenuListButtonGradients(renderer, paintInfo, bounds);
</span><span class="cx">
</span><span class="cx"> // Since we actually know the size of the control here, we restrict the font scale to make sure the arrow will fit vertically in the bounds
</span><del>- float fontScale = min(renderer->style().fontSize() / baseFontSize, bounds.height() / baseArrowHeight);
</del><ins>+ float fontScale = min(renderer.style().fontSize() / baseFontSize, bounds.height() / baseArrowHeight);
</ins><span class="cx"> float centerY = bounds.y() + bounds.height() / 2.0f;
</span><span class="cx"> float arrowHeight = baseArrowHeight * fontScale;
</span><span class="cx"> float arrowWidth = baseArrowWidth * fontScale;
</span><span class="lines">@@ -831,7 +831,7 @@
</span><span class="cx">
</span><span class="cx"> paintInfo.context->save();
</span><span class="cx">
</span><del>- paintInfo.context->setFillColor(renderer->style().visitedDependentColor(CSSPropertyColor), ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context->setFillColor(renderer.style().visitedDependentColor(CSSPropertyColor), ColorSpaceDeviceRGB);
</ins><span class="cx"> paintInfo.context->setStrokeColor(NoStroke, ColorSpaceDeviceRGB);
</span><span class="cx">
</span><span class="cx"> FloatPoint arrow[3];
</span><span class="lines">@@ -956,21 +956,15 @@
</span><span class="cx"> const int trackWidth = 5;
</span><span class="cx"> const int trackRadius = 2;
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintSliderTrack(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeSafari::paintSliderTrack(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> IntSize radius(trackRadius, trackRadius);
</span><span class="cx"> FloatRoundedRect bounds(r, radius, radius, radius, radius);
</span><span class="cx">
</span><del>- if (o->style().appearance() == SliderHorizontalPart)
- bounds.setRect(IntRect(r.x(),
- r.y() + r.height() / 2 - trackWidth / 2,
- r.width(),
- trackWidth));
- else if (o->style().appearance() == SliderVerticalPart)
- bounds.setRect(IntRect(r.x() + r.width() / 2 - trackWidth / 2,
- r.y(),
- trackWidth,
- r.height()));
</del><ins>+ if (o.style().appearance() == SliderHorizontalPart)
+ bounds.setRect(IntRect(r.x(), r.y() + r.height() / 2 - trackWidth / 2, r.width(), trackWidth));
+ else if (o.style().appearance() == SliderVerticalPart)
+ bounds.setRect(IntRect(r.x() + r.width() / 2 - trackWidth / 2, r.y(), trackWidth, r.height()));
</ins><span class="cx">
</span><span class="cx"> CGContextRef context = paintInfo.context->platformContext();
</span><span class="cx"> CGColorSpaceRef cspace = deviceRGBColorSpaceRef();
</span><span class="lines">@@ -981,7 +975,7 @@
</span><span class="cx"> struct CGFunctionCallbacks mainCallbacks = { 0, TrackGradientInterpolate, NULL };
</span><span class="cx"> RetainPtr<CGFunctionRef> mainFunction = adoptCF(CGFunctionCreate(NULL, 1, NULL, 4, NULL, &mainCallbacks));
</span><span class="cx"> RetainPtr<CGShadingRef> mainShading;
</span><del>- if (o->style().appearance() == SliderVerticalPart)
</del><ins>+ if (o.style().appearance() == SliderVerticalPart)
</ins><span class="cx"> mainShading = adoptCF(CGShadingCreateAxial(cspace, CGPointMake(bounds.rect().x(), bounds.rect().maxY()), CGPointMake(bounds.rect().maxX(), bounds.rect().maxY()), mainFunction.get(), false, false));
</span><span class="cx"> else
</span><span class="cx"> mainShading = adoptCF(CGShadingCreateAxial(cspace, CGPointMake(bounds.rect().x(), bounds.rect().y()), CGPointMake(bounds.rect().x(), bounds.rect().maxY()), mainFunction.get(), false, false));
</span><span class="lines">@@ -1001,7 +995,7 @@
</span><span class="cx">
</span><span class="cx"> const float verticalSliderHeightPadding = 0.1f;
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeSafari::paintSliderThumb(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(SafariThemeLibrary());
</span><span class="cx"> paintThemePart(SliderThumbPart, paintInfo.context->platformContext(), r, NSSmallControlSize, determineState(o));
</span><span class="lines">@@ -1023,7 +1017,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintSearchField(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeSafari::paintSearchField(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(SafariThemeLibrary());
</span><span class="cx">
</span><span class="lines">@@ -1076,13 +1070,13 @@
</span><span class="cx"> setFontFromControlSize(styleResolver, style, controlSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect&)
</del><ins>+bool RenderThemeSafari::paintSearchFieldCancelButton(const RenderObject& o, const PaintInfo& paintInfo, const IntRect&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(SafariThemeLibrary());
</span><span class="cx">
</span><del>- Node* input = o->node()->shadowHost();
</del><ins>+ Node* input = o.node()->shadowHost();
</ins><span class="cx"> if (!input)
</span><del>- input = o->node();
</del><ins>+ input = o.node();
</ins><span class="cx"> RenderObject* renderer = input->renderer();
</span><span class="cx"> ASSERT(renderer);
</span><span class="cx">
</span><span class="lines">@@ -1119,7 +1113,7 @@
</span><span class="cx"> style->setHeight(Length(size.height(), Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintSearchFieldDecorationPart(RenderObject*, const PaintInfo&, const IntRect&)
</del><ins>+bool RenderThemeSafari::paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&)
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -1131,13 +1125,13 @@
</span><span class="cx"> style->setHeight(Length(size.height(), Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintSearchFieldResultsDecorationPart(RenderObject* o, const PaintInfo& paintInfo, const IntRect&)
</del><ins>+bool RenderThemeSafari::paintSearchFieldResultsDecorationPart(const RenderObject& o, const PaintInfo& paintInfo, const IntRect&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(SafariThemeLibrary());
</span><span class="cx">
</span><del>- Node* input = o->node()->shadowHost();
</del><ins>+ Node* input = o.node()->shadowHost();
</ins><span class="cx"> if (!input)
</span><del>- input = o->node();
</del><ins>+ input = o.node();
</ins><span class="cx"> RenderObject* renderer = input->renderer();
</span><span class="cx"> ASSERT(renderer);
</span><span class="cx">
</span><span class="lines">@@ -1155,13 +1149,13 @@
</span><span class="cx"> style->setHeight(Length(size.height(), Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintSearchFieldResultsButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect&)
</del><ins>+bool RenderThemeSafari::paintSearchFieldResultsButton(const RenderObject& o, const PaintInfo& paintInfo, const IntRect&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(SafariThemeLibrary());
</span><span class="cx">
</span><del>- Node* input = o->node()->shadowHost();
</del><ins>+ Node* input = o.node()->shadowHost();
</ins><span class="cx"> if (!input)
</span><del>- input = o->node();
</del><ins>+ input = o.node();
</ins><span class="cx"> RenderObject* renderer = input->renderer();
</span><span class="cx"> ASSERT(renderer);
</span><span class="cx">
</span><span class="lines">@@ -1216,14 +1210,14 @@
</span><span class="cx"> return bounds.size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintMeter(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeSafari::paintMeter(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> // NOTE: This routine is for testing only. It should be fleshed out with a real CG-based implementation.
</span><span class="cx"> // Right now it uses a slider, with the thumb positioned at the meter point.
</span><del>- if (!renderObject->isMeter())
</del><ins>+ if (!renderObject.isMeter())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- HTMLMeterElement* element = toRenderMeter(renderObject)->meterElement();
</del><ins>+ HTMLMeterElement* element = toRenderMeter(&renderObject)->meterElement();
</ins><span class="cx">
</span><span class="cx"> int remaining = static_cast<int>((1.0 - element->valueRatio()) * static_cast<double>(rect.size().width()));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeSafarih"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.h (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeSafari.h 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.h 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -52,15 +52,15 @@
</span><span class="cx"> // A method to obtain the baseline position for a "leaf" control. This will only be used if a baseline
</span><span class="cx"> // position cannot be determined by examining child content. Checkboxes and radio buttons are examples of
</span><span class="cx"> // controls that need to do this.
</span><del>- virtual int baselinePosition(const RenderObject*) const;
</del><ins>+ virtual int baselinePosition(const RenderObject&) const;
</ins><span class="cx">
</span><span class="cx"> // A method asking if the control changes its tint when the window has focus or not.
</span><del>- virtual bool controlSupportsTints(const RenderObject*) const;
</del><ins>+ virtual bool controlSupportsTints(const RenderObject&) const;
</ins><span class="cx">
</span><span class="cx"> // A general method asking if any control tinting is supported at all.
</span><span class="cx"> virtual bool supportsControlTints() const { return true; }
</span><span class="cx">
</span><del>- virtual void adjustRepaintRect(const RenderObject*, IntRect&);
</del><ins>+ virtual void adjustRepaintRect(const RenderObject&, IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual bool isControlStyled(const RenderStyle*, const BorderData&,
</span><span class="cx"> const FillLayer&, const Color& backgroundColor) const;
</span><span class="lines">@@ -86,47 +86,47 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> // Methods for each appearance value.
</span><del>- virtual bool paintCheckbox(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintCheckbox(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void setCheckboxSize(RenderStyle*) const;
</span><span class="cx">
</span><del>- virtual bool paintRadio(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintRadio(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void setRadioSize(RenderStyle*) const;
</span><span class="cx">
</span><span class="cx"> virtual void adjustButtonStyle(StyleResolver*, RenderStyle*, WebCore::Element*) const;
</span><del>- virtual bool paintButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void setButtonSize(RenderStyle*) const;
</span><span class="cx">
</span><del>- virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintTextField(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustTextFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintTextArea(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintTextArea(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustTextAreaStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
+ virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><del>- virtual bool paintSearchField(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldResultsDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldResultsButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><del>- virtual bool paintCapsLockIndicator(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintCapsLockIndicator(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> virtual String mediaControlsStyleSheet() override;
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> virtual IntSize meterSizeForBounds(const RenderMeter*, const IntRect&) const override;
</span><span class="cx"> virtual bool supportsMeter(ControlPart) const override;
</span><span class="cx"> virtual void adjustMeterStyle(StyleResolver*, RenderStyle*, Element*) const override;
</span><del>- virtual bool paintMeter(RenderObject*, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintMeter(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual bool shouldShowPlaceholderWhenFocused() const { return true; }
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> const IntSize* popupButtonSizes() const;
</span><span class="cx"> const int* popupButtonMargins(NSControlSize) const;
</span><span class="cx"> const int* popupButtonPadding(NSControlSize) const;
</span><del>- void paintMenuListButtonGradients(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ void paintMenuListButtonGradients(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> const IntSize* menuListSizes() const;
</span><span class="cx">
</span><span class="cx"> const IntSize* searchFieldSizes() const;
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> const IntSize* resultsButtonSizes() const;
</span><span class="cx"> void setSearchFieldSize(RenderStyle*) const;
</span><span class="cx">
</span><del>- ThemeControlState determineState(RenderObject*) const;
</del><ins>+ ThemeControlState determineState(const RenderObject&) const;
</ins><span class="cx">
</span><span class="cx"> String m_mediaControlsScript;
</span><span class="cx"> String m_mediaControlsStyleSheet;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -434,10 +434,10 @@
</span><span class="cx"> return supportsFocus(style->appearance());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned RenderThemeWin::determineClassicState(RenderObject* o, ControlSubPart subPart)
</del><ins>+unsigned RenderThemeWin::determineClassicState(const RenderObject& o, ControlSubPart subPart)
</ins><span class="cx"> {
</span><span class="cx"> unsigned state = 0;
</span><del>- switch (o->style().appearance()) {
</del><ins>+ switch (o.style().appearance()) {
</ins><span class="cx"> case PushButtonPart:
</span><span class="cx"> case ButtonPart:
</span><span class="cx"> case DefaultButtonPart:
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case RadioPart:
</span><span class="cx"> case CheckboxPart:
</span><del>- state = (o->style().appearance() == RadioPart) ? DFCS_BUTTONRADIO : DFCS_BUTTONCHECK;
</del><ins>+ state = (o.style().appearance() == RadioPart) ? DFCS_BUTTONRADIO : DFCS_BUTTONCHECK;
</ins><span class="cx"> if (isChecked(o))
</span><span class="cx"> state |= DFCS_CHECKED;
</span><span class="cx"> if (!isEnabled(o))
</span><span class="lines">@@ -481,10 +481,10 @@
</span><span class="cx"> return state;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned RenderThemeWin::determineState(RenderObject* o)
</del><ins>+unsigned RenderThemeWin::determineState(const RenderObject& o)
</ins><span class="cx"> {
</span><span class="cx"> unsigned result = TS_NORMAL;
</span><del>- ControlPart appearance = o->style().appearance();
</del><ins>+ ControlPart appearance = o.style().appearance();
</ins><span class="cx"> if (!isEnabled(o))
</span><span class="cx"> result = TS_DISABLED;
</span><span class="cx"> else if (isReadOnlyControl(o) && (TextFieldPart == appearance || TextAreaPart == appearance || SearchFieldPart == appearance))
</span><span class="lines">@@ -502,12 +502,12 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned RenderThemeWin::determineSliderThumbState(RenderObject* o)
</del><ins>+unsigned RenderThemeWin::determineSliderThumbState(const RenderObject& o)
</ins><span class="cx"> {
</span><span class="cx"> unsigned result = TUS_NORMAL;
</span><span class="cx"> if (!isEnabled(o))
</span><span class="cx"> result = TUS_DISABLED;
</span><del>- else if (supportsFocus(o->style().appearance()) && isFocused(o))
</del><ins>+ else if (supportsFocus(o.style().appearance()) && isFocused(o))
</ins><span class="cx"> result = TUS_FOCUSED;
</span><span class="cx"> else if (isPressed(o))
</span><span class="cx"> result = TUS_PRESSED;
</span><span class="lines">@@ -516,14 +516,14 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned RenderThemeWin::determineButtonState(RenderObject* o)
</del><ins>+unsigned RenderThemeWin::determineButtonState(const RenderObject& o)
</ins><span class="cx"> {
</span><span class="cx"> unsigned result = PBS_NORMAL;
</span><span class="cx"> if (!isEnabled(o))
</span><span class="cx"> result = PBS_DISABLED;
</span><span class="cx"> else if (isPressed(o))
</span><span class="cx"> result = PBS_PRESSED;
</span><del>- else if (supportsFocus(o->style().appearance()) && isFocused(o))
</del><ins>+ else if (supportsFocus(o.style().appearance()) && isFocused(o))
</ins><span class="cx"> result = PBS_DEFAULTED;
</span><span class="cx"> else if (isHovered(o))
</span><span class="cx"> result = PBS_HOT;
</span><span class="lines">@@ -532,7 +532,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned RenderThemeWin::determineSpinButtonState(RenderObject* o, ControlSubPart subPart)
</del><ins>+unsigned RenderThemeWin::determineSpinButtonState(const RenderObject& o, ControlSubPart subPart)
</ins><span class="cx"> {
</span><span class="cx"> bool isUpButton = subPart == SpinButtonUp;
</span><span class="cx"> unsigned result = isUpButton ? UPS_NORMAL : DNS_NORMAL;
</span><span class="lines">@@ -545,10 +545,10 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ThemeData RenderThemeWin::getClassicThemeData(RenderObject* o, ControlSubPart subPart)
</del><ins>+ThemeData RenderThemeWin::getClassicThemeData(const RenderObject& o, ControlSubPart subPart)
</ins><span class="cx"> {
</span><span class="cx"> ThemeData result;
</span><del>- switch (o->style().appearance()) {
</del><ins>+ switch (o.style().appearance()) {
</ins><span class="cx"> case PushButtonPart:
</span><span class="cx"> case ButtonPart:
</span><span class="cx"> case DefaultButtonPart:
</span><span class="lines">@@ -597,13 +597,13 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ThemeData RenderThemeWin::getThemeData(RenderObject* o, ControlSubPart subPart)
</del><ins>+ThemeData RenderThemeWin::getThemeData(const RenderObject& o, ControlSubPart subPart)
</ins><span class="cx"> {
</span><span class="cx"> if (!haveTheme)
</span><span class="cx"> return getClassicThemeData(o, subPart);
</span><span class="cx">
</span><span class="cx"> ThemeData result;
</span><del>- switch (o->style().appearance()) {
</del><ins>+ switch (o.style().appearance()) {
</ins><span class="cx"> case PushButtonPart:
</span><span class="cx"> case ButtonPart:
</span><span class="cx"> case DefaultButtonPart:
</span><span class="lines">@@ -618,7 +618,7 @@
</span><span class="cx"> case MenulistButtonPart: {
</span><span class="cx"> const bool isVistaOrLater = (windowsVersion() >= WindowsVista);
</span><span class="cx"> result.m_part = isVistaOrLater ? CP_DROPDOWNBUTTONRIGHT : CP_DROPDOWNBUTTON;
</span><del>- if (isVistaOrLater && o->frame().settings().applicationChromeMode()) {
</del><ins>+ if (isVistaOrLater && o.frame().settings().applicationChromeMode()) {
</ins><span class="cx"> // The "readonly" look we use in application chrome mode
</span><span class="cx"> // only uses a "normal" look for the drop down button.
</span><span class="cx"> result.m_state = TS_NORMAL;
</span><span class="lines">@@ -665,7 +665,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void drawControl(GraphicsContext* context, RenderObject* o, HANDLE theme, const ThemeData& themeData, const IntRect& r)
</del><ins>+static void drawControl(GraphicsContext* context, const RenderObject& o, HANDLE theme, const ThemeData& themeData, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> bool alphaBlend = false;
</span><span class="cx"> if (theme)
</span><span class="lines">@@ -685,10 +685,10 @@
</span><span class="cx"> } else if (themeData.m_part == TKP_TRACK || themeData.m_part == TKP_TRACKVERT) {
</span><span class="cx"> ::DrawEdge(hdc, &widgetRect, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
</span><span class="cx"> ::FillRect(hdc, &widgetRect, (HBRUSH)GetStockObject(GRAY_BRUSH));
</span><del>- } else if ((o->style().appearance() == SliderThumbHorizontalPart ||
- o->style().appearance() == SliderThumbVerticalPart) &&
- (themeData.m_part == TKP_THUMBBOTTOM || themeData.m_part == TKP_THUMBTOP ||
- themeData.m_part == TKP_THUMBLEFT || themeData.m_part == TKP_THUMBRIGHT)) {
</del><ins>+ } else if ((o.style().appearance() == SliderThumbHorizontalPart
+ || o.style().appearance() == SliderThumbVerticalPart)
+ && (themeData.m_part == TKP_THUMBBOTTOM || themeData.m_part == TKP_THUMBTOP
+ || themeData.m_part == TKP_THUMBLEFT || themeData.m_part == TKP_THUMBRIGHT)) {
</ins><span class="cx"> ::DrawEdge(hdc, &widgetRect, EDGE_RAISED, BF_RECT | BF_SOFT | BF_MIDDLE | BF_ADJUST);
</span><span class="cx"> if (themeData.m_state == TUS_DISABLED) {
</span><span class="cx"> static WORD patternBits[8] = {0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55};
</span><span class="lines">@@ -710,7 +710,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // Push buttons, buttons, checkboxes and radios, and the dropdown arrow in menulists.
</span><del>- if (o->style().appearance() == DefaultButtonPart) {
</del><ins>+ if (o.style().appearance() == DefaultButtonPart) {
</ins><span class="cx"> HBRUSH brush = ::GetSysColorBrush(COLOR_3DDKSHADOW);
</span><span class="cx"> ::FrameRect(hdc, &widgetRect, brush);
</span><span class="cx"> ::InflateRect(&widgetRect, -1, -1);
</span><span class="lines">@@ -724,7 +724,7 @@
</span><span class="cx"> DIBPixelData::setRGBABitmapAlpha(windowsContext.hdc(), r, 255);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintButton(RenderObject* o, const PaintInfo& i, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintButton(const RenderObject& o, const PaintInfo& i, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> drawControl(i.context, o, buttonTheme(), getThemeData(o), r);
</span><span class="cx"> return false;
</span><span class="lines">@@ -739,7 +739,7 @@
</span><span class="cx"> style->setMinWidth(Length(width, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintInnerSpinButton(RenderObject* o, const PaintInfo& i, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintInnerSpinButton(const RenderObject& o, const PaintInfo& i, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> // We split the specified rectangle into two vertically. We can't draw a
</span><span class="cx"> // spin button of which height is less than 2px.
</span><span class="lines">@@ -771,19 +771,19 @@
</span><span class="cx"> style->setHeight(Length(13, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintTextField(RenderObject* o, const PaintInfo& i, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintTextField(const RenderObject& o, const PaintInfo& i, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> drawControl(i.context, o, textFieldTheme(), getThemeData(o), r);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintMenuList(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeWin::paintMenuList(const RenderObject& renderer, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> HANDLE theme;
</span><span class="cx"> int part;
</span><span class="cx"> if (haveTheme && (windowsVersion() >= WindowsVista)) {
</span><span class="cx"> theme = menuListTheme();
</span><del>- if (renderer->frame().settings().applicationChromeMode())
</del><ins>+ if (renderer.frame().settings().applicationChromeMode())
</ins><span class="cx"> part = CP_READONLY;
</span><span class="cx"> else
</span><span class="cx"> part = CP_BORDER;
</span><span class="lines">@@ -792,7 +792,7 @@
</span><span class="cx"> part = TFP_TEXTFIELD;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- drawControl(paintInfo.context, renderer, theme, ThemeData(part, determineState(renderer)), rect);
</del><ins>+ drawControl(paintInfo.context, renderer, theme, ThemeData(part, determineState(renderer)), rect);
</ins><span class="cx">
</span><span class="cx"> return paintMenuListButtonDecorations(renderer, paintInfo, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -834,7 +834,7 @@
</span><span class="cx"> style->setWhiteSpace(PRE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintMenuListButtonDecorations(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeWin::paintMenuListButtonDecorations(const RenderObject& renderer, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Don't make hardcoded assumptions about the thickness of the textfield border.
</span><span class="cx"> int borderThickness = haveTheme ? 1 : 2;
</span><span class="lines">@@ -843,7 +843,7 @@
</span><span class="cx"> // leaving space for the text field's 1px border
</span><span class="cx"> IntRect buttonRect(rect);
</span><span class="cx"> buttonRect.inflate(-borderThickness);
</span><del>- if (renderer->style().direction() == LTR)
</del><ins>+ if (renderer.style().direction() == LTR)
</ins><span class="cx"> buttonRect.setX(buttonRect.maxX() - dropDownButtonWidth);
</span><span class="cx"> buttonRect.setWidth(dropDownButtonWidth);
</span><span class="cx">
</span><span class="lines">@@ -861,14 +861,14 @@
</span><span class="cx">
</span><span class="cx"> const int trackWidth = 4;
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintSliderTrack(const RenderObject& o, const PaintInfo& i, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> IntRect bounds = r;
</span><span class="cx">
</span><del>- if (o->style().appearance() == SliderHorizontalPart) {
</del><ins>+ if (o.style().appearance() == SliderHorizontalPart) {
</ins><span class="cx"> bounds.setHeight(trackWidth);
</span><span class="cx"> bounds.setY(r.y() + r.height() / 2 - trackWidth / 2);
</span><del>- } else if (o->style().appearance() == SliderVerticalPart) {
</del><ins>+ } else if (o.style().appearance() == SliderVerticalPart) {
</ins><span class="cx"> bounds.setWidth(trackWidth);
</span><span class="cx"> bounds.setX(r.x() + r.width() / 2 - trackWidth / 2);
</span><span class="cx"> }
</span><span class="lines">@@ -877,7 +877,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintSliderThumb(const RenderObject& o, const PaintInfo& i, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> drawControl(i.context, o, sliderTheme(), getThemeData(o), r);
</span><span class="cx"> return false;
</span><span class="lines">@@ -902,7 +902,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintSearchField(RenderObject* o, const PaintInfo& i, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintSearchField(const RenderObject& o, const PaintInfo& i, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> return paintTextField(o, i, r);
</span><span class="cx"> }
</span><span class="lines">@@ -919,14 +919,14 @@
</span><span class="cx"> style->setOutlineOffset(-2);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintSearchFieldCancelButton(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> IntRect bounds = r;
</span><del>- ASSERT(o->parent());
- if (!o->parent() || !o->parent()->isBox())
</del><ins>+ ASSERT(o.parent());
+ if (!o.parent() || !o.parent()->isBox())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- RenderBox* parentRenderBox = toRenderBox(o->parent());
</del><ins>+ RenderBox* parentRenderBox = toRenderBox(o.parent());
</ins><span class="cx">
</span><span class="cx"> IntRect parentBox = parentRenderBox->absoluteContentBox();
</span><span class="cx">
</span><span class="lines">@@ -940,7 +940,7 @@
</span><span class="cx">
</span><span class="cx"> static Image* cancelImage = Image::loadPlatformResource("searchCancel").leakRef();
</span><span class="cx"> static Image* cancelPressedImage = Image::loadPlatformResource("searchCancelPressed").leakRef();
</span><del>- paintInfo.context->drawImage(isPressed(o) ? cancelPressedImage : cancelImage, o->style().colorSpace(), bounds);
</del><ins>+ paintInfo.context->drawImage(isPressed(o) ? cancelPressedImage : cancelImage, o.style().colorSpace(), bounds);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -970,14 +970,14 @@
</span><span class="cx"> style->setHeight(Length(magnifierSize, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintSearchFieldResultsDecorationPart(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintSearchFieldResultsDecorationPart(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> IntRect bounds = r;
</span><del>- ASSERT(o->parent());
- if (!o->parent() || !o->parent()->isBox())
</del><ins>+ ASSERT(o.parent());
+ if (!o.parent() || !o.parent()->isBox())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- RenderBox* parentRenderBox = toRenderBox(o->parent());
</del><ins>+ RenderBox* parentRenderBox = toRenderBox(o.parent());
</ins><span class="cx"> IntRect parentBox = parentRenderBox->absoluteContentBox();
</span><span class="cx">
</span><span class="cx"> // Make sure the scaled decoration stays square and will fit in its parent's box
</span><span class="lines">@@ -989,7 +989,7 @@
</span><span class="cx"> bounds.setY(parentBox.y() + (parentBox.height() - bounds.height() + 1) / 2);
</span><span class="cx">
</span><span class="cx"> static Image* magnifierImage = Image::loadPlatformResource("searchMagnifier").leakRef();
</span><del>- paintInfo.context->drawImage(magnifierImage, o->style().colorSpace(), bounds);
</del><ins>+ paintInfo.context->drawImage(magnifierImage, o.style().colorSpace(), bounds);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1004,16 +1004,16 @@
</span><span class="cx"> style->setHeight(Length(magnifierHeight, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintSearchFieldResultsButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintSearchFieldResultsButton(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> IntRect bounds = r;
</span><del>- ASSERT(o->parent());
- if (!o->parent())
</del><ins>+ ASSERT(o.parent());
+ if (!o.parent())
</ins><span class="cx"> return false;
</span><del>- if (!o->parent() || !o->parent()->isBox())
</del><ins>+ if (!o.parent() || !o.parent()->isBox())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- RenderBox* parentRenderBox = toRenderBox(o->parent());
</del><ins>+ RenderBox* parentRenderBox = toRenderBox(o.parent());
</ins><span class="cx"> IntRect parentBox = parentRenderBox->absoluteContentBox();
</span><span class="cx">
</span><span class="cx"> // Make sure the scaled decoration will fit in its parent's box
</span><span class="lines">@@ -1025,7 +1025,7 @@
</span><span class="cx"> bounds.setY(parentBox.y() + (parentBox.height() - bounds.height() + 1) / 2);
</span><span class="cx">
</span><span class="cx"> static Image* magnifierImage = Image::loadPlatformResource("searchMagnifierResults").leakRef();
</span><del>- paintInfo.context->drawImage(magnifierImage, o->style().colorSpace(), bounds);
</del><ins>+ paintInfo.context->drawImage(magnifierImage, o.style().colorSpace(), bounds);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1177,12 +1177,12 @@
</span><span class="cx"> return bounds.size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintMeter(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeWin::paintMeter(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- if (!renderObject->isMeter())
</del><ins>+ if (!renderObject.isMeter())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- HTMLMeterElement* element = toRenderMeter(renderObject)->meterElement();
</del><ins>+ HTMLMeterElement* element = toRenderMeter(&renderObject)->meterElement();
</ins><span class="cx">
</span><span class="cx"> ThemeData theme = getThemeData(renderObject);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWin.h (167754 => 167755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWin.h 2014-04-24 12:58:16 UTC (rev 167754)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.h 2014-04-24 14:27:54 UTC (rev 167755)
</span><span class="lines">@@ -66,51 +66,51 @@
</span><span class="cx"> virtual void systemFont(CSSValueID, FontDescription&) const;
</span><span class="cx"> virtual Color systemColor(CSSValueID) const;
</span><span class="cx">
</span><del>- virtual bool paintCheckbox(RenderObject* o, const PaintInfo& i, const IntRect& r)
</del><ins>+ virtual bool paintCheckbox(const RenderObject& o, const PaintInfo& i, const IntRect& r)
</ins><span class="cx"> { return paintButton(o, i, r); }
</span><span class="cx"> virtual void setCheckboxSize(RenderStyle*) const;
</span><span class="cx">
</span><del>- virtual bool paintRadio(RenderObject* o, const PaintInfo& i, const IntRect& r)
</del><ins>+ virtual bool paintRadio(const RenderObject& o, const PaintInfo& i, const IntRect& r)
</ins><span class="cx"> { return paintButton(o, i, r); }
</span><span class="cx"> virtual void setRadioSize(RenderStyle* style) const
</span><span class="cx"> { return setCheckboxSize(style); }
</span><span class="cx">
</span><del>- virtual bool paintButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintInnerSpinButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintInnerSpinButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><del>- virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintTextField(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><del>- virtual bool paintTextArea(RenderObject* o, const PaintInfo& i, const IntRect& r)
</del><ins>+ virtual bool paintTextArea(const RenderObject& o, const PaintInfo& i, const IntRect& r)
</ins><span class="cx"> { return paintTextField(o, i, r); }
</span><span class="cx">
</span><span class="cx"> virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuList(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuListButtonDecorations(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><del>- virtual bool paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& r);
- virtual bool paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& r);
</del><ins>+ virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&);
+ virtual bool paintSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustSliderThumbSize(RenderStyle*, Element*) const;
</span><span class="cx">
</span><span class="cx"> virtual bool popupOptionSupportsTextIndent() const { return true; }
</span><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchField(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldDecorationPart(RenderObject*, const PaintInfo&, const IntRect&) { return false; }
</del><ins>+ virtual bool paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) { return false; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldResultsDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintSearchFieldResultsButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void themeChanged();
</span><span class="cx">
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> virtual IntSize meterSizeForBounds(const RenderMeter*, const IntRect&) const override;
</span><span class="cx"> virtual bool supportsMeter(ControlPart) const override;
</span><span class="cx"> virtual void adjustMeterStyle(StyleResolver*, RenderStyle*, Element*) const override;
</span><del>- virtual bool paintMeter(RenderObject*, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintMeter(const RenderObject&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual bool shouldShowPlaceholderWhenFocused() const { return true; }
</span><span class="lines">@@ -151,16 +151,16 @@
</span><span class="cx"> void addIntrinsicMargins(RenderStyle*) const;
</span><span class="cx"> void close();
</span><span class="cx">
</span><del>- unsigned determineState(RenderObject*);
- unsigned determineClassicState(RenderObject*, ControlSubPart = None);
- unsigned determineSliderThumbState(RenderObject*);
- unsigned determineButtonState(RenderObject*);
- unsigned determineSpinButtonState(RenderObject*, ControlSubPart = None);
</del><ins>+ unsigned determineState(const RenderObject&);
+ unsigned determineClassicState(const RenderObject&, ControlSubPart = None);
+ unsigned determineSliderThumbState(const RenderObject&);
+ unsigned determineButtonState(const RenderObject&);
+ unsigned determineSpinButtonState(const RenderObject&, ControlSubPart = None);
</ins><span class="cx">
</span><span class="cx"> bool supportsFocus(ControlPart) const;
</span><span class="cx">
</span><del>- ThemeData getThemeData(RenderObject*, ControlSubPart = None);
- ThemeData getClassicThemeData(RenderObject* o, ControlSubPart = None);
</del><ins>+ ThemeData getThemeData(const RenderObject&, ControlSubPart = None);
+ ThemeData getClassicThemeData(const RenderObject&, ControlSubPart = None);
</ins><span class="cx">
</span><span class="cx"> HANDLE buttonTheme() const;
</span><span class="cx"> HANDLE textFieldTheme() const;
</span></span></pre>
</div>
</div>
</body>
</html>