<!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>[179222] branches/safari-600.1.4.15-branch/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/179222">179222</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-01-27 14:49:55 -0800 (Tue, 27 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/177612">r177612</a>. rdar://problem/19445900</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebKit2ChangeLog">branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessAPIAPIUIClienth">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/APIUIClient.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessAPICocoaWKUIDelegatePrivateh">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessCocoaUIDelegateh">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessCocoaUIDelegatemm">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessWebPageProxyh">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessiosWebVideoFullscreenManagerProxymm">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (179221 => 179222)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-27 22:41:47 UTC (rev 179221)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-27 22:49:55 UTC (rev 179222)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2015-01-27 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r177612
+
+ 2014-12-19 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Add didEnterFullscreen / didExitFullscreen callbacks to WKUIDelegatePrivate
+ https://bugs.webkit.org/show_bug.cgi?id=139835
+ <rdar://problem/19312042>
+
+ Reviewed by Anders Carlsson.
+
+ Add didEnterFullscreen / didExitFullscreen callbacks to WKUIDelegatePrivate
+ so that they can be implemented in MobileSafari.
+
+ * UIProcess/API/APIUIClient.h:
+ (API::UIClient::didEnterFullscreen):
+ (API::UIClient::didExitFullscreen):
+ * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+ * UIProcess/Cocoa/UIDelegate.h:
+ * UIProcess/Cocoa/UIDelegate.mm:
+ (WebKit::UIDelegate::setDelegate):
+ (WebKit::UIDelegate::UIClient::didEnterFullscreen):
+ (WebKit::UIDelegate::UIClient::didExitFullscreen):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didEnterFullscreen):
+ (WebKit::WebPageProxy::didExitFullscreen):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
+ (WebKit::WebVideoFullscreenManagerProxy::didExitFullscreen):
+ (WebKit::WebVideoFullscreenManagerProxy::didEnterFullscreen):
+
+2015-01-27 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r177531
</span><span class="cx">
</span><span class="cx"> 2014-12-18 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessAPIAPIUIClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/APIUIClient.h (179221 => 179222)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/APIUIClient.h 2015-01-27 22:41:47 UTC (rev 179221)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/APIUIClient.h 2015-01-27 22:49:55 UTC (rev 179222)
</span><span class="lines">@@ -70,6 +70,8 @@
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) { return nullptr; }
</span><span class="cx"> virtual void showPage(WebKit::WebPageProxy*) { }
</span><ins>+ virtual void didEnterFullscreen(WebKit::WebPageProxy*) { }
+ virtual void didExitFullscreen(WebKit::WebPageProxy*) { }
</ins><span class="cx"> virtual void close(WebKit::WebPageProxy*) { }
</span><span class="cx">
</span><span class="cx"> virtual void takeFocus(WebKit::WebPageProxy*, WKFocusDirection) { }
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessAPICocoaWKUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (179221 => 179222)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2015-01-27 22:41:47 UTC (rev 179221)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2015-01-27 22:49:55 UTC (rev 179222)
</span><span class="lines">@@ -45,6 +45,8 @@
</span><span class="cx"> - (void)_webView:(WKWebView *)webView printFrame:(_WKFrameHandle *)frame;
</span><span class="cx">
</span><span class="cx"> - (void)_webViewClose:(WKWebView *)webView;
</span><ins>+- (void)_webViewDidEnterFullscreen:(WKWebView *)webView WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+- (void)_webViewDidExitFullscreen:(WKWebView *)webView WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> - (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(NSArray *)defaultActions;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessCocoaUIDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h (179221 => 179222)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2015-01-27 22:41:47 UTC (rev 179221)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2015-01-27 22:49:55 UTC (rev 179222)
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx"> // API::UIClient
</span><span class="cx"> virtual PassRefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) override;
</span><span class="cx"> virtual void close(WebKit::WebPageProxy*) override;
</span><ins>+ virtual void didEnterFullscreen(WebKit::WebPageProxy*) override;
+ virtual void didExitFullscreen(WebKit::WebPageProxy*) override;
</ins><span class="cx"> virtual void runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void ()> completionHandler) override;
</span><span class="cx"> virtual void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (bool)> completionHandler) override;
</span><span class="cx"> virtual void runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (const WTF::String&)> completionHandler) override;
</span><span class="lines">@@ -86,6 +88,8 @@
</span><span class="cx"> bool webViewDecideWebApplicationCacheQuotaForSecurityOriginCurrentQuotaTotalBytesNeeded : 1;
</span><span class="cx"> bool webViewPrintFrame : 1;
</span><span class="cx"> bool webViewClose : 1;
</span><ins>+ bool webViewDidEnterFullscreen : 1;
+ bool webViewDidExitFullscreen : 1;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool webViewActionsForElementDefaultActions : 1;
</span><span class="cx"> bool webViewDidNotHandleTapAsClickAtPoint : 1;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessCocoaUIDelegatemm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (179221 => 179222)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2015-01-27 22:41:47 UTC (rev 179221)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2015-01-27 22:49:55 UTC (rev 179222)
</span><span class="lines">@@ -72,6 +72,8 @@
</span><span class="cx"> m_delegateMethods.webViewDecideWebApplicationCacheQuotaForSecurityOriginCurrentQuotaTotalBytesNeeded = [delegate respondsToSelector:@selector(_webView:decideWebApplicationCacheQuotaForSecurityOrigin:currentQuota:totalBytesNeeded:decisionHandler:)];
</span><span class="cx"> m_delegateMethods.webViewPrintFrame = [delegate respondsToSelector:@selector(_webView:printFrame:)];
</span><span class="cx"> m_delegateMethods.webViewClose = [delegate respondsToSelector:@selector(_webViewClose:)];
</span><ins>+ m_delegateMethods.webViewDidEnterFullscreen = [delegate respondsToSelector:@selector(_webViewDidEnterFullscreen:)];
+ m_delegateMethods.webViewDidExitFullscreen = [delegate respondsToSelector:@selector(_webViewDidExitFullscreen:)];
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_delegateMethods.webViewActionsForElementDefaultActions = [delegate respondsToSelector:@selector(_webView:actionsForElement:defaultActions:)];
</span><span class="cx"> m_delegateMethods.webViewDidNotHandleTapAsClickAtPoint = [delegate respondsToSelector:@selector(_webView:didNotHandleTapAsClickAtPoint:)];
</span><span class="lines">@@ -241,6 +243,30 @@
</span><span class="cx"> [(id <WKUIDelegatePrivate>)delegate _webViewClose:m_uiDelegate.m_webView];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UIDelegate::UIClient::didEnterFullscreen(WebKit::WebPageProxy*)
+{
+ if (!m_uiDelegate.m_delegateMethods.webViewDidEnterFullscreen)
+ return;
+
+ auto delegate = m_uiDelegate.m_delegate.get();
+ if (!delegate)
+ return;
+
+ [(id <WKUIDelegatePrivate>)delegate _webViewDidEnterFullscreen:m_uiDelegate.m_webView];
+}
+
+void UIDelegate::UIClient::didExitFullscreen(WebKit::WebPageProxy*)
+{
+ if (!m_uiDelegate.m_delegateMethods.webViewDidExitFullscreen)
+ return;
+
+ auto delegate = m_uiDelegate.m_delegate.get();
+ if (!delegate)
+ return;
+
+ [(id <WKUIDelegatePrivate>)delegate _webViewDidExitFullscreen:m_uiDelegate.m_webView];
+}
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> RetainPtr<NSArray> UIDelegate::UIClient::actionsForElement(_WKActivatedElementInfo *elementInfo, RetainPtr<NSArray> defaultActions)
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (179221 => 179222)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-27 22:41:47 UTC (rev 179221)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-27 22:49:55 UTC (rev 179222)
</span><span class="lines">@@ -3023,6 +3023,16 @@
</span><span class="cx"> m_uiClient->showPage(this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::didEnterFullscreen()
+{
+ m_uiClient->didEnterFullscreen(this);
+}
+
+void WebPageProxy::didExitFullscreen()
+{
+ m_uiClient->didExitFullscreen(this);
+}
+
</ins><span class="cx"> void WebPageProxy::closePage(bool stopResponsivenessTimer)
</span><span class="cx"> {
</span><span class="cx"> if (stopResponsivenessTimer)
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.h (179221 => 179222)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-27 22:41:47 UTC (rev 179221)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-27 22:49:55 UTC (rev 179222)
</span><span class="lines">@@ -259,6 +259,9 @@
</span><span class="cx"> bool addsVisitedLinks() const { return m_addsVisitedLinks; }
</span><span class="cx"> void setAddsVisitedLinks(bool addsVisitedLinks) { m_addsVisitedLinks = addsVisitedLinks; }
</span><span class="cx">
</span><ins>+ void didEnterFullscreen();
+ void didExitFullscreen();
+
</ins><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> WebInspectorProxy* inspector();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessiosWebVideoFullscreenManagerProxymm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm (179221 => 179222)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2015-01-27 22:41:47 UTC (rev 179221)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2015-01-27 22:49:55 UTC (rev 179222)
</span><span class="lines">@@ -126,6 +126,7 @@
</span><span class="cx"> void WebVideoFullscreenManagerProxy::didExitFullscreen()
</span><span class="cx"> {
</span><span class="cx"> m_page->send(Messages::WebVideoFullscreenManager::DidExitFullscreen(), m_page->pageID());
</span><ins>+ m_page->didExitFullscreen();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenManagerProxy::didCleanupFullscreen()
</span><span class="lines">@@ -143,6 +144,7 @@
</span><span class="cx"> void WebVideoFullscreenManagerProxy::didEnterFullscreen()
</span><span class="cx"> {
</span><span class="cx"> m_page->send(Messages::WebVideoFullscreenManager::DidEnterFullscreen(), m_page->pageID());
</span><ins>+ m_page->didEnterFullscreen();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenManagerProxy::play()
</span></span></pre>
</div>
</div>
</body>
</html>