[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:19:13 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit f85608627f33704d5f7fd98db5b506ecdb6ecb75
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 3 10:00:20 2009 +0000
2009-11-02 Chris Fleizach <cfleizach at apple.com>
Reviewed by David Levin.
fix accessibility webkit-style-check errors
https://bugs.webkit.org/show_bug.cgi?id=29672
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::getOrCreate):
(WebCore::AXObjectCache::remove):
(WebCore::AXObjectCache::platformGenerateAXID):
(WebCore::AXObjectCache::removeAXID):
* accessibility/AXObjectCache.h:
(WebCore::AXObjectCache::enableAccessibility):
(WebCore::AXObjectCache::enableEnhancedUserInterfaceAccessibility):
(WebCore::AXObjectCache::accessibilityEnabled):
(WebCore::AXObjectCache::accessibilityEnhancedUserInterfaceEnabled):
(WebCore::AXObjectCache::isIDinUse):
(WebCore::AXObjectCache::objectFromAXID):
(WebCore::AXObjectCache::):
(WebCore::AXObjectCache::handleActiveDescendantChanged):
(WebCore::AXObjectCache::handleAriaRoleChanged):
(WebCore::AXObjectCache::detachWrapper):
(WebCore::AXObjectCache::attachWrapper):
(WebCore::AXObjectCache::selectedChildrenChanged):
(WebCore::AXObjectCache::postNotification):
(WebCore::AXObjectCache::postPlatformNotification):
(WebCore::AXObjectCache::handleFocusedUIElementChanged):
(WebCore::AXObjectCache::handleScrolledToAnchor):
* accessibility/AccessibilityARIAGrid.cpp:
(WebCore::AccessibilityARIAGrid::cellForColumnAndRow):
* accessibility/AccessibilityAllInOne.cpp:
* accessibility/AccessibilityImageMapLink.cpp:
* accessibility/AccessibilityList.h:
(WebCore::AccessibilityList::isList):
* accessibility/AccessibilityListBox.cpp:
* accessibility/AccessibilityListBox.h:
(WebCore::AccessibilityListBox::isListBox):
* accessibility/AccessibilityListBoxOption.cpp:
* accessibility/AccessibilityListBoxOption.h:
(WebCore::AccessibilityListBoxOption::isListBoxOption):
* accessibility/AccessibilityMediaControls.h:
(WebCore::AccessibilityMediaControl::~AccessibilityMediaControl):
(WebCore::AccessibilityMediaTimeline::~AccessibilityMediaTimeline):
(WebCore::AccessibilityMediaTimeline::isMediaTimeline):
(WebCore::AccessibilityMediaControlsContainer::~AccessibilityMediaControlsContainer):
(WebCore::AccessibilityMediaControlsContainer::roleValue):
(WebCore::AccessibilityMediaControlsContainer::accessibilityIsIgnored):
(WebCore::AccessibilityMediaTimeDisplay::~AccessibilityMediaTimeDisplay):
(WebCore::AccessibilityMediaTimeDisplay::roleValue):
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::parentObjectUnignored):
(WebCore::AccessibilityObject::rightLineVisiblePositionRange):
(WebCore::replacedNodeNeedsCharacter):
(WebCore::AccessibilityObject::stringForVisiblePositionRange):
(WebCore::AccessibilityObject::lengthForVisiblePositionRange):
(WebCore::AccessibilityObject::actionVerb):
* accessibility/AccessibilityObject.h:
(WebCore::PlainTextRange::isNull):
(WebCore::AccessibilityObject::isAccessibilityRenderObject):
(WebCore::AccessibilityObject::isAnchor):
(WebCore::AccessibilityObject::isAttachment):
(WebCore::AccessibilityObject::isHeading):
(WebCore::AccessibilityObject::isLink):
(WebCore::AccessibilityObject::isImage):
(WebCore::AccessibilityObject::isNativeImage):
(WebCore::AccessibilityObject::isImageButton):
(WebCore::AccessibilityObject::isPasswordField):
(WebCore::AccessibilityObject::isTextControl):
(WebCore::AccessibilityObject::isNativeTextControl):
(WebCore::AccessibilityObject::isWebArea):
(WebCore::AccessibilityObject::isCheckboxOrRadio):
(WebCore::AccessibilityObject::isListBox):
(WebCore::AccessibilityObject::isFileUploadButton):
(WebCore::AccessibilityObject::isProgressIndicator):
(WebCore::AccessibilityObject::isSlider):
(WebCore::AccessibilityObject::isControl):
(WebCore::AccessibilityObject::isList):
(WebCore::AccessibilityObject::isDataTable):
(WebCore::AccessibilityObject::isTableRow):
(WebCore::AccessibilityObject::isTableColumn):
(WebCore::AccessibilityObject::isTableCell):
(WebCore::AccessibilityObject::isFieldset):
(WebCore::AccessibilityObject::isGroup):
(WebCore::AccessibilityObject::isChecked):
(WebCore::AccessibilityObject::isEnabled):
(WebCore::AccessibilityObject::isSelected):
(WebCore::AccessibilityObject::isFocused):
(WebCore::AccessibilityObject::isHovered):
(WebCore::AccessibilityObject::isIndeterminate):
(WebCore::AccessibilityObject::isLoaded):
(WebCore::AccessibilityObject::isMultiSelect):
(WebCore::AccessibilityObject::isOffScreen):
(WebCore::AccessibilityObject::isPressed):
(WebCore::AccessibilityObject::isReadOnly):
(WebCore::AccessibilityObject::isVisited):
(WebCore::AccessibilityObject::isRequired):
(WebCore::AccessibilityObject::canSetFocusAttribute):
(WebCore::AccessibilityObject::canSetTextRangeAttributes):
(WebCore::AccessibilityObject::canSetValueAttribute):
(WebCore::AccessibilityObject::hasIntValue):
(WebCore::AccessibilityObject::accessibilityShouldUseUniqueId):
(WebCore::AccessibilityObject::accessibilityIsIgnored):
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::parentObjectIfExists):
(WebCore::AccessibilityRenderObject::parentObject):
(WebCore::AccessibilityRenderObject::isMenuRelated):
(WebCore::AccessibilityRenderObject::accessibilityDescription):
(WebCore::AccessibilityRenderObject::accessibilityIsIgnored):
(WebCore::AccessibilityRenderObject::isFocused):
(WebCore::AccessibilityRenderObject::visiblePositionRangeForLine):
(WebCore::AccessibilityRenderObject::setSelectedVisiblePositionRange):
(WebCore::AccessibilityRenderObject::doAXRangeForLine):
(WebCore::AccessibilityRenderObject::doAXStringForRange):
(WebCore::AccessibilityRenderObject::accessibilityImageMapHitTest):
(WebCore::AccessibilityRenderObject::determineAriaRoleAttribute):
(WebCore::AccessibilityRenderObject::determineAccessibilityRole):
(WebCore::AccessibilityRenderObject::isPresentationalChildOfAriaRole):
(WebCore::AccessibilityRenderObject::canSetFocusAttribute):
(WebCore::AccessibilityRenderObject::canHaveChildren):
(WebCore::AccessibilityRenderObject::actionVerb):
(WebCore::shouldReturnTagNameAsRoleForMSAA):
* accessibility/AccessibilityRenderObject.h:
(WebCore::AccessibilityRenderObject::isAccessibilityRenderObject):
* accessibility/AccessibilitySlider.cpp:
(WebCore::AccessibilitySlider::orientation):
* accessibility/AccessibilitySlider.h:
(WebCore::AccessibilitySlider::~AccessibilitySlider):
(WebCore::AccessibilitySlider::roleValue):
(WebCore::AccessibilitySlider::accessibilityIsIgnored):
(WebCore::AccessibilitySlider::isSlider):
(WebCore::AccessibilitySlider::canSetValueAttribute):
(WebCore::AccessibilitySliderThumb::~AccessibilitySliderThumb):
(WebCore::AccessibilitySliderThumb::roleValue):
(WebCore::AccessibilitySliderThumb::accessibilityIsIgnored):
(WebCore::AccessibilitySliderThumb::setParentObject):
(WebCore::AccessibilitySliderThumb::parentObject):
* accessibility/AccessibilityTable.cpp:
(WebCore::AccessibilityTable::isTableExposableThroughAccessibility):
* accessibility/AccessibilityTableColumn.cpp:
* accessibility/AccessibilityTableHeaderContainer.cpp:
(WebCore::AccessibilityTableHeaderContainer::addChildren):
* accessibility/AccessibilityTableRow.cpp:
* accessibility/mac/AccessibilityObjectWrapper.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50446 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c5c97e6..464131f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -882,6 +882,20 @@
https://bugs.webkit.org/show_bug.cgi?id=30964
[Gtk] Implemment AtkDocument
+ Provides access to expected document attributes.
+
+ * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+ (documentAttributeValue):
+ (webkit_accessible_document_get_document_attribute_value):
+ (webkit_accessible_document_get_document_attributes):
+
+2009-11-03 Joanmarie Diggs <joanmarie.diggs at gmail.com>
+
+ Reviewed by Jan Alonzo.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30964
+ [Gtk] Implemment AtkDocument
+
Implements what has been implemented in AT-SPI.
* accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
diff --git a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
index f566677..80b5a3d 100644
--- a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
+++ b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
@@ -44,6 +44,7 @@
#include "AtomicString.h"
#include "CString.h"
#include "Document.h"
+#include "DocumentType.h"
#include "Editor.h"
#include "Frame.h"
#include "FrameView.h"
@@ -1411,18 +1412,42 @@ static void atk_table_interface_init(AtkTableIface* iface)
iface->get_row_description = webkit_accessible_table_get_row_description;
}
-static const gchar* webkit_accessible_document_get_attribute_value(AtkDocument* document, const gchar* attribute)
+static const gchar* documentAttributeValue(AtkDocument* document, const gchar* attribute)
{
- // FIXME: This needs to be implemented.
- notImplemented();
+ Document* coreDocument = core(document)->document();
+ if (!coreDocument)
+ return 0;
+
+ String value = String();
+ if (!g_ascii_strcasecmp(attribute, "DocType") && coreDocument->doctype())
+ value = coreDocument->doctype()->name();
+ else if (!g_ascii_strcasecmp(attribute, "Encoding"))
+ value = coreDocument->charset();
+ else if (!g_ascii_strcasecmp(attribute, "URI"))
+ value = coreDocument->documentURI();
+ if (!value.isEmpty())
+ return returnString(value);
+
return 0;
}
+static const gchar* webkit_accessible_document_get_attribute_value(AtkDocument* document, const gchar* attribute)
+{
+ return documentAttributeValue(document, attribute);
+}
+
static AtkAttributeSet* webkit_accessible_document_get_attributes(AtkDocument* document)
{
- // FIXME: This needs to be implemented.
- notImplemented();
- return 0;
+ AtkAttributeSet* attributeSet = 0;
+ const gchar* attributes [] = {"DocType", "Encoding", "URI"};
+
+ for (unsigned i = 0; i < G_N_ELEMENTS(attributes); i++) {
+ const gchar* value = documentAttributeValue(document, attributes[i]);
+ if (value)
+ attributeSet = addAttributeToSet(attributeSet, attributes[i], value);
+ }
+
+ return attributeSet;
}
static const gchar* webkit_accessible_document_get_locale(AtkDocument* document)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list