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

[beidson at apple.com]

The following commit has been merged in the debian/experimental branch:
commit fa268eb546e1fe7c3dadac1af16ea7dc5358407e
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 14 01:59:26 2010 +0000

    <rdar://problem/8752202> and https://bugs.webkit.org/show_bug.cgi?id=50997
    Expose "link title" and "link label" to InjectedBundleHitTestResult API
    
    Reviewed by Jon Honeycutt (and Brian Weinstein in heart).
    
    * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp:
    (WKBundleHitTestResultCopyLinkLabel):
    (WKBundleHitTestResultCopyLinkTitle):
    * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h:
    
    * WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:
    (WebKit::InjectedBundleHitTestResult::linkLabel):
    (WebKit::InjectedBundleHitTestResult::linkTitle):
    * WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73992 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 9d7f23e..b1d71f0 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,20 @@
+2010-12-13  Brady Eidson  <beidson at apple.com>
+
+        Reviewed by Jon Honeycutt (and Brian Weinstein in heart).
+
+        <rdar://problem/8752202> and https://bugs.webkit.org/show_bug.cgi?id=50997
+        Expose "link title" and "link label" to InjectedBundleHitTestResult API
+
+        * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp:
+        (WKBundleHitTestResultCopyLinkLabel):
+        (WKBundleHitTestResultCopyLinkTitle):
+        * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h:
+
+        * WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:
+        (WebKit::InjectedBundleHitTestResult::linkLabel):
+        (WebKit::InjectedBundleHitTestResult::linkTitle):
+        * WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:
+
 2010-12-13  Brian Weinstein  <bweinstein at apple.com>
 
         Windows Build Fix. Add a needed include.
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp
index ca55fa9..7e74262 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp
@@ -76,5 +76,14 @@ WKRect WKBundleHitTestResultGetImageRect(WKBundleHitTestResultRef hitTestResultR
 bool WKBundleHitTestResultGetIsSelected(WKBundleHitTestResultRef hitTestResultRef)
 {
     return toImpl(hitTestResultRef)->isSelected();
+}
 
+WKStringRef WKBundleHitTestResultCopyLinkLabel(WKBundleHitTestResultRef hitTestResultRef)
+{
+    return toCopiedAPI(toImpl(hitTestResultRef)->linkLabel());
+}
+
+WKStringRef WKBundleHitTestResultCopyLinkTitle(WKBundleHitTestResultRef hitTestResultRef)
+{
+    return toCopiedAPI(toImpl(hitTestResultRef)->linkTitle());
 }
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h
index f22da68..19a6582 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h
@@ -47,6 +47,9 @@ WK_EXPORT WKURLRef WKBundleHitTestResultCopyAbsoluteMediaURL(WKBundleHitTestResu
 WK_EXPORT WKRect WKBundleHitTestResultGetImageRect(WKBundleHitTestResultRef hitTestResult);
 WK_EXPORT bool WKBundleHitTestResultGetIsSelected(WKBundleHitTestResultRef hitTestResult);
 
+WK_EXPORT WKStringRef WKBundleHitTestResultCopyLinkLabel(WKBundleHitTestResultRef hitTestResult);
+WK_EXPORT WKStringRef WKBundleHitTestResultCopyLinkTitle(WKBundleHitTestResultRef hitTestResult);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp b/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
index d60fff9..ab59226 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
@@ -89,6 +89,16 @@ String InjectedBundleHitTestResult::absoluteMediaURL() const
     return m_hitTestResult.absoluteMediaURL().string();
 }
 
+String InjectedBundleHitTestResult::linkLabel() const
+{
+    return m_hitTestResult.textContent();
+}
+
+String InjectedBundleHitTestResult::linkTitle() const
+{
+    return m_hitTestResult.titleDisplayString();
+}
+
 WebCore::IntRect InjectedBundleHitTestResult::imageRect() const
 {
     return m_hitTestResult.imageRect();
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h b/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h
index 8b82ce7..b09da1c 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h
@@ -52,6 +52,9 @@ public:
     String absoluteImageURL() const;
     String absoluteLinkURL() const;
     String absoluteMediaURL() const;
+
+    String linkLabel() const;
+    String linkTitle() const;
     
     WebCore::IntRect imageRect() const;
     

-- 
WebKit Debian packaging