<!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>[173944] 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/173944">173944</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-09-24 20:50:40 -0700 (Wed, 24 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add initial is<>() / downcast<>() support for any type of Nodes
https://bugs.webkit.org/show_bug.cgi?id=137056
Reviewed by Benjamin Poulain.
Source/WebCore:
Add initial is<>() / downcast<>() support for any type of Nodes, not
just Elements by:
- Moving the is<>() / downcast<>() declarations from Element.h to
Node.h
- Introducing a SPECIALIZE_TYPE_TRAITS_*() macro that generates the
needed template specializations for is<>() / downcast<>() to work.
This macro will replace NODE_TYPE_CASTS() entirely once the code base
is fully ported.
This patch makes use of SPECIALIZE_TYPE_TRAITS_*() macro for
HTMLFormControlElement, that is an HTMLElement for which the template
specializations cannot be automatically generated because it requires
special handling.
This patch also makes use of SPECIALIZE_TYPE_TRAITS_*() macro for
DocumentFragment to show that it can be used for non-Element Nodes.
No new tests, no behavior change.
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::isReadOnly):
(WebCore::AccessibilityNodeObject::isRequired):
(WebCore::AccessibilityNodeObject::isControl):
* css/SelectorCheckerTestFunctions.h:
(WebCore::isAutofilled):
(WebCore::isDisabled):
(WebCore::isEnabled):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::canShareStyleWithElement):
(WebCore::StyleResolver::adjustRenderStyle):
* dom/Document.cpp:
(WebCore::Document::importNode):
(WebCore::Document::setFocusedElement):
* dom/DocumentFragment.h:
(WebCore::isDocumentFragment):
* dom/Element.cpp:
(WebCore::Element::focus):
* dom/Element.h:
(WebCore::is): Deleted.
(WebCore::downcast): Deleted.
* dom/Node.h:
(WebCore::is):
(WebCore::downcast):
* dom/make_names.pl:
(printTypeHelpers):
* editing/FrameSelection.cpp:
(WebCore::scanForForm):
* editing/TextIterator.cpp:
(WebCore::isRendererReplacedElement):
* html/FormAssociatedElement.h:
* html/HTMLElement.h:
* html/HTMLFieldSetElement.cpp:
(WebCore::updateFromControlElementsAncestorDisabledStateUnder):
(WebCore::HTMLFieldSetElement::refreshElementsIfNeeded):
* html/HTMLFormControlElement.cpp:
(WebCore::HTMLFormControlElement::enclosingFormControlElement):
* html/HTMLFormControlElement.h:
(WebCore::isHTMLFormControlElement):
* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::submitImplicitly):
(WebCore::submitElementFromEvent):
(WebCore::HTMLFormElement::validateInteractively):
(WebCore::HTMLFormElement::submit):
(WebCore::HTMLFormElement::reset):
(WebCore::HTMLFormElement::formElementIndex):
(WebCore::HTMLFormElement::defaultButton):
(WebCore::HTMLFormElement::checkInvalidControlsAndCollectUnhandled):
(WebCore::HTMLFormElement::documentDidResumeFromPageCache):
* html/HTMLMediaElement.h:
* html/HTMLPlugInImageElement.h:
* html/HTMLSummaryElement.cpp:
(WebCore::isClickableControl):
* html/LabelableElement.h:
* html/RadioNodeList.cpp:
(WebCore::RadioNodeList::checkElementMatchesRadioNodeListFilter):
(WebCore::RadioNodeList::elementMatches):
* html/parser/HTMLConstructionSite.cpp:
(WebCore::HTMLConstructionSite::findFosterSite):
* html/parser/HTMLTreeBuilder.cpp:
(WebCore::disallowTelephoneNumberParsing):
* loader/FormSubmission.cpp:
(WebCore::FormSubmission::create):
* mathml/MathMLElement.h:
* page/ContextMenuController.cpp:
(WebCore::ContextMenuController::populate):
* page/Frame.cpp:
(WebCore::Frame::searchForLabelsBeforeElement):
* rendering/RenderButton.cpp:
(WebCore::RenderButton::formControlElement):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::resize):
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::isReadOnlyControl):
* svg/SVGElement.h:
* svg/SVGFilterPrimitiveStandardAttributes.h:
* svg/animation/SVGSMILElement.h:
Source/WebKit/mac:
Use is<HTMLFormControlElement>() / downcast<HTMLFormControlElement>()
instead of isFormControlElement() / toHTMLFormControlElement().
* WebView/WebHTMLRepresentation.mm:
(searchForLabelsBeforeElement):
Source/WebKit/win:
Use is<HTMLFormControlElement>() / downcast<HTMLFormControlElement>()
instead of isFormControlElement() / toHTMLFormControlElement().
* WebFrame.cpp:
(WebFrame::elementWithName):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckerTestFunctionsh">trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentFragmenth">trunk/Source/WebCore/dom/DocumentFragment.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
<li><a href="#trunkSourceWebCoredommake_namespl">trunk/Source/WebCore/dom/make_names.pl</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTextIteratorcpp">trunk/Source/WebCore/editing/TextIterator.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlFormAssociatedElementh">trunk/Source/WebCore/html/FormAssociatedElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementh">trunk/Source/WebCore/html/HTMLElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFieldSetElementcpp">trunk/Source/WebCore/html/HTMLFieldSetElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementcpp">trunk/Source/WebCore/html/HTMLFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementh">trunk/Source/WebCore/html/HTMLFormControlElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementcpp">trunk/Source/WebCore/html/HTMLFormElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementh">trunk/Source/WebCore/html/HTMLPlugInImageElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSummaryElementcpp">trunk/Source/WebCore/html/HTMLSummaryElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlLabelableElementh">trunk/Source/WebCore/html/LabelableElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlRadioNodeListcpp">trunk/Source/WebCore/html/RadioNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLConstructionSitecpp">trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLTreeBuildercpp">trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFormSubmissioncpp">trunk/Source/WebCore/loader/FormSubmission.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLElementh">trunk/Source/WebCore/mathml/MathMLElement.h</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuControllercpp">trunk/Source/WebCore/page/ContextMenuController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderButtoncpp">trunk/Source/WebCore/rendering/RenderButton.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemecpp">trunk/Source/WebCore/rendering/RenderTheme.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementh">trunk/Source/WebCore/svg/SVGElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFilterPrimitiveStandardAttributesh">trunk/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h</a></li>
<li><a href="#trunkSourceWebCoresvganimationSVGSMILElementh">trunk/Source/WebCore/svg/animation/SVGSMILElement.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLRepresentationmm">trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebFramecpp">trunk/Source/WebKit/win/WebFrame.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/ChangeLog 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -1,3 +1,107 @@
</span><ins>+2014-09-24 Christophe Dumez <cdumez@apple.com>
+
+ Add initial is<>() / downcast<>() support for any type of Nodes
+ https://bugs.webkit.org/show_bug.cgi?id=137056
+
+ Reviewed by Benjamin Poulain.
+
+ Add initial is<>() / downcast<>() support for any type of Nodes, not
+ just Elements by:
+ - Moving the is<>() / downcast<>() declarations from Element.h to
+ Node.h
+ - Introducing a SPECIALIZE_TYPE_TRAITS_*() macro that generates the
+ needed template specializations for is<>() / downcast<>() to work.
+ This macro will replace NODE_TYPE_CASTS() entirely once the code base
+ is fully ported.
+
+ This patch makes use of SPECIALIZE_TYPE_TRAITS_*() macro for
+ HTMLFormControlElement, that is an HTMLElement for which the template
+ specializations cannot be automatically generated because it requires
+ special handling.
+
+ This patch also makes use of SPECIALIZE_TYPE_TRAITS_*() macro for
+ DocumentFragment to show that it can be used for non-Element Nodes.
+
+ No new tests, no behavior change.
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::isReadOnly):
+ (WebCore::AccessibilityNodeObject::isRequired):
+ (WebCore::AccessibilityNodeObject::isControl):
+ * css/SelectorCheckerTestFunctions.h:
+ (WebCore::isAutofilled):
+ (WebCore::isDisabled):
+ (WebCore::isEnabled):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::canShareStyleWithElement):
+ (WebCore::StyleResolver::adjustRenderStyle):
+ * dom/Document.cpp:
+ (WebCore::Document::importNode):
+ (WebCore::Document::setFocusedElement):
+ * dom/DocumentFragment.h:
+ (WebCore::isDocumentFragment):
+ * dom/Element.cpp:
+ (WebCore::Element::focus):
+ * dom/Element.h:
+ (WebCore::is): Deleted.
+ (WebCore::downcast): Deleted.
+ * dom/Node.h:
+ (WebCore::is):
+ (WebCore::downcast):
+ * dom/make_names.pl:
+ (printTypeHelpers):
+ * editing/FrameSelection.cpp:
+ (WebCore::scanForForm):
+ * editing/TextIterator.cpp:
+ (WebCore::isRendererReplacedElement):
+ * html/FormAssociatedElement.h:
+ * html/HTMLElement.h:
+ * html/HTMLFieldSetElement.cpp:
+ (WebCore::updateFromControlElementsAncestorDisabledStateUnder):
+ (WebCore::HTMLFieldSetElement::refreshElementsIfNeeded):
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::enclosingFormControlElement):
+ * html/HTMLFormControlElement.h:
+ (WebCore::isHTMLFormControlElement):
+ * html/HTMLFormElement.cpp:
+ (WebCore::HTMLFormElement::submitImplicitly):
+ (WebCore::submitElementFromEvent):
+ (WebCore::HTMLFormElement::validateInteractively):
+ (WebCore::HTMLFormElement::submit):
+ (WebCore::HTMLFormElement::reset):
+ (WebCore::HTMLFormElement::formElementIndex):
+ (WebCore::HTMLFormElement::defaultButton):
+ (WebCore::HTMLFormElement::checkInvalidControlsAndCollectUnhandled):
+ (WebCore::HTMLFormElement::documentDidResumeFromPageCache):
+ * html/HTMLMediaElement.h:
+ * html/HTMLPlugInImageElement.h:
+ * html/HTMLSummaryElement.cpp:
+ (WebCore::isClickableControl):
+ * html/LabelableElement.h:
+ * html/RadioNodeList.cpp:
+ (WebCore::RadioNodeList::checkElementMatchesRadioNodeListFilter):
+ (WebCore::RadioNodeList::elementMatches):
+ * html/parser/HTMLConstructionSite.cpp:
+ (WebCore::HTMLConstructionSite::findFosterSite):
+ * html/parser/HTMLTreeBuilder.cpp:
+ (WebCore::disallowTelephoneNumberParsing):
+ * loader/FormSubmission.cpp:
+ (WebCore::FormSubmission::create):
+ * mathml/MathMLElement.h:
+ * page/ContextMenuController.cpp:
+ (WebCore::ContextMenuController::populate):
+ * page/Frame.cpp:
+ (WebCore::Frame::searchForLabelsBeforeElement):
+ * rendering/RenderButton.cpp:
+ (WebCore::RenderButton::formControlElement):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::resize):
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::isReadOnlyControl):
+ * svg/SVGElement.h:
+ * svg/SVGFilterPrimitiveStandardAttributes.h:
+ * svg/animation/SVGSMILElement.h:
+
</ins><span class="cx"> 2014-09-24 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Old Turkic characters behave as left-to-right instead of right-to-left, because they are encoded as surrogate pairs.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -739,7 +739,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (is<HTMLTextAreaElement>(node))
</span><del>- return toHTMLFormControlElement(node)->isReadOnly();
</del><ins>+ return downcast<HTMLTextAreaElement>(node)->isReadOnly();
</ins><span class="cx">
</span><span class="cx"> if (is<HTMLInputElement>(node)) {
</span><span class="cx"> HTMLInputElement& input = downcast<HTMLInputElement>(*node);
</span><span class="lines">@@ -760,8 +760,8 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> Node* n = this->node();
</span><del>- if (n && (n->isElementNode() && toElement(n)->isFormControlElement()))
- return toHTMLFormControlElement(n)->isRequired();
</del><ins>+ if (n && is<HTMLFormControlElement>(n))
+ return downcast<HTMLFormControlElement>(n)->isRequired();
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -898,8 +898,7 @@
</span><span class="cx"> if (!node)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return ((node->isElementNode() && toElement(node)->isFormControlElement())
- || AccessibilityObject::isARIAControl(ariaRoleAttribute()));
</del><ins>+ return is<HTMLFormControlElement>(node) || AccessibilityObject::isARIAControl(ariaRoleAttribute());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AccessibilityNodeObject::isFieldset() const
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckerTestFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE bool isAutofilled(const Element* element)
</span><span class="cx"> {
</span><del>- if (element->isFormControlElement()) {
</del><ins>+ if (is<HTMLFormControlElement>(element)) {
</ins><span class="cx"> if (const HTMLInputElement* inputElement = element->toInputElement())
</span><span class="cx"> return inputElement->isAutofilled();
</span><span class="cx"> }
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE bool isDisabled(const Element* element)
</span><span class="cx"> {
</span><del>- if (element->isFormControlElement() || is<HTMLOptionElement>(element) || is<HTMLOptGroupElement>(element))
</del><ins>+ if (is<HTMLFormControlElement>(element) || is<HTMLOptionElement>(element) || is<HTMLOptGroupElement>(element))
</ins><span class="cx"> return element->isDisabledFormControl();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> ALWAYS_INLINE bool isEnabled(const Element* element)
</span><span class="cx"> {
</span><span class="cx"> bool isEnabled = false;
</span><del>- if (element->isFormControlElement() || is<HTMLOptionElement>(element) || is<HTMLOptGroupElement>(element))
</del><ins>+ if (is<HTMLFormControlElement>(element) || is<HTMLOptionElement>(element) || is<HTMLOptGroupElement>(element))
</ins><span class="cx"> isEnabled = !element->isDisabledFormControl();
</span><span class="cx"> else if (element->isLink())
</span><span class="cx"> isEnabled = is<HTMLAnchorElement>(element) || is<HTMLAreaElement>(element);
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -626,9 +626,9 @@
</span><span class="cx"> if (element->hasID() && m_ruleSets.features().idsInRules.contains(element->idForStyleResolution().impl()))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- bool isControl = element->isFormControlElement();
</del><ins>+ bool isControl = is<HTMLFormControlElement>(element);
</ins><span class="cx">
</span><del>- if (isControl != state.element()->isFormControlElement())
</del><ins>+ if (isControl != is<HTMLFormControlElement>(state.element()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (isControl && !canShareStyleWithControl(element))
</span><span class="lines">@@ -1335,7 +1335,7 @@
</span><span class="cx">
</span><span class="cx"> // Important: Intrinsic margins get added to controls before the theme has adjusted the style, since the theme will
</span><span class="cx"> // alter fonts and heights/widths.
</span><del>- if (e && e->isFormControlElement() && style.fontSize() >= 11) {
</del><ins>+ if (e && is<HTMLFormControlElement>(e) && style.fontSize() >= 11) {
</ins><span class="cx"> // Don't apply intrinsic margins to image buttons. The designer knows how big the images are,
</span><span class="cx"> // so we have to treat all image buttons as though they were explicitly sized.
</span><span class="cx"> if (!is<HTMLInputElement>(e) || !downcast<HTMLInputElement>(*e).isImageButton())
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -973,7 +973,7 @@
</span><span class="cx"> // Either they are imported along with their host node, or created implicitly.
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- DocumentFragment& oldFragment = toDocumentFragment(*importedNode);
</del><ins>+ DocumentFragment& oldFragment = downcast<DocumentFragment>(*importedNode);
</ins><span class="cx"> RefPtr<DocumentFragment> newFragment = createDocumentFragment();
</span><span class="cx"> if (deep) {
</span><span class="cx"> for (Node* oldChild = oldFragment.firstChild(); oldChild; oldChild = oldChild->nextSibling()) {
</span><span class="lines">@@ -3410,10 +3410,10 @@
</span><span class="cx"> oldFocusedElement->setFocus(false);
</span><span class="cx">
</span><span class="cx"> // Dispatch a change event for form control elements that have been edited.
</span><del>- if (oldFocusedElement->isFormControlElement()) {
- HTMLFormControlElement* formControlElement = toHTMLFormControlElement(oldFocusedElement.get());
- if (formControlElement->wasChangedSinceLastFormControlChangeEvent())
- formControlElement->dispatchFormControlChangeEvent();
</del><ins>+ if (is<HTMLFormControlElement>(*oldFocusedElement)) {
+ HTMLFormControlElement& formControlElement = downcast<HTMLFormControlElement>(*oldFocusedElement);
+ if (formControlElement.wasChangedSinceLastFormControlChangeEvent())
+ formControlElement.dispatchFormControlChangeEvent();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Dispatch the blur event and let the node do any other blur related activities (important for text fields)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentFragmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentFragment.h (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentFragment.h 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/dom/DocumentFragment.h 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -52,11 +52,10 @@
</span><span class="cx"> virtual bool childTypeAllowed(NodeType) const override;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline bool isDocumentFragment(const Node& node) { return node.isDocumentFragment(); }
-void isDocumentFragment(const DocumentFragment&); // Catch unnecessary runtime check of type known at compile time.
</del><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(DocumentFragment)
+ static bool isDocumentFragment(const Node& node) { return node.isDocumentFragment(); }
+SPECIALIZE_TYPE_TRAITS_END()
</ins><span class="cx">
</span><del>-NODE_TYPE_CASTS(DocumentFragment)
-
</del><span class="cx"> } //namespace
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -1928,7 +1928,7 @@
</span><span class="cx"> // Calling updateFocusAppearance() would generate an unnecessary call to ScrollView::setScrollPosition(),
</span><span class="cx"> // which would jump us around during this animation. See <rdar://problem/6699741>.
</span><span class="cx"> FrameView* view = document().view();
</span><del>- bool isFormControl = view && isFormControlElement();
</del><ins>+ bool isFormControl = view && is<HTMLFormControlElement>(*this);
</ins><span class="cx"> if (isFormControl)
</span><span class="cx"> view->setProhibitsScrolling(true);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/dom/Element.h 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -670,52 +670,11 @@
</span><span class="cx">
</span><span class="cx"> NODE_TYPE_CASTS(Element)
</span><span class="cx">
</span><del>-template <typename ExpectedType, typename ArgType>
-struct ElementTypeCastTraits {
- static bool is(ArgType&);
-};
-
-// Type checking function for Elements, to use before casting with downcast<>().
-template <typename ExpectedType, typename ArgType>
-inline bool is(ArgType& node)
-{
- static_assert(!std::is_base_of<ExpectedType, ArgType>::value, "Unnecessary type check");
- return ElementTypeCastTraits<const ExpectedType, const ArgType>::is(node);
-}
-
-template <typename ExpectedType, typename ArgType>
-inline bool is(ArgType* node)
-{
- ASSERT(node);
- static_assert(!std::is_base_of<ExpectedType, ArgType>::value, "Unnecessary type check");
- return ElementTypeCastTraits<const ExpectedType, const ArgType>::is(*node);
-}
-
</del><span class="cx"> template <>
</span><del>-struct ElementTypeCastTraits<const Element, const Node> {
</del><ins>+struct NodeTypeCastTraits<const Element, const Node> {
</ins><span class="cx"> static bool is(const Node& node) { return node.isElementNode(); }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template <typename ExpectedType>
-struct ElementTypeCastTraits<ExpectedType, ExpectedType> {
- static bool is(ExpectedType&) { return true; }
-};
-
-// Downcasting functions for Element types.
-template<typename Target, typename Source>
-inline typename std::conditional<std::is_const<Source>::value, const Target&, Target&>::type downcast(Source& source)
-{
- static_assert(!std::is_base_of<Target, Source>::value, "Unnecessary cast");
- ASSERT_WITH_SECURITY_IMPLICATION(is<Target>(source));
- return static_cast<typename std::conditional<std::is_const<Source>::value, const Target&, Target&>::type>(source);
-}
-template<typename Target, typename Source> inline typename std::conditional<std::is_const<Source>::value, const Target*, Target*>::type downcast(Source* source)
-{
- static_assert(!std::is_base_of<Target, Source>::value, "Unnecessary cast");
- ASSERT_WITH_SECURITY_IMPLICATION(!source || is<Target>(*source));
- return static_cast<typename std::conditional<std::is_const<Source>::value, const Target*, Target*>::type>(source);
-}
-
</del><span class="cx"> inline bool Node::hasAttributes() const
</span><span class="cx"> {
</span><span class="cx"> return isElementNode() && toElement(this)->hasAttributes();
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/dom/Node.h 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -739,6 +739,59 @@
</span><span class="cx"> return parentNode();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template <typename ExpectedType, typename ArgType>
+struct NodeTypeCastTraits {
+ static bool is(ArgType&);
+};
+
+template <typename ExpectedType>
+struct NodeTypeCastTraits<ExpectedType, ExpectedType> {
+ static bool is(ExpectedType&) { return true; }
+};
+
+// Type checking function for Nodes, to use before casting with downcast<>().
+template <typename ExpectedType, typename ArgType>
+inline bool is(ArgType& node)
+{
+ static_assert(!std::is_base_of<ExpectedType, ArgType>::value, "Unnecessary type check");
+ return NodeTypeCastTraits<const ExpectedType, const ArgType>::is(node);
+}
+
+template <typename ExpectedType, typename ArgType>
+inline bool is(ArgType* node)
+{
+ ASSERT(node);
+ static_assert(!std::is_base_of<ExpectedType, ArgType>::value, "Unnecessary type check");
+ return NodeTypeCastTraits<const ExpectedType, const ArgType>::is(*node);
+}
+
+// Downcasting functions for Node types.
+template<typename Target, typename Source>
+inline typename std::conditional<std::is_const<Source>::value, const Target&, Target&>::type downcast(Source& source)
+{
+ static_assert(!std::is_base_of<Target, Source>::value, "Unnecessary cast");
+ ASSERT_WITH_SECURITY_IMPLICATION(is<Target>(source));
+ return static_cast<typename std::conditional<std::is_const<Source>::value, const Target&, Target&>::type>(source);
+}
+template<typename Target, typename Source> inline typename std::conditional<std::is_const<Source>::value, const Target*, Target*>::type downcast(Source* source)
+{
+ static_assert(!std::is_base_of<Target, Source>::value, "Unnecessary cast");
+ ASSERT_WITH_SECURITY_IMPLICATION(!source || is<Target>(*source));
+ return static_cast<typename std::conditional<std::is_const<Source>::value, const Target*, Target*>::type>(source);
+}
+
+// Add support for type checking / casting using is<>() / downcast<>() helpers for a specific class.
+#define SPECIALIZE_TYPE_TRAITS_BEGIN(ClassName) \
+ template <typename ArgType> \
+ class NodeTypeCastTraits<const ClassName, ArgType> { \
+ public: \
+ static bool is(ArgType& node) { return is##ClassName(node); } \
+ private:
+
+#define SPECIALIZE_TYPE_TRAITS_END() \
+ };
+
+// FIXME: This should be removed and all uses should be replaced with SPECIALIZE_TYPE_TRAITS_*().
</ins><span class="cx"> #define NODE_TYPE_CASTS(ToClassName) \
</span><span class="cx"> TYPE_CASTS_BASE(ToClassName, Node, node, WebCore::is##ToClassName(*node), WebCore::is##ToClassName(node))
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredommake_namespl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/make_names.pl (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/make_names.pl 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/dom/make_names.pl 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -636,7 +636,7 @@
</span><span class="cx"> print F <<END
</span><span class="cx"> class $class;
</span><span class="cx"> template <typename ArgType>
</span><del>-class ElementTypeCastTraits<const $class, ArgType> {
</del><ins>+class NodeTypeCastTraits<const $class, ArgType> {
</ins><span class="cx"> public:
</span><span class="cx"> static bool is(ArgType& node) { return checkTagName(node); }
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -2025,8 +2025,8 @@
</span><span class="cx"> HTMLElement& element = *it;
</span><span class="cx"> if (isHTMLFormElement(&element))
</span><span class="cx"> return downcast<HTMLFormElement>(&element);
</span><del>- if (isHTMLFormControlElement(element))
- return toHTMLFormControlElement(element).form();
</del><ins>+ if (is<HTMLFormControlElement>(element))
+ return downcast<HTMLFormControlElement>(element).form();
</ins><span class="cx"> if (isHTMLFrameElementBase(element)) {
</span><span class="cx"> Document* contentDocument = toHTMLFrameElementBase(element).contentDocument();
</span><span class="cx"> if (!contentDocument)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx">
</span><span class="cx"> if (renderer->node() && renderer->node()->isElementNode()) {
</span><span class="cx"> Element& element = toElement(*renderer->node());
</span><del>- if (element.isFormControlElement() || element.hasTagName(legendTag) || element.hasTagName(meterTag) || element.hasTagName(progressTag))
</del><ins>+ if (is<HTMLFormControlElement>(element) || is<HTMLLegendElement>(element) || is<HTMLMeterElement>(element) || is<HTMLProgressElement>(element))
</ins><span class="cx"> return true;
</span><span class="cx"> if (equalIgnoringCase(element.fastGetAttribute(roleAttr), "img"))
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlFormAssociatedElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/FormAssociatedElement.h (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/FormAssociatedElement.h 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/html/FormAssociatedElement.h 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -118,9 +118,6 @@
</span><span class="cx"> String m_customValidationMessage;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#define FORM_ASSOCIATED_ELEMENT_TYPE_CASTS(ToClassName, predicate) \
- TYPE_CASTS_BASE(ToClassName, FormAssociatedElement, element, element->predicate, element.predicate)
-
</del><span class="cx"> } // namespace
</span><span class="cx">
</span><span class="cx"> #endif // FormAssociatedElement_h
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.h (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.h 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/html/HTMLElement.h 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> inline bool isHTMLElement(const Node& node) { return node.isHTMLElement(); }
</span><span class="cx">
</span><span class="cx"> template <typename ArgType>
</span><del>-struct ElementTypeCastTraits<const HTMLElement, ArgType> {
</del><ins>+struct NodeTypeCastTraits<const HTMLElement, ArgType> {
</ins><span class="cx"> static bool is(ArgType& node) { return isHTMLElement(node); }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFieldSetElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFieldSetElement.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFieldSetElement.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/html/HTMLFieldSetElement.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx"> static void updateFromControlElementsAncestorDisabledStateUnder(HTMLElement& startNode, bool isDisabled)
</span><span class="cx"> {
</span><span class="cx"> HTMLFormControlElement* control;
</span><del>- if (isHTMLFormControlElement(startNode))
- control = &toHTMLFormControlElement(startNode);
</del><ins>+ if (is<HTMLFormControlElement>(startNode))
+ control = &downcast<HTMLFormControlElement>(startNode);
</ins><span class="cx"> else
</span><span class="cx"> control = Traversal<HTMLFormControlElement>::firstWithin(&startNode);
</span><span class="cx"> while (control) {
</span><span class="lines">@@ -167,8 +167,8 @@
</span><span class="cx"> for (auto& element : descendantsOfType<Element>(const_cast<HTMLFieldSetElement&>(*this))) {
</span><span class="cx"> if (element.hasTagName(objectTag))
</span><span class="cx"> m_associatedElements.append(&downcast<HTMLObjectElement>(element));
</span><del>- else if (element.isFormControlElement())
- m_associatedElements.append(&toHTMLFormControlElement(element));
</del><ins>+ else if (is<HTMLFormControlElement>(element))
+ m_associatedElements.append(&downcast<HTMLFormControlElement>(element));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -508,10 +508,10 @@
</span><span class="cx"> HTMLFormControlElement* HTMLFormControlElement::enclosingFormControlElement(Node* node)
</span><span class="cx"> {
</span><span class="cx"> for (; node; node = node->parentNode()) {
</span><del>- if (node->isElementNode() && toElement(node)->isFormControlElement())
- return toHTMLFormControlElement(node);
</del><ins>+ if (is<HTMLFormControlElement>(node))
+ return downcast<HTMLFormControlElement>(node);
</ins><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Webcore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.h (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.h 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.h 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -190,19 +190,12 @@
</span><span class="cx"> bool m_hasAutofocused : 1;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-void isHTMLFormControlElement(const HTMLFormControlElement&); // Catch unnecessary runtime check of type known at compile time.
-inline bool isHTMLFormControlElement(const Element& element) { return element.isFormControlElement(); }
-inline bool isHTMLFormControlElement(const Node& node) { return node.isElementNode() && toElement(node).isFormControlElement(); }
</del><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(HTMLFormControlElement)
+ static bool isHTMLFormControlElement(const Element& element) { return element.isFormControlElement(); }
+ static bool isHTMLFormControlElement(const Node& node) { return node.isElementNode() && toElement(node).isFormControlElement(); }
+ static bool isHTMLFormControlElement(const FormAssociatedElement& element) { return element.isFormControlElement(); }
+SPECIALIZE_TYPE_TRAITS_END()
</ins><span class="cx">
</span><del>-template <typename ArgType>
-struct ElementTypeCastTraits<const HTMLFormControlElement, ArgType> {
- static bool is(ArgType& node) { return isHTMLFormControlElement(node); }
-};
-
-NODE_TYPE_CASTS(HTMLFormControlElement)
-
-FORM_ASSOCIATED_ELEMENT_TYPE_CASTS(HTMLFormControlElement, isFormControlElement())
-
</del><span class="cx"> } // namespace
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -182,15 +182,15 @@
</span><span class="cx"> unsigned submissionTriggerCount = 0;
</span><span class="cx"> for (unsigned i = 0; i < m_associatedElements.size(); ++i) {
</span><span class="cx"> FormAssociatedElement* formAssociatedElement = m_associatedElements[i];
</span><del>- if (!formAssociatedElement->isFormControlElement())
</del><ins>+ if (!is<HTMLFormControlElement>(formAssociatedElement))
</ins><span class="cx"> continue;
</span><del>- HTMLFormControlElement* formElement = toHTMLFormControlElement(formAssociatedElement);
- if (formElement->isSuccessfulSubmitButton()) {
- if (formElement->renderer()) {
- formElement->dispatchSimulatedClick(event);
</del><ins>+ HTMLFormControlElement& formElement = downcast<HTMLFormControlElement>(*formAssociatedElement);
+ if (formElement.isSuccessfulSubmitButton()) {
+ if (formElement.renderer()) {
+ formElement.dispatchSimulatedClick(event);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- } else if (formElement->canTriggerImplicitSubmission())
</del><ins>+ } else if (formElement.canTriggerImplicitSubmission())
</ins><span class="cx"> ++submissionTriggerCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -206,10 +206,10 @@
</span><span class="cx"> static inline HTMLFormControlElement* submitElementFromEvent(const Event* event)
</span><span class="cx"> {
</span><span class="cx"> for (Node* node = event->target()->toNode(); node; node = node->parentNode()) {
</span><del>- if (node->isElementNode() && toElement(node)->isFormControlElement())
- return toHTMLFormControlElement(node);
</del><ins>+ if (is<HTMLFormControlElement>(node))
+ return downcast<HTMLFormControlElement>(node);
</ins><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLFormElement::validateInteractively(Event* event)
</span><span class="lines">@@ -223,8 +223,8 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < m_associatedElements.size(); ++i) {
</span><del>- if (m_associatedElements[i]->isFormControlElement())
- toHTMLFormControlElement(m_associatedElements[i])->hideVisibleValidationMessage();
</del><ins>+ if (is<HTMLFormControlElement>(m_associatedElements[i]))
+ downcast<HTMLFormControlElement>(*m_associatedElements[i]).hideVisibleValidationMessage();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<FormAssociatedElement>> unhandledInvalidControls;
</span><span class="lines">@@ -245,8 +245,8 @@
</span><span class="cx"> if (element.inDocument() && element.isFocusable()) {
</span><span class="cx"> element.scrollIntoViewIfNeeded(false);
</span><span class="cx"> element.focus();
</span><del>- if (element.isFormControlElement())
- toHTMLFormControlElement(element).updateVisibleValidationMessage();
</del><ins>+ if (is<HTMLFormControlElement>(element))
+ downcast<HTMLFormControlElement>(element).updateVisibleValidationMessage();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -345,14 +345,14 @@
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < m_associatedElements.size(); ++i) {
</span><span class="cx"> FormAssociatedElement* associatedElement = m_associatedElements[i];
</span><del>- if (!associatedElement->isFormControlElement())
</del><ins>+ if (!is<HTMLFormControlElement>(associatedElement))
</ins><span class="cx"> continue;
</span><span class="cx"> if (needButtonActivation) {
</span><del>- HTMLFormControlElement* control = toHTMLFormControlElement(associatedElement);
- if (control->isActivatedSubmit())
</del><ins>+ HTMLFormControlElement& control = downcast<HTMLFormControlElement>(*associatedElement);
+ if (control.isActivatedSubmit())
</ins><span class="cx"> needButtonActivation = false;
</span><del>- else if (firstSuccessfulSubmitButton == 0 && control->isSuccessfulSubmitButton())
- firstSuccessfulSubmitButton = control;
</del><ins>+ else if (!firstSuccessfulSubmitButton && control.isSuccessfulSubmitButton())
+ firstSuccessfulSubmitButton = &control;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -384,8 +384,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < m_associatedElements.size(); ++i) {
</span><del>- if (m_associatedElements[i]->isFormControlElement())
- toHTMLFormControlElement(m_associatedElements[i])->reset();
</del><ins>+ if (is<HTMLFormControlElement>(m_associatedElements[i]))
+ downcast<HTMLFormControlElement>(*m_associatedElements[i]).reset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_isInResetFunction = false;
</span><span class="lines">@@ -592,7 +592,7 @@
</span><span class="cx"> for (auto& element : descendants) {
</span><span class="cx"> if (&element == &associatedHTMLElement)
</span><span class="cx"> return i;
</span><del>- if (!isHTMLFormControlElement(element) && !is<HTMLObjectElement>(element))
</del><ins>+ if (!is<HTMLFormControlElement>(element) && !is<HTMLObjectElement>(element))
</ins><span class="cx"> continue;
</span><span class="cx"> if (element.form() != this)
</span><span class="cx"> continue;
</span><span class="lines">@@ -696,14 +696,14 @@
</span><span class="cx"> HTMLFormControlElement* HTMLFormElement::defaultButton() const
</span><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0; i < m_associatedElements.size(); ++i) {
</span><del>- if (!m_associatedElements[i]->isFormControlElement())
</del><ins>+ if (!is<HTMLFormControlElement>(m_associatedElements[i]))
</ins><span class="cx"> continue;
</span><del>- HTMLFormControlElement* control = toHTMLFormControlElement(m_associatedElements[i]);
- if (control->isSuccessfulSubmitButton())
- return control;
</del><ins>+ HTMLFormControlElement& control = downcast<HTMLFormControlElement>(*m_associatedElements[i]);
+ if (control.isSuccessfulSubmitButton())
+ return &control;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLFormElement::checkValidity()
</span><span class="lines">@@ -723,9 +723,9 @@
</span><span class="cx"> elements.append(m_associatedElements[i]);
</span><span class="cx"> bool hasInvalidControls = false;
</span><span class="cx"> for (unsigned i = 0; i < elements.size(); ++i) {
</span><del>- if (elements[i]->form() == this && elements[i]->isFormControlElement()) {
- HTMLFormControlElement* control = toHTMLFormControlElement(elements[i].get());
- if (!control->checkValidity(&unhandledInvalidControls) && control->form() == this)
</del><ins>+ if (elements[i]->form() == this && is<HTMLFormControlElement>(*elements[i])) {
+ HTMLFormControlElement& control = downcast<HTMLFormControlElement>(*elements[i]);
+ if (!control.checkValidity(&unhandledInvalidControls) && control.form() == this)
</ins><span class="cx"> hasInvalidControls = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -810,8 +810,8 @@
</span><span class="cx"> ASSERT(!shouldAutocomplete());
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < m_associatedElements.size(); ++i) {
</span><del>- if (m_associatedElements[i]->isFormControlElement())
- toHTMLFormControlElement(m_associatedElements[i])->reset();
</del><ins>+ if (is<HTMLFormControlElement>(m_associatedElements[i]))
+ downcast<HTMLFormControlElement>(*m_associatedElements[i]).reset();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -915,7 +915,7 @@
</span><span class="cx"> inline bool isHTMLMediaElement(const Node& node) { return node.isElementNode() && toElement(node).isMediaElement(); }
</span><span class="cx">
</span><span class="cx"> template <typename ArgType>
</span><del>-struct ElementTypeCastTraits<const HTMLMediaElement, ArgType> {
</del><ins>+struct NodeTypeCastTraits<const HTMLMediaElement, ArgType> {
</ins><span class="cx"> static bool is(ArgType& node) { return isHTMLMediaElement(node); }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.h (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> inline bool isHTMLPlugInImageElement(const Node& node) { return node.isPluginElement() && toHTMLPlugInElement(node).isPlugInImageElement(); }
</span><span class="cx">
</span><span class="cx"> template <typename ArgType>
</span><del>-struct ElementTypeCastTraits<const HTMLPlugInImageElement, ArgType> {
</del><ins>+struct NodeTypeCastTraits<const HTMLPlugInImageElement, ArgType> {
</ins><span class="cx"> static bool is(ArgType& node) { return isHTMLPlugInImageElement(node); }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSummaryElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSummaryElement.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSummaryElement.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/html/HTMLSummaryElement.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #if ENABLE(DETAILS_ELEMENT)
</span><span class="cx"> #include "DetailsMarkerControl.h"
</span><span class="cx"> #include "HTMLDetailsElement.h"
</span><ins>+#include "HTMLFormControlElement.h"
</ins><span class="cx"> #include "InsertionPoint.h"
</span><span class="cx"> #include "KeyboardEvent.h"
</span><span class="cx"> #include "MouseEvent.h"
</span><span class="lines">@@ -104,10 +105,10 @@
</span><span class="cx"> if (!node->isElementNode())
</span><span class="cx"> return false;
</span><span class="cx"> Element* element = toElement(node);
</span><del>- if (element->isFormControlElement())
</del><ins>+ if (is<HTMLFormControlElement>(element))
</ins><span class="cx"> return true;
</span><span class="cx"> Element* host = element->shadowHost();
</span><del>- return host && host->isFormControlElement();
</del><ins>+ return host && is<HTMLFormControlElement>(host);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLSummaryElement::supportsFocus() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlLabelableElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/LabelableElement.h (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LabelableElement.h 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/html/LabelableElement.h 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> inline bool isLabelableElement(const Node& node) { return node.isHTMLElement() && toHTMLElement(node).isLabelable(); }
</span><span class="cx">
</span><span class="cx"> template <typename ArgType>
</span><del>-struct ElementTypeCastTraits<const LabelableElement, ArgType> {
</del><ins>+struct NodeTypeCastTraits<const LabelableElement, ArgType> {
</ins><span class="cx"> static bool is(ArgType& node) { return isLabelableElement(node); }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRadioNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RadioNodeList.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RadioNodeList.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/html/RadioNodeList.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -85,13 +85,13 @@
</span><span class="cx">
</span><span class="cx"> bool RadioNodeList::checkElementMatchesRadioNodeListFilter(const Element& testElement) const
</span><span class="cx"> {
</span><del>- ASSERT(testElement.hasTagName(objectTag) || testElement.isFormControlElement());
</del><ins>+ ASSERT(is<HTMLObjectElement>(testElement) || is<HTMLFormControlElement>(testElement));
</ins><span class="cx"> if (isHTMLFormElement(ownerNode())) {
</span><span class="cx"> HTMLFormElement* formElement = nullptr;
</span><span class="cx"> if (testElement.hasTagName(objectTag))
</span><span class="cx"> formElement = downcast<HTMLObjectElement>(testElement).form();
</span><span class="cx"> else
</span><del>- formElement = toHTMLFormControlElement(testElement).form();
</del><ins>+ formElement = downcast<HTMLFormControlElement>(testElement).form();
</ins><span class="cx"> if (!formElement || formElement != &ownerNode())
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> bool RadioNodeList::elementMatches(Element& testElement) const
</span><span class="cx"> {
</span><del>- if (!testElement.hasTagName(objectTag) && !testElement.isFormControlElement())
</del><ins>+ if (!is<HTMLObjectElement>(testElement) && !is<HTMLFormControlElement>(testElement))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (HTMLInputElement* inputElement = testElement.toInputElement()) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLConstructionSitecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -727,7 +727,7 @@
</span><span class="cx"> // and instead use the DocumentFragment as a root node. So we must treat the root node (DocumentFragment) as if it is a html element here.
</span><span class="cx"> bool parentCanBeFosterParent = parent && (parent->isElementNode() || (m_isParsingFragment && parent == m_openElements.rootNode()));
</span><span class="cx"> #if ENABLE(TEMPLATE_ELEMENT)
</span><del>- parentCanBeFosterParent = parentCanBeFosterParent || (parent && parent->isDocumentFragment() && toDocumentFragment(parent)->isTemplateContent());
</del><ins>+ parentCanBeFosterParent = parentCanBeFosterParent || (parent && is<DocumentFragment>(parent) && downcast<DocumentFragment>(parent)->isTemplateContent());
</ins><span class="cx"> #endif
</span><span class="cx"> if (parentCanBeFosterParent) {
</span><span class="cx"> task.parent = parent;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLTreeBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -2381,7 +2381,7 @@
</span><span class="cx"> return node.isLink()
</span><span class="cx"> || node.nodeType() == Node::COMMENT_NODE
</span><span class="cx"> || node.hasTagName(scriptTag)
</span><del>- || (node.isHTMLElement() && toHTMLElement(node).isFormControlElement())
</del><ins>+ || is<HTMLFormControlElement>(node)
</ins><span class="cx"> || node.hasTagName(styleTag)
</span><span class="cx"> || node.hasTagName(ttTag)
</span><span class="cx"> || node.hasTagName(preTag)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFormSubmissioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FormSubmission.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FormSubmission.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/loader/FormSubmission.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -144,8 +144,8 @@
</span><span class="cx"> HTMLFormControlElement* submitButton = 0;
</span><span class="cx"> if (event && event->target()) {
</span><span class="cx"> for (Node* node = event->target()->toNode(); node; node = node->parentNode()) {
</span><del>- if (node->isElementNode() && toElement(node)->isFormControlElement()) {
- submitButton = toHTMLFormControlElement(node);
</del><ins>+ if (is<HTMLFormControlElement>(node)) {
+ submitButton = downcast<HTMLFormControlElement>(node);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLElement.h (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLElement.h 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/mathml/MathMLElement.h 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> inline bool isMathMLElement(const Node& node) { return node.isMathMLElement(); }
</span><span class="cx">
</span><span class="cx"> template <typename ArgType>
</span><del>-struct ElementTypeCastTraits<const MathMLElement, ArgType> {
</del><ins>+struct NodeTypeCastTraits<const MathMLElement, ArgType> {
</ins><span class="cx"> static bool is(ArgType& node) { return isMathMLElement(node); }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuController.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -836,7 +836,7 @@
</span><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- if (!m_context.hitTestResult().isContentEditable() && (node->isElementNode() && toElement(node)->isFormControlElement()))
</del><ins>+ if (!m_context.hitTestResult().isContentEditable() && is<HTMLFormControlElement>(node))
</ins><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx"> Frame* frame = node->document().frame();
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/page/Frame.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx"> Node* n;
</span><span class="cx"> for (n = NodeTraversal::previous(element); n && lengthSearched < charsSearchedThreshold; n = NodeTraversal::previous(n)) {
</span><span class="cx"> // We hit another form element or the start of the form - bail out
</span><del>- if (isHTMLFormElement(n) || (n->isHTMLElement() && toElement(n)->isFormControlElement()))
</del><ins>+ if (is<HTMLFormElement>(n) || is<HTMLFormControlElement>(n))
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> if (n->hasTagName(tdTag) && !startingTableCell) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderButtoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderButton.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderButton.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/rendering/RenderButton.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> HTMLFormControlElement& RenderButton::formControlElement() const
</span><span class="cx"> {
</span><del>- return toHTMLFormControlElement(nodeForNonAnonymous());
</del><ins>+ return downcast<HTMLFormControlElement>(nodeForNonAnonymous());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderButton::canBeSelectionLeaf() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "Gradient.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><ins>+#include "HTMLFormControlElement.h"
</ins><span class="cx"> #include "HTMLFrameElement.h"
</span><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="lines">@@ -2573,7 +2574,7 @@
</span><span class="cx">
</span><span class="cx"> EResize resize = renderer->style().resize();
</span><span class="cx"> if (resize != RESIZE_VERTICAL && difference.width()) {
</span><del>- if (element->isFormControlElement()) {
</del><ins>+ if (is<HTMLFormControlElement>(element)) {
</ins><span class="cx"> // Make implicit margins from the theme explicit (see <http://bugs.webkit.org/show_bug.cgi?id=9547>).
</span><span class="cx"> styledElement->setInlineStyleProperty(CSSPropertyMarginLeft, renderer->marginLeft() / zoomFactor, CSSPrimitiveValue::CSS_PX);
</span><span class="cx"> styledElement->setInlineStyleProperty(CSSPropertyMarginRight, renderer->marginRight() / zoomFactor, CSSPrimitiveValue::CSS_PX);
</span><span class="lines">@@ -2584,7 +2585,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (resize != RESIZE_HORIZONTAL && difference.height()) {
</span><del>- if (element->isFormControlElement()) {
</del><ins>+ if (is<HTMLFormControlElement>(element)) {
</ins><span class="cx"> // Make implicit margins from the theme explicit (see <http://bugs.webkit.org/show_bug.cgi?id=9547>).
</span><span class="cx"> styledElement->setInlineStyleProperty(CSSPropertyMarginTop, renderer->marginTop() / zoomFactor, CSSPrimitiveValue::CSS_PX);
</span><span class="cx"> styledElement->setInlineStyleProperty(CSSPropertyMarginBottom, renderer->marginBottom() / zoomFactor, CSSPrimitiveValue::CSS_PX);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -843,9 +843,9 @@
</span><span class="cx"> bool RenderTheme::isReadOnlyControl(const RenderObject& o) const
</span><span class="cx"> {
</span><span class="cx"> Node* node = o.node();
</span><del>- if (!node || !node->isElementNode() || !toElement(node)->isFormControlElement())
</del><ins>+ if (!node || !is<HTMLFormControlElement>(node))
</ins><span class="cx"> return false;
</span><del>- return !toElement(node)->matchesReadWritePseudoClass();
</del><ins>+ return !toElement(*node).matchesReadWritePseudoClass();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderTheme::isHovered(const RenderObject& o) const
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.h (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.h 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/svg/SVGElement.h 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> inline bool isSVGElement(const Node& node) { return node.isSVGElement(); }
</span><span class="cx">
</span><span class="cx"> template <typename ArgType>
</span><del>-struct ElementTypeCastTraits<const SVGElement, ArgType> {
</del><ins>+struct NodeTypeCastTraits<const SVGElement, ArgType> {
</ins><span class="cx"> static bool is(ArgType& node) { return isSVGElement(node); }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFilterPrimitiveStandardAttributesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> inline bool isSVGFilterPrimitiveStandardAttributes(const Node& node) { return node.isSVGElement() && downcast<SVGElement>(node).isFilterEffect(); }
</span><span class="cx">
</span><span class="cx"> template <typename ArgType>
</span><del>-struct ElementTypeCastTraits<const SVGFilterPrimitiveStandardAttributes, ArgType> {
</del><ins>+struct NodeTypeCastTraits<const SVGFilterPrimitiveStandardAttributes, ArgType> {
</ins><span class="cx"> static bool is(ArgType& node) { return isSVGFilterPrimitiveStandardAttributes(node); }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvganimationSVGSMILElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/animation/SVGSMILElement.h (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/animation/SVGSMILElement.h 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebCore/svg/animation/SVGSMILElement.h 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> inline bool isSVGSMILElement(const Node& node) { return node.isSVGElement() && downcast<SVGElement>(node).isSMILElement(); }
</span><span class="cx">
</span><span class="cx"> template <typename ArgType>
</span><del>-struct ElementTypeCastTraits<const SVGSMILElement, ArgType> {
</del><ins>+struct NodeTypeCastTraits<const SVGSMILElement, ArgType> {
</ins><span class="cx"> static bool is(ArgType& node) { return isSVGSMILElement(node); }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-09-24 Christophe Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Add initial is<>() / downcast<>() support for any type of Nodes
+ https://bugs.webkit.org/show_bug.cgi?id=137056
+
+ Reviewed by Benjamin Poulain.
+
+ Use is<HTMLFormControlElement>() / downcast<HTMLFormControlElement>()
+ instead of isFormControlElement() / toHTMLFormControlElement().
+
+ * WebView/WebHTMLRepresentation.mm:
+ (searchForLabelsBeforeElement):
+
+2014-09-24 Christophe Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Use is<HTML*Element>() instead of isHTML*Element() - Part 1
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137068
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLRepresentationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -445,15 +445,13 @@
</span><span class="cx"> unsigned lengthSearched = 0;
</span><span class="cx"> Node* n;
</span><span class="cx"> for (n = NodeTraversal::previous(element);
</span><del>- n && lengthSearched < charsSearchedThreshold;
- n = NodeTraversal::previous(n))
- {
- if (n->hasTagName(formTag)
- || (n->isHTMLElement() && toElement(n)->isFormControlElement()))
- {
</del><ins>+ n && lengthSearched < charsSearchedThreshold;
+ n = NodeTraversal::previous(n)) {
+ if (is<HTMLFormElement>(n) || is<HTMLFormControlElement>(n)) {
</ins><span class="cx"> // We hit another form element or the start of the form - bail out
</span><span class="cx"> break;
</span><del>- } else if (n->hasTagName(tdTag) && !startingTableCell) {
</del><ins>+ }
+ if (n->hasTagName(tdTag) && !startingTableCell) {
</ins><span class="cx"> startingTableCell = static_cast<HTMLTableCellElement*>(n);
</span><span class="cx"> } else if (n->hasTagName(trTag) && startingTableCell) {
</span><span class="cx"> NSString* result = frame->searchForLabelsAboveCell(*regExp, startingTableCell, resultDistance);
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebKit/win/ChangeLog 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-09-24 Christophe Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Add initial is<>() / downcast<>() support for any type of Nodes
+ https://bugs.webkit.org/show_bug.cgi?id=137056
+
+ Reviewed by Benjamin Poulain.
+
+ Use is<HTMLFormControlElement>() / downcast<HTMLFormControlElement>()
+ instead of isFormControlElement() / toHTMLFormControlElement().
+
+ * WebFrame.cpp:
+ (WebFrame::elementWithName):
+
+2014-09-24 Christophe Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Unreviewed build fix after r173932.
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix after r173932 for Windows. Use WebCore:: namespace
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebFrame.cpp (173943 => 173944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebFrame.cpp 2014-09-25 02:53:48 UTC (rev 173943)
+++ trunk/Source/WebKit/win/WebFrame.cpp 2014-09-25 03:50:40 UTC (rev 173944)
</span><span class="lines">@@ -1101,12 +1101,12 @@
</span><span class="cx"> const Vector<FormAssociatedElement*>& elements = formElement->associatedElements();
</span><span class="cx"> AtomicString targetName((UChar*)name, SysStringLen(name));
</span><span class="cx"> for (unsigned int i = 0; i < elements.size(); i++) {
</span><del>- if (!elements[i]->isFormControlElement())
</del><ins>+ if (!is<HTMLFormControlElement>(elements[i]))
</ins><span class="cx"> continue;
</span><del>- HTMLFormControlElement* elt = toHTMLFormControlElement(elements[i]);
</del><ins>+ HTMLFormControlElement& elt = downcast<HTMLFormControlElement>(*elements[i]);
</ins><span class="cx"> // Skip option elements, other duds
</span><del>- if (elt->name() == targetName) {
- *element = DOMElement::createInstance(elt);
</del><ins>+ if (elt.name() == targetName) {
+ *element = DOMElement::createInstance(&elt);
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>