<!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>[183283] 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/183283">183283</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-24 15:00:18 -0700 (Fri, 24 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/183266">r183266</a>.
https://bugs.webkit.org/show_bug.cgi?id=144164
Broke 32-bit build and a test. (Requested by ap on #webkit).
Reverted changeset:
"AX: richer text change notifications (142719)"
https://bugs.webkit.org/show_bug.cgi?id=142719
http://trac.webkit.org/changeset/183266</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCacheh">trunk/Source/WebCore/accessibility/AXObjectCache.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjecth">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h</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="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityScrollViewh">trunk/Source/WebCore/accessibility/AccessibilityScrollView.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkAXObjectCacheAtkcpp">trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosAXObjectCacheIOSmm">trunk/Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacAXObjectCacheMacmm">trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperBaseh">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperBasemm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMach">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingAppendNodeCommandcpp">trunk/Source/WebCore/editing/AppendNodeCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingAppendNodeCommandh">trunk/Source/WebCore/editing/AppendNodeCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingApplyStyleCommandcpp">trunk/Source/WebCore/editing/ApplyStyleCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingApplyStyleCommandh">trunk/Source/WebCore/editing/ApplyStyleCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandcpp">trunk/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandh">trunk/Source/WebCore/editing/CompositeEditCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingDeleteFromTextNodeCommandcpp">trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingDeleteFromTextNodeCommandh">trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingDeleteSelectionCommandcpp">trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingDeleteSelectionCommandh">trunk/Source/WebCore/editing/DeleteSelectionCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingDictationCommandcpp">trunk/Source/WebCore/editing/DictationCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditActionh">trunk/Source/WebCore/editing/EditAction.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditCommandcpp">trunk/Source/WebCore/editing/EditCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditCommandh">trunk/Source/WebCore/editing/EditCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingAllInOnecpp">trunk/Source/WebCore/editing/EditingAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorCommandcpp">trunk/Source/WebCore/editing/EditorCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectionh">trunk/Source/WebCore/editing/FrameSelection.h</a></li>
<li><a href="#trunkSourceWebCoreeditingInsertIntoTextNodeCommandcpp">trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingInsertIntoTextNodeCommandh">trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingInsertNodeBeforeCommandcpp">trunk/Source/WebCore/editing/InsertNodeBeforeCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingInsertNodeBeforeCommandh">trunk/Source/WebCore/editing/InsertNodeBeforeCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingInsertParagraphSeparatorCommandcpp">trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingInsertParagraphSeparatorCommandh">trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingInsertTextCommandcpp">trunk/Source/WebCore/editing/InsertTextCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingInsertTextCommandh">trunk/Source/WebCore/editing/InsertTextCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingMoveSelectionCommandcpp">trunk/Source/WebCore/editing/MoveSelectionCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingRemoveNodePreservingChildrenCommandcpp">trunk/Source/WebCore/editing/RemoveNodePreservingChildrenCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingRemoveNodePreservingChildrenCommandh">trunk/Source/WebCore/editing/RemoveNodePreservingChildrenCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingReplaceSelectionCommandcpp">trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingReplaceSelectionCommandh">trunk/Source/WebCore/editing/ReplaceSelectionCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingTypingCommandcpp">trunk/Source/WebCore/editing/TypingCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingatkFrameSelectionAtkcpp">trunk/Source/WebCore/editing/atk/FrameSelectionAtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingiosDictationCommandIOScpp">trunk/Source/WebCore/editing/ios/DictationCommandIOS.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingiosDictationCommandIOSh">trunk/Source/WebCore/editing/ios/DictationCommandIOS.h</a></li>
<li><a href="#trunkSourceWebCoreeditingmacFrameSelectionMacmm">trunk/Source/WebCore/editing/mac/FrameSelectionMac.mm</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementcpp">trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFocusControllercpp">trunk/Source/WebCore/page/FocusController.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebEditCommandProxycpp">trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacAccessibilityNotificationHandlerh">trunk/Tools/DumpRenderTree/mac/AccessibilityNotificationHandler.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacAccessibilityNotificationHandlermm">trunk/Tools/DumpRenderTree/mac/AccessibilityNotificationHandler.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacAccessibilityUIElementMacmm">trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityNotificationHandlermm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityinputreplacevalueuserinfoexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/input-replacevalue-userinfo-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityinputreplacevalueuserinfohtml">trunk/LayoutTests/platform/mac/accessibility/input-replacevalue-userinfo.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityselectionchangeuserinfoexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/selection-change-userinfo-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityselectionchangeuserinfohtml">trunk/LayoutTests/platform/mac/accessibility/selection-change-userinfo.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityvaluechangeuserinfoexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/value-change-userinfo-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityvaluechangeuserinfohtml">trunk/LayoutTests/platform/mac/accessibility/value-change-userinfo.html</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXTextStateChangeIntenth">trunk/Source/WebCore/accessibility/AXTextStateChangeIntent.h</a></li>
<li><a href="#trunkSourceWebCoreeditingReplaceDeleteFromTextNodeCommandcpp">trunk/Source/WebCore/editing/ReplaceDeleteFromTextNodeCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingReplaceDeleteFromTextNodeCommandh">trunk/Source/WebCore/editing/ReplaceDeleteFromTextNodeCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingReplaceInsertIntoTextNodeCommandcpp">trunk/Source/WebCore/editing/ReplaceInsertIntoTextNodeCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingReplaceInsertIntoTextNodeCommandh">trunk/Source/WebCore/editing/ReplaceInsertIntoTextNodeCommand.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/LayoutTests/ChangeLog 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-24 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r183266.
+ https://bugs.webkit.org/show_bug.cgi?id=144164
+
+ Broke 32-bit build and a test. (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "AX: richer text change notifications (142719)"
+ https://bugs.webkit.org/show_bug.cgi?id=142719
+ http://trac.webkit.org/changeset/183266
+
</ins><span class="cx"> 2015-04-24 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Origin header is preserved on cross-origin redirects.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityinputreplacevalueuserinfoexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/accessibility/input-replacevalue-userinfo-expected.txt (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/input-replacevalue-userinfo-expected.txt 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/LayoutTests/platform/mac/accessibility/input-replacevalue-userinfo-expected.txt 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>-
-This tests value change notifications user info data when replacing the contents of an input field.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS addedNotification is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeEdit
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextChangeValue"] is "0"
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextEditType"] is AXTextEditTypeDelete
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeEdit
-PASS results[resultIndex]["AXTextChangeValues"][1]["AXTextChangeValue"] is "1"
-PASS results[resultIndex]["AXTextChangeValues"][1]["AXTextEditType"] is AXTextEditTypeInsert
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeEdit
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextChangeValue"] is " "
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextEditType"] is AXTextEditTypeInsert
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityinputreplacevalueuserinfohtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/accessibility/input-replacevalue-userinfo.html (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/input-replacevalue-userinfo.html 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/LayoutTests/platform/mac/accessibility/input-replacevalue-userinfo.html 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,83 +0,0 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
- <script src="../../../resources/js-test-pre.js"></script>
- <script src="../../../editing/editing.js"></script>
-</head>
-<body id="body">
-
- <input type="password" id="securevaluetest">
-
- <input type="text" id="valuetest">
-
- <p id="description"></p>
- <div id="console"></div>
- <div id="notifications"></div>
-
- <script>
-
- description("This tests value change notifications user info data when replacing the contents of an input field.");
-
- var AXTextStateChangeTypeEdit = 1;
-
- var AXTextEditTypeDelete = 1;
- var AXTextEditTypeInsert = AXTextEditTypeDelete + 1;
-
- var webArea = 0;
- var count = 0;
- var results = [];
- var resultIndex = 0;
- function notificationCallback(notification, userInfo) {
- if (notification == "AXValueChanged") {
- count++;
- results.push(userInfo);
- if (count == 2) {
-
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeEdit");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextChangeValue\"]", "\"0\"");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextEditType\"]", "AXTextEditTypeDelete");
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeEdit");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][1][\"AXTextChangeValue\"]", "\"1\"");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][1][\"AXTextEditType\"]", "AXTextEditTypeInsert");
-
- // Password notifications will be insert only and the value string will be whitespace
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeEdit");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextChangeValue\"]", "\" \"");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextEditType\"]", "AXTextEditTypeInsert");
-
- webArea.removeNotificationListener();
- window.testRunner.notifyDone();
- }
- }
- }
-
- function setvalue() {
- document.getElementById("valuetest").value = "1";
- }
-
- function setsecurevalue() {
- document.getElementById("securevaluetest").value = "1";
- }
-
- document.getElementById("valuetest").value = "0";
- document.getElementById("securevaluetest").value = "0";
-
- if (window.accessibilityController) {
- window.testRunner.waitUntilDone();
-
- accessibilityController.enableEnhancedAccessibility(true);
-
- webArea = accessibilityController.rootElement.childAtIndex(0);
- var addedNotification = webArea.addNotificationListener(notificationCallback);
- shouldBe("addedNotification", "true");
-
- setvalue();
-
- setsecurevalue();
- }
- </script>
-
- <script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityselectionchangeuserinfoexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/accessibility/selection-change-userinfo-expected.txt (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/selection-change-userinfo-expected.txt 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/LayoutTests/platform/mac/accessibility/selection-change-userinfo-expected.txt 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,95 +0,0 @@
</span><del>-one two three. four five six.
-
-seven eight nine.
-
-This tests selection change notifications user info data.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS addedNotification is true
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityCharacter
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionNext
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityCharacter
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionPrevious
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityWord
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionNext
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityWord
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionPrevious
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularitySentence
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionNext
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularitySentence
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionPrevious
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityLine
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionNext
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityLine
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionPrevious
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityParagraph
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionNext
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityParagraph
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionPrevious
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityLine
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionEnd
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityLine
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionBeginning
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularitySentence
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionEnd
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularitySentence
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionBeginning
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityParagraph
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionEnd
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityParagraph
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionBeginning
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityDocument
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionEnd
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionMove
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityDocument
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionBeginning
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionExtend
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityCharacter
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionNext
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionExtend
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityWord
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionNext
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionExtend
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularitySentence
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionNext
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionExtend
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityLine
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionNext
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionExtend
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityParagraph
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionNext
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionExtend
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityLine
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionEnd
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionExtend
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularitySentence
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionEnd
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionExtend
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityParagraph
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionEnd
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeSelectionExtend
-PASS results[resultIndex]["AXTextSelectionGranularity"] is AXTextSelectionGranularityDocument
-PASS results[resultIndex]["AXTextSelectionDirection"] is AXTextSelectionDirectionEnd
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityselectionchangeuserinfohtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/accessibility/selection-change-userinfo.html (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/selection-change-userinfo.html 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/LayoutTests/platform/mac/accessibility/selection-change-userinfo.html 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,217 +0,0 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src="../../../resources/js-test-pre.js"></script>
-</head>
-<body id="body">
-
-<div role="textbox" tabindex=0 id="textbox" contenteditable=true>
-<p>one two three. four five six.</p>
-<p>seven eight nine.</p>
-</div>
-
-<p id="description"></p>
-<div id="console"></div>
-<div id="notifications"></div>
-
-<script>
-
- description("This tests selection change notifications user info data.");
-
- var AXTextStateChangeTypeSelectionMove = 2;
- var AXTextStateChangeTypeSelectionExtend = AXTextStateChangeTypeSelectionMove + 1;
-
- var AXTextSelectionDirectionBeginning = 1;
- var AXTextSelectionDirectionEnd = AXTextSelectionDirectionBeginning + 1;
- var AXTextSelectionDirectionPrevious = AXTextSelectionDirectionEnd + 1;
- var AXTextSelectionDirectionNext = AXTextSelectionDirectionPrevious + 1;
-
- var AXTextSelectionGranularityCharacter = 1;
- var AXTextSelectionGranularityWord = AXTextSelectionGranularityCharacter + 1;
- var AXTextSelectionGranularityLine = AXTextSelectionGranularityWord + 1;
- var AXTextSelectionGranularitySentence = AXTextSelectionGranularityLine + 1;
- var AXTextSelectionGranularityParagraph = AXTextSelectionGranularitySentence + 1;
- var AXTextSelectionGranularityDocument = AXTextSelectionGranularityParagraph + 2;
-
- var gran = ["character", "word", "sentence", "line", "paragraph", "lineboundary", "sentenceboundary", "paragraphboundary", "documentboundary"];
- var webArea = 0;
- var count = 0;
- var results = [];
- var resultIndex = 0;
- function notificationCallback(notification, userInfo) {
- if (notification == "AXSelectedTextChanged") {
- count++;
- if (userInfo)
- results.push(userInfo);
- if (count == gran.length * 4) {
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityCharacter");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionNext");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityCharacter");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionPrevious");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityWord");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionNext");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityWord");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionPrevious");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularitySentence");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionNext");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularitySentence");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionPrevious");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityLine");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionNext");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityLine");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionPrevious");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityParagraph");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionNext");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityParagraph");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionPrevious");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityLine");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionEnd");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityLine");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionBeginning");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularitySentence");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionEnd");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularitySentence");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionBeginning");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityParagraph");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionEnd");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityParagraph");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionBeginning");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityDocument");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionEnd");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionMove");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityDocument");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionBeginning");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionExtend");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityCharacter");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionNext");
-
- resultIndex += 2;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionExtend");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityWord");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionNext");
-
- resultIndex += 2;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionExtend");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularitySentence");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionNext");
-
- resultIndex += 2;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionExtend");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityLine");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionNext");
-
- resultIndex += 2;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionExtend");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityParagraph");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionNext");
-
- resultIndex += 2;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionExtend");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityLine");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionEnd");
-
- resultIndex += 2;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionExtend");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularitySentence");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionEnd");
-
- resultIndex += 2;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionExtend");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityParagraph");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionEnd");
-
- resultIndex += 2;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeSelectionExtend");
- shouldBe("results[resultIndex][\"AXTextSelectionGranularity\"]", "AXTextSelectionGranularityDocument");
- shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionEnd");
-
- webArea.removeNotificationListener();
- window.testRunner.notifyDone();
- }
- }
- }
-
- if (window.accessibilityController) {
- window.testRunner.waitUntilDone();
-
- accessibilityController.enableEnhancedAccessibility(true);
-
- webArea = accessibilityController.rootElement.childAtIndex(0);
- var addedNotification = webArea.addNotificationListener(notificationCallback);
- shouldBe("addedNotification", "true");
-
- textbox = document.getElementById("textbox");
- textbox.focus();
-
- // Trigger selection changes.
- var s = window.getSelection();
- s.setPosition(textbox, 0);
- for (var i in gran) {
- s.modify("move", "forward", gran[i]);
- s.modify("move", "backward", gran[i]);
- }
- for (var i in gran) {
- s.setPosition(textbox, 0);
- s.modify("extend", "forward", gran[i]);
- }
- }
-
-</script>
-
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityvaluechangeuserinfoexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/accessibility/value-change-userinfo-expected.txt (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/value-change-userinfo-expected.txt 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/LayoutTests/platform/mac/accessibility/value-change-userinfo-expected.txt 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-0234567890
-This tests value change notifications user info data.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS addedNotification is true
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeEdit
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextChangeValue"] is "0"
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextEditType"] is AXTextEditTypeCut
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeEdit
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextChangeValue"] is "1"
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextEditType"] is AXTextEditTypeDelete
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeEdit
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextChangeValue"] is "0"
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextEditType"] is AXTextEditTypePaste
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeEdit
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextChangeValue"] is "234567890"
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextEditType"] is AXTextEditTypePaste
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeEdit
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextChangeValue"] is "1"
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextEditType"] is AXTextEditTypeTyping
-PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeEdit
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextChangeValue"] is "1"
-PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextEditType"] is AXTextEditTypeDelete
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityvaluechangeuserinfohtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/accessibility/value-change-userinfo.html (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/value-change-userinfo.html 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/LayoutTests/platform/mac/accessibility/value-change-userinfo.html 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,97 +0,0 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
- <script src="../../../resources/js-test-pre.js"></script>
- <script src="../../../editing/editing.js"></script>
-</head>
-<body id="body">
-
- <div role="textbox" tabindex=0 id="textbox" contenteditable=true>01234567890</div>
-
- <p id="description"></p>
- <div id="console"></div>
- <div id="notifications"></div>
-
- <script>
-
- description("This tests value change notifications user info data.");
-
- var AXTextStateChangeTypeEdit = 1;
-
- var AXTextEditTypeDelete = 1;
- var AXTextEditTypeInsert = AXTextEditTypeDelete + 1;
- var AXTextEditTypeTyping = AXTextEditTypeInsert + 1;
- var AXTextEditTypeDictation = AXTextEditTypeTyping + 1;
- var AXTextEditTypeCut = AXTextEditTypeDictation + 1
- var AXTextEditTypePaste = AXTextEditTypeCut + 1;
-
- var webArea = 0;
- var count = 0;
- var results = [];
- var resultIndex = 0;
- function notificationCallback(notification, userInfo) {
- if (notification == "AXValueChanged") {
- count++;
- results.push(userInfo);
- if (count == 6) {
-
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeEdit");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextChangeValue\"]", "\"0\"");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextEditType\"]", "AXTextEditTypeCut");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeEdit");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextChangeValue\"]", "\"1\"");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextEditType\"]", "AXTextEditTypeDelete");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeEdit");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextChangeValue\"]", "\"0\"");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextEditType\"]", "AXTextEditTypePaste");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeEdit");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextChangeValue\"]", "\"234567890\"");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextEditType\"]", "AXTextEditTypePaste");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeEdit");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextChangeValue\"]", "\"1\"");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextEditType\"]", "AXTextEditTypeTyping");
-
- resultIndex++;
- shouldBe("results[resultIndex][\"AXTextStateChangeType\"]", "AXTextStateChangeTypeEdit");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextChangeValue\"]", "\"1\"");
- shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextEditType\"]", "AXTextEditTypeDelete");
-
- webArea.removeNotificationListener();
- window.testRunner.notifyDone();
- }
- }
- }
-
- if (window.accessibilityController) {
- window.testRunner.waitUntilDone();
-
- accessibilityController.enableEnhancedAccessibility(true);
-
- webArea = accessibilityController.rootElement.childAtIndex(0);
- var addedNotification = webArea.addNotificationListener(notificationCallback);
- shouldBe("addedNotification", "true");
-
- var textbox = document.getElementById("textbox");
- textbox.focus();
-
- execSetSelectionCommand(textbox, 0);
- execExtendSelectionRightByCharacterCommand();
- cutCommand();
- execExtendSelectionRightByCharacterCommand();
- pasteCommand();
- eventSender.keyDown("1");
- deleteCommand();
- }
- </script>
-
- <script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1513,8 +1513,6 @@
</span><span class="cx"> editing/RemoveNodeCommand.cpp
</span><span class="cx"> editing/RemoveNodePreservingChildrenCommand.cpp
</span><span class="cx"> editing/RenderedPosition.cpp
</span><del>- editing/ReplaceDeleteFromTextNodeCommand.cpp
- editing/ReplaceInsertIntoTextNodeCommand.cpp
</del><span class="cx"> editing/ReplaceNodeWithSpanCommand.cpp
</span><span class="cx"> editing/ReplaceSelectionCommand.cpp
</span><span class="cx"> editing/SetNodeAttributeCommand.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/ChangeLog 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-24 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r183266.
+ https://bugs.webkit.org/show_bug.cgi?id=144164
+
+ Broke 32-bit build and a test. (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "AX: richer text change notifications (142719)"
+ https://bugs.webkit.org/show_bug.cgi?id=142719
+ http://trac.webkit.org/changeset/183266
+
</ins><span class="cx"> 2015-04-24 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Origin header is preserved on cross-origin redirects.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -14777,34 +14777,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\editing\ReplaceDeleteFromTextNodeCommand.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\editing\ReplaceInsertIntoTextNodeCommand.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\editing\ReplaceNodeWithSpanCommand.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -19573,7 +19545,6 @@
</span><span class="cx"> <ClInclude Include="..\accessibility\AccessibilityTableHeaderContainer.h" />
</span><span class="cx"> <ClInclude Include="..\accessibility\AccessibilityTableRow.h" />
</span><span class="cx"> <ClInclude Include="..\accessibility\AXObjectCache.h" />
</span><del>- <ClInclude Include="..\accessibility\AXTextStateChangeIntent.h" />
</del><span class="cx"> <ClInclude Include="..\accessibility\win\AccessibilityObjectWrapperWin.h" />
</span><span class="cx"> <ClInclude Include="..\page\AdjustViewSizeOrNot.h" />
</span><span class="cx"> <ClInclude Include="..\page\AlternativeTextClient.h" />
</span><span class="lines">@@ -21116,8 +21087,6 @@
</span><span class="cx"> <ClInclude Include="..\editing\RemoveNodeCommand.h" />
</span><span class="cx"> <ClInclude Include="..\editing\RemoveNodePreservingChildrenCommand.h" />
</span><span class="cx"> <ClInclude Include="..\editing\RenderedPosition.h" />
</span><del>- <ClInclude Include="..\editing\ReplaceDeleteFromTextNodeCommand.h" />
- <ClInclude Include="..\editing\ReplaceInsertIntoTextNodeCommand.h" />
</del><span class="cx"> <ClInclude Include="..\editing\ReplaceNodeWithSpanCommand.h" />
</span><span class="cx"> <ClInclude Include="..\editing\ReplaceSelectionCommand.h" />
</span><span class="cx"> <ClInclude Include="..\editing\SetNodeAttributeCommand.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -3525,12 +3525,6 @@
</span><span class="cx"> <ClCompile Include="..\editing\RenderedPosition.cpp">
</span><span class="cx"> <Filter>editing</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\editing\ReplaceDeleteFromTextNodeCommand.cpp">
- <Filter>editing</Filter>
- </ClCompile>
- <ClCompile Include="..\editing\ReplaceInsertIntoTextNodeCommand.cpp">
- <Filter>editing</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\editing\ReplaceNodeWithSpanCommand.cpp">
</span><span class="cx"> <Filter>editing</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -7674,9 +7668,6 @@
</span><span class="cx"> <ClInclude Include="..\accessibility\AXObjectCache.h">
</span><span class="cx"> <Filter>accessibility</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\accessibility\AXTextStateChangeIntent.h">
- <Filter>accessibility</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\accessibility\win\AccessibilityObjectWrapperWin.h">
</span><span class="cx"> <Filter>accessibility\win</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -10686,12 +10677,6 @@
</span><span class="cx"> <ClInclude Include="..\editing\RenderedPosition.h">
</span><span class="cx"> <Filter>editing</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\editing\ReplaceDeleteFromTextNodeCommand.h">
- <Filter>editing</Filter>
- </ClInclude>
- <ClInclude Include="..\editing\ReplaceInsertIntoTextNodeCommand.h">
- <Filter>editing</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\editing\ReplaceNodeWithSpanCommand.h">
</span><span class="cx"> <Filter>editing</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -3250,7 +3250,6 @@
</span><span class="cx"> 9001774112E0347800648462 /* OESStandardDerivatives.h in Headers */ = {isa = PBXBuildFile; fileRef = 9001773E12E0347800648462 /* OESStandardDerivatives.h */; };
</span><span class="cx"> 9001788012E0370700648462 /* JSOESStandardDerivatives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9001787E12E0370700648462 /* JSOESStandardDerivatives.cpp */; };
</span><span class="cx"> 9001788112E0370700648462 /* JSOESStandardDerivatives.h in Headers */ = {isa = PBXBuildFile; fileRef = 9001787F12E0370700648462 /* JSOESStandardDerivatives.h */; };
</span><del>- 91C9F2F91AE3BEB00095B61C /* AXTextStateChangeIntent.h in Headers */ = {isa = PBXBuildFile; fileRef = 91C9F2F81AE3BE240095B61C /* AXTextStateChangeIntent.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 9302B0BD0D79F82900C7EE83 /* PageGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */; };
</span><span class="cx"> 9302B0BF0D79F82C00C7EE83 /* PageGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 9302B0BE0D79F82C00C7EE83 /* PageGroup.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 9305B24D098F1B6B00C28855 /* Timer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9305B24C098F1B6B00C28855 /* Timer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -6396,10 +6395,6 @@
</span><span class="cx"> F52AD5E41534245F0059FBE6 /* EmptyClients.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F52AD5E31534245F0059FBE6 /* EmptyClients.cpp */; };
</span><span class="cx"> F544F78815CFB2A800AF33A8 /* PlatformLocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F544F78615CFB2A800AF33A8 /* PlatformLocale.cpp */; };
</span><span class="cx"> F544F78915CFB2A800AF33A8 /* PlatformLocale.h in Headers */ = {isa = PBXBuildFile; fileRef = F544F78715CFB2A800AF33A8 /* PlatformLocale.h */; };
</span><del>- F5528DA51AC1033E000EF7AD /* ReplaceDeleteFromTextNodeCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = F5528DA31AC1033E000EF7AD /* ReplaceDeleteFromTextNodeCommand.h */; };
- F5528DA61AC1033E000EF7AD /* ReplaceDeleteFromTextNodeCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5528DA41AC1033E000EF7AD /* ReplaceDeleteFromTextNodeCommand.cpp */; };
- F5528DA91AC109DF000EF7AD /* ReplaceInsertIntoTextNodeCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5528DA71AC109DF000EF7AD /* ReplaceInsertIntoTextNodeCommand.cpp */; };
- F5528DAA1AC109DF000EF7AD /* ReplaceInsertIntoTextNodeCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = F5528DA81AC109DF000EF7AD /* ReplaceInsertIntoTextNodeCommand.h */; };
</del><span class="cx"> F55B3DAD1251F12D003EF269 /* BaseTextInputType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F55B3D791251F12D003EF269 /* BaseTextInputType.cpp */; };
</span><span class="cx"> F55B3DAE1251F12D003EF269 /* BaseTextInputType.h in Headers */ = {isa = PBXBuildFile; fileRef = F55B3D7A1251F12D003EF269 /* BaseTextInputType.h */; };
</span><span class="cx"> F55B3DAF1251F12D003EF269 /* ButtonInputType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F55B3D7B1251F12D003EF269 /* ButtonInputType.cpp */; };
</span><span class="lines">@@ -10505,7 +10500,6 @@
</span><span class="cx"> 9001773F12E0347800648462 /* OESStandardDerivatives.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OESStandardDerivatives.idl; path = canvas/OESStandardDerivatives.idl; sourceTree = "<group>"; };
</span><span class="cx"> 9001787E12E0370700648462 /* JSOESStandardDerivatives.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOESStandardDerivatives.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9001787F12E0370700648462 /* JSOESStandardDerivatives.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOESStandardDerivatives.h; sourceTree = "<group>"; };
</span><del>- 91C9F2F81AE3BE240095B61C /* AXTextStateChangeIntent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AXTextStateChangeIntent.h; sourceTree = "<group>"; };
</del><span class="cx"> 9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageGroup.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9302B0BE0D79F82C00C7EE83 /* PageGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageGroup.h; sourceTree = "<group>"; };
</span><span class="cx"> 9305B24C098F1B6B00C28855 /* Timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Timer.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -14046,10 +14040,6 @@
</span><span class="cx"> F52AD5E31534245F0059FBE6 /* EmptyClients.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmptyClients.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F544F78615CFB2A800AF33A8 /* PlatformLocale.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformLocale.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F544F78715CFB2A800AF33A8 /* PlatformLocale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformLocale.h; sourceTree = "<group>"; };
</span><del>- F5528DA31AC1033E000EF7AD /* ReplaceDeleteFromTextNodeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReplaceDeleteFromTextNodeCommand.h; sourceTree = "<group>"; };
- F5528DA41AC1033E000EF7AD /* ReplaceDeleteFromTextNodeCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReplaceDeleteFromTextNodeCommand.cpp; sourceTree = "<group>"; };
- F5528DA71AC109DF000EF7AD /* ReplaceInsertIntoTextNodeCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReplaceInsertIntoTextNodeCommand.cpp; sourceTree = "<group>"; };
- F5528DA81AC109DF000EF7AD /* ReplaceInsertIntoTextNodeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReplaceInsertIntoTextNodeCommand.h; sourceTree = "<group>"; };
</del><span class="cx"> F55B3D791251F12D003EF269 /* BaseTextInputType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseTextInputType.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F55B3D7A1251F12D003EF269 /* BaseTextInputType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseTextInputType.h; sourceTree = "<group>"; };
</span><span class="cx"> F55B3D7B1251F12D003EF269 /* ButtonInputType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ButtonInputType.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -15671,7 +15661,6 @@
</span><span class="cx"> 29A812130FBB9C1D00510293 /* AccessibilityTableRow.h */,
</span><span class="cx"> 2981CAAF131822EC00D12F2A /* AXObjectCache.cpp */,
</span><span class="cx"> 29A8121A0FBB9C1D00510293 /* AXObjectCache.h */,
</span><del>- 91C9F2F81AE3BE240095B61C /* AXTextStateChangeIntent.h */,
</del><span class="cx"> );
</span><span class="cx"> path = accessibility;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -17805,10 +17794,6 @@
</span><span class="cx"> 93309DB8099E64910056E581 /* RemoveNodePreservingChildrenCommand.h */,
</span><span class="cx"> 9B32CDA813DF7FA900F34D13 /* RenderedPosition.cpp */,
</span><span class="cx"> 9B32CDA713DF7FA900F34D13 /* RenderedPosition.h */,
</span><del>- F5528DA41AC1033E000EF7AD /* ReplaceDeleteFromTextNodeCommand.cpp */,
- F5528DA31AC1033E000EF7AD /* ReplaceDeleteFromTextNodeCommand.h */,
- F5528DA71AC109DF000EF7AD /* ReplaceInsertIntoTextNodeCommand.cpp */,
- F5528DA81AC109DF000EF7AD /* ReplaceInsertIntoTextNodeCommand.h */,
</del><span class="cx"> A89CCC500F44E98100B5DA10 /* ReplaceNodeWithSpanCommand.cpp */,
</span><span class="cx"> A89CCC510F44E98100B5DA10 /* ReplaceNodeWithSpanCommand.h */,
</span><span class="cx"> 93309DBA099E64910056E581 /* ReplaceSelectionCommand.cpp */,
</span><span class="lines">@@ -23743,7 +23728,6 @@
</span><span class="cx"> 6C568CB119DAFEA000430CA2 /* MaskImageOperation.h in Headers */,
</span><span class="cx"> 0F580FAF149800D400FB5BD8 /* AnimationUtilities.h in Headers */,
</span><span class="cx"> 4A4F65721AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h in Headers */,
</span><del>- F5528DA51AC1033E000EF7AD /* ReplaceDeleteFromTextNodeCommand.h in Headers */,
</del><span class="cx"> 93309DD7099E64920056E581 /* AppendNodeCommand.h in Headers */,
</span><span class="cx"> 1A8F6BBD0DB55CDC001DB794 /* ApplicationCache.h in Headers */,
</span><span class="cx"> 1A8F6BBF0DB55CDC001DB794 /* ApplicationCacheGroup.h in Headers */,
</span><span class="lines">@@ -25669,7 +25653,6 @@
</span><span class="cx"> BC60DA3A0D2A302800B9918F /* JSXMLHttpRequestException.h in Headers */,
</span><span class="cx"> F916C48E0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h in Headers */,
</span><span class="cx"> BCDFD4960E30592F009D10AD /* JSXMLHttpRequestUpload.h in Headers */,
</span><del>- F5528DAA1AC109DF000EF7AD /* ReplaceInsertIntoTextNodeCommand.h in Headers */,
</del><span class="cx"> 1ACE53F70A8D19470022947D /* JSXMLSerializer.h in Headers */,
</span><span class="cx"> 1A762C740A074F2600989F5B /* JSXPathEvaluator.h in Headers */,
</span><span class="cx"> BC60DB4A0D2A3D1E00B9918F /* JSXPathException.h in Headers */,
</span><span class="lines">@@ -26723,7 +26706,6 @@
</span><span class="cx"> 7C4C96DD1AD4483500365A50 /* JSReadableStream.h in Headers */,
</span><span class="cx"> 83C1D428178D5AB400141E68 /* SVGPathSegCurvetoCubicRel.h in Headers */,
</span><span class="cx"> B2227A690D00BF220071B782 /* SVGPathSegCurvetoCubicSmooth.h in Headers */,
</span><del>- 91C9F2F91AE3BEB00095B61C /* AXTextStateChangeIntent.h in Headers */,
</del><span class="cx"> 83C1D429178D5AB400141E68 /* SVGPathSegCurvetoCubicSmoothAbs.h in Headers */,
</span><span class="cx"> 83C1D42A178D5AB400141E68 /* SVGPathSegCurvetoCubicSmoothRel.h in Headers */,
</span><span class="cx"> B2227A6D0D00BF220071B782 /* SVGPathSegCurvetoQuadratic.h in Headers */,
</span><span class="lines">@@ -28482,7 +28464,6 @@
</span><span class="cx"> 510192D118B6B9AB007FC7A1 /* ImageControlsRootElementMac.cpp in Sources */,
</span><span class="cx"> A77979190D6B9D0C003851B9 /* ImageData.cpp in Sources */,
</span><span class="cx"> 97205AB51239291000B17380 /* ImageDocument.cpp in Sources */,
</span><del>- F5528DA61AC1033E000EF7AD /* ReplaceDeleteFromTextNodeCommand.cpp in Sources */,
</del><span class="cx"> F55B3DC11251F12D003EF269 /* ImageInputType.cpp in Sources */,
</span><span class="cx"> 089582550E857A7E00F82C83 /* ImageLoader.cpp in Sources */,
</span><span class="cx"> B275357B0B053814002CE64F /* ImageMac.mm in Sources */,
</span><span class="lines">@@ -29930,7 +29911,6 @@
</span><span class="cx"> FE36FD1616C7826500F887C1 /* SQLTransactionStateMachine.cpp in Sources */,
</span><span class="cx"> 1A2E6E590CC55213004A2062 /* SQLValue.cpp in Sources */,
</span><span class="cx"> 4476531B133170990006B789 /* SSLKeyGeneratorIOS.cpp in Sources */,
</span><del>- F5528DA91AC109DF000EF7AD /* ReplaceInsertIntoTextNodeCommand.cpp in Sources */,
</del><span class="cx"> 93F19AE608245E59001E9ABC /* SSLKeyGeneratorMac.cpp in Sources */,
</span><span class="cx"> BC7FA62E0D1F0EFF00DB22A9 /* StaticNodeList.cpp in Sources */,
</span><span class="cx"> A5AFB34F115151A700B045CB /* StepRange.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009, 2010, 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008, 2009, 2010 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -90,9 +90,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-// Post value change notifications for password fields or elements contained in password fields at a 40hz interval to thwart analysis of typing cadence
-static double AccessibilityPasswordValueChangeNotificationInterval = 0.025;
-
</del><span class="cx"> AccessibilityObjectInclusion AXComputedObjectAttributeCache::getIgnored(AXID id) const
</span><span class="cx"> {
</span><span class="cx"> HashMap<AXID, CachedAXObjectAttributes>::const_iterator it = m_idMapping.find(id);
</span><span class="lines">@@ -132,7 +129,6 @@
</span><span class="cx"> AXObjectCache::AXObjectCache(Document& document)
</span><span class="cx"> : m_document(document)
</span><span class="cx"> , m_notificationPostTimer(*this, &AXObjectCache::notificationPostTimerFired)
</span><del>- , m_passwordNotificationPostTimer(*this, &AXObjectCache::passwordNotificationPostTimerFired)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -709,7 +705,7 @@
</span><span class="cx"> Ref<Document> protectorForCacheOwner(m_document);
</span><span class="cx"> m_notificationPostTimer.stop();
</span><span class="cx">
</span><del>- // In tests, posting notifications has a tendency to immediately queue up other notifications, which can lead to unexpected behavior
</del><ins>+ // In DRT, posting notifications has a tendency to immediately queue up other notifications, which can lead to unexpected behavior
</ins><span class="cx"> // when the notification list is cleared at the end. Instead copy this list at the start.
</span><span class="cx"> auto notifications = WTF::move(m_notificationsToPost);
</span><span class="cx">
</span><span class="lines">@@ -746,20 +742,6 @@
</span><span class="cx"> childrenChanged(obj->parentObject());
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
-void AXObjectCache::passwordNotificationPostTimerFired()
-{
-#if PLATFORM(COCOA)
- m_passwordNotificationPostTimer.stop();
-
- // In tests, posting notifications has a tendency to immediately queue up other notifications, which can lead to unexpected behavior
- // when the notification list is cleared at the end. Instead copy this list at the start.
- auto notifications = WTF::move(m_passwordNotificationsToPost);
-
- for (const auto& notification : notifications)
- postTextStateChangePlatformNotification(notification.get(), AXTextEditTypeInsert, " ", VisiblePosition());
-#endif
-}
</del><span class="cx">
</span><span class="cx"> void AXObjectCache::postNotification(RenderObject* renderer, AXNotification notification, PostTarget postTarget, PostType postType)
</span><span class="cx"> {
</span><span class="lines">@@ -868,225 +850,18 @@
</span><span class="cx"> postNotification(renderer, AXSelectedChildrenChanged, TargetObservableParent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
-void AXObjectCache::showIntent(const AXTextStateChangeIntent &intent)
</del><ins>+void AXObjectCache::nodeTextChangeNotification(Node* node, AXTextChange textChange, unsigned offset, const String& text)
</ins><span class="cx"> {
</span><del>- switch (intent.type) {
- case AXTextStateChangeTypeUnknown:
- dataLog("Unknown");
- break;
- case AXTextStateChangeTypeEdit:
- dataLog("Edit::");
- break;
- case AXTextStateChangeTypeSelectionMove:
- dataLog("Move::");
- break;
- case AXTextStateChangeTypeSelectionExtend:
- dataLog("Extend::");
- break;
- }
- switch (intent.type) {
- case AXTextStateChangeTypeUnknown:
- break;
- case AXTextStateChangeTypeEdit:
- switch (intent.change) {
- case AXTextEditTypeUnknown:
- dataLog("Unknown");
- break;
- case AXTextEditTypeDelete:
- dataLog("Delete");
- break;
- case AXTextEditTypeInsert:
- dataLog("Insert");
- break;
- case AXTextEditTypeDictation:
- dataLog("DictationInsert");
- break;
- case AXTextEditTypeTyping:
- dataLog("TypingInsert");
- break;
- case AXTextEditTypeCut:
- dataLog("Cut");
- break;
- case AXTextEditTypePaste:
- dataLog("Paste");
- break;
- }
- break;
- case AXTextStateChangeTypeSelectionMove:
- case AXTextStateChangeTypeSelectionExtend:
- switch (intent.selection.direction) {
- case AXTextSelectionDirectionUnknown:
- dataLog("Unknown::");
- break;
- case AXTextSelectionDirectionBeginning:
- dataLog("Beginning::");
- break;
- case AXTextSelectionDirectionEnd:
- dataLog("End::");
- break;
- case AXTextSelectionDirectionPrevious:
- dataLog("Previous::");
- break;
- case AXTextSelectionDirectionNext:
- dataLog("Next::");
- break;
- case AXTextSelectionDirectionDiscontiguous:
- dataLog("Discontiguous::");
- break;
- }
- switch (intent.selection.direction) {
- case AXTextSelectionDirectionUnknown:
- case AXTextSelectionDirectionBeginning:
- case AXTextSelectionDirectionEnd:
- case AXTextSelectionDirectionPrevious:
- case AXTextSelectionDirectionNext:
- switch (intent.selection.granularity) {
- case AXTextSelectionGranularityUnknown:
- dataLog("Unknown");
- break;
- case AXTextSelectionGranularityCharacter:
- dataLog("Character");
- break;
- case AXTextSelectionGranularityWord:
- dataLog("Word");
- break;
- case AXTextSelectionGranularityLine:
- dataLog("Line");
- break;
- case AXTextSelectionGranularitySentence:
- dataLog("Sentence");
- break;
- case AXTextSelectionGranularityParagraph:
- dataLog("Paragraph");
- break;
- case AXTextSelectionGranularityPage:
- dataLog("Page");
- break;
- case AXTextSelectionGranularityDocument:
- dataLog("Document");
- break;
- case AXTextSelectionGranularityAll:
- dataLog("All");
- break;
- }
- break;
- case AXTextSelectionDirectionDiscontiguous:
- break;
- }
- break;
- }
- if (intent.isSynchronizing)
- dataLog("-Sync");
- dataLog("\n");
-}
-#endif
-
-void AXObjectCache::setTextSelectionIntent(AXTextStateChangeIntent intent)
-{
- m_textSelectionIntent = intent;
-}
-
-static bool isPasswordFieldOrContainedByPasswordField(AccessibilityObject* object)
-{
- return object && (object->isPasswordField() || object->isContainedByPasswordField());
-}
-
-void AXObjectCache::postTextStateChangeNotification(Node* node, AXTextStateChangeIntent intent, const VisibleSelection& selection)
-{
</del><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
- if (intent.type == AXTextStateChangeTypeUnknown)
- intent = m_textSelectionIntent;
-
</del><span class="cx"> stopCachingComputedObjectAttributes();
</span><span class="cx">
</span><del>- AccessibilityObject* object = getOrCreate(node);
- if (object) {
- if (isPasswordFieldOrContainedByPasswordField(object))
- return;
- object = object->observableObject();
- }
-
- postTextStateChangePlatformNotification(object, intent, selection);
-#else
- postNotification(node->renderer(), AXObjectCache::AXSelectedTextChanged, TargetObservableParent);
- UNUSED_PARAM(intent);
- UNUSED_PARAM(selection);
-#endif
-
- setTextSelectionIntent(AXTextStateChangeIntent());
</del><ins>+ // Delegate on the right platform
+ AccessibilityObject* obj = getOrCreate(node);
+ nodeTextChangePlatformNotification(obj, textChange, offset, text);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void AXObjectCache::postTextStateChangeNotification(Node* node, AXTextEditType type, const String& text, const VisiblePosition& position)
-{
- if (!node)
- return;
- ASSERT(type != AXTextEditTypeUnknown);
-
- stopCachingComputedObjectAttributes();
-
- AccessibilityObject* object = getOrCreate(node);
-#if PLATFORM(COCOA)
- if (object) {
- if (enqueuePasswordValueChangeNotification(object))
- return;
- object = object->observableObject();
- }
-
- postTextStateChangePlatformNotification(object, type, text, position);
-#else
- nodeTextChangePlatformNotification(object, textChangeForEditType(type), position.deepEquivalent().deprecatedEditingOffset(), text);
-#endif
-}
-
-void AXObjectCache::postTextReplacementNotification(Node* node, AXTextEditType deletionType, const String& deletedText, AXTextEditType insertionType, const String& insertedText, const VisiblePosition& position)
-{
- if (!node)
- return;
- ASSERT(deletionType == AXTextEditTypeDelete);
- ASSERT(insertionType == AXTextEditTypeInsert || insertionType == AXTextEditTypeTyping || insertionType == AXTextEditTypeDictation || insertionType == AXTextEditTypePaste);
-
- stopCachingComputedObjectAttributes();
-
- AccessibilityObject* object = getOrCreate(node);
-#if PLATFORM(COCOA)
- if (object) {
- if (enqueuePasswordValueChangeNotification(object))
- return;
- object = object->observableObject();
- }
-
- postTextReplacementPlatformNotification(object, deletionType, deletedText, insertionType, insertedText, position);
-#else
- nodeTextChangePlatformNotification(object, textChangeForEditType(deletionType), position.deepEquivalent().deprecatedEditingOffset(), deletedText);
- nodeTextChangePlatformNotification(object, textChangeForEditType(insertionType), position.deepEquivalent().deprecatedEditingOffset(), insertedText);
-#endif
-}
-
-bool AXObjectCache::enqueuePasswordValueChangeNotification(AccessibilityObject* object)
-{
- if (!isPasswordFieldOrContainedByPasswordField(object))
- return false;
-
- AccessibilityObject* observableObject = object->observableObject();
- if (!observableObject) {
- ASSERT_NOT_REACHED();
- // return true even though the enqueue didn't happen because this is a password field and caller shouldn't post a notification
- return true;
- }
-
- if (!m_passwordNotificationsToPost.contains(observableObject)) {
- m_passwordNotificationsToPost.append(observableObject);
- if (!m_passwordNotificationPostTimer.isActive())
- m_passwordNotificationPostTimer.startOneShot(AccessibilityPasswordValueChangeNotificationInterval);
- }
-
- return true;
-}
-
</del><span class="cx"> void AXObjectCache::frameLoadingEventNotification(Frame* frame, AXLoadingEvent loadingEvent)
</span><span class="cx"> {
</span><span class="cx"> if (!frame)
</span><span class="lines">@@ -1309,14 +1084,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AccessibilityObject* AXObjectCache::rootWebArea()
-{
- AccessibilityObject* rootObject = this->rootObject();
- if (!rootObject || !rootObject->isAccessibilityScrollView())
- return nullptr;
- return downcast<AccessibilityScrollView>(*rootObject).webAreaObject();
-}
-
</del><span class="cx"> AXAttributeCacheEnabler::AXAttributeCacheEnabler(AXObjectCache* cache)
</span><span class="cx"> : m_cache(cache)
</span><span class="cx"> {
</span><span class="lines">@@ -1329,26 +1096,6 @@
</span><span class="cx"> if (m_cache)
</span><span class="cx"> m_cache->stopCachingComputedObjectAttributes();
</span><span class="cx"> }
</span><del>-
-#if !PLATFORM(COCOA)
-AXTextChange AXObjectCache::textChangeForEditType(AXTextEditType type)
-{
- switch (type) {
- case AXTextEditTypeCut:
- case AXTextEditTypeDelete:
- return AXTextDeleted;
- case AXTextEditTypeInsert:
- case AXTextEditTypeDictation:
- case AXTextEditTypeTyping:
- case AXTextEditTypePaste:
- return AXTextInserted;
- case AXTextEditTypeUnknown:
- break;
- }
- ASSERT_NOT_REACHED();
- return AXTextInserted;
-}
-#endif
</del><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2010, 2011, 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #ifndef AXObjectCache_h
</span><span class="cx"> #define AXObjectCache_h
</span><span class="cx">
</span><del>-#include "AXTextStateChangeIntent.h"
</del><span class="cx"> #include "AccessibilityObject.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <limits.h>
</span><span class="lines">@@ -68,10 +67,6 @@
</span><span class="cx"> HashMap<AXID, CachedAXObjectAttributes> m_idMapping;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if !PLATFORM(COCOA)
-enum AXTextChange { AXTextInserted, AXTextDeleted };
-#endif
-
</del><span class="cx"> enum PostTarget { TargetElement, TargetObservableParent };
</span><span class="cx">
</span><span class="cx"> enum PostType { PostSynchronously, PostAsynchronously };
</span><span class="lines">@@ -194,16 +189,13 @@
</span><span class="cx"> void postNotification(Node*, AXNotification, PostTarget = TargetElement, PostType = PostAsynchronously);
</span><span class="cx"> void postNotification(AccessibilityObject*, Document*, AXNotification, PostTarget = TargetElement, PostType = PostAsynchronously);
</span><span class="cx">
</span><del>-#ifndef NDEBUG
- void showIntent(const AXTextStateChangeIntent&);
-#endif
</del><ins>+ enum AXTextChange {
+ AXTextInserted,
+ AXTextDeleted,
+ };
</ins><span class="cx">
</span><del>- void setTextSelectionIntent(AXTextStateChangeIntent);
</del><ins>+ void nodeTextChangeNotification(Node*, AXTextChange, unsigned offset, const String&);
</ins><span class="cx">
</span><del>- void postTextStateChangeNotification(Node*, AXTextEditType, const String&, const VisiblePosition&);
- void postTextReplacementNotification(Node*, AXTextEditType deletionType, const String& deletedText, AXTextEditType insertionType, const String& insertedText, const VisiblePosition&);
- void postTextStateChangeNotification(Node*, AXTextStateChangeIntent, const VisibleSelection&);
-
</del><span class="cx"> enum AXLoadingEvent {
</span><span class="cx"> AXLoadingStarted,
</span><span class="cx"> AXLoadingReloaded,
</span><span class="lines">@@ -221,24 +213,12 @@
</span><span class="cx"> AXComputedObjectAttributeCache* computedObjectAttributeCache() { return m_computedObjectAttributeCache.get(); }
</span><span class="cx">
</span><span class="cx"> Document& document() const { return m_document; }
</span><del>-
-#if PLATFORM(MAC)
- static void setShouldRepostNotificationsForTests(bool value);
-#endif
-
</del><ins>+
</ins><span class="cx"> protected:
</span><span class="cx"> void postPlatformNotification(AccessibilityObject*, AXNotification);
</span><span class="cx"> void platformHandleFocusedUIElementChanged(Node* oldFocusedNode, Node* newFocusedNode);
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
- void postTextStateChangePlatformNotification(AccessibilityObject*, AXTextStateChangeIntent, const VisibleSelection&);
- void postTextStateChangePlatformNotification(AccessibilityObject*, AXTextEditType, const String&, const VisiblePosition&);
- void postTextReplacementPlatformNotification(AccessibilityObject*, AXTextEditType, const String&, AXTextEditType, const String&, const VisiblePosition&);
-#else
- static AXTextChange textChangeForEditType(AXTextEditType);
- void nodeTextChangePlatformNotification(AccessibilityObject*, AXTextChange, unsigned, const String&);
-#endif
-
</del><ins>+ void nodeTextChangePlatformNotification(AccessibilityObject*, AXTextChange, unsigned offset, const String&);
</ins><span class="cx"> void frameLoadingEventPlatformNotification(AccessibilityObject*, AXLoadingEvent);
</span><span class="cx"> void textChanged(AccessibilityObject*);
</span><span class="cx"> void labelChanged(Element*);
</span><span class="lines">@@ -249,8 +229,6 @@
</span><span class="cx"> bool isNodeInUse(Node* n) { return m_textMarkerNodes.contains(n); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- AccessibilityObject* rootWebArea();
-
</del><span class="cx"> Document& m_document;
</span><span class="cx"> HashMap<AXID, RefPtr<AccessibilityObject>> m_objects;
</span><span class="cx"> HashMap<RenderObject*, AXID> m_renderObjectMapping;
</span><span class="lines">@@ -266,11 +244,6 @@
</span><span class="cx"> Timer m_notificationPostTimer;
</span><span class="cx"> Vector<std::pair<RefPtr<AccessibilityObject>, AXNotification>> m_notificationsToPost;
</span><span class="cx"> void notificationPostTimerFired();
</span><del>-
- Timer m_passwordNotificationPostTimer;
- Vector<RefPtr<AccessibilityObject>> m_passwordNotificationsToPost;
- void passwordNotificationPostTimerFired();
-
</del><span class="cx"> void handleMenuOpened(Node*);
</span><span class="cx"> void handleLiveRegionCreated(Node*);
</span><span class="cx"> void handleMenuItemSelected(Node*);
</span><span class="lines">@@ -278,10 +251,6 @@
</span><span class="cx"> static AccessibilityObject* focusedImageMapUIElement(HTMLAreaElement*);
</span><span class="cx">
</span><span class="cx"> AXID getAXID(AccessibilityObject*);
</span><del>-
- bool enqueuePasswordValueChangeNotification(AccessibilityObject*);
-
- AXTextStateChangeIntent m_textSelectionIntent;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class AXAttributeCacheEnabler
</span><span class="lines">@@ -339,9 +308,8 @@
</span><span class="cx"> inline void AXObjectCache::handleAttributeChanged(const QualifiedName&, Element*) { }
</span><span class="cx"> inline void AXObjectCache::recomputeIsIgnored(RenderObject*) { }
</span><span class="cx"> inline void AXObjectCache::handleScrolledToAnchor(const Node*) { }
</span><del>-inline void AXObjectCache::postTextStateChangeNotification(Node*, AXTextStateChangeIntent, const VisibleSelection&) { }
-inline void AXObjectCache::postTextStateChangeNotification(Node*, AXTextEditType, const String&, const VisiblePosition&) { }
-inline void AXObjectCache::postTextReplacementNotification(Node*, AXTextEditType, const String&, AXTextEditType, const String&, const VisiblePosition&) { }
</del><ins>+inline void AXObjectCache::nodeTextChangeNotification(Node*, AXTextChange, unsigned, const String&) { }
+inline void AXObjectCache::nodeTextChangePlatformNotification(AccessibilityObject*, AXTextChange, unsigned, const String&) { }
</ins><span class="cx"> inline void AXObjectCache::postNotification(AccessibilityObject*, Document*, AXNotification, PostTarget, PostType) { }
</span><span class="cx"> inline void AXObjectCache::postNotification(RenderObject*, AXNotification, PostTarget, PostType) { }
</span><span class="cx"> inline void AXObjectCache::postNotification(Node*, AXNotification, PostTarget, PostType) { }
</span><span class="lines">@@ -352,15 +320,7 @@
</span><span class="cx"> inline void AXObjectCache::remove(Widget*) { }
</span><span class="cx"> inline void AXObjectCache::selectedChildrenChanged(RenderObject*) { }
</span><span class="cx"> inline void AXObjectCache::selectedChildrenChanged(Node*) { }
</span><del>-#if PLATFORM(COCOA)
-inline void AXObjectCache::postTextStateChangePlatformNotification(AccessibilityObject*, AXTextStateChangeIntent, const VisibleSelection&) { }
-inline void AXObjectCache::postTextStateChangePlatformNotification(AccessibilityObject*, AXTextEditType, const String&, const VisiblePosition&) { }
-inline void AXObjectCache::postTextReplacementPlatformNotification(AccessibilityObject*, AXTextEditType, const String&, AXTextEditType, const String&, const VisiblePosition&) { }
-#else
-inline AXTextChange AXObjectCache::textChangeForEditType(AXTextEditType) { return AXTextInserted; }
-inline void AXObjectCache::nodeTextChangePlatformNotification(AccessibilityObject*, AXTextChange, unsigned, const String&) { }
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXTextStateChangeIntenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/accessibility/AXTextStateChangeIntent.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXTextStateChangeIntent.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/AXTextStateChangeIntent.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,103 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef AXTextStateChangeIntent_h
-#define AXTextStateChangeIntent_h
-
-namespace WebCore {
-
-enum AXTextStateChangeType {
- AXTextStateChangeTypeUnknown,
- AXTextStateChangeTypeEdit,
- AXTextStateChangeTypeSelectionMove,
- AXTextStateChangeTypeSelectionExtend
-};
-
-enum AXTextEditType {
- AXTextEditTypeUnknown,
- AXTextEditTypeDelete, // Generic text delete
- AXTextEditTypeInsert, // Generic text insert
- AXTextEditTypeTyping, // Insert via typing
- AXTextEditTypeDictation, // Insert via dictation
- AXTextEditTypeCut, // Delete via Cut
- AXTextEditTypePaste // Insert via Paste
-};
-
-enum AXTextSelectionDirection {
- AXTextSelectionDirectionUnknown,
- AXTextSelectionDirectionBeginning,
- AXTextSelectionDirectionEnd,
- AXTextSelectionDirectionPrevious,
- AXTextSelectionDirectionNext,
- AXTextSelectionDirectionDiscontiguous
-};
-
-enum AXTextSelectionGranularity {
- AXTextSelectionGranularityUnknown,
- AXTextSelectionGranularityCharacter,
- AXTextSelectionGranularityWord,
- AXTextSelectionGranularityLine,
- AXTextSelectionGranularitySentence,
- AXTextSelectionGranularityParagraph,
- AXTextSelectionGranularityPage,
- AXTextSelectionGranularityDocument,
- AXTextSelectionGranularityAll // All granularity represents the action of selecting the whole document as a single action. Extending selection by some other granularity until it encompasses the whole document will not result in a all granularity notification.
-};
-
-struct AXTextSelection {
- AXTextSelectionDirection direction;
- AXTextSelectionGranularity granularity;
-};
-
-struct AXTextStateChangeIntent {
- AXTextStateChangeType type;
- union {
- AXTextSelection selection;
- AXTextEditType change;
- };
- bool isSynchronizing { false };
-
- AXTextStateChangeIntent(AXTextStateChangeType type = AXTextStateChangeTypeUnknown, AXTextSelection selection = AXTextSelection())
- : type(type)
- , selection(selection)
- { }
-
- AXTextStateChangeIntent(AXTextEditType change)
- : type(AXTextStateChangeTypeEdit)
- , change(change)
- { }
-
- AXTextStateChangeIntent(AXTextStateChangeType type, bool isSynchronizing)
- : type(type)
- , selection()
- , isSynchronizing(isSynchronizing)
- {
- ASSERT(type == AXTextStateChangeTypeSelectionMove || type == AXTextStateChangeTypeSelectionExtend);
- }
-};
-
-}
-
-#endif // AXTextStateChangeIntent_h
</del></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -552,27 +552,6 @@
</span><span class="cx"> return inputElement->isPasswordField();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AccessibilityObject* AccessibilityNodeObject::passwordFieldOrContainingPasswordField()
-{
- Node* node = this->node();
- if (!node)
- return nullptr;
-
- if (HTMLInputElement* inputElement = node->toInputElement()) {
- if (inputElement->isPasswordField())
- return this;
- }
-
- Element* element = node->shadowHost();
- if (!element || !is<HTMLInputElement>(element))
- return nullptr;
-
- if (AXObjectCache* cache = axObjectCache())
- return cache->getOrCreate(element);
-
- return nullptr;
-}
-
</del><span class="cx"> bool AccessibilityNodeObject::isInputImage() const
</span><span class="cx"> {
</span><span class="cx"> Node* node = this->node();
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -88,7 +88,6 @@
</span><span class="cx"> virtual bool isNativeImage() const override;
</span><span class="cx"> virtual bool isNativeTextControl() const override;
</span><span class="cx"> virtual bool isPasswordField() const override;
</span><del>- virtual AccessibilityObject* passwordFieldOrContainingPasswordField() override;
</del><span class="cx"> virtual bool isProgressIndicator() const override;
</span><span class="cx"> virtual bool isSearchField() const override;
</span><span class="cx"> virtual bool isSlider() const override;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -2646,17 +2646,4 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-bool AccessibilityObject::isContainedByPasswordField() const
-{
- Node* node = this->node();
- if (!node)
- return false;
-
- if (ariaRoleAttribute() != UnknownRole)
- return false;
-
- Element* element = node->shadowHost();
- return is<HTMLInputElement>(element) && downcast<HTMLInputElement>(*element).isPasswordField();
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -463,8 +463,6 @@
</span><span class="cx"> virtual bool isNativeImage() const { return false; }
</span><span class="cx"> virtual bool isImageButton() const { return false; }
</span><span class="cx"> virtual bool isPasswordField() const { return false; }
</span><del>- bool isContainedByPasswordField() const;
- virtual AccessibilityObject* passwordFieldOrContainingPasswordField() { return nullptr; }
</del><span class="cx"> virtual bool isNativeTextControl() const { return false; }
</span><span class="cx"> virtual bool isSearchField() const { return false; }
</span><span class="cx"> bool isWebArea() const { return roleValue() == WebAreaRole; }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1491,17 +1491,14 @@
</span><span class="cx"> void AccessibilityRenderObject::setSelectedTextRange(const PlainTextRange& range)
</span><span class="cx"> {
</span><span class="cx"> if (isNativeTextControl()) {
</span><del>- if (AXObjectCache* cache = axObjectCache())
- cache->setTextSelectionIntent(AXTextStateChangeIntent(range.length ? AXTextStateChangeTypeSelectionExtend : AXTextStateChangeTypeSelectionMove, true));
</del><span class="cx"> HTMLTextFormControlElement& textControl = downcast<RenderTextControl>(*m_renderer).textFormControlElement();
</span><span class="cx"> textControl.setSelectionRange(range.start, range.start + range.length);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* node = m_renderer->node();
</span><del>- VisibleSelection newSelection(Position(node, range.start, Position::PositionIsOffsetInAnchor), Position(node, range.start + range.length, Position::PositionIsOffsetInAnchor), DOWNSTREAM);
- AXTextStateChangeIntent newIntent(range.length ? AXTextStateChangeTypeSelectionExtend : AXTextStateChangeTypeSelectionMove, true);
- m_renderer->frame().selection().setSelection(newSelection, FrameSelection::defaultSetSelectionOptions(), newIntent);
</del><ins>+ m_renderer->frame().selection().setSelection(VisibleSelection(Position(node, range.start, Position::PositionIsOffsetInAnchor),
+ Position(node, range.start + range.length, Position::PositionIsOffsetInAnchor), DOWNSTREAM));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> URL AccessibilityRenderObject::url() const
</span><span class="lines">@@ -1966,16 +1963,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (range.start.isNull() || range.end.isNull())
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> // make selection and tell the document to use it. if it's zero length, then move to that position
</span><del>- if (range.start == range.end) {
- if (AXObjectCache* cache = axObjectCache())
- cache->setTextSelectionIntent(AXTextStateChangeIntent(AXTextStateChangeTypeSelectionMove, true));
</del><ins>+ if (range.start == range.end)
</ins><span class="cx"> m_renderer->frame().selection().moveTo(range.start, UserTriggered);
</span><del>- }
</del><span class="cx"> else {
</span><span class="cx"> VisibleSelection newSelection = VisibleSelection(range.start, range.end);
</span><del>- m_renderer->frame().selection().setSelection(newSelection, FrameSelection::defaultSetSelectionOptions(), AXTextStateChangeIntent(AXTextStateChangeTypeSelectionExtend, true));
</del><ins>+ m_renderer->frame().selection().setSelection(newSelection);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityScrollView.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityScrollView.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/AccessibilityScrollView.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -43,8 +43,6 @@
</span><span class="cx"> virtual ~AccessibilityScrollView();
</span><span class="cx"> virtual void detach(AccessibilityDetachmentType, AXObjectCache*) override;
</span><span class="cx">
</span><del>- AccessibilityObject* webAreaObject() const;
-
</del><span class="cx"> private:
</span><span class="cx"> explicit AccessibilityScrollView(ScrollView*);
</span><span class="cx">
</span><span class="lines">@@ -73,6 +71,7 @@
</span><span class="cx"> virtual AccessibilityObject* parentObject() const override;
</span><span class="cx"> virtual AccessibilityObject* parentObjectIfExists() const override;
</span><span class="cx">
</span><ins>+ AccessibilityObject* webAreaObject() const;
</ins><span class="cx"> virtual AccessibilityObject* firstChild() const override { return webAreaObject(); }
</span><span class="cx"> AccessibilityScrollbar* addChildScrollbar(Scrollbar*);
</span><span class="cx"> void removeChildScrollbar(AccessibilityObject*);
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkAXObjectCacheAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -268,10 +268,10 @@
</span><span class="cx"> // Select the right signal to be emitted
</span><span class="cx"> CString detail;
</span><span class="cx"> switch (textChange) {
</span><del>- case AXTextInserted:
</del><ins>+ case AXObjectCache::AXTextInserted:
</ins><span class="cx"> detail = "text-insert";
</span><span class="cx"> break;
</span><del>- case AXTextDeleted:
</del><ins>+ case AXObjectCache::AXTextDeleted:
</ins><span class="cx"> detail = "text-remove";
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosAXObjectCacheIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -95,21 +95,10 @@
</span><span class="cx"> [obj->wrapper() accessibilityPostedNotification:notificationString];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AXObjectCache::postTextStateChangePlatformNotification(AccessibilityObject* object, AXTextStateChangeIntent, const VisibleSelection&)
</del><ins>+void AXObjectCache::nodeTextChangePlatformNotification(AccessibilityObject*, AXTextChange, unsigned, const String&)
</ins><span class="cx"> {
</span><del>- postPlatformNotification(object, AXSelectedTextChanged);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void AXObjectCache::postTextStateChangePlatformNotification(AccessibilityObject* object, AXTextEditType, const String&, const VisiblePosition&)
-{
- postPlatformNotification(object, AXValueChanged);
-}
-
-void AXObjectCache::postTextReplacementPlatformNotification(AccessibilityObject* object, AXTextEditType, const String&, AXTextEditType, const String&, const VisiblePosition&)
-{
- postPlatformNotification(object, AXValueChanged);
-}
-
</del><span class="cx"> void AXObjectCache::frameLoadingEventPlatformNotification(AccessibilityObject* axFrameObject, AXLoadingEvent loadingEvent)
</span><span class="cx"> {
</span><span class="cx"> if (!axFrameObject)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacAXObjectCacheMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -44,53 +44,6 @@
</span><span class="cx"> #define NSAccessibilityLiveRegionCreatedNotification @"AXLiveRegionCreated"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#ifndef NSAccessibilityTextStateChangeTypeKey
-#define NSAccessibilityTextStateChangeTypeKey @"AXTextStateChangeType"
-#endif
-
-#ifndef NSAccessibilityTextStateSyncKey
-#define NSAccessibilityTextStateSyncKey @"AXTextStateSync"
-#endif
-
-#ifndef NSAccessibilityTextSelectionDirection
-#define NSAccessibilityTextSelectionDirection @"AXTextSelectionDirection"
-#endif
-
-#ifndef NSAccessibilityTextSelectionGranularity
-#define NSAccessibilityTextSelectionGranularity @"AXTextSelectionGranularity"
-#endif
-
-#ifndef NSAccessibilityTextEditType
-#define NSAccessibilityTextEditType @"AXTextEditType"
-#endif
-
-#ifndef NSAccessibilityTextChangeValues
-#define NSAccessibilityTextChangeValues @"AXTextChangeValues"
-#endif
-
-#ifndef NSAccessibilityTextChangeValue
-#define NSAccessibilityTextChangeValue @"AXTextChangeValue"
-#endif
-
-#ifndef NSAccessibilityTextChangeValueLength
-#define NSAccessibilityTextChangeValueLength @"AXTextChangeValueLength"
-#endif
-
-#ifndef NSAccessibilityTextChangeValueStartMarker
-#define NSAccessibilityTextChangeValueStartMarker @"AXTextChangeValueStartMarker"
-#endif
-
-#ifndef NSAccessibilityTextChangeElement
-#define NSAccessibilityTextChangeElement @"AXTextChangeElement"
-#endif
-
-#ifndef NSAccessibilitySelectedTextMarkerRangeAttribute
-#define NSAccessibilitySelectedTextMarkerRangeAttribute @"AXSelectedTextMarkerRange"
-#endif
-
-// 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.
-static const NSUInteger AXValueChangeTruncationLength = 1000;
-
</del><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">@@ -107,21 +60,6 @@
</span><span class="cx"> obj->setWrapper(wrapper.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static BOOL axShouldRepostNotificationsForTests = false;
-
-void AXObjectCache::setShouldRepostNotificationsForTests(bool value)
-{
- axShouldRepostNotificationsForTests = value;
-}
-
-static void AXPostNotificationWithUserInfo(id object, NSString *notification, id userInfo)
-{
- NSAccessibilityPostNotificationWithUserInfo(object, notification, userInfo);
- // To simplify monitoring for notifications in tests, repost as a simple NSNotification instead of forcing test infrastucture to setup an IPC client and do all the translation between WebCore types and platform specific IPC types and back
- if (UNLIKELY(axShouldRepostNotificationsForTests))
- [object accessibilityPostedNotification:notification userInfo:userInfo];
-}
-
</del><span class="cx"> void AXObjectCache::postPlatformNotification(AccessibilityObject* obj, AXNotification notification)
</span><span class="cx"> {
</span><span class="cx"> if (!obj)
</span><span class="lines">@@ -211,133 +149,17 @@
</span><span class="cx"> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><span class="cx"> ASSERT([obj->wrapper() accessibilityIsIgnored] || true);
</span><span class="cx"> #pragma clang diagnostic pop
</span><del>-
- AXPostNotificationWithUserInfo(obj->wrapper(), macNotification, nil);
</del><ins>+
+ NSAccessibilityPostNotification(obj->wrapper(), macNotification);
+
+ // Used by DRT to know when notifications are posted.
+ [obj->wrapper() accessibilityPostedNotification:macNotification];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void AXObjectCache::postTextStateChangePlatformNotification(AccessibilityObject* object, AXTextStateChangeIntent intent, const VisibleSelection& selection)
</del><ins>+void AXObjectCache::nodeTextChangePlatformNotification(AccessibilityObject*, AXTextChange, unsigned, const String&)
</ins><span class="cx"> {
</span><del>- if (!object)
- object = rootWebArea();
-
- if (!object)
- return;
-
- NSMutableDictionary *userInfo = [[NSMutableDictionary alloc] initWithCapacity:5];
- if (intent.isSynchronizing)
- userInfo[NSAccessibilityTextStateSyncKey] = @YES;
- if (intent.type != AXTextStateChangeTypeUnknown) {
- userInfo[NSAccessibilityTextStateChangeTypeKey] = @(intent.type);
- switch (intent.type) {
- case AXTextStateChangeTypeSelectionMove:
- case AXTextStateChangeTypeSelectionExtend:
- userInfo[NSAccessibilityTextSelectionDirection] = @(intent.selection.direction);
- switch (intent.selection.direction) {
- case AXTextSelectionDirectionUnknown:
- break;
- case AXTextSelectionDirectionBeginning:
- case AXTextSelectionDirectionEnd:
- case AXTextSelectionDirectionPrevious:
- case AXTextSelectionDirectionNext:
- userInfo[NSAccessibilityTextSelectionGranularity] = @(intent.selection.granularity);
- break;
- case AXTextSelectionDirectionDiscontiguous:
- break;
- }
- break;
- case AXTextStateChangeTypeUnknown:
- case AXTextStateChangeTypeEdit:
- break;
- }
- }
- if (!selection.isNone()) {
- if (id textMarkerRange = [object->wrapper() textMarkerRangeFromVisiblePositions:selection.visibleStart() endPosition:selection.visibleEnd()])
- userInfo[NSAccessibilitySelectedTextMarkerRangeAttribute] = textMarkerRange;
- }
-
- if (id wrapper = object->wrapper())
- userInfo[NSAccessibilityTextChangeElement] = wrapper;
-
- AccessibilityObject* webArea = rootWebArea();
- AXPostNotificationWithUserInfo(webArea->wrapper(), NSAccessibilitySelectedTextChangedNotification, userInfo);
- AXPostNotificationWithUserInfo(object->wrapper(), NSAccessibilitySelectedTextChangedNotification, userInfo);
- [userInfo release];
</del><span class="cx"> }
</span><span class="cx">
</span><del>-static NSDictionary *textReplacementChangeDictionary(AccessibilityObject* object, AXTextEditType type, const String& string, const VisiblePosition& position)
-{
- NSString *text = (NSString *)string;
- NSUInteger length = [text length];
- if (!length)
- return nil;
- NSMutableDictionary *change = [[NSMutableDictionary alloc] initWithCapacity:4];
- change[NSAccessibilityTextEditType] = @(type);
- if (length > AXValueChangeTruncationLength) {
- change[NSAccessibilityTextChangeValueLength] = @(length);
- text = [text substringToIndex:AXValueChangeTruncationLength];
- }
- change[NSAccessibilityTextChangeValue] = text;
- if (position.isNotNull()) {
- if (id textMarker = [object->wrapper() textMarkerForVisiblePosition:position])
- change[NSAccessibilityTextChangeValueStartMarker] = textMarker;
- }
- return [change autorelease];
-}
-
-void AXObjectCache::postTextStateChangePlatformNotification(AccessibilityObject* object, AXTextEditType type, const String& text, const VisiblePosition& position)
-{
- if (!object)
- object = rootWebArea();
-
- if (!object)
- return;
-
- if (!text.length())
- return;
-
- NSMutableDictionary *userInfo = [[NSMutableDictionary alloc] initWithCapacity:3];
- userInfo[NSAccessibilityTextStateChangeTypeKey] = @(AXTextStateChangeTypeEdit);
-
- if (NSDictionary *change = textReplacementChangeDictionary(object, type, text, position))
- userInfo[NSAccessibilityTextChangeValues] = @[change];
-
- if (id wrapper = object->wrapper())
- userInfo[NSAccessibilityTextChangeElement] = wrapper;
-
- AccessibilityObject* webArea = rootWebArea();
- AXPostNotificationWithUserInfo(webArea->wrapper(), NSAccessibilityValueChangedNotification, userInfo);
- AXPostNotificationWithUserInfo(object->wrapper(), NSAccessibilityValueChangedNotification, userInfo);
- [userInfo release];
-}
-
-void AXObjectCache::postTextReplacementPlatformNotification(AccessibilityObject* object, AXTextEditType deletionType, const String& deletedText, AXTextEditType insertionType, const String& insertedText, const VisiblePosition& position)
-{
- if (!object)
- object = rootWebArea();
-
- if (!object)
- return;
-
- NSMutableDictionary *userInfo = [[NSMutableDictionary alloc] initWithCapacity:4];
- userInfo[NSAccessibilityTextStateChangeTypeKey] = @(AXTextStateChangeTypeEdit);
-
- NSMutableArray *changes = [[NSMutableArray alloc] initWithCapacity:2];
- if (NSDictionary *change = textReplacementChangeDictionary(object, deletionType, deletedText, position))
- [changes addObject:change];
- if (NSDictionary *change = textReplacementChangeDictionary(object, insertionType, insertedText, position))
- [changes addObject:change];
- userInfo[NSAccessibilityTextChangeValues] = changes;
- [changes release];
-
- if (id wrapper = object->wrapper())
- userInfo[NSAccessibilityTextChangeElement] = wrapper;
-
- AccessibilityObject* webArea = rootWebArea();
- AXPostNotificationWithUserInfo(webArea->wrapper(), NSAccessibilityValueChangedNotification, userInfo);
- AXPostNotificationWithUserInfo(object->wrapper(), NSAccessibilityValueChangedNotification, userInfo);
- [userInfo release];
-}
-
</del><span class="cx"> void AXObjectCache::frameLoadingEventPlatformNotification(AccessibilityObject* axFrameObject, AXLoadingEvent loadingEvent)
</span><span class="cx"> {
</span><span class="cx"> if (!axFrameObject)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -56,9 +56,8 @@
</span><span class="cx"> - (NSString *)ariaLandmarkRoleDescription;
</span><span class="cx">
</span><span class="cx"> - (id)attachmentView;
</span><del>-// Used to inform an element when a notification is posted for it. Used by tests.
</del><ins>+// Used to inform an element when a notification is posted for it. Used by DRT.
</ins><span class="cx"> - (void)accessibilityPostedNotification:(NSString *)notificationName;
</span><del>-- (void)accessibilityPostedNotification:(NSString *)notificationName userInfo:(NSDictionary *)userInfo;
</del><span class="cx">
</span><span class="cx"> - (CGPathRef)convertPathToScreenSpace:(WebCore::Path &)path;
</span><span class="cx"> - (CGPoint)convertPointToScreenSpace:(WebCore::FloatPoint &)point;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperBasemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -383,69 +383,13 @@
</span><span class="cx"> + (void)accessibilitySetShouldRepostNotifications:(BOOL)repost
</span><span class="cx"> {
</span><span class="cx"> accessibilityShouldRepostNotifications = repost;
</span><del>-#if PLATFORM(MAC)
- AXObjectCache::setShouldRepostNotificationsForTests(repost);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)accessibilityPostedNotification:(NSString *)notificationName
</span><span class="cx"> {
</span><del>- if (accessibilityShouldRepostNotifications)
- [self accessibilityPostedNotification:notificationName userInfo:nil];
-}
-
-static NSArray *arrayRemovingNonJSONTypes(NSArray *array)
-{
- ASSERT([array isKindOfClass:[NSArray class]]);
- NSMutableArray *mutableArray = [array mutableCopy];
- for (NSUInteger i = 0; i < [mutableArray count];) {
- id value = mutableArray[i];
- if ([value isKindOfClass:[NSDictionary class]])
- [mutableArray replaceObjectAtIndex:i withObject:dictionaryRemovingNonJSONTypes(value)];
- else if ([value isKindOfClass:[NSArray class]])
- [mutableArray replaceObjectAtIndex:i withObject:arrayRemovingNonJSONTypes(value)];
- else if (!([value isKindOfClass:[NSString class]] || [value isKindOfClass:[NSNumber class]])) {
- [mutableArray removeObjectAtIndex:i];
- continue;
- }
- i++;
- }
- return [mutableArray autorelease];
-}
-
-static NSDictionary *dictionaryRemovingNonJSONTypes(NSDictionary *dictionary)
-{
- ASSERT([dictionary isKindOfClass:[NSDictionary class]]);
- NSMutableDictionary *mutableDictionary = [dictionary mutableCopy];
- for (NSString *key in dictionary) {
- id value = dictionary[key];
- if ([value isKindOfClass:[NSDictionary class]])
- mutableDictionary[key] = dictionaryRemovingNonJSONTypes(value);
- else if ([value isKindOfClass:[NSArray class]])
- mutableDictionary[key] = arrayRemovingNonJSONTypes(value);
- else if (!([value isKindOfClass:[NSString class]] || [value isKindOfClass:[NSNumber class]]))
- [mutableDictionary removeObjectForKey:key];
- }
- return [mutableDictionary autorelease];
-}
-
-- (void)accessibilityPostedNotification:(NSString *)notificationName userInfo:(NSDictionary *)userInfo
-{
</del><span class="cx"> if (accessibilityShouldRepostNotifications) {
</span><del>- ASSERT(notificationName);
- NSDictionary *info = nil;
- if (userInfo) {
- NSData *userInfoData = [NSJSONSerialization dataWithJSONObject:dictionaryRemovingNonJSONTypes(userInfo) options:(NSJSONWritingOptions)0 error:nil];
- if (userInfoData) {
- NSString *userInfoString = [[NSString alloc] initWithData:userInfoData encoding:NSUTF8StringEncoding];
- if (userInfoString)
- info = @{@"notificationName" : notificationName, @"userInfo" : userInfoString};
- [userInfoString release];
- }
- }
- if (!info)
- info = @{@"notificationName" : notificationName};
- [[NSNotificationCenter defaultCenter] postNotificationName:@"AXDRTNotification" object:self userInfo:info];
</del><ins>+ NSDictionary* userInfo = [NSDictionary dictionaryWithObjectsAndKeys:notificationName, @"notificationName", nil];
+ [[NSNotificationCenter defaultCenter] postNotificationName:@"AXDRTNotification" object:self userInfo:userInfo];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -33,9 +33,6 @@
</span><span class="cx">
</span><span class="cx"> @interface WebAccessibilityObjectWrapper : WebAccessibilityObjectWrapperBase
</span><span class="cx">
</span><del>-- (id)textMarkerRangeFromVisiblePositions:(const WebCore::VisiblePosition&)startPosition endPosition:(const WebCore::VisiblePosition&)endPosition;
-- (id)textMarkerForVisiblePosition:(const WebCore::VisiblePosition&)visiblePos;
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // WebAccessibilityObjectWrapper_h
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1136,14 +1136,14 @@
</span><span class="cx"> return [attrString autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static id textMarkerRangeFromVisiblePositions(AXObjectCache *cache, const VisiblePosition& startPosition, const VisiblePosition& endPosition)
</del><ins>+static id textMarkerRangeFromVisiblePositions(AXObjectCache *cache, VisiblePosition startPosition, VisiblePosition endPosition)
</ins><span class="cx"> {
</span><span class="cx"> id startTextMarker = textMarkerForVisiblePosition(cache, startPosition);
</span><span class="cx"> id endTextMarker = textMarkerForVisiblePosition(cache, endPosition);
</span><span class="cx"> return textMarkerRangeFromMarkers(startTextMarker, endTextMarker);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)textMarkerRangeFromVisiblePositions:(const VisiblePosition&)startPosition endPosition:(const VisiblePosition&)endPosition
</del><ins>+- (id)textMarkerRangeFromVisiblePositions:(VisiblePosition)startPosition endPosition:(VisiblePosition)endPosition
</ins><span class="cx"> {
</span><span class="cx"> return textMarkerRangeFromVisiblePositions(m_object->axObjectCache(), startPosition, endPosition);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingAppendNodeCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/AppendNodeCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/AppendNodeCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/AppendNodeCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -30,13 +30,12 @@
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "ExceptionCodePlaceholder.h"
</span><span class="cx"> #include "RenderElement.h"
</span><del>-#include "Text.h"
</del><span class="cx"> #include "htmlediting.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-AppendNodeCommand::AppendNodeCommand(PassRefPtr<ContainerNode> parent, PassRefPtr<Node> node, EditAction editingAction)
- : SimpleEditCommand(parent->document(), editingAction)
</del><ins>+AppendNodeCommand::AppendNodeCommand(PassRefPtr<ContainerNode> parent, PassRefPtr<Node> node)
+ : SimpleEditCommand(parent->document())
</ins><span class="cx"> , m_parent(parent)
</span><span class="cx"> , m_node(node)
</span><span class="cx"> {
</span><span class="lines">@@ -47,23 +46,15 @@
</span><span class="cx"> ASSERT(m_parent->hasEditableStyle() || !m_parent->renderer());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void sendAXTextChangedIgnoringLineBreaks(Node* node, AXTextEditType type)
</del><ins>+static void sendAXTextChangedIgnoringLineBreaks(Node* node, AXObjectCache::AXTextChange textChange)
</ins><span class="cx"> {
</span><del>- if (!node)
- return;
-
- if (!AXObjectCache::accessibilityEnabled())
- return;
-
- String text = node->nodeValue();
</del><ins>+ String nodeValue = node->nodeValue();
</ins><span class="cx"> // Don't consider linebreaks in this command
</span><del>- if (text == "\n")
</del><ins>+ if (nodeValue == "\n")
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (AXObjectCache* cache = node->document().existingAXObjectCache()) {
- Position position = is<Text>(node) ? Position(downcast<Text>(node), 0) : createLegacyEditingPosition(node, 0);
- cache->postTextStateChangeNotification(node, type, text, VisiblePosition(position));
- }
</del><ins>+ if (AXObjectCache* cache = node->document().existingAXObjectCache())
+ cache->nodeTextChangeNotification(node, textChange, 0, nodeValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AppendNodeCommand::doApply()
</span><span class="lines">@@ -73,16 +64,18 @@
</span><span class="cx">
</span><span class="cx"> m_parent->appendChild(m_node.get(), IGNORE_EXCEPTION);
</span><span class="cx">
</span><del>- sendAXTextChangedIgnoringLineBreaks(m_node.get(), applyEditType());
</del><ins>+ if (AXObjectCache::accessibilityEnabled())
+ sendAXTextChangedIgnoringLineBreaks(m_node.get(), AXObjectCache::AXTextInserted);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AppendNodeCommand::doUnapply()
</span><span class="cx"> {
</span><span class="cx"> if (!m_parent->hasEditableStyle())
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Need to notify this before actually deleting the text
</span><del>- sendAXTextChangedIgnoringLineBreaks(m_node.get(), unapplyEditType());
</del><ins>+ if (AXObjectCache::accessibilityEnabled())
+ sendAXTextChangedIgnoringLineBreaks(m_node.get(), AXObjectCache::AXTextDeleted);
</ins><span class="cx">
</span><span class="cx"> m_node->remove(IGNORE_EXCEPTION);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingAppendNodeCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/AppendNodeCommand.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/AppendNodeCommand.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/AppendNodeCommand.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -32,13 +32,13 @@
</span><span class="cx">
</span><span class="cx"> class AppendNodeCommand : public SimpleEditCommand {
</span><span class="cx"> public:
</span><del>- static Ref<AppendNodeCommand> create(PassRefPtr<ContainerNode> parent, PassRefPtr<Node> node, EditAction editingAction)
</del><ins>+ static Ref<AppendNodeCommand> create(PassRefPtr<ContainerNode> parent, PassRefPtr<Node> node)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new AppendNodeCommand(parent, node, editingAction));
</del><ins>+ return adoptRef(*new AppendNodeCommand(parent, node));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- AppendNodeCommand(PassRefPtr<ContainerNode> parent, PassRefPtr<Node>, EditAction);
</del><ins>+ AppendNodeCommand(PassRefPtr<ContainerNode> parent, PassRefPtr<Node>);
</ins><span class="cx">
</span><span class="cx"> virtual void doApply() override;
</span><span class="cx"> virtual void doUnapply() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingApplyStyleCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ApplyStyleCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -123,8 +123,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ApplyStyleCommand::ApplyStyleCommand(Document& document, const EditingStyle* style, EditAction editingAction, EPropertyLevel propertyLevel)
</span><del>- : CompositeEditCommand(document, editingAction)
</del><ins>+ : CompositeEditCommand(document)
</ins><span class="cx"> , m_style(style->copy())
</span><ins>+ , m_editingAction(editingAction)
</ins><span class="cx"> , m_propertyLevel(propertyLevel)
</span><span class="cx"> , m_start(endingSelection().start().downstream())
</span><span class="cx"> , m_end(endingSelection().end().upstream())
</span><span class="lines">@@ -135,8 +136,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ApplyStyleCommand::ApplyStyleCommand(Document& document, const EditingStyle* style, const Position& start, const Position& end, EditAction editingAction, EPropertyLevel propertyLevel)
</span><del>- : CompositeEditCommand(document, editingAction)
</del><ins>+ : CompositeEditCommand(document)
</ins><span class="cx"> , m_style(style->copy())
</span><ins>+ , m_editingAction(editingAction)
</ins><span class="cx"> , m_propertyLevel(propertyLevel)
</span><span class="cx"> , m_start(start)
</span><span class="cx"> , m_end(end)
</span><span class="lines">@@ -147,8 +149,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ApplyStyleCommand::ApplyStyleCommand(PassRefPtr<Element> element, bool removeOnly, EditAction editingAction)
</span><del>- : CompositeEditCommand(element->document(), editingAction)
</del><ins>+ : CompositeEditCommand(element->document())
</ins><span class="cx"> , m_style(EditingStyle::create())
</span><ins>+ , m_editingAction(editingAction)
</ins><span class="cx"> , m_propertyLevel(PropertyDefault)
</span><span class="cx"> , m_start(endingSelection().start().downstream())
</span><span class="cx"> , m_end(endingSelection().end().upstream())
</span><span class="lines">@@ -160,8 +163,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ApplyStyleCommand::ApplyStyleCommand(Document& document, const EditingStyle* style, IsInlineElementToRemoveFunction isInlineElementToRemoveFunction, EditAction editingAction)
</span><del>- : CompositeEditCommand(document, editingAction)
</del><ins>+ : CompositeEditCommand(document)
</ins><span class="cx"> , m_style(style->copy())
</span><ins>+ , m_editingAction(editingAction)
</ins><span class="cx"> , m_propertyLevel(PropertyDefault)
</span><span class="cx"> , m_start(endingSelection().start().downstream())
</span><span class="cx"> , m_end(endingSelection().end().upstream())
</span><span class="lines">@@ -222,6 +226,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+EditAction ApplyStyleCommand::editingAction() const
+{
+ return m_editingAction;
+}
+
</ins><span class="cx"> void ApplyStyleCommand::applyBlockStyle(EditingStyle *style)
</span><span class="cx"> {
</span><span class="cx"> // update document layout once before removing styles
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingApplyStyleCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ApplyStyleCommand.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ApplyStyleCommand.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/ApplyStyleCommand.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> ApplyStyleCommand(Document&, const EditingStyle*, bool (*isInlineElementToRemove)(const Element*), EditAction);
</span><span class="cx">
</span><span class="cx"> virtual void doApply() override;
</span><ins>+ virtual EditAction editingAction() const override;
</ins><span class="cx">
</span><span class="cx"> // style-removal helpers
</span><span class="cx"> bool isStyledInlineElementToRemove(Element*) const;
</span><span class="lines">@@ -121,6 +122,7 @@
</span><span class="cx"> Position endPosition();
</span><span class="cx">
</span><span class="cx"> RefPtr<EditingStyle> m_style;
</span><ins>+ EditAction m_editingAction;
</ins><span class="cx"> EPropertyLevel m_propertyLevel;
</span><span class="cx"> Position m_start;
</span><span class="cx"> Position m_end;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -58,8 +58,6 @@
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><span class="cx"> #include "RenderText.h"
</span><span class="cx"> #include "RenderedDocumentMarker.h"
</span><del>-#include "ReplaceDeleteFromTextNodeCommand.h"
-#include "ReplaceInsertIntoTextNodeCommand.h"
</del><span class="cx"> #include "ReplaceNodeWithSpanCommand.h"
</span><span class="cx"> #include "ReplaceSelectionCommand.h"
</span><span class="cx"> #include "ScopedEventQueue.h"
</span><span class="lines">@@ -164,31 +162,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-AXTextEditType EditCommandComposition::unapplyEditType() const
-{
- switch (editingAction()) {
- case EditActionCut:
- case EditActionDelete:
- return AXTextEditTypeInsert;
- case EditActionDictation:
- case EditActionInsert:
- case EditActionPaste:
- case EditActionTyping:
- return AXTextEditTypeDelete;
- // Include default case for unhandled EditAction cases.
- default:
- break;
- }
- return AXTextEditTypeUnknown;
-}
-
</del><span class="cx"> void applyCommand(PassRefPtr<CompositeEditCommand> command)
</span><span class="cx"> {
</span><span class="cx"> command->apply();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CompositeEditCommand::CompositeEditCommand(Document& document, EditAction editingAction)
- : EditCommand(document, editingAction)
</del><ins>+CompositeEditCommand::CompositeEditCommand(Document& document)
+ : EditCommand(document)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -207,7 +187,6 @@
</span><span class="cx"> case EditActionSetWritingDirection:
</span><span class="cx"> case EditActionCut:
</span><span class="cx"> case EditActionUnspecified:
</span><del>- case EditActionInsert:
</del><span class="cx"> case EditActionDelete:
</span><span class="cx"> case EditActionDictation:
</span><span class="cx"> break;
</span><span class="lines">@@ -317,7 +296,7 @@
</span><span class="cx">
</span><span class="cx"> void CompositeEditCommand::insertParagraphSeparator(bool useDefaultParagraphElement, bool pasteBlockqutoeIntoUnquotedArea)
</span><span class="cx"> {
</span><del>- applyCommandToComposite(InsertParagraphSeparatorCommand::create(document(), useDefaultParagraphElement, pasteBlockqutoeIntoUnquotedArea, editingAction()));
</del><ins>+ applyCommandToComposite(InsertParagraphSeparatorCommand::create(document(), useDefaultParagraphElement, pasteBlockqutoeIntoUnquotedArea));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CompositeEditCommand::insertLineBreak()
</span><span class="lines">@@ -343,7 +322,7 @@
</span><span class="cx">
</span><span class="cx"> void CompositeEditCommand::insertNodeBefore(PassRefPtr<Node> insertChild, PassRefPtr<Node> refChild, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable)
</span><span class="cx"> {
</span><del>- applyCommandToComposite(InsertNodeBeforeCommand::create(insertChild, refChild, shouldAssumeContentIsAlwaysEditable, editingAction()));
</del><ins>+ applyCommandToComposite(InsertNodeBeforeCommand::create(insertChild, refChild, shouldAssumeContentIsAlwaysEditable));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CompositeEditCommand::insertNodeAfter(PassRefPtr<Node> insertChild, PassRefPtr<Node> refChild)
</span><span class="lines">@@ -394,7 +373,7 @@
</span><span class="cx"> void CompositeEditCommand::appendNode(PassRefPtr<Node> node, PassRefPtr<ContainerNode> parent)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(canHaveChildrenForEditing(parent.get()));
</span><del>- applyCommandToComposite(AppendNodeCommand::create(parent, node, editingAction()));
</del><ins>+ applyCommandToComposite(AppendNodeCommand::create(parent, node));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CompositeEditCommand::removeChildrenInRange(PassRefPtr<Node> node, unsigned from, unsigned to)
</span><span class="lines">@@ -418,7 +397,7 @@
</span><span class="cx">
</span><span class="cx"> void CompositeEditCommand::removeNodePreservingChildren(PassRefPtr<Node> node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable)
</span><span class="cx"> {
</span><del>- applyCommandToComposite(RemoveNodePreservingChildrenCommand::create(node, shouldAssumeContentIsAlwaysEditable, editingAction()));
</del><ins>+ applyCommandToComposite(RemoveNodePreservingChildrenCommand::create(node, shouldAssumeContentIsAlwaysEditable));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CompositeEditCommand::removeNodeAndPruneAncestors(PassRefPtr<Node> node)
</span><span class="lines">@@ -546,21 +525,20 @@
</span><span class="cx"> void CompositeEditCommand::insertTextIntoNode(PassRefPtr<Text> node, unsigned offset, const String& text)
</span><span class="cx"> {
</span><span class="cx"> if (!text.isEmpty())
</span><del>- applyCommandToComposite(InsertIntoTextNodeCommand::create(node, offset, text, editingAction()));
</del><ins>+ applyCommandToComposite(InsertIntoTextNodeCommand::create(node, offset, text));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CompositeEditCommand::deleteTextFromNode(PassRefPtr<Text> node, unsigned offset, unsigned count)
</span><span class="cx"> {
</span><del>- applyCommandToComposite(DeleteFromTextNodeCommand::create(node, offset, count, editingAction()));
</del><ins>+ applyCommandToComposite(DeleteFromTextNodeCommand::create(node, offset, count));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CompositeEditCommand::replaceTextInNode(PassRefPtr<Text> prpNode, unsigned offset, unsigned count, const String& replacementText)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Text> node(prpNode);
</span><del>- RefPtr<DeleteFromTextNodeCommand> deleteCommand = ReplaceDeleteFromTextNodeCommand::create(WTF::move(node), offset, count);
- applyCommandToComposite(deleteCommand);
</del><ins>+ applyCommandToComposite(DeleteFromTextNodeCommand::create(node, offset, count));
</ins><span class="cx"> if (!replacementText.isEmpty())
</span><del>- applyCommandToComposite(ReplaceInsertIntoTextNodeCommand::create(WTF::move(node), offset, replacementText, deleteCommand->deletedText(), editingAction()));
</del><ins>+ applyCommandToComposite(InsertIntoTextNodeCommand::create(node, offset, replacementText));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Position CompositeEditCommand::replaceSelectedTextInNode(const String& text)
</span><span class="lines">@@ -1311,7 +1289,7 @@
</span><span class="cx"> ReplaceSelectionCommand::CommandOptions options = ReplaceSelectionCommand::SelectReplacement | ReplaceSelectionCommand::MovingParagraph;
</span><span class="cx"> if (!preserveStyle)
</span><span class="cx"> options |= ReplaceSelectionCommand::MatchStyle;
</span><del>- applyCommandToComposite(ReplaceSelectionCommand::create(document(), WTF::move(fragment), options));
</del><ins>+ applyCommandToComposite(ReplaceSelectionCommand::create(document(), fragment, options));
</ins><span class="cx">
</span><span class="cx"> frame().editor().markMisspellingsAndBadGrammar(endingSelection());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -59,8 +59,6 @@
</span><span class="cx"> virtual void getNodesInCommand(HashSet<Node*>&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- AXTextEditType unapplyEditType() const;
-
</del><span class="cx"> private:
</span><span class="cx"> EditCommandComposition(Document&, const VisibleSelection& startingSelection, const VisibleSelection& endingSelection, EditAction);
</span><span class="cx">
</span><span class="lines">@@ -91,7 +89,7 @@
</span><span class="cx"> virtual bool shouldStopCaretBlinking() const { return false; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- explicit CompositeEditCommand(Document&, EditAction = EditActionUnspecified);
</del><ins>+ explicit CompositeEditCommand(Document&);
</ins><span class="cx">
</span><span class="cx"> //
</span><span class="cx"> // sugary-sweet convenience functions to help create and apply edit commands in composite commands
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDeleteFromTextNodeCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005, 2008, 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005, 2008 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-DeleteFromTextNodeCommand::DeleteFromTextNodeCommand(RefPtr<Text>&& node, unsigned offset, unsigned count, EditAction editingAction)
- : SimpleEditCommand(node->document(), editingAction)
</del><ins>+DeleteFromTextNodeCommand::DeleteFromTextNodeCommand(PassRefPtr<Text> node, unsigned offset, unsigned count)
+ : SimpleEditCommand(node->document())
</ins><span class="cx"> , m_node(node)
</span><span class="cx"> , m_offset(offset)
</span><span class="cx"> , m_count(count)
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Need to notify this before actually deleting the text
</span><del>- if (AXObjectCache::accessibilityEnabled())
- notifyAccessibilityForTextChange(m_node.get(), applyEditType(), m_text, VisiblePosition(Position(m_node, m_offset)));
</del><ins>+ if (AXObjectCache* cache = document().existingAXObjectCache())
+ cache->nodeTextChangeNotification(m_node.get(), AXObjectCache::AXTextDeleted, m_offset, m_text);
</ins><span class="cx">
</span><span class="cx"> m_node->deleteData(m_offset, m_count, ec);
</span><span class="cx"> }
</span><span class="lines">@@ -73,8 +73,8 @@
</span><span class="cx">
</span><span class="cx"> m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION);
</span><span class="cx">
</span><del>- if (AXObjectCache::accessibilityEnabled())
- notifyAccessibilityForTextChange(m_node.get(), unapplyEditType(), m_text, VisiblePosition(Position(m_node, m_offset)));
</del><ins>+ if (AXObjectCache* cache = document().existingAXObjectCache())
+ cache->nodeTextChangeNotification(m_node.get(), AXObjectCache::AXTextInserted, m_offset, m_text);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDeleteFromTextNodeCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005, 2006, 2008, 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -34,17 +34,14 @@
</span><span class="cx">
</span><span class="cx"> class DeleteFromTextNodeCommand : public SimpleEditCommand {
</span><span class="cx"> public:
</span><del>- static Ref<DeleteFromTextNodeCommand> create(RefPtr<Text>&& node, unsigned offset, unsigned count, EditAction editingAction = EditActionDelete)
</del><ins>+ static Ref<DeleteFromTextNodeCommand> create(PassRefPtr<Text> node, unsigned offset, unsigned count)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new DeleteFromTextNodeCommand(WTF::move(node), offset, count, editingAction));
</del><ins>+ return adoptRef(*new DeleteFromTextNodeCommand(node, offset, count));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- const String& deletedText();
-
-protected:
- DeleteFromTextNodeCommand(RefPtr<Text>&&, unsigned offset, unsigned count, EditAction);
-
</del><span class="cx"> private:
</span><ins>+ DeleteFromTextNodeCommand(PassRefPtr<Text>, unsigned offset, unsigned count);
+
</ins><span class="cx"> virtual void doApply() override;
</span><span class="cx"> virtual void doUnapply() override;
</span><span class="cx">
</span><span class="lines">@@ -58,11 +55,6 @@
</span><span class="cx"> String m_text;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline const String& DeleteFromTextNodeCommand::deletedText()
-{
- return m_text;
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // DeleteFromTextNodeCommand_h
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDeleteSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -72,8 +72,8 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DeleteSelectionCommand::DeleteSelectionCommand(Document& document, bool smartDelete, bool mergeBlocksAfterDelete, bool replace, bool expandForSpecialElements, bool sanitizeMarkup, EditAction editingAction)
- : CompositeEditCommand(document, editingAction)
</del><ins>+DeleteSelectionCommand::DeleteSelectionCommand(Document& document, bool smartDelete, bool mergeBlocksAfterDelete, bool replace, bool expandForSpecialElements, bool sanitizeMarkup)
+ : CompositeEditCommand(document)
</ins><span class="cx"> , m_hasSelectionToDelete(false)
</span><span class="cx"> , m_smartDelete(smartDelete)
</span><span class="cx"> , m_mergeBlocksAfterDelete(mergeBlocksAfterDelete)
</span><span class="lines">@@ -90,8 +90,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DeleteSelectionCommand::DeleteSelectionCommand(const VisibleSelection& selection, bool smartDelete, bool mergeBlocksAfterDelete, bool replace, bool expandForSpecialElements, bool sanitizeMarkup, EditAction editingAction)
- : CompositeEditCommand(selection.start().anchorNode()->document(), editingAction)
</del><ins>+DeleteSelectionCommand::DeleteSelectionCommand(const VisibleSelection& selection, bool smartDelete, bool mergeBlocksAfterDelete, bool replace, bool expandForSpecialElements, bool sanitizeMarkup)
+ : CompositeEditCommand(selection.start().anchorNode()->document())
</ins><span class="cx"> , m_hasSelectionToDelete(true)
</span><span class="cx"> , m_smartDelete(smartDelete)
</span><span class="cx"> , m_mergeBlocksAfterDelete(mergeBlocksAfterDelete)
</span><span class="lines">@@ -884,6 +884,14 @@
</span><span class="cx"> clearTransientState();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+EditAction DeleteSelectionCommand::editingAction() const
+{
+ // Note that DeleteSelectionCommand is also used when the user presses the Delete key,
+ // but in that case there's a TypingCommand that supplies the editingAction(), so
+ // the Undo menu correctly shows "Undo Typing"
+ return EditActionCut;
+}
+
</ins><span class="cx"> // Normally deletion doesn't preserve the typing style that was present before it. For example,
</span><span class="cx"> // type a character, Bold, then delete the character and start typing. The Bold typing style shouldn't
</span><span class="cx"> // stick around. Deletion should preserve a typing style that *it* sets, however.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDeleteSelectionCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DeleteSelectionCommand.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DeleteSelectionCommand.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/DeleteSelectionCommand.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -34,22 +34,23 @@
</span><span class="cx">
</span><span class="cx"> class DeleteSelectionCommand : public CompositeEditCommand {
</span><span class="cx"> public:
</span><del>- static Ref<DeleteSelectionCommand> create(Document& document, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = false, bool sanitizeMarkup = true, EditAction editingAction = EditActionDelete)
</del><ins>+ static Ref<DeleteSelectionCommand> create(Document& document, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = false, bool sanitizeMarkup = true)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new DeleteSelectionCommand(document, smartDelete, mergeBlocksAfterDelete, replace, expandForSpecialElements, sanitizeMarkup, editingAction));
</del><ins>+ return adoptRef(*new DeleteSelectionCommand(document, smartDelete, mergeBlocksAfterDelete, replace, expandForSpecialElements, sanitizeMarkup));
</ins><span class="cx"> }
</span><del>- static Ref<DeleteSelectionCommand> create(const VisibleSelection& selection, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = false, bool sanitizeMarkup = true, EditAction editingAction = EditActionDelete)
</del><ins>+ static Ref<DeleteSelectionCommand> create(const VisibleSelection& selection, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool replace = false, bool expandForSpecialElements = false, bool sanitizeMarkup = true)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new DeleteSelectionCommand(selection, smartDelete, mergeBlocksAfterDelete, replace, expandForSpecialElements, sanitizeMarkup, editingAction));
</del><ins>+ return adoptRef(*new DeleteSelectionCommand(selection, smartDelete, mergeBlocksAfterDelete, replace, expandForSpecialElements, sanitizeMarkup));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- DeleteSelectionCommand(Document&, bool smartDelete, bool mergeBlocksAfterDelete, bool replace, bool expandForSpecialElements, bool santizeMarkup, EditAction = EditActionDelete);
</del><ins>+ DeleteSelectionCommand(Document&, bool smartDelete, bool mergeBlocksAfterDelete, bool replace, bool expandForSpecialElements, bool santizeMarkup);
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- DeleteSelectionCommand(const VisibleSelection&, bool smartDelete, bool mergeBlocksAfterDelete, bool replace, bool expandForSpecialElements, bool sanitizeMarkup, EditAction);
</del><ins>+ DeleteSelectionCommand(const VisibleSelection&, bool smartDelete, bool mergeBlocksAfterDelete, bool replace, bool expandForSpecialElements, bool sanitizeMarkup);
</ins><span class="cx">
</span><span class="cx"> virtual void doApply();
</span><ins>+ virtual EditAction editingAction() const;
</ins><span class="cx">
</span><span class="cx"> virtual bool preservesTypingStyle() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDictationCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DictationCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DictationCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/DictationCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<DictationAlternative> alternativesInLine;
</span><span class="cx"> collectDictationAlternativesInRange(lineStart, lineLength, alternativesInLine);
</span><del>- RefPtr<InsertTextCommand> command = InsertTextCommand::createWithMarkerSupplier(document(), m_textToInsert.substring(lineStart, lineLength), DictationMarkerSupplier::create(alternativesInLine), EditActionDictation);
</del><ins>+ RefPtr<InsertTextCommand> command = InsertTextCommand::createWithMarkerSupplier(document(), m_textToInsert.substring(lineStart, lineLength), DictationMarkerSupplier::create(alternativesInLine));
</ins><span class="cx"> applyCommandToComposite(command, endingSelection());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> if (!canAppendNewLineFeedToSelection(endingSelection()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- applyCommandToComposite(InsertParagraphSeparatorCommand::create(document(), false, false, EditActionDictation));
</del><ins>+ applyCommandToComposite(InsertParagraphSeparatorCommand::create(document()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DictationCommand::collectDictationAlternativesInRange(size_t rangeStart, size_t rangeLength, Vector<DictationAlternative>& alternatives)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditActionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditAction.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditAction.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/EditAction.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> typedef enum {
</span><span class="cx"> EditActionUnspecified,
</span><del>- EditActionInsert,
</del><span class="cx"> EditActionSetColor,
</span><span class="cx"> EditActionSetBackgroundColor,
</span><span class="cx"> EditActionTurnOffKerning,
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/EditCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "EditCommand.h"
</span><span class="cx">
</span><del>-#include "AXObjectCache.h"
</del><span class="cx"> #include "CompositeEditCommand.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Editor.h"
</span><span class="lines">@@ -38,10 +37,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-EditCommand::EditCommand(Document& document, EditAction editingAction)
</del><ins>+EditCommand::EditCommand(Document& document)
</ins><span class="cx"> : m_document(document)
</span><span class="cx"> , m_parent(0)
</span><del>- , m_editingAction(editingAction)
</del><span class="cx"> {
</span><span class="cx"> ASSERT(document.frame());
</span><span class="cx"> setStartingSelection(m_document->frame()->selection().selection());
</span><span class="lines">@@ -69,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> EditAction EditCommand::editingAction() const
</span><span class="cx"> {
</span><del>- return m_editingAction;
</del><ins>+ return EditActionUnspecified;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline EditCommandComposition* compositionIfPossible(EditCommand* command)
</span><span class="lines">@@ -114,50 +112,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AXTextEditType EditCommand::applyEditType() const
-{
- switch (editingAction()) {
- case EditActionCut:
- return AXTextEditTypeCut;
- case EditActionDelete:
- return AXTextEditTypeDelete;
- case EditActionDictation:
- return AXTextEditTypeDictation;
- case EditActionInsert:
- return AXTextEditTypeInsert;
- case EditActionPaste:
- return AXTextEditTypePaste;
- case EditActionTyping:
- return AXTextEditTypeTyping;
- // Include default case for unhandled EditAction cases.
- default:
- break;
- }
- return AXTextEditTypeUnknown;
-}
-
-AXTextEditType EditCommand::unapplyEditType() const
-{
- switch (applyEditType()) {
- case AXTextEditTypeUnknown:
- return AXTextEditTypeUnknown;
- case AXTextEditTypeDelete:
- case AXTextEditTypeCut:
- return AXTextEditTypeInsert;
- case AXTextEditTypeInsert:
- case AXTextEditTypeTyping:
- case AXTextEditTypeDictation:
- case AXTextEditTypePaste:
- return AXTextEditTypeDelete;
- }
- return AXTextEditTypeUnknown;
-}
-
-SimpleEditCommand::SimpleEditCommand(Document& document, EditAction editingAction)
- : EditCommand(document, editingAction)
-{
-}
-
</del><span class="cx"> void SimpleEditCommand::doReapply()
</span><span class="cx"> {
</span><span class="cx"> doApply();
</span><span class="lines">@@ -171,14 +125,4 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void SimpleEditCommand::notifyAccessibilityForTextChange(Node* node, AXTextEditType type, const String& text, const VisiblePosition& position)
-{
- if (!AXObjectCache::accessibilityEnabled())
- return;
- AXObjectCache* cache = document().existingAXObjectCache();
- if (!cache)
- return;
- cache->postTextStateChangeNotification(node, type, text, position);
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditCommand.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditCommand.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/EditCommand.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #ifndef EditCommand_h
</span><span class="cx"> #define EditCommand_h
</span><span class="cx">
</span><del>-#include "AXTextStateChangeIntent.h"
</del><span class="cx"> #include "EditAction.h"
</span><span class="cx"> #include "VisibleSelection.h"
</span><span class="cx">
</span><span class="lines">@@ -47,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> void setParent(CompositeEditCommand*);
</span><span class="cx">
</span><del>- EditAction editingAction() const;
</del><ins>+ virtual EditAction editingAction() const;
</ins><span class="cx">
</span><span class="cx"> const VisibleSelection& startingSelection() const { return m_startingSelection; }
</span><span class="cx"> const VisibleSelection& endingSelection() const { return m_endingSelection; }
</span><span class="lines">@@ -60,11 +59,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void doApply() = 0;
</span><span class="cx">
</span><del>- AXTextEditType applyEditType() const;
- AXTextEditType unapplyEditType() const;
-
</del><span class="cx"> protected:
</span><del>- explicit EditCommand(Document&, EditAction = EditActionUnspecified);
</del><ins>+ explicit EditCommand(Document&);
</ins><span class="cx"> EditCommand(Document&, const VisibleSelection&, const VisibleSelection&);
</span><span class="cx">
</span><span class="cx"> Frame& frame();
</span><span class="lines">@@ -78,7 +74,6 @@
</span><span class="cx"> VisibleSelection m_startingSelection;
</span><span class="cx"> VisibleSelection m_endingSelection;
</span><span class="cx"> CompositeEditCommand* m_parent;
</span><del>- EditAction m_editingAction { EditActionUnspecified };
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum ShouldAssumeContentIsAlwaysEditable {
</span><span class="lines">@@ -96,14 +91,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- explicit SimpleEditCommand(Document&, EditAction = EditActionUnspecified);
</del><ins>+ explicit SimpleEditCommand(Document& document) : EditCommand(document) { }
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> void addNodeAndDescendants(Node*, HashSet<Node*>&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual void notifyAccessibilityForTextChange(Node*, AXTextEditType, const String&, const VisiblePosition&);
-
</del><span class="cx"> private:
</span><span class="cx"> virtual bool isSimpleEditCommand() const override { return true; }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditingAllInOne.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditingAllInOne.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/EditingAllInOne.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -59,8 +59,6 @@
</span><span class="cx"> #include <RemoveNodeCommand.cpp>
</span><span class="cx"> #include <RemoveNodePreservingChildrenCommand.cpp>
</span><span class="cx"> #include <RenderedPosition.cpp>
</span><del>-#include <ReplaceDeleteFromTextNodeCommand.cpp>
-#include <ReplaceInsertIntoTextNodeCommand.cpp>
</del><span class="cx"> #include <ReplaceNodeWithSpanCommand.cpp>
</span><span class="cx"> #include <ReplaceSelectionCommand.cpp>
</span><span class="cx"> #include <SetNodeAttributeCommand.cpp>
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/Editor.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -208,12 +208,12 @@
</span><span class="cx"> if (client()->performsTwoStepPaste(event->pastingFragment()))
</span><span class="cx"> return true;
</span><span class="cx"> #endif
</span><del>- replaceSelectionWithFragment(event->pastingFragment(), false, event->shouldSmartReplace(), event->shouldMatchStyle(), EditActionPaste, event->mailBlockquoteHandling());
</del><ins>+ replaceSelectionWithFragment(event->pastingFragment(), false, event->shouldSmartReplace(), event->shouldMatchStyle(), event->mailBlockquoteHandling());
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> else
</span><del>- replaceSelectionWithText(event->data(), false, event->shouldSmartReplace(), EditActionPaste);
</del><ins>+ replaceSelectionWithText(event->data(), false, event->shouldSmartReplace());
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -374,12 +374,12 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::deleteSelectionWithSmartDelete(bool smartDelete, EditAction editingAction)
</del><ins>+void Editor::deleteSelectionWithSmartDelete(bool smartDelete)
</ins><span class="cx"> {
</span><span class="cx"> if (m_frame.selection().isNone())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- applyCommand(DeleteSelectionCommand::create(document(), smartDelete, true, false, false, true, editingAction));
</del><ins>+ applyCommand(DeleteSelectionCommand::create(document(), smartDelete));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Editor::clearText()
</span><span class="lines">@@ -520,7 +520,7 @@
</span><span class="cx"> return client()->shouldInsertNode(fragment.get(), replacingDOMRange.get(), givenAction);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::replaceSelectionWithFragment(PassRefPtr<DocumentFragment> fragment, bool selectReplacement, bool smartReplace, bool matchStyle, EditAction editingAction, MailBlockquoteHandling mailBlockquoteHandling)
</del><ins>+void Editor::replaceSelectionWithFragment(PassRefPtr<DocumentFragment> fragment, bool selectReplacement, bool smartReplace, bool matchStyle, MailBlockquoteHandling mailBlockquoteHandling)
</ins><span class="cx"> {
</span><span class="cx"> VisibleSelection selection = m_frame.selection().selection();
</span><span class="cx"> if (selection.isNone() || !selection.isContentEditable() || !fragment)
</span><span class="lines">@@ -536,7 +536,7 @@
</span><span class="cx"> if (mailBlockquoteHandling == MailBlockquoteHandling::IgnoreBlockquote)
</span><span class="cx"> options |= ReplaceSelectionCommand::IgnoreMailBlockquote;
</span><span class="cx">
</span><del>- applyCommand(ReplaceSelectionCommand::create(document(), fragment, options, editingAction));
</del><ins>+ applyCommand(ReplaceSelectionCommand::create(document(), fragment, options, EditActionPaste));
</ins><span class="cx"> revealSelectionAfterEditingOperation();
</span><span class="cx">
</span><span class="cx"> selection = m_frame.selection().selection();
</span><span class="lines">@@ -550,13 +550,13 @@
</span><span class="cx"> m_spellChecker->requestCheckingFor(SpellCheckRequest::create(resolveTextCheckingTypeMask(TextCheckingTypeSpelling | TextCheckingTypeGrammar), TextCheckingProcessBatch, rangeToCheck, rangeToCheck));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::replaceSelectionWithText(const String& text, bool selectReplacement, bool smartReplace, EditAction editingAction)
</del><ins>+void Editor::replaceSelectionWithText(const String& text, bool selectReplacement, bool smartReplace)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<Range> range = selectedRange();
</span><span class="cx"> if (!range)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- replaceSelectionWithFragment(createFragmentFromText(*range, text), selectReplacement, smartReplace, true, editingAction);
</del><ins>+ replaceSelectionWithFragment(createFragmentFromText(*range, text), selectReplacement, smartReplace, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Range> Editor::selectedRange()
</span><span class="lines">@@ -998,8 +998,7 @@
</span><span class="cx">
</span><span class="cx"> // Don't clear the typing style with this selection change. We do those things elsewhere if necessary.
</span><span class="cx"> FrameSelection::SetSelectionOptions options = cmd->isDictationCommand() ? FrameSelection::DictationTriggered : 0;
</span><del>-
- changeSelectionAfterCommand(newSelection, options, cmd->applyEditType());
</del><ins>+ changeSelectionAfterCommand(newSelection, options);
</ins><span class="cx"> dispatchEditableContentChangedEvents(composition->startingRootEditableElement(), composition->endingRootEditableElement());
</span><span class="cx">
</span><span class="cx"> updateEditorUINowIfScheduled();
</span><span class="lines">@@ -1030,7 +1029,7 @@
</span><span class="cx"> notifyTextFromControls(cmd->startingRootEditableElement(), cmd->endingRootEditableElement());
</span><span class="cx">
</span><span class="cx"> VisibleSelection newSelection(cmd->startingSelection());
</span><del>- changeSelectionAfterCommand(newSelection, FrameSelection::defaultSetSelectionOptions(), cmd->unapplyEditType());
</del><ins>+ changeSelectionAfterCommand(newSelection, FrameSelection::defaultSetSelectionOptions());
</ins><span class="cx"> dispatchEditableContentChangedEvents(cmd->startingRootEditableElement(), cmd->endingRootEditableElement());
</span><span class="cx">
</span><span class="cx"> updateEditorUINowIfScheduled();
</span><span class="lines">@@ -1264,7 +1263,7 @@
</span><span class="cx">
</span><span class="cx"> didWriteSelectionToPasteboard();
</span><span class="cx"> if (action == CutAction)
</span><del>- deleteSelectionWithSmartDelete(canSmartCopyOrDelete(), EditActionCut);
</del><ins>+ deleteSelectionWithSmartDelete(canSmartCopyOrDelete());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Editor::paste()
</span><span class="lines">@@ -2236,7 +2235,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_frame.editor().shouldInsertText(autocorrectedString, misspellingRange.get(), EditorInsertActionTyped))
</span><span class="cx"> return;
</span><del>- m_frame.editor().replaceSelectionWithText(autocorrectedString, false, false, EditActionInsert);
</del><ins>+ m_frame.editor().replaceSelectionWithText(autocorrectedString, false, false);
</ins><span class="cx">
</span><span class="cx"> // Reset the charet one character further.
</span><span class="cx"> m_frame.selection().moveTo(m_frame.selection().selection().end());
</span><span class="lines">@@ -2582,7 +2581,7 @@
</span><span class="cx">
</span><span class="cx"> m_alternativeTextController->recordAutocorrectionResponseReversed(replacedString, selection);
</span><span class="cx"> TextCheckingParagraph paragraph(selection);
</span><del>- replaceSelectionWithText(replacedString, false, false, EditActionInsert);
</del><ins>+ replaceSelectionWithText(replacedString, false, false);
</ins><span class="cx"> RefPtr<Range> changedRange = paragraph.subrange(paragraph.checkingStart(), replacedString.length());
</span><span class="cx"> changedRange->startContainer()->document().markers().addMarker(changedRange.get(), DocumentMarker::Replacement, String());
</span><span class="cx"> m_alternativeTextController->markReversed(changedRange.get());
</span><span class="lines">@@ -2816,7 +2815,7 @@
</span><span class="cx"> // Insert the transposed characters.
</span><span class="cx"> if (!shouldInsertText(transposed, range.get(), EditorInsertActionTyped))
</span><span class="cx"> return;
</span><del>- replaceSelectionWithText(transposed, false, false, EditActionInsert);
</del><ins>+ replaceSelectionWithText(transposed, false, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Editor::addToKillRing(Range* range, bool prepend)
</span><span class="lines">@@ -2848,7 +2847,7 @@
</span><span class="cx"> m_alternativeTextController->dismiss(ReasonForDismissingAlternativeTextIgnored);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::changeSelectionAfterCommand(const VisibleSelection& newSelection, FrameSelection::SetSelectionOptions options, AXTextStateChangeIntent intent)
</del><ins>+void Editor::changeSelectionAfterCommand(const VisibleSelection& newSelection, FrameSelection::SetSelectionOptions options)
</ins><span class="cx"> {
</span><span class="cx"> // If the new selection is orphaned, then don't update the selection.
</span><span class="cx"> if (newSelection.start().isOrphan() || newSelection.end().isOrphan())
</span><span class="lines">@@ -2860,7 +2859,7 @@
</span><span class="cx"> // See <rdar://problem/5729315> Some shouldChangeSelectedDOMRange contain Ranges for selections that are no longer valid
</span><span class="cx"> bool selectionDidNotChangeDOMPosition = newSelection == m_frame.selection().selection();
</span><span class="cx"> if (selectionDidNotChangeDOMPosition || m_frame.selection().shouldChangeSelection(newSelection))
</span><del>- m_frame.selection().setSelection(newSelection, options, intent);
</del><ins>+ m_frame.selection().setSelection(newSelection, options);
</ins><span class="cx">
</span><span class="cx"> // Some editing operations change the selection visually without affecting its position within the DOM.
</span><span class="cx"> // For example when you press return in the following (the caret is marked by ^):
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/Editor.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool deleteWithDirection(SelectionDirection, TextGranularity, bool killRing, bool isTypingAction);
</span><del>- WEBCORE_EXPORT void deleteSelectionWithSmartDelete(bool smartDelete, EditAction = EditActionDelete);
</del><ins>+ WEBCORE_EXPORT void deleteSelectionWithSmartDelete(bool smartDelete);
</ins><span class="cx"> void clearText();
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> WEBCORE_EXPORT void removeUnchangeableStyles();
</span><span class="lines">@@ -382,8 +382,8 @@
</span><span class="cx"> void textDidChangeInTextArea(Element*);
</span><span class="cx"> WEBCORE_EXPORT WritingDirection baseWritingDirectionForSelectionStart() const;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void replaceSelectionWithFragment(PassRefPtr<DocumentFragment>, bool selectReplacement, bool smartReplace, bool matchStyle, EditAction = EditActionInsert, MailBlockquoteHandling = MailBlockquoteHandling::RespectBlockquote);
- WEBCORE_EXPORT void replaceSelectionWithText(const String&, bool selectReplacement, bool smartReplace, EditAction = EditActionInsert);
</del><ins>+ WEBCORE_EXPORT void replaceSelectionWithFragment(PassRefPtr<DocumentFragment>, bool selectReplacement, bool smartReplace, bool matchStyle, MailBlockquoteHandling = MailBlockquoteHandling::RespectBlockquote);
+ WEBCORE_EXPORT void replaceSelectionWithText(const String&, bool selectReplacement, bool smartReplace);
</ins><span class="cx"> WEBCORE_EXPORT bool selectionStartHasMarkerFor(DocumentMarker::MarkerType, int from, int length) const;
</span><span class="cx"> void updateMarkersForWordsAffectedByEditing(bool onlyHandleWordsContainingSelection);
</span><span class="cx"> void deletedAutocorrectionAtPosition(const Position&, const String& originalString);
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> enum SetCompositionMode { ConfirmComposition, CancelComposition };
</span><span class="cx"> void setComposition(const String&, SetCompositionMode);
</span><span class="cx">
</span><del>- void changeSelectionAfterCommand(const VisibleSelection& newSelection, FrameSelection::SetSelectionOptions, AXTextStateChangeIntent = AXTextStateChangeIntent());
</del><ins>+ void changeSelectionAfterCommand(const VisibleSelection& newSelection, FrameSelection::SetSelectionOptions);
</ins><span class="cx">
</span><span class="cx"> enum EditorActionSpecifier { CutAction, CopyAction };
</span><span class="cx"> void performCutOrCopy(EditorActionSpecifier);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditorCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditorCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/EditorCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> static bool executeInsertFragment(Frame& frame, PassRefPtr<DocumentFragment> fragment)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(frame.document());
</span><del>- applyCommand(ReplaceSelectionCommand::create(*frame.document(), fragment, ReplaceSelectionCommand::PreventNesting, EditActionInsert));
</del><ins>+ applyCommand(ReplaceSelectionCommand::create(*frame.document(), fragment, ReplaceSelectionCommand::PreventNesting, EditActionUnspecified));
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "FrameSelection.h"
</span><span class="cx">
</span><del>-#include "AXObjectCache.h"
</del><span class="cx"> #include "CharacterData.h"
</span><span class="cx"> #include "DeleteSelectionCommand.h"
</span><span class="cx"> #include "Document.h"
</span><span class="lines">@@ -140,7 +139,7 @@
</span><span class="cx"> void FrameSelection::moveTo(const VisiblePosition &pos, EUserTriggered userTriggered, CursorAlignOnScroll align)
</span><span class="cx"> {
</span><span class="cx"> setSelection(VisibleSelection(pos.deepEquivalent(), pos.deepEquivalent(), pos.affinity(), m_selection.isDirectional()),
</span><del>- defaultSetSelectionOptions(userTriggered), AXTextStateChangeIntent(), align);
</del><ins>+ defaultSetSelectionOptions(userTriggered), align);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameSelection::moveTo(const VisiblePosition &base, const VisiblePosition &extent, EUserTriggered userTriggered)
</span><span class="lines">@@ -171,8 +170,7 @@
</span><span class="cx"> VisibleSelection newSelection;
</span><span class="cx"> newSelection.setWithoutValidation(base, extent);
</span><span class="cx"> newSelection.setIsDirectional(selectionHasDirection);
</span><del>- AXTextStateChangeIntent intent(AXTextStateChangeTypeSelectionMove, AXTextSelection { AXTextSelectionDirectionDiscontiguous, AXTextSelectionGranularityUnknown });
- setSelection(newSelection, defaultSetSelectionOptions() | (shouldSetFocus ? 0 : DoNotSetFocus), intent);
</del><ins>+ setSelection(newSelection, defaultSetSelectionOptions() | (shouldSetFocus ? 0 : DoNotSetFocus));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DragCaretController::setCaretPosition(const VisiblePosition& position)
</span><span class="lines">@@ -256,13 +254,7 @@
</span><span class="cx"> if (m_selection == newSelection || !shouldChangeSelection(newSelection))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-
- AXTextStateChangeIntent intent;
- if (AXObjectCache::accessibilityEnabled() && newSelection.isCaret())
- intent = AXTextStateChangeIntent(AXTextStateChangeTypeSelectionMove, AXTextSelection { AXTextSelectionDirectionDiscontiguous, AXTextSelectionGranularityUnknown });
- else
- intent = AXTextStateChangeIntent();
- setSelection(newSelection, defaultSetSelectionOptions() | FireSelectEvent, intent, AlignCursorOnScrollIfNeeded, granularity);
</del><ins>+ setSelection(newSelection, defaultSetSelectionOptions() | FireSelectEvent, AlignCursorOnScrollIfNeeded, granularity);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool FrameSelection::setSelectionWithoutUpdatingAppearance(const VisibleSelection& newSelectionPossiblyWithoutDirection, SetSelectionOptions options, CursorAlignOnScroll align, TextGranularity granularity)
</span><span class="lines">@@ -284,7 +276,7 @@
</span><span class="cx"> if (Document* newSelectionDocument = newSelection.base().document()) {
</span><span class="cx"> if (RefPtr<Frame> newSelectionFrame = newSelectionDocument->frame()) {
</span><span class="cx"> if (newSelectionFrame != m_frame && newSelectionDocument != m_frame->document()) {
</span><del>- newSelectionFrame->selection().setSelection(newSelection, options, AXTextStateChangeIntent(), align, granularity);
</del><ins>+ newSelectionFrame->selection().setSelection(newSelection, options, align, granularity);
</ins><span class="cx"> // It's possible that during the above set selection, this FrameSelection has been modified by
</span><span class="cx"> // selectFrameElementInParentIfFullySelected, but that the selection is no longer valid since
</span><span class="cx"> // the frame is about to be destroyed. If this is the case, clear our selection.
</span><span class="lines">@@ -328,7 +320,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameSelection::setSelection(const VisibleSelection& selection, SetSelectionOptions options, AXTextStateChangeIntent intent, CursorAlignOnScroll align, TextGranularity granularity)
</del><ins>+void FrameSelection::setSelection(const VisibleSelection& selection, SetSelectionOptions options, CursorAlignOnScroll align, TextGranularity granularity)
</ins><span class="cx"> {
</span><span class="cx"> if (!setSelectionWithoutUpdatingAppearance(selection, options, align, granularity))
</span><span class="cx"> return;
</span><span class="lines">@@ -349,7 +341,7 @@
</span><span class="cx"> if (frameView && frameView->layoutPending())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- updateAndRevealSelection(intent);
</del><ins>+ updateAndRevealSelection();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void updateSelectionByUpdatingLayoutOrStyle(Frame& frame)
</span><span class="lines">@@ -368,7 +360,7 @@
</span><span class="cx"> view->clearSelection();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameSelection::updateAndRevealSelection(AXTextStateChangeIntent intent)
</del><ins>+void FrameSelection::updateAndRevealSelection()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_pendingSelectionUpdate)
</span><span class="cx"> return;
</span><span class="lines">@@ -388,7 +380,7 @@
</span><span class="cx"> revealSelection(alignment, RevealExtent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- notifyAccessibilityForSelectionChange(intent);
</del><ins>+ notifyAccessibilityForSelectionChange();
</ins><span class="cx">
</span><span class="cx"> if (auto* client = m_frame->editor().client())
</span><span class="cx"> client->didChangeSelectionAndUpdateLayout();
</span><span class="lines">@@ -1029,76 +1021,8 @@
</span><span class="cx"> static bool isBoundary(TextGranularity granularity)
</span><span class="cx"> {
</span><span class="cx"> return granularity == LineBoundary || granularity == ParagraphBoundary || granularity == DocumentBoundary;
</span><del>-}
</del><ins>+}
</ins><span class="cx">
</span><del>-AXTextStateChangeIntent FrameSelection::textSelectionIntent(EAlteration alter, SelectionDirection direction, TextGranularity granularity)
-{
- AXTextStateChangeIntent intent = AXTextStateChangeIntent();
- bool flip = false;
- if (alter == FrameSelection::AlterationMove) {
- intent.type = AXTextStateChangeTypeSelectionMove;
- flip = isRange() && directionOfSelection() == RTL;
- } else
- intent.type = AXTextStateChangeTypeSelectionExtend;
- switch (granularity) {
- case CharacterGranularity:
- intent.selection.granularity = AXTextSelectionGranularityCharacter;
- break;
- case WordGranularity:
- intent.selection.granularity = AXTextSelectionGranularityWord;
- break;
- case SentenceGranularity:
- case SentenceBoundary:
- intent.selection.granularity = AXTextSelectionGranularitySentence;
- break;
- case LineGranularity:
- case LineBoundary:
- intent.selection.granularity = AXTextSelectionGranularityLine;
- break;
- case ParagraphGranularity:
- case ParagraphBoundary:
- intent.selection.granularity = AXTextSelectionGranularityParagraph;
- break;
- case DocumentGranularity:
- case DocumentBoundary:
- intent.selection.granularity = AXTextSelectionGranularityDocument;
- break;
- }
- bool boundary = false;
- switch (granularity) {
- case CharacterGranularity:
- case WordGranularity:
- case SentenceGranularity:
- case LineGranularity:
- case ParagraphGranularity:
- case DocumentGranularity:
- break;
- case SentenceBoundary:
- case LineBoundary:
- case ParagraphBoundary:
- case DocumentBoundary:
- boundary = true;
- break;
- }
- switch (direction) {
- case DirectionRight:
- case DirectionForward:
- if (boundary)
- intent.selection.direction = flip ? AXTextSelectionDirectionBeginning : AXTextSelectionDirectionEnd;
- else
- intent.selection.direction = flip ? AXTextSelectionDirectionPrevious : AXTextSelectionDirectionNext;
- break;
- case DirectionLeft:
- case DirectionBackward:
- if (boundary)
- intent.selection.direction = flip ? AXTextSelectionDirectionEnd : AXTextSelectionDirectionBeginning;
- else
- intent.selection.direction = flip ? AXTextSelectionDirectionNext : AXTextSelectionDirectionPrevious;
- break;
- }
- return intent;
-}
-
</del><span class="cx"> bool FrameSelection::modify(EAlteration alter, SelectionDirection direction, TextGranularity granularity, EUserTriggered userTriggered)
</span><span class="cx"> {
</span><span class="cx"> if (userTriggered == UserTriggered) {
</span><span class="lines">@@ -1153,11 +1077,6 @@
</span><span class="cx"> if (!wasRange && alter == AlterationMove && position == originalStartPosition)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (m_frame && AXObjectCache::accessibilityEnabled()) {
- if (AXObjectCache* cache = m_frame->document()->existingAXObjectCache())
- cache->setTextSelectionIntent(textSelectionIntent(alter, direction, granularity));
- }
-
</del><span class="cx"> // Some of the above operations set an xPosForVerticalArrowNavigation.
</span><span class="cx"> // Setting a selection will clear it, so save it to possibly restore later.
</span><span class="cx"> // Note: the START position type is arbitrary because it is unused, it would be
</span><span class="lines">@@ -1791,10 +1710,8 @@
</span><span class="cx">
</span><span class="cx"> VisibleSelection newSelection(VisibleSelection::selectionFromContentsOfNode(root.get()));
</span><span class="cx">
</span><del>- if (shouldChangeSelection(newSelection)) {
- AXTextStateChangeIntent intent(AXTextStateChangeTypeSelectionExtend, AXTextSelection { AXTextSelectionDirectionDiscontiguous, AXTextSelectionGranularityAll });
- setSelection(newSelection, defaultSetSelectionOptions() | FireSelectEvent, intent);
- }
</del><ins>+ if (shouldChangeSelection(newSelection))
+ setSelection(newSelection, defaultSetSelectionOptions() | FireSelectEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool FrameSelection::setSelectedRange(Range* range, EAffinity affinity, bool closeTyping)
</span><span class="lines">@@ -2506,7 +2423,7 @@
</span><span class="cx">
</span><span class="cx"> VisibleSelection newSelection = frameSelection.selection();
</span><span class="cx"> newSelection.expandUsingGranularity(WordGranularity);
</span><del>- frameSelection.setSelection(newSelection, defaultSetSelectionOptions(), AXTextStateChangeIntent(), AlignCursorOnScrollIfNeeded, frameSelection.granularity());
</del><ins>+ frameSelection.setSelection(newSelection, defaultSetSelectionOptions(), AlignCursorOnScrollIfNeeded, frameSelection.granularity());
</ins><span class="cx">
</span><span class="cx"> Position startPos(frameSelection.selection().start());
</span><span class="cx"> Position endPos(frameSelection.selection().end());
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #ifndef FrameSelection_h
</span><span class="cx"> #define FrameSelection_h
</span><span class="cx">
</span><del>-#include "AXTextStateChangeIntent.h"
</del><span class="cx"> #include "EditingStyle.h"
</span><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include "LayoutRect.h"
</span><span class="lines">@@ -145,7 +144,7 @@
</span><span class="cx"> void moveWithoutValidationTo(const Position&, const Position&, bool selectionHasDirection, bool shouldSetFocus);
</span><span class="cx">
</span><span class="cx"> const VisibleSelection& selection() const { return m_selection; }
</span><del>- WEBCORE_EXPORT void setSelection(const VisibleSelection&, SetSelectionOptions = defaultSetSelectionOptions(), AXTextStateChangeIntent = AXTextStateChangeIntent(), CursorAlignOnScroll = AlignCursorOnScrollIfNeeded, TextGranularity = CharacterGranularity);
</del><ins>+ WEBCORE_EXPORT void setSelection(const VisibleSelection&, SetSelectionOptions = defaultSetSelectionOptions(), CursorAlignOnScroll = AlignCursorOnScrollIfNeeded, TextGranularity = CharacterGranularity);
</ins><span class="cx"> WEBCORE_EXPORT bool setSelectedRange(Range*, EAffinity, bool closeTyping);
</span><span class="cx"> WEBCORE_EXPORT void selectAll();
</span><span class="cx"> WEBCORE_EXPORT void clear();
</span><span class="lines">@@ -273,7 +272,7 @@
</span><span class="cx"> private:
</span><span class="cx"> enum EPositionType { START, END, BASE, EXTENT };
</span><span class="cx">
</span><del>- void updateAndRevealSelection(AXTextStateChangeIntent = AXTextStateChangeIntent());
</del><ins>+ void updateAndRevealSelection();
</ins><span class="cx"> void updateDataDetectorsForSelection();
</span><span class="cx">
</span><span class="cx"> bool setSelectionWithoutUpdatingAppearance(const VisibleSelection&, SetSelectionOptions, CursorAlignOnScroll, TextGranularity);
</span><span class="lines">@@ -298,11 +297,10 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit lineDirectionPointForBlockDirectionNavigation(EPositionType);
</span><span class="cx">
</span><del>- AXTextStateChangeIntent textSelectionIntent(EAlteration, SelectionDirection, TextGranularity);
</del><span class="cx"> #if HAVE(ACCESSIBILITY)
</span><del>- void notifyAccessibilityForSelectionChange(AXTextStateChangeIntent = AXTextStateChangeIntent());
</del><ins>+ void notifyAccessibilityForSelectionChange();
</ins><span class="cx"> #else
</span><del>- void notifyAccessibilityForSelectionChange(AXTextSelectionIntent) { }
</del><ins>+ void notifyAccessibilityForSelectionChange() { }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void updateSelectionCachesIfSelectionIsInsideTextFormControl(EUserTriggered);
</span><span class="lines">@@ -369,7 +367,7 @@
</span><span class="cx">
</span><span class="cx"> #if !(PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(EFL))
</span><span class="cx"> #if HAVE(ACCESSIBILITY)
</span><del>-inline void FrameSelection::notifyAccessibilityForSelectionChange(AXTextStateChangeIntent)
</del><ins>+inline void FrameSelection::notifyAccessibilityForSelectionChange()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingInsertIntoTextNodeCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-InsertIntoTextNodeCommand::InsertIntoTextNodeCommand(RefPtr<Text>&& node, unsigned offset, const String& text, EditAction editingAction)
- : SimpleEditCommand(node->document(), editingAction)
</del><ins>+InsertIntoTextNodeCommand::InsertIntoTextNodeCommand(PassRefPtr<Text> node, unsigned offset, const String& text)
+ : SimpleEditCommand(node->document())
</ins><span class="cx"> , m_node(node)
</span><span class="cx"> , m_offset(offset)
</span><span class="cx"> , m_text(text)
</span><span class="lines">@@ -66,8 +66,8 @@
</span><span class="cx">
</span><span class="cx"> m_node->insertData(m_offset, m_text, IGNORE_EXCEPTION);
</span><span class="cx">
</span><del>- if (AXObjectCache::accessibilityEnabled())
- notifyAccessibilityForTextChange(m_node.get(), applyEditType(), m_text, VisiblePosition(Position(m_node, m_offset)));
</del><ins>+ if (AXObjectCache* cache = document().existingAXObjectCache())
+ cache->nodeTextChangeNotification(m_node.get(), AXObjectCache::AXTextInserted, m_offset, m_text);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Need to notify this before actually deleting the text
</span><del>- if (AXObjectCache::accessibilityEnabled())
- notifyAccessibilityForTextChange(m_node.get(), unapplyEditType(), m_text, VisiblePosition(Position(m_node, m_offset)));
</del><ins>+ if (AXObjectCache* cache = document().existingAXObjectCache())
+ cache->nodeTextChangeNotification(m_node.get(), AXObjectCache::AXTextDeleted, m_offset, m_text);
</ins><span class="cx">
</span><span class="cx"> m_node->deleteData(m_offset, m_text.length(), IGNORE_EXCEPTION);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingInsertIntoTextNodeCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -34,17 +34,14 @@
</span><span class="cx">
</span><span class="cx"> class InsertIntoTextNodeCommand : public SimpleEditCommand {
</span><span class="cx"> public:
</span><del>- static Ref<InsertIntoTextNodeCommand> create(RefPtr<Text>&& node, unsigned offset, const String& text, EditAction editingAction = EditActionInsert)
</del><ins>+ static Ref<InsertIntoTextNodeCommand> create(PassRefPtr<Text> node, unsigned offset, const String& text)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InsertIntoTextNodeCommand(WTF::move(node), offset, text, editingAction));
</del><ins>+ return adoptRef(*new InsertIntoTextNodeCommand(node, offset, text));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- const String& insertedText();
-
-protected:
- InsertIntoTextNodeCommand(RefPtr<Text>&& node, unsigned offset, const String& text, EditAction editingAction);
-
</del><span class="cx"> private:
</span><ins>+ InsertIntoTextNodeCommand(PassRefPtr<Text> node, unsigned offset, const String& text);
+
</ins><span class="cx"> virtual void doApply() override;
</span><span class="cx"> virtual void doUnapply() override;
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -60,11 +57,6 @@
</span><span class="cx"> String m_text;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline const String& InsertIntoTextNodeCommand::insertedText()
-{
- return m_text;
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // InsertIntoTextNodeCommand_h
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingInsertNodeBeforeCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/InsertNodeBeforeCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/InsertNodeBeforeCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/InsertNodeBeforeCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -29,13 +29,13 @@
</span><span class="cx"> #include "AXObjectCache.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "ExceptionCodePlaceholder.h"
</span><del>-#include "Text.h"
</del><span class="cx"> #include "htmlediting.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-InsertNodeBeforeCommand::InsertNodeBeforeCommand(RefPtr<Node>&& insertChild, RefPtr<Node>&& refChild, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable, EditAction editingAction)
- : SimpleEditCommand(refChild->document(), editingAction)
</del><ins>+InsertNodeBeforeCommand::InsertNodeBeforeCommand(PassRefPtr<Node> insertChild, PassRefPtr<Node> refChild,
+ ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable)
+ : SimpleEditCommand(refChild->document())
</ins><span class="cx"> , m_insertChild(insertChild)
</span><span class="cx"> , m_refChild(refChild)
</span><span class="cx"> , m_shouldAssumeContentIsAlwaysEditable(shouldAssumeContentIsAlwaysEditable)
</span><span class="lines">@@ -57,10 +57,8 @@
</span><span class="cx">
</span><span class="cx"> parent->insertBefore(m_insertChild.get(), m_refChild.get(), IGNORE_EXCEPTION);
</span><span class="cx">
</span><del>- if (AXObjectCache::accessibilityEnabled()) {
- Position position = is<Text>(m_insertChild.get()) ? Position(downcast<Text>(m_insertChild.get()), 0) : createLegacyEditingPosition(m_insertChild.get(), 0);
- notifyAccessibilityForTextChange(m_insertChild.get(), applyEditType(), m_insertChild->nodeValue(), VisiblePosition(position));
- }
</del><ins>+ if (AXObjectCache* cache = document().existingAXObjectCache())
+ cache->nodeTextChangeNotification(m_insertChild.get(), AXObjectCache::AXTextInserted, 0, m_insertChild->nodeValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InsertNodeBeforeCommand::doUnapply()
</span><span class="lines">@@ -69,10 +67,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Need to notify this before actually deleting the text
</span><del>- if (AXObjectCache::accessibilityEnabled()) {
- Position position = is<Text>(m_insertChild.get()) ? Position(downcast<Text>(m_insertChild.get()), 0) : createLegacyEditingPosition(m_insertChild.get(), 0);
- notifyAccessibilityForTextChange(m_insertChild.get(), unapplyEditType(), m_insertChild->nodeValue(), VisiblePosition(position));
- }
</del><ins>+ if (AXObjectCache* cache = document().existingAXObjectCache())
+ cache->nodeTextChangeNotification(m_insertChild.get(), AXObjectCache::AXTextDeleted, 0, m_insertChild->nodeValue());
</ins><span class="cx">
</span><span class="cx"> m_insertChild->remove(IGNORE_EXCEPTION);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingInsertNodeBeforeCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/InsertNodeBeforeCommand.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/InsertNodeBeforeCommand.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/InsertNodeBeforeCommand.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -32,23 +32,22 @@
</span><span class="cx">
</span><span class="cx"> class InsertNodeBeforeCommand : public SimpleEditCommand {
</span><span class="cx"> public:
</span><del>- static Ref<InsertNodeBeforeCommand> create(RefPtr<Node>&& childToInsert, RefPtr<Node>&& childToInsertBefore,
- ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable, EditAction editingAction = EditActionInsert)
</del><ins>+ static Ref<InsertNodeBeforeCommand> create(PassRefPtr<Node> childToInsert, PassRefPtr<Node> childToInsertBefore,
+ ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InsertNodeBeforeCommand(WTF::move(childToInsert), WTF::move(childToInsertBefore), shouldAssumeContentIsAlwaysEditable, editingAction));
</del><ins>+ return adoptRef(*new InsertNodeBeforeCommand(childToInsert, childToInsertBefore, shouldAssumeContentIsAlwaysEditable));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-protected:
- InsertNodeBeforeCommand(RefPtr<Node>&& childToInsert, RefPtr<Node>&& childToInsertBefore, ShouldAssumeContentIsAlwaysEditable, EditAction);
-
</del><span class="cx"> private:
</span><ins>+ InsertNodeBeforeCommand(PassRefPtr<Node> childToInsert, PassRefPtr<Node> childToInsertBefore, ShouldAssumeContentIsAlwaysEditable);
+
</ins><span class="cx"> virtual void doApply() override;
</span><span class="cx"> virtual void doUnapply() override;
</span><del>-
</del><ins>+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> virtual void getNodesInCommand(HashSet<Node*>&) override;
</span><span class="cx"> #endif
</span><del>-
</del><ins>+
</ins><span class="cx"> RefPtr<Node> m_insertChild;
</span><span class="cx"> RefPtr<Node> m_refChild;
</span><span class="cx"> ShouldAssumeContentIsAlwaysEditable m_shouldAssumeContentIsAlwaysEditable;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingInsertParagraphSeparatorCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> return curBlock;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InsertParagraphSeparatorCommand::InsertParagraphSeparatorCommand(Document& document, bool mustUseDefaultParagraphElement, bool pasteBlockqutoeIntoUnquotedArea, EditAction editingAction)
- : CompositeEditCommand(document, editingAction)
</del><ins>+InsertParagraphSeparatorCommand::InsertParagraphSeparatorCommand(Document& document, bool mustUseDefaultParagraphElement, bool pasteBlockqutoeIntoUnquotedArea)
+ : CompositeEditCommand(document)
</ins><span class="cx"> , m_mustUseDefaultParagraphElement(mustUseDefaultParagraphElement)
</span><span class="cx"> , m_pasteBlockqutoeIntoUnquotedArea(pasteBlockqutoeIntoUnquotedArea)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingInsertParagraphSeparatorCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -34,13 +34,13 @@
</span><span class="cx">
</span><span class="cx"> class InsertParagraphSeparatorCommand : public CompositeEditCommand {
</span><span class="cx"> public:
</span><del>- static Ref<InsertParagraphSeparatorCommand> create(Document& document, bool useDefaultParagraphElement = false, bool pasteBlockqutoeIntoUnquotedArea = false, EditAction editingAction = EditActionInsert)
</del><ins>+ static Ref<InsertParagraphSeparatorCommand> create(Document& document, bool useDefaultParagraphElement = false, bool pasteBlockqutoeIntoUnquotedArea = false)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InsertParagraphSeparatorCommand(document, useDefaultParagraphElement, pasteBlockqutoeIntoUnquotedArea, editingAction));
</del><ins>+ return adoptRef(*new InsertParagraphSeparatorCommand(document, useDefaultParagraphElement, pasteBlockqutoeIntoUnquotedArea));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- InsertParagraphSeparatorCommand(Document&, bool useDefaultParagraphElement, bool pasteBlockqutoeIntoUnquotedArea, EditAction);
</del><ins>+ InsertParagraphSeparatorCommand(Document&, bool useDefaultParagraphElement, bool pasteBlockqutoeIntoUnquotedArea);
</ins><span class="cx">
</span><span class="cx"> virtual void doApply();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingInsertTextCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/InsertTextCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/InsertTextCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/InsertTextCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -37,16 +37,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-InsertTextCommand::InsertTextCommand(Document& document, const String& text, bool selectInsertedText, RebalanceType rebalanceType, EditAction editingAction)
- : CompositeEditCommand(document, editingAction)
</del><ins>+InsertTextCommand::InsertTextCommand(Document& document, const String& text, bool selectInsertedText, RebalanceType rebalanceType)
+ : CompositeEditCommand(document)
</ins><span class="cx"> , m_text(text)
</span><span class="cx"> , m_selectInsertedText(selectInsertedText)
</span><span class="cx"> , m_rebalanceType(rebalanceType)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InsertTextCommand::InsertTextCommand(Document& document, const String& text, PassRefPtr<TextInsertionMarkerSupplier> markerSupplier, EditAction editingAction)
- : CompositeEditCommand(document, editingAction)
</del><ins>+InsertTextCommand::InsertTextCommand(Document& document, const String& text, PassRefPtr<TextInsertionMarkerSupplier> markerSupplier)
+ : CompositeEditCommand(document)
</ins><span class="cx"> , m_text(text)
</span><span class="cx"> , m_selectInsertedText(false)
</span><span class="cx"> , m_rebalanceType(RebalanceLeadingAndTrailingWhitespaces)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingInsertTextCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/InsertTextCommand.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/InsertTextCommand.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/InsertTextCommand.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -49,22 +49,21 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static Ref<InsertTextCommand> create(Document& document, const String& text, bool selectInsertedText = false,
</span><del>- RebalanceType rebalanceType = RebalanceLeadingAndTrailingWhitespaces, EditAction editingAction = EditActionInsert)
</del><ins>+ RebalanceType rebalanceType = RebalanceLeadingAndTrailingWhitespaces)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InsertTextCommand(document, text, selectInsertedText, rebalanceType, editingAction));
</del><ins>+ return adoptRef(*new InsertTextCommand(document, text, selectInsertedText, rebalanceType));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- static Ref<InsertTextCommand> createWithMarkerSupplier(Document& document, const String& text, PassRefPtr<TextInsertionMarkerSupplier> markerSupplier, EditAction editingAction = EditActionInsert)
</del><ins>+ static Ref<InsertTextCommand> createWithMarkerSupplier(Document& document, const String& text, PassRefPtr<TextInsertionMarkerSupplier> markerSupplier)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InsertTextCommand(document, text, markerSupplier, editingAction));
</del><ins>+ return adoptRef(*new InsertTextCommand(document, text, markerSupplier));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-protected:
- InsertTextCommand(Document&, const String& text, PassRefPtr<TextInsertionMarkerSupplier>, EditAction);
- InsertTextCommand(Document&, const String& text, bool selectInsertedText, RebalanceType, EditAction);
-
</del><span class="cx"> private:
</span><span class="cx">
</span><ins>+ InsertTextCommand(Document&, const String& text, bool selectInsertedText, RebalanceType);
+ InsertTextCommand(Document&, const String& text, PassRefPtr<TextInsertionMarkerSupplier>);
+
</ins><span class="cx"> void deleteCharacter();
</span><span class="cx">
</span><span class="cx"> virtual void doApply();
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingMoveSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/MoveSelectionCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/MoveSelectionCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/MoveSelectionCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> ReplaceSelectionCommand::CommandOptions options = ReplaceSelectionCommand::SelectReplacement | ReplaceSelectionCommand::PreventNesting;
</span><span class="cx"> if (m_smartInsert)
</span><span class="cx"> options |= ReplaceSelectionCommand::SmartReplace;
</span><del>- applyCommandToComposite(ReplaceSelectionCommand::create(document(), WTF::move(m_fragment), options));
</del><ins>+ applyCommandToComposite(ReplaceSelectionCommand::create(document(), m_fragment, options));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EditAction MoveSelectionCommand::editingAction() const
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingRemoveNodePreservingChildrenCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/RemoveNodePreservingChildrenCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/RemoveNodePreservingChildrenCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/RemoveNodePreservingChildrenCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RemoveNodePreservingChildrenCommand::RemoveNodePreservingChildrenCommand(PassRefPtr<Node> node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable, EditAction editingAction)
- : CompositeEditCommand(node->document(), editingAction)
</del><ins>+RemoveNodePreservingChildrenCommand::RemoveNodePreservingChildrenCommand(PassRefPtr<Node> node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable)
+ : CompositeEditCommand(node->document())
</ins><span class="cx"> , m_node(node)
</span><span class="cx"> , m_shouldAssumeContentIsAlwaysEditable(shouldAssumeContentIsAlwaysEditable)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingRemoveNodePreservingChildrenCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/RemoveNodePreservingChildrenCommand.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/RemoveNodePreservingChildrenCommand.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/RemoveNodePreservingChildrenCommand.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -32,13 +32,13 @@
</span><span class="cx">
</span><span class="cx"> class RemoveNodePreservingChildrenCommand : public CompositeEditCommand {
</span><span class="cx"> public:
</span><del>- static Ref<RemoveNodePreservingChildrenCommand> create(PassRefPtr<Node> node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable, EditAction editingAction)
</del><ins>+ static Ref<RemoveNodePreservingChildrenCommand> create(PassRefPtr<Node> node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new RemoveNodePreservingChildrenCommand(node, shouldAssumeContentIsAlwaysEditable, editingAction));
</del><ins>+ return adoptRef(*new RemoveNodePreservingChildrenCommand(node, shouldAssumeContentIsAlwaysEditable));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit RemoveNodePreservingChildrenCommand(PassRefPtr<Node>, ShouldAssumeContentIsAlwaysEditable, EditAction);
</del><ins>+ explicit RemoveNodePreservingChildrenCommand(PassRefPtr<Node>, ShouldAssumeContentIsAlwaysEditable);
</ins><span class="cx">
</span><span class="cx"> virtual void doApply();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceDeleteFromTextNodeCommandcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/editing/ReplaceDeleteFromTextNodeCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceDeleteFromTextNodeCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/ReplaceDeleteFromTextNodeCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ReplaceDeleteFromTextNodeCommand.h"
-
-#include "Text.h"
-
-namespace WebCore {
-
-ReplaceDeleteFromTextNodeCommand::ReplaceDeleteFromTextNodeCommand(RefPtr<Text>&& text, unsigned offset, unsigned count)
- : DeleteFromTextNodeCommand(WTF::move(text), offset, count, EditActionDelete)
-{
-}
-
-void ReplaceDeleteFromTextNodeCommand::notifyAccessibilityForTextChange(Node*, AXTextEditType, const String&, const VisiblePosition&)
-{
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceDeleteFromTextNodeCommandh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/editing/ReplaceDeleteFromTextNodeCommand.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceDeleteFromTextNodeCommand.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/ReplaceDeleteFromTextNodeCommand.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ReplaceDeleteFromTextNodeCommand_h
-#define ReplaceDeleteFromTextNodeCommand_h
-
-#include "DeleteFromTextNodeCommand.h"
-
-namespace WebCore {
-
-class ReplaceDeleteFromTextNodeCommand final : public DeleteFromTextNodeCommand {
-public:
- static Ref<ReplaceDeleteFromTextNodeCommand> create(RefPtr<Text>&& text, unsigned offset, unsigned count)
- {
- return adoptRef(*new ReplaceDeleteFromTextNodeCommand(WTF::move(text), offset, count));
- }
-
-private:
- ReplaceDeleteFromTextNodeCommand(RefPtr<Text>&&, unsigned, unsigned);
- virtual void notifyAccessibilityForTextChange(Node*, AXTextEditType, const String&, const VisiblePosition&) override;
-};
-
-} // namespace WebCore
-
-#endif // ReplaceDeleteFromTextNodeCommand_h
</del></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceInsertIntoTextNodeCommandcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/editing/ReplaceInsertIntoTextNodeCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceInsertIntoTextNodeCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/ReplaceInsertIntoTextNodeCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,66 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ReplaceInsertIntoTextNodeCommand.h"
-
-#include "AXObjectCache.h"
-#include "Document.h"
-#include "Text.h"
-
-namespace WebCore {
-
-ReplaceInsertIntoTextNodeCommand::ReplaceInsertIntoTextNodeCommand(RefPtr<Text>&& node, unsigned offset, const String& text, const String& deletedText, EditAction editingAction)
- : InsertIntoTextNodeCommand(WTF::move(node), offset, text, editingAction)
- , m_deletedText(deletedText)
-{
-}
-
-void ReplaceInsertIntoTextNodeCommand::notifyAccessibilityForTextChange(Node* node, AXTextEditType type, const String& text, const VisiblePosition& position)
-{
- if (!AXObjectCache::accessibilityEnabled())
- return;
- AXObjectCache* cache = document().existingAXObjectCache();
- if (!cache)
- return;
- switch (type) {
- case AXTextEditTypeUnknown:
- break;
- case AXTextEditTypeCut:
- case AXTextEditTypeDictation:
- ASSERT_NOT_REACHED();
- break;
- case AXTextEditTypeDelete:
- cache->postTextReplacementNotification(node, AXTextEditTypeDelete, text, AXTextEditTypeInsert, m_deletedText, position);
- break;
- case AXTextEditTypeInsert:
- case AXTextEditTypePaste:
- case AXTextEditTypeTyping:
- cache->postTextReplacementNotification(node, AXTextEditTypeDelete, m_deletedText, type, text, position);
- break;
- }
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceInsertIntoTextNodeCommandh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/editing/ReplaceInsertIntoTextNodeCommand.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceInsertIntoTextNodeCommand.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/ReplaceInsertIntoTextNodeCommand.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ReplaceInsertIntoTextNodeCommand_h
-#define ReplaceInsertIntoTextNodeCommand_h
-
-#include "InsertIntoTextNodeCommand.h"
-
-namespace WebCore {
-
-class ReplaceInsertIntoTextNodeCommand final : public InsertIntoTextNodeCommand {
-public:
- static Ref<ReplaceInsertIntoTextNodeCommand> create(RefPtr<Text>&& node, unsigned offset, const String& text, const String& deletedText, EditAction editingAction)
- {
- return adoptRef(*new ReplaceInsertIntoTextNodeCommand(WTF::move(node), offset, text, deletedText, editingAction));
- }
-
-private:
- ReplaceInsertIntoTextNodeCommand(RefPtr<Text>&&, unsigned, const String&, const String&, EditAction);
- virtual void notifyAccessibilityForTextChange(Node*, AXTextEditType, const String&, const VisiblePosition&) override;
-
- String m_deletedText;
-};
-
-} // namespace WebCore
-
-#endif // ReplaceInsertIntoTextNodeCommand_h
</del></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -47,8 +47,6 @@
</span><span class="cx"> #include "RenderInline.h"
</span><span class="cx"> #include "RenderObject.h"
</span><span class="cx"> #include "RenderText.h"
</span><del>-#include "ReplaceDeleteFromTextNodeCommand.h"
-#include "ReplaceInsertIntoTextNodeCommand.h"
</del><span class="cx"> #include "SimplifyMarkupCommand.h"
</span><span class="cx"> #include "SmartReplace.h"
</span><span class="cx"> #include "StyleProperties.h"
</span><span class="lines">@@ -370,14 +368,15 @@
</span><span class="cx"> m_lastNodeInserted = newNode;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ReplaceSelectionCommand::ReplaceSelectionCommand(Document& document, RefPtr<DocumentFragment>&& fragment, CommandOptions options, EditAction editAction)
- : CompositeEditCommand(document, editAction)
</del><ins>+ReplaceSelectionCommand::ReplaceSelectionCommand(Document& document, PassRefPtr<DocumentFragment> fragment, CommandOptions options, EditAction editAction)
+ : CompositeEditCommand(document)
</ins><span class="cx"> , m_selectReplacement(options & SelectReplacement)
</span><span class="cx"> , m_smartReplace(options & SmartReplace)
</span><span class="cx"> , m_matchStyle(options & MatchStyle)
</span><span class="cx"> , m_documentFragment(fragment)
</span><span class="cx"> , m_preventNesting(options & PreventNesting)
</span><span class="cx"> , m_movingParagraph(options & MovingParagraph)
</span><ins>+ , m_editAction(editAction)
</ins><span class="cx"> , m_sanitizeFragment(options & SanitizeFragment)
</span><span class="cx"> , m_shouldMergeEnd(false)
</span><span class="cx"> , m_ignoreMailBlockquote(options & IgnoreMailBlockquote)
</span><span class="lines">@@ -1428,6 +1427,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+EditAction ReplaceSelectionCommand::editingAction() const
+{
+ return m_editAction;
+}
+
</ins><span class="cx"> // If the user is inserting a list into an existing list, instead of nesting the list,
</span><span class="cx"> // we put the list items into the existing list.
</span><span class="cx"> Node* ReplaceSelectionCommand::insertAsListItems(PassRefPtr<HTMLElement> prpListElement, Node* insertionBlock, const Position& insertPos, InsertedNodes& insertedNodes)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceSelectionCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -48,16 +48,17 @@
</span><span class="cx">
</span><span class="cx"> typedef unsigned CommandOptions;
</span><span class="cx">
</span><del>- static Ref<ReplaceSelectionCommand> create(Document& document, RefPtr<DocumentFragment>&& fragment, CommandOptions options, EditAction editingAction = EditActionInsert)
</del><ins>+ static Ref<ReplaceSelectionCommand> create(Document& document, PassRefPtr<DocumentFragment> fragment, CommandOptions options, EditAction action = EditActionPaste)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new ReplaceSelectionCommand(document, WTF::move(fragment), options, editingAction));
</del><ins>+ return adoptRef(*new ReplaceSelectionCommand(document, fragment, options, action));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- ReplaceSelectionCommand(Document&, RefPtr<DocumentFragment>&&, CommandOptions, EditAction);
</del><ins>+ ReplaceSelectionCommand(Document&, PassRefPtr<DocumentFragment>, CommandOptions, EditAction);
</ins><span class="cx">
</span><span class="cx"> virtual void doApply();
</span><del>-
</del><ins>+ virtual EditAction editingAction() const;
+
</ins><span class="cx"> class InsertedNodes {
</span><span class="cx"> public:
</span><span class="cx"> void respondToNodeInsertion(Node*);
</span><span class="lines">@@ -119,6 +120,7 @@
</span><span class="cx"> RefPtr<DocumentFragment> m_documentFragment;
</span><span class="cx"> bool m_preventNesting;
</span><span class="cx"> bool m_movingParagraph;
</span><ins>+ EditAction m_editAction;
</ins><span class="cx"> bool m_sanitizeFragment;
</span><span class="cx"> bool m_shouldMergeEnd;
</span><span class="cx"> bool m_ignoreMailBlockquote;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTypingCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TypingCommand.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TypingCommand.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/TypingCommand.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> void TypingCommand::insertTextRunWithoutNewlines(const String &text, bool selectInsertedText)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<InsertTextCommand> command = InsertTextCommand::create(document(), text, selectInsertedText,
</span><del>- m_compositionType == TextCompositionNone ? InsertTextCommand::RebalanceLeadingAndTrailingWhitespaces : InsertTextCommand::RebalanceAllWhitespaces, EditActionTyping);
</del><ins>+ m_compositionType == TextCompositionNone ? InsertTextCommand::RebalanceLeadingAndTrailingWhitespaces : InsertTextCommand::RebalanceAllWhitespaces);
</ins><span class="cx">
</span><span class="cx"> applyCommandToComposite(command, endingSelection());
</span><span class="cx">
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> if (!canAppendNewLineFeedToSelection(endingSelection()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- applyCommandToComposite(InsertParagraphSeparatorCommand::create(document(), false, false, EditActionTyping));
</del><ins>+ applyCommandToComposite(InsertParagraphSeparatorCommand::create(document()));
</ins><span class="cx"> typingAddedToOpenCommand(InsertParagraphSeparator);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingatkFrameSelectionAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/atk/FrameSelectionAtk.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/atk/FrameSelectionAtk.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/atk/FrameSelectionAtk.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-void FrameSelection::notifyAccessibilityForSelectionChange(AXTextStateChangeIntent)
</del><ins>+void FrameSelection::notifyAccessibilityForSelectionChange()
</ins><span class="cx"> {
</span><span class="cx"> if (!AXObjectCache::accessibilityEnabled())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingiosDictationCommandIOScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ios/DictationCommandIOS.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ios/DictationCommandIOS.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/ios/DictationCommandIOS.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> DictationCommandIOS::DictationCommandIOS(Document& document, Vector<Vector<String>>&& dictationPhrases, RetainPtr<id> metadata)
</span><del>- : CompositeEditCommand(document, EditActionDictation)
</del><ins>+ : CompositeEditCommand(document)
</ins><span class="cx"> , m_dictationPhrases(WTF::move(dictationPhrases))
</span><span class="cx"> , m_metadata(WTF::move(metadata))
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingiosDictationCommandIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ios/DictationCommandIOS.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ios/DictationCommandIOS.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/ios/DictationCommandIOS.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> DictationCommandIOS(Document&, Vector<Vector<String>>&& dictationPhrases, RetainPtr<id> metadata);
</span><span class="cx">
</span><span class="cx"> virtual void doApply() override;
</span><ins>+ virtual EditAction editingAction() const override { return EditActionDictation; }
</ins><span class="cx">
</span><span class="cx"> Vector<Vector<String>> m_dictationPhrases;
</span><span class="cx"> RetainPtr<id> m_metadata;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacFrameSelectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/FrameSelectionMac.mm (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/FrameSelectionMac.mm 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/editing/mac/FrameSelectionMac.mm 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -47,13 +47,13 @@
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx">
</span><del>-void FrameSelection::notifyAccessibilityForSelectionChange(AXTextStateChangeIntent intent)
</del><ins>+void FrameSelection::notifyAccessibilityForSelectionChange()
</ins><span class="cx"> {
</span><span class="cx"> Document* document = m_frame->document();
</span><span class="cx">
</span><span class="cx"> if (m_selection.start().isNotNull() && m_selection.end().isNotNull()) {
</span><span class="cx"> if (AXObjectCache* cache = document->existingAXObjectCache())
</span><del>- cache->postTextStateChangeNotification(m_selection.start().deprecatedNode(), intent, m_selection);
</del><ins>+ cache->postNotification(m_selection.start().deprecatedNode()->renderer(), AXObjectCache::AXSelectedTextChanged, TargetObservableParent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -548,26 +548,16 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(isTextFormControl());
</span><del>- String previousValue = innerTextValueFrom(*innerText);
- bool textIsChanged = value != previousValue;
</del><ins>+ bool textIsChanged = value != innerTextValueFrom(*innerText);
</ins><span class="cx"> if (textIsChanged || !innerText->hasChildNodes()) {
</span><del>-#if HAVE(ACCESSIBILITY) && !PLATFORM(COCOA)
</del><span class="cx"> if (textIsChanged && renderer()) {
</span><span class="cx"> if (AXObjectCache* cache = document().existingAXObjectCache())
</span><span class="cx"> cache->postNotification(this, AXObjectCache::AXValueChanged, TargetObservableParent);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> innerText->setInnerText(value, ASSERT_NO_EXCEPTION);
</span><span class="cx">
</span><span class="cx"> if (value.endsWith('\n') || value.endsWith('\r'))
</span><span class="cx"> innerText->appendChild(HTMLBRElement::create(document()), ASSERT_NO_EXCEPTION);
</span><del>-
-#if HAVE(ACCESSIBILITY) && PLATFORM(COCOA)
- if (textIsChanged && renderer()) {
- if (AXObjectCache* cache = document().existingAXObjectCache())
- cache->postTextReplacementNotification(this, AXTextEditTypeDelete, previousValue, AXTextEditTypeInsert, value, VisiblePosition(Position(this, Position::PositionIsBeforeAnchor)));
- }
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> setFormControlValueMatchesRenderer(true);
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/page/DragController.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -524,7 +524,7 @@
</span><span class="cx"> options |= ReplaceSelectionCommand::SmartReplace;
</span><span class="cx"> if (chosePlainText)
</span><span class="cx"> options |= ReplaceSelectionCommand::MatchStyle;
</span><del>- applyCommand(ReplaceSelectionCommand::create(*m_documentUnderMouse, WTF::move(fragment), options));
</del><ins>+ applyCommand(ReplaceSelectionCommand::create(*m_documentUnderMouse, fragment, options));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -3239,8 +3239,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- AXTextStateChangeIntent intent(AXTextStateChangeTypeSelectionMove, AXTextSelection { AXTextSelectionDirectionDiscontiguous, AXTextSelectionGranularityUnknown });
- selection.setSelection(visiblePosition, FrameSelection::defaultSetSelectionOptions(UserTriggered), intent);
</del><ins>+ selection.setSelection(visiblePosition, FrameSelection::defaultSetSelectionOptions(UserTriggered));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void handleKeyboardSelectionMovement(Frame& frame, KeyboardEvent* event)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFocusControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FocusController.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FocusController.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebCore/page/FocusController.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -340,10 +340,8 @@
</span><span class="cx"> if (caretBrowsing) {
</span><span class="cx"> Position position = firstPositionInOrBeforeNode(element.get());
</span><span class="cx"> VisibleSelection newSelection(position, position, DOWNSTREAM);
</span><del>- if (frame.selection().shouldChangeSelection(newSelection)) {
- AXTextStateChangeIntent intent(AXTextStateChangeTypeSelectionMove, AXTextSelection { AXTextSelectionDirectionDiscontiguous, AXTextSelectionGranularityUnknown });
- frame.selection().setSelection(newSelection, FrameSelection::defaultSetSelectionOptions(UserTriggered), intent);
- }
</del><ins>+ if (frame.selection().shouldChangeSelection(newSelection))
+ frame.selection().setSelection(newSelection);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> element->focus(false, direction);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-24 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r183266.
+ https://bugs.webkit.org/show_bug.cgi?id=144164
+
+ Broke 32-bit build and a test. (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "AX: richer text change notifications (142719)"
+ https://bugs.webkit.org/show_bug.cgi?id=142719
+ http://trac.webkit.org/changeset/183266
+
</ins><span class="cx"> 2015-04-24 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Start cleaning up FontPlatformData
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -546,7 +546,6 @@
</span><span class="cx"> // FIXME: This is identical to code in WebKit2's WebEditCommandProxy class; would be nice to share the strings instead of having two copies.
</span><span class="cx"> switch (editAction) {
</span><span class="cx"> case EditActionUnspecified: return nil;
</span><del>- case EditActionInsert: return nil;
</del><span class="cx"> case EditActionSetColor: return UI_STRING_KEY_INTERNAL("Set Color", "Set Color (Undo action name)", "Undo action name");
</span><span class="cx"> case EditActionSetBackgroundColor: return UI_STRING_KEY_INTERNAL("Set Background Color", "Set Background Color (Undo action name)", "Undo action name");
</span><span class="cx"> case EditActionTurnOffKerning: return UI_STRING_KEY_INTERNAL("Turn Off Kerning", "Turn Off Kerning (Undo action name)", "Undo action name");
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-24 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r183266.
+ https://bugs.webkit.org/show_bug.cgi?id=144164
+
+ Broke 32-bit build and a test. (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "AX: richer text change notifications (142719)"
+ https://bugs.webkit.org/show_bug.cgi?id=142719
+ http://trac.webkit.org/changeset/183266
+
</ins><span class="cx"> 2015-04-24 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: WebKit2.ActionMenusTest API test fails
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebEditCommandProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -74,8 +74,6 @@
</span><span class="cx"> switch (editAction) {
</span><span class="cx"> case EditActionUnspecified:
</span><span class="cx"> return String();
</span><del>- case EditActionInsert:
- return String();
</del><span class="cx"> case EditActionSetColor:
</span><span class="cx"> return WEB_UI_STRING_KEY("Set Color", "Set Color (Undo action name)", "Undo action name");
</span><span class="cx"> case EditActionSetBackgroundColor:
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Tools/ChangeLog 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-24 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r183266.
+ https://bugs.webkit.org/show_bug.cgi?id=144164
+
+ Broke 32-bit build and a test. (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "AX: richer text change notifications (142719)"
+ https://bugs.webkit.org/show_bug.cgi?id=142719
+ http://trac.webkit.org/changeset/183266
+
</ins><span class="cx"> 2015-04-24 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: WebKit2.ActionMenusTest API test fails
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacAccessibilityNotificationHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityNotificationHandler.h (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/AccessibilityNotificationHandler.h 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityNotificationHandler.h 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> - (void)setPlatformElement:(id)platformElement;
</span><span class="cx"> - (void)setCallback:(JSObjectRef)callback;
</span><span class="cx"> - (void)startObserving;
</span><del>-- (void)stopObserving;
</del><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacAccessibilityNotificationHandlermm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityNotificationHandler.mm (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/AccessibilityNotificationHandler.mm 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityNotificationHandler.mm 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -104,11 +104,6 @@
</span><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_notificationReceived:) name:@"AXDRTNotification" object:nil];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)stopObserving
-{
- [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
</del><span class="cx"> - (void)_notificationReceived:(NSNotification *)notification
</span><span class="cx"> {
</span><span class="cx"> NSString *notificationName = [[notification userInfo] objectForKey:@"notificationName"];
</span><span class="lines">@@ -117,27 +112,16 @@
</span><span class="cx"> if (m_platformElement && m_platformElement != [notification object])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- NSString *userInfoJSONValue = notification.userInfo[@"userInfo"];
-
</del><span class="cx"> JSRetainPtr<JSStringRef> jsNotification(Adopt, [notificationName createJSStringRef]);
</span><span class="cx"> JSValueRef notificationNameArgument = JSValueMakeString([mainFrame globalContext], jsNotification.get());
</span><del>- JSValueRef userInfoJSONValueArgument = nil;
- if ([userInfoJSONValue length]) {
- JSRetainPtr<JSStringRef> jsUserInfoJSONValue(Adopt, [userInfoJSONValue createJSStringRef]);
- userInfoJSONValueArgument = JSValueMakeFromJSONString([mainFrame globalContext], jsUserInfoJSONValue.get());
- }
</del><span class="cx"> if (m_platformElement) {
</span><del>- // Listener for one element gets the notification name and userInfo.
- JSValueRef arguments[2];
- arguments[0] = notificationNameArgument;
- arguments[1] = userInfoJSONValueArgument;
- JSObjectCallAsFunction([mainFrame globalContext], m_notificationFunctionCallback, 0, 2, arguments, 0);
</del><ins>+ // Listener for one element just gets one argument, the notification name.
+ JSObjectCallAsFunction([mainFrame globalContext], m_notificationFunctionCallback, 0, 1, &notificationNameArgument, 0);
</ins><span class="cx"> } else {
</span><del>- // A global listener gets the element, notification name and userInfo.
- JSValueRef arguments[3];
</del><ins>+ // A global listener gets the element and the notification name as arguments.
+ JSValueRef arguments[2];
</ins><span class="cx"> arguments[0] = AccessibilityUIElement::makeJSAccessibilityUIElement([mainFrame globalContext], AccessibilityUIElement([notification object]));
</span><span class="cx"> arguments[1] = notificationNameArgument;
</span><del>- arguments[2] = userInfoJSONValueArgument;
</del><span class="cx"> JSObjectCallAsFunction([mainFrame globalContext], m_notificationFunctionCallback, 0, 2, arguments, 0);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1446,7 +1446,6 @@
</span><span class="cx"> // Mac programmers should not be trying to remove a listener that's already removed.
</span><span class="cx"> ASSERT(m_notificationHandler);
</span><span class="cx">
</span><del>- [m_notificationHandler stopObserving];
</del><span class="cx"> [m_notificationHandler release];
</span><span class="cx"> m_notificationHandler = nil;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityNotificationHandlermm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -125,30 +125,19 @@
</span><span class="cx"> if (m_platformElement && m_platformElement != [notification object])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- NSString *userInfoJSONValue = notification.userInfo[@"userInfo"];
-
</del><span class="cx"> WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(WTR::InjectedBundle::singleton().page()->page());
</span><span class="cx"> JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
</span><span class="cx">
</span><span class="cx"> JSRetainPtr<JSStringRef> jsNotification(Adopt, [notificationName createJSStringRef]);
</span><span class="cx"> JSValueRef notificationNameArgument = JSValueMakeString(context, jsNotification.get());
</span><del>- JSValueRef userInfoJSONValueArgument = nil;
- if ([userInfoJSONValue length]) {
- JSRetainPtr<JSStringRef> jsUserInfoJSONValue(Adopt, [userInfoJSONValue createJSStringRef]);
- userInfoJSONValueArgument = JSValueMakeFromJSONString(context, jsUserInfoJSONValue.get());
- }
</del><span class="cx"> if (m_platformElement) {
</span><del>- // Listener for one element gets the notification name and userInfo.
- JSValueRef arguments[2];
- arguments[0] = notificationNameArgument;
- arguments[1] = userInfoJSONValueArgument;
- JSObjectCallAsFunction(context, const_cast<JSObjectRef>(m_notificationFunctionCallback), 0, 2, arguments, 0);
</del><ins>+ // Listener for one element just gets one argument, the notification name.
+ JSObjectCallAsFunction(context, const_cast<JSObjectRef>(m_notificationFunctionCallback), 0, 1, &notificationNameArgument, 0);
</ins><span class="cx"> } else {
</span><del>- // A global listener gets the element, notification name and userInfo.
- JSValueRef arguments[3];
</del><ins>+ // A global listener gets the element and the notification name as arguments.
+ JSValueRef arguments[2];
</ins><span class="cx"> arguments[0] = toJS(context, WTF::getPtr(WTR::AccessibilityUIElement::create([notification object])));
</span><span class="cx"> arguments[1] = notificationNameArgument;
</span><del>- arguments[2] = userInfoJSONValueArgument;
</del><span class="cx"> JSObjectCallAsFunction(context, const_cast<JSObjectRef>(m_notificationFunctionCallback), 0, 2, arguments, 0);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (183282 => 183283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2015-04-24 21:53:47 UTC (rev 183282)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2015-04-24 22:00:18 UTC (rev 183283)
</span><span class="lines">@@ -1476,7 +1476,6 @@
</span><span class="cx"> // Mac programmers should not be trying to remove a listener that's already removed.
</span><span class="cx"> ASSERT(m_notificationHandler);
</span><span class="cx">
</span><del>- [m_notificationHandler stopObserving];
</del><span class="cx"> [m_notificationHandler release];
</span><span class="cx"> m_notificationHandler = nil;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>