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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b821806df99b889cfbe7ea1c72e9c047d4494d5b
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 16 03:31:48 2010 +0000

    2010-12-15  Chris Guillory  <chris.guillory at google.com>
    
            Reviewed by Darin Fisher.
    
            Expose AccessibilityObject::url() to Chromium
            https://bugs.webkit.org/show_bug.cgi?id=51046
    
            * public/WebAccessibilityObject.h:
            * src/WebAccessibilityObject.cpp:
            (WebKit::WebAccessibilityObject::url):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74171 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index ec48251..95e377a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-15  Chris Guillory  <chris.guillory at google.com>
+
+        Reviewed by Darin Fisher.
+
+        Expose AccessibilityObject::url() to Chromium
+        https://bugs.webkit.org/show_bug.cgi?id=51046
+
+        * public/WebAccessibilityObject.h:
+        * src/WebAccessibilityObject.cpp:
+        (WebKit::WebAccessibilityObject::url):
+
 2010-12-14  Darin Fisher  <darin at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/public/WebAccessibilityObject.h b/WebKit/chromium/public/WebAccessibilityObject.h
index f7c93f2..182d124 100644
--- a/WebKit/chromium/public/WebAccessibilityObject.h
+++ b/WebKit/chromium/public/WebAccessibilityObject.h
@@ -45,6 +45,7 @@ class WebAccessibilityObjectPrivate;
 class WebNode;
 class WebDocument;
 class WebString;
+class WebURL;
 struct WebPoint;
 struct WebRect;
 
@@ -110,6 +111,7 @@ public:
     WEBKIT_API void setFocused(bool) const;
     WEBKIT_API WebString stringValue() const;
     WEBKIT_API WebString title() const;
+    WEBKIT_API WebURL url() const;
 
     WEBKIT_API WebNode node() const;
     WEBKIT_API WebDocument document() const;
diff --git a/WebKit/chromium/src/WebAccessibilityObject.cpp b/WebKit/chromium/src/WebAccessibilityObject.cpp
index 1a425e3..50baa27 100644
--- a/WebKit/chromium/src/WebAccessibilityObject.cpp
+++ b/WebKit/chromium/src/WebAccessibilityObject.cpp
@@ -44,6 +44,7 @@
 #include "WebPoint.h"
 #include "WebRect.h"
 #include "WebString.h"
+#include "WebURL.h"
 
 using namespace WebCore;
 
@@ -461,6 +462,14 @@ WebString WebAccessibilityObject::title() const
     return m_private->title();
 }
 
+WebURL WebAccessibilityObject::url() const
+{
+    if (!m_private)
+        return WebURL();
+    
+    m_private->updateBackingStore();
+    return m_private->url();
+}
 
 WebNode WebAccessibilityObject::node() const
 {

-- 
WebKit Debian packaging