<!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>[165159] trunk/Source/WebKit2</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/165159">165159</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-03-05 18:51:55 -0800 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Support IOS Accessibility in WK2
https://bugs.webkit.org/show_bug.cgi?id=129527
Address review comments from Simon noted in bug.
* UIProcess/ios/WKContentView.mm:
(-[WKContentView _accessibilityRegisterUIProcessTokens]):
* WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm:
(-[WKAccessibilityWebPageObject init]):
(-[WKAccessibilityWebPageObject dealloc]):
* WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.h:
* WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
(-[WKAccessibilityWebPageObject accessibilityAttributeNames]):
(-[WKAccessibilityWebPageObject accessibilitySetValue:forAttribute:]):
(-[WKAccessibilityWebPageObject accessibilityAttributeValue:]):
(-[WKAccessibilityWebPageObject accessibilityAttributeValue:forParameter:]):
(-[WKAccessibilityWebPageObject accessibilityHitTest:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWKAccessibilityWebPageObjectIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWKAccessibilityWebPageObjectMach">trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWKAccessibilityWebPageObjectMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165158 => 165159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-06 02:30:51 UTC (rev 165158)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-06 02:51:55 UTC (rev 165159)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-03-05 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Support IOS Accessibility in WK2
+ https://bugs.webkit.org/show_bug.cgi?id=129527
+
+ Address review comments from Simon noted in bug.
+
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView _accessibilityRegisterUIProcessTokens]):
+ * WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm:
+ (-[WKAccessibilityWebPageObject init]):
+ (-[WKAccessibilityWebPageObject dealloc]):
+ * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.h:
+ * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
+ (-[WKAccessibilityWebPageObject accessibilityAttributeNames]):
+ (-[WKAccessibilityWebPageObject accessibilitySetValue:forAttribute:]):
+ (-[WKAccessibilityWebPageObject accessibilityAttributeValue:]):
+ (-[WKAccessibilityWebPageObject accessibilityAttributeValue:forParameter:]):
+ (-[WKAccessibilityWebPageObject accessibilityHitTest:]):
+
</ins><span class="cx"> 2014-03-05 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebGL] Use WKSI to see what the system policy for WebGL is
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (165158 => 165159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-03-06 02:30:51 UTC (rev 165158)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-03-06 02:51:55 UTC (rev 165159)
</span><span class="lines">@@ -261,10 +261,10 @@
</span><span class="cx"> if (_page->process().state() == WebProcessProxy::State::Running) {
</span><span class="cx"> IPC::Connection* connection = _page->process().connection();
</span><span class="cx"> WKAXStoreRemoteConnectionInformation(self, _page->process().processIdentifier(), connection->identifier().port, uuid.get());
</span><ins>+
+ IPC::DataReference elementToken = IPC::DataReference(reinterpret_cast<const uint8_t*>([remoteElementToken bytes]), [remoteElementToken length]);
+ _page->registerUIProcessAccessibilityTokens(elementToken, elementToken);
</ins><span class="cx"> }
</span><del>-
- IPC::DataReference elementToken = IPC::DataReference(reinterpret_cast<const uint8_t*>([remoteElementToken bytes]), [remoteElementToken length]);
- _page->registerUIProcessAccessibilityTokens(elementToken, elementToken);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark PageClientImpl methods
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWKAccessibilityWebPageObjectIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm (165158 => 165159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm 2014-03-06 02:30:51 UTC (rev 165158)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm 2014-03-06 02:51:55 UTC (rev 165159)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation WKAccessibilityWebPageObject
</span><span class="cx">
</span><del>-- (id)init
</del><ins>+- (instancetype)init
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -49,6 +49,13 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)dealloc
+{
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+ [_remoteTokenData release];
+ [super dealloc];
+}
+
</ins><span class="cx"> - (void)_accessibilityCategoryInstalled:(id)notification
</span><span class="cx"> {
</span><span class="cx"> // Accessibility bundle will override this method so that it knows when to initialize the accessibility runtime within the WebProcess.
</span><span class="lines">@@ -59,13 +66,6 @@
</span><span class="cx"> return m_page->pageScaleFactor();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)dealloc
-{
- [[NSNotificationCenter defaultCenter] removeObserver:self];
- self.remoteTokenData = nil;
- [super dealloc];
-}
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWKAccessibilityWebPageObjectMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.h (165158 => 165159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.h 2014-03-06 02:30:51 UTC (rev 165158)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.h 2014-03-06 02:51:55 UTC (rev 165159)
</span><span class="lines">@@ -26,13 +26,14 @@
</span><span class="cx"> #ifndef WKAccessibilityWebPageObjectMac_h
</span><span class="cx"> #define WKAccessibilityWebPageObjectMac_h
</span><span class="cx">
</span><del>-#include "WKAccessibilityWebPageObjectBase.h"
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span><ins>+#include "WKAccessibilityWebPageObjectBase.h"
+#include <wtf/RetainPtr.h>
+
</ins><span class="cx"> @interface WKAccessibilityWebPageObject : WKAccessibilityWebPageObjectBase {
</span><del>- NSArray* m_attributeNames;
- NSMutableArray* m_accessibilityChildren;
</del><ins>+ RetainPtr<NSArray> m_attributeNames;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSPoint)convertScreenPointToRootView:(NSPoint)point;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWKAccessibilityWebPageObjectMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm (165158 => 165159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm 2014-03-06 02:30:51 UTC (rev 165158)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm 2014-03-06 02:51:55 UTC (rev 165159)
</span><span class="lines">@@ -53,8 +53,6 @@
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><span class="cx"> WKUnregisterUniqueIdForElement(self);
</span><del>- [m_accessibilityChildren release];
- [m_attributeNames release];
</del><span class="cx"> [m_parent release];
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="lines">@@ -67,12 +65,12 @@
</span><span class="cx"> - (NSArray *)accessibilityAttributeNames
</span><span class="cx"> {
</span><span class="cx"> if (!m_attributeNames)
</span><del>- m_attributeNames = [[NSArray alloc] initWithObjects:
</del><ins>+ m_attributeNames = adoptNS([[NSArray alloc] initWithObjects:
</ins><span class="cx"> NSAccessibilityRoleAttribute, NSAccessibilityRoleDescriptionAttribute, NSAccessibilityFocusedAttribute,
</span><span class="cx"> NSAccessibilityParentAttribute, NSAccessibilityWindowAttribute, NSAccessibilityTopLevelUIElementAttribute,
</span><del>- NSAccessibilityPositionAttribute, NSAccessibilitySizeAttribute, NSAccessibilityChildrenAttribute, nil];
</del><ins>+ NSAccessibilityPositionAttribute, NSAccessibilitySizeAttribute, NSAccessibilityChildrenAttribute, nil]);
</ins><span class="cx">
</span><del>- return m_attributeNames;
</del><ins>+ return m_attributeNames.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSArray *)accessibilityParameterizedAttributeNames
</span><span class="lines">@@ -101,7 +99,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)accessibilitySetValue:(id)value forAttribute:(NSString *)attribute
</span><span class="cx"> {
</span><del>- return;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSPoint)convertScreenPointToRootView:(NSPoint)point
</span><span class="lines">@@ -130,14 +127,19 @@
</span><span class="cx">
</span><span class="cx"> if ([attribute isEqualToString:NSAccessibilityParentAttribute])
</span><span class="cx"> return m_parent;
</span><ins>+
</ins><span class="cx"> if ([attribute isEqualToString:NSAccessibilityWindowAttribute])
</span><span class="cx"> return [m_parent accessibilityAttributeValue:NSAccessibilityWindowAttribute];
</span><ins>+
</ins><span class="cx"> if ([attribute isEqualToString:NSAccessibilityTopLevelUIElementAttribute])
</span><span class="cx"> return [m_parent accessibilityAttributeValue:NSAccessibilityTopLevelUIElementAttribute];
</span><ins>+
</ins><span class="cx"> if ([attribute isEqualToString:NSAccessibilityRoleAttribute])
</span><span class="cx"> return NSAccessibilityGroupRole;
</span><ins>+
</ins><span class="cx"> if ([attribute isEqualToString:NSAccessibilityRoleDescriptionAttribute])
</span><span class="cx"> return NSAccessibilityRoleDescription(NSAccessibilityGroupRole, nil);
</span><ins>+
</ins><span class="cx"> if ([attribute isEqualToString:NSAccessibilityFocusedAttribute])
</span><span class="cx"> return [NSNumber numberWithBool:NO];
</span><span class="cx">
</span><span class="lines">@@ -148,10 +150,12 @@
</span><span class="cx"> const WebCore::FloatPoint& point = m_page->accessibilityPosition();
</span><span class="cx"> return [NSValue valueWithPoint:NSMakePoint(point.x(), point.y())];
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if ([attribute isEqualToString:NSAccessibilitySizeAttribute]) {
</span><span class="cx"> const IntSize& s = m_page->size();
</span><span class="cx"> return [NSValue valueWithSize:NSMakeSize(s.width(), s.height())];
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if ([attribute isEqualToString:NSAccessibilityChildrenAttribute])
</span><span class="cx"> return [self accessibilityChildren];
</span><span class="cx">
</span><span class="lines">@@ -174,7 +178,7 @@
</span><span class="cx">
</span><span class="cx"> if (toImpl(result.get())->type() == API::String::APIType)
</span><span class="cx"> return CFBridgingRelease(WKStringCopyCFString(kCFAllocatorDefault, (WKStringRef)result.get()));
</span><del>- else if (toImpl(result.get())->type() == API::Boolean::APIType)
</del><ins>+ if (toImpl(result.get())->type() == API::Boolean::APIType)
</ins><span class="cx"> return [NSNumber numberWithBool:WKBooleanGetValue(static_cast<WKBooleanRef>(result.get()))];
</span><span class="cx">
</span><span class="cx"> return nil;
</span><span class="lines">@@ -185,8 +189,6 @@
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</del><span class="cx"> - (id)accessibilityHitTest:(NSPoint)point
</span><span class="cx"> {
</span><span class="cx"> // Hit-test point comes in as bottom-screen coordinates. Needs to be normalized to the frame of the web page.
</span><span class="lines">@@ -211,7 +213,6 @@
</span><span class="cx">
</span><span class="cx"> return [[self accessibilityRootObjectWrapper] accessibilityHitTest:point];
</span><span class="cx"> }
</span><del>-#pragma clang diagnostic pop
</del><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>