Changeset 33520 in webkit

Timestamp:

May 16, 2008 10:26:23 AM (16 years ago)

Author:

Chris Fleizach

Message:

<rdar://problem/5710317> REGRESSION:Selecting ranges of text should be possible using the keyboard (15310)

Adds support to select text ranges when enhanced accessibility is turned on

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.base.exp (modified) (1 diff)
• WebCore/editing/VisiblePosition.cpp (modified) (2 diffs)
• WebCore/page/AXObjectCache.cpp (modified) (1 diff)
• WebCore/page/AXObjectCache.h (modified) (2 diffs)
• WebCore/page/AccessibilityRenderObject.cpp (modified) (4 diffs)
• WebCore/page/EventHandler.cpp (modified) (3 diffs)
• WebCore/page/EventHandler.h (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebFrame.mm (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-05-16  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by Alice Liu
+
+        <rdar://problem/5710317> REGRESSION:Selecting ranges of text should be possible using the keyboard (15310)
+
+        * WebCore.base.exp:
+        * editing/VisiblePosition.cpp:
+        (WebCore::VisiblePosition::leftVisuallyDistinctCandidate):
+        (WebCore::VisiblePosition::rightVisuallyDistinctCandidate):
+        * page/AXObjectCache.cpp:
+        * page/AXObjectCache.h:
+        (WebCore::AXObjectCache::enableEnhancedUserInterfaceAccessibility):
+        (WebCore::AXObjectCache::accessibilityEnabled):
+        (WebCore::AXObjectCache::accessibilityEnhancedUserInterfaceEnabled):
+        * page/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::visiblePositionRange):
+        (WebCore::AccessibilityRenderObject::doSetAXSelectedTextMarkerRange):
+        (WebCore::AccessibilityRenderObject::addChildren):
+        (WebCore::AccessibilityRenderObject::actionVerb):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleKeyboardSelectionMovement):
+        (WebCore::EventHandler::defaultKeyboardEventHandler):
+        * page/EventHandler.h:
+
 2008-05-15  Ariya Hidayat  <ariya.hidayat@trolltech.com>
 

trunk/WebCore/WebCore.base.exp

@@ -139 +139 @@
 __ZN7WebCore12TextIteratorC1EPKNS_5RangeEb
 __ZN7WebCore13AXObjectCache21gAccessibilityEnabledE
+__ZN7WebCore13AXObjectCache42gAccessibilityEnhancedUserInterfaceEnabledE
 __ZN7WebCore13AXObjectCache3getEPNS_12RenderObjectE
 __ZN7WebCore13HitTestResultC1ERKS0_

trunk/WebCore/editing/VisiblePosition.cpp

@@ -106 +106 @@
 {
     Position p = m_deepPosition;
+    if (!p.node())
+        return Position();
+
     Position downstreamStart = p.downstream();
-
     TextDirection primaryDirection = LTR;
     for (RenderObject* r = p.node()->renderer(); r; r = r->parent()) {
@@ -245 +247 @@
 {
     Position p = m_deepPosition;
+    if (!p.node())
+        return Position();
+
     Position downstreamStart = p.downstream();
-
     TextDirection primaryDirection = LTR;
     for (RenderObject* r = p.node()->renderer(); r; r = r->parent()) {

trunk/WebCore/page/AXObjectCache.cpp

@@ -40 +40 @@
 
 bool AXObjectCache::gAccessibilityEnabled = false;
+bool AXObjectCache::gAccessibilityEnhancedUserInterfaceEnabled = false;
 
 AXObjectCache::~AXObjectCache()

trunk/WebCore/page/AXObjectCache.h

@@ -78 +78 @@
         void handleFocusedUIElementChanged();
         static void enableAccessibility() { gAccessibilityEnabled = true; }
+        static void enableEnhancedUserInterfaceAccessibility() { gAccessibilityEnhancedUserInterfaceEnabled = true; }
+        
         static bool accessibilityEnabled() { return gAccessibilityEnabled; }
-        
+        static bool accessibilityEnhancedUserInterfaceEnabled() { return gAccessibilityEnhancedUserInterfaceEnabled; }
+
         void removeAXID(AccessibilityObject*);
         bool isIDinUse(AXID id) const { return m_idsInUse.contains(id); }
@@ -87 +90 @@
         HashMap<RenderObject*, AXID> m_renderObjectMapping;
         static bool gAccessibilityEnabled;
+        static bool gAccessibilityEnhancedUserInterfaceEnabled;
+        
         HashSet<AXID> m_idsInUse;
         

trunk/WebCore/page/AccessibilityRenderObject.cpp

@@ -1212 +1212 @@
     // construct VisiblePositions for start and end
     Node* node = m_renderer->element();
+    if (!node)
+        return VisiblePositionRange();
+    
     VisiblePosition startPos = VisiblePosition(node, 0, VP_DEFAULT_AFFINITY);
     VisiblePosition endPos = VisiblePosition(node, maxDeepOffset(node), VP_DEFAULT_AFFINITY);
@@ -1346 +1349 @@
         return;
     
-    // make selection and tell the document to use it
-    Selection newSelection = Selection(textMarkerRange.start, textMarkerRange.end);
-    m_renderer->document()->frame()->selectionController()->setSelection(newSelection);
+    // make selection and tell the document to use it. if it's zero length, then move to that position
+    if (textMarkerRange.start == textMarkerRange.end) {
+        m_renderer->document()->frame()->selectionController()->moveTo(textMarkerRange.start, true);
+    }
+    else {
+        Selection newSelection = Selection(textMarkerRange.start, textMarkerRange.end);
+        m_renderer->document()->frame()->selectionController()->setSelection(newSelection);
+    }    
 }
 
@@ -1886 +1894 @@
     for (RefPtr<AccessibilityObject> obj = firstChild(); obj; obj = obj->nextSibling()) {
         if (obj->accessibilityIsIgnored()) {
-            if (!m_haveChildren)
+            if (!obj->hasChildren())
                 obj->addChildren();
             Vector<RefPtr<AccessibilityObject> >children = obj->children();
@@ -1992 +2000 @@
 }   
     
-    const String& AccessibilityRenderObject::actionVerb() const
+const String& AccessibilityRenderObject::actionVerb() const
 {
     // FIXME: Need to add verbs for select elements.

trunk/WebCore/page/EventHandler.cpp

@@ -28 +28 @@
 #include "EventHandler.h"
 
+#include "AXObjectCache.h"
 #include "CachedImage.h"
 #include "ChromeClient.h"
@@ -1579 +1580 @@
 }
 
+void EventHandler::handleKeyboardSelectionMovement(KeyboardEvent* event)
+{
+    if (!event)
+        return;
+    
+    String key = event->keyIdentifier();           
+    bool isShifted = event->getModifierState("Shift");
+    bool isOptioned = event->getModifierState("Alt");
+    
+    if (key == "Up") {
+        m_frame->selectionController()->modify((isShifted) ? SelectionController::EXTEND : SelectionController::MOVE, SelectionController::BACKWARD, LineGranularity, true);
+        event->setDefaultHandled();
+    }
+    else if (key == "Down") { 
+        m_frame->selectionController()->modify((isShifted) ? SelectionController::EXTEND : SelectionController::MOVE, SelectionController::FORWARD, LineGranularity, true);
+        event->setDefaultHandled();
+    }
+    else if (key == "Left") {
+        m_frame->selectionController()->modify((isShifted) ? SelectionController::EXTEND : SelectionController::MOVE, SelectionController::LEFT, (isOptioned) ? WordGranularity : CharacterGranularity, true);
+        event->setDefaultHandled();
+    }
+    else if (key == "Right") {
+        m_frame->selectionController()->modify((isShifted) ? SelectionController::EXTEND : SelectionController::MOVE, SelectionController::RIGHT, (isOptioned) ? WordGranularity : CharacterGranularity, true);
+        event->setDefaultHandled();
+    }    
+}
+    
 void EventHandler::defaultKeyboardEventHandler(KeyboardEvent* event)
 {
@@ -1587 +1615 @@
         if (event->keyIdentifier() == "U+0009")
             defaultTabEventHandler(event);
+
+       // provides KB navigation and selection for enhanced accessibility users
+       if (AXObjectCache::accessibilityEnhancedUserInterfaceEnabled())
+           handleKeyboardSelectionMovement(event);       
    }
    if (event->type() == keypressEvent) {

trunk/WebCore/page/EventHandler.h

@@ -203 +203 @@
     bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&);
 
+    void handleKeyboardSelectionMovement(KeyboardEvent*);
+    
     Cursor selectCursor(const MouseEventWithHitTestResults&, PlatformScrollbar*);
 

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2008-05-16  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by Alice Liu
+
+        <rdar://problem/5710317> REGRESSION:Selecting ranges of text should be possible using the keyboard (15310)
+
+        * WebView/WebFrame.mm:
+        (-[WebFrame _accessibilityTree]):
+
 2008-05-15  Stephanie Lewis  <slewis@apple.com>
         

trunk/WebKit/mac/WebView/WebFrame.mm

@@ -121 +121 @@
 NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
 
+// FIXME: Remove when this key becomes publicly defined
+NSString *NSAccessibilityEnhancedUserInterfaceAttribute = @"AXEnhancedUserInterface";
+
 @implementation WebFramePrivate
 
@@ -670 +673 @@
 - (id)_accessibilityTree
 {
-    AXObjectCache::enableAccessibility();
+    if (!AXObjectCache::accessibilityEnabled()) {
+        AXObjectCache::enableAccessibility();
+        if ([[NSApp accessibilityAttributeValue:NSAccessibilityEnhancedUserInterfaceAttribute] boolValue])
+            AXObjectCache::enableEnhancedUserInterfaceAccessibility();
+    }
+
     if (!_private->coreFrame || !_private->coreFrame->document())
         return nil;