<!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>[202088] 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/202088">202088</a></dd>
<dt>Author</dt> <dd>pvollan@apple.com</dd>
<dt>Date</dt> <dd>2016-06-15 02:55:18 -0700 (Wed, 15 Jun 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Win] The test accessibility/selected-text-range-aria-elements.html is failing.
https://bugs.webkit.org/show_bug.cgi?id=158732

Reviewed by Brent Fulgham.

Source/WebCore:

Implement support for getting selected text range.

* accessibility/win/AccessibilityObjectWrapperWin.cpp:
(WebCore::AccessibilityObjectWrapper::accessibilityAttributeValue):

Tools:

Implement selectedTextRange() method.

* DumpRenderTree/win/AccessibilityUIElementWin.cpp:
(AccessibilityUIElement::selectedTextRange):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitywinAccessibilityObjectWrapperWincpp">trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinAccessibilityUIElementWincpp">trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202087 => 202088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-06-15 09:36:22 UTC (rev 202087)
+++ trunk/Source/WebCore/ChangeLog        2016-06-15 09:55:18 UTC (rev 202088)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-06-15  Per Arne Vollan  &lt;pvollan@apple.com&gt;
+
+        [Win] The test accessibility/selected-text-range-aria-elements.html is failing.
+        https://bugs.webkit.org/show_bug.cgi?id=158732
+
+        Reviewed by Brent Fulgham.
+
+        Implement support for getting selected text range.
+
+        * accessibility/win/AccessibilityObjectWrapperWin.cpp:
+        (WebCore::AccessibilityObjectWrapper::accessibilityAttributeValue):
+
</ins><span class="cx"> 2016-06-14  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Addressing post-review comments after r201971
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitywinAccessibilityObjectWrapperWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp (202087 => 202088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp        2016-06-15 09:36:22 UTC (rev 202087)
+++ trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp        2016-06-15 09:55:18 UTC (rev 202088)
</span><span class="lines">@@ -65,6 +65,15 @@
</span><span class="cx">         V_BSTR(result) = WebCore::BString(m_object-&gt;getAttribute(WebCore::HTMLNames::idAttr)).release();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><ins>+
+    if (attributeName == &quot;AXSelectedTextRangeAttribute&quot;) {
+        ASSERT(V_VT(result) == VT_EMPTY);
+        V_VT(result) = VT_BSTR;
+        PlainTextRange textRange = m_object-&gt;selectedTextRange();
+        String range = String::format(&quot;{%u, %u}&quot;, textRange.start, textRange.length);
+        V_BSTR(result) = WebCore::BString(range).release();
+        return;
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202087 => 202088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-06-15 09:36:22 UTC (rev 202087)
+++ trunk/Tools/ChangeLog        2016-06-15 09:55:18 UTC (rev 202088)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-06-15  Per Arne Vollan  &lt;pvollan@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        [Win] The test accessibility/selected-text-range-aria-elements.html is failing.
+        https://bugs.webkit.org/show_bug.cgi?id=158732
+
+        Reviewed by Brent Fulgham.
+
+        Implement selectedTextRange() method.
+
+        * DumpRenderTree/win/AccessibilityUIElementWin.cpp:
+        (AccessibilityUIElement::selectedTextRange):
+
+2016-06-15  Per Arne Vollan  &lt;pvollan@apple.com&gt;
+
</ins><span class="cx">         [Win] MiniBrowser is not DPI aware.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=158733
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinAccessibilityUIElementWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp (202087 => 202088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp        2016-06-15 09:36:22 UTC (rev 202087)
+++ trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp        2016-06-15 09:55:18 UTC (rev 202088)
</span><span class="lines">@@ -686,7 +686,16 @@
</span><span class="cx"> 
</span><span class="cx"> JSStringRef AccessibilityUIElement::selectedTextRange()
</span><span class="cx"> {
</span><del>-    return JSStringCreateWithCharacters(0, 0);    
</del><ins>+    COMPtr&lt;IAccessibleComparable&gt; comparable = comparableObject(platformUIElement().get());
+    if (!comparable)
+        return JSStringCreateWithCharacters(0, 0);
+
+    _variant_t value;
+    if (FAILED(comparable-&gt;get_attribute(_bstr_t(L&quot;AXSelectedTextRangeAttribute&quot;), &amp;value.GetVARIANT())))
+        return JSStringCreateWithCharacters(0, 0);    
+
+    ASSERT(V_VT(&amp;value) == VT_BSTR);
+    return JSStringCreateWithBSTR(value.bstrVal);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void AccessibilityUIElement::setSelectedTextRange(unsigned location, unsigned length)
</span></span></pre>
</div>
</div>

</body>
</html>