<!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>[210624] 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/210624">210624</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-11 22:16:42 -0800 (Wed, 11 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add IconLoadingDelegate functionality to WKView.
https://bugs.webkit.org/show_bug.cgi?id=166951
Reviewed by Tim Horton.
* UIProcess/API/mac/WKView.mm:
(-[WKView dealloc]):
(-[WKView maybeInstallIconLoadingClient]): If the subclass implements the delegate method, install the
icon loading client. Otherwise, maintain the normal IconDatabase loading behavior.
(-[WKView initWithFrame:processPool:configuration:webView:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (210623 => 210624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-12 05:59:16 UTC (rev 210623)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-12 06:16:42 UTC (rev 210624)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-01-11 Brady Eidson <beidson@apple.com>
+
+ Add IconLoadingDelegate functionality to WKView.
+ https://bugs.webkit.org/show_bug.cgi?id=166951
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView dealloc]):
+ (-[WKView maybeInstallIconLoadingClient]): If the subclass implements the delegate method, install the
+ icon loading client. Otherwise, maintain the normal IconDatabase loading behavior.
+ (-[WKView initWithFrame:processPool:configuration:webView:]):
+
</ins><span class="cx"> 2017-01-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][Cocoa] Avoid null dereference in FullScreen code.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (210623 => 210624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2017-01-12 05:59:16 UTC (rev 210623)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2017-01-12 06:16:42 UTC (rev 210624)
</span><span class="lines">@@ -29,8 +29,10 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> #import "APIHitTestResult.h"
</span><ins>+#import "APIIconLoadingClient.h"
</ins><span class="cx"> #import "APIPageConfiguration.h"
</span><span class="cx"> #import "WKBrowsingContextGroupPrivate.h"
</span><ins>+#import "WKNSData.h"
</ins><span class="cx"> #import "WKProcessGroupPrivate.h"
</span><span class="cx"> #import "WebBackForwardListItem.h"
</span><span class="cx"> #import "WebKit2Initialize.h"
</span><span class="lines">@@ -38,6 +40,8 @@
</span><span class="cx"> #import "WebPreferencesKeys.h"
</span><span class="cx"> #import "WebProcessPool.h"
</span><span class="cx"> #import "WebViewImpl.h"
</span><ins>+#import "_WKLinkIconParametersInternal.h"
+#import <wtf/BlockPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -78,6 +82,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><ins>+ _data->_impl->page().setIconLoadingClient(nullptr);
</ins><span class="cx"> _data->_impl = nullptr;
</span><span class="cx">
</span><span class="cx"> [_data release];
</span><span class="lines">@@ -848,6 +853,48 @@
</span><span class="cx"> return _data->_impl->namesOfPromisedFilesDroppedAtDestination(dropDestination);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)maybeInstallIconLoadingClient
+{
+#if WK_API_ENABLED
+ class IconLoadingClient : public API::IconLoadingClient {
+ public:
+ explicit IconLoadingClient(WKView *wkView)
+ : m_wkView(wkView)
+ {
+ }
+
+ static SEL delegateSelector()
+ {
+ return sel_registerName("_shouldLoadIconWithParameters:completionHandler:");
+ }
+
+ private:
+ typedef void (^IconLoadCompletionHandler)(NSData*);
+
+ void getLoadDecisionForIcon(const WebCore::LinkIcon& linkIcon, Function<void (std::function<void (API::Data*, WebKit::CallbackBase::Error)>)>&& completionHandler) override {
+ RetainPtr<_WKLinkIconParameters> parameters = adoptNS([[_WKLinkIconParameters alloc] _initWithLinkIcon:linkIcon]);
+
+ [m_wkView performSelector:delegateSelector() withObject:parameters.get() withObject:^void (IconLoadCompletionHandler loadCompletionHandler) {
+ if (loadCompletionHandler) {
+ completionHandler([loadCompletionHandler = BlockPtr<void (NSData *)>(loadCompletionHandler)](API::Data* data, WebKit::CallbackBase::Error error) {
+ if (error != CallbackBase::Error::None || !data)
+ loadCompletionHandler(nil);
+ else
+ loadCompletionHandler(wrapper(*data));
+ });
+ } else
+ completionHandler(nullptr);
+ }];
+ }
+
+ WKView *m_wkView;
+ };
+
+ if ([self respondsToSelector:IconLoadingClient::delegateSelector()])
+ _data->_impl->page().setIconLoadingClient(std::make_unique<IconLoadingClient>(self));
+#endif // WK_API_ENABLED
+}
+
</ins><span class="cx"> - (instancetype)initWithFrame:(NSRect)frame processPool:(WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView
</span><span class="cx"> {
</span><span class="cx"> self = [super initWithFrame:frame];
</span><span class="lines">@@ -859,6 +906,8 @@
</span><span class="cx"> _data = [[WKViewData alloc] init];
</span><span class="cx"> _data->_impl = std::make_unique<WebViewImpl>(self, webView, processPool, WTFMove(configuration));
</span><span class="cx">
</span><ins>+ [self maybeInstallIconLoadingClient];
+
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>