<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[207579] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207579">207579</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-19 16:55:30 -0700 (Wed, 19 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleHitTestResultcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleHitTestResulth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleHitTestResultcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleHitTestResulth">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (207578 => 207579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-19 23:49:43 UTC (rev 207578)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-19 23:55:30 UTC (rev 207579)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+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:
+
</ins><span class="cx"> 2016-10-19 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r207557.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp (207578 => 207579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp 2016-10-19 23:49:43 UTC (rev 207578)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp 2016-10-19 23:55:30 UTC (rev 207579)
</span><span class="lines">@@ -120,3 +120,8 @@
</span><span class="cx"> {
</span><span class="cx"> return toCopiedAPI(toImpl(hitTestResultRef)->linkTitle());
</span><span class="cx"> }
</span><ins>+
+WKStringRef WKBundleHitTestResultCopyLinkSuggestedFilename(WKBundleHitTestResultRef hitTestResultRef)
+{
+ return toCopiedAPI(toImpl(hitTestResultRef)->linkSuggestedFilename());
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleHitTestResulth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h (207578 => 207579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h 2016-10-19 23:49:43 UTC (rev 207578)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h 2016-10-19 23:55:30 UTC (rev 207579)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKStringRef WKBundleHitTestResultCopyLinkLabel(WKBundleHitTestResultRef hitTestResult);
</span><span class="cx"> WK_EXPORT WKStringRef WKBundleHitTestResultCopyLinkTitle(WKBundleHitTestResultRef hitTestResult);
</span><ins>+WK_EXPORT WKStringRef WKBundleHitTestResultCopyLinkSuggestedFilename(WKBundleHitTestResultRef hitTestResult);
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp (207578 => 207579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp 2016-10-19 23:49:43 UTC (rev 207578)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp 2016-10-19 23:55:30 UTC (rev 207579)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> #include <WebCore/Frame.h>
</span><span class="cx"> #include <WebCore/FrameLoader.h>
</span><span class="cx"> #include <WebCore/FrameView.h>
</span><ins>+#include <WebCore/HTMLAnchorElement.h>
+#include <WebCore/HTMLNames.h>
</ins><span class="cx"> #include <WebCore/URL.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -41,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-Ref<InjectedBundleHitTestResult> InjectedBundleHitTestResult::create(const WebCore::HitTestResult& hitTestResult)
</del><ins>+Ref<InjectedBundleHitTestResult> InjectedBundleHitTestResult::create(const HitTestResult& hitTestResult)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new InjectedBundleHitTestResult(hitTestResult));
</span><span class="cx"> }
</span><span class="lines">@@ -118,7 +120,7 @@
</span><span class="cx"> #if !ENABLE(VIDEO)
</span><span class="cx"> return BundleHitTestResultMediaTypeNone;
</span><span class="cx"> #else
</span><del>- WebCore::Node* node = m_hitTestResult.innerNonSharedNode();
</del><ins>+ Node* node = m_hitTestResult.innerNonSharedNode();
</ins><span class="cx"> if (!is<Element>(*node))
</span><span class="cx"> return BundleHitTestResultMediaTypeNone;
</span><span class="cx">
</span><span class="lines">@@ -139,23 +141,31 @@
</span><span class="cx"> return m_hitTestResult.titleDisplayString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebCore::IntRect InjectedBundleHitTestResult::imageRect() const
</del><ins>+String InjectedBundleHitTestResult::linkSuggestedFilename() const
</ins><span class="cx"> {
</span><del>- WebCore::IntRect imageRect = m_hitTestResult.imageRect();
</del><ins>+ 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();
</ins><span class="cx"> if (imageRect.isEmpty())
</span><span class="cx"> return imageRect;
</span><span class="cx">
</span><del>- // The image rect in WebCore::HitTestResult is in frame coordinates, but we need it in WKView
</del><ins>+ // The image rect in HitTestResult is in frame coordinates, but we need it in WKView
</ins><span class="cx"> // coordinates since WebKit2 clients don't have enough context to do the conversion themselves.
</span><span class="cx"> WebFrame* webFrame = frame();
</span><span class="cx"> if (!webFrame)
</span><span class="cx"> return imageRect;
</span><span class="cx">
</span><del>- WebCore::Frame* coreFrame = webFrame->coreFrame();
</del><ins>+ Frame* coreFrame = webFrame->coreFrame();
</ins><span class="cx"> if (!coreFrame)
</span><span class="cx"> return imageRect;
</span><span class="cx">
</span><del>- WebCore::FrameView* view = coreFrame->view();
</del><ins>+ FrameView* view = coreFrame->view();
</ins><span class="cx"> if (!view)
</span><span class="cx"> return imageRect;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleHitTestResulth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h (207578 => 207579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h 2016-10-19 23:49:43 UTC (rev 207578)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h 2016-10-19 23:55:30 UTC (rev 207579)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx">
</span><span class="cx"> String linkLabel() const;
</span><span class="cx"> String linkTitle() const;
</span><ins>+ String linkSuggestedFilename() const;
</ins><span class="cx">
</span><span class="cx"> WebCore::IntRect imageRect() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>