<!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>[244911] trunk/Source/WebKit</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/244911">244911</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2019-05-03 10:34:46 -0700 (Fri, 03 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Expose full screen controller SPI to check if full screen is open and close full screen
https://bugs.webkit.org/show_bug.cgi?id=197263

Patch by Jay Mulani <jmulani@apple.com> on 2019-05-03
Reviewed by Jer Noble.

* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView closeFullScreenWindowController]):
(-[WKWebView fullScreenWindowController]):
* UIProcess/API/Cocoa/WKWebViewInternal.h:
* UIProcess/API/Cocoa/WKWebViewPrivate.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewInternalh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (244910 => 244911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-05-03 17:32:25 UTC (rev 244910)
+++ trunk/Source/WebKit/ChangeLog       2019-05-03 17:34:46 UTC (rev 244911)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2019-05-03  Jay Mulani  <jmulani@apple.com>
+
+        Expose full screen controller SPI to check if full screen is open and close full screen
+        https://bugs.webkit.org/show_bug.cgi?id=197263
+
+        Reviewed by Jer Noble.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView closeFullScreenWindowController]):
+        (-[WKWebView fullScreenWindowController]):
+        * UIProcess/API/Cocoa/WKWebViewInternal.h:
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
</ins><span class="cx"> 2019-05-03  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         LayoutTest imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm is a flaky failure
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (244910 => 244911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm     2019-05-03 17:32:25 UTC (rev 244910)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm        2019-05-03 17:34:46 UTC (rev 244911)
</span><span class="lines">@@ -7311,7 +7311,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(FULLSCREEN_API) && PLATFORM(IOS_FAMILY)
</span><span class="cx"> 
</span><del>-@implementation WKWebView (FullScreenAPI)
</del><ins>+@implementation WKWebView (FullScreenAPI_Private)
</ins><span class="cx"> 
</span><span class="cx"> - (BOOL)hasFullScreenWindowController
</span><span class="cx"> {
</span><span class="lines">@@ -7318,21 +7318,25 @@
</span><span class="cx">     return !!_fullScreenWindowController;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (WKFullScreenWindowController *)fullScreenWindowController
</del><ins>+- (void)closeFullScreenWindowController
</ins><span class="cx"> {
</span><span class="cx">     if (!_fullScreenWindowController)
</span><del>-        _fullScreenWindowController = adoptNS([[WKFullScreenWindowController alloc] initWithWebView:self]);
</del><ins>+        return;
</ins><span class="cx"> 
</span><del>-    return _fullScreenWindowController.get();
</del><ins>+    [_fullScreenWindowController close];
+    _fullScreenWindowController = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)closeFullScreenWindowController
</del><ins>+@end
+
+@implementation WKWebView (FullScreenAPI_Internal)
+
+- (WKFullScreenWindowController *)fullScreenWindowController
</ins><span class="cx"> {
</span><span class="cx">     if (!_fullScreenWindowController)
</span><del>-        return;
</del><ins>+        _fullScreenWindowController = adoptNS([[WKFullScreenWindowController alloc] initWithWebView:self]);
</ins><span class="cx"> 
</span><del>-    [_fullScreenWindowController close];
-    _fullScreenWindowController = nullptr;
</del><ins>+    return _fullScreenWindowController.get();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h (244910 => 244911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h      2019-05-03 17:32:25 UTC (rev 244910)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h 2019-05-03 17:34:46 UTC (rev 244911)
</span><span class="lines">@@ -195,12 +195,10 @@
</span><span class="cx"> WKWebView* fromWebPageProxy(WebKit::WebPageProxy&);
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(FULLSCREEN_API) && PLATFORM(IOS_FAMILY)
</span><del>-@interface WKWebView (FullScreenAPI)
--(BOOL)hasFullScreenWindowController;
</del><ins>+@interface WKWebView (FullScreenAPI_Internal)
</ins><span class="cx"> -(WKFullScreenWindowController *)fullScreenWindowController;
</span><del>--(void)closeFullScreenWindowController;
</del><span class="cx"> @end
</span><del>-#endif // ENABLE(FULLSCREEN_API) && PLATFORM(IOS_FAMILY)
</del><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
</span><span class="cx"> @interface WKWebView (_WKWebViewPrintFormatter)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h (244910 => 244911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h       2019-05-03 17:32:25 UTC (rev 244910)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h  2019-05-03 17:34:46 UTC (rev 244911)
</span><span class="lines">@@ -427,6 +427,13 @@
</span><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+#if TARGET_OS_IOS || (defined(TARGET_OS_IOSMAC) && TARGET_OS_IOSMAC) || TARGET_OS_TV
+@interface WKWebView (FullScreenAPI_Private)
+-(BOOL)hasFullScreenWindowController;
+-(void)closeFullScreenWindowController;
+@end
+#endif
+
</ins><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> 
</span><span class="cx"> @interface WKWebView () <UIResponderStandardEditActions>
</span></span></pre>
</div>
</div>

</body>
</html>