[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 0a14bacce3256fab004efa13bd14972a3210a447
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 2 18:22:26 2003 +0000

    	Work on exposing elements to the Acc API.  This patch gets us to the point where text
    	under the mouse is voiced.
    
            Reviewed by darin
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView accessibilityAttributeValue:]):
            (-[WebHTMLView accessibilityHitTest:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5116 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5a02b87..7e17f69 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-10-02  David Hyatt  <hyatt at apple.com>
+
+	Work on exposing elements to the Acc API.  This patch gets us to the point where text
+	under the mouse is voiced.
+	
+        Reviewed by darin
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView accessibilityAttributeValue:]):
+        (-[WebHTMLView accessibilityHitTest:]):
+
 2003-10-01  John Sullivan  <sullivan at apple.com>
 
         Reviewed by Darin
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index c1450ef..12c7cde 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -28,6 +28,8 @@
 #import <AppKit/NSResponder_Private.h>
 #import <CoreGraphics/CGContextGState.h>
 
+#import <AppKit/NSAccessibility.h>
+
 @interface WebHTMLView (WebHTMLViewPrivate)
 - (void)_setPrinting:(BOOL)printing pageWidth:(float)pageWidth adjustViewSize:(BOOL)adjustViewSize;
 - (void)_updateTextSizeMultiplier;
@@ -874,6 +876,27 @@
     }
 }
 
+- (id)accessibilityAttributeValue:(NSString*)attributeName
+{
+    if ([attributeName isEqualToString: NSAccessibilityChildrenAttribute]) {
+        id accTree = [[self _bridge] accessibilityTree];
+        if (accTree)
+            return [NSArray arrayWithObject: accTree];
+        return nil;
+    }
+    return [super accessibilityAttributeValue:attributeName];
+}
+
+- (id)accessibilityHitTest:(NSPoint)point
+{
+    id accTree = [[self _bridge] accessibilityTree];
+    if (accTree) {
+        NSPoint windowCoord = [[self window] convertScreenToBase: point];
+        return [accTree accessibilityHitTest: [self convertPoint:windowCoord fromView:nil]];
+    }
+    else
+        return self;
+}
 @end
 
 @implementation WebHTMLView (TextSizing)

-- 
WebKit Debian packaging