[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
cfleizach at apple.com
cfleizach at apple.com
Wed Dec 22 11:39:38 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 00a196710c66e2d4ab77deb416395693aa18bfe7
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 3 01:05:31 2010 +0000
2010-08-02 Chris Fleizach <cfleizach at 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 Chris Fleizach <cfleizach at 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 at 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: http://svn.webkit.org/repository/webkit/trunk@64517 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 2c1643b..b6c500f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-02 Chris Fleizach <cfleizach at 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 at igalia.com>
Reviewed by Gustavo Noronha.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 27d8d4e..711adf2 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -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 \
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5ab9519..d0fa65d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,17 @@
2010-08-02 Chris Fleizach <cfleizach at 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 at apple.com>
+
Unreviewed, rolling out r64478.
http://trac.webkit.org/changeset/64478
https://bugs.webkit.org/show_bug.cgi?id=43005
diff --git a/LayoutTests/platform/mac/accessibility/js-accessibility-expected.txt b/LayoutTests/platform/mac/accessibility/js-accessibility-expected.txt
deleted file mode 100644
index 5e81a29..0000000
--- a/LayoutTests/platform/mac/accessibility/js-accessibility-expected.txt
+++ /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
index b9b73fe..0000000
--- a/LayoutTests/platform/mac/accessibility/js-accessibility.html
+++ /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>
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index 63be0a8..216cde9 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -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 \
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index f67d54d..2ee4276 100644
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -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 \
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ddaa9fb..f352ccd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,40 @@
+2010-08-02 Chris Fleizach <cfleizach at 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 at webkit.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/DerivedSources.cpp b/WebCore/DerivedSources.cpp
index a59e832..3e5fb60 100644
--- a/WebCore/DerivedSources.cpp
+++ b/WebCore/DerivedSources.cpp
@@ -27,7 +27,6 @@
#include "HTMLElementFactory.cpp"
#include "JSAbstractWorker.cpp"
-#include "JSAccessibility.cpp"
#include "JSAttr.cpp"
#include "JSBarInfo.cpp"
#include "JSBeforeLoadEvent.cpp"
@@ -225,7 +224,6 @@
#include "JSRect.cpp"
#include "JSRGBColor.cpp"
#include "JSScreen.cpp"
-#include "JSScreenReader.cpp"
#include "JSScriptProfile.cpp"
#include "JSScriptProfileNode.cpp"
#include "JSSharedWorker.cpp"
diff --git a/WebCore/DerivedSources.make b/WebCore/DerivedSources.make
index e053350..3f2f0f4 100644
--- a/WebCore/DerivedSources.make
+++ b/WebCore/DerivedSources.make
@@ -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 \
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 852f3eb..885bd6c 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -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 \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 9085656..20482bb 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -1,8 +1,6 @@
{
'variables': {
'webcore_bindings_idl_files': [
- 'accessibility/Accessibility.idl',
- 'accessibility/ScreenReader.idl',
'css/CSSCharsetRule.idl',
'css/CSSFontFaceRule.idl',
'css/CSSImportRule.idl',
@@ -442,8 +440,6 @@
# Source/Header Files
'accessibility/AXObjectCache.cpp',
'accessibility/AXObjectCache.h',
- 'accessibility/Accessibility.cpp',
- 'accessibility/Accessibility.h',
'accessibility/AccessibilityARIAGrid.cpp',
'accessibility/AccessibilityARIAGrid.h',
'accessibility/AccessibilityARIAGridCell.cpp',
@@ -486,8 +482,6 @@
'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',
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index 19f4916..ff65cae 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -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 \
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 5d1731f..03af4df 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -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 \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 88031f9..32220a0 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -601,62 +601,6 @@
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSAccessibility.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSAccessibility.h"
- >
- </File>
- <File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSAttr.cpp"
>
<FileConfiguration
@@ -10741,62 +10685,6 @@
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSScreenReader.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSScreenReader.h"
- >
- </File>
- <File
RelativePath="$(WebKitOutputDir)\obj\WebCore\DerivedSources\JSSharedWorker.cpp"
>
<FileConfiguration
@@ -21041,13 +20929,6 @@
>
</File>
<File
- RelativePath="..\accessibility\Accessibility.cpp"
- >
- <File
- RelativePath="..\accessibility\Accessibility.h"
- >
- </File>
- <File
RelativePath="..\accessibility\AccessibilityARIAGrid.cpp"
>
<FileConfiguration
@@ -22135,13 +22016,6 @@
RelativePath="..\accessibility\AXObjectCache.h"
>
</File>
- <File
- RelativePath="..\accessibility\ScreenReader.cpp"
- >
- <File
- RelativePath="..\accessibility\ScreenReader.h"
- >
- </File>
<Filter
Name="win"
>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index f15bc53..025f1d3 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -624,14 +624,6 @@
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 */; };
@@ -6332,16 +6324,6 @@
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>"; };
@@ -11618,9 +11600,6 @@
isa = PBXGroup;
children = (
29A812050FBB9B5200510293 /* mac */,
- 2974463711FE257A004523F8 /* Accessibility.cpp */,
- 2974463811FE257A004523F8 /* Accessibility.h */,
- 2974463911FE257A004523F8 /* Accessibility.idl */,
29A8120A0FBB9C1D00510293 /* AccessibilityARIAGrid.cpp */,
29A812160FBB9C1D00510293 /* AccessibilityARIAGrid.h */,
29A812120FBB9C1D00510293 /* AccessibilityARIAGridCell.cpp */,
@@ -11665,9 +11644,6 @@
29A812130FBB9C1D00510293 /* AccessibilityTableRow.h */,
29A812190FBB9C1D00510293 /* AXObjectCache.cpp */,
29A8121A0FBB9C1D00510293 /* AXObjectCache.h */,
- 2974463A11FE257A004523F8 /* ScreenReader.cpp */,
- 2974463B11FE257A004523F8 /* ScreenReader.h */,
- 2974463C11FE257A004523F8 /* ScreenReader.idl */,
);
path = accessibility;
sourceTree = "<group>";
@@ -14739,8 +14715,6 @@
A83B79100CCB001B000B0825 /* Core */ = {
isa = PBXGroup;
children = (
- 2974466D11FE2B32004523F8 /* JSAccessibility.cpp */,
- 2974466E11FE2B32004523F8 /* JSAccessibility.h */,
65DF31D809D1C122000BE325 /* JSAttr.cpp */,
65DF31D909D1C123000BE325 /* JSAttr.h */,
93F9B79E0BA6032600854064 /* JSCDATASection.cpp */,
@@ -14793,8 +14767,6 @@
65DF31EC09D1CC60000BE325 /* JSProcessingInstruction.h */,
E4B423850CBFB73C00AF2ECE /* JSProgressEvent.cpp */,
E4B423860CBFB73C00AF2ECE /* JSProgressEvent.h */,
- 2974468C11FE2BE1004523F8 /* JSScreenReader.cpp */,
- 2974468D11FE2BE1004523F8 /* JSScreenReader.h */,
65DF31EF09D1CC60000BE325 /* JSText.cpp */,
65DF31F009D1CC60000BE325 /* JSText.h */,
);
@@ -17334,7 +17306,6 @@
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 */,
@@ -18686,7 +18657,6 @@
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 */,
@@ -18912,7 +18882,6 @@
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 */,
@@ -19437,7 +19406,6 @@
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 */,
@@ -20294,7 +20262,6 @@
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 */,
@@ -21110,7 +21077,6 @@
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 */,
@@ -21403,7 +21369,6 @@
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 */,
@@ -21916,7 +21881,6 @@
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 */,
diff --git a/WebCore/accessibility/AXObjectCache.h b/WebCore/accessibility/AXObjectCache.h
index b9b5639..f18d08a 100644
--- a/WebCore/accessibility/AXObjectCache.h
+++ b/WebCore/accessibility/AXObjectCache.h
@@ -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
index abfaf30..0000000
--- a/WebCore/accessibility/Accessibility.cpp
+++ /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
index de4e526..0000000
--- a/WebCore/accessibility/Accessibility.h
+++ /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
index 5979020..0000000
--- a/WebCore/accessibility/Accessibility.idl
+++ /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();
-
- };
-}
diff --git a/WebCore/accessibility/AccessibilityObject.h b/WebCore/accessibility/AccessibilityObject.h
index ea1b1a9..c517855 100644
--- a/WebCore/accessibility/AccessibilityObject.h
+++ b/WebCore/accessibility/AccessibilityObject.h
@@ -46,12 +46,6 @@
#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
index b098e31..0000000
--- a/WebCore/accessibility/ScreenReader.cpp
+++ /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
index 98ffd05..0000000
--- a/WebCore/accessibility/ScreenReader.h
+++ /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
index a821c92..0000000
--- a/WebCore/accessibility/ScreenReader.idl
+++ /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;
- };
-
-}
-
diff --git a/WebCore/accessibility/mac/AXObjectCacheMac.mm b/WebCore/accessibility/mac/AXObjectCacheMac.mm
index ff5970f..a02bc75 100644
--- a/WebCore/accessibility/mac/AXObjectCacheMac.mm
+++ b/WebCore/accessibility/mac/AXObjectCacheMac.mm
@@ -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;
diff --git a/WebCore/accessibility/mac/AccessibilityObjectMac.mm b/WebCore/accessibility/mac/AccessibilityObjectMac.mm
index b6d351e..1076972 100644
--- a/WebCore/accessibility/mac/AccessibilityObjectMac.mm
+++ b/WebCore/accessibility/mac/AccessibilityObjectMac.mm
@@ -29,26 +29,9 @@
#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];
diff --git a/WebCore/page/Navigator.cpp b/WebCore/page/Navigator.cpp
index e68507b..6c22fb1 100644
--- a/WebCore/page/Navigator.cpp
+++ b/WebCore/page/Navigator.cpp
@@ -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
{
diff --git a/WebCore/page/Navigator.h b/WebCore/page/Navigator.h
index 2da39bc..3a07126 100644
--- a/WebCore/page/Navigator.h
+++ b/WebCore/page/Navigator.h
@@ -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;
};
}
diff --git a/WebCore/page/Navigator.idl b/WebCore/page/Navigator.idl
index a00e0a4..e141e6c 100644
--- a/WebCore/page/Navigator.idl
+++ b/WebCore/page/Navigator.idl
@@ -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;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list