diff options
Diffstat (limited to 'Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h')
-rw-r--r-- | Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h | 59 |
1 files changed, 7 insertions, 52 deletions
diff --git a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h index 3f39a1781..807b82446 100644 --- a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h +++ b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h @@ -35,7 +35,7 @@ #include <wtf/Platform.h> #include <wtf/Vector.h> -#if PLATFORM(COCOA) +#if PLATFORM(MAC) #ifdef __OBJC__ typedef id PlatformUIElement; #else @@ -44,13 +44,13 @@ typedef struct objc_object* PlatformUIElement; #elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL)) #include "AccessibilityNotificationHandlerAtk.h" #include <atk/atk.h> -#include <wtf/glib/GRefPtr.h> +#include <wtf/gobject/GRefPtr.h> typedef GRefPtr<AtkObject> PlatformUIElement; #else typedef void* PlatformUIElement; #endif -#if PLATFORM(COCOA) +#if PLATFORM(MAC) #ifdef __OBJC__ typedef id NotificationHandler; #else @@ -105,7 +105,6 @@ public: JSValueRef uiElementArrayAttributeValue(JSStringRef attribute) const; PassRefPtr<AccessibilityUIElement> uiElementAttributeValue(JSStringRef attribute) const; bool boolAttributeValue(JSStringRef attribute); - void setBoolAttributeValue(JSStringRef attribute, bool value); bool isAttributeSupported(JSStringRef attribute); bool isAttributeSettable(JSStringRef attribute); bool isPressActionSupported(); @@ -114,7 +113,6 @@ public: JSRetainPtr<JSStringRef> role(); JSRetainPtr<JSStringRef> subrole(); JSRetainPtr<JSStringRef> roleDescription(); - JSRetainPtr<JSStringRef> computedRoleString(); JSRetainPtr<JSStringRef> title(); JSRetainPtr<JSStringRef> description(); JSRetainPtr<JSStringRef> language(); @@ -142,8 +140,6 @@ public: bool isSelectable() const; bool isMultiSelectable() const; void setSelectedChild(AccessibilityUIElement*) const; - void setSelectedChildAtIndex(unsigned) const; - void removeSelectionAtIndex(unsigned) const; unsigned selectedChildrenCount() const; PassRefPtr<AccessibilityUIElement> selectedChildAtIndex(unsigned) const; @@ -191,7 +187,6 @@ public: // ARIA specific PassRefPtr<AccessibilityUIElement> ariaOwnsElementAtIndex(unsigned); PassRefPtr<AccessibilityUIElement> ariaFlowToElementAtIndex(unsigned); - PassRefPtr<AccessibilityUIElement> ariaControlsElementAtIndex(unsigned); // ARIA Drag and Drop bool ariaIsGrabbed() const; @@ -207,9 +202,8 @@ public: JSRetainPtr<JSStringRef> stringForRange(unsigned location, unsigned length); JSRetainPtr<JSStringRef> attributedStringForRange(unsigned location, unsigned length); bool attributedStringRangeIsMisspelled(unsigned location, unsigned length); - unsigned uiElementCountForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly); - PassRefPtr<AccessibilityUIElement> uiElementForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly); - JSRetainPtr<JSStringRef> selectTextWithCriteria(JSContextRef, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString, JSStringRef activity); + unsigned uiElementCountForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly); + PassRefPtr<AccessibilityUIElement> uiElementForSearchPredicate(JSContextRef, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly); // Text-specific JSRetainPtr<JSStringRef> characterAtOffset(int offset); @@ -225,15 +219,10 @@ public: PassRefPtr<AccessibilityUIElement> verticalScrollbar() const; void scrollToMakeVisible(); - void scrollToGlobalPoint(int x, int y); - void scrollToMakeVisibleWithSubFocus(int x, int y, int width, int height); // Text markers. - PassRefPtr<AccessibilityTextMarkerRange> lineTextMarkerRangeForTextMarker(AccessibilityTextMarker*); PassRefPtr<AccessibilityTextMarkerRange> textMarkerRangeForElement(AccessibilityUIElement*); PassRefPtr<AccessibilityTextMarkerRange> textMarkerRangeForMarkers(AccessibilityTextMarker* startMarker, AccessibilityTextMarker* endMarker); - PassRefPtr<AccessibilityTextMarkerRange> selectedTextMarkerRange(); - void resetSelectedTextMarkerRange(); PassRefPtr<AccessibilityTextMarker> startTextMarkerForTextMarkerRange(AccessibilityTextMarkerRange*); PassRefPtr<AccessibilityTextMarker> endTextMarkerForTextMarkerRange(AccessibilityTextMarkerRange*); PassRefPtr<AccessibilityTextMarker> endTextMarkerForBounds(int x, int y, int width, int height); @@ -250,17 +239,6 @@ public: PassRefPtr<AccessibilityTextMarker> textMarkerForIndex(int); PassRefPtr<AccessibilityTextMarker> startTextMarker(); PassRefPtr<AccessibilityTextMarker> endTextMarker(); - bool setSelectedVisibleTextRange(AccessibilityTextMarkerRange*); - PassRefPtr<AccessibilityTextMarkerRange> leftWordTextMarkerRangeForTextMarker(AccessibilityTextMarker*); - PassRefPtr<AccessibilityTextMarkerRange> rightWordTextMarkerRangeForTextMarker(AccessibilityTextMarker*); - PassRefPtr<AccessibilityTextMarker> previousWordStartTextMarkerForTextMarker(AccessibilityTextMarker*); - PassRefPtr<AccessibilityTextMarker> nextWordEndTextMarkerForTextMarker(AccessibilityTextMarker*); - PassRefPtr<AccessibilityTextMarkerRange> paragraphTextMarkerRangeForTextMarker(AccessibilityTextMarker*); - PassRefPtr<AccessibilityTextMarker> nextParagraphEndTextMarkerForTextMarker(AccessibilityTextMarker*); - PassRefPtr<AccessibilityTextMarker> previousParagraphStartTextMarkerForTextMarker(AccessibilityTextMarker*); - PassRefPtr<AccessibilityTextMarkerRange> sentenceTextMarkerRangeForTextMarker(AccessibilityTextMarker*); - PassRefPtr<AccessibilityTextMarker> nextSentenceEndTextMarkerForTextMarker(AccessibilityTextMarker*); - PassRefPtr<AccessibilityTextMarker> previousSentenceStartTextMarkerForTextMarker(AccessibilityTextMarker*); // Returns an ordered list of supported actions for an element. JSRetainPtr<JSStringRef> supportedActions() const; @@ -275,29 +253,6 @@ public: // Make sure you call remove, because you can't rely on objects being deallocated in a timely fashion. bool removeNotificationListener(); - JSRetainPtr<JSStringRef> identifier(); - JSRetainPtr<JSStringRef> traits(); - int elementTextPosition(); - int elementTextLength(); - JSRetainPtr<JSStringRef> stringForSelection(); - JSValueRef elementsForRange(unsigned location, unsigned length); - void increaseTextSelection(); - void decreaseTextSelection(); - PassRefPtr<AccessibilityUIElement> linkedElement(); - PassRefPtr<AccessibilityUIElement> headerElementAtIndex(unsigned index); - void assistiveTechnologySimulatedFocus(); - bool isSearchField() const; - bool isTextArea() const; - - bool scrollPageUp(); - bool scrollPageDown(); - bool scrollPageLeft(); - bool scrollPageRight(); - - // Fieldset - bool hasContainedByFieldsetTrait(); - PassRefPtr<AccessibilityUIElement> fieldsetAncestorElement(); - private: AccessibilityUIElement(PlatformUIElement); AccessibilityUIElement(const AccessibilityUIElement&); @@ -306,7 +261,7 @@ private: // A retained, platform specific object used to help manage notifications for this object. #if HAVE(ACCESSIBILITY) -#if PLATFORM(COCOA) +#if PLATFORM(MAC) NotificationHandler m_notificationHandler; void getLinkedUIElements(Vector<RefPtr<AccessibilityUIElement> >&); @@ -315,7 +270,7 @@ private: void getUIElementsWithAttribute(JSStringRef, Vector<RefPtr<AccessibilityUIElement> >&) const; #endif -#if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(EFL) +#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) void getChildren(Vector<RefPtr<AccessibilityUIElement> >&); void getChildrenWithRange(Vector<RefPtr<AccessibilityUIElement> >&, unsigned location, unsigned length); #endif |