<!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>[160599] trunk/Source</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/160599">160599</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2013-12-14 10:58:48 -0800 (Sat, 14 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Page::theme() should return a reference.
<https://webkit.org/b/125737>
There's always a RenderTheme, and not a single call site was checking
for null pointers anyway. Updated RenderObject::theme() as well.
Reviewed by Antti Koivisto.</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="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.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="#trunkSourceWebCorehtmlHTMLMeterElementcpp">trunk/Source/WebCore/html/HTMLMeterElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionElementcpp">trunk/Source/WebCore/html/HTMLOptionElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementcpp">trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlInputTypecpp">trunk/Source/WebCore/html/InputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlTextFieldInputTypecpp">trunk/Source/WebCore/html/TextFieldInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlscpp">trunk/Source/WebCore/html/shadow/MediaControls.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlsApplecpp">trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlsGtkcpp">trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMeterShadowElementcpp">trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowSliderThumbElementcpp">trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCoreplatformeflRenderThemeEflcpp">trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformeflScrollbarEflcpp">trunk/Source/WebCore/platform/efl/ScrollbarEfl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.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="#trunkSourceWebCorerenderingRenderInlinecpp">trunk/Source/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMediaControlElementscpp">trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMenuListcpp">trunk/Source/WebCore/rendering/RenderMenuList.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMetercpp">trunk/Source/WebCore/rendering/RenderMeter.cpp</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="#trunkSourceWebCorerenderingRenderTextControlcpp">trunk/Source/WebCore/rendering/RenderTextControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlSingleLinecpp">trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp</a></li>
<li><a href="#trunkSourceWebKiteflewkewk_viewcpp">trunk/Source/WebKit/efl/ewk/ewk_view.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageeflWebPageEflcpp">trunk/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/ChangeLog 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-14 Andreas Kling <akling@apple.com>
+
+ Page::theme() should return a reference.
+ <https://webkit.org/b/125737>
+
+ There's always a RenderTheme, and not a single call site was checking
+ for null pointers anyway. Updated RenderObject::theme() as well.
+
+ Reviewed by Antti Koivisto.
+
</ins><span class="cx"> 2013-12-13 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> CTTE: Convert Element and RenderObject iterator usage to use range-based for loops
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -585,7 +585,7 @@
</span><span class="cx"> IntRect r = quads[i].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="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -1382,7 +1382,7 @@
</span><span class="cx"> if (id <= 0)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- color = document->page()->theme()->systemColor(id).rgb();
</del><ins>+ color = document->page()->theme().systemColor(id).rgb();
</ins><span class="cx"> return true;
</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 (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/dom/Element.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -515,7 +515,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(), PressedState))
</del><ins>+ if (renderer()->style().hasAppearance() && renderer()->theme().stateChanged(renderer(), 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">@@ -581,7 +581,7 @@
</span><span class="cx"> setNeedsStyleRecalc();
</span><span class="cx">
</span><span class="cx"> if (renderer()->style().hasAppearance())
</span><del>- renderer()->theme()->stateChanged(renderer(), HoverState);
</del><ins>+ renderer()->theme().stateChanged(renderer(), 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 (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -1705,7 +1705,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, FocusState);
</del><ins>+ renderer->theme().stateChanged(renderer, FocusState);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1759,7 +1759,7 @@
</span><span class="cx"> // Start blinking with a black caret. Be sure not to restart if we're
</span><span class="cx"> // already blinking in the right location.
</span><span class="cx"> if (shouldBlink && !m_caretBlinkTimer.isActive()) {
</span><del>- if (double blinkInterval = m_frame->page()->theme()->caretBlinkInterval())
</del><ins>+ if (double blinkInterval = m_frame->page()->theme().caretBlinkInterval())
</ins><span class="cx"> m_caretBlinkTimer.startRepeating(blinkInterval);
</span><span class="cx">
</span><span class="cx"> if (!m_caretPaint) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -137,7 +137,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(), ReadOnlyState);
</del><ins>+ renderer()->theme().stateChanged(renderer(), ReadOnlyState);
</ins><span class="cx"> }
</span><span class="cx"> } else if (name == requiredAttr) {
</span><span class="cx"> bool wasRequired = m_isRequired;
</span><span class="lines">@@ -157,7 +157,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(), EnabledState);
</del><ins>+ renderer()->theme().stateChanged(renderer(), EnabledState);
</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 (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -882,7 +882,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(), CheckedState);
</del><ins>+ renderer()->theme().stateChanged(renderer(), 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">@@ -916,7 +916,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(), CheckedState);
</del><ins>+ renderer()->theme().stateChanged(renderer(), CheckedState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int HTMLInputElement::size() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMeterElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMeterElement.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMeterElement.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/html/HTMLMeterElement.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> RenderElement* HTMLMeterElement::createRenderer(PassRef<RenderStyle> style)
</span><span class="cx"> {
</span><del>- if (hasAuthorShadowRoot() || !document().page()->theme()->supportsMeter(style.get().appearance()))
</del><ins>+ if (hasAuthorShadowRoot() || !document().page()->theme().supportsMeter(style.get().appearance()))
</ins><span class="cx"> return RenderElement::createFor(*this, std::move(style));
</span><span class="cx">
</span><span class="cx"> return new RenderMeter(*this, std::move(style));
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionElement.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionElement.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/html/HTMLOptionElement.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</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(), EnabledState);
</del><ins>+ renderer()->theme().stateChanged(renderer(), 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="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> bool HTMLSelectElement::usesMenuList() const
</span><span class="cx"> {
</span><span class="cx"> const Page* page = document().page();
</span><del>- RefPtr<RenderTheme> renderTheme = page ? page->theme() : RenderTheme::defaultTheme();
</del><ins>+ RefPtr<RenderTheme> renderTheme = page ? &page->theme() : RenderTheme::defaultTheme();
</ins><span class="cx"> if (renderTheme->delegatesMenuListRendering())
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -1078,7 +1078,7 @@
</span><span class="cx"> bool HTMLSelectElement::platformHandleKeydownEvent(KeyboardEvent* event)
</span><span class="cx"> {
</span><span class="cx"> const Page* page = document().page();
</span><del>- RefPtr<RenderTheme> renderTheme = page ? page->theme() : RenderTheme::defaultTheme();
</del><ins>+ RefPtr<RenderTheme> renderTheme = page ? &page->theme() : RenderTheme::defaultTheme();
</ins><span class="cx">
</span><span class="cx"> if (!renderTheme->popsMenuByArrowKeys())
</span><span class="cx"> return false;
</span><span class="lines">@@ -1111,7 +1111,7 @@
</span><span class="cx"> void HTMLSelectElement::menuListDefaultEventHandler(Event* event)
</span><span class="cx"> {
</span><span class="cx"> const Page* page = document().page();
</span><del>- RefPtr<RenderTheme> renderTheme = page ? page->theme() : RenderTheme::defaultTheme();
</del><ins>+ RefPtr<RenderTheme> renderTheme = page ? &page->theme() : RenderTheme::defaultTheme();
</ins><span class="cx">
</span><span class="cx"> if (event->type() == eventNames().keydownEvent) {
</span><span class="cx"> if (!renderer() || !event->isKeyboardEvent())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> && isEmptyValue()
</span><span class="cx"> && isEmptySuggestedValue()
</span><span class="cx"> && !isPlaceholderEmpty()
</span><del>- && (document().focusedElement() != this || (renderer() && renderer()->theme()->shouldShowPlaceholderWhenFocused()))
</del><ins>+ && (document().focusedElement() != this || (renderer() && renderer()->theme().shouldShowPlaceholderWhenFocused()))
</ins><span class="cx"> && (!renderer() || renderer()->style().visibility() == VISIBLE);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/InputType.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/InputType.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/html/InputType.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> bool InputType::themeSupportsDataListUI(InputType* type)
</span><span class="cx"> {
</span><span class="cx"> Document& document = type->element().document();
</span><del>- RefPtr<RenderTheme> theme = document.page() ? document.page()->theme() : RenderTheme::defaultTheme();
</del><ins>+ RefPtr<RenderTheme> theme = document.page() ? &document.page()->theme() : RenderTheme::defaultTheme();
</ins><span class="cx"> return theme->supportsDataListUI(type->formControlType());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTextFieldInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> bool TextFieldInputType::shouldHaveSpinButton() const
</span><span class="cx"> {
</span><span class="cx"> Document& document = element().document();
</span><del>- RefPtr<RenderTheme> theme = document.page() ? document.page()->theme() : RenderTheme::defaultTheme();
</del><ins>+ RefPtr<RenderTheme> theme = document.page() ? &document.page()->theme() : RenderTheme::defaultTheme();
</ins><span class="cx"> return theme->shouldHaveSpinButton(&element());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> // The timer is required to set the property display:'none' on the panel,
</span><span class="cx"> // such that captions are correctly displayed at the bottom of the video
</span><span class="cx"> // at the end of the fadeout transition.
</span><del>- double duration = document().page() ? document().page()->theme()->mediaControlsFadeOutDuration() : 0;
</del><ins>+ double duration = document().page() ? document().page()->theme().mediaControlsFadeOutDuration() : 0;
</ins><span class="cx"> m_transitionTimer.startOneShot(duration);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> if (m_opaque)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- double duration = document().page() ? document().page()->theme()->mediaControlsFadeInDuration() : 0;
</del><ins>+ double duration = document().page() ? document().page()->theme().mediaControlsFadeInDuration() : 0;
</ins><span class="cx">
</span><span class="cx"> setInlineStyleProperty(CSSPropertyWebkitTransitionProperty, CSSPropertyOpacity);
</span><span class="cx"> setInlineStyleProperty(CSSPropertyWebkitTransitionDuration, duration, CSSPrimitiveValue::CSS_S);
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> if (!m_opaque)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- double duration = document().page() ? document().page()->theme()->mediaControlsFadeOutDuration() : 0;
</del><ins>+ double duration = document().page() ? document().page()->theme().mediaControlsFadeOutDuration() : 0;
</ins><span class="cx">
</span><span class="cx"> setInlineStyleProperty(CSSPropertyWebkitTransitionProperty, CSSPropertyOpacity);
</span><span class="cx"> setInlineStyleProperty(CSSPropertyWebkitTransitionDuration, duration, CSSPrimitiveValue::CSS_S);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControls.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControls.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/html/shadow/MediaControls.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -93,12 +93,12 @@
</span><span class="cx"> updateCurrentTimeDisplay();
</span><span class="cx">
</span><span class="cx"> double duration = m_mediaController->duration();
</span><del>- if (std::isfinite(duration) || page->theme()->hasOwnDisabledStateHandlingFor(MediaSliderPart)) {
</del><ins>+ if (std::isfinite(duration) || page->theme().hasOwnDisabledStateHandlingFor(MediaSliderPart)) {
</ins><span class="cx"> m_timeline->setDuration(duration);
</span><span class="cx"> m_timeline->setPosition(m_mediaController->currentTime());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_mediaController->hasAudio() || page->theme()->hasOwnDisabledStateHandlingFor(MediaMuteButtonPart))
</del><ins>+ if (m_mediaController->hasAudio() || page->theme().hasOwnDisabledStateHandlingFor(MediaMuteButtonPart))
</ins><span class="cx"> m_panelMuteButton->show();
</span><span class="cx"> else
</span><span class="cx"> m_panelMuteButton->hide();
</span><span class="lines">@@ -130,15 +130,15 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!page->theme()->hasOwnDisabledStateHandlingFor(MediaMuteButtonPart)) {
</del><ins>+ if (!page->theme().hasOwnDisabledStateHandlingFor(MediaMuteButtonPart)) {
</ins><span class="cx"> m_panelMuteButton->hide();
</span><span class="cx"> m_volumeSlider->hide();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_toggleClosedCaptionsButton && !page->theme()->hasOwnDisabledStateHandlingFor(MediaToggleClosedCaptionsButtonPart))
</del><ins>+ if (m_toggleClosedCaptionsButton && !page->theme().hasOwnDisabledStateHandlingFor(MediaToggleClosedCaptionsButtonPart))
</ins><span class="cx"> m_toggleClosedCaptionsButton->hide();
</span><span class="cx">
</span><del>- if (m_fullScreenButton && !page->theme()->hasOwnDisabledStateHandlingFor(MediaEnterFullscreenButtonPart))
</del><ins>+ if (m_fullScreenButton && !page->theme().hasOwnDisabledStateHandlingFor(MediaEnterFullscreenButtonPart))
</ins><span class="cx"> m_fullScreenButton->hide();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_currentTimeDisplay->setInnerText(page->theme()->formatMediaControlsTime(now), IGNORE_EXCEPTION);
</del><ins>+ m_currentTimeDisplay->setInnerText(page->theme().formatMediaControlsTime(now), IGNORE_EXCEPTION);
</ins><span class="cx"> m_currentTimeDisplay->setCurrentValue(now);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlsApplecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> if (ec)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- if (document.page()->theme()->usesMediaControlStatusDisplay()) {
</del><ins>+ if (document.page()->theme().usesMediaControlStatusDisplay()) {
</ins><span class="cx"> RefPtr<MediaControlStatusDisplayElement> statusDisplay = MediaControlStatusDisplayElement::create(document);
</span><span class="cx"> controls->m_statusDisplay = statusDisplay.get();
</span><span class="cx"> panel->appendChild(statusDisplay.release(), ec, AttachLazily);
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> if (ec)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- if (document.page()->theme()->supportsClosedCaptioning()) {
</del><ins>+ if (document.page()->theme().supportsClosedCaptioning()) {
</ins><span class="cx"> RefPtr<MediaControlClosedCaptionsContainerElement> closedCaptionsContainer = MediaControlClosedCaptionsContainerElement::create(document);
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaControlClosedCaptionsTrackListElement> closedCaptionsTrackList = MediaControlClosedCaptionsTrackListElement::create(document, controls.get());
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> // The mute button and the slider element should be in the same div.
</span><span class="cx"> RefPtr<HTMLDivElement> panelVolumeControlContainer = HTMLDivElement::create(document);
</span><span class="cx">
</span><del>- if (document.page()->theme()->usesMediaControlVolumeSlider()) {
</del><ins>+ if (document.page()->theme().usesMediaControlVolumeSlider()) {
</ins><span class="cx"> RefPtr<MediaControlVolumeSliderContainerElement> volumeSliderContainer = MediaControlVolumeSliderContainerElement::create(document);
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaControlPanelVolumeSliderElement> slider = MediaControlPanelVolumeSliderElement::create(document);
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> m_fullScreenButton->hide();
</span><span class="cx">
</span><span class="cx"> double duration = m_mediaController->duration();
</span><del>- if (std::isfinite(duration) || page->theme()->hasOwnDisabledStateHandlingFor(MediaSliderPart)) {
</del><ins>+ if (std::isfinite(duration) || page->theme().hasOwnDisabledStateHandlingFor(MediaSliderPart)) {
</ins><span class="cx"> m_timeline->setDuration(duration);
</span><span class="cx"> m_timelineContainer->show();
</span><span class="cx"> m_timeline->setPosition(m_mediaController->currentTime());
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> } else
</span><span class="cx"> m_timelineContainer->hide();
</span><span class="cx">
</span><del>- if (m_mediaController->hasAudio() || page->theme()->hasOwnDisabledStateHandlingFor(MediaMuteButtonPart))
</del><ins>+ if (m_mediaController->hasAudio() || page->theme().hasOwnDisabledStateHandlingFor(MediaMuteButtonPart))
</ins><span class="cx"> m_panelMuteButton->show();
</span><span class="cx"> else
</span><span class="cx"> m_panelMuteButton->hide();
</span><span class="lines">@@ -378,9 +378,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Allow the theme to format the time.
</span><del>- m_currentTimeDisplay->setInnerText(page->theme()->formatMediaControlsCurrentTime(now, duration), IGNORE_EXCEPTION);
</del><ins>+ m_currentTimeDisplay->setInnerText(page->theme().formatMediaControlsCurrentTime(now, duration), IGNORE_EXCEPTION);
</ins><span class="cx"> m_currentTimeDisplay->setCurrentValue(now);
</span><del>- m_timeRemainingDisplay->setInnerText(page->theme()->formatMediaControlsRemainingTime(now, duration), IGNORE_EXCEPTION);
</del><ins>+ m_timeRemainingDisplay->setInnerText(page->theme().formatMediaControlsRemainingTime(now, duration), IGNORE_EXCEPTION);
</ins><span class="cx"> m_timeRemainingDisplay->setCurrentValue(now - duration);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -390,17 +390,17 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!page->theme()->hasOwnDisabledStateHandlingFor(MediaSliderPart))
</del><ins>+ if (!page->theme().hasOwnDisabledStateHandlingFor(MediaSliderPart))
</ins><span class="cx"> m_timelineContainer->hide();
</span><span class="cx">
</span><del>- if (!page->theme()->hasOwnDisabledStateHandlingFor(MediaMuteButtonPart))
</del><ins>+ if (!page->theme().hasOwnDisabledStateHandlingFor(MediaMuteButtonPart))
</ins><span class="cx"> m_panelMuteButton->hide();
</span><span class="cx">
</span><span class="cx"> m_fullScreenButton->hide();
</span><span class="cx">
</span><span class="cx"> if (m_volumeSliderContainer)
</span><span class="cx"> m_volumeSliderContainer->hide();
</span><del>- if (m_toggleClosedCaptionsButton && !page->theme()->hasOwnDisabledStateHandlingFor(MediaToggleClosedCaptionsButtonPart))
</del><ins>+ if (m_toggleClosedCaptionsButton && !page->theme().hasOwnDisabledStateHandlingFor(MediaToggleClosedCaptionsButtonPart))
</ins><span class="cx"> m_toggleClosedCaptionsButton->hide();
</span><span class="cx"> if (m_closedCaptionsContainer)
</span><span class="cx"> hideClosedCaptionTrackList();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlsGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> if (exceptionCode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (document.page()->theme()->supportsClosedCaptioning()) {
</del><ins>+ if (document.page()->theme().supportsClosedCaptioning()) {
</ins><span class="cx"> RefPtr<MediaControlClosedCaptionsContainerElement> closedCaptionsContainer = MediaControlClosedCaptionsContainerElement::create(document);
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaControlClosedCaptionsTrackListElement> closedCaptionsTrackList = MediaControlClosedCaptionsTrackListElement::create(document, this);
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> double duration = m_mediaController->duration();
</span><del>- m_durationDisplay->setInnerText(page->theme()->formatMediaControlsTime(duration), ASSERT_NO_EXCEPTION);
</del><ins>+ m_durationDisplay->setInnerText(page->theme().formatMediaControlsTime(duration), ASSERT_NO_EXCEPTION);
</ins><span class="cx"> m_durationDisplay->setCurrentValue(duration);
</span><span class="cx">
</span><span class="cx"> if (m_toggleClosedCaptionsButton) {
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> // Allow the theme to format the time.
</span><span class="cx"> ExceptionCode exceptionCode;
</span><del>- m_currentTimeDisplay->setInnerText(page->theme()->formatMediaControlsCurrentTime(now, duration), exceptionCode);
</del><ins>+ m_currentTimeDisplay->setInnerText(page->theme().formatMediaControlsCurrentTime(now, duration), exceptionCode);
</ins><span class="cx"> m_currentTimeDisplay->setCurrentValue(now);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMeterShadowElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> bool MeterShadowElement::rendererIsNeeded(const RenderStyle& style)
</span><span class="cx"> {
</span><span class="cx"> auto render = meterElement()->renderer();
</span><del>- return render && !render->theme()->supportsMeter(render->style().appearance()) && HTMLDivElement::rendererIsNeeded(style);
</del><ins>+ return render && !render->theme().supportsMeter(render->style().appearance()) && HTMLDivElement::rendererIsNeeded(style);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MeterInnerElement::MeterInnerElement(Document& document)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> return HTMLDivElement::rendererIsNeeded(style);
</span><span class="cx">
</span><span class="cx"> auto render = meterElement()->renderer();
</span><del>- return render && !render->theme()->supportsMeter(render->style().appearance()) && HTMLDivElement::rendererIsNeeded(style);
</del><ins>+ return render && !render->theme().supportsMeter(render->style().appearance()) && HTMLDivElement::rendererIsNeeded(style);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderElement* MeterInnerElement::createRenderer(PassRef<RenderStyle> style)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowSliderThumbElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> const RenderStyle& sliderStyle = input->renderer()->style();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>- if (sliderStyle.appearance() == MediaVolumeSliderPart && input->renderer()->theme()->usesVerticalVolumeSlider())
</del><ins>+ if (sliderStyle.appearance() == MediaVolumeSliderPart && input->renderer()->theme().usesVerticalVolumeSlider())
</ins><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> else if (parentStyle->appearance() == MediaFullScreenVolumeSliderPart)
</span><span class="cx"> style().setAppearance(MediaFullScreenVolumeSliderThumbPart);
</span><span class="cx"> if (style().hasAppearance())
</span><del>- theme()->adjustSliderThumbSize(&style(), element());
</del><ins>+ theme().adjustSliderThumbSize(&style(), element());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderSliderThumb::isSliderThumb() const
</span><span class="lines">@@ -122,12 +122,12 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span><span class="cx"> if (input->renderer()->isSlider() && !isVertical && input->list()) {
</span><del>- int offsetFromCenter = theme()->sliderTickOffsetFromTrackCenter();
</del><ins>+ int offsetFromCenter = theme().sliderTickOffsetFromTrackCenter();
</ins><span class="cx"> LayoutUnit trackHeight = 0;
</span><span class="cx"> if (offsetFromCenter < 0)
</span><span class="cx"> trackHeight = -2 * offsetFromCenter;
</span><span class="cx"> else {
</span><del>- int tickLength = theme()->sliderTickSize().height();
</del><ins>+ int tickLength = theme().sliderTickSize().height();
</ins><span class="cx"> trackHeight = 2 * (offsetFromCenter + tickLength);
</span><span class="cx"> }
</span><span class="cx"> float zoomFactor = style().effectiveZoom();
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> Decimal value = stepRange.clampValue(stepRange.valueFromProportion(fraction));
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span><del>- const LayoutUnit snappingThreshold = renderer()->theme()->sliderTickSnappingThreshold();
</del><ins>+ const LayoutUnit snappingThreshold = renderer()->theme().sliderTickSnappingThreshold();
</ins><span class="cx"> if (snappingThreshold > 0) {
</span><span class="cx"> Decimal closest = input->findClosestTickMarkValue(value);
</span><span class="cx"> if (closest.isFinite()) {
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/page/FrameView.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -3404,7 +3404,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><del>- if ((renderView && renderView->theme()->supportsControlTints()) || hasCustomScrollbars())
</del><ins>+ if ((renderView && renderView->theme().supportsControlTints()) || hasCustomScrollbars())
</ins><span class="cx"> paintControlTints();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/page/Page.h 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">
</span><span class="cx"> void setNeedsRecalcStyleInAllFrames();
</span><span class="cx">
</span><del>- RenderTheme* theme() const { return m_theme.get(); }
</del><ins>+ RenderTheme& theme() const { return *m_theme; }
</ins><span class="cx">
</span><span class="cx"> ViewportArguments viewportArguments() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflRenderThemeEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -798,7 +798,7 @@
</span><span class="cx"> void RenderThemeEfl::adjustCheckboxStyle(StyleResolver* styleResolver, RenderStyle* style, Element* element) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_page && element && element->document().page()) {
</span><del>- static_cast<RenderThemeEfl*>(element->document().page()->theme())->adjustCheckboxStyle(styleResolver, style, element);
</del><ins>+ static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustCheckboxStyle(styleResolver, style, element);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -821,7 +821,7 @@
</span><span class="cx"> void RenderThemeEfl::adjustRadioStyle(StyleResolver* styleResolver, RenderStyle* style, Element* element) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_page && element && element->document().page()) {
</span><del>- static_cast<RenderThemeEfl*>(element->document().page()->theme())->adjustRadioStyle(styleResolver, style, element);
</del><ins>+ static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustRadioStyle(styleResolver, style, element);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -844,7 +844,7 @@
</span><span class="cx"> void RenderThemeEfl::adjustButtonStyle(StyleResolver* styleResolver, RenderStyle* style, Element* element) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_page && element && element->document().page()) {
</span><del>- static_cast<RenderThemeEfl*>(element->document().page()->theme())->adjustButtonStyle(styleResolver, style, element);
</del><ins>+ static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustButtonStyle(styleResolver, style, element);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -861,7 +861,7 @@
</span><span class="cx"> void RenderThemeEfl::adjustMenuListStyle(StyleResolver* styleResolver, RenderStyle* style, Element* element) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_page && element && element->document().page()) {
</span><del>- static_cast<RenderThemeEfl*>(element->document().page()->theme())->adjustMenuListStyle(styleResolver, style, element);
</del><ins>+ static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustMenuListStyle(styleResolver, style, element);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> adjustSizeConstraints(style, ComboBox);
</span><span class="lines">@@ -900,7 +900,7 @@
</span><span class="cx"> void RenderThemeEfl::adjustTextFieldStyle(StyleResolver* styleResolver, RenderStyle* style, Element* element) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_page && element && element->document().page()) {
</span><del>- static_cast<RenderThemeEfl*>(element->document().page()->theme())->adjustTextFieldStyle(styleResolver, style, element);
</del><ins>+ static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustTextFieldStyle(styleResolver, style, element);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> adjustSizeConstraints(style, TextField);
</span><span class="lines">@@ -924,7 +924,7 @@
</span><span class="cx"> void RenderThemeEfl::adjustSearchFieldResultsButtonStyle(StyleResolver* styleResolver, RenderStyle* style, Element* element) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_page && element && element->document().page()) {
</span><del>- static_cast<RenderThemeEfl*>(element->document().page()->theme())->adjustSearchFieldResultsButtonStyle(styleResolver, style, element);
</del><ins>+ static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustSearchFieldResultsButtonStyle(styleResolver, style, element);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> adjustSizeConstraints(style, SearchFieldResultsButton);
</span><span class="lines">@@ -946,7 +946,7 @@
</span><span class="cx"> void RenderThemeEfl::adjustSearchFieldResultsDecorationPartStyle(StyleResolver* styleResolver, RenderStyle* style, Element* element) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_page && element && element->document().page()) {
</span><del>- static_cast<RenderThemeEfl*>(element->document().page()->theme())->adjustSearchFieldResultsDecorationPartStyle(styleResolver, style, element);
</del><ins>+ static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustSearchFieldResultsDecorationPartStyle(styleResolver, style, element);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> adjustSizeConstraints(style, SearchFieldResultsDecoration);
</span><span class="lines">@@ -968,7 +968,7 @@
</span><span class="cx"> void RenderThemeEfl::adjustSearchFieldCancelButtonStyle(StyleResolver* styleResolver, RenderStyle* style, Element* element) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_page && element && element->document().page()) {
</span><del>- static_cast<RenderThemeEfl*>(element->document().page()->theme())->adjustSearchFieldCancelButtonStyle(styleResolver, style, element);
</del><ins>+ static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustSearchFieldCancelButtonStyle(styleResolver, style, element);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> adjustSizeConstraints(style, SearchFieldCancelButton);
</span><span class="lines">@@ -992,7 +992,7 @@
</span><span class="cx"> void RenderThemeEfl::adjustSearchFieldStyle(StyleResolver* styleResolver, RenderStyle* style, Element* element) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_page && element && element->document().page()) {
</span><del>- static_cast<RenderThemeEfl*>(element->document().page()->theme())->adjustSearchFieldStyle(styleResolver, style, element);
</del><ins>+ static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustSearchFieldStyle(styleResolver, style, element);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> adjustSizeConstraints(style, SearchField);
</span><span class="lines">@@ -1008,7 +1008,7 @@
</span><span class="cx"> void RenderThemeEfl::adjustInnerSpinButtonStyle(StyleResolver* styleResolver, RenderStyle* style, Element* element) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_page && element && element->document().page()) {
</span><del>- static_cast<RenderThemeEfl*>(element->document().page()->theme())->adjustInnerSpinButtonStyle(styleResolver, style, element);
</del><ins>+ static_cast<RenderThemeEfl&>(element->document().page()->theme()).adjustInnerSpinButtonStyle(styleResolver, style, element);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> adjustSizeConstraints(style, Spinner);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflScrollbarEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/ScrollbarEfl.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/ScrollbarEfl.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/platform/efl/ScrollbarEfl.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> if (!frame.page())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- String theme = static_cast<RenderThemeEfl*>(frame.page()->theme())->themePath();
</del><ins>+ String theme = static_cast<RenderThemeEfl&>(frame.page()->theme()).themePath();
</ins><span class="cx">
</span><span class="cx"> const char* group = (orientation() == HorizontalScrollbar) ? "scrollbar.horizontal" : "scrollbar.vertical";
</span><span class="cx"> if (theme.isEmpty()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -1284,9 +1284,7 @@
</span><span class="cx">
</span><span class="cx"> // Optionally highlight the text
</span><span class="cx"> if (renderer().frame().editor().markedTextMatchesAreHighlighted()) {
</span><del>- Color color = marker->activeMatch() ?
- renderer().theme()->platformActiveTextSearchHighlightColor() :
- renderer().theme()->platformInactiveTextSearchHighlightColor();
</del><ins>+ Color color = marker->activeMatch() ? renderer().theme().platformActiveTextSearchHighlightColor() : renderer().theme().platformInactiveTextSearchHighlightColor();
</ins><span class="cx"> GraphicsContextStateSaver stateSaver(*pt);
</span><span class="cx"> updateGraphicsContext(*pt, TextPaintStyle(color, style.colorSpace())); // Don't draw text at all!
</span><span class="cx"> pt->clip(FloatRect(boxOrigin.x(), boxOrigin.y() - deltaY, m_logicalWidth, selHeight));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -1710,7 +1710,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">@@ -4711,8 +4711,8 @@
</span><span class="cx"> // FIXME: Might be better to have a custom CSS property instead, so that if the theme
</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><del>- if (style().hasAppearance() && !theme()->isControlContainer(style().appearance()))
- return theme()->baselinePosition(this);
</del><ins>+ if (style().hasAppearance() && !theme().isControlContainer(style().appearance()))
+ 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 (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -1203,7 +1203,7 @@
</span><span class="cx"> // If we have a native theme appearance, paint that before painting our background.
</span><span class="cx"> // The theme will tell us whether or not we should also paint the CSS background.
</span><span class="cx"> IntRect snappedPaintRect(pixelSnappedIntRect(paintRect));
</span><del>- bool themePainted = style().hasAppearance() && !theme()->paint(this, paintInfo, snappedPaintRect);
</del><ins>+ bool themePainted = style().hasAppearance() && !theme().paint(this, paintInfo, snappedPaintRect);
</ins><span class="cx"> if (!themePainted) {
</span><span class="cx"> if (bleedAvoidance == BackgroundBleedBackgroundOverBorder)
</span><span class="cx"> paintBorder(paintInfo, paintRect, &style(), bleedAvoidance);
</span><span class="lines">@@ -1211,12 +1211,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 (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderButton.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderButton.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</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 = adoptPtr(new 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.clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFileUploadControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> RenderFileUploadControl* renderer = const_cast<RenderFileUploadControl*>(this);
</span><span class="cx"> float minDefaultLabelWidth = defaultWidthNumChars * font.width(constructTextRun(renderer, font, characterAsString, style(), TextRun::AllowTrailingExpansion));
</span><span class="cx">
</span><del>- const String label = theme()->fileListDefaultLabel(inputElement().multiple());
</del><ins>+ const String label = theme().fileListDefaultLabel(inputElement().multiple());
</ins><span class="cx"> float defaultLabelWidth = font.width(constructTextRun(renderer, font, label, style(), TextRun::AllowTrailingExpansion));
</span><span class="cx"> if (HTMLInputElement* button = uploadButton())
</span><span class="cx"> if (RenderObject* buttonRenderer = button->renderer())
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> if (inputElement().files()->length())
</span><span class="cx"> return StringTruncator::rightTruncate(inputElement().displayString(), maxFilenameWidth(), style().font(), StringTruncator::EnableRoundingHacks);
</span><span class="cx"> #endif
</span><del>- return theme()->fileListNameForWidth(inputElement().files(), style().font(), maxFilenameWidth(), inputElement().multiple());
</del><ins>+ return theme().fileListNameForWidth(inputElement().files(), style().font(), maxFilenameWidth(), inputElement().multiple());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -1355,7 +1355,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="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -1458,7 +1458,7 @@
</span><span class="cx">
</span><span class="cx"> RenderStyle& styleToUse = style();
</span><span class="cx"> if (styleToUse.outlineStyleIsAuto() || hasOutlineAnnotation()) {
</span><del>- if (!theme()->supportsFocusRing(&styleToUse)) {
</del><ins>+ if (!theme().supportsFocusRing(&styleToUse)) {
</ins><span class="cx"> // Only paint the focus ring by hand if the theme isn't able to draw the focus ring.
</span><span class="cx"> paintFocusRing(paintInfo, paintOffset, &styleToUse);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -399,10 +399,10 @@
</span><span class="cx"> Color textColor = listItemElement->renderStyle() ? listItemElement->renderStyle()->visitedDependentColor(CSSPropertyColor) : style().visitedDependentColor(CSSPropertyColor);
</span><span class="cx"> if (isOptionElement && toHTMLOptionElement(listItemElement)->selected()) {
</span><span class="cx"> if (frame().selection().isFocusedAndActive() && document().focusedElement() == &selectElement())
</span><del>- textColor = theme()->activeListBoxSelectionForegroundColor();
</del><ins>+ textColor = theme().activeListBoxSelectionForegroundColor();
</ins><span class="cx"> // Honor the foreground color for disabled items
</span><span class="cx"> else if (!listItemElement->isDisabledFormControl() && !selectElement().isDisabledFormControl())
</span><del>- textColor = theme()->inactiveListBoxSelectionForegroundColor();
</del><ins>+ textColor = theme().inactiveListBoxSelectionForegroundColor();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ColorSpace colorSpace = itemStyle->colorSpace();
</span><span class="lines">@@ -432,9 +432,9 @@
</span><span class="cx"> Color backColor;
</span><span class="cx"> if (isHTMLOptionElement(listItemElement) && toHTMLOptionElement(listItemElement)->selected()) {
</span><span class="cx"> if (frame().selection().isFocusedAndActive() && document().focusedElement() == &selectElement())
</span><del>- backColor = theme()->activeListBoxSelectionBackgroundColor();
</del><ins>+ backColor = theme().activeListBoxSelectionBackgroundColor();
</ins><span class="cx"> else
</span><del>- backColor = theme()->inactiveListBoxSelectionBackgroundColor();
</del><ins>+ backColor = theme().inactiveListBoxSelectionBackgroundColor();
</ins><span class="cx"> } else
</span><span class="cx"> backColor = listItemElement->renderStyle() ? listItemElement->renderStyle()->visitedDependentColor(CSSPropertyBackgroundColor) : style().visitedDependentColor(CSSPropertyBackgroundColor);
</span><span class="cx">
</span><span class="lines">@@ -807,7 +807,7 @@
</span><span class="cx"> if (hasCustomScrollbarStyle)
</span><span class="cx"> widget = RenderScrollbar::createCustomScrollbar(this, VerticalScrollbar, &selectElement());
</span><span class="cx"> else {
</span><del>- widget = Scrollbar::createNativeScrollbar(this, VerticalScrollbar, theme()->scrollbarControlSizeForPart(ListboxPart));
</del><ins>+ widget = Scrollbar::createNativeScrollbar(this, VerticalScrollbar, theme().scrollbarControlSizeForPart(ListboxPart));
</ins><span class="cx"> didAddScrollbar(widget.get(), VerticalScrollbar);
</span><span class="cx"> }
</span><span class="cx"> view().frameView().addChild(widget.get());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> // If the slider would be rendered outside the page, it should be moved below the controls.
</span><span class="cx"> if (UNLIKELY(absoluteOffsetTop < 0))
</span><del>- setY(buttonBox->offsetTop() + theme()->volumeSliderOffsetFromMuteButton(buttonBox, pixelSnappedSize()).y());
</del><ins>+ setY(buttonBox->offsetTop() + theme().volumeSliderOffsetFromMuteButton(buttonBox, pixelSnappedSize()).y());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ----------------------------
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMenuListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -130,10 +130,10 @@
</span><span class="cx"> innerStyle.setAlignSelf(AlignFlexStart);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- innerStyle.setPaddingLeft(Length(theme()->popupInternalPaddingLeft(&style()), Fixed));
- innerStyle.setPaddingRight(Length(theme()->popupInternalPaddingRight(&style()), Fixed));
- innerStyle.setPaddingTop(Length(theme()->popupInternalPaddingTop(&style()), Fixed));
- innerStyle.setPaddingBottom(Length(theme()->popupInternalPaddingBottom(&style()), Fixed));
</del><ins>+ innerStyle.setPaddingLeft(Length(theme().popupInternalPaddingLeft(&style()), Fixed));
+ innerStyle.setPaddingRight(Length(theme().popupInternalPaddingRight(&style()), Fixed));
+ innerStyle.setPaddingTop(Length(theme().popupInternalPaddingTop(&style()), Fixed));
+ innerStyle.setPaddingBottom(Length(theme().popupInternalPaddingBottom(&style()), Fixed));
</ins><span class="cx">
</span><span class="cx"> if (document().page()->chrome().selectItemWritingDirectionIsNatural()) {
</span><span class="cx"> // Items in the popup will not respect the CSS text-align and direction properties,
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx">
</span><span class="cx"> String text = toHTMLOptionElement(element)->textIndentedToRespectGroupLabel();
</span><span class="cx"> applyTextTransform(style(), text, ' ');
</span><del>- if (theme()->popupOptionSupportsTextIndent()) {
</del><ins>+ if (theme().popupOptionSupportsTextIndent()) {
</ins><span class="cx"> // Add in the option's text indent. We can't calculate percentage values for now.
</span><span class="cx"> float optionWidth = 0;
</span><span class="cx"> if (RenderStyle* optionStyle = element->renderStyle())
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderMenuList::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
</span><span class="cx"> {
</span><del>- maxLogicalWidth = std::max(m_optionsWidth, theme()->minimumMenuListSize(&style())) + m_innerBlock->paddingLeft() + m_innerBlock->paddingRight();
</del><ins>+ maxLogicalWidth = std::max(m_optionsWidth, theme().minimumMenuListSize(&style())) + m_innerBlock->paddingLeft() + m_innerBlock->paddingRight();
</ins><span class="cx"> if (!style().width().isPercent())
</span><span class="cx"> minLogicalWidth = maxLogicalWidth;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMetercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMeter.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMeter.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderMeter.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderBox::updateLogicalWidth();
</span><span class="cx">
</span><del>- IntSize frameSize = theme()->meterSizeForBounds(this, pixelSnappedIntRect(frameRect()));
</del><ins>+ IntSize frameSize = theme().meterSizeForBounds(this, pixelSnappedIntRect(frameRect()));
</ins><span class="cx"> setLogicalWidth(isHorizontalWritingMode() ? frameSize.width() : frameSize.height());
</span><span class="cx"> }
</span><span class="cx">
</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()->meterSizeForBounds(this, pixelSnappedIntRect(frame));
</del><ins>+ IntSize frameSize = theme().meterSizeForBounds(this, pixelSnappedIntRect(frame));
</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="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -130,10 +130,9 @@
</span><span class="cx"> view().didDestroyRenderer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderTheme* RenderObject::theme() const
</del><ins>+RenderTheme& RenderObject::theme() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(document().page());
</span><del>-
</del><span class="cx"> return document().page()->theme();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1016,7 +1015,7 @@
</span><span class="cx"> int outlineOffset = styleToUse.outlineOffset();
</span><span class="cx">
</span><span class="cx"> if (styleToUse.outlineStyleIsAuto() || hasOutlineAnnotation()) {
</span><del>- if (!theme()->supportsFocusRing(&styleToUse)) {
</del><ins>+ if (!theme().supportsFocusRing(&styleToUse)) {
</ins><span class="cx"> // Only paint the focus ring by hand if the theme isn't able to draw the focus ring.
</span><span class="cx"> paintFocusRing(paintInfo, paintRect.location(), &styleToUse);
</span><span class="cx"> }
</span><span class="lines">@@ -1456,7 +1455,7 @@
</span><span class="cx"> if (pseudoStyle && pseudoStyle->visitedDependentColor(CSSPropertyBackgroundColor).isValid())
</span><span class="cx"> color = pseudoStyle->visitedDependentColor(CSSPropertyBackgroundColor).blendWithWhite();
</span><span class="cx"> else
</span><del>- color = frame().selection().isFocusedAndActive() ? theme()->activeSelectionBackgroundColor() : theme()->inactiveSelectionBackgroundColor();
</del><ins>+ color = frame().selection().isFocusedAndActive() ? theme().activeSelectionBackgroundColor() : theme().inactiveSelectionBackgroundColor();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1477,9 +1476,7 @@
</span><span class="cx"> if (!color.isValid())
</span><span class="cx"> color = pseudoStyle->visitedDependentColor(CSSPropertyColor);
</span><span class="cx"> } else
</span><del>- color = frame().selection().isFocusedAndActive() ?
- theme()->activeSelectionForegroundColor() :
- theme()->inactiveSelectionForegroundColor();
</del><ins>+ color = frame().selection().isFocusedAndActive() ? theme().activeSelectionForegroundColor() : theme().inactiveSelectionForegroundColor();
</ins><span class="cx">
</span><span class="cx"> return color;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> explicit RenderObject(Node&);
</span><span class="cx"> virtual ~RenderObject();
</span><span class="cx">
</span><del>- RenderTheme* theme() const;
</del><ins>+ RenderTheme& theme() const;
</ins><span class="cx">
</span><span class="cx"> virtual const char* renderName() const = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderProgresscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderProgress.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderProgress.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderProgress.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</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 class="lines">@@ -96,8 +96,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderProgress::updateAnimationState()
</span><span class="cx"> {
</span><del>- m_animationDuration = theme()->animationDurationForProgressBar(this);
- m_animationRepeatInterval = theme()->animationRepeatIntervalForProgressBar(this);
</del><ins>+ m_animationDuration = theme().animationDurationForProgressBar(this);
+ m_animationRepeatInterval = theme().animationRepeatIntervalForProgressBar(this);
</ins><span class="cx">
</span><span class="cx"> bool animating = style().hasAppearance() && m_animationDuration > 0;
</span><span class="cx"> if (animating == m_animating)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderTextControl.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> bool disabled = updateUserModifyProperty(textFormControlElement(), textBlockStyle);
</span><span class="cx"> if (disabled)
</span><del>- textBlockStyle->setColor(theme()->disabledTextColor(textBlockStyle->visitedDependentColor(CSSPropertyColor), startStyle->visitedDependentColor(CSSPropertyBackgroundColor)));
</del><ins>+ textBlockStyle->setColor(theme().disabledTextColor(textBlockStyle->visitedDependentColor(CSSPropertyColor), startStyle->visitedDependentColor(CSSPropertyBackgroundColor)));
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (textBlockStyle->textSecurity() != TSNONE && !textBlockStyle->isLeftToRightDirection()) {
</span><span class="cx"> // Preserve the alignment but force the direction to LTR so that the last-typed, unmasked character
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlSingleLinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</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="trunkSourceWebKiteflewkewk_viewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -1366,8 +1366,8 @@
</span><span class="cx"> if (!eina_stringshare_replace(&priv->settings.theme, path))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebCore::RenderThemeEfl* theme = static_cast<WebCore::RenderThemeEfl*>(priv->page->theme());
- theme->setThemePath(path);
</del><ins>+ WebCore::RenderThemeEfl& theme = static_cast<WebCore::RenderThemeEfl&>(priv->page->theme());
+ theme.setThemePath(path);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* ewk_view_theme_get(const Evas_Object* ewkView)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebKit/win/WebView.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -2380,7 +2380,7 @@
</span><span class="cx"> case WM_XP_THEMECHANGED:
</span><span class="cx"> if (Frame* coreFrame = core(mainFrameImpl)) {
</span><span class="cx"> webView->deleteBackingStore();
</span><del>- coreFrame->page()->theme()->themeChanged();
</del><ins>+ coreFrame->page()->theme().themeChanged();
</ins><span class="cx"> ScrollbarTheme::theme()->themeChanged();
</span><span class="cx"> RECT windowRect;
</span><span class="cx"> ::GetClientRect(hWnd, &windowRect);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageeflWebPageEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp (160598 => 160599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp 2013-12-14 18:05:45 UTC (rev 160598)
+++ trunk/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp 2013-12-14 18:58:48 UTC (rev 160599)
</span><span class="lines">@@ -168,8 +168,8 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::setThemePath(const String& themePath)
</span><span class="cx"> {
</span><del>- WebCore::RenderThemeEfl* theme = static_cast<WebCore::RenderThemeEfl*>(m_page->theme());
- theme->setThemePath(themePath);
</del><ins>+ WebCore::RenderThemeEfl& theme = static_cast<WebCore::RenderThemeEfl&>(m_page->theme());
+ theme.setThemePath(themePath);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Frame* targetFrameForEditing(WebPage* page)
</span></span></pre>
</div>
</div>
</body>
</html>