<!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>[174917] 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/174917">174917</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-20 18:19:23 -0700 (Mon, 20 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is<>() / downcast<>() for SpinButtonElement
https://bugs.webkit.org/show_bug.cgi?id=137896
Reviewed by Gyuyoung Kim.
Use is<>() / downcast<>() for SpinButtonElement instead of
isSpinButtonElement() / static_cast for consistency with the rest of
the code and for safety.
No new tests, no behavior change.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::addTextFieldChildren):
* html/shadow/SpinButtonElement.h:
(isType):
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::isSpinUpButtonPartPressed):
(WebCore::RenderTheme::isHovered):
(WebCore::RenderTheme::isSpinUpButtonPartHovered):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowSpinButtonElementh">trunk/Source/WebCore/html/shadow/SpinButtonElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemecpp">trunk/Source/WebCore/rendering/RenderTheme.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174916 => 174917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-21 01:16:45 UTC (rev 174916)
+++ trunk/Source/WebCore/ChangeLog 2014-10-21 01:19:23 UTC (rev 174917)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-10-20 Chris Dumez <cdumez@apple.com>
+
+ Use is<>() / downcast<>() for SpinButtonElement
+ https://bugs.webkit.org/show_bug.cgi?id=137896
+
+ Reviewed by Gyuyoung Kim.
+
+ Use is<>() / downcast<>() for SpinButtonElement instead of
+ isSpinButtonElement() / static_cast for consistency with the rest of
+ the code and for safety.
+
+ No new tests, no behavior change.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::addTextFieldChildren):
+ * html/shadow/SpinButtonElement.h:
+ (isType):
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::isSpinUpButtonPartPressed):
+ (WebCore::RenderTheme::isHovered):
+ (WebCore::RenderTheme::isSpinUpButtonPartHovered):
+
</ins><span class="cx"> 2014-10-20 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Use glFlush instead of glFinish when drawing WebGL output to screen.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (174916 => 174917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-10-21 01:16:45 UTC (rev 174916)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-10-21 01:19:23 UTC (rev 174917)
</span><span class="lines">@@ -2834,12 +2834,11 @@
</span><span class="cx">
</span><span class="cx"> HTMLInputElement& input = downcast<HTMLInputElement>(*node);
</span><span class="cx"> HTMLElement* spinButtonElement = input.innerSpinButtonElement();
</span><del>- if (!spinButtonElement || !spinButtonElement->isSpinButtonElement())
</del><ins>+ if (!is<SpinButtonElement>(spinButtonElement))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> auto& axSpinButton = downcast<AccessibilitySpinButton>(*axObjectCache()->getOrCreate(SpinButtonRole));
</span><del>- // FIXME: We should use is<>() / downcast<>() for SpinButtonElement.
- axSpinButton.setSpinButtonElement(static_cast<SpinButtonElement*>(spinButtonElement));
</del><ins>+ axSpinButton.setSpinButtonElement(downcast<SpinButtonElement>(spinButtonElement));
</ins><span class="cx"> axSpinButton.setParent(this);
</span><span class="cx"> m_children.append(&axSpinButton);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowSpinButtonElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/SpinButtonElement.h (174916 => 174917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/SpinButtonElement.h 2014-10-21 01:16:45 UTC (rev 174916)
+++ trunk/Source/WebCore/html/shadow/SpinButtonElement.h 2014-10-21 01:19:23 UTC (rev 174917)
</span><span class="lines">@@ -90,6 +90,11 @@
</span><span class="cx"> Timer<SpinButtonElement> m_repeatingTimer;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-} // namespace
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-#endif
</del><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::SpinButtonElement)
+ static bool isType(const WebCore::Element& element) { return element.isSpinButtonElement(); }
+ static bool isType(const WebCore::Node& node) { return is<WebCore::Element>(node) && isType(downcast<WebCore::Element>(node)); }
+SPECIALIZE_TYPE_TRAITS_END()
+
+#endif // SpinButtonElement_h
</ins></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (174916 => 174917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2014-10-21 01:16:45 UTC (rev 174916)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2014-10-21 01:19:23 UTC (rev 174917)
</span><span class="lines">@@ -837,9 +837,9 @@
</span><span class="cx"> if (!is<Element>(node))
</span><span class="cx"> return false;
</span><span class="cx"> Element& element = downcast<Element>(*node);
</span><del>- if (!element.active() || !element.isSpinButtonElement())
</del><ins>+ if (!element.active() || !is<SpinButtonElement>(element))
</ins><span class="cx"> return false;
</span><del>- return static_cast<SpinButtonElement&>(element).upDownState() == SpinButtonElement::Up;
</del><ins>+ return downcast<SpinButtonElement>(element).upDownState() == SpinButtonElement::Up;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderTheme::isReadOnlyControl(const RenderObject& renderer) const
</span><span class="lines">@@ -855,19 +855,19 @@
</span><span class="cx"> Node* node = renderer.node();
</span><span class="cx"> if (!is<Element>(node))
</span><span class="cx"> return false;
</span><del>- if (!downcast<Element>(*node).isSpinButtonElement())
- return downcast<Element>(*node).hovered();
- SpinButtonElement* element = static_cast<SpinButtonElement*>(node);
- return element->hovered() && element->upDownState() != SpinButtonElement::Indeterminate;
</del><ins>+ Element& element = downcast<Element>(*node);
+ if (!is<SpinButtonElement>(element))
+ return element.hovered();
+ SpinButtonElement& spinButton = downcast<SpinButtonElement>(element);
+ return spinButton.hovered() && spinButton.upDownState() != SpinButtonElement::Indeterminate;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderTheme::isSpinUpButtonPartHovered(const RenderObject& renderer) const
</span><span class="cx"> {
</span><span class="cx"> Node* node = renderer.node();
</span><del>- if (!is<Element>(node) || !downcast<Element>(*node).isSpinButtonElement())
</del><ins>+ if (!is<SpinButtonElement>(node))
</ins><span class="cx"> return false;
</span><del>- SpinButtonElement* element = static_cast<SpinButtonElement*>(node);
- return element->upDownState() == SpinButtonElement::Up;
</del><ins>+ return downcast<SpinButtonElement>(*node).upDownState() == SpinButtonElement::Up;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderTheme::isDefault(const RenderObject& o) const
</span></span></pre>
</div>
</div>
</body>
</html>