<!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>[186236] trunk/Source</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/186236">186236</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-07-02 15:10:40 -0700 (Thu, 02 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow the UIDelegate to customize an image preview
https://bugs.webkit.org/show_bug.cgi?id=146557
-and corresponding-
rdar://problem/21657424
Reviewed by Tim Horton.
Source/WebCore:
Add WEBCORE_EXPORT to use this in WK2.
* loader/cache/CachedResource.h:
(WebCore::CachedResource::url):
Source/WebKit2:
Add imageURL to InteractionInformationAtPosition.
* Shared/InteractionInformationAtPosition.cpp:
(WebKit::InteractionInformationAtPosition::encode):
(WebKit::InteractionInformationAtPosition::decode):
* Shared/InteractionInformationAtPosition.h:
Two new delegate methods.
* UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
Call the delegate methods at the appropriate time.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView previewViewControllerForPosition:inSourceView:]):
(-[WKContentView commitPreviewViewController:]):
Include the imageURL in InteractionInformationAtPosition.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getPositionInformation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceh">trunk/Source/WebCore/loader/cache/CachedResource.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedInteractionInformationAtPositioncpp">trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedInteractionInformationAtPositionh">trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUIDelegatePrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186235 => 186236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-02 21:39:37 UTC (rev 186235)
+++ trunk/Source/WebCore/ChangeLog 2015-07-02 22:10:40 UTC (rev 186236)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-07-02 Beth Dakin <bdakin@apple.com>
+
+ Allow the UIDelegate to customize an image preview
+ https://bugs.webkit.org/show_bug.cgi?id=146557
+ -and corresponding-
+ rdar://problem/21657424
+
+ Reviewed by Tim Horton.
+
+ Add WEBCORE_EXPORT to use this in WK2.
+ * loader/cache/CachedResource.h:
+ (WebCore::CachedResource::url):
+
</ins><span class="cx"> 2015-07-02 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add preference to disable all http-equiv.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (186235 => 186236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h 2015-07-02 21:39:37 UTC (rev 186235)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2015-07-02 22:10:40 UTC (rev 186236)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> virtual bool shouldIgnoreHTTPStatusCodeErrors() const { return false; }
</span><span class="cx">
</span><span class="cx"> ResourceRequest& resourceRequest() { return m_resourceRequest; }
</span><del>- const URL& url() const { return m_resourceRequest.url();}
</del><ins>+ WEBCORE_EXPORT const URL& url() const { return m_resourceRequest.url();}
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> const String& cachePartition() const { return m_resourceRequest.cachePartition(); }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186235 => 186236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-02 21:39:37 UTC (rev 186235)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-02 22:10:40 UTC (rev 186236)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-07-02 Beth Dakin <bdakin@apple.com>
+
+ Allow the UIDelegate to customize an image preview
+ https://bugs.webkit.org/show_bug.cgi?id=146557
+ -and corresponding-
+ rdar://problem/21657424
+
+ Reviewed by Tim Horton.
+
+ Add imageURL to InteractionInformationAtPosition.
+ * Shared/InteractionInformationAtPosition.cpp:
+ (WebKit::InteractionInformationAtPosition::encode):
+ (WebKit::InteractionInformationAtPosition::decode):
+ * Shared/InteractionInformationAtPosition.h:
+
+ Two new delegate methods.
+ * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+
+ Call the delegate methods at the appropriate time.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView previewViewControllerForPosition:inSourceView:]):
+ (-[WKContentView commitPreviewViewController:]):
+
+ Include the imageURL in InteractionInformationAtPosition.
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getPositionInformation):
+
</ins><span class="cx"> 2015-07-02 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Instead of requiring ToT UIKIt, check that UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP is defined to 1
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedInteractionInformationAtPositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp (186235 => 186236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp 2015-07-02 21:39:37 UTC (rev 186235)
+++ trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp 2015-07-02 22:10:40 UTC (rev 186236)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> encoder << touchCalloutEnabled;
</span><span class="cx"> encoder << clickableElementName;
</span><span class="cx"> encoder << url;
</span><ins>+ encoder << imageURL;
</ins><span class="cx"> encoder << title;
</span><span class="cx"> encoder << bounds;
</span><span class="cx">
</span><span class="lines">@@ -73,6 +74,9 @@
</span><span class="cx"> if (!decoder.decode(result.url))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (!decoder.decode(result.imageURL))
+ return false;
+
</ins><span class="cx"> if (!decoder.decode(result.title))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedInteractionInformationAtPositionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.h (186235 => 186236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.h 2015-07-02 21:39:37 UTC (rev 186235)
+++ trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.h 2015-07-02 22:10:40 UTC (rev 186236)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> bool touchCalloutEnabled;
</span><span class="cx"> String clickableElementName;
</span><span class="cx"> String url;
</span><ins>+ String imageURL;
</ins><span class="cx"> String title;
</span><span class="cx"> WebCore::IntRect bounds;
</span><span class="cx"> RefPtr<ShareableBitmap> image;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (186235 => 186236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2015-07-02 21:39:37 UTC (rev 186235)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2015-07-02 22:10:40 UTC (rev 186236)
</span><span class="lines">@@ -56,6 +56,8 @@
</span><span class="cx"> - (BOOL)_webView:(WKWebView *)webView shouldRequestGeolocationAuthorizationForURL:(NSURL *)url isMainFrame:(BOOL)isMainFrame mainFrameURL:(NSURL *)mainFrameURL;
</span><span class="cx"> - (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url;
</span><span class="cx"> - (void)_webView:(WKWebView *)webView commitPreviewedViewController:(UIViewController *)previewedViewController;
</span><ins>+- (void)_webView:(WKWebView *)webView willPreviewImageWithURL:(NSURL *)imageURL WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+- (void)_webView:(WKWebView *)webView commitPreviewedImageWithURL:(NSURL *)imageURL WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</ins><span class="cx"> - (void)_webView:(WKWebView *)webView didDismissPreviewViewController:(UIViewController *)previewedViewController;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (186235 => 186236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-02 21:39:37 UTC (rev 186235)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-07-02 22:10:40 UTC (rev 186236)
</span><span class="lines">@@ -3213,10 +3213,11 @@
</span><span class="cx"> canShowLinkPreview = NO;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
+
</ins><span class="cx"> if (canShowLinkPreview) {
</span><span class="cx"> _previewType = PreviewElementType::Link;
</span><span class="cx"> NSURL *targetURL = [NSURL _web_URLWithWTFString:_positionInformation.url];
</span><del>- id<WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
</del><span class="cx"> if ([uiDelegate respondsToSelector:@selector(_webView:previewViewControllerForURL:)]) {
</span><span class="cx"> _highlightLongPressCanClick = NO;
</span><span class="cx"> return [uiDelegate _webView:_webView previewViewControllerForURL:targetURL];
</span><span class="lines">@@ -3232,7 +3233,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (canShowImagePreview) {
</span><ins>+ String absoluteImageURL = _positionInformation.imageURL;
+ if (absoluteImageURL.isEmpty() || !(WebCore::protocolIsInHTTPFamily(absoluteImageURL) || WebCore::protocolIs(absoluteImageURL, "data")))
+ return nil;
</ins><span class="cx"> _previewType = PreviewElementType::Image;
</span><ins>+ if ([uiDelegate respondsToSelector:@selector(_webView:willPreviewImageWithURL:)])
+ [uiDelegate _webView:_webView willPreviewImageWithURL:[NSURL _web_URLWithWTFString:_positionInformation.imageURL]];
</ins><span class="cx"> return [[[WKImagePreviewViewController alloc] initWithCGImage:_positionInformation.image->makeCGImageCopy()] autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3241,10 +3247,18 @@
</span><span class="cx">
</span><span class="cx"> - (void)commitPreviewViewController:(UIViewController *)viewController
</span><span class="cx"> {
</span><del>- if (_previewType != PreviewElementType::Link)
</del><ins>+ id <WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
+ if (_previewType == PreviewElementType::Image) {
+ if ([uiDelegate respondsToSelector:@selector(_webView:commitPreviewedImageWithURL:)]) {
+ String absoluteImageURL = _positionInformation.imageURL;
+ if (absoluteImageURL.isEmpty() || !(WebCore::protocolIsInHTTPFamily(absoluteImageURL) || WebCore::protocolIs(absoluteImageURL, "data")))
+ return;
+ [uiDelegate _webView:_webView commitPreviewedImageWithURL:[NSURL _web_URLWithWTFString:absoluteImageURL]];
+ return;
+ }
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><del>- id<WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([_webView UIDelegate]);
</del><span class="cx"> if ([uiDelegate respondsToSelector:@selector(_webView:commitPreviewedViewController:)]) {
</span><span class="cx"> [uiDelegate _webView:_webView commitPreviewedViewController:viewController];
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (186235 => 186236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-07-02 21:39:37 UTC (rev 186235)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-07-02 22:10:40 UTC (rev 186236)
</span><span class="lines">@@ -2141,6 +2141,7 @@
</span><span class="cx"> } else if (element->renderer() && element->renderer()->isRenderImage()) {
</span><span class="cx"> auto& renderImage = downcast<RenderImage>(*(element->renderer()));
</span><span class="cx"> if (renderImage.cachedImage() && !renderImage.cachedImage()->errorOccurred()) {
</span><ins>+ info.imageURL = [(NSURL *)element->document().completeURL(renderImage.cachedImage()->url()) absoluteString];
</ins><span class="cx"> if (Image* image = renderImage.cachedImage()->imageForRenderer(&renderImage)) {
</span><span class="cx"> FloatSize screenSizeInPixels = screenSize();
</span><span class="cx"> screenSizeInPixels.scale(corePage()->deviceScaleFactor());
</span></span></pre>
</div>
</div>
</body>
</html>