<!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>[194690] 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/194690">194690</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-07 00:14:39 -0800 (Thu, 07 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: AXObjectCacheMac is passing WebCore enum values directly to VoiceOver
https://bugs.webkit.org/show_bug.cgi?id=151755
Patch by Doug Russell <d_russell@apple.com> on 2016-01-07
Reviewed by Chris Fleizach.
No new tests, covered by existing tests.
* accessibility/mac/AXObjectCacheMac.mm:
(platformChangeTypeForWebCoreChangeType):
(platformEditTypeForWebCoreEditType):
(platformDirectionForWebCoreDirection):
(platformGranularityForWebCoreGranularity):
(WebCore::AXObjectCache::postTextStateChangePlatformNotification):
(WebCore::textReplacementChangeDictionary):
(WebCore::AXObjectCache::postTextReplacementPlatformNotification):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacAXObjectCacheMacmm">trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194689 => 194690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-07 07:53:55 UTC (rev 194689)
+++ trunk/Source/WebCore/ChangeLog 2016-01-07 08:14:39 UTC (rev 194690)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-01-07 Doug Russell <d_russell@apple.com>
+
+ AX: AXObjectCacheMac is passing WebCore enum values directly to VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=151755
+
+ Reviewed by Chris Fleizach.
+
+ No new tests, covered by existing tests.
+
+ * accessibility/mac/AXObjectCacheMac.mm:
+ (platformChangeTypeForWebCoreChangeType):
+ (platformEditTypeForWebCoreEditType):
+ (platformDirectionForWebCoreDirection):
+ (platformGranularityForWebCoreGranularity):
+ (WebCore::AXObjectCache::postTextStateChangePlatformNotification):
+ (WebCore::textReplacementChangeDictionary):
+ (WebCore::AXObjectCache::postTextReplacementPlatformNotification):
+
</ins><span class="cx"> 2016-01-06 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Fix up IDBDatabaseIdentifier hash issues.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacAXObjectCacheMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm (194689 => 194690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2016-01-07 07:53:55 UTC (rev 194689)
+++ trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2016-01-07 08:14:39 UTC (rev 194690)
</span><span class="lines">@@ -34,6 +34,10 @@
</span><span class="cx"> #import "WebAccessibilityObjectWrapperMac.h"
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span><span class="cx">
</span><ins>+#if __has_include(<HIServices/AccessibilityPriv.h>)
+#include <HIServices/AccessibilityPriv.h>
+#endif
+
</ins><span class="cx"> #ifndef NSAccessibilityLiveRegionChangedNotification
</span><span class="cx"> #define NSAccessibilityLiveRegionChangedNotification @"AXLiveRegionChanged"
</span><span class="cx"> #endif
</span><span class="lines">@@ -93,6 +97,134 @@
</span><span class="cx"> // Very large strings can negatively impact the performance of notifications, so this length is chosen to try to fit an average paragraph or line of text, but not allow strings to be large enough to hurt performance.
</span><span class="cx"> static const NSUInteger AXValueChangeTruncationLength = 1000;
</span><span class="cx">
</span><ins>+// Check if platform provides enums for text change notifications
+#ifndef AXTextStateChangeDefined
+#define AXTextStateChangeDefined
+
+typedef CF_ENUM(UInt32, AXTextStateChangeType)
+{
+ kAXTextStateChangeTypeUnknown,
+ kAXTextStateChangeTypeEdit,
+ kAXTextStateChangeTypeSelectionMove,
+ kAXTextStateChangeTypeSelectionExtend,
+ kAXTextStateChangeTypeSelectionBoundary
+};
+
+typedef CF_ENUM(UInt32, AXTextEditType)
+{
+ kAXTextEditTypeUnknown,
+ kAXTextEditTypeDelete,
+ kAXTextEditTypeInsert,
+ kAXTextEditTypeTyping,
+ kAXTextEditTypeDictation,
+ kAXTextEditTypeCut,
+ kAXTextEditTypePaste,
+ kAXTextEditTypeAttributesChange
+};
+
+typedef CF_ENUM(UInt32, AXTextSelectionDirection)
+{
+ kAXTextSelectionDirectionUnknown = 0,
+ kAXTextSelectionDirectionBeginning,
+ kAXTextSelectionDirectionEnd,
+ kAXTextSelectionDirectionPrevious,
+ kAXTextSelectionDirectionNext,
+ kAXTextSelectionDirectionDiscontiguous
+};
+
+typedef CF_ENUM(UInt32, AXTextSelectionGranularity)
+{
+ kAXTextSelectionGranularityUnknown,
+ kAXTextSelectionGranularityCharacter,
+ kAXTextSelectionGranularityWord,
+ kAXTextSelectionGranularityLine,
+ kAXTextSelectionGranularitySentence,
+ kAXTextSelectionGranularityParagraph,
+ kAXTextSelectionGranularityPage,
+ kAXTextSelectionGranularityDocument,
+ kAXTextSelectionGranularityAll
+};
+
+#endif // AXTextStateChangeDefined
+
+static AXTextStateChangeType platformChangeTypeForWebCoreChangeType(WebCore::AXTextStateChangeType changeType)
+{
+ switch (changeType) {
+ case WebCore::AXTextStateChangeTypeUnknown:
+ return kAXTextStateChangeTypeUnknown;
+ case WebCore::AXTextStateChangeTypeEdit:
+ return kAXTextStateChangeTypeEdit;
+ case WebCore::AXTextStateChangeTypeSelectionMove:
+ return kAXTextStateChangeTypeSelectionMove;
+ case WebCore::AXTextStateChangeTypeSelectionExtend:
+ return kAXTextStateChangeTypeSelectionExtend;
+ }
+}
+
+static AXTextEditType platformEditTypeForWebCoreEditType(WebCore::AXTextEditType changeType)
+{
+ switch (changeType) {
+ case WebCore::AXTextEditTypeUnknown:
+ return kAXTextEditTypeUnknown;
+ case WebCore::AXTextEditTypeDelete:
+ return kAXTextEditTypeDelete;
+ case WebCore::AXTextEditTypeInsert:
+ return kAXTextEditTypeInsert;
+ case WebCore::AXTextEditTypeTyping:
+ return kAXTextEditTypeTyping;
+ case WebCore::AXTextEditTypeDictation:
+ return kAXTextEditTypeDictation;
+ case WebCore::AXTextEditTypeCut:
+ return kAXTextEditTypeCut;
+ case WebCore::AXTextEditTypePaste:
+ return kAXTextEditTypePaste;
+ case WebCore::AXTextEditTypeAttributesChange:
+ return kAXTextEditTypeAttributesChange;
+ }
+}
+
+static AXTextSelectionDirection platformDirectionForWebCoreDirection(WebCore::AXTextSelectionDirection direction)
+{
+ switch (direction) {
+ case WebCore::AXTextSelectionDirectionUnknown:
+ return kAXTextSelectionDirectionUnknown;
+ case WebCore::AXTextSelectionDirectionBeginning:
+ return kAXTextSelectionDirectionBeginning;
+ case WebCore::AXTextSelectionDirectionEnd:
+ return kAXTextSelectionDirectionEnd;
+ case WebCore::AXTextSelectionDirectionPrevious:
+ return kAXTextSelectionDirectionPrevious;
+ case WebCore::AXTextSelectionDirectionNext:
+ return kAXTextSelectionDirectionNext;
+ case WebCore::AXTextSelectionDirectionDiscontiguous:
+ return kAXTextSelectionDirectionDiscontiguous;
+ }
+}
+
+static AXTextSelectionGranularity platformGranularityForWebCoreGranularity(WebCore::AXTextSelectionGranularity granularity)
+{
+ switch (granularity) {
+ case WebCore::AXTextSelectionGranularityUnknown:
+ return kAXTextSelectionGranularityUnknown;
+ case WebCore::AXTextSelectionGranularityCharacter:
+ return kAXTextSelectionGranularityCharacter;
+ case WebCore::AXTextSelectionGranularityWord:
+ return kAXTextSelectionGranularityWord;
+ case WebCore::AXTextSelectionGranularityLine:
+ return kAXTextSelectionGranularityLine;
+ case WebCore::AXTextSelectionGranularitySentence:
+ return kAXTextSelectionGranularitySentence;
+ case WebCore::AXTextSelectionGranularityParagraph:
+ return kAXTextSelectionGranularityParagraph;
+ case WebCore::AXTextSelectionGranularityPage:
+ return kAXTextSelectionGranularityPage;
+ case WebCore::AXTextSelectionGranularityDocument:
+ return kAXTextSelectionGranularityDocument;
+ case WebCore::AXTextSelectionGranularityAll:
+ return kAXTextSelectionGranularityAll;
+ }
+}
+
</ins><span class="cx"> // The simple Cocoa calls in this file don't throw exceptions.
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -229,11 +361,11 @@
</span><span class="cx"> if (m_isSynchronizingSelection)
</span><span class="cx"> [userInfo setObject:[NSNumber numberWithBool:YES] forKey:NSAccessibilityTextStateSyncKey];
</span><span class="cx"> if (intent.type != AXTextStateChangeTypeUnknown) {
</span><del>- [userInfo setObject:[NSNumber numberWithInt:intent.type] forKey:NSAccessibilityTextStateChangeTypeKey];
</del><ins>+ [userInfo setObject:@(platformChangeTypeForWebCoreChangeType(intent.type)) forKey:NSAccessibilityTextStateChangeTypeKey];
</ins><span class="cx"> switch (intent.type) {
</span><span class="cx"> case AXTextStateChangeTypeSelectionMove:
</span><span class="cx"> case AXTextStateChangeTypeSelectionExtend:
</span><del>- [userInfo setObject:[NSNumber numberWithInt:intent.selection.direction] forKey:NSAccessibilityTextSelectionDirection];
</del><ins>+ [userInfo setObject:@(platformDirectionForWebCoreDirection(intent.selection.direction)) forKey:NSAccessibilityTextSelectionDirection];
</ins><span class="cx"> switch (intent.selection.direction) {
</span><span class="cx"> case AXTextSelectionDirectionUnknown:
</span><span class="cx"> break;
</span><span class="lines">@@ -241,7 +373,7 @@
</span><span class="cx"> case AXTextSelectionDirectionEnd:
</span><span class="cx"> case AXTextSelectionDirectionPrevious:
</span><span class="cx"> case AXTextSelectionDirectionNext:
</span><del>- [userInfo setObject:[NSNumber numberWithInt:intent.selection.granularity] forKey:NSAccessibilityTextSelectionGranularity];
</del><ins>+ [userInfo setObject:@(platformGranularityForWebCoreGranularity(intent.selection.granularity)) forKey:NSAccessibilityTextSelectionGranularity];
</ins><span class="cx"> break;
</span><span class="cx"> case AXTextSelectionDirectionDiscontiguous:
</span><span class="cx"> break;
</span><span class="lines">@@ -275,7 +407,7 @@
</span><span class="cx"> if (!length)
</span><span class="cx"> return nil;
</span><span class="cx"> NSMutableDictionary *change = [[NSMutableDictionary alloc] initWithCapacity:4];
</span><del>- [change setObject:[NSNumber numberWithInt:type] forKey:NSAccessibilityTextEditType];
</del><ins>+ [change setObject:@(platformEditTypeForWebCoreEditType(type)) forKey:NSAccessibilityTextEditType];
</ins><span class="cx"> if (length > AXValueChangeTruncationLength) {
</span><span class="cx"> [change setObject:[NSNumber numberWithInt:length] forKey:NSAccessibilityTextChangeValueLength];
</span><span class="cx"> text = [text substringToIndex:AXValueChangeTruncationLength];
</span><span class="lines">@@ -305,7 +437,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSMutableDictionary *userInfo = [[NSMutableDictionary alloc] initWithCapacity:4];
</span><del>- [userInfo setObject:@(AXTextStateChangeTypeEdit) forKey:NSAccessibilityTextStateChangeTypeKey];
</del><ins>+ [userInfo setObject:@(platformChangeTypeForWebCoreChangeType(AXTextStateChangeTypeEdit)) forKey:NSAccessibilityTextStateChangeTypeKey];
</ins><span class="cx">
</span><span class="cx"> NSMutableArray *changes = [[NSMutableArray alloc] initWithCapacity:2];
</span><span class="cx"> if (NSDictionary *change = textReplacementChangeDictionary(object, deletionType, deletedText, position))
</span></span></pre>
</div>
</div>
</body>
</html>