WK2: Need to propagate enhanced accessibility flag from UI -> web process

https://bugs.webkit.org/show_bug.cgi?id=56379

Reviewed by Darin Adler.

Source/WebCore: 

Allow the enhanced accessibility flag to be toggleable. 

* accessibility/AXObjectCache.h:
(WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility):

Source/WebKit/mac: 

* WebView/WebFrame.mm:
(-[WebFrame accessibilityRoot]):

Source/WebKit2: 

Support sending the enhanced accessibility flag between processes.

* UIProcess/WebContext.cpp:
(WebKit::WebContext::~WebContext):
(WebKit::WebContext::setEnhancedAccessibility):
* UIProcess/WebContext.h:
* UIProcess/gtk/WebContextGtk.cpp:
(WebKit::WebContet::platformInvalidateContext):
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformInitializeWebProcess):
(WebKit::WebContext::platformInvalidateContext):
* UIProcess/qt/WebContextQt.cpp:
(WebKit::WebContext::platformInvalidateContext):
* UIProcess/win/WebContextWin.cpp:
(WebKit::WebContext::platformInvalidateContext):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::setEnhancedAccessibility):
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:



git-svn-id: svn://svn.chromium.org/blink/trunk@81274 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/WebCore/ChangeLog

+2011-03-16  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by Darin Adler.
+
+        WK2: Need to propagate enhanced accessibility flag from UI -> web process
+        https://bugs.webkit.org/show_bug.cgi?id=56379
+
+        Allow the enhanced accessibility flag to be toggleable. 
+
+        * accessibility/AXObjectCache.h:
+        (WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility):
+
 2011-03-16  Csaba Osztrogonác  <ossy@webkit.org>
 
         [Qt] Buildfix after r81230.

third_party/WebKit/Source/WebCore/accessibility/AXObjectCache.h

@@ -96,7 +96,8 @@ public:
     void handleScrollbarUpdate(ScrollView*);
     
     static void enableAccessibility() { gAccessibilityEnabled = true; }
-    static void enableEnhancedUserInterfaceAccessibility() { gAccessibilityEnhancedUserInterfaceEnabled = true; }
+    // Enhanced user interface accessibility can be toggled by the assistive technology.
+    static void setEnhancedUserInterfaceAccessibility(bool flag) { gAccessibilityEnhancedUserInterfaceEnabled = flag; }
     
     static bool accessibilityEnabled() { return gAccessibilityEnabled; }
     static bool accessibilityEnhancedUserInterfaceEnabled() { return gAccessibilityEnhancedUserInterfaceEnabled; }

third_party/WebKit/Source/WebKit/mac/ChangeLog

+2011-03-16  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by Darin Adler.
+
+        WK2: Need to propagate enhanced accessibility flag from UI -> web process
+        https://bugs.webkit.org/show_bug.cgi?id=56379
+
+        * WebView/WebFrame.mm:
+        (-[WebFrame accessibilityRoot]):
+
 2011-03-15  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Geoffrey Garen.

third_party/WebKit/Source/WebKit/mac/WebView/WebFrame.mm

@@ -1321,8 +1321,7 @@ static inline WebDataSource *dataSource(DocumentLoader* loader)
 #if HAVE(ACCESSIBILITY)
     if (!AXObjectCache::accessibilityEnabled()) {
         AXObjectCache::enableAccessibility();
-        if ([[NSApp accessibilityAttributeValue:NSAccessibilityEnhancedUserInterfaceAttribute] boolValue])
-            AXObjectCache::enableEnhancedUserInterfaceAccessibility();
+        AXObjectCache::setEnhancedUserInterfaceAccessibility([[NSApp accessibilityAttributeValue:NSAccessibilityEnhancedUserInterfaceAttribute] boolValue]);
     }
     
     if (!_private->coreFrame || !_private->coreFrame->document())

third_party/WebKit/Source/WebKit2/ChangeLog

+2011-03-16  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by Darin Adler.
+
+        WK2: Need to propagate enhanced accessibility flag from UI -> web process
+        https://bugs.webkit.org/show_bug.cgi?id=56379
+
+        Support sending the enhanced accessibility flag between processes.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::~WebContext):
+        (WebKit::WebContext::setEnhancedAccessibility):
+        * UIProcess/WebContext.h:
+        * UIProcess/gtk/WebContextGtk.cpp:
+        (WebKit::WebContet::platformInvalidateContext):
+        * UIProcess/mac/WebContextMac.mm:
+        (WebKit::WebContext::platformInitializeWebProcess):
+        (WebKit::WebContext::platformInvalidateContext):
+        * UIProcess/qt/WebContextQt.cpp:
+        (WebKit::WebContext::platformInvalidateContext):
+        * UIProcess/win/WebContextWin.cpp:
+        (WebKit::WebContext::platformInvalidateContext):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::setEnhancedAccessibility):
+        * WebProcess/WebProcess.h:
+        * WebProcess/WebProcess.messages.in:
+
 2011-03-15  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Geoffrey Garen.

third_party/WebKit/Source/WebKit2/UIProcess/WebContext.cpp

@@ -167,6 +167,8 @@ WebContext::~WebContext()
     m_resourceCacheManagerProxy->invalidate();
     m_resourceCacheManagerProxy->clearContext();
 
+    platformInvalidateContext();
+    
 #ifndef NDEBUG
     webContextCounter.decrement();
 #endif
@@ -698,6 +700,14 @@ void WebContext::clearApplicationCache()
     m_process->send(Messages::WebProcess::ClearApplicationCache(), 0);
 }
    
+void WebContext::setEnhancedAccessibility(bool flag)
+{
+    if (!hasValidProcess())
+        return;
+    
+    m_process->send(Messages::WebProcess::SetEnhancedAccessibility(flag), 0);
+}
+    
 void WebContext::startMemorySampler(const double interval)
 {    
     // For new WebProcesses we will also want to start the Memory Sampler

third_party/WebKit/Source/WebKit2/UIProcess/WebContext.h

@@ -131,6 +131,8 @@ public:
     void setShouldPaintNativeControls(bool);
 #endif
 
+    void setEnhancedAccessibility(bool);
+    
     // Downloads.
     uint64_t createDownloadProxy();
     WebDownloadClient& downloadClient() { return m_downloadClient; }
@@ -167,6 +169,7 @@ private:
     virtual Type type() const { return APIType; }
 
     void platformInitializeWebProcess(WebProcessCreationParameters&);
+    void platformInvalidateContext();
     
     // History client
     void didNavigateWithNavigationData(uint64_t pageID, const WebNavigationDataStore& store, uint64_t frameID);
@@ -246,6 +249,10 @@ private:
     bool m_shouldPaintNativeControls;
 #endif
 
+#if PLATFORM(MAC)
+    RetainPtr<CFTypeRef> m_enhancedAccessibilityObserver;
+#endif
+    
     String m_overrideDatabaseDirectory;
     String m_overrideIconDatabasePath;
     String m_overrideLocalStorageDirectory;

third_party/WebKit/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp

@@ -41,6 +41,10 @@ void WebContext::platformInitializeWebProcess(WebProcessCreationParameters&)
 {
 }
 
+void WebContext::platformInvalidateContext()
+{
+}
+
 String WebContext::platformDefaultDatabaseDirectory() const
 {
     return WTF::String::fromUTF8(g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL));

third_party/WebKit/Source/WebKit2/UIProcess/mac/WebContextMac.mm

@@ -37,6 +37,8 @@ NSString *WebDatabaseDirectoryDefaultsKey = @"WebDatabaseDirectory";
 NSString *WebKitLocalCacheDefaultsKey = @"WebKitLocalCache";
 NSString *WebStorageDirectoryDefaultsKey = @"WebKitLocalStorageDatabasePathPreferenceKey";
 
+static NSString *WebKitApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification = @"NSApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification";
+
 // FIXME: <rdar://problem/9138817> - After this "backwards compatibility" radar is removed, this code should be removed to only return an empty String.
 NSString *WebIconDatabaseDirectoryDefaultsKey = @"WebIconDatabaseDirectoryDefaultsKey";
 
@@ -101,6 +103,16 @@ void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& para
 #if USE(CFURLSTORAGESESSIONS)
     parameters.uiProcessBundleIdentifier = String([[NSBundle mainBundle] bundleIdentifier]);
 #endif
+    
+    // Listen for enhanced accessibility changes and propagate them to the WebProcess.
+    m_enhancedAccessibilityObserver = [[NSNotificationCenter defaultCenter] addObserverForName:WebKitApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *note) {
+        setEnhancedAccessibility([[[note userInfo] objectForKey:@"AXEnhancedUserInterface"] boolValue]);
+    }];
+}
+
+void WebContext::platformInvalidateContext()
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:(id)m_enhancedAccessibilityObserver.get()];
 }
     
 String WebContext::platformDefaultDatabaseDirectory() const

third_party/WebKit/Source/WebKit2/UIProcess/qt/WebContextQt.cpp

@@ -47,6 +47,10 @@ void WebContext::platformInitializeWebProcess(WebProcessCreationParameters&)
     qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
 }
 
+void WebContext::platformInvalidateContext()
+{
+}
+
 String WebContext::platformDefaultDatabaseDirectory() const
 {
     // FIXME: Implement.

third_party/WebKit/Source/WebKit2/UIProcess/win/WebContextWin.cpp

@@ -76,6 +76,10 @@ void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& para
 #endif // USE(CFNETWORK)
 }
 
+void WebContext::platformInvalidateContext()
+{
+}
+
 String WebContext::platformDefaultDatabaseDirectory() const
 {
     return WebCore::pathByAppendingComponent(WebCore::localUserSpecificStorageDirectory(), "Databases");

third_party/WebKit/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -50,6 +50,7 @@
 #include "WebProcessMessages.h"
 #include "WebProcessProxyMessages.h"
 #include "WebResourceCacheManager.h"
+#include <WebCore/AXObjectCache.h>
 #include <WebCore/ApplicationCacheStorage.h>
 #include <WebCore/CrossOriginPreflightResultCache.h>
 #include <WebCore/Font.h>
@@ -777,6 +778,11 @@ void WebProcess::cancelDownload(uint64_t downloadID)
     DownloadManager::shared().cancelDownload(downloadID);
 }
 
+void WebProcess::setEnhancedAccessibility(bool flag)
+{
+    WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility(flag);
+}
+    
 void WebProcess::startMemorySampler(const SandboxExtension::Handle& sampleLogFileHandle, const String& sampleLogFilePath, const double interval)
 {
 #if ENABLE(MEMORY_SAMPLER)    

third_party/WebKit/Source/WebKit2/WebProcess/WebProcess.h

@@ -152,6 +152,8 @@ private:
     void platformClearResourceCaches(ResourceCachesToClear);
     void clearApplicationCache();
 
+    void setEnhancedAccessibility(bool);
+    
 #if !ENABLE(PLUGIN_PROCESS)
     void getSitesWithPluginData(const Vector<String>& pluginPaths, uint64_t callbackID);
     void clearPluginSiteData(const Vector<String>& pluginPaths, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);

third_party/WebKit/Source/WebKit2/WebProcess/WebProcess.messages.in

@@ -63,4 +63,6 @@ messages -> WebProcess {
     CancelDownload(uint64_t downloadID)
 
     SetTextCheckerState(WebKit::TextCheckerState textCheckerState)
+
+    SetEnhancedAccessibility(bool flag)
 }