Changeset 67498 in webkit
- Timestamp:
- Sep 14, 2010 2:29:35 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 32 added
- 2 deleted
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r67496 r67498 1 2010-09-14 Chris Guillory <chris.guillory@google.com> 2 3 Reviewed by Chris Fleizach. 4 5 Send all accessibility notifications to Chromium. 6 https://bugs.webkit.org/show_bug.cgi?id=45156 7 8 * platform/chromium/accessibility/children-changed-notification-expected.txt: Removed. 9 * platform/chromium/accessibility/children-changed-notification.html: Removed. 10 * platform/chromium/accessibility/post-notification-ActiveDescendantChanged-expected.txt: Added. 11 * platform/chromium/accessibility/post-notification-ActiveDescendantChanged.html: Added. 12 * platform/chromium/accessibility/post-notification-CheckedStateChanged-expected.txt: Added. 13 * platform/chromium/accessibility/post-notification-CheckedStateChanged.html: Added. 14 * platform/chromium/accessibility/post-notification-ChildrenChanged-expected.txt: Added. 15 * platform/chromium/accessibility/post-notification-ChildrenChanged.html: Added. 16 * platform/chromium/accessibility/post-notification-FocusedUIElementChanged-expected.txt: Added. 17 * platform/chromium/accessibility/post-notification-FocusedUIElementChanged.html: Added. 18 * platform/chromium/accessibility/post-notification-LayoutComplete-expected.txt: Added. 19 * platform/chromium/accessibility/post-notification-LayoutComplete.html: Added. 20 * platform/chromium/accessibility/post-notification-LiveRegionChanged-expected.txt: Added. 21 * platform/chromium/accessibility/post-notification-LiveRegionChanged.html: Added. 22 * platform/chromium/accessibility/post-notification-LoadComplete-expected.txt: Added. 23 * platform/chromium/accessibility/post-notification-LoadComplete.html: Added. 24 * platform/chromium/accessibility/post-notification-MenuListValueChanged-expected.txt: Added. 25 * platform/chromium/accessibility/post-notification-MenuListValueChanged.html: Added. 26 * platform/chromium/accessibility/post-notification-RowCollapsed-expected.txt: Added. 27 * platform/chromium/accessibility/post-notification-RowCollapsed.html: Added. 28 * platform/chromium/accessibility/post-notification-RowCountChanged-expected.txt: Added. 29 * platform/chromium/accessibility/post-notification-RowCountChanged.html: Added. 30 * platform/chromium/accessibility/post-notification-RowExpanded-expected.txt: Added. 31 * platform/chromium/accessibility/post-notification-RowExpanded.html: Added. 32 * platform/chromium/accessibility/post-notification-ScrolledToAnchor-expected.txt: Added. 33 * platform/chromium/accessibility/post-notification-ScrolledToAnchor.html: Added. 34 * platform/chromium/accessibility/post-notification-SelectedChildrenChanged-expected.txt: Added. 35 * platform/chromium/accessibility/post-notification-SelectedChildrenChanged.html: Added. 36 * platform/chromium/accessibility/post-notification-SelectedTextChanged-expected.txt: Added. 37 * platform/chromium/accessibility/post-notification-SelectedTextChanged.html: Added. 38 * platform/chromium/accessibility/post-notification-ValueChanged-expected.txt: Added. 39 * platform/chromium/accessibility/post-notification-ValueChanged.html: Added. 40 * platform/chromium/accessibility/post-notification.js: Added. 41 (enumAccessibilityObjects): 42 (testDone): 43 (test): 44 * platform/chromium/drt_expectations.txt: 45 * platform/chromium/test_expectations.txt: 46 1 47 2010-09-14 Darin Adler <darin@apple.com> 2 48 -
trunk/LayoutTests/platform/chromium/drt_expectations.txt
r67387 r67498 162 162 163 163 // Pass with DRT though FAIL on test_shell 164 BUG_DRT : platform/chromium/accessibility /children-changed-notification.html= PASS164 BUG_DRT : platform/chromium/accessibility = PASS -
trunk/LayoutTests/platform/chromium/test_expectations.txt
r67480 r67498 955 955 956 956 // Functionality is supported in DRT but not TestShell 957 WONTFIX SKIP : platform/chromium/accessibility /children-changed-notification.html= FAIL957 WONTFIX SKIP : platform/chromium/accessibility = FAIL 958 958 959 959 // ----------------------------------------------------------------- -
trunk/WebCore/ChangeLog
r67496 r67498 1 2010-09-14 Chris Guillory <chris.guillory@google.com> 2 3 Reviewed by Chris Fleizach. 4 5 Send all accessibility notifications to Chromium. 6 https://bugs.webkit.org/show_bug.cgi?id=45156 7 8 Use postAccessibilityNotification to pass accessibility notifications 9 to chromium. 10 11 Tests: platform/chromium/accessibility/post-notification-ActiveDescendantChanged.html 12 platform/chromium/accessibility/post-notification-CheckedStateChanged.html 13 platform/chromium/accessibility/post-notification-ChildrenChanged.html 14 platform/chromium/accessibility/post-notification-FocusedUIElementChanged.html 15 platform/chromium/accessibility/post-notification-LayoutComplete.html 16 platform/chromium/accessibility/post-notification-LiveRegionChanged.html 17 platform/chromium/accessibility/post-notification-LoadComplete.html 18 platform/chromium/accessibility/post-notification-MenuListValueChanged.html 19 platform/chromium/accessibility/post-notification-RowCollapsed.html 20 platform/chromium/accessibility/post-notification-RowCountChanged.html 21 platform/chromium/accessibility/post-notification-RowExpanded.html 22 platform/chromium/accessibility/post-notification-ScrolledToAnchor.html 23 platform/chromium/accessibility/post-notification-SelectedChildrenChanged.html 24 platform/chromium/accessibility/post-notification-SelectedTextChanged.html 25 platform/chromium/accessibility/post-notification-ValueChanged.html 26 27 * accessibility/chromium/AXObjectCacheChromium.cpp: 28 (WebCore::AXObjectCache::postPlatformNotification): 29 * page/chromium/ChromeClientChromium.h: 30 1 31 2010-09-14 Darin Adler <darin@apple.com> 2 32 -
trunk/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp
r66317 r67498 61 61 62 62 ChromeClientChromium* client = toChromeClientChromium(obj->documentFrameView()); 63 if (client) { 64 switch (notification) { 65 case AXCheckedStateChanged: 66 client->didChangeAccessibilityObjectState(obj); 67 break; 68 case AXChildrenChanged: 69 client->didChangeAccessibilityObjectChildren(obj); 70 break; 71 case AXActiveDescendantChanged: 72 case AXFocusedUIElementChanged: 73 case AXLayoutComplete: 74 case AXLiveRegionChanged: 75 case AXLoadComplete: 76 case AXMenuListValueChanged: 77 case AXRowCollapsed: 78 case AXRowCountChanged: 79 case AXRowExpanded: 80 case AXScrolledToAnchor: 81 case AXSelectedChildrenChanged: 82 case AXSelectedTextChanged: 83 case AXValueChanged: 84 break; 85 } 63 if (!client) 64 return; 65 66 // TODO: Remove after the new postAccessibilityNotification is used downstream. 67 switch (notification) { 68 case AXCheckedStateChanged: 69 client->didChangeAccessibilityObjectState(obj); 70 break; 71 case AXChildrenChanged: 72 client->didChangeAccessibilityObjectChildren(obj); 73 break; 74 case AXActiveDescendantChanged: 75 case AXFocusedUIElementChanged: 76 case AXLayoutComplete: 77 case AXLiveRegionChanged: 78 case AXLoadComplete: 79 case AXMenuListValueChanged: 80 case AXRowCollapsed: 81 case AXRowCountChanged: 82 case AXRowExpanded: 83 case AXScrolledToAnchor: 84 case AXSelectedChildrenChanged: 85 case AXSelectedTextChanged: 86 case AXValueChanged: 87 break; 86 88 } 89 90 client->postAccessibilityNotification(obj, notification); 87 91 } 88 92 -
trunk/WebCore/page/chromium/ChromeClientChromium.h
r66305 r67498 32 32 #define ChromeClientChromium_h 33 33 34 #include "AXObjectCache.h" 34 35 #include "ChromeClient.h" 35 36 #include <wtf/Forward.h> … … 59 60 // Notified embedder that the children of an accessibility object has changed. 60 61 virtual void didChangeAccessibilityObjectChildren(AccessibilityObject*) = 0; 62 63 // Notifies embedder about an accessibility notification. 64 virtual void postAccessibilityNotification(AccessibilityObject*, AXObjectCache::AXNotification) = 0; 61 65 }; 62 66 -
trunk/WebKit/chromium/ChangeLog
r67487 r67498 1 2010-09-14 Chris Guillory <chris.guillory@google.com> 2 3 Reviewed by Chris Fleizach. 4 5 Send all accessibility notifications to Chromium. 6 https://bugs.webkit.org/show_bug.cgi?id=45156 7 8 Use postAccessibilityNotification to pass accessibility notifications 9 to chromium. 10 11 * WebKit.gyp: 12 * public/WebAccessibilityNotification.h: Added. 13 * public/WebViewClient.h: 14 (WebKit::WebViewClient::postAccessibilityNotification): 15 * src/AssertMatchingEnums.h: Added. 16 * src/ChromeClientImpl.cpp: 17 (WebKit::toWebAccessibilityNotification): 18 (WebKit::ChromeClientImpl::didChangeAccessibilityObjectChildren): 19 (WebKit::ChromeClientImpl::postAccessibilityNotification): 20 * src/ChromeClientImpl.h: 21 1 22 2010-09-14 Tony Chang <tony@chromium.org> 2 23 -
trunk/WebKit/chromium/WebKit.gyp
r67446 r67498 99 99 'public/mac/WebScreenInfoFactory.h', 100 100 'public/WebAccessibilityCache.h', 101 'public/WebAccessibilityNotification.h', 101 102 'public/WebAccessibilityObject.h', 102 103 'public/WebAccessibilityRole.h', -
trunk/WebKit/chromium/public/WebViewClient.h
r66305 r67498 32 32 #define WebViewClient_h 33 33 34 #include "WebAccessibilityNotification.h" 34 35 #include "WebDragOperation.h" 35 36 #include "WebEditingAction.h" … … 281 282 // Notifies embedder that the children of an accessibility object has changed. 282 283 virtual void didChangeAccessibilityObjectChildren(const WebAccessibilityObject&) { } 284 285 // Notifies embedder about an accessibility notification. 286 virtual void postAccessibilityNotification(const WebAccessibilityObject&, WebAccessibilityNotification) { } 283 287 284 288 -
trunk/WebKit/chromium/src/ChromeClientImpl.cpp
r67244 r67498 57 57 #include "Page.h" 58 58 #include "PopupMenuChromium.h" 59 #include "ScriptController.h" 59 60 #include "SearchPopupMenuChromium.h" 60 #include "ScriptController.h"61 61 #include "SecurityOrigin.h" 62 62 #include "SharedGraphicsContext3D.h" 63 #include "WebGeolocationService.h"64 63 #if USE(V8) 65 64 #include "V8Proxy.h" … … 71 70 #include "WebFrameClient.h" 72 71 #include "WebFrameImpl.h" 72 #include "WebGeolocationService.h" 73 73 #include "WebInputEvent.h" 74 74 #include "WebKit.h" … … 104 104 } 105 105 106 // Converts a WebCore::AXObjectCache::AXNotification to a WebKit::WebAccessibilityNotification 107 static WebAccessibilityNotification toWebAccessibilityNotification(AXObjectCache::AXNotification notification) 108 { 109 switch (notification) { 110 case AXObjectCache::AXActiveDescendantChanged: 111 return WebAccessibilityNotificationActiveDescendantChanged; 112 case AXObjectCache::AXCheckedStateChanged: 113 return WebAccessibilityNotificationCheckedStateChanged; 114 case AXObjectCache::AXChildrenChanged: 115 return WebAccessibilityNotificationChildrenChanged; 116 case AXObjectCache::AXFocusedUIElementChanged: 117 return WebAccessibilityNotificationFocusedUIElementChanged; 118 case AXObjectCache::AXLayoutComplete: 119 return WebAccessibilityNotificationLayoutComplete; 120 case AXObjectCache::AXLoadComplete: 121 return WebAccessibilityNotificationLoadComplete; 122 case AXObjectCache::AXSelectedChildrenChanged: 123 return WebAccessibilityNotificationSelectedChildrenChanged; 124 case AXObjectCache::AXSelectedTextChanged: 125 return WebAccessibilityNotificationSelectedTextChanged; 126 case AXObjectCache::AXValueChanged: 127 return WebAccessibilityNotificationValueChanged; 128 case AXObjectCache::AXScrolledToAnchor: 129 return WebAccessibilityNotificationScrolledToAnchor; 130 case AXObjectCache::AXLiveRegionChanged: 131 return WebAccessibilityNotificationLiveRegionChanged; 132 case AXObjectCache::AXMenuListValueChanged: 133 return WebAccessibilityNotificationMenuListValueChanged; 134 case AXObjectCache::AXRowCountChanged: 135 return WebAccessibilityNotificationRowCountChanged; 136 case AXObjectCache::AXRowCollapsed: 137 return WebAccessibilityNotificationRowCollapsed; 138 case AXObjectCache::AXRowExpanded: 139 return WebAccessibilityNotificationRowExpanded; 140 default: 141 ASSERT_NOT_REACHED(); 142 return WebAccessibilityNotificationInvalid; 143 } 144 } 145 106 146 ChromeClientImpl::ChromeClientImpl(WebViewImpl* webView) 107 147 : m_webView(webView) … … 344 384 { 345 385 m_scrollbarsVisible = value; 346 WebFrameImpl* web _frame = static_cast<WebFrameImpl*>(m_webView->mainFrame());347 if (web _frame)348 web _frame->setCanHaveScrollbars(value);386 WebFrameImpl* webFrame = static_cast<WebFrameImpl*>(m_webView->mainFrame()); 387 if (webFrame) 388 webFrame->setCanHaveScrollbars(value); 349 389 } 350 390 … … 735 775 } 736 776 777 void ChromeClientImpl::postAccessibilityNotification(AccessibilityObject* obj, AXObjectCache::AXNotification notification) 778 { 779 // Alert assistive technology about the accessibility object notification. 780 if (obj) 781 m_webView->client()->postAccessibilityNotification(WebAccessibilityObject(obj), toWebAccessibilityNotification(notification)); 782 } 783 737 784 #if ENABLE(NOTIFICATIONS) 738 785 NotificationPresenter* ChromeClientImpl::notificationPresenter() const -
trunk/WebKit/chromium/src/ChromeClientImpl.h
r66777 r67498 169 169 virtual void didChangeAccessibilityObjectState(WebCore::AccessibilityObject*); 170 170 virtual void didChangeAccessibilityObjectChildren(WebCore::AccessibilityObject*); 171 virtual void postAccessibilityNotification(WebCore::AccessibilityObject*, WebCore::AXObjectCache::AXNotification); 171 172 172 173 // ChromeClientImpl: -
trunk/WebKitTools/ChangeLog
r67495 r67498 1 2010-09-14 Chris Guillory <chris.guillory@google.com> 2 3 Reviewed by Chris Fleizach. 4 5 Send all accessibility notifications to Chromium. 6 https://bugs.webkit.org/show_bug.cgi?id=45156 7 8 * DumpRenderTree/chromium/WebViewHost.cpp: 9 (WebViewHost::postAccessibilityNotification): 10 * DumpRenderTree/chromium/WebViewHost.h: 11 1 12 2010-09-14 Adam Barth <abarth@webkit.org> 2 13 -
trunk/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
r67294 r67498 41 41 #include "public/WebDataSource.h" 42 42 #include "public/WebDragData.h" 43 #include "public/WebElement.h" 43 44 #include "public/WebFrame.h" 44 45 #include "public/WebGeolocationServiceMock.h" … … 490 491 } 491 492 492 void WebViewHost::didChangeAccessibilityObjectChildren(const WebAccessibilityObject& object) 493 { 494 if (m_shell->accessibilityController()->shouldDumpAccessibilityNotifications()) 495 printf("didChangeAccessibilityObjectChildren - new count: %d\n", object.childCount()); 493 void WebViewHost::postAccessibilityNotification(const WebAccessibilityObject& obj, WebAccessibilityNotification notification) 494 { 495 printf("AccessibilityNotification - "); 496 497 if (m_shell->accessibilityController()->shouldDumpAccessibilityNotifications()) { 498 switch (notification) { 499 case WebAccessibilityNotificationActiveDescendantChanged: 500 printf("ActiveDescendantChanged"); 501 break; 502 case WebAccessibilityNotificationCheckedStateChanged: 503 printf("CheckedStateChanged"); 504 break; 505 case WebAccessibilityNotificationChildrenChanged: 506 printf("ChildrenChanged"); 507 break; 508 case WebAccessibilityNotificationFocusedUIElementChanged: 509 printf("FocusedUIElementChanged"); 510 break; 511 case WebAccessibilityNotificationLayoutComplete: 512 printf("LayoutComplete"); 513 break; 514 case WebAccessibilityNotificationLoadComplete: 515 printf("LoadComplete"); 516 break; 517 case WebAccessibilityNotificationSelectedChildrenChanged: 518 printf("SelectedChildrenChanged"); 519 break; 520 case WebAccessibilityNotificationSelectedTextChanged: 521 printf("SelectedTextChanged"); 522 break; 523 case WebAccessibilityNotificationValueChanged: 524 printf("ValueChanged"); 525 break; 526 case WebAccessibilityNotificationScrolledToAnchor: 527 printf("ScrolledToAnchor"); 528 break; 529 case WebAccessibilityNotificationLiveRegionChanged: 530 printf("LiveRegionChanged"); 531 break; 532 case WebAccessibilityNotificationMenuListValueChanged: 533 printf("MenuListValueChanged"); 534 break; 535 case WebAccessibilityNotificationRowCountChanged: 536 printf("RowCountChanged"); 537 break; 538 case WebAccessibilityNotificationRowCollapsed: 539 printf("RowCollapsed"); 540 break; 541 case WebAccessibilityNotificationRowExpanded: 542 printf("RowExpanded"); 543 break; 544 } 545 546 WebKit::WebNode node = obj.node(); 547 if (!node.isNull() && node.isElementNode()) { 548 WebKit::WebElement element = node.to<WebKit::WebElement>(); 549 if (element.hasAttribute("id")) 550 printf(" - id:%s", element.getAttribute("id").utf8().data()); 551 } 552 553 printf("\n"); 554 } 496 555 } 497 556 -
trunk/WebKitTools/DumpRenderTree/chromium/WebViewHost.h
r67177 r67498 34 34 #include "MockSpellCheck.h" 35 35 #include "TestNavigationController.h" 36 #include "public/WebAccessibilityNotification.h" 36 37 #include "public/WebCursorInfo.h" 37 38 #include "public/WebFrameClient.h" … … 128 129 virtual int historyForwardListCount(); 129 130 virtual void focusAccessibilityObject(const WebKit::WebAccessibilityObject&); 130 virtual void didChangeAccessibilityObjectChildren(const WebKit::WebAccessibilityObject&);131 virtual void postAccessibilityNotification(const WebKit::WebAccessibilityObject&, WebKit::WebAccessibilityNotification); 131 132 virtual WebKit::WebNotificationPresenter* notificationPresenter(); 132 133 virtual WebKit::WebGeolocationService* geolocationService();
Note: See TracChangeset
for help on using the changeset viewer.