<!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>[187885] 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/187885">187885</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-08-04 13:46:06 -0700 (Tue, 04 Aug 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>RenderTheme::paint() should take RenderBox instead of RenderObject.
https://bugs.webkit.org/show_bug.cgi?id=147638

Reviewed by Andreas Kling.

No change in functionality.

* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::paint):
(WebCore::RenderTheme::updateControlStatesForRenderer): -&gt;RenderBox too.
(WebCore::RenderTheme::isActive): Remove redundant code.
* rendering/RenderTheme.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187884 => 187885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-08-04 20:39:06 UTC (rev 187884)
+++ trunk/Source/WebCore/ChangeLog        2015-08-04 20:46:06 UTC (rev 187885)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-08-04  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        RenderTheme::paint() should take RenderBox instead of RenderObject.
+        https://bugs.webkit.org/show_bug.cgi?id=147638
+
+        Reviewed by Andreas Kling.
+
+        No change in functionality.
+
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::paint):
+        (WebCore::RenderTheme::updateControlStatesForRenderer): -&gt;RenderBox too.
+        (WebCore::RenderTheme::isActive): Remove redundant code.
+        * rendering/RenderTheme.h:
+
</ins><span class="cx"> 2015-08-04  Matthew Daiter  &lt;mdaiter@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Render to GraphicsContext MediaPlayerPrivateMediaStreamAVFObjC
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (187884 => 187885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp        2015-08-04 20:39:06 UTC (rev 187884)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp        2015-08-04 20:46:06 UTC (rev 187885)
</span><span class="lines">@@ -262,26 +262,26 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool RenderTheme::paint(const RenderObject&amp; o, ControlStates&amp; controlStates, const PaintInfo&amp; paintInfo, const LayoutRect&amp; r)
</del><ins>+bool RenderTheme::paint(const RenderBox&amp; box, ControlStates&amp; controlStates, const PaintInfo&amp; paintInfo, const LayoutRect&amp; rect)
</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-&gt;updatingControlTints()) {
</span><del>-        if (controlSupportsTints(o))
-            o.repaint();
</del><ins>+        if (controlSupportsTints(box))
+            box.repaint();
</ins><span class="cx">         return false;
</span><span class="cx">     }
</span><span class="cx">     if (paintInfo.context-&gt;paintingDisabled())
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-    ControlPart part = o.style().appearance();
-    IntRect integralSnappedRect = snappedIntRect(r);
-    float deviceScaleFactor = o.document().deviceScaleFactor();
-    FloatRect devicePixelSnappedRect = snapRectToDevicePixels(r, deviceScaleFactor);
</del><ins>+    ControlPart part = box.style().appearance();
+    IntRect integralSnappedRect = snappedIntRect(rect);
+    float deviceScaleFactor = box.document().deviceScaleFactor();
+    FloatRect devicePixelSnappedRect = snapRectToDevicePixels(rect, deviceScaleFactor);
</ins><span class="cx"> 
</span><span class="cx"> #if USE(NEW_THEME)
</span><del>-    float pageScaleFactor = o.document().page() ? o.document().page()-&gt;pageScaleFactor() : 1.0f;
</del><ins>+    float pageScaleFactor = box.document().page() ? box.document().page()-&gt;pageScaleFactor() : 1.0f;
</ins><span class="cx">     
</span><span class="cx">     switch (part) {
</span><span class="cx">     case CheckboxPart:
</span><span class="lines">@@ -291,8 +291,8 @@
</span><span class="cx">     case DefaultButtonPart:
</span><span class="cx">     case ButtonPart:
</span><span class="cx">     case InnerSpinButtonPart:
</span><del>-        updateControlStatesForRenderer(o, controlStates);
-        m_theme-&gt;paint(part, controlStates, const_cast&lt;GraphicsContext*&gt;(paintInfo.context), devicePixelSnappedRect, o.style().effectiveZoom(), &amp;o.view().frameView(), deviceScaleFactor, pageScaleFactor);
</del><ins>+        updateControlStatesForRenderer(box, controlStates);
+        m_theme-&gt;paint(part, controlStates, const_cast&lt;GraphicsContext*&gt;(paintInfo.context), devicePixelSnappedRect, box.style().effectiveZoom(), &amp;box.view().frameView(), deviceScaleFactor, pageScaleFactor);
</ins><span class="cx">         return false;
</span><span class="cx">     default:
</span><span class="cx">         break;
</span><span class="lines">@@ -305,102 +305,102 @@
</span><span class="cx">     switch (part) {
</span><span class="cx"> #if !USE(NEW_THEME)
</span><span class="cx">     case CheckboxPart:
</span><del>-        return paintCheckbox(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintCheckbox(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case RadioPart:
</span><del>-        return paintRadio(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintRadio(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case PushButtonPart:
</span><span class="cx">     case SquareButtonPart:
</span><span class="cx">     case DefaultButtonPart:
</span><span class="cx">     case ButtonPart:
</span><del>-        return paintButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case InnerSpinButtonPart:
</span><del>-        return paintInnerSpinButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintInnerSpinButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx"> #endif
</span><span class="cx">     case MenulistPart:
</span><del>-        return paintMenuList(o, paintInfo, devicePixelSnappedRect);
</del><ins>+        return paintMenuList(box, paintInfo, devicePixelSnappedRect);
</ins><span class="cx"> #if ENABLE(METER_ELEMENT)
</span><span class="cx">     case MeterPart:
</span><span class="cx">     case RelevancyLevelIndicatorPart:
</span><span class="cx">     case ContinuousCapacityLevelIndicatorPart:
</span><span class="cx">     case DiscreteCapacityLevelIndicatorPart:
</span><span class="cx">     case RatingLevelIndicatorPart:
</span><del>-        return paintMeter(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMeter(box, paintInfo, integralSnappedRect);
</ins><span class="cx"> #endif
</span><span class="cx">     case ProgressBarPart:
</span><del>-        return paintProgressBar(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintProgressBar(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case SliderHorizontalPart:
</span><span class="cx">     case SliderVerticalPart:
</span><del>-        return paintSliderTrack(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintSliderTrack(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case SliderThumbHorizontalPart:
</span><span class="cx">     case SliderThumbVerticalPart:
</span><del>-        return paintSliderThumb(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintSliderThumb(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaEnterFullscreenButtonPart:
</span><span class="cx">     case MediaExitFullscreenButtonPart:
</span><del>-        return paintMediaFullscreenButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaFullscreenButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaPlayButtonPart:
</span><del>-        return paintMediaPlayButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaPlayButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaOverlayPlayButtonPart:
</span><del>-        return paintMediaOverlayPlayButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaOverlayPlayButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaMuteButtonPart:
</span><del>-        return paintMediaMuteButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaMuteButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaSeekBackButtonPart:
</span><del>-        return paintMediaSeekBackButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaSeekBackButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaSeekForwardButtonPart:
</span><del>-        return paintMediaSeekForwardButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaSeekForwardButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaRewindButtonPart:
</span><del>-        return paintMediaRewindButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaRewindButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaReturnToRealtimeButtonPart:
</span><del>-        return paintMediaReturnToRealtimeButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaReturnToRealtimeButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaToggleClosedCaptionsButtonPart:
</span><del>-        return paintMediaToggleClosedCaptionsButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaToggleClosedCaptionsButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaSliderPart:
</span><del>-        return paintMediaSliderTrack(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaSliderTrack(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaSliderThumbPart:
</span><del>-        return paintMediaSliderThumb(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaSliderThumb(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaVolumeSliderMuteButtonPart:
</span><del>-        return paintMediaMuteButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaMuteButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaVolumeSliderContainerPart:
</span><del>-        return paintMediaVolumeSliderContainer(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaVolumeSliderContainer(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaVolumeSliderPart:
</span><del>-        return paintMediaVolumeSliderTrack(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaVolumeSliderTrack(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaVolumeSliderThumbPart:
</span><del>-        return paintMediaVolumeSliderThumb(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaVolumeSliderThumb(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaFullScreenVolumeSliderPart:
</span><del>-        return paintMediaFullScreenVolumeSliderTrack(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaFullScreenVolumeSliderTrack(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaFullScreenVolumeSliderThumbPart:
</span><del>-        return paintMediaFullScreenVolumeSliderThumb(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaFullScreenVolumeSliderThumb(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaTimeRemainingPart:
</span><del>-        return paintMediaTimeRemaining(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaTimeRemaining(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaCurrentTimePart:
</span><del>-        return paintMediaCurrentTime(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaCurrentTime(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MediaControlsBackgroundPart:
</span><del>-        return paintMediaControlsBackground(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintMediaControlsBackground(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case MenulistButtonPart:
</span><span class="cx">     case TextFieldPart:
</span><span class="cx">     case TextAreaPart:
</span><span class="cx">     case ListboxPart:
</span><span class="cx">         return true;
</span><span class="cx">     case SearchFieldPart:
</span><del>-        return paintSearchField(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintSearchField(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case SearchFieldCancelButtonPart:
</span><del>-        return paintSearchFieldCancelButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintSearchFieldCancelButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case SearchFieldDecorationPart:
</span><del>-        return paintSearchFieldDecorationPart(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintSearchFieldDecorationPart(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case SearchFieldResultsDecorationPart:
</span><del>-        return paintSearchFieldResultsDecorationPart(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintSearchFieldResultsDecorationPart(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case SearchFieldResultsButtonPart:
</span><del>-        return paintSearchFieldResultsButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintSearchFieldResultsButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx">     case SnapshottedPluginOverlayPart:
</span><del>-        return paintSnapshottedPluginOverlay(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintSnapshottedPluginOverlay(box, paintInfo, integralSnappedRect);
</ins><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx">     case ImageControlsButtonPart:
</span><del>-        return paintImageControlsButton(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintImageControlsButton(box, paintInfo, integralSnappedRect);
</ins><span class="cx"> #endif
</span><span class="cx">     case CapsLockIndicatorPart:
</span><del>-        return paintCapsLockIndicator(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintCapsLockIndicator(box, paintInfo, integralSnappedRect);
</ins><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><span class="cx">     case AttachmentPart:
</span><del>-        return paintAttachment(o, paintInfo, integralSnappedRect);
</del><ins>+        return paintAttachment(box, paintInfo, integralSnappedRect);
</ins><span class="cx"> #endif
</span><span class="cx">     default:
</span><span class="cx">         break;
</span><span class="lines">@@ -738,12 +738,12 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderTheme::updateControlStatesForRenderer(const RenderObject&amp; o, ControlStates&amp; controlStates) const
</del><ins>+void RenderTheme::updateControlStatesForRenderer(const RenderBox&amp; box, ControlStates&amp; controlStates) const
</ins><span class="cx"> {
</span><del>-    ControlStates newStates = extractControlStatesForRenderer(o);
</del><ins>+    ControlStates newStates = extractControlStatesForRenderer(box);
</ins><span class="cx">     controlStates.setStates(newStates.states());
</span><del>-    if (isFocused(o))
-        controlStates.setTimeSinceControlWasFocused(o.document().page()-&gt;focusController().timeSinceFocusWasSet());
</del><ins>+    if (isFocused(box))
+        controlStates.setTimeSinceControlWasFocused(box.document().page()-&gt;focusController().timeSinceFocusWasSet());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> ControlStates::States RenderTheme::extractControlStatesForRenderer(const RenderObject&amp; o) const
</span><span class="lines">@@ -776,15 +776,7 @@
</span><span class="cx"> 
</span><span class="cx"> bool RenderTheme::isActive(const RenderObject&amp; o) const
</span><span class="cx"> {
</span><del>-    Node* node = o.node();
-    if (!node)
-        return false;
-
-    Frame* frame = node-&gt;document().frame();
-    if (!frame)
-        return false;
-
-    Page* page = frame-&gt;page();
</del><ins>+    Page* page = o.document().page();
</ins><span class="cx">     if (!page)
</span><span class="cx">         return false;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.h (187884 => 187885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.h        2015-08-04 20:39:06 UTC (rev 187884)
+++ trunk/Source/WebCore/rendering/RenderTheme.h        2015-08-04 20:46:06 UTC (rev 187885)
</span><span class="lines">@@ -79,7 +79,7 @@
</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(const RenderObject&amp;, ControlStates&amp;, const PaintInfo&amp;, const LayoutRect&amp;);
</del><ins>+    bool paint(const RenderBox&amp;, ControlStates&amp;, const PaintInfo&amp;, const LayoutRect&amp;);
</ins><span class="cx">     bool paintBorderOnly(const RenderBox&amp;, const PaintInfo&amp;, const LayoutRect&amp;);
</span><span class="cx">     bool paintDecorations(const RenderBox&amp;, const PaintInfo&amp;, const LayoutRect&amp;);
</span><span class="cx"> 
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> public:
</span><del>-    void updateControlStatesForRenderer(const RenderObject&amp;, ControlStates&amp;) const;
</del><ins>+    void updateControlStatesForRenderer(const RenderBox&amp;, ControlStates&amp;) const;
</ins><span class="cx">     ControlStates::States extractControlStatesForRenderer(const RenderObject&amp;) const;
</span><span class="cx">     bool isActive(const RenderObject&amp;) const;
</span><span class="cx">     bool isChecked(const RenderObject&amp;) const;
</span></span></pre>
</div>
</div>

</body>
</html>