<!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>[174898] 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/174898">174898</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-20 12:08:40 -0700 (Mon, 20 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is<>() / downcast<>() for Accessibility objects
https://bugs.webkit.org/show_bug.cgi?id=137286
Reviewed by Darin Adler.
Source/WebCore:
Use is<>() / downcast<>() for Accessibility objects and clean up the
surrounding code.
No new tests, no behavior change.
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::focusedImageMapUIElement):
(WebCore::AXObjectCache::notificationPostTimerFired):
* accessibility/AccessibilityARIAGrid.cpp:
(WebCore::AccessibilityARIAGrid::addTableCellChild):
(WebCore::AccessibilityARIAGrid::addChildren):
* accessibility/AccessibilityARIAGridCell.cpp:
(WebCore::AccessibilityARIAGridCell::parentTable):
(WebCore::AccessibilityARIAGridCell::rowIndexRange):
* accessibility/AccessibilityARIAGridRow.cpp:
(WebCore::AccessibilityARIAGridRow::disclosedRows):
(WebCore::AccessibilityARIAGridRow::disclosedByRow):
(WebCore::AccessibilityARIAGridRow::parentTable):
* accessibility/AccessibilityARIAGridRow.h:
* accessibility/AccessibilityImageMapLink.cpp:
(WebCore::AccessibilityImageMapLink::imageMapLinkRenderer):
* accessibility/AccessibilityImageMapLink.h:
* accessibility/AccessibilityList.h:
* accessibility/AccessibilityListBox.cpp:
(WebCore::AccessibilityListBox::setSelectedChildren):
(WebCore::AccessibilityListBox::selectedChildren):
(WebCore::AccessibilityListBox::listBoxOptionAccessibilityObject):
* accessibility/AccessibilityListBox.h:
* accessibility/AccessibilityListBoxOption.h:
* accessibility/AccessibilityMenuList.cpp:
(WebCore::AccessibilityMenuList::addChildren):
(WebCore::AccessibilityMenuList::didUpdateActiveOption):
* accessibility/AccessibilityMenuList.h:
* accessibility/AccessibilityMenuListOption.h:
* accessibility/AccessibilityMenuListPopup.cpp:
(WebCore::AccessibilityMenuListPopup::menuListOptionAccessibilityObject):
* accessibility/AccessibilityMenuListPopup.h:
* accessibility/AccessibilityMockObject.h:
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::textUnderElement):
* accessibility/AccessibilityNodeObject.h:
* accessibility/AccessibilityObject.cpp:
(WebCore::appendChildrenToArray):
(WebCore::AccessibilityObject::scrollViewAncestor):
* accessibility/AccessibilityObject.h:
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::getDocumentLinks):
(WebCore::AccessibilityRenderObject::handleActiveDescendantChanged):
(WebCore::AccessibilityRenderObject::inheritsPresentationalRole):
(WebCore::AccessibilityRenderObject::addImageMapChildren):
(WebCore::AccessibilityRenderObject::addTextFieldChildren):
(WebCore::AccessibilityRenderObject::remoteSVGRootElement):
(WebCore::AccessibilityRenderObject::ariaSelectedRows):
* accessibility/AccessibilityRenderObject.h:
* accessibility/AccessibilitySVGRoot.h:
* accessibility/AccessibilityScrollView.cpp:
(WebCore::AccessibilityScrollView::addChildScrollbar):
* accessibility/AccessibilityScrollView.h:
* accessibility/AccessibilityScrollbar.h:
* accessibility/AccessibilitySlider.cpp:
(WebCore::AccessibilitySlider::addChildren):
* accessibility/AccessibilitySlider.h:
* accessibility/AccessibilitySpinButton.cpp:
(WebCore::AccessibilitySpinButton::addChildren):
(WebCore::AccessibilitySpinButtonPart::press):
* accessibility/AccessibilitySpinButton.h:
* accessibility/AccessibilityTable.cpp:
(WebCore::AccessibilityTable::addChildren):
(WebCore::AccessibilityTable::addChildrenFromSection):
(WebCore::AccessibilityTable::headerContainer):
(WebCore::AccessibilityTable::columnHeaders):
(WebCore::AccessibilityTable::rowHeaders):
(WebCore::AccessibilityTable::cellForColumnAndRow):
* accessibility/AccessibilityTable.h:
Make isAccessibilityTable() public and mark as final so that callers
can benefit from tighter typing, as isAccessibilityTable() is
stricter than isTable(). isTable() indicates that the object is an
AccessibilityTable and is equivalent to is<AccessibilityTable>(object).
isAccessibilityTable() is equivalent to "isTable() && renderer()".
* accessibility/AccessibilityTableCell.cpp:
(WebCore::AccessibilityTableCell::parentTable):
* accessibility/AccessibilityTableCell.h:
* accessibility/AccessibilityTableColumn.cpp:
(WebCore::AccessibilityTableColumn::headerObject):
(WebCore::AccessibilityTableColumn::addChildren):
* accessibility/AccessibilityTableColumn.h:
* accessibility/AccessibilityTableHeaderContainer.cpp:
(WebCore::AccessibilityTableHeaderContainer::addChildren):
* accessibility/AccessibilityTableRow.cpp:
(WebCore::AccessibilityTableRow::parentTable):
(WebCore::AccessibilityTableRow::headerObject):
* accessibility/AccessibilityTableRow.h:
* accessibility/atk/WebKitAccessibleInterfaceSelection.cpp:
(webkitAccessibleSelectionClearSelection):
(webkitAccessibleSelectionSelectAllSelection):
* accessibility/atk/WebKitAccessibleInterfaceTable.cpp:
(core):
(cell):
(cellAtIndex):
(webkitAccessibleTableGetIndexAt):
(webkitAccessibleTableGetNColumns):
(webkitAccessibleTableGetNRows):
(webkitAccessibleTableGetColumnHeader):
(webkitAccessibleTableGetRowHeader):
* accessibility/atk/WebKitAccessibleInterfaceTableCell.cpp:
(webkitAccessibleTableCellGetColumnHeaderCells):
(webkitAccessibleTableCellGetRowHeaderCells):
(webkitAccessibleTableCellGetColumnSpan):
(webkitAccessibleTableCellGetRowSpan):
(webkitAccessibleTableCellGetPosition):
* accessibility/ios/AccessibilityObjectIOS.mm:
(WebCore::AccessibilityObject::accessibilityPasswordFieldLength):
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper convertPointToScreenSpace:]):
(-[WebAccessibilityObjectWrapper convertRectToScreenSpace:]):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(AXAttributeStringSetElement):
(-[WebAccessibilityObjectWrapper additionalAccessibilityAttributeNames]):
(-[WebAccessibilityObjectWrapper convertPointToScreenSpace:]):
(-[WebAccessibilityObjectWrapper subrole]):
(-[WebAccessibilityObjectWrapper roleDescription]):
(-[WebAccessibilityObjectWrapper scrollViewParent]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
(-[WebAccessibilityObjectWrapper accessibilityShowContextMenu]):
(-[WebAccessibilityObjectWrapper accessibilitySetValue:forAttribute:]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
* rendering/RenderMenuList.cpp:
(RenderMenuList::didUpdateActiveOption):
Source/WebKit/win:
Use is<>() / downcast<>() for Accessibility objects.
* AccessibleBase.cpp:
(AccessibleBase::accSelect):
* AccessibleImage.cpp:
(AccessibleImage::name):
Source/WTF:
Remove the legacy TYPE_CASTS_BASE() macro now that it is no longer
used.
* wtf/Assertions.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfAssertionsh">trunk/Source/WTF/wtf/Assertions.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityARIAGridcpp">trunk/Source/WebCore/accessibility/AccessibilityARIAGrid.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityARIAGridCellcpp">trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityARIAGridRowcpp">trunk/Source/WebCore/accessibility/AccessibilityARIAGridRow.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityARIAGridRowh">trunk/Source/WebCore/accessibility/AccessibilityARIAGridRow.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityImageMapLinkcpp">trunk/Source/WebCore/accessibility/AccessibilityImageMapLink.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityImageMapLinkh">trunk/Source/WebCore/accessibility/AccessibilityImageMapLink.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityListh">trunk/Source/WebCore/accessibility/AccessibilityList.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityListBoxcpp">trunk/Source/WebCore/accessibility/AccessibilityListBox.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityListBoxh">trunk/Source/WebCore/accessibility/AccessibilityListBox.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityListBoxOptionh">trunk/Source/WebCore/accessibility/AccessibilityListBoxOption.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityMenuListcpp">trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityMenuListh">trunk/Source/WebCore/accessibility/AccessibilityMenuList.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityMenuListOptionh">trunk/Source/WebCore/accessibility/AccessibilityMenuListOption.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityMenuListPopupcpp">trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityMenuListPopuph">trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityMockObjecth">trunk/Source/WebCore/accessibility/AccessibilityMockObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjecth">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjecth">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilitySVGRooth">trunk/Source/WebCore/accessibility/AccessibilitySVGRoot.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityScrollViewcpp">trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityScrollViewh">trunk/Source/WebCore/accessibility/AccessibilityScrollView.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityScrollbarh">trunk/Source/WebCore/accessibility/AccessibilityScrollbar.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilitySlidercpp">trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilitySliderh">trunk/Source/WebCore/accessibility/AccessibilitySlider.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilitySpinButtoncpp">trunk/Source/WebCore/accessibility/AccessibilitySpinButton.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilitySpinButtonh">trunk/Source/WebCore/accessibility/AccessibilitySpinButton.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTablecpp">trunk/Source/WebCore/accessibility/AccessibilityTable.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableh">trunk/Source/WebCore/accessibility/AccessibilityTable.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableCellcpp">trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableCellh">trunk/Source/WebCore/accessibility/AccessibilityTableCell.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableColumncpp">trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableColumnh">trunk/Source/WebCore/accessibility/AccessibilityTableColumn.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableHeaderContainercpp">trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableRowcpp">trunk/Source/WebCore/accessibility/AccessibilityTableRow.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableRowh">trunk/Source/WebCore/accessibility/AccessibilityTableRow.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceSelectioncpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTablecpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTableCellcpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTableCell.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosAccessibilityObjectIOSmm">trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMenuListcpp">trunk/Source/WebCore/rendering/RenderMenuList.cpp</a></li>
<li><a href="#trunkSourceWebKitwinAccessibleBasecpp">trunk/Source/WebKit/win/AccessibleBase.cpp</a></li>
<li><a href="#trunkSourceWebKitwinAccessibleImagecpp">trunk/Source/WebKit/win/AccessibleImage.cpp</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WTF/ChangeLog 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-20 Chris Dumez <cdumez@apple.com>
+
+ Use is<>() / downcast<>() for Accessibility objects
+ https://bugs.webkit.org/show_bug.cgi?id=137286
+
+ Reviewed by Darin Adler.
+
+ Remove the legacy TYPE_CASTS_BASE() macro now that it is no longer
+ used.
+
+ * wtf/Assertions.h:
+
</ins><span class="cx"> 2014-10-18 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> WorkQueue dispatches functions but isn’t a FunctionDispatcher
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WTF/wtf/Assertions.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -382,32 +382,4 @@
</span><span class="cx"> #define RELEASE_ASSERT_NOT_REACHED() ASSERT_NOT_REACHED()
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-/* TYPE CAST */
-
-// FIXME: This macro should be removed once the code base is ported to using
-// the new SPECIALIZE_TYPE_TRAITS_*() macro.
-#define TYPE_CASTS_BASE(ToClassName, argumentType, argumentName, pointerPredicate, referencePredicate) \
-inline ToClassName* to##ToClassName(argumentType* argumentName) \
-{ \
- ASSERT_WITH_SECURITY_IMPLICATION(!argumentName || (pointerPredicate)); \
- return static_cast<ToClassName*>(argumentName); \
-} \
-inline const ToClassName* to##ToClassName(const argumentType* argumentName) \
-{ \
- ASSERT_WITH_SECURITY_IMPLICATION(!argumentName || (pointerPredicate)); \
- return static_cast<const ToClassName*>(argumentName); \
-} \
-inline ToClassName& to##ToClassName(argumentType& argumentName) \
-{ \
- ASSERT_WITH_SECURITY_IMPLICATION(referencePredicate); \
- return static_cast<ToClassName&>(argumentName); \
-} \
-inline const ToClassName& to##ToClassName(const argumentType& argumentName) \
-{ \
- ASSERT_WITH_SECURITY_IMPLICATION(referencePredicate); \
- return static_cast<const ToClassName&>(argumentName); \
-} \
-void to##ToClassName(const ToClassName*); \
-void to##ToClassName(const ToClassName&);
-
</del><span class="cx"> #endif /* WTF_Assertions_h */
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/ChangeLog 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -1,3 +1,142 @@
</span><ins>+2014-10-20 Chris Dumez <cdumez@apple.com>
+
+ Use is<>() / downcast<>() for Accessibility objects
+ https://bugs.webkit.org/show_bug.cgi?id=137286
+
+ Reviewed by Darin Adler.
+
+ Use is<>() / downcast<>() for Accessibility objects and clean up the
+ surrounding code.
+
+ No new tests, no behavior change.
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::AXObjectCache::focusedImageMapUIElement):
+ (WebCore::AXObjectCache::notificationPostTimerFired):
+ * accessibility/AccessibilityARIAGrid.cpp:
+ (WebCore::AccessibilityARIAGrid::addTableCellChild):
+ (WebCore::AccessibilityARIAGrid::addChildren):
+ * accessibility/AccessibilityARIAGridCell.cpp:
+ (WebCore::AccessibilityARIAGridCell::parentTable):
+ (WebCore::AccessibilityARIAGridCell::rowIndexRange):
+ * accessibility/AccessibilityARIAGridRow.cpp:
+ (WebCore::AccessibilityARIAGridRow::disclosedRows):
+ (WebCore::AccessibilityARIAGridRow::disclosedByRow):
+ (WebCore::AccessibilityARIAGridRow::parentTable):
+ * accessibility/AccessibilityARIAGridRow.h:
+ * accessibility/AccessibilityImageMapLink.cpp:
+ (WebCore::AccessibilityImageMapLink::imageMapLinkRenderer):
+ * accessibility/AccessibilityImageMapLink.h:
+ * accessibility/AccessibilityList.h:
+ * accessibility/AccessibilityListBox.cpp:
+ (WebCore::AccessibilityListBox::setSelectedChildren):
+ (WebCore::AccessibilityListBox::selectedChildren):
+ (WebCore::AccessibilityListBox::listBoxOptionAccessibilityObject):
+ * accessibility/AccessibilityListBox.h:
+ * accessibility/AccessibilityListBoxOption.h:
+ * accessibility/AccessibilityMenuList.cpp:
+ (WebCore::AccessibilityMenuList::addChildren):
+ (WebCore::AccessibilityMenuList::didUpdateActiveOption):
+ * accessibility/AccessibilityMenuList.h:
+ * accessibility/AccessibilityMenuListOption.h:
+ * accessibility/AccessibilityMenuListPopup.cpp:
+ (WebCore::AccessibilityMenuListPopup::menuListOptionAccessibilityObject):
+ * accessibility/AccessibilityMenuListPopup.h:
+ * accessibility/AccessibilityMockObject.h:
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::textUnderElement):
+ * accessibility/AccessibilityNodeObject.h:
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::appendChildrenToArray):
+ (WebCore::AccessibilityObject::scrollViewAncestor):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::getDocumentLinks):
+ (WebCore::AccessibilityRenderObject::handleActiveDescendantChanged):
+ (WebCore::AccessibilityRenderObject::inheritsPresentationalRole):
+ (WebCore::AccessibilityRenderObject::addImageMapChildren):
+ (WebCore::AccessibilityRenderObject::addTextFieldChildren):
+ (WebCore::AccessibilityRenderObject::remoteSVGRootElement):
+ (WebCore::AccessibilityRenderObject::ariaSelectedRows):
+ * accessibility/AccessibilityRenderObject.h:
+ * accessibility/AccessibilitySVGRoot.h:
+ * accessibility/AccessibilityScrollView.cpp:
+ (WebCore::AccessibilityScrollView::addChildScrollbar):
+ * accessibility/AccessibilityScrollView.h:
+ * accessibility/AccessibilityScrollbar.h:
+ * accessibility/AccessibilitySlider.cpp:
+ (WebCore::AccessibilitySlider::addChildren):
+ * accessibility/AccessibilitySlider.h:
+ * accessibility/AccessibilitySpinButton.cpp:
+ (WebCore::AccessibilitySpinButton::addChildren):
+ (WebCore::AccessibilitySpinButtonPart::press):
+ * accessibility/AccessibilitySpinButton.h:
+ * accessibility/AccessibilityTable.cpp:
+ (WebCore::AccessibilityTable::addChildren):
+ (WebCore::AccessibilityTable::addChildrenFromSection):
+ (WebCore::AccessibilityTable::headerContainer):
+ (WebCore::AccessibilityTable::columnHeaders):
+ (WebCore::AccessibilityTable::rowHeaders):
+ (WebCore::AccessibilityTable::cellForColumnAndRow):
+ * accessibility/AccessibilityTable.h:
+ Make isAccessibilityTable() public and mark as final so that callers
+ can benefit from tighter typing, as isAccessibilityTable() is
+ stricter than isTable(). isTable() indicates that the object is an
+ AccessibilityTable and is equivalent to is<AccessibilityTable>(object).
+ isAccessibilityTable() is equivalent to "isTable() && renderer()".
+
+ * accessibility/AccessibilityTableCell.cpp:
+ (WebCore::AccessibilityTableCell::parentTable):
+ * accessibility/AccessibilityTableCell.h:
+ * accessibility/AccessibilityTableColumn.cpp:
+ (WebCore::AccessibilityTableColumn::headerObject):
+ (WebCore::AccessibilityTableColumn::addChildren):
+ * accessibility/AccessibilityTableColumn.h:
+ * accessibility/AccessibilityTableHeaderContainer.cpp:
+ (WebCore::AccessibilityTableHeaderContainer::addChildren):
+ * accessibility/AccessibilityTableRow.cpp:
+ (WebCore::AccessibilityTableRow::parentTable):
+ (WebCore::AccessibilityTableRow::headerObject):
+ * accessibility/AccessibilityTableRow.h:
+ * accessibility/atk/WebKitAccessibleInterfaceSelection.cpp:
+ (webkitAccessibleSelectionClearSelection):
+ (webkitAccessibleSelectionSelectAllSelection):
+ * accessibility/atk/WebKitAccessibleInterfaceTable.cpp:
+ (core):
+ (cell):
+ (cellAtIndex):
+ (webkitAccessibleTableGetIndexAt):
+ (webkitAccessibleTableGetNColumns):
+ (webkitAccessibleTableGetNRows):
+ (webkitAccessibleTableGetColumnHeader):
+ (webkitAccessibleTableGetRowHeader):
+ * accessibility/atk/WebKitAccessibleInterfaceTableCell.cpp:
+ (webkitAccessibleTableCellGetColumnHeaderCells):
+ (webkitAccessibleTableCellGetRowHeaderCells):
+ (webkitAccessibleTableCellGetColumnSpan):
+ (webkitAccessibleTableCellGetRowSpan):
+ (webkitAccessibleTableCellGetPosition):
+ * accessibility/ios/AccessibilityObjectIOS.mm:
+ (WebCore::AccessibilityObject::accessibilityPasswordFieldLength):
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper convertPointToScreenSpace:]):
+ (-[WebAccessibilityObjectWrapper convertRectToScreenSpace:]):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (AXAttributeStringSetElement):
+ (-[WebAccessibilityObjectWrapper additionalAccessibilityAttributeNames]):
+ (-[WebAccessibilityObjectWrapper convertPointToScreenSpace:]):
+ (-[WebAccessibilityObjectWrapper subrole]):
+ (-[WebAccessibilityObjectWrapper roleDescription]):
+ (-[WebAccessibilityObjectWrapper scrollViewParent]):
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+ (-[WebAccessibilityObjectWrapper accessibilityShowContextMenu]):
+ (-[WebAccessibilityObjectWrapper accessibilitySetValue:forAttribute:]):
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
+ * rendering/RenderMenuList.cpp:
+ (RenderMenuList::didUpdateActiveOption):
+
</ins><span class="cx"> 2014-10-20 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Generate all Inspector domains together in JavaScriptCore
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -159,10 +159,10 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> for (const auto& child : axRenderImage->children()) {
</span><del>- if (!child->isImageMapLink())
</del><ins>+ if (!is<AccessibilityImageMapLink>(*child))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- if (toAccessibilityImageMapLink(child.get())->areaElement() == areaElement)
</del><ins>+ if (downcast<AccessibilityImageMapLink>(*child).areaElement() == areaElement)
</ins><span class="cx"> return child.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -720,10 +720,8 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> // Make sure none of the render views are in the process of being layed out.
</span><span class="cx"> // Notifications should only be sent after the renderer has finished
</span><del>- if (obj->isAccessibilityRenderObject()) {
- AccessibilityRenderObject* renderObj = toAccessibilityRenderObject(obj);
- RenderObject* renderer = renderObj->renderer();
- if (renderer)
</del><ins>+ if (is<AccessibilityRenderObject>(*obj)) {
+ if (auto* renderer = downcast<AccessibilityRenderObject>(*obj).renderer())
</ins><span class="cx"> ASSERT(!renderer->view().layoutState());
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityARIAGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityARIAGrid.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityARIAGrid.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityARIAGrid.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -55,29 +55,29 @@
</span><span class="cx">
</span><span class="cx"> bool AccessibilityARIAGrid::addTableCellChild(AccessibilityObject* child, HashSet<AccessibilityObject*>& appendedRows, unsigned& columnCount)
</span><span class="cx"> {
</span><del>- if (!child || (!child->isTableRow() && child->ariaRoleAttribute() != RowRole))
</del><ins>+ if (!child || (!is<AccessibilityTableRow>(*child) && !is<AccessibilityARIAGridRow>(*child)))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- AccessibilityTableRow* row = toAccessibilityTableRow(child);
- if (appendedRows.contains(row))
</del><ins>+ auto& row = downcast<AccessibilityTableRow>(*child);
+ if (appendedRows.contains(&row))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // store the maximum number of columns
</span><del>- unsigned rowCellCount = row->children().size();
</del><ins>+ unsigned rowCellCount = row.children().size();
</ins><span class="cx"> if (rowCellCount > columnCount)
</span><span class="cx"> columnCount = rowCellCount;
</span><span class="cx">
</span><del>- row->setRowIndex((int)m_rows.size());
- m_rows.append(row);
</del><ins>+ row.setRowIndex((int)m_rows.size());
+ m_rows.append(&row);
</ins><span class="cx">
</span><span class="cx"> // Try adding the row if it's not ignoring accessibility,
</span><span class="cx"> // otherwise add its children (the cells) as the grid's children.
</span><del>- if (!row->accessibilityIsIgnored())
- m_children.append(row);
</del><ins>+ if (!row.accessibilityIsIgnored())
+ m_children.append(&row);
</ins><span class="cx"> else
</span><del>- m_children.appendVector(row->children());
</del><ins>+ m_children.appendVector(row.children());
</ins><span class="cx">
</span><del>- appendedRows.add(row);
</del><ins>+ appendedRows.add(&row);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -134,12 +134,12 @@
</span><span class="cx">
</span><span class="cx"> // make the columns based on the number of columns in the first body
</span><span class="cx"> for (unsigned i = 0; i < columnCount; ++i) {
</span><del>- AccessibilityTableColumn* column = toAccessibilityTableColumn(axCache->getOrCreate(ColumnRole));
- column->setColumnIndex((int)i);
- column->setParent(this);
- m_columns.append(column);
- if (!column->accessibilityIsIgnored())
- m_children.append(column);
</del><ins>+ auto& column = downcast<AccessibilityTableColumn>(*axCache->getOrCreate(ColumnRole));
+ column.setColumnIndex(static_cast<int>(i));
+ column.setParent(this);
+ m_columns.append(&column);
+ if (!column.accessibilityIsIgnored())
+ m_children.append(&column);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* headerContainerObject = headerContainer();
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityARIAGridCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (parent->isAccessibilityTable())
</span><del>- return toAccessibilityTable(parent);
</del><ins>+ return downcast<AccessibilityTable>(parent);
</ins><span class="cx">
</span><span class="cx"> // It could happen that we hadn't reached the parent table yet (in
</span><span class="cx"> // case objects for rows were not ignoring accessibility) so for
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> if (!parent || !parent->isAccessibilityTable())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return toAccessibilityTable(parent);
</del><ins>+ return downcast<AccessibilityTable>(parent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AccessibilityARIAGridCell::rowIndexRange(std::pair<unsigned, unsigned>& rowRange)
</span><span class="lines">@@ -74,13 +74,13 @@
</span><span class="cx"> if (!parent)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (parent->isTableRow()) {
</del><ins>+ if (is<AccessibilityTableRow>(*parent)) {
</ins><span class="cx"> // We already got a table row, use its API.
</span><del>- rowRange.first = toAccessibilityTableRow(parent)->rowIndex();
</del><ins>+ rowRange.first = downcast<AccessibilityTableRow>(*parent).rowIndex();
</ins><span class="cx"> } else if (parent->isAccessibilityTable()) {
</span><span class="cx"> // We reached the parent table, so we need to inspect its
</span><span class="cx"> // children to determine the row index for the cell in it.
</span><del>- unsigned columnCount = toAccessibilityTable(parent)->columnCount();
</del><ins>+ unsigned columnCount = downcast<AccessibilityTable>(*parent).columnCount();
</ins><span class="cx"> if (!columnCount)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityARIAGridRowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityARIAGridRow.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityARIAGridRow.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityARIAGridRow.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> unsigned level = hierarchicalLevel();
</span><del>- auto& allRows = toAccessibilityTable(parent)->rows();
</del><ins>+ auto& allRows = downcast<AccessibilityTable>(*parent).rows();
</ins><span class="cx"> int rowCount = allRows.size();
</span><span class="cx"> for (int k = index + 1; k < rowCount; ++k) {
</span><span class="cx"> AccessibilityObject* row = allRows[k].get();
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> // Search for the previous row that matches the correct level.
</span><span class="cx"> int index = rowIndex();
</span><del>- auto& allRows = toAccessibilityTable(parent)->rows();
</del><ins>+ auto& allRows = downcast<AccessibilityTable>(parent)->rows();
</ins><span class="cx"> int rowCount = allRows.size();
</span><span class="cx"> if (index >= rowCount)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -120,8 +120,8 @@
</span><span class="cx"> // only have "row" elements, but if not, we still should handle it gracefully by finding the right table.
</span><span class="cx"> for (AccessibilityObject* parent = parentObject(); parent; parent = parent->parentObject()) {
</span><span class="cx"> // The parent table for an ARIA grid row should be an ARIA table.
</span><del>- if (parent->isTable() && parent->isAccessibilityTable() && toAccessibilityTable(parent)->isAriaTable())
- return toAccessibilityTable(parent);
</del><ins>+ if (parent->isAccessibilityTable() && downcast<AccessibilityTable>(*parent).isAriaTable())
+ return downcast<AccessibilityTable>(parent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityARIAGridRowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityARIAGridRow.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityARIAGridRow.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityARIAGridRow.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> virtual AccessibilityTable* parentTable() const override;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityARIAGridRow, isARIATreeGridRow())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityARIAGridRow, isARIATreeGridRow())
+
</ins><span class="cx"> #endif // AccessibilityARIAGridRow_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityImageMapLinkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityImageMapLink.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityImageMapLink.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityImageMapLink.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -140,8 +140,8 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> RenderElement* renderer = nullptr;
</span><del>- if (m_parent && m_parent->isAccessibilityRenderObject())
- renderer = downcast<RenderElement>(toAccessibilityRenderObject(m_parent)->renderer());
</del><ins>+ if (is<AccessibilityRenderObject>(m_parent))
+ renderer = downcast<RenderElement>(downcast<AccessibilityRenderObject>(*m_parent).renderer());
</ins><span class="cx"> else
</span><span class="cx"> renderer = m_mapElement->renderer();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityImageMapLinkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityImageMapLink.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityImageMapLink.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityImageMapLink.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -80,9 +80,9 @@
</span><span class="cx"> virtual bool isImageMapLink() const override { return true; }
</span><span class="cx"> virtual bool supportsPath() const override { return true; }
</span><span class="cx"> };
</span><del>-
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityImageMapLink, isImageMapLink())
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityImageMapLink, isImageMapLink())
+
</ins><span class="cx"> #endif // AccessibilityImageMapLink_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityList.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityList.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityList.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -52,8 +52,8 @@
</span><span class="cx"> virtual AccessibilityRole determineAccessibilityRole() override;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityList, isList())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityList, isList())
+
</ins><span class="cx"> #endif // AccessibilityList_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityListBox.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityListBox.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityListBox.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -92,16 +92,16 @@
</span><span class="cx">
</span><span class="cx"> // disable any selected options
</span><span class="cx"> for (const auto& child : m_children) {
</span><del>- AccessibilityListBoxOption* listBoxOption = toAccessibilityListBoxOption(child.get());
- if (listBoxOption->isSelected())
- listBoxOption->setSelected(false);
</del><ins>+ auto& listBoxOption = downcast<AccessibilityListBoxOption>(*child);
+ if (listBoxOption.isSelected())
+ listBoxOption.setSelected(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (const auto& obj : children) {
</span><span class="cx"> if (obj->roleValue() != ListBoxOptionRole)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- toAccessibilityListBoxOption(obj.get())->setSelected(true);
</del><ins>+ downcast<AccessibilityListBoxOption>(*obj).setSelected(true);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> addChildren();
</span><span class="cx">
</span><span class="cx"> for (const auto& child : m_children) {
</span><del>- if (toAccessibilityListBoxOption(child.get())->isSelected())
</del><ins>+ if (downcast<AccessibilityListBoxOption>(*child).isSelected())
</ins><span class="cx"> result.append(child.get());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -138,10 +138,10 @@
</span><span class="cx"> if (!element || element->hasTagName(hrTag))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- AccessibilityObject* listBoxObject = m_renderer->document().axObjectCache()->getOrCreate(ListBoxOptionRole);
- toAccessibilityListBoxOption(listBoxObject)->setHTMLElement(element);
</del><ins>+ AccessibilityObject& listBoxObject = *m_renderer->document().axObjectCache()->getOrCreate(ListBoxOptionRole);
+ downcast<AccessibilityListBoxOption>(listBoxObject).setHTMLElement(element);
</ins><span class="cx">
</span><del>- return listBoxObject;
</del><ins>+ return &listBoxObject;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* AccessibilityListBox::elementAccessibilityHitTest(const IntPoint& point) const
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityListBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityListBox.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityListBox.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityListBox.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -56,9 +56,9 @@
</span><span class="cx"> AccessibilityObject* listBoxOptionAccessibilityObject(HTMLElement*) const;
</span><span class="cx"> virtual AccessibilityObject* elementAccessibilityHitTest(const IntPoint&) const override;
</span><span class="cx"> };
</span><del>-
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityListBox, isListBox())
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityListBox, isListBox())
+
</ins><span class="cx"> #endif // AccessibilityListBox_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityListBoxOptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityListBoxOption.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityListBoxOption.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityListBoxOption.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -74,9 +74,9 @@
</span><span class="cx"> AccessibilityObject* listBoxOptionAccessibilityObject(HTMLElement*) const;
</span><span class="cx"> virtual bool computeAccessibilityIsIgnored() const override;
</span><span class="cx"> };
</span><del>-
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityListBoxOption, isListBoxOption())
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityListBoxOption, isListBoxOption())
+
</ins><span class="cx"> #endif // AccessibilityListBoxOption_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityMenuListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> if (!list)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- toAccessibilityMockObject(list)->setParent(this);
</del><ins>+ downcast<AccessibilityMockObject>(*list).setParent(this);
</ins><span class="cx"> if (list->accessibilityIsIgnored()) {
</span><span class="cx"> cache->remove(list->axObjectID());
</span><span class="cx"> return;
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> const auto& childObjects = children();
</span><span class="cx"> if (!childObjects.isEmpty()) {
</span><span class="cx"> ASSERT(childObjects.size() == 1);
</span><del>- ASSERT(childObjects[0]->isMenuListPopup());
</del><ins>+ ASSERT(is<AccessibilityMenuListPopup>(*childObjects[0]));
</ins><span class="cx">
</span><span class="cx"> // We might be calling this method in situations where the renderers for list items
</span><span class="cx"> // associated to the menu list have not been created (e.g. they might be rendered
</span><span class="lines">@@ -121,10 +121,8 @@
</span><span class="cx"> // You can reproduce the issue in the GTK+ port by removing this check and running
</span><span class="cx"> // accessibility/insert-selected-option-into-select-causes-crash.html (will crash).
</span><span class="cx"> int popupChildrenSize = static_cast<int>(childObjects[0]->children().size());
</span><del>- if (childObjects[0]->isMenuListPopup() && optionIndex >= 0 && optionIndex < popupChildrenSize) {
- if (AccessibilityMenuListPopup* popup = toAccessibilityMenuListPopup(childObjects[0].get()))
- popup->didUpdateActiveOption(optionIndex);
- }
</del><ins>+ if (is<AccessibilityMenuListPopup>(*childObjects[0]) && optionIndex >= 0 && optionIndex < popupChildrenSize)
+ downcast<AccessibilityMenuListPopup>(*childObjects[0]).didUpdateActiveOption(optionIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> cache->postNotification(this, &document.get(), AXObjectCache::AXMenuListValueChanged, TargetElement, PostSynchronously);
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityMenuListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuList.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityMenuList.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuList.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> virtual void childrenChanged() override;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityMenuList, isMenuList())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityMenuList, isMenuList())
+
</ins><span class="cx"> #endif // AccessibilityMenuList_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityMenuListOptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuListOption.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityMenuListOption.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuListOption.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -62,8 +62,8 @@
</span><span class="cx"> RefPtr<HTMLElement> m_element;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityMenuListOption, isMenuListOption())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityMenuListOption, isMenuListOption())
+
</ins><span class="cx"> #endif // AccessibilityMenuListOption_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityMenuListPopupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -73,13 +73,10 @@
</span><span class="cx"> if (!is<HTMLOptionElement>(element) || !element->inRenderedDocument())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- AccessibilityObject* object = document()->axObjectCache()->getOrCreate(MenuListOptionRole);
- ASSERT_WITH_SECURITY_IMPLICATION(object->isMenuListOption());
</del><ins>+ auto& option = downcast<AccessibilityMenuListOption>(*document()->axObjectCache()->getOrCreate(MenuListOptionRole));
+ option.setElement(element);
</ins><span class="cx">
</span><del>- AccessibilityMenuListOption* option = toAccessibilityMenuListOption(object);
- option->setElement(element);
-
- return option;
</del><ins>+ return &option;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AccessibilityMenuListPopup::press()
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityMenuListPopuph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -62,8 +62,8 @@
</span><span class="cx"> AccessibilityMenuListOption* menuListOptionAccessibilityObject(HTMLElement*) const;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityMenuListPopup, isMenuListPopup())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityMenuListPopup, isMenuListPopup())
+
</ins><span class="cx"> #endif // AccessibilityMenuListPopup_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityMockObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityMockObject.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityMockObject.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityMockObject.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -51,10 +51,10 @@
</span><span class="cx"> virtual bool isMockObject() const override { return true; }
</span><span class="cx">
</span><span class="cx"> virtual bool computeAccessibilityIsIgnored() const override;
</span><del>-};
</del><ins>+};
</ins><span class="cx">
</span><del>-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityMockObject, isMockObject())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityMockObject, isMockObject())
+
</ins><span class="cx"> #endif // AccessibilityMockObject_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -1669,9 +1669,9 @@
</span><span class="cx"> if (!shouldUseAccessiblityObjectInnerText(child, mode))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- if (child->isAccessibilityNodeObject()) {
</del><ins>+ if (is<AccessibilityNodeObject>(*child)) {
</ins><span class="cx"> Vector<AccessibilityText> textOrder;
</span><del>- toAccessibilityNodeObject(child)->alternativeText(textOrder);
</del><ins>+ downcast<AccessibilityNodeObject>(*child).alternativeText(textOrder);
</ins><span class="cx"> if (textOrder.size() > 0 && textOrder[0].text.length()) {
</span><span class="cx"> appendNameToStringBuilder(builder, textOrder[0].text);
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -207,8 +207,8 @@
</span><span class="cx"> bool usesAltTagForTextComputation() const;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityNodeObject, isAccessibilityNodeObject())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityNodeObject, isAccessibilityNodeObject())
+
</ins><span class="cx"> #endif // AccessibilityNodeObject_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -502,7 +502,7 @@
</span><span class="cx"> {
</span><span class="cx"> // A table's children includes elements whose own children are also the table's children (due to the way the Mac exposes tables).
</span><span class="cx"> // The rows from the table should be queried, since those are direct descendants of the table, and they contain content.
</span><del>- const auto& searchChildren = object->isAccessibilityTable() ? toAccessibilityTable(object)->rows() : object->children();
</del><ins>+ const auto& searchChildren = object->isAccessibilityTable() ? downcast<AccessibilityTable>(*object).rows() : object->children();
</ins><span class="cx">
</span><span class="cx"> size_t childrenSize = searchChildren.size();
</span><span class="cx">
</span><span class="lines">@@ -1536,8 +1536,8 @@
</span><span class="cx"> ScrollView* AccessibilityObject::scrollViewAncestor() const
</span><span class="cx"> {
</span><span class="cx"> for (const AccessibilityObject* scrollParent = this; scrollParent; scrollParent = scrollParent->parentObject()) {
</span><del>- if (scrollParent->isAccessibilityScrollView())
- return toAccessibilityScrollView(scrollParent)->scrollView();
</del><ins>+ if (is<AccessibilityScrollView>(*scrollParent))
+ return downcast<AccessibilityScrollView>(*scrollParent).scrollView();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -1005,9 +1005,11 @@
</span><span class="cx"> inline void AccessibilityObject::updateBackingStore() { }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#define ACCESSIBILITY_OBJECT_TYPE_CASTS(ToValueTypeName, predicate) \
- TYPE_CASTS_BASE(ToValueTypeName, AccessibilityObject, object, object->predicate, object.predicate)
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+#define SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(ToValueTypeName, predicate) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ToValueTypeName) \
+ static bool isType(const WebCore::AccessibilityObject& object) { return object.predicate; } \
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #endif // AccessibilityObject_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -1738,13 +1738,13 @@
</span><span class="cx"> } else {
</span><span class="cx"> Node* parent = curr->parentNode();
</span><span class="cx"> if (is<HTMLAreaElement>(*curr) && is<HTMLMapElement>(parent)) {
</span><del>- AccessibilityImageMapLink* areaObject = toAccessibilityImageMapLink(axObjectCache()->getOrCreate(ImageMapLinkRole));
</del><ins>+ auto& areaObject = downcast<AccessibilityImageMapLink>(*axObjectCache()->getOrCreate(ImageMapLinkRole));
</ins><span class="cx"> HTMLMapElement& map = downcast<HTMLMapElement>(*parent);
</span><del>- areaObject->setHTMLAreaElement(downcast<HTMLAreaElement>(curr));
- areaObject->setHTMLMapElement(&map);
- areaObject->setParent(accessibilityParentForImageMap(&map));
</del><ins>+ areaObject.setHTMLAreaElement(downcast<HTMLAreaElement>(curr));
+ areaObject.setHTMLMapElement(&map);
+ areaObject.setParent(accessibilityParentForImageMap(&map));
</ins><span class="cx">
</span><del>- result.append(areaObject);
</del><ins>+ result.append(&areaObject);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2328,7 +2328,7 @@
</span><span class="cx"> if (!renderer()->frame().selection().isFocusedAndActive() || renderer()->document().focusedElement() != element)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (toAccessibilityRenderObject(activeDescendant()) && shouldNotifyActiveDescendant())
</del><ins>+ if (activeDescendant() && shouldNotifyActiveDescendant())
</ins><span class="cx"> renderer()->document().axObjectCache()->postNotification(m_renderer, AXObjectCache::AXActiveDescendantChanged);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2685,10 +2685,10 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> for (AccessibilityObject* parent = parentObject(); parent; parent = parent->parentObject()) {
</span><del>- if (!parent->isAccessibilityRenderObject())
</del><ins>+ if (!is<AccessibilityRenderObject>(*parent))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- Node* node = toAccessibilityRenderObject(parent)->node();
</del><ins>+ Node* node = downcast<AccessibilityRenderObject>(*parent).node();
</ins><span class="cx"> if (!is<Element>(node))
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -2807,14 +2807,14 @@
</span><span class="cx"> // add an <area> element for this child if it has a link
</span><span class="cx"> if (!area.isLink())
</span><span class="cx"> continue;
</span><del>- AccessibilityImageMapLink* areaObject = toAccessibilityImageMapLink(axObjectCache()->getOrCreate(ImageMapLinkRole));
- areaObject->setHTMLAreaElement(&area);
- areaObject->setHTMLMapElement(map);
- areaObject->setParent(this);
- if (!areaObject->accessibilityIsIgnored())
- m_children.append(areaObject);
</del><ins>+ auto& areaObject = downcast<AccessibilityImageMapLink>(*axObjectCache()->getOrCreate(ImageMapLinkRole));
+ areaObject.setHTMLAreaElement(&area);
+ areaObject.setHTMLMapElement(map);
+ areaObject.setParent(this);
+ if (!areaObject.accessibilityIsIgnored())
+ m_children.append(&areaObject);
</ins><span class="cx"> else
</span><del>- axObjectCache()->remove(areaObject->axObjectID());
</del><ins>+ axObjectCache()->remove(areaObject.axObjectID());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2837,10 +2837,11 @@
</span><span class="cx"> if (!spinButtonElement || !spinButtonElement->isSpinButtonElement())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- AccessibilitySpinButton* axSpinButton = toAccessibilitySpinButton(axObjectCache()->getOrCreate(SpinButtonRole));
- axSpinButton->setSpinButtonElement(static_cast<SpinButtonElement*>(spinButtonElement));
- axSpinButton->setParent(this);
- m_children.append(axSpinButton);
</del><ins>+ auto& axSpinButton = downcast<AccessibilitySpinButton>(*axObjectCache()->getOrCreate(SpinButtonRole));
+ // FIXME: We should use is<>() / downcast<>() for SpinButtonElement.
+ axSpinButton.setSpinButtonElement(static_cast<SpinButtonElement*>(spinButtonElement));
+ axSpinButton.setParent(this);
+ m_children.append(&axSpinButton);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AccessibilityRenderObject::isSVGImage() const
</span><span class="lines">@@ -2890,11 +2891,11 @@
</span><span class="cx">
</span><span class="cx"> // In order to connect the AX hierarchy from the SVG root element from the loaded resource
</span><span class="cx"> // the parent must be set, because there's no other way to get back to who created the image.
</span><del>- ASSERT(rootSVGObject && rootSVGObject->isAccessibilitySVGRoot());
- if (!rootSVGObject->isAccessibilitySVGRoot())
</del><ins>+ ASSERT(rootSVGObject);
+ if (!is<AccessibilitySVGRoot>(*rootSVGObject))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return toAccessibilitySVGRoot(rootSVGObject);
</del><ins>+ return downcast<AccessibilitySVGRoot>(rootSVGObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AccessibilityRenderObject::addRemoteSVGChildren()
</span><span class="lines">@@ -3134,8 +3135,8 @@
</span><span class="cx"> AccessibilityChildrenVector allRows;
</span><span class="cx"> ariaTreeRows(allRows);
</span><span class="cx"> rowsIteration(allRows);
</span><del>- } else if (isAccessibilityTable() && toAccessibilityTable(this)->supportsSelectedRows())
- rowsIteration(toAccessibilityTable(this)->rows());
</del><ins>+ } else if (isAccessibilityTable() && downcast<AccessibilityTable>(*this).supportsSelectedRows())
+ rowsIteration(downcast<AccessibilityTable>(*this).rows());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AccessibilityRenderObject::ariaListboxSelectedChildren(AccessibilityChildrenVector& result)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -338,8 +338,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityRenderObject, isAccessibilityRenderObject())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityRenderObject, isAccessibilityRenderObject())
+
</ins><span class="cx"> #endif // AccessibilityRenderObject_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilitySVGRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilitySVGRoot.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilitySVGRoot.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilitySVGRoot.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx"> virtual AccessibilityObject* parentObject() const override;
</span><span class="cx"> virtual bool isAccessibilitySVGRoot() const override { return true; }
</span><span class="cx"> };
</span><del>-
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilitySVGRoot, isAccessibilitySVGRoot())
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilitySVGRoot, isAccessibilitySVGRoot())
+
</ins><span class="cx"> #endif // AccessibilitySVGRoot_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -151,10 +151,10 @@
</span><span class="cx"> if (!cache)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- AccessibilityScrollbar* scrollBarObject = toAccessibilityScrollbar(cache->getOrCreate(scrollbar));
- scrollBarObject->setParent(this);
- m_children.append(scrollBarObject);
- return scrollBarObject;
</del><ins>+ auto& scrollBarObject = downcast<AccessibilityScrollbar>(*cache->getOrCreate(scrollbar));
+ scrollBarObject.setParent(this);
+ m_children.append(&scrollBarObject);
+ return &scrollBarObject;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AccessibilityScrollView::clearChildren()
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityScrollView.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityScrollView.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityScrollView.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -83,9 +83,9 @@
</span><span class="cx"> RefPtr<AccessibilityObject> m_verticalScrollbar;
</span><span class="cx"> bool m_childrenDirty;
</span><span class="cx"> };
</span><del>-
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityScrollView, isAccessibilityScrollView())
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityScrollView, isAccessibilityScrollView())
+
</ins><span class="cx"> #endif // AccessibilityScrollView_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityScrollbarh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityScrollbar.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityScrollbar.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityScrollbar.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -62,8 +62,8 @@
</span><span class="cx"> RefPtr<Scrollbar> m_scrollbar;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityScrollbar, isAccessibilityScrollbar())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityScrollbar, isAccessibilityScrollbar())
+
</ins><span class="cx"> #endif // AccessibilityScrollbar_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilitySlidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -84,15 +84,15 @@
</span><span class="cx">
</span><span class="cx"> AXObjectCache* cache = m_renderer->document().axObjectCache();
</span><span class="cx">
</span><del>- AccessibilitySliderThumb* thumb = toAccessibilitySliderThumb(cache->getOrCreate(SliderThumbRole));
- thumb->setParent(this);
</del><ins>+ auto& thumb = downcast<AccessibilitySliderThumb>(*cache->getOrCreate(SliderThumbRole));
+ thumb.setParent(this);
</ins><span class="cx">
</span><span class="cx"> // Before actually adding the value indicator to the hierarchy,
</span><span class="cx"> // allow the platform to make a final decision about it.
</span><del>- if (thumb->accessibilityIsIgnored())
- cache->remove(thumb->axObjectID());
</del><ins>+ if (thumb.accessibilityIsIgnored())
+ cache->remove(thumb.axObjectID());
</ins><span class="cx"> else
</span><del>- m_children.append(thumb);
</del><ins>+ m_children.append(&thumb);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const AtomicString& AccessibilitySlider::getAttribute(const QualifiedName& attribute) const
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilitySliderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilitySlider.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilitySlider.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilitySlider.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> virtual bool computeAccessibilityIsIgnored() const override;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilitySliderThumb, isSliderThumb())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilitySliderThumb, isSliderThumb())
+
</ins><span class="cx"> #endif // AccessibilitySlider_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilitySpinButtoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilitySpinButton.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilitySpinButton.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilitySpinButton.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -82,15 +82,15 @@
</span><span class="cx"> {
</span><span class="cx"> m_haveChildren = true;
</span><span class="cx">
</span><del>- AccessibilitySpinButtonPart* incrementor = toAccessibilitySpinButtonPart(axObjectCache()->getOrCreate(SpinButtonPartRole));
- incrementor->setIsIncrementor(true);
- incrementor->setParent(this);
- m_children.append(incrementor);
</del><ins>+ auto& incrementor = downcast<AccessibilitySpinButtonPart>(*axObjectCache()->getOrCreate(SpinButtonPartRole));
+ incrementor.setIsIncrementor(true);
+ incrementor.setParent(this);
+ m_children.append(&incrementor);
</ins><span class="cx">
</span><del>- AccessibilitySpinButtonPart* decrementor = toAccessibilitySpinButtonPart(axObjectCache()->getOrCreate(SpinButtonPartRole));
- decrementor->setIsIncrementor(false);
- decrementor->setParent(this);
- m_children.append(decrementor);
</del><ins>+ auto& decrementor = downcast<AccessibilitySpinButtonPart>(*axObjectCache()->getOrCreate(SpinButtonPartRole));
+ decrementor.setIsIncrementor(false);
+ decrementor.setParent(this);
+ m_children.append(&decrementor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AccessibilitySpinButton::step(int amount)
</span><span class="lines">@@ -132,14 +132,14 @@
</span><span class="cx">
</span><span class="cx"> bool AccessibilitySpinButtonPart::press()
</span><span class="cx"> {
</span><del>- if (!m_parent || !m_parent->isSpinButton())
</del><ins>+ if (!is<AccessibilitySpinButton>(m_parent))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- AccessibilitySpinButton* spinButton = toAccessibilitySpinButton(parentObject());
</del><ins>+ auto& spinButton = downcast<AccessibilitySpinButton>(*m_parent);
</ins><span class="cx"> if (m_isIncrementor)
</span><del>- spinButton->step(1);
</del><ins>+ spinButton.step(1);
</ins><span class="cx"> else
</span><del>- spinButton->step(-1);
</del><ins>+ spinButton.step(-1);
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilitySpinButtonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilitySpinButton.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilitySpinButton.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilitySpinButton.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -73,10 +73,10 @@
</span><span class="cx"> virtual bool isSpinButtonPart() const override { return true; }
</span><span class="cx"> virtual LayoutRect elementRect() const override;
</span><span class="cx"> };
</span><del>-
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilitySpinButton, isNativeSpinButton())
-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilitySpinButtonPart, isSpinButtonPart())
</del><span class="cx">
</span><del>-} // namespace WebCore
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilitySpinButton, isNativeSpinButton())
+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilitySpinButtonPart, isSpinButtonPart())
+
</ins><span class="cx"> #endif // AccessibilitySpinButton_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTable.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTable.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityTable.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -379,12 +379,12 @@
</span><span class="cx"> // make the columns based on the number of columns in the first body
</span><span class="cx"> unsigned length = maxColumnCount;
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><del>- AccessibilityTableColumn* column = toAccessibilityTableColumn(axCache->getOrCreate(ColumnRole));
- column->setColumnIndex((int)i);
- column->setParent(this);
- m_columns.append(column);
- if (!column->accessibilityIsIgnored())
- m_children.append(column);
</del><ins>+ auto& column = downcast<AccessibilityTableColumn>(*axCache->getOrCreate(ColumnRole));
+ column.setColumnIndex((int)i);
+ column.setParent(this);
+ m_columns.append(&column);
+ if (!column.accessibilityIsIgnored())
+ m_children.append(&column);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* headerContainerObject = headerContainer();
</span><span class="lines">@@ -407,25 +407,25 @@
</span><span class="cx"> if (!renderRow)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- AccessibilityObject* rowObject = axCache->getOrCreate(renderRow);
- if (!rowObject->isTableRow())
</del><ins>+ AccessibilityObject& rowObject = *axCache->getOrCreate(renderRow);
+ if (!is<AccessibilityTableRow>(rowObject))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- AccessibilityTableRow* row = toAccessibilityTableRow(rowObject);
</del><ins>+ auto& row = downcast<AccessibilityTableRow>(rowObject);
</ins><span class="cx"> // We need to check every cell for a new row, because cell spans
</span><span class="cx"> // can cause us to miss rows if we just check the first column.
</span><del>- if (appendedRows.contains(row))
</del><ins>+ if (appendedRows.contains(&row))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- row->setRowIndex(static_cast<int>(m_rows.size()));
- m_rows.append(row);
- if (!row->accessibilityIsIgnored())
- m_children.append(row);
</del><ins>+ row.setRowIndex(static_cast<int>(m_rows.size()));
+ m_rows.append(&row);
+ if (!row.accessibilityIsIgnored())
+ m_children.append(&row);
</ins><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span><span class="cx"> else
</span><del>- m_children.appendVector(row->children());
</del><ins>+ m_children.appendVector(row.children());
</ins><span class="cx"> #endif
</span><del>- appendedRows.add(row);
</del><ins>+ appendedRows.add(&row);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> maxColumnCount = std::max(tableSection->numColumns(), maxColumnCount);
</span><span class="lines">@@ -436,10 +436,10 @@
</span><span class="cx"> if (m_headerContainer)
</span><span class="cx"> return m_headerContainer.get();
</span><span class="cx">
</span><del>- AccessibilityMockObject* tableHeader = toAccessibilityMockObject(axObjectCache()->getOrCreate(TableHeaderContainerRole));
- tableHeader->setParent(this);
</del><ins>+ auto& tableHeader = downcast<AccessibilityMockObject>(*axObjectCache()->getOrCreate(TableHeaderContainerRole));
+ tableHeader.setParent(this);
</ins><span class="cx">
</span><del>- m_headerContainer = tableHeader;
</del><ins>+ m_headerContainer = &tableHeader;
</ins><span class="cx"> return m_headerContainer.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -465,7 +465,7 @@
</span><span class="cx"> updateChildrenIfNecessary();
</span><span class="cx">
</span><span class="cx"> for (const auto& column : m_columns) {
</span><del>- if (AccessibilityObject* header = toAccessibilityTableColumn(column.get())->headerObject())
</del><ins>+ if (AccessibilityObject* header = downcast<AccessibilityTableColumn>(*column).headerObject())
</ins><span class="cx"> headers.append(header);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> updateChildrenIfNecessary();
</span><span class="cx">
</span><span class="cx"> for (const auto& row : m_rows) {
</span><del>- if (AccessibilityObject* header = toAccessibilityTableRow(row.get())->headerObject())
</del><ins>+ if (AccessibilityObject* header = downcast<AccessibilityTableRow>(*row).headerObject())
</ins><span class="cx"> headers.append(header);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -547,19 +547,19 @@
</span><span class="cx"> for (unsigned colIndexCounter = std::min(static_cast<unsigned>(children.size()), column + 1); colIndexCounter > 0; --colIndexCounter) {
</span><span class="cx"> unsigned colIndex = colIndexCounter - 1;
</span><span class="cx"> AccessibilityObject* child = children[colIndex].get();
</span><del>- ASSERT(child->isTableCell());
- if (!child->isTableCell())
</del><ins>+ ASSERT(is<AccessibilityTableCell>(*child));
+ if (!is<AccessibilityTableCell>(*child))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> std::pair<unsigned, unsigned> columnRange;
</span><span class="cx"> std::pair<unsigned, unsigned> rowRange;
</span><del>- AccessibilityTableCell* tableCellChild = toAccessibilityTableCell(child);
- tableCellChild->columnIndexRange(columnRange);
- tableCellChild->rowIndexRange(rowRange);
</del><ins>+ auto& tableCellChild = downcast<AccessibilityTableCell>(*child);
+ tableCellChild.columnIndexRange(columnRange);
+ tableCellChild.rowIndexRange(rowRange);
</ins><span class="cx">
</span><span class="cx"> if ((column >= columnRange.first && column < (columnRange.first + columnRange.second))
</span><span class="cx"> && (row >= rowRange.first && row < (rowRange.first + rowRange.second)))
</span><del>- return tableCellChild;
</del><ins>+ return &tableCellChild;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTable.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTable.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityTable.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -75,6 +75,9 @@
</span><span class="cx"> // an object that contains, as children, all the objects that act as headers
</span><span class="cx"> AccessibilityObject* headerContainer();
</span><span class="cx">
</span><ins>+ // isAccessibilityTable is whether it is exposed as an AccessibilityTable to the platform.
+ virtual bool isAccessibilityTable() const override final;
+
</ins><span class="cx"> protected:
</span><span class="cx"> AccessibilityChildrenVector m_rows;
</span><span class="cx"> AccessibilityChildrenVector m_columns;
</span><span class="lines">@@ -86,8 +89,6 @@
</span><span class="cx">
</span><span class="cx"> // isTable is whether it's an AccessibilityTable object.
</span><span class="cx"> virtual bool isTable() const override { return true; }
</span><del>- // isAccessibilityTable is whether it is exposed as an AccessibilityTable to the platform.
- virtual bool isAccessibilityTable() const override;
</del><span class="cx"> // isDataTable is whether it is exposed as an AccessibilityTable because the heuristic
</span><span class="cx"> // think this "looks" like a data-based table (instead of a table used for layout).
</span><span class="cx"> virtual bool isDataTable() const override;
</span><span class="lines">@@ -101,8 +102,8 @@
</span><span class="cx"> void addChildrenFromSection(RenderTableSection*, unsigned& maxColumnCount);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityTable, isTable())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityTable, isTable())
+
</ins><span class="cx"> #endif // AccessibilityTable_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -89,9 +89,9 @@
</span><span class="cx"> // always be the case when AT clients access a table.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=42652
</span><span class="cx"> AccessibilityObject* parentTable = axObjectCache()->get(downcast<RenderTableCell>(*m_renderer).table());
</span><del>- if (!parentTable || !parentTable->isTable())
</del><ins>+ if (!is<AccessibilityTable>(parentTable))
</ins><span class="cx"> return nullptr;
</span><del>- return toAccessibilityTable(parentTable);
</del><ins>+ return downcast<AccessibilityTable>(parentTable);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AccessibilityTableCell::isTableCell() const
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableCell.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTableCell.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableCell.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -73,8 +73,8 @@
</span><span class="cx"> bool isTableCellInSameColGroup(AccessibilityTableCell*);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityTableCell, isTableCell())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityTableCell, isTableCell())
+
</ins><span class="cx"> #endif // AccessibilityTableCell_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableColumncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -79,8 +79,8 @@
</span><span class="cx"> if (!m_parent->isAccessibilityTable())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- AccessibilityTable* parentTable = toAccessibilityTable(m_parent);
- if (parentTable->isAriaTable()) {
</del><ins>+ auto& parentTable = downcast<AccessibilityTable>(*m_parent);
+ if (parentTable.isAriaTable()) {
</ins><span class="cx"> for (const auto& cell : children()) {
</span><span class="cx"> if (cell->ariaRoleAttribute() == ColumnHeaderRole)
</span><span class="cx"> return cell.get();
</span><span class="lines">@@ -173,11 +173,11 @@
</span><span class="cx"> if (!m_parent || !m_parent->isAccessibilityTable())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- AccessibilityTable* parentTable = toAccessibilityTable(m_parent);
- int numRows = parentTable->rowCount();
</del><ins>+ AccessibilityTable& parentTable = downcast<AccessibilityTable>(*m_parent);
+ int numRows = parentTable.rowCount();
</ins><span class="cx">
</span><del>- for (int i = 0; i < numRows; i++) {
- AccessibilityTableCell* cell = parentTable->cellForColumnAndRow(m_columnIndex, i);
</del><ins>+ for (int i = 0; i < numRows; ++i) {
+ AccessibilityTableCell* cell = parentTable.cellForColumnAndRow(m_columnIndex, i);
</ins><span class="cx"> if (!cell)
</span><span class="cx"> continue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableColumnh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableColumn.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTableColumn.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableColumn.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -66,8 +66,8 @@
</span><span class="cx"> virtual bool computeAccessibilityIsIgnored() const override;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityTableColumn, isTableColumn())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityTableColumn, isTableColumn())
+
</ins><span class="cx"> #endif // AccessibilityTableColumn_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableHeaderContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> if (!m_parent || !m_parent->isAccessibilityTable())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- toAccessibilityTable(m_parent)->columnHeaders(m_children);
</del><ins>+ downcast<AccessibilityTable>(*m_parent).columnHeaders(m_children);
</ins><span class="cx">
</span><span class="cx"> for (const auto& child : m_children)
</span><span class="cx"> m_headerRect.unite(child->elementRect());
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableRowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableRow.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTableRow.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableRow.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -106,8 +106,8 @@
</span><span class="cx"> for (AccessibilityObject* parent = parentObject(); parent; parent = parent->parentObject()) {
</span><span class="cx"> // If this is a table object, but not an accessibility table, we should stop because we don't want to
</span><span class="cx"> // choose another ancestor table as this row's table.
</span><del>- if (parent->isTable())
- return parent->isAccessibilityTable() ? toAccessibilityTable(parent) : 0;
</del><ins>+ if (is<AccessibilityTable>(*parent))
+ return downcast<AccessibilityTable>(*parent).isAccessibilityTable() ? downcast<AccessibilityTable>(parent) : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -124,10 +124,10 @@
</span><span class="cx">
</span><span class="cx"> // check the first element in the row to see if it is a TH element
</span><span class="cx"> AccessibilityObject* cell = rowChildren[0].get();
</span><del>- if (!cell->isTableCell())
</del><ins>+ if (!is<AccessibilityTableCell>(*cell))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- RenderObject* cellRenderer = toAccessibilityTableCell(cell)->renderer();
</del><ins>+ RenderObject* cellRenderer = downcast<AccessibilityTableCell>(*cell).renderer();
</ins><span class="cx"> if (!cellRenderer)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableRowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableRow.h (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTableRow.h 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableRow.h 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -64,10 +64,10 @@
</span><span class="cx">
</span><span class="cx"> virtual AccessibilityObject* observableObject() const override;
</span><span class="cx"> virtual bool computeAccessibilityIsIgnored() const override;
</span><del>-};
</del><ins>+};
</ins><span class="cx">
</span><del>-ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityTableRow, isTableRow())
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-} // namespace WebCore
</del><ins>+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityTableRow, isTableRow())
</ins><span class="cx">
</span><span class="cx"> #endif // AccessibilityTableRow_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceSelection.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceSelection.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceSelection.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -150,12 +150,12 @@
</span><span class="cx"> return FALSE;
</span><span class="cx">
</span><span class="cx"> AccessibilityObject::AccessibilityChildrenVector selectedItems;
</span><del>- if (coreSelection->isListBox() || coreSelection->isMenuList()) {
</del><ins>+ if (is<AccessibilityListBox>(*coreSelection)) {
</ins><span class="cx"> // Set the list of selected items to an empty list; then verify that it worked.
</span><del>- AccessibilityListBox* listBox = toAccessibilityListBox(coreSelection);
- listBox->setSelectedChildren(selectedItems);
- listBox->selectedChildren(selectedItems);
- return !selectedItems.size();
</del><ins>+ auto& listBox = downcast<AccessibilityListBox>(*coreSelection);
+ listBox.setSelectedChildren(selectedItems);
+ listBox.selectedChildren(selectedItems);
+ return selectedItems.isEmpty();
</ins><span class="cx"> }
</span><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -246,12 +246,12 @@
</span><span class="cx"> if (!coreSelection || !coreSelection->isMultiSelectable())
</span><span class="cx"> return FALSE;
</span><span class="cx">
</span><del>- if (coreSelection->isListBox()) {
</del><ins>+ if (is<AccessibilityListBox>(*coreSelection)) {
</ins><span class="cx"> const AccessibilityObject::AccessibilityChildrenVector& children = coreSelection->children();
</span><del>- AccessibilityListBox* listBox = toAccessibilityListBox(coreSelection);
- listBox->setSelectedChildren(children);
</del><ins>+ AccessibilityListBox& listBox = downcast<AccessibilityListBox>(*coreSelection);
+ listBox.setSelectedChildren(children);
</ins><span class="cx"> AccessibilityObject::AccessibilityChildrenVector selectedItems;
</span><del>- listBox->selectedChildren(selectedItems);
</del><ins>+ listBox.selectedChildren(selectedItems);
</ins><span class="cx"> return selectedItems.size() == children.size();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> static AccessibilityObject* core(AtkTable* table)
</span><span class="cx"> {
</span><span class="cx"> if (!WEBKIT_IS_ACCESSIBLE(table))
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return webkitAccessibleGetAccessibilityObject(WEBKIT_ACCESSIBLE(table));
</span><span class="cx"> }
</span><span class="lines">@@ -58,9 +58,9 @@
</span><span class="cx"> static AccessibilityTableCell* cell(AtkTable* table, guint row, guint column)
</span><span class="cx"> {
</span><span class="cx"> AccessibilityObject* accTable = core(table);
</span><del>- if (accTable->isAccessibilityRenderObject())
- return toAccessibilityTable(accTable)->cellForColumnAndRow(column, row);
- return 0;
</del><ins>+ if (is<AccessibilityTable>(*accTable))
+ return downcast<AccessibilityTable>(*accTable).cellForColumnAndRow(column, row);
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static gint cellIndex(AccessibilityTableCell* axCell, AccessibilityTable* axTable)
</span><span class="lines">@@ -79,15 +79,13 @@
</span><span class="cx"> static AccessibilityTableCell* cellAtIndex(AtkTable* table, gint index)
</span><span class="cx"> {
</span><span class="cx"> AccessibilityObject* accTable = core(table);
</span><del>- if (accTable->isAccessibilityRenderObject()) {
</del><ins>+ if (is<AccessibilityTable>(*accTable)) {
</ins><span class="cx"> AccessibilityObject::AccessibilityChildrenVector allCells;
</span><del>- toAccessibilityTable(accTable)->cells(allCells);
- if (0 <= index && static_cast<unsigned>(index) < allCells.size()) {
- AccessibilityObject* accCell = allCells.at(index).get();
- return toAccessibilityTableCell(accCell);
- }
</del><ins>+ downcast<AccessibilityTable>(*accTable).cells(allCells);
+ if (0 <= index && static_cast<unsigned>(index) < allCells.size())
+ return downcast<AccessibilityTableCell>(allCells[index].get());
</ins><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static AtkObject* webkitAccessibleTableRefAt(AtkTable* table, gint row, gint column)
</span><span class="lines">@@ -114,7 +112,7 @@
</span><span class="cx"> returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(table), -1);
</span><span class="cx">
</span><span class="cx"> AccessibilityTableCell* axCell = cell(table, row, column);
</span><del>- AccessibilityTable* axTable = toAccessibilityTable(core(table));
</del><ins>+ AccessibilityTable* axTable = downcast<AccessibilityTable>(core(table));
</ins><span class="cx"> return cellIndex(axCell, axTable);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -152,8 +150,8 @@
</span><span class="cx"> returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(table), 0);
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* accTable = core(table);
</span><del>- if (accTable->isAccessibilityRenderObject())
- return toAccessibilityTable(accTable)->columnCount();
</del><ins>+ if (is<AccessibilityTable>(*accTable))
+ return downcast<AccessibilityTable>(*accTable).columnCount();
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -163,8 +161,8 @@
</span><span class="cx"> returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(table), 0);
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* accTable = core(table);
</span><del>- if (accTable->isAccessibilityRenderObject())
- return toAccessibilityTable(accTable)->rowCount();
</del><ins>+ if (is<AccessibilityTable>(*accTable))
+ return downcast<AccessibilityTable>(*accTable).rowCount();
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -202,18 +200,18 @@
</span><span class="cx"> returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(table), 0);
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* accTable = core(table);
</span><del>- if (accTable->isAccessibilityRenderObject()) {
</del><ins>+ if (is<AccessibilityTable>(*accTable)) {
</ins><span class="cx"> AccessibilityObject::AccessibilityChildrenVector columnHeaders;
</span><del>- toAccessibilityTable(accTable)->columnHeaders(columnHeaders);
</del><ins>+ downcast<AccessibilityTable>(*accTable).columnHeaders(columnHeaders);
</ins><span class="cx">
</span><span class="cx"> for (const auto& columnHeader : columnHeaders) {
</span><span class="cx"> std::pair<unsigned, unsigned> columnRange;
</span><del>- toAccessibilityTableCell(columnHeader.get())->columnIndexRange(columnRange);
</del><ins>+ downcast<AccessibilityTableCell>(*columnHeader).columnIndexRange(columnRange);
</ins><span class="cx"> if (columnRange.first <= static_cast<unsigned>(column) && static_cast<unsigned>(column) < columnRange.first + columnRange.second)
</span><span class="cx"> return columnHeader->wrapper();
</span><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"> static AtkObject* webkitAccessibleTableGetRowHeader(AtkTable* table, gint row)
</span><span class="lines">@@ -222,18 +220,18 @@
</span><span class="cx"> returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(table), 0);
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* accTable = core(table);
</span><del>- if (accTable->isAccessibilityRenderObject()) {
</del><ins>+ if (is<AccessibilityTable>(*accTable)) {
</ins><span class="cx"> AccessibilityObject::AccessibilityChildrenVector rowHeaders;
</span><del>- toAccessibilityTable(accTable)->rowHeaders(rowHeaders);
</del><ins>+ downcast<AccessibilityTable>(*accTable).rowHeaders(rowHeaders);
</ins><span class="cx">
</span><span class="cx"> for (const auto& rowHeader : rowHeaders) {
</span><span class="cx"> std::pair<unsigned, unsigned> rowRange;
</span><del>- toAccessibilityTableCell(rowHeader.get())->rowIndexRange(rowRange);
</del><ins>+ downcast<AccessibilityTableCell>(*rowHeader).rowIndexRange(rowRange);
</ins><span class="cx"> if (rowRange.first <= static_cast<unsigned>(row) && static_cast<unsigned>(row) < rowRange.first + rowRange.second)
</span><span class="cx"> return rowHeader->wrapper();
</span><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"> static AtkObject* webkitAccessibleTableGetCaption(AtkTable* table)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTableCell.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTableCell.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTableCell.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -54,11 +54,11 @@
</span><span class="cx"> returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(cell), nullptr);
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* axObject = core(cell);
</span><del>- if (!axObject || !axObject->isTableCell())
</del><ins>+ if (!is<AccessibilityTableCell>(axObject))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> AccessibilityObject::AccessibilityChildrenVector columnHeaders;
</span><del>- toAccessibilityTableCell(axObject)->columnHeaders(columnHeaders);
</del><ins>+ downcast<AccessibilityTableCell>(*axObject).columnHeaders(columnHeaders);
</ins><span class="cx">
</span><span class="cx"> return convertToGPtrArray(columnHeaders);
</span><span class="cx"> }
</span><span class="lines">@@ -69,11 +69,11 @@
</span><span class="cx"> returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(cell), nullptr);
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* axObject = core(cell);
</span><del>- if (!axObject || !axObject->isTableCell())
</del><ins>+ if (!is<AccessibilityTableCell>(axObject))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> AccessibilityObject::AccessibilityChildrenVector rowHeaders;
</span><del>- toAccessibilityTableCell(axObject)->rowHeaders(rowHeaders);
</del><ins>+ downcast<AccessibilityTableCell>(*axObject).rowHeaders(rowHeaders);
</ins><span class="cx">
</span><span class="cx"> return convertToGPtrArray(rowHeaders);
</span><span class="cx"> }
</span><span class="lines">@@ -84,11 +84,11 @@
</span><span class="cx"> returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(cell), 0);
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* axObject = core(cell);
</span><del>- if (!axObject || !axObject->isTableCell())
</del><ins>+ if (!is<AccessibilityTableCell>(axObject))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> std::pair<unsigned, unsigned> columnRange;
</span><del>- toAccessibilityTableCell(axObject)->columnIndexRange(columnRange);
</del><ins>+ downcast<AccessibilityTableCell>(*axObject).columnIndexRange(columnRange);
</ins><span class="cx">
</span><span class="cx"> return columnRange.second;
</span><span class="cx"> }
</span><span class="lines">@@ -99,11 +99,11 @@
</span><span class="cx"> returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(cell), 0);
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* axObject = core(cell);
</span><del>- if (!axObject || !axObject->isTableCell())
</del><ins>+ if (!is<AccessibilityTableCell>(axObject))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> std::pair<unsigned, unsigned> rowRange;
</span><del>- toAccessibilityTableCell(axObject)->rowIndexRange(rowRange);
</del><ins>+ downcast<AccessibilityTableCell>(*axObject).rowIndexRange(rowRange);
</ins><span class="cx">
</span><span class="cx"> return rowRange.second;
</span><span class="cx"> }
</span><span class="lines">@@ -114,16 +114,16 @@
</span><span class="cx"> returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(cell), false);
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* axObject = core(cell);
</span><del>- if (!axObject || !axObject->isTableCell())
</del><ins>+ if (!is<AccessibilityTableCell>(axObject))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> std::pair<unsigned, unsigned> columnRowRange;
</span><span class="cx"> if (row) {
</span><del>- toAccessibilityTableCell(axObject)->rowIndexRange(columnRowRange);
</del><ins>+ downcast<AccessibilityTableCell>(*axObject).rowIndexRange(columnRowRange);
</ins><span class="cx"> *row = columnRowRange.first;
</span><span class="cx"> }
</span><span class="cx"> if (column) {
</span><del>- toAccessibilityTableCell(axObject)->columnIndexRange(columnRowRange);
</del><ins>+ downcast<AccessibilityTableCell>(*axObject).columnIndexRange(columnRowRange);
</ins><span class="cx"> *column = columnRowRange.first;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosAccessibilityObjectIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -62,9 +62,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (!isPasswordField())
</span><span class="cx"> return 0;
</span><del>- RenderObject* renderObject = toAccessibilityRenderObject(this)->renderer();
</del><ins>+ RenderObject* renderObject = downcast<AccessibilityRenderObject>(*this).renderer();
</ins><span class="cx">
</span><del>- if (!renderObject || !renderObject->node() || !renderObject->node()->isHTMLElement())
</del><ins>+ if (!renderObject || !is<HTMLInputElement>(renderObject->node()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> HTMLInputElement& inputElement = downcast<HTMLInputElement>(*renderObject->node());
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -1114,8 +1114,8 @@
</span><span class="cx"> ScrollView* scrollView = nullptr;
</span><span class="cx"> AccessibilityObject* parent = nullptr;
</span><span class="cx"> for (parent = m_object->parentObject(); parent; parent = parent->parentObject()) {
</span><del>- if (parent->isAccessibilityScrollView()) {
- scrollView = toAccessibilityScrollView(parent)->scrollView();
</del><ins>+ if (is<AccessibilityScrollView>(*parent)) {
+ scrollView = downcast<AccessibilityScrollView>(*parent).scrollView();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1168,8 +1168,8 @@
</span><span class="cx"> ScrollView* scrollView = nullptr;
</span><span class="cx"> AccessibilityObject* parent = nullptr;
</span><span class="cx"> for (parent = m_object->parentObject(); parent; parent = parent->parentObject()) {
</span><del>- if (parent->isAccessibilityScrollView()) {
- scrollView = toAccessibilityScrollView(parent)->scrollView();
</del><ins>+ if (is<AccessibilityScrollView>(*parent)) {
+ scrollView = downcast<AccessibilityScrollView>(*parent).scrollView();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -994,10 +994,10 @@
</span><span class="cx"> if (!AXAttributedStringRangeIsValid(attrString, range))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (object && object->isAccessibilityRenderObject()) {
</del><ins>+ if (is<AccessibilityRenderObject>(object)) {
</ins><span class="cx"> // make a serializable AX object
</span><span class="cx">
</span><del>- RenderObject* renderer = toAccessibilityRenderObject(object)->renderer();
</del><ins>+ RenderObject* renderer = downcast<AccessibilityRenderObject>(*object).renderer();
</ins><span class="cx"> if (!renderer)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1199,7 +1199,7 @@
</span><span class="cx"> if (m_object->supportsARIADropping())
</span><span class="cx"> [additional addObject:NSAccessibilityDropEffectsAttribute];
</span><span class="cx">
</span><del>- if (m_object->isAccessibilityTable() && toAccessibilityTable(m_object)->supportsSelectedRows())
</del><ins>+ if (m_object->isAccessibilityTable() && downcast<AccessibilityTable>(*m_object).supportsSelectedRows())
</ins><span class="cx"> [additional addObject:NSAccessibilitySelectedRowsAttribute];
</span><span class="cx">
</span><span class="cx"> if (m_object->supportsARIALiveRegion()) {
</span><span class="lines">@@ -1752,8 +1752,8 @@
</span><span class="cx"> ScrollView* scrollView = nullptr;
</span><span class="cx"> AccessibilityObject* parent = nullptr;
</span><span class="cx"> for (parent = m_object->parentObject(); parent; parent = parent->parentObject()) {
</span><del>- if (parent->isAccessibilityScrollView()) {
- scrollView = toAccessibilityScrollView(parent)->scrollView();
</del><ins>+ if (is<AccessibilityScrollView>(*parent)) {
+ scrollView = downcast<AccessibilityScrollView>(*parent).scrollView();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1992,8 +1992,8 @@
</span><span class="cx"> if (m_object->roleValue() == HorizontalRuleRole)
</span><span class="cx"> return NSAccessibilityContentSeparatorSubrole;
</span><span class="cx">
</span><del>- if (m_object->isSpinButtonPart()) {
- if (toAccessibilitySpinButtonPart(m_object)->isIncrementor())
</del><ins>+ if (is<AccessibilitySpinButtonPart>(*m_object)) {
+ if (downcast<AccessibilitySpinButtonPart>(*m_object).isIncrementor())
</ins><span class="cx"> return NSAccessibilityIncrementArrowSubrole;
</span><span class="cx">
</span><span class="cx"> return NSAccessibilityDecrementArrowSubrole;
</span><span class="lines">@@ -2005,11 +2005,11 @@
</span><span class="cx"> if (m_object->isTreeItem())
</span><span class="cx"> return NSAccessibilityOutlineRowSubrole;
</span><span class="cx">
</span><del>- if (m_object->isList()) {
- AccessibilityList* listObject = toAccessibilityList(m_object);
- if (listObject->isUnorderedList() || listObject->isOrderedList())
</del><ins>+ if (is<AccessibilityList>(*m_object)) {
+ auto& listObject = downcast<AccessibilityList>(*m_object);
+ if (listObject.isUnorderedList() || listObject.isOrderedList())
</ins><span class="cx"> return NSAccessibilityContentListSubrole;
</span><del>- if (listObject->isDescriptionList()) {
</del><ins>+ if (listObject.isDescriptionList()) {
</ins><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
</span><span class="cx"> return NSAccessibilityDefinitionListSubrole;
</span><span class="cx"> #else
</span><span class="lines">@@ -2179,9 +2179,8 @@
</span><span class="cx">
</span><span class="cx"> // Only returning for DL (not UL or OL) because description changed with HTML5 from 'definition list' to
</span><span class="cx"> // superset 'description list' and does not return the same values in AX API on some OS versions.
</span><del>- if (m_object->isList()) {
- AccessibilityList* listObject = toAccessibilityList(m_object);
- if (listObject->isDescriptionList())
</del><ins>+ if (is<AccessibilityList>(*m_object)) {
+ if (downcast<AccessibilityList>(*m_object).isDescriptionList())
</ins><span class="cx"> return AXDescriptionListText();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2217,7 +2216,7 @@
</span><span class="cx">
</span><span class="cx"> - (id)scrollViewParent
</span><span class="cx"> {
</span><del>- if (!m_object || !m_object->isAccessibilityScrollView())
</del><ins>+ if (!is<AccessibilityScrollView>(m_object))
</ins><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> // If this scroll view provides it's parent object (because it's a sub-frame), then
</span><span class="lines">@@ -2225,8 +2224,7 @@
</span><span class="cx"> if (m_object->parentObject())
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- AccessibilityScrollView* scrollView = toAccessibilityScrollView(m_object);
- ScrollView* scroll = scrollView->scrollView();
</del><ins>+ ScrollView* scroll = downcast<AccessibilityScrollView>(*m_object).scrollView();
</ins><span class="cx"> if (!scroll)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="lines">@@ -2333,7 +2331,7 @@
</span><span class="cx"> if (m_object->isWebArea()) {
</span><span class="cx"> if ([attributeName isEqualToString:@"AXLinkUIElements"]) {
</span><span class="cx"> AccessibilityObject::AccessibilityChildrenVector links;
</span><del>- toAccessibilityRenderObject(m_object)->getDocumentLinks(links);
</del><ins>+ downcast<AccessibilityRenderObject>(*m_object).getDocumentLinks(links);
</ins><span class="cx"> return convertToNSArray(links);
</span><span class="cx"> }
</span><span class="cx"> if ([attributeName isEqualToString:@"AXLoaded"])
</span><span class="lines">@@ -2392,11 +2390,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Only native spin buttons have increment and decrement buttons.
</span><del>- if (m_object->isNativeSpinButton()) {
</del><ins>+ if (is<AccessibilitySpinButton>(*m_object)) {
</ins><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityIncrementButtonAttribute])
</span><del>- return toAccessibilitySpinButton(m_object)->incrementButton()->wrapper();
</del><ins>+ return downcast<AccessibilitySpinButton>(*m_object).incrementButton()->wrapper();
</ins><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityDecrementButtonAttribute])
</span><del>- return toAccessibilitySpinButton(m_object)->decrementButton()->wrapper();
</del><ins>+ return downcast<AccessibilitySpinButton>(*m_object).decrementButton()->wrapper();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([attributeName isEqualToString: @"AXVisited"])
</span><span class="lines">@@ -2557,19 +2555,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_object->isAccessibilityTable()) {
</span><ins>+ auto& table = downcast<AccessibilityTable>(*m_object);
</ins><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityRowsAttribute])
</span><del>- return convertToNSArray(toAccessibilityTable(m_object)->rows());
</del><ins>+ return convertToNSArray(table.rows());
</ins><span class="cx">
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityVisibleRowsAttribute]) {
</span><span class="cx"> AccessibilityObject::AccessibilityChildrenVector visibleRows;
</span><del>- toAccessibilityTable(m_object)->visibleRows(visibleRows);
</del><ins>+ table.visibleRows(visibleRows);
</ins><span class="cx"> return convertToNSArray(visibleRows);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // TODO: distinguish between visible and non-visible columns
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityColumnsAttribute] ||
</span><span class="cx"> [attributeName isEqualToString:NSAccessibilityVisibleColumnsAttribute]) {
</span><del>- return convertToNSArray(toAccessibilityTable(m_object)->columns());
</del><ins>+ return convertToNSArray(table.columns());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilitySelectedRowsAttribute]) {
</span><span class="lines">@@ -2585,12 +2584,12 @@
</span><span class="cx">
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityColumnHeaderUIElementsAttribute]) {
</span><span class="cx"> AccessibilityObject::AccessibilityChildrenVector columnHeaders;
</span><del>- toAccessibilityTable(m_object)->columnHeaders(columnHeaders);
</del><ins>+ table.columnHeaders(columnHeaders);
</ins><span class="cx"> return convertToNSArray(columnHeaders);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityHeaderAttribute]) {
</span><del>- AccessibilityObject* headerContainer = toAccessibilityTable(m_object)->headerContainer();
</del><ins>+ AccessibilityObject* headerContainer = table.headerContainer();
</ins><span class="cx"> if (headerContainer)
</span><span class="cx"> return headerContainer->wrapper();
</span><span class="cx"> return nil;
</span><span class="lines">@@ -2598,59 +2597,61 @@
</span><span class="cx">
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityRowHeaderUIElementsAttribute]) {
</span><span class="cx"> AccessibilityObject::AccessibilityChildrenVector rowHeaders;
</span><del>- toAccessibilityTable(m_object)->rowHeaders(rowHeaders);
</del><ins>+ table.rowHeaders(rowHeaders);
</ins><span class="cx"> return convertToNSArray(rowHeaders);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityVisibleCellsAttribute]) {
</span><span class="cx"> AccessibilityObject::AccessibilityChildrenVector cells;
</span><del>- toAccessibilityTable(m_object)->cells(cells);
</del><ins>+ table.cells(cells);
</ins><span class="cx"> return convertToNSArray(cells);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityColumnCountAttribute])
</span><del>- return @(toAccessibilityTable(m_object)->columnCount());
</del><ins>+ return @(table.columnCount());
</ins><span class="cx">
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityRowCountAttribute])
</span><del>- return @(toAccessibilityTable(m_object)->rowCount());
</del><ins>+ return @(table.rowCount());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_object->isTableColumn()) {
</del><ins>+ if (is<AccessibilityTableColumn>(*m_object)) {
+ auto& column = downcast<AccessibilityTableColumn>(*m_object);
</ins><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityIndexAttribute])
</span><del>- return [NSNumber numberWithInt:toAccessibilityTableColumn(m_object)->columnIndex()];
</del><ins>+ return [NSNumber numberWithInt:column.columnIndex()];
</ins><span class="cx">
</span><span class="cx"> // rows attribute for a column is the list of all the elements in that column at each row
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityRowsAttribute] ||
</span><span class="cx"> [attributeName isEqualToString:NSAccessibilityVisibleRowsAttribute]) {
</span><del>- return convertToNSArray(toAccessibilityTableColumn(m_object)->children());
</del><ins>+ return convertToNSArray(column.children());
</ins><span class="cx"> }
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityHeaderAttribute]) {
</span><del>- AccessibilityObject* header = toAccessibilityTableColumn(m_object)->headerObject();
</del><ins>+ AccessibilityObject* header = column.headerObject();
</ins><span class="cx"> if (!header)
</span><span class="cx"> return nil;
</span><span class="cx"> return header->wrapper();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_object->isTableCell()) {
</del><ins>+ if (is<AccessibilityTableCell>(*m_object)) {
+ auto& cell = downcast<AccessibilityTableCell>(*m_object);
</ins><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityRowIndexRangeAttribute]) {
</span><span class="cx"> std::pair<unsigned, unsigned> rowRange;
</span><del>- toAccessibilityTableCell(m_object)->rowIndexRange(rowRange);
</del><ins>+ cell.rowIndexRange(rowRange);
</ins><span class="cx"> return [NSValue valueWithRange:NSMakeRange(rowRange.first, rowRange.second)];
</span><span class="cx"> }
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityColumnIndexRangeAttribute]) {
</span><span class="cx"> std::pair<unsigned, unsigned> columnRange;
</span><del>- toAccessibilityTableCell(m_object)->columnIndexRange(columnRange);
</del><ins>+ cell.columnIndexRange(columnRange);
</ins><span class="cx"> return [NSValue valueWithRange:NSMakeRange(columnRange.first, columnRange.second)];
</span><span class="cx"> }
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityColumnHeaderUIElementsAttribute]) {
</span><span class="cx"> AccessibilityObject::AccessibilityChildrenVector columnHeaders;
</span><del>- toAccessibilityTableCell(m_object)->columnHeaders(columnHeaders);
</del><ins>+ cell.columnHeaders(columnHeaders);
</ins><span class="cx"> return convertToNSArray(columnHeaders);
</span><span class="cx"> }
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityRowHeaderUIElementsAttribute]) {
</span><span class="cx"> AccessibilityObject::AccessibilityChildrenVector rowHeaders;
</span><del>- toAccessibilityTableCell(m_object)->rowHeaders(rowHeaders);
</del><ins>+ cell.rowHeaders(rowHeaders);
</ins><span class="cx"> return convertToNSArray(rowHeaders);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2691,9 +2692,9 @@
</span><span class="cx">
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><del>- if (m_object->isTableRow()) {
</del><ins>+ if (is<AccessibilityTableRow>(*m_object)) {
</ins><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityIndexAttribute])
</span><del>- return [NSNumber numberWithInt:toAccessibilityTableRow(m_object)->rowIndex()];
</del><ins>+ return [NSNumber numberWithInt:downcast<AccessibilityTableRow>(*m_object).rowIndex()];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2703,9 +2704,9 @@
</span><span class="cx"> AccessibilityObject::AccessibilityChildrenVector rowsCopy;
</span><span class="cx"> m_object->ariaTreeItemDisclosedRows(rowsCopy);
</span><span class="cx"> return convertToNSArray(rowsCopy);
</span><del>- } else if (m_object->isARIATreeGridRow()) {
</del><ins>+ } else if (is<AccessibilityARIAGridRow>(*m_object)) {
</ins><span class="cx"> AccessibilityObject::AccessibilityChildrenVector rowsCopy;
</span><del>- toAccessibilityARIAGridRow(m_object)->disclosedRows(rowsCopy);
</del><ins>+ downcast<AccessibilityARIAGridRow>(*m_object).disclosedRows(rowsCopy);
</ins><span class="cx"> return convertToNSArray(rowsCopy);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2723,8 +2724,8 @@
</span><span class="cx"> parent = parent->parentObject();
</span><span class="cx"> }
</span><span class="cx"> return nil;
</span><del>- } else if (m_object->isARIATreeGridRow()) {
- AccessibilityObject* row = toAccessibilityARIAGridRow(m_object)->disclosedByRow();
</del><ins>+ } else if (is<AccessibilityARIAGridRow>(*m_object)) {
+ AccessibilityObject* row = downcast<AccessibilityARIAGridRow>(*m_object).disclosedByRow();
</ins><span class="cx"> if (!row)
</span><span class="cx"> return nil;
</span><span class="cx"> return row->wrapper();
</span><span class="lines">@@ -2769,7 +2770,7 @@
</span><span class="cx"> return [NSNumber numberWithBool:m_object->isSelected()];
</span><span class="cx">
</span><span class="cx"> if ([attributeName isEqualToString: NSAccessibilityServesAsTitleForUIElementsAttribute] && m_object->isMenuButton()) {
</span><del>- AccessibilityObject* uiElement = toAccessibilityRenderObject(m_object)->menuForMenuButton();
</del><ins>+ AccessibilityObject* uiElement = downcast<AccessibilityRenderObject>(*m_object).menuForMenuButton();
</ins><span class="cx"> if (uiElement)
</span><span class="cx"> return [NSArray arrayWithObject:uiElement->wrapper()];
</span><span class="cx"> }
</span><span class="lines">@@ -3197,8 +3198,8 @@
</span><span class="cx"> if (frameView && !frameView->platformWidget()) {
</span><span class="cx"> // Find the appropriate scroll view to use to convert the contents to the window.
</span><span class="cx"> for (AccessibilityObject* parent = m_object->parentObject(); parent; parent = parent->parentObject()) {
</span><del>- if (parent->isAccessibilityScrollView()) {
- ScrollView* scrollView = toAccessibilityScrollView(parent)->scrollView();
</del><ins>+ if (is<AccessibilityScrollView>(*parent)) {
+ ScrollView* scrollView = downcast<AccessibilityScrollView>(*parent).scrollView();
</ins><span class="cx"> rect = scrollView->contentsToRootView(rect);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -3299,7 +3300,7 @@
</span><span class="cx"> return;
</span><span class="cx"> AccessibilityObject::AccessibilityChildrenVector selectedChildren;
</span><span class="cx"> convertToVector(array, selectedChildren);
</span><del>- toAccessibilityListBox(m_object)->setSelectedChildren(selectedChildren);
</del><ins>+ downcast<AccessibilityListBox>(*m_object).setSelectedChildren(selectedChildren);
</ins><span class="cx"> } else if (m_object->isTextControl()) {
</span><span class="cx"> if ([attributeName isEqualToString: NSAccessibilitySelectedTextAttribute]) {
</span><span class="cx"> m_object->setSelectedText(string);
</span><span class="lines">@@ -3706,7 +3707,7 @@
</span><span class="cx"> if ([attribute isEqualToString:NSAccessibilityCellForColumnAndRowParameterizedAttribute]) {
</span><span class="cx"> if (array == nil || [array count] != 2)
</span><span class="cx"> return nil;
</span><del>- AccessibilityTableCell* cell = toAccessibilityTable(m_object)->cellForColumnAndRow([[array objectAtIndex:0] unsignedIntValue], [[array objectAtIndex:1] unsignedIntValue]);
</del><ins>+ AccessibilityTableCell* cell = downcast<AccessibilityTable>(*m_object).cellForColumnAndRow([[array objectAtIndex:0] unsignedIntValue], [[array objectAtIndex:1] unsignedIntValue]);
</ins><span class="cx"> if (!cell)
</span><span class="cx"> return nil;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -1580,8 +1580,8 @@
</span><span class="cx"> liveRegionStatus = Inspector::Protocol::DOM::AccessibilityProperties::LiveRegionStatus::Polite;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (axObject->isAccessibilityNodeObject())
- mouseEventNode = toAccessibilityNodeObject(axObject)->mouseButtonListener(MouseButtonListenerResultFilter::IncludeBodyElement);
</del><ins>+ if (is<AccessibilityNodeObject>(*axObject))
+ mouseEventNode = downcast<AccessibilityNodeObject>(*axObject).mouseButtonListener(MouseButtonListenerResultFilter::IncludeBodyElement);
</ins><span class="cx">
</span><span class="cx"> if (axObject->supportsARIAOwns()) {
</span><span class="cx"> Vector<Element*> ownedElements;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMenuListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -437,7 +437,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (AXObjectCache* cache = document().existingAXObjectCache()) {
</span><del>- if (AccessibilityMenuList* menuList = toAccessibilityMenuList(cache->get(this)))
</del><ins>+ if (AccessibilityMenuList* menuList = downcast<AccessibilityMenuList>(cache->get(this)))
</ins><span class="cx"> menuList->didUpdateActiveOption(optionIndex);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinAccessibleBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/AccessibleBase.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/AccessibleBase.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebKit/win/AccessibleBase.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -616,10 +616,10 @@
</span><span class="cx"> return E_INVALIDARG;
</span><span class="cx">
</span><span class="cx"> if (selectionFlags & SELFLAG_TAKESELECTION) {
</span><del>- if (parentObject->isListBox()) {
</del><ins>+ if (is<AccessibilityListBox>(*parentObject)) {
</ins><span class="cx"> Vector<RefPtr<AccessibilityObject> > selectedChildren(1);
</span><span class="cx"> selectedChildren[0] = childObject;
</span><del>- toAccessibilityListBox(parentObject)->setSelectedChildren(selectedChildren);
</del><ins>+ downcast<AccessibilityListBox>(*parentObject).setSelectedChildren(selectedChildren);
</ins><span class="cx"> } else { // any element may be selectable by virtue of it having the aria-selected property
</span><span class="cx"> ASSERT(!parentObject->isMultiSelectable());
</span><span class="cx"> childObject->setSelected(true);
</span></span></pre></div>
<a id="trunkSourceWebKitwinAccessibleImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/AccessibleImage.cpp (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/AccessibleImage.cpp 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebKit/win/AccessibleImage.cpp 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -41,16 +41,16 @@
</span><span class="cx">
</span><span class="cx"> String AccessibleImage::name() const
</span><span class="cx"> {
</span><del>- if (!m_object->isAccessibilityRenderObject())
</del><ins>+ if (!is<AccessibilityRenderObject>(*m_object))
</ins><span class="cx"> return AccessibleBase::name();
</span><span class="cx">
</span><del>- AccessibilityRenderObject* obj = toAccessibilityRenderObject(m_object);
</del><ins>+ AccessibilityRenderObject& obj = downcast<AccessibilityRenderObject>(*m_object);
</ins><span class="cx">
</span><del>- String ariaLabel = obj->ariaLabeledByAttribute();
</del><ins>+ String ariaLabel = obj.ariaLabeledByAttribute();
</ins><span class="cx"> if (!ariaLabel.isEmpty())
</span><span class="cx"> return ariaLabel;
</span><span class="cx">
</span><del>- const AtomicString& altText = obj->getAttribute(HTMLNames::altAttr);
</del><ins>+ const AtomicString& altText = obj.getAttribute(HTMLNames::altAttr);
</ins><span class="cx"> if (!altText.isEmpty())
</span><span class="cx"> return altText;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (174897 => 174898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-10-20 18:52:37 UTC (rev 174897)
+++ trunk/Source/WebKit/win/ChangeLog 2014-10-20 19:08:40 UTC (rev 174898)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-10-20 Chris Dumez <cdumez@apple.com>
+
+ Use is<>() / downcast<>() for Accessibility objects
+ https://bugs.webkit.org/show_bug.cgi?id=137286
+
+ Reviewed by Darin Adler.
+
+ Use is<>() / downcast<>() for Accessibility objects.
+
+ * AccessibleBase.cpp:
+ (AccessibleBase::accSelect):
+ * AccessibleImage.cpp:
+ (AccessibleImage::name):
+
</ins><span class="cx"> 2014-10-18 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Repaint issues with accelerated compositing.
</span></span></pre>
</div>
</div>
</body>
</html>