<!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>[185137] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185137">185137</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-02 18:29:43 -0700 (Tue, 02 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: debugging attributes for text markers
https://bugs.webkit.org/show_bug.cgi?id=145283
Patch by Doug Russell <d_russell@apple.com> on 2015-06-02
Reviewed by Chris Fleizach.
AXTextMarkerDebugDescription: returns the result of
VisiblePosition::formatForDebugger() for the visible position that a text marker
represents.
AXTextMarkerNodeDebugDescription: calls Node::showNode() and
Node::showNodePathForThis() for the visible position that a text marker
represents.
AXTextMarkerNodeTreeDebugDescription: calls Node::showTreeForThis() for the
visible position that a text marker represents.
AXTextMarkerRangeDebugDescription: returns the result of
formatForDebugger(VisiblePositionRange) for the visible position range that a text
marker range represents.
This is debug only tooling. Tests would be flakey and not very helpful.
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper debugDescriptionForTextMarker:]):
(-[WebAccessibilityObjectWrapper debugDescriptionForTextMarkerRange:]):
(-[WebAccessibilityObjectWrapper showNodeForTextMarker:]):
(-[WebAccessibilityObjectWrapper showNodeTreeForTextMarker:]):
(formatForDebugger):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
* dom/Text.cpp:
(WebCore::Text::formatForDebugger):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCoredomTextcpp">trunk/Source/WebCore/dom/Text.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185136 => 185137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-03 00:45:00 UTC (rev 185136)
+++ trunk/Source/WebCore/ChangeLog 2015-06-03 01:29:43 UTC (rev 185137)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-06-02 Doug Russell <d_russell@apple.com>
+
+ AX: debugging attributes for text markers
+ https://bugs.webkit.org/show_bug.cgi?id=145283
+
+ Reviewed by Chris Fleizach.
+
+ AXTextMarkerDebugDescription: returns the result of
+ VisiblePosition::formatForDebugger() for the visible position that a text marker
+ represents.
+ AXTextMarkerNodeDebugDescription: calls Node::showNode() and
+ Node::showNodePathForThis() for the visible position that a text marker
+ represents.
+ AXTextMarkerNodeTreeDebugDescription: calls Node::showTreeForThis() for the
+ visible position that a text marker represents.
+ AXTextMarkerRangeDebugDescription: returns the result of
+ formatForDebugger(VisiblePositionRange) for the visible position range that a text
+ marker range represents.
+
+ This is debug only tooling. Tests would be flakey and not very helpful.
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper debugDescriptionForTextMarker:]):
+ (-[WebAccessibilityObjectWrapper debugDescriptionForTextMarkerRange:]):
+ (-[WebAccessibilityObjectWrapper showNodeForTextMarker:]):
+ (-[WebAccessibilityObjectWrapper showNodeTreeForTextMarker:]):
+ (formatForDebugger):
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
+ * dom/Text.cpp:
+ (WebCore::Text::formatForDebugger):
+
</ins><span class="cx"> 2015-06-02 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> MediaSessions should keep track of their current state.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (185136 => 185137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-06-03 00:45:00 UTC (rev 185136)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-06-03 01:29:43 UTC (rev 185137)
</span><span class="lines">@@ -3485,6 +3485,62 @@
</span><span class="cx"> return [attrString RTFFromRange: NSMakeRange(0, [attrString length]) documentAttributes:@{ }];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(TREE_DEBUGGING)
+- (NSString *)debugDescriptionForTextMarker:(id)textMarker
+{
+ char description[1024];
+ [self visiblePositionForTextMarker:textMarker].formatForDebugger(description, sizeof(description));
+ return [NSString stringWithUTF8String:description];
+
+}
+
+- (NSString *)debugDescriptionForTextMarkerRange:(id)textMarkerRange
+{
+ VisiblePositionRange visiblePositionRange = [self visiblePositionRangeForTextMarkerRange:textMarkerRange];
+ if (visiblePositionRange.isNull())
+ return @"<null>";
+ char description[2048];
+ formatForDebugger(visiblePositionRange, description, sizeof(description));
+ return [NSString stringWithUTF8String:description];
+
+}
+
+- (void)showNodeForTextMarker:(id)textMarker
+{
+ VisiblePosition visiblePosition = [self visiblePositionForTextMarker:textMarker];
+ Node* node = visiblePosition.deepEquivalent().deprecatedNode();
+ if (!node)
+ return;
+ node->showNode();
+ node->showNodePathForThis();
+}
+
+- (void)showNodeTreeForTextMarker:(id)textMarker
+{
+ VisiblePosition visiblePosition = [self visiblePositionForTextMarker:textMarker];
+ Node* node = visiblePosition.deepEquivalent().deprecatedNode();
+ if (!node)
+ return;
+ node->showTreeForThis();
+}
+
+static void formatForDebugger(const VisiblePositionRange& range, char* buffer, unsigned length)
+{
+ StringBuilder result;
+
+ const int FormatBufferSize = 1024;
+ char format[FormatBufferSize];
+ result.appendLiteral("from ");
+ range.start.formatForDebugger(format, FormatBufferSize);
+ result.append(format);
+ result.appendLiteral(" to ");
+ range.end.formatForDebugger(format, FormatBufferSize);
+ result.append(format);
+
+ strlcpy(buffer, result.toString().utf8().data(), length);
+}
+#endif
+
</ins><span class="cx"> - (id)accessibilityAttributeValue:(NSString*)attribute forParameter:(id)parameter
</span><span class="cx"> {
</span><span class="cx"> id textMarker = nil;
</span><span class="lines">@@ -3773,7 +3829,25 @@
</span><span class="cx"> VisiblePositionRange visiblePosRange = [self visiblePositionRangeForTextMarkerRange:textMarkerRange];
</span><span class="cx"> return [self textMarkerForVisiblePosition:visiblePosRange.end];
</span><span class="cx"> }
</span><del>-
</del><ins>+
+#if ENABLE(TREE_DEBUGGING)
+ if ([attribute isEqualToString:@"AXTextMarkerDebugDescription"])
+ return [self debugDescriptionForTextMarker:textMarker];
+
+ if ([attribute isEqualToString:@"AXTextMarkerRangeDebugDescription"])
+ return [self debugDescriptionForTextMarkerRange:textMarkerRange];
+
+ if ([attribute isEqualToString:@"AXTextMarkerNodeDebugDescription"]) {
+ [self showNodeForTextMarker:textMarker];
+ return nil;
+ }
+
+ if ([attribute isEqualToString:@"AXTextMarkerNodeTreeDebugDescription"]) {
+ [self showNodeTreeForTextMarker:textMarker];
+ return nil;
+ }
+#endif
+
</ins><span class="cx"> if (is<AccessibilityTable>(*m_object) && downcast<AccessibilityTable>(*m_object).isExposableThroughAccessibility()) {
</span><span class="cx"> if ([attribute isEqualToString:NSAccessibilityCellForColumnAndRowParameterizedAttribute]) {
</span><span class="cx"> if (array == nil || [array count] != 2)
</span></span></pre></div>
<a id="trunkSourceWebCoredomTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Text.cpp (185136 => 185137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Text.cpp 2015-06-03 00:45:00 UTC (rev 185136)
+++ trunk/Source/WebCore/dom/Text.cpp 2015-06-03 01:29:43 UTC (rev 185137)
</span><span class="lines">@@ -228,11 +228,14 @@
</span><span class="cx"> if (s.length() > 0) {
</span><span class="cx"> if (result.length())
</span><span class="cx"> result.appendLiteral("; ");
</span><del>- result.appendLiteral("value=");
</del><ins>+ result.appendLiteral("length=");
+ result.appendNumber(s.length());
+ result.appendLiteral("; value=\"");
</ins><span class="cx"> result.append(s);
</span><ins>+ result.append('"');
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- strncpy(buffer, result.toString().utf8().data(), length - 1);
</del><ins>+ strlcpy(buffer, result.toString().utf8().data(), length);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>