2010-08-02 Chris Fleizach <cfleizach@apple.com>
authorcfleizach@apple.com <cfleizach@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Aug 2010 01:05:31 +0000 (01:05 +0000)
committercfleizach@apple.com <cfleizach@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Aug 2010 01:05:31 +0000 (01:05 +0000)
        Unreviewed, rolling out r64471.
        http://trac.webkit.org/changeset/64471
        https://bugs.webkit.org/show_bug.cgi?id=43005

        Rolling out https://bugs.webkit.org/show_bug.cgi?id=43005
        until further discussion

        * Android.derived.v8bindings.mk:
        * Android.jscbindings.mk:
        * DerivedSources.cpp:
        * DerivedSources.make:
        * GNUmakefile.am:
        * WebCore.gypi:
        * WebCore.pri:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * accessibility/AXObjectCache.h:
        (WebCore::AXObjectCache::):
        * accessibility/Accessibility.cpp: Removed.
        * accessibility/Accessibility.h: Removed.
        * accessibility/Accessibility.idl: Removed.
        * accessibility/AccessibilityObject.h:
        * accessibility/ScreenReader.cpp: Removed.
        * accessibility/ScreenReader.h: Removed.
        * accessibility/ScreenReader.idl: Removed.
        * accessibility/mac/AXObjectCacheMac.mm:
        (WebCore::AXObjectCache::postPlatformNotification):
        * accessibility/mac/AccessibilityObjectMac.mm:
        * page/Navigator.cpp:
        (WebCore::Navigator::disconnectFrame):
        (WebCore::Navigator::mimeTypes):
        * page/Navigator.h:
        * page/Navigator.idl:
2010-08-02  Chris Fleizach  <cfleizach@apple.com>

        Unreviewed, rolling out r64471.
        http://trac.webkit.org/changeset/64471
        https://bugs.webkit.org/show_bug.cgi?id=43005

        Rolling out https://bugs.webkit.org/show_bug.cgi?id=43005
        until further discussion

        * GNUmakefile.am:
2010-08-02  Chris Fleizach  <cfleizach@apple.com>

        Unreviewed, rolling out r64471.
        http://trac.webkit.org/changeset/64471
        https://bugs.webkit.org/show_bug.cgi?id=43005

        Rolling out https://bugs.webkit.org/show_bug.cgi?id=43005
        until further discussion

        * platform/mac/accessibility/js-accessibility-expected.txt: Removed.
        * platform/mac/accessibility/js-accessibility.html: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@64517 268f45cc-cd09-0410-ab3c-d52691b4dbfc

29 files changed:
ChangeLog
GNUmakefile.am
LayoutTests/ChangeLog
LayoutTests/platform/mac/accessibility/js-accessibility-expected.txt [deleted file]
LayoutTests/platform/mac/accessibility/js-accessibility.html [deleted file]
WebCore/Android.derived.v8bindings.mk
WebCore/Android.jscbindings.mk
WebCore/ChangeLog
WebCore/DerivedSources.cpp
WebCore/DerivedSources.make
WebCore/GNUmakefile.am
WebCore/WebCore.gypi
WebCore/WebCore.pri
WebCore/WebCore.pro
WebCore/WebCore.vcproj/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/accessibility/AXObjectCache.h
WebCore/accessibility/Accessibility.cpp [deleted file]
WebCore/accessibility/Accessibility.h [deleted file]
WebCore/accessibility/Accessibility.idl [deleted file]
WebCore/accessibility/AccessibilityObject.h
WebCore/accessibility/ScreenReader.cpp [deleted file]
WebCore/accessibility/ScreenReader.h [deleted file]
WebCore/accessibility/ScreenReader.idl [deleted file]
WebCore/accessibility/mac/AXObjectCacheMac.mm
WebCore/accessibility/mac/AccessibilityObjectMac.mm
WebCore/page/Navigator.cpp
WebCore/page/Navigator.h
WebCore/page/Navigator.idl

index 2c1643b248be76db096f34f86ae31a4318ccf02f..b6c500f39052e412b63bd544272aa9d6e668b0a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-02  Chris Fleizach  <cfleizach@apple.com>
+
+        Unreviewed, rolling out r64471.
+        http://trac.webkit.org/changeset/64471
+        https://bugs.webkit.org/show_bug.cgi?id=43005
+
+        Rolling out https://bugs.webkit.org/show_bug.cgi?id=43005
+        until further discussion
+
+        * GNUmakefile.am:
+
 2010-08-02  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Gustavo Noronha.
index 27d8d4ee62cd958152931c8d8e1f78c2f0e82c97..711adf2751f5ec8a6c8b3895a4092feca7b033b6 100644 (file)
@@ -336,7 +336,6 @@ webkitgtk_static_h_api += \
        $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h
 
 webkitgtk_built_h_api += \
-       DerivedSources/webkit/WebKitDOMAccessibility.h \
        DerivedSources/webkit/WebKitDOMCSSRule.h \
        DerivedSources/webkit/WebKitDOMCSSRuleList.h \
        DerivedSources/webkit/WebKitDOMCSSStyleDeclaration.h \
@@ -449,7 +448,6 @@ webkitgtk_built_h_api += \
        DerivedSources/webkit/WebKitDOMObject.h \
        DerivedSources/webkit/WebKitDOMNavigator.h \
        DerivedSources/webkit/WebKitDOMScreen.h \
-       DerivedSources/webkit/WebKitDOMScreenReader.h \
        DerivedSources/webkit/WebKitDOMWebKitPoint.h \
        DerivedSources/webkit/WebKitDOMDOMMimeType.h \
        DerivedSources/webkit/WebKitDOMDOMMimeTypeArray.h \
@@ -469,7 +467,6 @@ webkitgtk_h_api += \
        $(webkitgtk_static_h_api)
 
 webkitgtk_gdom_built_sources += \
-       DerivedSources/webkit/WebKitDOMAccessibility.cpp \
        DerivedSources/webkit/WebKitDOMAttr.cpp \
        DerivedSources/webkit/WebKitDOMAttrPrivate.h \
        DerivedSources/webkit/WebKitDOMBarInfo.cpp \
@@ -686,7 +683,6 @@ webkitgtk_gdom_built_sources += \
        DerivedSources/webkit/WebKitDOMRangePrivate.h \
        DerivedSources/webkit/WebKitDOMScreen.cpp \
        DerivedSources/webkit/WebKitDOMScreenPrivate.h \
-       DerivedSources/webkit/WebKitDOMScreenReader.cpp \
        DerivedSources/webkit/WebKitDOMStorage.cpp \
        DerivedSources/webkit/WebKitDOMStoragePrivate.h \
        DerivedSources/webkit/WebKitDOMStyleMedia.cpp \
index 5ab95197d77a879aae09b0e3577cda7664a3db4c..d0fa65d49cf1bf7ef9d0e777af1fcc3d9129dd7f 100644 (file)
@@ -1,3 +1,15 @@
+2010-08-02  Chris Fleizach  <cfleizach@apple.com>
+
+        Unreviewed, rolling out r64471.
+        http://trac.webkit.org/changeset/64471
+        https://bugs.webkit.org/show_bug.cgi?id=43005
+
+        Rolling out https://bugs.webkit.org/show_bug.cgi?id=43005
+        until further discussion
+
+        * platform/mac/accessibility/js-accessibility-expected.txt: Removed.
+        * platform/mac/accessibility/js-accessibility.html: Removed.
+
 2010-08-02  Chris Fleizach  <cfleizach@apple.com>
 
         Unreviewed, rolling out r64478.
diff --git a/LayoutTests/platform/mac/accessibility/js-accessibility-expected.txt b/LayoutTests/platform/mac/accessibility/js-accessibility-expected.txt
deleted file mode 100644 (file)
index 5e81a29..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-This tests the javascript interface to accessibility
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS ax.screenReader.active is false
-PASS addedNotification is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS name is 'AXScreenChanged'
-PASS name is 'AXElementsChanged'
-
diff --git a/LayoutTests/platform/mac/accessibility/js-accessibility.html b/LayoutTests/platform/mac/accessibility/js-accessibility.html
deleted file mode 100644 (file)
index b9b73fe..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
-<script>
-var successfullyParsed = false;
-</script>
-<script src="../../../fast/js/resources/js-test-pre.js"></script>
-</head>
-<body id="body">
-
-<p id="description"></p>
-<div id="console"></div>
-
-<script>
-
-    description("This tests the javascript interface to accessibility");
-
-    var body = 0;
-    var name = 0;
-    function notifyCallback(notification) {  
-        name = notification;
-        if (name == "AXScreenChanged") {
-            shouldBe("name", "'AXScreenChanged'");
-        }
-        else if (name == "AXElementsChanged") {
-            shouldBe("name", "'AXElementsChanged'");
-            body.removeNotificationListener();
-            window.layoutTestController.notifyDone();
-        }
-    }
-</script>
-
-<script>
-    var ax = window.navigator.accessibility;
-
-    // screen reader should not be running within layout tests.
-    shouldBe("ax.screenReader.active", "false");
-
-    // should not cause an error.
-    var version = ax.screenReader.version;
-
-    // should not cause an error
-    var activeElement = ax.screenReader.activeElement;
-
-    if (window.accessibilityController) {
-        window.layoutTestController.waitUntilDone();
-
-        document.getElementById("body").focus();
-
-        body = window.accessibilityController.focusedElement;
-
-        var addedNotification = body.addNotificationListener(notifyCallback);
-        shouldBe("addedNotification", "true");
-
-        // should cause a AXScreenChanged to be sent out.
-        ax.screenChanged();
-
-        // should cause a AXElementsChanged to be sent out.
-        ax.elementsChanged();
-    }
-
-    successfullyParsed = true;
-</script>
-
-<script src="../../../fast/js/resources/js-test-post.js"></script>
-</body>
-</html>
index 63be0a823121e34d62b11a5f298601949676d8f8..216cde9fc78d7d78fccc1789963f08bb9b088dbb 100644 (file)
@@ -263,21 +263,6 @@ LOCAL_GENERATED_SOURCES += $(GEN)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h
 
-# Accessibility
-GEN := \
-    $(intermediates)/bindings/V8Accessibility.h
-    $(intermediates)/bindings/V8ScreenReader.h
-
-$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
-$(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $<
-$(GEN): $(intermediates)/bindings/V8%.h : $(LOCAL_PATH)/accessibility/%.idl $(js_binding_scripts)
-       $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-# We also need the .cpp files, which are generated as side effects of the
-# above rules.  Specifying this explicitly makes -j2 work.
-$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h
-
 # Page
 GEN := \
     $(intermediates)/bindings/V8BarInfo.h \
index f67d54d15dac20b6b01365fe984673fda914001a..2ee4276ba4bcf432f2fecfa0f1a361b8ebaee4b1 100644 (file)
@@ -45,7 +45,6 @@ BINDING_C_INCLUDES := \
        $(JAVASCRIPTCORE_PATH)/wrec \
        $(JAVASCRIPTCORE_PATH)/ForwardingHeaders \
        \
-       $(base_intermediates)/WebCore/accessibility \
        $(base_intermediates)/WebCore/bindings/js \
        $(base_intermediates)/WebCore/dom \
        $(base_intermediates)/WebCore/html/canvas \
index ddaa9fb2a2c5132af6e81521d75a4eb9fea0f800..f352ccdae1bc29e118b804c3e7943c3eedb8fe75 100644 (file)
@@ -1,3 +1,40 @@
+2010-08-02  Chris Fleizach  <cfleizach@apple.com>
+
+        Unreviewed, rolling out r64471.
+        http://trac.webkit.org/changeset/64471
+        https://bugs.webkit.org/show_bug.cgi?id=43005
+
+        Rolling out https://bugs.webkit.org/show_bug.cgi?id=43005
+        until further discussion
+
+        * Android.derived.v8bindings.mk:
+        * Android.jscbindings.mk:
+        * DerivedSources.cpp:
+        * DerivedSources.make:
+        * GNUmakefile.am:
+        * WebCore.gypi:
+        * WebCore.pri:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * accessibility/AXObjectCache.h:
+        (WebCore::AXObjectCache::):
+        * accessibility/Accessibility.cpp: Removed.
+        * accessibility/Accessibility.h: Removed.
+        * accessibility/Accessibility.idl: Removed.
+        * accessibility/AccessibilityObject.h:
+        * accessibility/ScreenReader.cpp: Removed.
+        * accessibility/ScreenReader.h: Removed.
+        * accessibility/ScreenReader.idl: Removed.
+        * accessibility/mac/AXObjectCacheMac.mm:
+        (WebCore::AXObjectCache::postPlatformNotification):
+        * accessibility/mac/AccessibilityObjectMac.mm:
+        * page/Navigator.cpp:
+        (WebCore::Navigator::disconnectFrame):
+        (WebCore::Navigator::mimeTypes):
+        * page/Navigator.h:
+        * page/Navigator.idl:
+
 2010-08-02  Ryosuke Niwa  <rniwa@webkit.org>
 
         Reviewed by Eric Seidel.
index a59e832ab806b42a995b82d3ea8c2345c52a74f5..3e5fb604efcb7d24145045c73fe90be98c5b7dfe 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "HTMLElementFactory.cpp"
 #include "JSAbstractWorker.cpp"
-#include "JSAccessibility.cpp"
 #include "JSAttr.cpp"
 #include "JSBarInfo.cpp"
 #include "JSBeforeLoadEvent.cpp"
 #include "JSRect.cpp"
 #include "JSRGBColor.cpp"
 #include "JSScreen.cpp"
-#include "JSScreenReader.cpp"
 #include "JSScriptProfile.cpp"
 #include "JSScriptProfileNode.cpp"
 #include "JSSharedWorker.cpp"
index e053350a42a0c7ef02999b79d4e3835d506e47b9..3f2f0f41311ae95be16eea31b2a32ebe00e94f63 100644 (file)
@@ -28,7 +28,6 @@
 
 VPATH = \
     $(WebCore) \
-    $(WebCore)/accessibility \
     $(WebCore)/bindings/js \
     $(WebCore)/bindings/objc \
     $(WebCore)/css \
@@ -51,7 +50,6 @@ VPATH = \
 DOM_CLASSES = \
     AbstractView \
     AbstractWorker \
-    Accessibility \
     Attr \
     BarInfo \
     BeforeLoadEvent \
@@ -440,7 +438,6 @@ DOM_CLASSES = \
     SVGZoomAndPan \
     SVGZoomEvent \
     Screen \
-    ScreenReader \
     StyleMedia \
     StyleSheet \
     StyleSheetList \
index 852f3eb99518b8921d2a297d300abfe5b16ac783..885bd6c7185dbf7ab91a333e4c92f9d72560f185 100644 (file)
@@ -99,8 +99,6 @@ webcore_built_sources += \
        DerivedSources/WebCore/InspectorBackendDispatcher.h \
        DerivedSources/WebCore/JSAbstractWorker.cpp \
        DerivedSources/WebCore/JSAbstractWorker.h \
-       DerivedSources/WebCore/JSAccessibility.cpp \
-       DerivedSources/WebCore/JSAccessibility.h \
        DerivedSources/WebCore/JSArrayBuffer.cpp \
        DerivedSources/WebCore/JSArrayBuffer.h \
        DerivedSources/WebCore/JSArrayBufferView.cpp \
@@ -468,8 +466,6 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSRGBColor.h \
        DerivedSources/WebCore/JSScreen.cpp \
        DerivedSources/WebCore/JSScreen.h \
-       DerivedSources/WebCore/JSScreenReader.cpp \
-       DerivedSources/WebCore/JSScreenReader.h \
        DerivedSources/WebCore/JSScriptProfile.cpp \
        DerivedSources/WebCore/JSScriptProfile.h \
        DerivedSources/WebCore/JSScriptProfileNode.cpp \
@@ -579,8 +575,6 @@ webcore_sources += \
        WebCore/WebCorePrefix.h \
        WebCore/accessibility/AXObjectCache.cpp \
        WebCore/accessibility/AXObjectCache.h \
-       WebCore/accessibility/Accessibility.cpp \
-       WebCore/accessibility/Accessibility.h \
        WebCore/accessibility/AccessibilityARIAGrid.cpp \
        WebCore/accessibility/AccessibilityARIAGrid.h \
        WebCore/accessibility/AccessibilityARIAGridCell.cpp \
@@ -623,8 +617,6 @@ webcore_sources += \
        WebCore/accessibility/AccessibilityTableHeaderContainer.h \
        WebCore/accessibility/AccessibilityTableRow.cpp \
        WebCore/accessibility/AccessibilityTableRow.h \
-       WebCore/accessibility/ScreenReader.cpp \
-       WebCore/accessibility/ScreenReader.h \
        WebCore/bindings/generic/RuntimeEnabledFeatures.cpp \
        WebCore/bindings/generic/RuntimeEnabledFeatures.h \
        WebCore/bindings/js/CachedScriptSourceProvider.h \
@@ -4429,7 +4421,6 @@ DerivedSources/WebCore/RemoteInspectorFrontend.cpp DerivedSources/WebCore/Remote
        $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts -I$(WebCore)/inspector $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES_WEBCORE)" --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --generator Inspector $<
 
 IDL_PATH := \
-    $(WebCore)/accessibility \
     $(WebCore)/bindings/js \
     $(WebCore)/css \
     $(WebCore)/dom \
index 9085656a6f1269b0cc90ad1f9abfe44787d39f4d..20482bbe0d339b98d1168332a3529f1ed2b6572f 100644 (file)
@@ -1,8 +1,6 @@
 {
     'variables': {
         'webcore_bindings_idl_files': [
-            'accessibility/Accessibility.idl',
-            'accessibility/ScreenReader.idl',
             'css/CSSCharsetRule.idl',
             'css/CSSFontFaceRule.idl',
             'css/CSSImportRule.idl',
             # Source/Header Files
             'accessibility/AXObjectCache.cpp',
             'accessibility/AXObjectCache.h',
-            'accessibility/Accessibility.cpp',
-            'accessibility/Accessibility.h',
             'accessibility/AccessibilityARIAGrid.cpp',
             'accessibility/AccessibilityARIAGrid.h',
             'accessibility/AccessibilityARIAGridCell.cpp',
             'accessibility/AccessibilityTableHeaderContainer.h',
             'accessibility/AccessibilityTableRow.cpp',
             'accessibility/AccessibilityTableRow.h',
-            'accessibility/ScreenReader.cpp',
-            'accessibility/ScreenReader.h',
             'accessibility/chromium/AXObjectCacheChromium.cpp',
             'accessibility/chromium/AccessibilityObjectChromium.cpp',
             'accessibility/chromium/AccessibilityObjectWrapper.h',
index 19f491640d29e41357ccc69c4e777253e3a9b397..ff65cae078a187521ea286e07dc9db1c156e62df 100644 (file)
@@ -256,8 +256,6 @@ STYLESHEETS_EMBED = \
     $$PWD/css/themeQtMaemo5.css
 
 IDL_BINDINGS += \
-    accessibility/Accessibility.idl \
-    accessibility/ScreenReader.idl \
     css/Counter.idl \
     css/CSSCharsetRule.idl \
     css/CSSFontFaceRule.idl \
index 5d1731fcdee4a408f8775f026b3bb068de415395..03af4df7867bf800fdb8321811c1ee2263caac4f 100644 (file)
@@ -254,7 +254,6 @@ contains(DEFINES, ENABLE_WCSS=1) {
 }
 
 SOURCES += \
-    accessibility/Accessibility.cpp \
     accessibility/AccessibilityImageMapLink.cpp \
     accessibility/AccessibilityMediaControls.cpp \    
     accessibility/AccessibilityMenuList.cpp \
@@ -277,7 +276,6 @@ SOURCES += \
     accessibility/AccessibilityTableHeaderContainer.cpp \    
     accessibility/AccessibilityTableRow.cpp \    
     accessibility/AXObjectCache.cpp \
-    accessibility/ScreenReader.cpp \
     bindings/generic/RuntimeEnabledFeatures.cpp \
     bindings/js/GCController.cpp \
     bindings/js/DOMObjectHashTableMap.cpp \
index 88031f986921f0912c28b00948d3f3cd51b67a4a..32220a03a7d054f9d16637321831ed9ead59b751 100644 (file)
                                RelativePath="$(WebKitOutputDir)\obj\WebCore\DerivedSources\JSAbstractWorker.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSAccessibility.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug_Internal|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug_Cairo|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release_Cairo|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug_All|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSAccessibility.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSAttr.cpp"\r
                                >\r
                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSScreen.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSScreenReader.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug_Internal|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug_Cairo|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release_Cairo|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug_All|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSScreenReader.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="$(WebKitOutputDir)\obj\WebCore\DerivedSources\JSSharedWorker.cpp"\r
                                >\r
                                RelativePath="..\accessibility\AccessibilityAllInOne.cpp"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\accessibility\Accessibility.cpp"\r
-                               >\r
-                       <File\r
-                               RelativePath="..\accessibility\Accessibility.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\accessibility\AccessibilityARIAGrid.cpp"\r
                                >\r
                                RelativePath="..\accessibility\AXObjectCache.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\accessibility\ScreenReader.cpp"\r
-                               >\r
-                       <File\r
-                               RelativePath="..\accessibility\ScreenReader.h"\r
-                               >\r
-                       </File>\r
                        <Filter\r
                                Name="win"\r
                                >\r
index f15bc53e259ae549a386fa54db148928081b7a08..025f1d30234c21ca9023346b6cc5c49e8f294936 100644 (file)
                24F54EAD101FE914000AE741 /* ApplicationCacheHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 24F54EAB101FE914000AE741 /* ApplicationCacheHost.h */; settings = {ATTRIBUTES = (); }; };
                2542F4DA1166C25A00E89A86 /* UserGestureIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2542F4D81166C25A00E89A86 /* UserGestureIndicator.cpp */; };
                2542F4DB1166C25A00E89A86 /* UserGestureIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2542F4D91166C25A00E89A86 /* UserGestureIndicator.h */; };
-               2974463D11FE257A004523F8 /* Accessibility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2974463711FE257A004523F8 /* Accessibility.cpp */; };
-               2974463E11FE257A004523F8 /* Accessibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 2974463811FE257A004523F8 /* Accessibility.h */; };
-               2974464011FE257A004523F8 /* ScreenReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2974463A11FE257A004523F8 /* ScreenReader.cpp */; };
-               2974464111FE257A004523F8 /* ScreenReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 2974463B11FE257A004523F8 /* ScreenReader.h */; };
-               2974466F11FE2B32004523F8 /* JSAccessibility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2974466D11FE2B32004523F8 /* JSAccessibility.cpp */; };
-               2974467011FE2B32004523F8 /* JSAccessibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 2974466E11FE2B32004523F8 /* JSAccessibility.h */; };
-               2974468E11FE2BE1004523F8 /* JSScreenReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2974468C11FE2BE1004523F8 /* JSScreenReader.cpp */; };
-               2974468F11FE2BE1004523F8 /* JSScreenReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 2974468D11FE2BE1004523F8 /* JSScreenReader.h */; };
                29A812260FBB9C1D00510293 /* AccessibilityRenderObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A812080FBB9C1D00510293 /* AccessibilityRenderObject.cpp */; };
                29A812270FBB9C1D00510293 /* AccessibilityTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A812090FBB9C1D00510293 /* AccessibilityTable.cpp */; };
                29A812280FBB9C1D00510293 /* AccessibilityARIAGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A8120A0FBB9C1D00510293 /* AccessibilityARIAGrid.cpp */; };
                24F54EAB101FE914000AE741 /* ApplicationCacheHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationCacheHost.h; sourceTree = "<group>"; };
                2542F4D81166C25A00E89A86 /* UserGestureIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserGestureIndicator.cpp; sourceTree = "<group>"; };
                2542F4D91166C25A00E89A86 /* UserGestureIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserGestureIndicator.h; sourceTree = "<group>"; };
-               2974463711FE257A004523F8 /* Accessibility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Accessibility.cpp; sourceTree = "<group>"; };
-               2974463811FE257A004523F8 /* Accessibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Accessibility.h; sourceTree = "<group>"; };
-               2974463911FE257A004523F8 /* Accessibility.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Accessibility.idl; sourceTree = "<group>"; };
-               2974463A11FE257A004523F8 /* ScreenReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScreenReader.cpp; sourceTree = "<group>"; };
-               2974463B11FE257A004523F8 /* ScreenReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreenReader.h; sourceTree = "<group>"; };
-               2974463C11FE257A004523F8 /* ScreenReader.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ScreenReader.idl; sourceTree = "<group>"; };
-               2974466D11FE2B32004523F8 /* JSAccessibility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAccessibility.cpp; sourceTree = "<group>"; };
-               2974466E11FE2B32004523F8 /* JSAccessibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAccessibility.h; sourceTree = "<group>"; };
-               2974468C11FE2BE1004523F8 /* JSScreenReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSScreenReader.cpp; sourceTree = "<group>"; };
-               2974468D11FE2BE1004523F8 /* JSScreenReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSScreenReader.h; sourceTree = "<group>"; };
                29A812080FBB9C1D00510293 /* AccessibilityRenderObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityRenderObject.cpp; sourceTree = "<group>"; };
                29A812090FBB9C1D00510293 /* AccessibilityTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityTable.cpp; sourceTree = "<group>"; };
                29A8120A0FBB9C1D00510293 /* AccessibilityARIAGrid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityARIAGrid.cpp; sourceTree = "<group>"; };
                        isa = PBXGroup;
                        children = (
                                29A812050FBB9B5200510293 /* mac */,
-                               2974463711FE257A004523F8 /* Accessibility.cpp */,
-                               2974463811FE257A004523F8 /* Accessibility.h */,
-                               2974463911FE257A004523F8 /* Accessibility.idl */,
                                29A8120A0FBB9C1D00510293 /* AccessibilityARIAGrid.cpp */,
                                29A812160FBB9C1D00510293 /* AccessibilityARIAGrid.h */,
                                29A812120FBB9C1D00510293 /* AccessibilityARIAGridCell.cpp */,
                                29A812130FBB9C1D00510293 /* AccessibilityTableRow.h */,
                                29A812190FBB9C1D00510293 /* AXObjectCache.cpp */,
                                29A8121A0FBB9C1D00510293 /* AXObjectCache.h */,
-                               2974463A11FE257A004523F8 /* ScreenReader.cpp */,
-                               2974463B11FE257A004523F8 /* ScreenReader.h */,
-                               2974463C11FE257A004523F8 /* ScreenReader.idl */,
                        );
                        path = accessibility;
                        sourceTree = "<group>";
                A83B79100CCB001B000B0825 /* Core */ = {
                        isa = PBXGroup;
                        children = (
-                               2974466D11FE2B32004523F8 /* JSAccessibility.cpp */,
-                               2974466E11FE2B32004523F8 /* JSAccessibility.h */,
                                65DF31D809D1C122000BE325 /* JSAttr.cpp */,
                                65DF31D909D1C123000BE325 /* JSAttr.h */,
                                93F9B79E0BA6032600854064 /* JSCDATASection.cpp */,
                                65DF31EC09D1CC60000BE325 /* JSProcessingInstruction.h */,
                                E4B423850CBFB73C00AF2ECE /* JSProgressEvent.cpp */,
                                E4B423860CBFB73C00AF2ECE /* JSProgressEvent.h */,
-                               2974468C11FE2BE1004523F8 /* JSScreenReader.cpp */,
-                               2974468D11FE2BE1004523F8 /* JSScreenReader.h */,
                                65DF31EF09D1CC60000BE325 /* JSText.cpp */,
                                65DF31F009D1CC60000BE325 /* JSText.h */,
                        );
                        files = (
                                B5B5DC6A119BB3D5002A8790 /* AbstractDatabase.h in Headers */,
                                41E1B1D10FF5986900576B3B /* AbstractWorker.h in Headers */,
-                               2974463E11FE257A004523F8 /* Accessibility.h in Headers */,
                                29A8122E0FBB9C1D00510293 /* AccessibilityARIAGridCell.h in Headers */,
                                29A812330FBB9C1D00510293 /* AccessibilityARIAGridRow.h in Headers */,
                                29A8123B0FBB9C1D00510293 /* AccessibilityImageMapLink.h in Headers */,
                                59EE122E1106080F00885116 /* JNIUtilityPrivate.h in Headers */,
                                93309DF4099E64920056E581 /* JoinTextNodesCommand.h in Headers */,
                                418F88050FF957AF0080F045 /* JSAbstractWorker.h in Headers */,
-                               2974467011FE2B32004523F8 /* JSAccessibility.h in Headers */,
                                49EECF01105070C400099FAB /* JSArrayBuffer.h in Headers */,
                                49EECF1C105072F300099FAB /* JSArrayBufferView.h in Headers */,
                                86243D0111BC31F700CC006A /* JSArrayBufferViewHelper.h in Headers */,
                                BCFE2F120C1B58380020235F /* JSRect.h in Headers */,
                                BC74DA491013F468007987AD /* JSRGBColor.h in Headers */,
                                BCEC01C30C274DDD009F4EC9 /* JSScreen.h in Headers */,
-                               2974468F11FE2BE1004523F8 /* JSScreenReader.h in Headers */,
                                9FA37EFB1172FDA600C4CD55 /* JSScriptProfile.h in Headers */,
                                9FA37EFD1172FDA600C4CD55 /* JSScriptProfileNode.h in Headers */,
                                41D07A7F0FF935CA0095EDCE /* JSSharedWorker.h in Headers */,
                                1CEFC9B90D78DC8C007D2579 /* SchedulePair.h in Headers */,
                                5162C7F511F77EFB00612EFE /* SchemeRegistry.h in Headers */,
                                BCEC01BE0C274DAC009F4EC9 /* Screen.h in Headers */,
-                               2974464111FE257A004523F8 /* ScreenReader.h in Headers */,
                                A84D82C111D3474800972990 /* ScriptableDocumentParser.h in Headers */,
                                7A1E88F6101CC384000C4DF5 /* ScriptArray.h in Headers */,
                                7AFD4A8B1131C2760035B883 /* ScriptBreakpoint.h in Headers */,
                        files = (
                                B5B5DC69119BB3D5002A8790 /* AbstractDatabase.cpp in Sources */,
                                41E1B1D00FF5986900576B3B /* AbstractWorker.cpp in Sources */,
-                               2974463D11FE257A004523F8 /* Accessibility.cpp in Sources */,
                                29A812280FBB9C1D00510293 /* AccessibilityARIAGrid.cpp in Sources */,
                                29A812300FBB9C1D00510293 /* AccessibilityARIAGridCell.cpp in Sources */,
                                29A8122D0FBB9C1D00510293 /* AccessibilityARIAGridRow.cpp in Sources */,
                                59EE122C1106080500885116 /* JNIUtilityPrivate.cpp in Sources */,
                                93309DF3099E64920056E581 /* JoinTextNodesCommand.cpp in Sources */,
                                418F88040FF957AE0080F045 /* JSAbstractWorker.cpp in Sources */,
-                               2974466F11FE2B32004523F8 /* JSAccessibility.cpp in Sources */,
                                49EECF00105070C400099FAB /* JSArrayBuffer.cpp in Sources */,
                                BC275CB311C5E85C00C9206C /* JSArrayBufferCustom.cpp in Sources */,
                                49EECF1B105072F300099FAB /* JSArrayBufferView.cpp in Sources */,
                                BCFE2F110C1B58370020235F /* JSRect.cpp in Sources */,
                                BC74DA481013F468007987AD /* JSRGBColor.cpp in Sources */,
                                BCEC01C20C274DDD009F4EC9 /* JSScreen.cpp in Sources */,
-                               2974468E11FE2BE1004523F8 /* JSScreenReader.cpp in Sources */,
                                9FA37EFA1172FDA600C4CD55 /* JSScriptProfile.cpp in Sources */,
                                9FA37EFC1172FDA600C4CD55 /* JSScriptProfileNode.cpp in Sources */,
                                9FA37EE71172FCF000C4CD55 /* JSScriptProfileNodeCustom.cpp in Sources */,
                                1CE24F970D7CAF0E007E04C2 /* SchedulePairMac.mm in Sources */,
                                5162C7F411F77EFB00612EFE /* SchemeRegistry.cpp in Sources */,
                                BCEC01BD0C274DAC009F4EC9 /* Screen.cpp in Sources */,
-                               2974464011FE257A004523F8 /* ScreenReader.cpp in Sources */,
                                A84D82C211D3474800972990 /* ScriptableDocumentParser.cpp in Sources */,
                                7A1E88F5101CC384000C4DF5 /* ScriptArray.cpp in Sources */,
                                200B190911C277D900DCCD3A /* ScriptBreakpoint.cpp in Sources */,
index b9b56397e1553cdf4e21a5d00cbda016fceaccb7..f18d08acb113126f4ef55c3fcf2889655bf9f7df 100644 (file)
@@ -119,8 +119,6 @@ public:
         AXRowCountChanged,
         AXRowCollapsed,
         AXRowExpanded,
-        AXScreenChanged,
-        AXElementsChanged
     };
 
     void postNotification(RenderObject*, AXNotification, bool postToElement, PostType = PostAsynchronously);
diff --git a/WebCore/accessibility/Accessibility.cpp b/WebCore/accessibility/Accessibility.cpp
deleted file mode 100644 (file)
index abfaf30..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2010 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. AND ITS CONTRIBUTORS ``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 ITS 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 "Accessibility.h"
-
-#include "AXObjectCache.h"
-#include "AccessibilityObject.h"
-#include "Frame.h"
-#include "ScreenReader.h"
-
-namespace WebCore {
-
-Accessibility::Accessibility(Frame* frame)
-    : m_frame(frame) 
-{
-}
-
-Accessibility::~Accessibility()
-{
-    disconnectFrame();
-}
-
-void Accessibility::disconnectFrame()
-{
-    if (m_screenReader) {
-        m_screenReader->disconnectFrame();
-        m_screenReader = 0;
-    }
-    m_frame = 0;
-}
-    
-void Accessibility::screenChanged()
-{
-    if (!m_frame)
-        return;
-    
-    Document* doc = m_frame->document();
-    if (!doc)
-        return;
-    
-    AccessibilityObject* root = doc->axObjectCache()->getOrCreate(doc->renderer());
-    doc->axObjectCache()->postNotification(root, doc, AXObjectCache::AXScreenChanged, false);
-}
-
-void Accessibility::elementsChanged()
-{
-    if (!m_frame)
-        return;
-    
-    Document* doc = m_frame->document();
-    if (!doc)
-        return;
-    
-    AccessibilityObject* root = doc->axObjectCache()->getOrCreate(doc->renderer());
-    doc->axObjectCache()->postNotification(root, doc, AXObjectCache::AXElementsChanged, false);
-}
-    
-ScreenReader* Accessibility::screenReader() const
-{
-    if (!m_screenReader)
-        m_screenReader = ScreenReader::create(m_frame);
-    
-    return m_screenReader.get();
-}
-    
-} // namespace WebCore
-
diff --git a/WebCore/accessibility/Accessibility.h b/WebCore/accessibility/Accessibility.h
deleted file mode 100644 (file)
index de4e526..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2010 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. AND ITS CONTRIBUTORS ``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 ITS 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 Accessibility_h
-#define Accessibility_h
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-    
-class Frame;
-class ScreenReader;
-    
-class Accessibility : public RefCounted<Accessibility> {
-public:
-    static PassRefPtr<Accessibility> create(Frame* frame) { return adoptRef(new Accessibility(frame)); }
-    ~Accessibility();
-    
-    ScreenReader* screenReader() const;
-    void screenChanged();
-    void elementsChanged();
-    
-    void disconnectFrame();
-    
-private:
-    Accessibility(Frame*);
-    Frame* m_frame;
-    mutable RefPtr<ScreenReader> m_screenReader;
-};
-    
-} // namespace WebCore
-
-#endif // Accessibility_h
diff --git a/WebCore/accessibility/Accessibility.idl b/WebCore/accessibility/Accessibility.idl
deleted file mode 100644 (file)
index 5979020..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2010 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-module window {
-
-    interface [OmitConstructor] Accessibility {
-        readonly attribute ScreenReader screenReader;
-
-        void screenChanged();
-        void elementsChanged();
-
-    };
-}
index ea1b1a9e2a76de28cd84b1ead7545198899d0954..c5178558e53b5029ce81ed8fb5171be4ac3bb299 100644 (file)
 #include "AccessibilityObjectWrapper.h"
 #endif
 
-#if PLATFORM(MAC)
-#define SUPPORTS_JSACCESSIBILITY 1
-#else
-#define SUPPORTS_JSACCESSIBILITY 0
-#endif
-
 typedef struct _NSRange NSRange;
 
 #ifdef __OBJC__
@@ -554,16 +548,6 @@ public:
 #endif
 #endif
 
-#if SUPPORTS_JSACCESSIBILITY
-    bool isScreenReaderRunning() const;
-    Element* screenReaderFocusedElement() const;
-    String screenReaderVersion() const;
-#else
-    bool isScreenReaderRunning() const { return false; }
-    Element* screenReaderFocusedElement() const { return 0; }
-    String screenReaderVersion() const { return nullAtom; }
-#endif
-    
 #if HAVE(ACCESSIBILITY)
     // a platform-specific method for determining if an attachment is ignored
     bool accessibilityIgnoreAttachment() const;
diff --git a/WebCore/accessibility/ScreenReader.cpp b/WebCore/accessibility/ScreenReader.cpp
deleted file mode 100644 (file)
index b098e31..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2010 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. AND ITS CONTRIBUTORS ``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 ITS 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 "ScreenReader.h"
-
-#include "AXObjectCache.h"
-#include "AccessibilityObject.h"
-#include "Document.h"
-#include "Element.h"
-#include "Frame.h"
-
-namespace WebCore {
-
-ScreenReader::ScreenReader(Frame* frame)
-    : m_frame(frame)
-{
-}
-
-ScreenReader::~ScreenReader()
-{
-    disconnectFrame();
-}
-    
-void ScreenReader::disconnectFrame()
-{
-    m_frame = 0;
-}
-
-bool ScreenReader::active() const
-{
-    if (!m_frame)
-        return false;
-    
-    Document* doc = m_frame->document();
-    if (!doc)
-        return false;
-    
-    AccessibilityObject* obj = doc->axObjectCache()->getOrCreate(doc->renderer());
-    return obj->isScreenReaderRunning();
-}
-    
-Element* ScreenReader::activeElement() const
-{
-    Document* doc = m_frame->document();
-    if (!doc)
-        return false;
-    
-    AccessibilityObject* obj = doc->axObjectCache()->getOrCreate(doc->renderer());
-    return obj->screenReaderFocusedElement();    
-}
-    
-String ScreenReader::version() const
-{
-    Document* doc = m_frame->document();
-    if (!doc)
-        return nullAtom;
-    
-    AccessibilityObject* obj = doc->axObjectCache()->getOrCreate(doc->renderer());
-    return obj->screenReaderVersion();
-}
-    
-} // namespace WebCore;
diff --git a/WebCore/accessibility/ScreenReader.h b/WebCore/accessibility/ScreenReader.h
deleted file mode 100644 (file)
index 98ffd05..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2010 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. AND ITS CONTRIBUTORS ``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 ITS 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 ScreenReader_h
-#define ScreenReader_h
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-    
-class Element;
-class Frame;
-class String;
-    
-class ScreenReader : public RefCounted<ScreenReader> {
-public:
-    static PassRefPtr<ScreenReader> create(Frame* frame) { return adoptRef(new ScreenReader(frame)); }
-    ~ScreenReader();
-    
-    String version() const;
-    bool active() const;
-    Element* activeElement() const;
-    
-    void disconnectFrame();
-private:
-    ScreenReader(Frame*);
-    Frame* m_frame;
-};
-    
-} // namespace WebCore
-
-#endif // ScreenReader_h
diff --git a/WebCore/accessibility/ScreenReader.idl b/WebCore/accessibility/ScreenReader.idl
deleted file mode 100644 (file)
index a821c92..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2010 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-module window {
-
-    interface  [OmitConstructor] ScreenReader {
-        readonly attribute DOMString version;
-        readonly attribute boolean active;
-        readonly attribute Element activeElement;
-    };
-
-}
-
index ff5970f309aaf88ca66e10fca0b1f27f6f016d76..a02bc753566817fd5deb91dba81d0412e343b873 100644 (file)
@@ -76,12 +76,6 @@ void AXObjectCache::postPlatformNotification(AccessibilityObject* obj, AXNotific
         case AXLayoutComplete:
             macNotification = "AXLayoutComplete";
             break;
-        case AXScreenChanged:
-            macNotification = "AXScreenChanged";
-            break;
-        case AXElementsChanged:
-            macNotification = "AXElementsChanged";
-            break;
         case AXLoadComplete:
             macNotification = "AXLoadComplete";
             break;
index b6d351e14ad018041dab8e522ace135cc1120253..107697254cf9ecd507c601c4417b55de86d65224 100644 (file)
 #if HAVE(ACCESSIBILITY)
 
 #import "AccessibilityObjectWrapper.h"
-#import "AXObjectCache.h"
 
 namespace WebCore {
 
-bool AccessibilityObject::isScreenReaderRunning() const
-{
-    // If the enhanced user interface is enabled, it means VoiceOver is running.
-    return AXObjectCache::accessibilityEnhancedUserInterfaceEnabled();
-}
-    
-Element* AccessibilityObject::screenReaderFocusedElement() const
-{
-    return 0;
-}
-    
-String AccessibilityObject::screenReaderVersion() const
-{ 
-    return nullAtom;
-}
-    
 bool AccessibilityObject::accessibilityIgnoreAttachment() const
 {
     NSView* attachment = [wrapper() attachmentView];
index e68507b1890b23d18e7686ff24ffcda74b6319e0..6c22fb1af53445ecb39d4d64d2bcf35ae33618fa 100644 (file)
@@ -23,7 +23,6 @@
 #include "config.h"
 #include "Navigator.h"
 
-#include "Accessibility.h"
 #include "Chrome.h"
 #include "CookieJar.h"
 #include "DOMMimeTypeArray.h"
@@ -67,10 +66,6 @@ void Navigator::disconnectFrame()
         m_geolocation->disconnectFrame();
         m_geolocation = 0;
     }
-    if (m_accessibility) {
-        m_accessibility->disconnectFrame();
-        m_accessibility = 0;
-    }
     m_frame = 0;
 }
 
@@ -132,13 +127,6 @@ DOMMimeTypeArray* Navigator::mimeTypes() const
         m_mimeTypes = DOMMimeTypeArray::create(m_frame);
     return m_mimeTypes.get();
 }
-    
-Accessibility* Navigator::accessibility() const
-{
-    if (!m_accessibility)
-        m_accessibility = Accessibility::create(m_frame);
-    return m_accessibility.get();
-}
 
 bool Navigator::cookieEnabled() const
 {
index 2da39bc78bec65adbea47667611e13c3908a39eb..3a07126ac52da0a51583b868ab0f3087d59c1aa8 100644 (file)
@@ -27,7 +27,6 @@
 
 namespace WebCore {
 
-class Accessibility;
 class DOMMimeTypeArray;
 class DOMPluginArray;
 class Frame;
@@ -47,7 +46,6 @@ public:
     String language() const;
     DOMPluginArray* plugins() const;
     DOMMimeTypeArray* mimeTypes() const;
-    Accessibility* accessibility() const;
     bool cookieEnabled() const;
     bool javaEnabled() const;
 
@@ -68,7 +66,6 @@ private:
     mutable RefPtr<DOMPluginArray> m_plugins;
     mutable RefPtr<DOMMimeTypeArray> m_mimeTypes;
     mutable RefPtr<Geolocation> m_geolocation;
-    mutable RefPtr<Accessibility> m_accessibility;
 };
 
 }
index a00e0a49f9e079e6fb457b5d9d566ce97cb69a31..e141e6c40b0d8c126e77c109fc8c14c0ae7b613c 100644 (file)
@@ -31,7 +31,6 @@ module window {
         readonly attribute DOMString platform;
         readonly attribute DOMPluginArray plugins;
         readonly attribute DOMMimeTypeArray mimeTypes;
-        readonly attribute Accessibility accessibility;
         readonly attribute DOMString product;
         readonly attribute DOMString productSub;
         readonly attribute DOMString vendor;