[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 038f7b15945614c81d96260eaf9ff051d4373591
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 08:33:42 2010 +0000

    2010-07-27  Dominic Mazzoni  <dmazzoni at google.com>
    
            Reviewed by Chris Fleizach.
    
            Add accessors for node and document to WebAccessibilityObject,
            needed to support some Windows screenreader functionality.
    
            https://bugs.webkit.org/show_bug.cgi?id=43001
    
            * public/WebAccessibilityObject.h:
            * src/WebAccessibilityObject.cpp:
            (WebKit::WebAccessibilityObject::node):
            (WebKit::WebAccessibilityObject::document):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64113 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index ce1e71e..9cc1823 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Chris Fleizach.
 
+        Add accessors for node and document to WebAccessibilityObject,
+        needed to support some Windows screenreader functionality.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43001
+        
+        * public/WebAccessibilityObject.h:
+        * src/WebAccessibilityObject.cpp:
+        (WebKit::WebAccessibilityObject::node):
+        (WebKit::WebAccessibilityObject::document):
+
+2010-07-27  Dominic Mazzoni  <dmazzoni at google.com>
+
+        Reviewed by Chris Fleizach.
+
         For Windows accessibility, have WebElement provide access
         to its attributes.
 
diff --git a/WebKit/chromium/public/WebAccessibilityObject.h b/WebKit/chromium/public/WebAccessibilityObject.h
index f1b2474..fcf2480 100644
--- a/WebKit/chromium/public/WebAccessibilityObject.h
+++ b/WebKit/chromium/public/WebAccessibilityObject.h
@@ -42,6 +42,8 @@ namespace WTF { template <typename T> class PassRefPtr; }
 namespace WebKit {
 
 class WebAccessibilityObjectPrivate;
+class WebNode;
+class WebDocument;
 class WebString;
 struct WebPoint;
 struct WebRect;
@@ -103,6 +105,9 @@ public:
     WEBKIT_API WebString stringValue() const;
     WEBKIT_API WebString title() const;
 
+    WEBKIT_API WebNode node() const;
+    WEBKIT_API WebDocument document() const;
+
 #if WEBKIT_IMPLEMENTATION
     WebAccessibilityObject(const WTF::PassRefPtr<WebCore::AccessibilityObject>&);
     WebAccessibilityObject& operator=(const WTF::PassRefPtr<WebCore::AccessibilityObject>&);
diff --git a/WebKit/chromium/src/WebAccessibilityObject.cpp b/WebKit/chromium/src/WebAccessibilityObject.cpp
index e59a1a2..1b8fcf7 100644
--- a/WebKit/chromium/src/WebAccessibilityObject.cpp
+++ b/WebKit/chromium/src/WebAccessibilityObject.cpp
@@ -32,9 +32,13 @@
 #include "WebAccessibilityObject.h"
 
 #include "AccessibilityObject.h"
+#include "Document.h"
 #include "EventHandler.h"
 #include "FrameView.h"
+#include "Node.h"
 #include "PlatformKeyboardEvent.h"
+#include "WebDocument.h"
+#include "WebNode.h"
 #include "WebPoint.h"
 #include "WebRect.h"
 #include "WebString.h"
@@ -401,6 +405,35 @@ WebString WebAccessibilityObject::title() const
     return m_private->title();
 }
 
+
+WebNode WebAccessibilityObject::node() const
+{
+    if (!m_private)
+        return WebNode();
+
+    m_private->updateBackingStore();
+
+    Node* node = m_private->node();
+    if (!node)
+        return WebNode();
+
+    return WebNode(node);
+}
+
+WebDocument WebAccessibilityObject::document() const
+{
+    if (!m_private)
+        return WebDocument();
+
+    m_private->updateBackingStore();
+
+    Document* document = m_private->document();
+    if (!document)
+        return WebDocument();
+
+    return WebDocument(document);
+}
+
 WebAccessibilityObject::WebAccessibilityObject(const WTF::PassRefPtr<WebCore::AccessibilityObject>& object)
     : m_private(static_cast<WebAccessibilityObjectPrivate*>(object.releaseRef()))
 {

-- 
WebKit Debian packaging