[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Wed Apr 7 23:36:40 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 231b3133e28561b030eeb752b16a6beb0c1572d3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 13 01:59:51 2009 +0000
2009-11-12 Joanmarie Diggs <joanmarie.diggs at gmail.com>
Reviewed by Gustavo Noronha Silva.
https://bugs.webkit.org/show_bug.cgi?id=30997
[Gtk] Implemment AtkDocument
Added testing support for AtkDocument implementation.
* accessibility/document-attributes.html: Added.
* accessibility/document-attributes-expected.txt: Added.
* platform/mac/Skipped:
* platform/win/Skipped:
2009-11-12 Joanmarie Diggs <joanmarie.diggs at gmail.com>
Reviewed by Gustavo Noronha Silva.
https://bugs.webkit.org/show_bug.cgi?id=30997
[Gtk] Implemment AtkDocument
Added testing support.
* DumpRenderTree/AccessibilityUIElement.cpp:
* DumpRenderTree/AccessibilityUIElement.h:
(getDocumentEncodingCallback):
(getDocumentURICallback):
(AccessibilityUIElement::getJSClass):
* DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp:
* DumpRenderTree/mac/AccessibilityUIElementMac.mm:
* DumpRenderTree/win/AccessibilityUIElementWin.cpp:
(AccessibilityUIElement::documentEncoding):
(AccessibilityUIElement::documentURI):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50921 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bca520c..9adda7d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-12 Joanmarie Diggs <joanmarie.diggs at gmail.com>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30997
+ [Gtk] Implemment AtkDocument
+
+ Added testing support for AtkDocument implementation.
+
+ * accessibility/document-attributes.html: Added.
+ * accessibility/document-attributes-expected.txt: Added.
+ * platform/mac/Skipped:
+ * platform/win/Skipped:
+
2009-11-11 Dirk Schulze <krit at webkit.org>
Reviewed by Simon Fraser.
diff --git a/LayoutTests/accessibility/document-attributes-expected.txt b/LayoutTests/accessibility/document-attributes-expected.txt
new file mode 100644
index 0000000..863339f
--- /dev/null
+++ b/LayoutTests/accessibility/document-attributes-expected.txt
@@ -0,0 +1 @@
+Passed
diff --git a/LayoutTests/accessibility/document-attributes.html b/LayoutTests/accessibility/document-attributes.html
new file mode 100644
index 0000000..cf46bd8
--- /dev/null
+++ b/LayoutTests/accessibility/document-attributes.html
@@ -0,0 +1,30 @@
+<html>
+<script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<body id="body">
+ <!-- This tests the exposure of a document's encoding and URI to assistive technologies -->
+ <div id="result"></div>
+ <script>
+ if (window.accessibilityController) {
+ var body = document.getElementById("body");
+ body.focus();
+ var webArea = accessibilityController.focusedElement;
+ var result = document.getElementById("result");
+
+ var documentEncoding = webArea.documentEncoding;
+ var documentURI = webArea.documentURI;
+
+ if (documentEncoding == "UTF-8" && documentURI == location.href) {
+ result.innerText = "Passed";
+ }
+ else {
+ result.innerText = "Failed:\nExpected: UTF-8 and " + location.href + ".\nActual: " + documentEncoding + " and " + documentURI + ".";
+ }
+ }
+ </script>
+</body>
+</html>
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 9c9cee7..2d61bf8 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -98,3 +98,6 @@ fast/ruby
# Missing SocketStreamHandle implementation
websocket/tests
+
+# Accessibility tests without results
+accessibility/document-attributes.html
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 0a460d1..5bfbf05 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -371,6 +371,7 @@ accessibility/aria-tables.html
accessibility/aria-tab-roles.html
accessibility/button-press-action.html
accessibility/canvas.html
+accessibility/document-attributes.html
accessibility/editable-webarea-context-menu-point.html
accessibility/iframe-bastardization.html
accessibility/ignore-spacer-elements.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 02bd387..4f13791 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2009-11-12 Joanmarie Diggs <joanmarie.diggs at gmail.com>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30997
+ [Gtk] Implemment AtkDocument
+
+ Added testing support.
+
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ * DumpRenderTree/AccessibilityUIElement.h:
+ (getDocumentEncodingCallback):
+ (getDocumentURICallback):
+ (AccessibilityUIElement::getJSClass):
+ * DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp:
+ * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
+ * DumpRenderTree/win/AccessibilityUIElementWin.cpp:
+ (AccessibilityUIElement::documentEncoding):
+ (AccessibilityUIElement::documentURI):
+
2009-11-12 Adam Roben <aroben at apple.com>
Replace worldIDs with world objects
diff --git a/WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp b/WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp
index eafe61e..24a5429 100644
--- a/WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp
+++ b/WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp
@@ -429,6 +429,18 @@ static JSValueRef getAccessibilityValueCallback(JSContextRef context, JSObjectRe
return JSValueMakeString(context, accessibilityValue.get());
}
+static JSValueRef getDocumentEncodingCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
+{
+ JSRetainPtr<JSStringRef> documentEncoding(Adopt, toAXElement(thisObject)->documentEncoding());
+ return JSValueMakeString(context, documentEncoding.get());
+}
+
+static JSValueRef getDocumentURICallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
+{
+ JSRetainPtr<JSStringRef> documentURI(Adopt, toAXElement(thisObject)->documentURI());
+ return JSValueMakeString(context, documentURI.get());
+}
+
// Destruction
static void finalize(JSObjectRef thisObject)
@@ -471,6 +483,8 @@ JSClassRef AccessibilityUIElement::getJSClass()
{ "isExpanded", getIsExpandedCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "valueDescription", getValueDescriptionCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "hierarchicalLevel", hierarchicalLevelCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "documentEncoding", getDocumentEncodingCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "documentURI", getDocumentURICallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ 0, 0, 0, 0 }
};
diff --git a/WebKitTools/DumpRenderTree/AccessibilityUIElement.h b/WebKitTools/DumpRenderTree/AccessibilityUIElement.h
index 8800cbe..289ff1c 100644
--- a/WebKitTools/DumpRenderTree/AccessibilityUIElement.h
+++ b/WebKitTools/DumpRenderTree/AccessibilityUIElement.h
@@ -112,6 +112,8 @@ public:
int hierarchicalLevel() const;
double clickPointX();
double clickPointY();
+ JSStringRef documentEncoding();
+ JSStringRef documentURI();
// Table-specific attributes
JSStringRef attributesOfColumnHeaders();
diff --git a/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp b/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
index c1bf07d..8984630 100644
--- a/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
@@ -476,3 +476,21 @@ JSStringRef AccessibilityUIElement::accessibilityValue() const
// FIXME: implement
return JSStringCreateWithCharacters(0, 0);
}
+
+JSStringRef AccessibilityUIElement::documentEncoding()
+{
+ AtkRole role = atk_object_get_role(ATK_OBJECT(m_element));
+ if (role != ATK_ROLE_DOCUMENT_FRAME)
+ return JSStringCreateWithCharacters(0, 0);
+
+ return JSStringCreateWithUTF8CString(atk_document_get_attribute_value(ATK_DOCUMENT(m_element), "Encoding"));
+}
+
+JSStringRef AccessibilityUIElement::documentURI()
+{
+ AtkRole role = atk_object_get_role(ATK_OBJECT(m_element));
+ if (role != ATK_ROLE_DOCUMENT_FRAME)
+ return JSStringCreateWithCharacters(0, 0);
+
+ return JSStringCreateWithUTF8CString(atk_document_get_attribute_value(ATK_DOCUMENT(m_element), "URI"));
+}
diff --git a/WebKitTools/DumpRenderTree/mac/AccessibilityUIElementMac.mm b/WebKitTools/DumpRenderTree/mac/AccessibilityUIElementMac.mm
index 7762f75..950b6ef 100644
--- a/WebKitTools/DumpRenderTree/mac/AccessibilityUIElementMac.mm
+++ b/WebKitTools/DumpRenderTree/mac/AccessibilityUIElementMac.mm
@@ -639,3 +639,13 @@ JSStringRef AccessibilityUIElement::accessibilityValue() const
// FIXME: implement
return JSStringCreateWithCharacters(0, 0);
}
+
+JSStringRef AccessibilityUIElement::documentEncoding()
+{
+ return JSStringCreateWithCharacters(0, 0);
+}
+
+JSStringRef AccessibilityUIElement::documentURI()
+{
+ return JSStringCreateWithCharacters(0, 0);
+}
diff --git a/WebKitTools/DumpRenderTree/win/AccessibilityUIElementWin.cpp b/WebKitTools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
index 8e20078..0afa89b 100644
--- a/WebKitTools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
@@ -431,3 +431,14 @@ JSStringRef AccessibilityUIElement::accessibilityValue() const
return JSStringCreateWithCharacters(value.data(), value.length());
}
+
+
+JSStringRef AccessibilityUIElement::documentEncoding()
+{
+ return JSStringCreateWithCharacters(0, 0);
+}
+
+JSStringRef AccessibilityUIElement::documentURI()
+{
+ return JSStringCreateWithCharacters(0, 0);
+}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list