Changeset 244582 in webkit
- Timestamp:
- Apr 24, 2019 12:46:08 AM (5 years ago)
- Location:
- trunk
- Files:
-
- 13 deleted
- 47 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r244581 r244582 1 2019-04-24 chris fleizach <cfleizach@apple.com> 2 3 AX: Remove deprecated Accessibility Object Model events 4 https://bugs.webkit.org/show_bug.cgi?id=197073 5 <rdar://problem/50027819> 6 7 Reviewed by Ryosuke Niwa. 8 9 * accessibility/mac/AOM-event-accessiblesetvalue-expected.txt: Removed. 10 * accessibility/mac/AOM-event-accessiblesetvalue.html: Removed. 11 * accessibility/mac/AOM-events-all-expected.txt: Removed. 12 * accessibility/mac/AOM-events-all.html: Removed. 13 * accessibility/mac/AOM-events-expected.txt: Removed. 14 * accessibility/mac/AOM-events-webarea-crash-expected.txt: Removed. 15 * accessibility/mac/AOM-events-webarea-crash.html: Removed. 16 * accessibility/mac/AOM-events.html: Removed. 17 * accessibility/mac/replace-text-with-range-expected.txt: Replaced. 18 * accessibility/mac/replace-text-with-range.html: Replaced. 19 1 20 2019-04-23 John Wilander <wilander@apple.com> 2 21 -
trunk/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt
r244421 r244582 150 150 PASS a["innerHTML"] is nerget 151 151 PASS a["outerHTML"] is <a id="foo" href="bar">nerget</a> 152 PASS a["onaccessiblecontextmenu"] is null153 PASS a["onaccessibleclick"] is null154 PASS a["onaccessibledecrement"] is null155 PASS a["onaccessibledismiss"] is null156 PASS a["onaccessiblefocus"] is null157 PASS a["onaccessibleincrement"] is null158 PASS a["onaccessiblescrollintoview"] is null159 PASS a["onaccessiblesetvalue"] is null160 PASS a["onaccessibleselect"] is null161 152 PASS a["oncopy"] is null 162 153 PASS a["oncut"] is null -
trunk/LayoutTests/platform/gtk/js/dom/dom-static-property-for-in-iteration-expected.txt
r235669 r244582 140 140 PASS a["innerHTML"] is nerget 141 141 PASS a["outerHTML"] is <a id="foo" href="bar">nerget</a> 142 PASS a["onaccessiblecontextmenu"] is null143 PASS a["onaccessibleclick"] is null144 PASS a["onaccessibledecrement"] is null145 PASS a["onaccessibledismiss"] is null146 PASS a["onaccessiblefocus"] is null147 PASS a["onaccessibleincrement"] is null148 PASS a["onaccessiblescrollintoview"] is null149 PASS a["onaccessiblesetvalue"] is null150 PASS a["onaccessibleselect"] is null151 142 PASS a["oncopy"] is null 152 143 PASS a["oncut"] is null -
trunk/LayoutTests/platform/ios-wk2/js/dom/dom-static-property-for-in-iteration-expected.txt
r239341 r244582 141 141 PASS a["innerHTML"] is nerget 142 142 PASS a["outerHTML"] is <a id="foo" href="bar">nerget</a> 143 PASS a["onaccessiblecontextmenu"] is null144 PASS a["onaccessibleclick"] is null145 PASS a["onaccessibledecrement"] is null146 PASS a["onaccessibledismiss"] is null147 PASS a["onaccessiblefocus"] is null148 PASS a["onaccessibleincrement"] is null149 PASS a["onaccessiblescrollintoview"] is null150 PASS a["onaccessiblesetvalue"] is null151 PASS a["onaccessibleselect"] is null152 143 PASS a["oncopy"] is null 153 144 PASS a["oncut"] is null -
trunk/LayoutTests/platform/mac-wk1/TestExpectations
r244428 r244582 568 568 webkit.org/b/172044 [ Debug ] imported/w3c/web-platform-tests/IndexedDB/open-request-queue.html [ Pass Timeout ] 569 569 570 webkit.org/b/180898 accessibility/mac/AOM-events.html [ Skip ]571 webkit.org/b/183023 accessibility/mac/AOM-events-all.html [ Skip ]572 webkit.org/b/183352 accessibility/ios-simulator/AOM-dismiss-event.html [ Skip ]573 570 webkit.org/b/184742 accessibility/mac/async-increment-decrement-action.html [ Skip ] 574 webkit.org/b/185897 accessibility/mac/AOM-event-accessiblesetvalue.html [ Skip ]575 571 webkit.org/b/185897 accessibility/mac/set-value-editable-types.html [ Skip ] 576 572 webkit.org/b/193414 accessibility/mac/relative-frame.html [ Skip ] -
trunk/LayoutTests/platform/mac-wk2/js/dom/dom-static-property-for-in-iteration-expected.txt
r244421 r244582 151 151 PASS a["innerHTML"] is nerget 152 152 PASS a["outerHTML"] is <a id="foo" href="bar">nerget</a> 153 PASS a["onaccessiblecontextmenu"] is null154 PASS a["onaccessibleclick"] is null155 PASS a["onaccessibledecrement"] is null156 PASS a["onaccessibledismiss"] is null157 PASS a["onaccessiblefocus"] is null158 PASS a["onaccessibleincrement"] is null159 PASS a["onaccessiblescrollintoview"] is null160 PASS a["onaccessiblesetvalue"] is null161 PASS a["onaccessibleselect"] is null162 153 PASS a["oncopy"] is null 163 154 PASS a["oncut"] is null -
trunk/LayoutTests/platform/wpe/js/dom/dom-static-property-for-in-iteration-expected.txt
r236163 r244582 139 139 PASS a["innerHTML"] is nerget 140 140 PASS a["outerHTML"] is <a id="foo" href="bar">nerget</a> 141 PASS a["onaccessiblecontextmenu"] is null142 PASS a["onaccessibleclick"] is null143 PASS a["onaccessibledecrement"] is null144 PASS a["onaccessibledismiss"] is null145 PASS a["onaccessiblefocus"] is null146 PASS a["onaccessibleincrement"] is null147 PASS a["onaccessiblescrollintoview"] is null148 PASS a["onaccessiblesetvalue"] is null149 PASS a["onaccessibleselect"] is null150 141 PASS a["oncopy"] is null 151 142 PASS a["oncut"] is null -
trunk/Source/WTF/ChangeLog
r244574 r244582 1 2019-04-24 chris fleizach <cfleizach@apple.com> 2 3 AX: Remove deprecated Accessibility Object Model events 4 https://bugs.webkit.org/show_bug.cgi?id=197073 5 <rdar://problem/50027819> 6 7 Reviewed by Ryosuke Niwa. 8 9 * wtf/Platform.h: 10 1 11 2019-04-23 Commit Queue <commit-queue@webkit.org> 2 12 -
trunk/Source/WTF/wtf/Platform.h
r244439 r244582 1375 1375 1376 1376 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS) || PLATFORM(IOSMAC) 1377 #define ENABLE_ACCESSIBILITY_EVENTS 11378 1377 #define HAVE_SEC_KEY_PROXY 1 1379 1378 #endif -
trunk/Source/WebCore/CMakeLists.txt
r244448 r244582 543 543 544 544 accessibility/AccessibilityRole.idl 545 accessibility/AccessibleSetValueEvent.idl546 545 accessibility/AriaAttributes.idl 547 546 -
trunk/Source/WebCore/ChangeLog
r244573 r244582 1 2019-04-24 chris fleizach <cfleizach@apple.com> 2 3 AX: Remove deprecated Accessibility Object Model events 4 https://bugs.webkit.org/show_bug.cgi?id=197073 5 <rdar://problem/50027819> 6 7 Reviewed by Ryosuke Niwa. 8 9 Test: accessibility/mac/replace-text-with-range.html 10 11 * DerivedSources.make: 12 * Sources.txt: 13 * WebCore.xcodeproj/project.pbxproj: 14 * accessibility/AccessibilityListBoxOption.cpp: 15 (WebCore::AccessibilityListBoxOption::setSelected): 16 * accessibility/AccessibilityMediaObject.cpp: 17 (WebCore::AccessibilityMediaObject::increment): 18 (WebCore::AccessibilityMediaObject::decrement): 19 * accessibility/AccessibilityMenuListOption.cpp: 20 (WebCore::AccessibilityMenuListOption::setSelected): 21 * accessibility/AccessibilityNodeObject.cpp: 22 (WebCore::AccessibilityNodeObject::increment): 23 (WebCore::AccessibilityNodeObject::decrement): 24 * accessibility/AccessibilityObject.cpp: 25 (WebCore::AccessibilityObject::press): 26 (WebCore::AccessibilityObject::replaceTextInRange): 27 (WebCore::AccessibilityObject::scrollToMakeVisible const): 28 (WebCore::AccessibilityObject::shouldDispatchAccessibilityEvent const): Deleted. 29 (WebCore::AccessibilityObject::dispatchAccessibilityEvent const): Deleted. 30 (WebCore::AccessibilityObject::dispatchAccessibilityEventWithType const): Deleted. 31 (WebCore::AccessibilityObject::dispatchAccessibleSetValueEvent const): Deleted. 32 * accessibility/AccessibilityObject.h: 33 * accessibility/AccessibilityRenderObject.cpp: 34 (WebCore::AccessibilityRenderObject::setFocused): 35 (WebCore::AccessibilityRenderObject::setValue): 36 * accessibility/AccessibilityScrollbar.cpp: 37 (WebCore::AccessibilityScrollbar::setValue): 38 * accessibility/AccessibilitySlider.cpp: 39 (WebCore::AccessibilitySlider::setValue): 40 * accessibility/ios/AccessibilityObjectIOS.mm: 41 (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject const): 42 (WebCore::AccessibilityObject::hasAccessibleDismissEventListener const): Deleted. 43 * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm: 44 (-[WebAccessibilityObjectWrapper accessibilityPerformEscape]): Deleted. 45 (-[WebAccessibilityObjectWrapper accessibilityElementDidBecomeFocused]): Deleted. 46 * accessibility/mac/WebAccessibilityObjectWrapperMac.mm: 47 (-[WebAccessibilityObjectWrapper accessibilityPerformShowMenuAction]): 48 * dom/Element.idl: 49 * dom/EventNames.h: 50 * dom/EventNames.in: 51 * html/HTMLAttributeNames.in: 52 * html/HTMLElement.cpp: 53 (WebCore::HTMLElement::createEventHandlerNameMap): 54 * page/Settings.yaml: 55 * testing/InternalSettings.cpp: 56 (WebCore::InternalSettings::Backup::Backup): 57 (WebCore::InternalSettings::Backup::restoreTo): 58 (WebCore::InternalSettings::setAccessibilityEventsEnabled): Deleted. 59 * testing/InternalSettings.h: 60 * testing/InternalSettings.idl: 61 1 62 2019-04-23 Andy Estes <aestes@apple.com> 2 63 -
trunk/Source/WebCore/DerivedSources-input.xcfilelist
r244499 r244582 396 396 $(PROJECT_DIR)/Scripts/SettingsTemplates/Settings.h.erb 397 397 $(PROJECT_DIR)/accessibility/AccessibilityRole.idl 398 $(PROJECT_DIR)/accessibility/AccessibleSetValueEvent.idl399 398 $(PROJECT_DIR)/accessibility/AriaAttributes.idl 400 399 $(PROJECT_DIR)/animation/Animatable.idl -
trunk/Source/WebCore/DerivedSources-output.xcfilelist
r244499 r244582 43 43 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSAccessibilityRole.cpp 44 44 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSAccessibilityRole.h 45 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSAccessibleSetValueEvent.cpp46 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSAccessibleSetValueEvent.h47 45 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSAddressErrors.cpp 48 46 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSAddressErrors.h -
trunk/Source/WebCore/DerivedSources.make
r244499 r244582 447 447 $(WebCore)/Modules/webvr/VRStageParameters.idl \ 448 448 $(WebCore)/accessibility/AccessibilityRole.idl \ 449 $(WebCore)/accessibility/AccessibleSetValueEvent.idl \450 449 $(WebCore)/accessibility/AriaAttributes.idl \ 451 450 $(WebCore)/animation/Animatable.idl \ -
trunk/Source/WebCore/Sources.txt
r244507 r244582 418 418 accessibility/AccessibilityTree.cpp 419 419 accessibility/AccessibilityTreeItem.cpp 420 accessibility/AccessibleSetValueEvent.cpp421 420 accessibility/isolatedtree/AXIsolatedTree.cpp 422 421 accessibility/isolatedtree/AXIsolatedTreeNode.cpp … … 2490 2489 JSAbortSignal.cpp 2491 2490 JSAbstractWorker.cpp 2492 JSAccessibleSetValueEvent.cpp2493 2491 JSAddressErrors.cpp 2494 2492 JSAesCbcCfbParams.cpp -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r244567 r244582 3345 3345 A9D248070D757E7D00FDF959 /* JSDOMMimeType.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D248030D757E7D00FDF959 /* JSDOMMimeType.h */; }; 3346 3346 A9D248090D757E7D00FDF959 /* JSDOMMimeTypeArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D248050D757E7D00FDF959 /* JSDOMMimeTypeArray.h */; }; 3347 A9F2E0EB20475CDE00512855 /* AccessibleSetValueEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = A9F2E0E820475CDC00512855 /* AccessibleSetValueEvent.h */; };3348 3347 AA12DF491743DF83004DAFDF /* PlatformSpeechSynthesizerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = AAE3755D17429BCC006200C2 /* PlatformSpeechSynthesizerIOS.mm */; }; 3349 3348 AA21ECCD0ABF0FC6002B834C /* CSSCursorImageValue.h in Headers */ = {isa = PBXBuildFile; fileRef = AA0978EE0ABAA6E100874480 /* CSSCursorImageValue.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 11904 11903 A9EE448C210FC9AD00B6EAE6 /* AriaAttributes.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AriaAttributes.idl; sourceTree = "<group>"; }; 11905 11904 A9EE448F210FD69A00B6EAE6 /* AccessibilityRole.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = AccessibilityRole.idl; sourceTree = "<group>"; }; 11906 A9F2E0E720475CDC00512855 /* AccessibleSetValueEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibleSetValueEvent.cpp; sourceTree = "<group>"; };11907 A9F2E0E820475CDC00512855 /* AccessibleSetValueEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibleSetValueEvent.h; sourceTree = "<group>"; };11908 A9F2E0E920475CDE00512855 /* AccessibleSetValueEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AccessibleSetValueEvent.idl; sourceTree = "<group>"; };11909 11905 AA0978ED0ABAA6E100874480 /* CSSCursorImageValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSCursorImageValue.cpp; sourceTree = "<group>"; }; 11910 11906 AA0978EE0ABAA6E100874480 /* CSSCursorImageValue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSCursorImageValue.h; sourceTree = "<group>"; }; … … 17262 17258 A91C9FC01B659A6700AFFD54 /* AccessibilityTreeItem.cpp */, 17263 17259 A91C9FC11B659A6700AFFD54 /* AccessibilityTreeItem.h */, 17264 A9F2E0E720475CDC00512855 /* AccessibleSetValueEvent.cpp */,17265 A9F2E0E820475CDC00512855 /* AccessibleSetValueEvent.h */,17266 A9F2E0E920475CDE00512855 /* AccessibleSetValueEvent.idl */,17267 17260 A9EE448C210FC9AD00B6EAE6 /* AriaAttributes.idl */, 17268 17261 2981CAAF131822EC00D12F2A /* AXObjectCache.cpp */, … … 28085 28078 A91C9FBF1B6586DE00AFFD54 /* AccessibilityTree.h in Headers */, 28086 28079 A91C9FC31B659A6700AFFD54 /* AccessibilityTreeItem.h in Headers */, 28087 A9F2E0EB20475CDE00512855 /* AccessibleSetValueEvent.h in Headers */,28088 28080 7C5222991E1DAE1C002CB8F7 /* ActiveDOMCallback.h in Headers */, 28089 28081 7CD0BA051B8F79C9005CEBBE /* ActiveDOMCallbackMicrotask.h in Headers */, -
trunk/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp
r229310 r244582 178 178 return; 179 179 180 if (selected && dispatchAccessibilityEventWithType(AccessibilityEventType::Select))181 return;182 183 180 bool isOptionSelected = isSelected(); 184 181 if ((isOptionSelected && selected) || (!isOptionSelected && !selected)) -
trunk/Source/WebCore/accessibility/AccessibilityMediaObject.cpp
r237266 r244582 108 108 void AccessibilityMediaObject::increment() 109 109 { 110 if (dispatchAccessibilityEventWithType(AccessibilityEventType::Increment))111 return;112 110 mediaSeek(AXSeekForward); 113 111 } … … 115 113 void AccessibilityMediaObject::decrement() 116 114 { 117 if (dispatchAccessibilityEventWithType(AccessibilityEventType::Decrement))118 return;119 115 mediaSeek(AXSeekBackward); 120 116 } -
trunk/Source/WebCore/accessibility/AccessibilityMenuListOption.cpp
r229310 r244582 84 84 return; 85 85 86 if (selected && dispatchAccessibilityEventWithType(AccessibilityEventType::Select))87 return;88 89 86 downcast<HTMLOptionElement>(*m_element).setSelected(selected); 90 87 } -
trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
r244187 r244582 1078 1078 void AccessibilityNodeObject::increment() 1079 1079 { 1080 if (dispatchAccessibilityEventWithType(AccessibilityEventType::Increment))1081 return;1082 1080 UserGestureIndicator gestureIndicator(ProcessingUserGesture, document()); 1083 1081 alterSliderValue(true); … … 1086 1084 void AccessibilityNodeObject::decrement() 1087 1085 { 1088 if (dispatchAccessibilityEventWithType(AccessibilityEventType::Decrement))1089 return;1090 1086 UserGestureIndicator gestureIndicator(ProcessingUserGesture, document()); 1091 1087 alterSliderValue(false); -
trunk/Source/WebCore/accessibility/AccessibilityObject.cpp
r244561 r244582 34 34 #include "AccessibilityScrollView.h" 35 35 #include "AccessibilityTable.h" 36 #include "AccessibleSetValueEvent.h"37 36 #include "Chrome.h" 38 37 #include "ChromeClient.h" … … 1094 1093 pressElement = hitTestElement; 1095 1094 1096 // dispatch accessibleclick event1097 if (auto* cache = axObjectCache()) {1098 if (auto* pressObject = cache->getOrCreate(pressElement)) {1099 if (pressObject->dispatchAccessibilityEventWithType(AccessibilityEventType::Click))1100 return true;1101 }1102 }1103 1104 1095 UserGestureIndicator gestureIndicator(ProcessingUserGesture, document); 1105 1096 … … 2258 2249 } 2259 2250 2260 bool AccessibilityObject::shouldDispatchAccessibilityEvent() const2261 {2262 bool shouldDispatch = RuntimeEnabledFeatures::sharedFeatures().accessibilityObjectModelEnabled();2263 #if ENABLE(ACCESSIBILITY_EVENTS)2264 return shouldDispatch &= this->page()->settings().accessibilityEventsEnabled();2265 #endif2266 return shouldDispatch;2267 }2268 2269 bool AccessibilityObject::dispatchAccessibilityEvent(Event& event) const2270 {2271 if (!shouldDispatchAccessibilityEvent())2272 return false;2273 2274 Vector<Element*> eventPath;2275 for (auto* parentObject = this; parentObject; parentObject = parentObject->parentObject()) {2276 if (parentObject->isWebArea())2277 break;2278 if (auto* parentElement = parentObject->element())2279 eventPath.append(parentElement);2280 }2281 2282 if (!eventPath.size())2283 return false;2284 2285 EventDispatcher::dispatchEvent(eventPath, event);2286 2287 // return true if preventDefault() was called, so that we don't execute the fallback behavior.2288 return event.defaultPrevented();2289 }2290 2291 bool AccessibilityObject::dispatchAccessibilityEventWithType(AccessibilityEventType type) const2292 {2293 AtomicString eventName;2294 switch (type) {2295 case AccessibilityEventType::ContextMenu:2296 eventName = eventNames().accessiblecontextmenuEvent;2297 break;2298 case AccessibilityEventType::Click:2299 eventName = eventNames().accessibleclickEvent;2300 break;2301 case AccessibilityEventType::Decrement:2302 eventName = eventNames().accessibledecrementEvent;2303 break;2304 case AccessibilityEventType::Dismiss:2305 eventName = eventNames().accessibledismissEvent;2306 break;2307 case AccessibilityEventType::Focus:2308 eventName = eventNames().accessiblefocusEvent;2309 break;2310 case AccessibilityEventType::Increment:2311 eventName = eventNames().accessibleincrementEvent;2312 break;2313 case AccessibilityEventType::ScrollIntoView:2314 eventName = eventNames().accessiblescrollintoviewEvent;2315 break;2316 case AccessibilityEventType::Select:2317 eventName = eventNames().accessibleselectEvent;2318 break;2319 default:2320 return false;2321 }2322 2323 auto event = Event::create(eventName, Event::CanBubble::Yes, Event::IsCancelable::Yes);2324 return dispatchAccessibilityEvent(event);2325 }2326 2327 2251 bool AccessibilityObject::replaceTextInRange(const String& replacementString, const PlainTextRange& range) 2328 2252 { … … 2351 2275 2352 2276 return false; 2353 }2354 2355 bool AccessibilityObject::dispatchAccessibleSetValueEvent(const String& value) const2356 {2357 if (!canSetValueAttribute())2358 return false;2359 auto event = AccessibleSetValueEvent::create(eventNames().accessiblesetvalueEvent, value);2360 return dispatchAccessibilityEvent(event);2361 2277 } 2362 2278 … … 3117 3033 void AccessibilityObject::scrollToMakeVisible(const ScrollRectToVisibleOptions& options) const 3118 3034 { 3119 if (dispatchAccessibilityEventWithType(AccessibilityEventType::ScrollIntoView))3120 return;3121 3122 3035 if (isScrollView() && parentObject()) 3123 3036 parentObject()->scrollToMakeVisible(); -
trunk/Source/WebCore/accessibility/AccessibilityObject.h
r244561 r244582 96 96 Subtitle, 97 97 Action, 98 };99 100 enum class AccessibilityEventType {101 ContextMenu,102 Click,103 Decrement,104 Dismiss,105 Focus,106 Increment,107 ScrollIntoView,108 Select,109 98 }; 110 99 … … 781 770 bool hasTagName(const QualifiedName&) const; 782 771 783 bool shouldDispatchAccessibilityEvent() const;784 bool dispatchAccessibilityEvent(Event&) const;785 bool dispatchAccessibilityEventWithType(AccessibilityEventType) const;786 bool dispatchAccessibleSetValueEvent(const String&) const;787 788 772 virtual VisiblePositionRange visiblePositionRange() const { return VisiblePositionRange(); } 789 773 virtual VisiblePositionRange visiblePositionRangeForLine(unsigned) const { return VisiblePositionRange(); } … … 992 976 bool hasTouchEventListener() const; 993 977 bool isInputTypePopupButton() const; 994 bool hasAccessibleDismissEventListener() const;995 978 #endif 996 979 -
trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
r244115 r244582 1749 1749 void AccessibilityRenderObject::setFocused(bool on) 1750 1750 { 1751 if (on && dispatchAccessibilityEventWithType(AccessibilityEventType::Focus))1752 return;1753 1754 1751 if (!canSetFocusAttribute()) 1755 1752 return; … … 1801 1798 { 1802 1799 if (!m_renderer || !is<Element>(m_renderer->node())) 1803 return;1804 if (dispatchAccessibleSetValueEvent(string))1805 1800 return; 1806 1801 -
trunk/Source/WebCore/accessibility/AccessibilityScrollbar.cpp
r242713 r244582 99 99 100 100 float newValue = value * m_scrollbar->maximum(); 101 if (dispatchAccessibleSetValueEvent(String::numberToStringFixedPrecision(newValue)))102 return;103 101 m_scrollbar->scrollableArea().scrollToOffsetWithoutAnimation(m_scrollbar->orientation(), newValue); 104 102 } -
trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp
r229112 r244582 129 129 void AccessibilitySlider::setValue(const String& value) 130 130 { 131 if (dispatchAccessibleSetValueEvent(value))132 return;133 134 131 HTMLInputElement* input = inputElement(); 135 132 -
trunk/Source/WebCore/accessibility/ios/AccessibilityObjectIOS.mm
r241321 r244582 75 75 return AccessibilityObjectInclusion::DefaultBehavior; 76 76 } 77 78 bool AccessibilityObject::hasAccessibleDismissEventListener() const79 {80 for (auto* node = this->node(); node; node = node->parentNode()) {81 if (node->hasEventListeners(eventNames().accessibledismissEvent))82 return true;83 }84 return false;85 }86 77 87 78 bool AccessibilityObject::hasTouchEventListener() const -
trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
r242651 r244582 1519 1519 } 1520 1520 1521 - (BOOL)accessibilityPerformEscape1522 {1523 if (![self _prepareAccessibilityCall])1524 return NO;1525 1526 m_object->dispatchAccessibilityEventWithType(AccessibilityEventType::Dismiss);1527 1528 // Return whether a listener received this event so it prevents other callers up the hierarchy chain.1529 return m_object->shouldDispatchAccessibilityEvent() && m_object->hasAccessibleDismissEventListener();1530 }1531 1532 1521 - (BOOL)_accessibilityScrollToVisible 1533 1522 { … … 1994 1983 m_object->findMatchingObjects(&criteria, results); 1995 1984 return (NSArray *)convertToNSArray(results); 1996 }1997 1998 - (void)accessibilityElementDidBecomeFocused1999 {2000 if (![self _prepareAccessibilityCall])2001 return;2002 2003 m_object->dispatchAccessibilityEventWithType(AccessibilityEventType::Focus);2004 1985 } 2005 1986 -
trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
r244561 r244582 3731 3731 - (void)accessibilityPerformShowMenuAction 3732 3732 { 3733 if (m_object && m_object->dispatchAccessibilityEventWithType(AccessibilityEventType::ContextMenu))3734 return;3735 3736 3733 if (m_object->roleValue() == AccessibilityRole::ComboBox) 3737 3734 m_object->setIsExpanded(true); -
trunk/Source/WebCore/dom/Element.idl
r240634 r244582 147 147 // Non standard event handler (https://developer.apple.com/reference/webkitjs/element/1629580-onwebkitplaybacktargetavailabili). 148 148 [NotEnumerable, Conditional=WIRELESS_PLAYBACK_TARGET] attribute EventHandler onwebkitplaybacktargetavailabilitychanged; 149 150 // Accessibility events.151 [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessiblecontextmenu;152 [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessibleclick;153 [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessibledecrement;154 [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessibledismiss;155 [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessiblefocus;156 [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessibleincrement;157 [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessiblescrollintoview;158 [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessiblesetvalue;159 [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessibleselect;160 149 }; 161 150 -
trunk/Source/WebCore/dom/EventNames.h
r244218 r244582 52 52 macro(DOMSubtreeModified) \ 53 53 macro(abort) \ 54 macro(accessiblecontextmenu) \55 macro(accessibleclick) \56 macro(accessibledecrement) \57 macro(accessibledismiss) \58 macro(accessiblefocus) \59 macro(accessibleincrement) \60 macro(accessiblescrollintoview) \61 macro(accessiblesetvalue) \62 macro(accessibleselect) \63 54 macro(activate) \ 64 55 macro(active) \ -
trunk/Source/WebCore/dom/EventNames.in
r240201 r244582 82 82 MediaKeyMessageEvent conditional=ENCRYPTED_MEDIA 83 83 VRDisplayEvent 84 AccessibleSetValueEvent85 84 PointerEvent conditional=POINTER_EVENTS -
trunk/Source/WebCore/html/HTMLAttributeNames.in
r244421 r244582 194 194 object 195 195 onabort 196 onaccessiblecontextmenu197 onaccessibleclick198 onaccessibledecrement199 onaccessibledismiss200 onaccessiblefocus201 onaccessibleincrement202 onaccessiblescrollintoview203 onaccessiblesetvalue204 onaccessibleselect205 196 onafterprint 206 197 onanimationstart -
trunk/Source/WebCore/html/HTMLElement.cpp
r244421 r244582 228 228 static const QualifiedName* const table[] = { 229 229 &onabortAttr.get(), 230 &onaccessiblecontextmenuAttr.get(),231 &onaccessibleclickAttr.get(),232 &onaccessibledecrementAttr.get(),233 &onaccessibledismissAttr.get(),234 &onaccessiblefocusAttr.get(),235 &onaccessibleincrementAttr.get(),236 &onaccessiblescrollintoviewAttr.get(),237 &onaccessiblesetvalueAttr.get(),238 &onaccessibleselectAttr.get(),239 230 &onanimationendAttr.get(), 240 231 &onanimationiterationAttr.get(), -
trunk/Source/WebCore/page/Settings.yaml
r243682 r244582 802 802 onChange: setNeedsRecalcStyleInAllFrames 803 803 804 accessibilityEventsEnabled:805 initial: true806 conditional: ACCESSIBILITY_EVENTS807 808 804 incompleteImageBorderEnabled: 809 805 initial: false -
trunk/Source/WebCore/testing/InternalSettings.cpp
r243958 r244582 96 96 , m_inputEventsEnabled(settings.inputEventsEnabled()) 97 97 , m_incompleteImageBorderEnabled(settings.incompleteImageBorderEnabled()) 98 #if ENABLE(ACCESSIBILITY_EVENTS)99 , m_accessibilityEventsEnabled(settings.accessibilityEventsEnabled())100 #endif101 98 , m_shouldDeactivateAudioSession(PlatformMediaSessionManager::shouldDeactivateAudioSession()) 102 99 , m_userInterfaceDirectionPolicy(settings.userInterfaceDirectionPolicy()) … … 206 203 settings.setIncompleteImageBorderEnabled(m_incompleteImageBorderEnabled); 207 204 PlatformMediaSessionManager::setShouldDeactivateAudioSession(m_shouldDeactivateAudioSession); 208 #if ENABLE(ACCESSIBILITY_EVENTS)209 settings.setAccessibilityEventsEnabled(m_accessibilityEventsEnabled);210 #endif211 205 212 206 #if ENABLE(INDEXED_DATABASE_IN_WORKERS) … … 891 885 } 892 886 893 ExceptionOr<void> InternalSettings::setAccessibilityEventsEnabled(bool enabled)894 {895 if (!m_page)896 return Exception { InvalidAccessError };897 #if ENABLE(ACCESSIBILITY_EVENTS)898 settings().setAccessibilityEventsEnabled(enabled);899 #else900 UNUSED_PARAM(enabled);901 #endif902 return { };903 }904 905 887 ExceptionOr<void> InternalSettings::setIncompleteImageBorderEnabled(bool enabled) 906 888 { -
trunk/Source/WebCore/testing/InternalSettings.h
r243958 r244582 102 102 ExceptionOr<void> setShouldManageAudioSessionCategory(bool); 103 103 ExceptionOr<void> setCustomPasteboardDataEnabled(bool); 104 ExceptionOr<void> setAccessibilityEventsEnabled(bool);105 104 ExceptionOr<void> setIncompleteImageBorderEnabled(bool); 106 105 … … 196 195 bool m_inputEventsEnabled; 197 196 bool m_incompleteImageBorderEnabled; 198 #if ENABLE(ACCESSIBILITY_EVENTS)199 bool m_accessibilityEventsEnabled;200 #endif201 197 bool m_shouldDeactivateAudioSession; 202 198 UserInterfaceDirectionPolicy m_userInterfaceDirectionPolicy; -
trunk/Source/WebCore/testing/InternalSettings.idl
r243958 r244582 115 115 [EnabledAtRuntime=WebAnimations] boolean webAnimationsCSSIntegrationEnabled(); 116 116 117 [MayThrowException] void setAccessibilityEventsEnabled(boolean enabled);118 117 void setShouldDeactivateAudioSession(boolean shouldDeactivate); 119 118 }; -
trunk/Source/WebKit/ChangeLog
r244581 r244582 1 2019-04-24 chris fleizach <cfleizach@apple.com> 2 3 AX: Remove deprecated Accessibility Object Model events 4 https://bugs.webkit.org/show_bug.cgi?id=197073 5 <rdar://problem/50027819> 6 7 Reviewed by Ryosuke Niwa. 8 9 * Platform/spi/ios/AccessibilitySupportSPI.h: 10 * UIProcess/API/Cocoa/WKWebView.mm: 11 (-[WKWebView _initializeWithConfiguration:]): 12 (-[WKWebView dealloc]): 13 (accessibilityEventsEnabledChangedCallback): Deleted. 14 (-[WKWebView _updateAccessibilityEventsEnabled]): Deleted. 15 * UIProcess/API/Cocoa/WKWebViewInternal.h: 16 * UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm: 17 * UIProcess/WebPageProxy.cpp: 18 (WebKit::WebPageProxy::updateAccessibilityEventsEnabled): Deleted. 19 * UIProcess/WebPageProxy.h: 20 * WebProcess/WebPage/WebPage.cpp: 21 (WebKit::WebPage::updateAccessibilityEventsEnabled): Deleted. 22 * WebProcess/WebPage/WebPage.h: 23 * WebProcess/WebPage/WebPage.messages.in: 24 1 25 2019-04-23 John Wilander <wilander@apple.com> 2 26 -
trunk/Source/WebKit/Platform/spi/ios/AccessibilitySupportSPI.h
r243480 r244582 45 45 #endif 46 46 47 #if ENABLE(ACCESSIBILITY_EVENTS)48 extern CFStringRef kAXSWebAccessibilityEventsEnabledNotification;49 extern Boolean _AXSWebAccessibilityEventsEnabled();50 #endif51 52 47 #if PLATFORM(IOS_FAMILY) && ENABLE(FULL_KEYBOARD_ACCESS) 53 48 extern CFStringRef kAXSFullKeyboardAccessEnabledNotification; -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
r244484 r244582 201 201 #endif // PLATFORM(MAC) 202 202 203 #if ENABLE(ACCESSIBILITY_EVENTS)204 #import "AccessibilitySupportSPI.h"205 #import <wtf/darwin/WeakLinking.h>206 #endif207 208 203 #if PLATFORM(MAC) && ENABLE(DRAG_SUPPORT) 209 204 … … 751 746 #endif 752 747 753 #if ENABLE(ACCESSIBILITY_EVENTS)754 // Check _AXSWebAccessibilityEventsEnabled here to avoid compiler optimizing755 // out the null check of kAXSWebAccessibilityEventsEnabledNotification.756 if (!isNullFunctionPointer(_AXSWebAccessibilityEventsEnabled))757 CFNotificationCenterAddObserver(CFNotificationCenterGetDarwinNotifyCenter(), (__bridge const void *)(self), accessibilityEventsEnabledChangedCallback, kAXSWebAccessibilityEventsEnabledNotification, 0, CFNotificationSuspensionBehaviorDeliverImmediately);758 [self _updateAccessibilityEventsEnabled];759 #endif760 761 748 if (NSString *applicationNameForUserAgent = configuration.applicationNameForUserAgent) 762 749 _page->setApplicationNameForUserAgent(applicationNameForUserAgent); … … 880 867 881 868 CFNotificationCenterRemoveObserver(CFNotificationCenterGetDarwinNotifyCenter(), (__bridge const void *)(self), (CFStringRef)[NSString stringWithUTF8String:kGSEventHardwareKeyboardAvailabilityChangedNotification], nullptr); 882 #endif883 884 #if ENABLE(ACCESSIBILITY_EVENTS)885 CFNotificationCenterRemoveObserver(CFNotificationCenterGetDarwinNotifyCenter(), (__bridge const void *)(self), nullptr, nullptr);886 869 #endif 887 870 … … 3473 3456 3474 3457 #endif // PLATFORM(IOS_FAMILY) 3475 3476 #if ENABLE(ACCESSIBILITY_EVENTS)3477 3478 static void accessibilityEventsEnabledChangedCallback(CFNotificationCenterRef, void* observer, CFStringRef, const void*, CFDictionaryRef)3479 {3480 ASSERT(observer);3481 WKWebView *webview = (__bridge WKWebView *)observer;3482 [webview _updateAccessibilityEventsEnabled];3483 }3484 3485 - (void)_updateAccessibilityEventsEnabled3486 {3487 if (!isNullFunctionPointer(_AXSWebAccessibilityEventsEnabled))3488 _page->updateAccessibilityEventsEnabled(_AXSWebAccessibilityEventsEnabled());3489 }3490 3491 #endif3492 3458 3493 3459 #pragma mark OS X-specific methods -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
r242757 r244582 176 176 #endif 177 177 178 #if ENABLE(ACCESSIBILITY_EVENTS)179 - (void)_updateAccessibilityEventsEnabled;180 #endif181 182 178 #if ENABLE(ATTACHMENT_ELEMENT) 183 179 - (void)_didRemoveAttachment:(API::Attachment&)attachment; -
trunk/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm
r239311 r244582 30 30 31 31 #import "WebProcessPool.h" 32 33 #if ENABLE(ACCESSIBILITY_EVENTS)34 #import "AccessibilitySupportSPI.h"35 #endif36 32 37 33 #if PLATFORM(MAC) -
trunk/Source/WebKit/UIProcess/WebPageProxy.cpp
r244540 r244582 3245 3245 } 3246 3246 3247 #if ENABLE(ACCESSIBILITY_EVENTS)3248 void WebPageProxy::updateAccessibilityEventsEnabled(bool enabled)3249 {3250 if (!hasRunningProcess())3251 return;3252 3253 m_process->send(Messages::WebPage::UpdateAccessibilityEventsEnabled(enabled), m_pageID);3254 }3255 #endif3256 3257 3247 void WebPageProxy::setUseFixedLayout(bool fixed) 3258 3248 { -
trunk/Source/WebKit/UIProcess/WebPageProxy.h
r244559 r244582 879 879 void windowScreenDidChange(WebCore::PlatformDisplayID); 880 880 void accessibilitySettingsDidChange(); 881 #if ENABLE(ACCESSIBILITY_EVENTS)882 void updateAccessibilityEventsEnabled(bool);883 #endif884 881 885 882 void setUseFixedLayout(bool); -
trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp
r244559 r244582 1999 1999 } 2000 2000 2001 #if ENABLE(ACCESSIBILITY_EVENTS)2002 void WebPage::updateAccessibilityEventsEnabled(bool enabled)2003 {2004 m_page->settings().setAccessibilityEventsEnabled(enabled);2005 }2006 #endif2007 2008 2001 void WebPage::setUseFixedLayout(bool fixed) 2009 2002 { -
trunk/Source/WebKit/WebProcess/WebPage/WebPage.h
r244559 r244582 474 474 475 475 void accessibilitySettingsDidChange(); 476 #if ENABLE(ACCESSIBILITY_EVENTS)477 void updateAccessibilityEventsEnabled(bool);478 #endif479 476 480 477 void scalePage(double scale, const WebCore::IntPoint& origin); -
trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
r244148 r244582 251 251 252 252 AccessibilitySettingsDidChange() 253 #if ENABLE(ACCESSIBILITY_EVENTS)254 UpdateAccessibilityEventsEnabled(bool enabled)255 #endif256 253 257 254 ScalePage(double scale, WebCore::IntPoint origin)
Note: See TracChangeset
for help on using the changeset viewer.