Changeset 207579 in webkit

Timestamp:

Oct 19, 2016 4:55:30 PM (8 years ago)

Author:

Chris Dumez

Message:

[WK2] Expose suggested filename via WKBundleHitTestResult API
​https://bugs.webkit.org/show_bug.cgi?id=163693
<rdar://problem/28840734>

Reviewed by Anders Carlsson.

Expose suggested filename via WKBundleHitTestResult API. The implementation
currently relies on the 'download' attribute on anchor / area elements
that we recently started supporting.

• WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp:

(WKBundleHitTestResultCopyLinkSuggestedFilename):

• WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h:
• WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:

(WebKit::InjectedBundleHitTestResult::create):
(WebKit::InjectedBundleHitTestResult::mediaType):
(WebKit::InjectedBundleHitTestResult::linkSuggestedFilename):
(WebKit::InjectedBundleHitTestResult::imageRect):

• WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h (modified) (1 diff)
• WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp (modified) (5 diffs)
• WebProcess/InjectedBundle/InjectedBundleHitTestResult.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-10-19  Chris Dumez  <cdumez@apple.com>
+
+        [WK2] Expose suggested filename via WKBundleHitTestResult API
+        https://bugs.webkit.org/show_bug.cgi?id=163693
+        <rdar://problem/28840734>
+
+        Reviewed by Anders Carlsson.
+
+        Expose suggested filename via WKBundleHitTestResult API. The implementation
+        currently relies on the 'download' attribute on anchor / area elements
+        that we recently started supporting.
+
+        * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp:
+        (WKBundleHitTestResultCopyLinkSuggestedFilename):
+        * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h:
+        * WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:
+        (WebKit::InjectedBundleHitTestResult::create):
+        (WebKit::InjectedBundleHitTestResult::mediaType):
+        (WebKit::InjectedBundleHitTestResult::linkSuggestedFilename):
+        (WebKit::InjectedBundleHitTestResult::imageRect):
+        * WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:
+
 2016-10-19  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp

@@ -121 +121 @@
     return toCopiedAPI(toImpl(hitTestResultRef)->linkTitle());
 }
+
+WKStringRef WKBundleHitTestResultCopyLinkSuggestedFilename(WKBundleHitTestResultRef hitTestResultRef)
+{
+    return toCopiedAPI(toImpl(hitTestResultRef)->linkSuggestedFilename());
+}

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h

@@ -63 +63 @@
 WK_EXPORT WKStringRef WKBundleHitTestResultCopyLinkLabel(WKBundleHitTestResultRef hitTestResult);
 WK_EXPORT WKStringRef WKBundleHitTestResultCopyLinkTitle(WKBundleHitTestResultRef hitTestResult);
+WK_EXPORT WKStringRef WKBundleHitTestResultCopyLinkSuggestedFilename(WKBundleHitTestResultRef hitTestResult);
 
 #ifdef __cplusplus

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp

@@ -35 +35 @@
 #include <WebCore/FrameLoader.h>
 #include <WebCore/FrameView.h>
+#include <WebCore/HTMLAnchorElement.h>
+#include <WebCore/HTMLNames.h>
 #include <WebCore/URL.h>
 #include <wtf/text/WTFString.h>
@@ -42 +44 @@
 namespace WebKit {
 
-Ref<InjectedBundleHitTestResult> InjectedBundleHitTestResult::create(const WebCore::HitTestResult& hitTestResult)
+Ref<InjectedBundleHitTestResult> InjectedBundleHitTestResult::create(const HitTestResult& hitTestResult)
 {
     return adoptRef(*new InjectedBundleHitTestResult(hitTestResult));
@@ -119 +121 @@
     return BundleHitTestResultMediaTypeNone;
 #else
-    WebCore::Node* node = m_hitTestResult.innerNonSharedNode();
+    Node* node = m_hitTestResult.innerNonSharedNode();
     if (!is<Element>(*node))
         return BundleHitTestResultMediaTypeNone;
@@ -140 +142 @@
 }
 
-WebCore::IntRect InjectedBundleHitTestResult::imageRect() const
+String InjectedBundleHitTestResult::linkSuggestedFilename() const
 {
-    WebCore::IntRect imageRect = m_hitTestResult.imageRect();
+    auto* urlElement = m_hitTestResult.URLElement();
+    if (!is<HTMLAnchorElement>(urlElement))
+        return String();
+    return urlElement->attributeWithoutSynchronization(HTMLNames::downloadAttr);
+}
+
+IntRect InjectedBundleHitTestResult::imageRect() const
+{
+    IntRect imageRect = m_hitTestResult.imageRect();
     if (imageRect.isEmpty())
         return imageRect;
         
-    // The image rect in WebCore::HitTestResult is in frame coordinates, but we need it in WKView
+    // The image rect in HitTestResult is in frame coordinates, but we need it in WKView
     // coordinates since WebKit2 clients don't have enough context to do the conversion themselves.
     WebFrame* webFrame = frame();
@@ -152 +162 @@
         return imageRect;
     
-    WebCore::Frame* coreFrame = webFrame->coreFrame();
+    Frame* coreFrame = webFrame->coreFrame();
     if (!coreFrame)
         return imageRect;
     
-    WebCore::FrameView* view = coreFrame->view();
+    FrameView* view = coreFrame->view();
     if (!view)
         return imageRect;

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h

@@ -61 +61 @@
     String linkLabel() const;
     String linkTitle() const;
+    String linkSuggestedFilename() const;
     
     WebCore::IntRect imageRect() const;