<!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>[172136] trunk</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/172136">172136</a></dd>
<dt>Author</dt> <dd>jcraig@apple.com</dd>
<dt>Date</dt> <dd>2014-08-05 23:21:03 -0700 (Tue, 05 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: AXI: Add label string once AccessibilityObject::computedLabel() is available
https://bugs.webkit.org/show_bug.cgi?id=129940
Reviewed by Chris Fleizach.
Source/WebCore:
Test: inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt
* accessibility/AccessibilityObject.cpp: Fixed crash.
(WebCore::AccessibilityObject::accessibilityComputedLabel):
* accessibility/AccessibilityObject.h: Method name update.
* inspector/InspectorDOMAgent.cpp: New support for getting Node label from AccessibilityObject.
(WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
Source/WebInspectorUI:
* UserInterface/Views/DOMNodeDetailsSidebarPanel.js: UI update for label field in Node Inspector.
(WebInspector.DOMNodeDetailsSidebarPanel.prototype._refreshAccessibility):
LayoutTests:
* inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt: LayoutTest expectation update.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocoldomgetAccessibilityPropertiesForNodeexpectedtxt">trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMNodeDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172135 => 172136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-06 06:14:48 UTC (rev 172135)
+++ trunk/LayoutTests/ChangeLog 2014-08-06 06:21:03 UTC (rev 172136)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-08-05 James Craig <jcraig@apple.com>
+
+ Web Inspector: AXI: Add label string once AccessibilityObject::computedLabel() is available
+ https://bugs.webkit.org/show_bug.cgi?id=129940
+
+ Reviewed by Chris Fleizach.
+
+ * inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt: LayoutTest expectation update.
+
</ins><span class="cx"> 2014-07-29 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r170564, r170571, r170604, r170628, r170672, r170680, r170724, r170728, r170729, r170819, r170821, r170836, r170855, r170860, r170890, r170907, r170929, r171052, r171106, r171152, r171153, r171214 from ftlopt.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocoldomgetAccessibilityPropertiesForNodeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt (172135 => 172136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt 2014-08-06 06:14:48 UTC (rev 172135)
+++ trunk/LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt 2014-08-06 06:21:03 UTC (rev 172136)
</span><span class="lines">@@ -56,14 +56,14 @@
</span><span class="cx">
</span><span class="cx"> <div role="option" aria-busy="true">busy (self)</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: busy (self)
</ins><span class="cx"> role: option
</span><span class="cx"> busy: true
</span><span class="cx"> parentNodeId: exists
</span><span class="cx">
</span><span class="cx"> <div role="option">busy (parent)</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: busy (parent)
</ins><span class="cx"> role: option
</span><span class="cx"> busy: true
</span><span class="cx"> parentNodeId: exists
</span><span class="lines">@@ -83,13 +83,13 @@
</span><span class="cx">
</span><span class="cx"> <div role="tab" aria-selected="false">not selected</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: not selected
</ins><span class="cx"> role: tab
</span><span class="cx"> parentNodeId: exists
</span><span class="cx">
</span><span class="cx"> <div role="tab" aria-selected="true">selected</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: selected
</ins><span class="cx"> role: tab
</span><span class="cx"> parentNodeId: exists
</span><span class="cx"> selected: true
</span><span class="lines">@@ -107,13 +107,13 @@
</span><span class="cx">
</span><span class="cx"> <div role="option" aria-selected="false">not selected</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: not selected
</ins><span class="cx"> role: option
</span><span class="cx"> parentNodeId: exists
</span><span class="cx">
</span><span class="cx"> <div role="option" aria-selected="true">selected</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: selected
</ins><span class="cx"> role: option
</span><span class="cx"> parentNodeId: exists
</span><span class="cx"> selected: true
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx">
</span><span class="cx"> <img src="data:image/gif..." alt="x" aria-hidden="true">
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: x
</ins><span class="cx"> role: img
</span><span class="cx"> ignored: true
</span><span class="cx"> ignoredByDefault: true
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx">
</span><span class="cx"> <img src="data:image/gif..." alt="x">
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: x
</ins><span class="cx"> role: img
</span><span class="cx">
</span><span class="cx"> <img src="data:image/gif..." alt="">
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx">
</span><span class="cx"> <div role="radio" aria-checked="false">unchecked</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: unchecked
</ins><span class="cx"> role: radio
</span><span class="cx"> checked: false
</span><span class="cx"> parentNodeId: exists
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx">
</span><span class="cx"> <div role="radio" aria-checked="mixed">unchecked [sic] mixed state will not be exposed on radios per ARIA spec.</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: unchecked [sic] mixed state will not be exposed on radios per ARIA spec.
</ins><span class="cx"> role: radio
</span><span class="cx"> checked: false
</span><span class="cx"> parentNodeId: exists
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx">
</span><span class="cx"> <div role="radio" aria-checked="true">checked</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: checked
</ins><span class="cx"> role: radio
</span><span class="cx"> checked: true
</span><span class="cx"> parentNodeId: exists
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx">
</span><span class="cx"> <div role="radio">unchecked (checked undefined evals to false on radio)</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: unchecked (checked undefined evals to false on radio)
</ins><span class="cx"> role: radio
</span><span class="cx"> checked: false
</span><span class="cx"> parentNodeId: exists
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx">
</span><span class="cx"> <div role="checkbox" aria-checked="false">unchecked</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: unchecked
</ins><span class="cx"> role: checkbox
</span><span class="cx"> checked: false
</span><span class="cx"> parentNodeId: exists
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx">
</span><span class="cx"> <div role="checkbox" aria-checked="mixed">mixed</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: mixed
</ins><span class="cx"> role: checkbox
</span><span class="cx"> checked: mixed
</span><span class="cx"> parentNodeId: exists
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx">
</span><span class="cx"> <div role="checkbox" aria-checked="true">checked</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: checked
</ins><span class="cx"> role: checkbox
</span><span class="cx"> checked: true
</span><span class="cx"> parentNodeId: exists
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx">
</span><span class="cx"> <div role="checkbox">unchecked (checked undefined evals to false on checkbox)</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: unchecked (checked undefined evals to false on checkbox)
</ins><span class="cx"> role: checkbox
</span><span class="cx"> checked: false
</span><span class="cx"> parentNodeId: exists
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx">
</span><span class="cx"> <div role="button" tabindex="0" aria-pressed="false">Not Pressed.</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: Not Pressed.
</ins><span class="cx"> role:
</span><span class="cx"> focused: false
</span><span class="cx"> parentNodeId: exists
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx">
</span><span class="cx"> <div role="button" tabindex="0" aria-pressed="true">FIXME: Pressed is false. Expected true. http://webkit.org/b/129830</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: FIXME: Pressed is false. Expected true. http://webkit.org/b/129830
</ins><span class="cx"> role:
</span><span class="cx"> focused: false
</span><span class="cx"> parentNodeId: exists
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx">
</span><span class="cx"> <div role="button" tabindex="0" aria-disabled="true">disabled</div>
</span><span class="cx"> exists: true
</span><del>- label:
</del><ins>+ label: disabled
</ins><span class="cx"> role: button
</span><span class="cx"> disabled: true
</span><span class="cx"> focused: false
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172135 => 172136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-06 06:14:48 UTC (rev 172135)
+++ trunk/Source/WebCore/ChangeLog 2014-08-06 06:21:03 UTC (rev 172136)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-08-05 James Craig <jcraig@apple.com>
+
+ Web Inspector: AXI: Add label string once AccessibilityObject::computedLabel() is available
+ https://bugs.webkit.org/show_bug.cgi?id=129940
+
+ Reviewed by Chris Fleizach.
+
+ Test: inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt
+
+ * accessibility/AccessibilityObject.cpp: Fixed crash.
+ (WebCore::AccessibilityObject::accessibilityComputedLabel):
+ * accessibility/AccessibilityObject.h: Method name update.
+ * inspector/InspectorDOMAgent.cpp: New support for getting Node label from AccessibilityObject.
+ (WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
+
</ins><span class="cx"> 2014-07-29 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r170564, r170571, r170604, r170628, r170672, r170680, r170724, r170728, r170729, r170819, r170821, r170836, r170855, r170860, r170890, r170907, r170929, r171052, r171106, r171152, r171153, r171214 from ftlopt.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (172135 => 172136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-08-06 06:14:48 UTC (rev 172135)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-08-06 06:21:03 UTC (rev 172136)
</span><span class="lines">@@ -288,8 +288,12 @@
</span><span class="cx"> || stringValue().contains(*text, false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String AccessibilityObject::accessibilityComputedLabel()
</del><ins>+String AccessibilityObject::computedLabel()
</ins><span class="cx"> {
</span><ins>+ // This method is being called by WebKit inspector, which may happen at any time, so we need to update our backing store now.
+ // Also hold onto this object in case updateBackingStore deletes this node.
+ RefPtr<AccessibilityObject> protector(this);
+ updateBackingStore();
</ins><span class="cx"> Vector<AccessibilityText> text;
</span><span class="cx"> accessibilityText(text);
</span><span class="cx"> if (text.size())
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (172135 => 172136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-08-06 06:14:48 UTC (rev 172135)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-08-06 06:21:03 UTC (rev 172136)
</span><span class="lines">@@ -647,8 +647,8 @@
</span><span class="cx">
</span><span class="cx"> // Accessibility Text
</span><span class="cx"> virtual void accessibilityText(Vector<AccessibilityText>&) { };
</span><del>- // A single methods for getting a computed label for an AXObject. It condenses the nuances of accessibilityText. Used by Inspector.
- String accessibilityComputedLabel();
</del><ins>+ // A single method for getting a computed label for an AXObject. It condenses the nuances of accessibilityText. Used by Inspector.
+ String computedLabel();
</ins><span class="cx">
</span><span class="cx"> // A programmatic way to set a name on an AccessibleObject.
</span><span class="cx"> virtual void setAccessibleName(const AtomicString&) { }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (172135 => 172136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-08-06 06:14:48 UTC (rev 172135)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-08-06 06:21:03 UTC (rev 172136)
</span><span class="lines">@@ -1457,7 +1457,7 @@
</span><span class="cx"> bool ignoredByDefault = false;
</span><span class="cx"> TypeBuilder::DOM::AccessibilityProperties::Invalid::Enum invalid = TypeBuilder::DOM::AccessibilityProperties::Invalid::False;
</span><span class="cx"> bool hidden = false;
</span><del>- String label; // FIXME: Waiting on http://webkit.org/b/121134
</del><ins>+ String label;
</ins><span class="cx"> bool liveRegionAtomic = false;
</span><span class="cx"> RefPtr<Inspector::TypeBuilder::Array<String>> liveRegionRelevant;
</span><span class="cx"> TypeBuilder::DOM::AccessibilityProperties::LiveRegionStatus::Enum liveRegionStatus = TypeBuilder::DOM::AccessibilityProperties::LiveRegionStatus::Off;
</span><span class="lines">@@ -1552,6 +1552,8 @@
</span><span class="cx"> if (axObject->isARIAHidden() || axObject->isDOMHidden())
</span><span class="cx"> hidden = true;
</span><span class="cx">
</span><ins>+ label = axObject->computedLabel();
+
</ins><span class="cx"> if (axObject->supportsARIALiveRegion()) {
</span><span class="cx"> supportsLiveRegion = true;
</span><span class="cx"> liveRegionAtomic = axObject->ariaLiveRegionAtomic();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (172135 => 172136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-08-06 06:14:48 UTC (rev 172135)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-08-06 06:21:03 UTC (rev 172136)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-08-05 James Craig <jcraig@apple.com>
+
+ Web Inspector: AXI: Add label string once AccessibilityObject::computedLabel() is available
+ https://bugs.webkit.org/show_bug.cgi?id=129940
+
+ Reviewed by Chris Fleizach.
+
+ * UserInterface/Views/DOMNodeDetailsSidebarPanel.js: UI update for label field in Node Inspector.
+ (WebInspector.DOMNodeDetailsSidebarPanel.prototype._refreshAccessibility):
+
</ins><span class="cx"> 2014-08-05 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: support storing multiple timeline recordings in the manager
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMNodeDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js (172135 => 172136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js 2014-08-06 06:14:48 UTC (rev 172135)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js 2014-08-06 06:21:03 UTC (rev 172136)
</span><span class="lines">@@ -360,6 +360,8 @@
</span><span class="cx"> else if (accessibilityProperties.invalid === DOMAgent.AccessibilityPropertiesInvalid.Spelling)
</span><span class="cx"> invalid = WebInspector.UIString("Spelling");
</span><span class="cx">
</span><ins>+ var label = accessibilityProperties.label;
+
</ins><span class="cx"> var liveRegionStatus = "";
</span><span class="cx"> var liveRegionStatusNode = null;
</span><span class="cx"> var liveRegionStatusToken = accessibilityProperties.liveRegionStatus;
</span><span class="lines">@@ -424,11 +426,6 @@
</span><span class="cx"> mouseEventNodeLink = linkForNodeId(mouseEventNodeId);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: label will always come back as empty. Blocked by http://webkit.org/b/121134
- var label = accessibilityProperties.label;
- if (label && label !== domNode.getAttribute("aria-label"))
- label = WebInspector.UIString("%s (computed)").format(label);
-
</del><span class="cx"> var ownedNodeLinkList = linkListForNodeIds(accessibilityProperties.ownedNodeIds);
</span><span class="cx">
</span><span class="cx"> // Accessibility tree parent is not a 1:1 mapping with the DOM tree parent.
</span></span></pre>
</div>
</div>
</body>
</html>