<!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>[172085] branches/safari-600.1-branch/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/172085">172085</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-05 14:39:21 -0700 (Tue, 05 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171973">r171973</a>. <rdar://problem/17834694></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformRuntimeApplicationChecksIOSh">branches/safari-600.1-branch/Source/WebCore/platform/RuntimeApplicationChecksIOS.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformRuntimeApplicationChecksIOSmm">branches/safari-600.1-branch/Source/WebCore/platform/RuntimeApplicationChecksIOS.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm">branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith">branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreplatformiosWebVideoFullscreenModelMediaElementmm">branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacChangeLog">branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacWebViewWebViewmm">branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessiosWebVideoFullscreenManagerProxymm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebProcessiosWebVideoFullscreenManagermm">branches/safari-600.1-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172084 => 172085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 21:37:10 UTC (rev 172084)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 21:39:21 UTC (rev 172085)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2014-08-05 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171973
+
+ 2014-08-02 Jeremy Jones <jeremyj@apple.com>
+
+ Support both window and view based video fullscreen.
+ https://bugs.webkit.org/show_bug.cgi?id=135525
+
+ Reviewed by Simon Fraser.
+
+ Presenting in a separate window gives greater flexibility for rotation separately from the app.
+ Presenting in the same window works better if the interface is rehosted in another process.
+
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+ (-[WebVideoFullscreenController enterFullscreen:]): Use clientRect instead of screenRect.
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.h: Add m_window and m_parentView.
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (-[WebAVVideoLayer setBounds:]): Parent view might not be fullscreen; use window instead.
+ (WebVideoFullscreenInterfaceAVKit::setupFullscreen): Conditionally create UIWindow and UIViewController for fullscreen.
+ (WebVideoFullscreenInterfaceAVKit::enterFullscreen): Video, not the container should have black background.
+ (WebVideoFullscreenInterfaceAVKit::exitFullscreen): Conditionally translate finalRect.
+ (WebVideoFullscreenInterfaceAVKit::cleanupFullscreen): Clean up UIWindow and force status bar to correct orientation.
+ (WebVideoFullscreenInterfaceAVKit::invalidate): Clean up UIWindow.
+ (WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen): Hide window and exit without animation.
+ * platform/ios/WebVideoFullscreenModelMediaElement.mm:
+ (WebVideoFullscreenModelMediaElement::setVideoFullscreenLayer): Apply frame, because it may have been set before the layer.
+
+2014-08-05 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r171952
</span><span class="cx">
</span><span class="cx"> 2014-08-01 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformRuntimeApplicationChecksIOSh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/RuntimeApplicationChecksIOS.h (172084 => 172085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/RuntimeApplicationChecksIOS.h 2014-08-05 21:37:10 UTC (rev 172084)
+++ branches/safari-600.1-branch/Source/WebCore/platform/RuntimeApplicationChecksIOS.h 2014-08-05 21:39:21 UTC (rev 172085)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> // FIXME: We should consider merging this file with RuntimeApplicationChecks.h.
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+bool applicationIsAdSheet();
</ins><span class="cx"> bool applicationIsMobileMail();
</span><span class="cx"> bool applicationIsMobileSafari();
</span><span class="cx"> bool applicationIsDumpRenderTree();
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformRuntimeApplicationChecksIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/RuntimeApplicationChecksIOS.mm (172084 => 172085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/RuntimeApplicationChecksIOS.mm 2014-08-05 21:37:10 UTC (rev 172084)
+++ branches/safari-600.1-branch/Source/WebCore/platform/RuntimeApplicationChecksIOS.mm 2014-08-05 21:39:21 UTC (rev 172085)
</span><span class="lines">@@ -31,6 +31,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+bool applicationIsAdSheet()
+{
+ static bool isAdSheet = [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.AdSheetPhone"];
+ return isAdSheet;
+}
+
</ins><span class="cx"> bool applicationIsMobileMail()
</span><span class="cx"> {
</span><span class="cx"> static bool isMobileMail = [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.mobilemail"];
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (172084 => 172085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-08-05 21:37:10 UTC (rev 172084)
+++ branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-08-05 21:39:21 UTC (rev 172085)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> _interface->setWebVideoFullscreenModel(_model.get());
</span><span class="cx"> _model->setMediaElement(_mediaElement.get());
</span><span class="cx"> _videoFullscreenLayer = [CALayer layer];
</span><del>- _interface->setupFullscreen(*_videoFullscreenLayer.get(), _mediaElement->screenRect(), view);
</del><ins>+ _interface->setupFullscreen(*_videoFullscreenLayer.get(), _mediaElement->clientRect(), view);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)exitFullscreen
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (172084 => 172085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2014-08-05 21:37:10 UTC (rev 172084)
+++ branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2014-08-05 21:39:21 UTC (rev 172085)
</span><span class="lines">@@ -62,12 +62,16 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<WebAVPlayerController> m_playerController;
</span><span class="cx"> RetainPtr<AVPlayerViewController> m_playerViewController;
</span><del>- RetainPtr<UIViewController> m_viewController;
</del><span class="cx"> RetainPtr<CALayer> m_videoLayer;
</span><span class="cx"> RetainPtr<WebAVVideoLayer> m_videoLayerContainer;
</span><span class="cx"> WebVideoFullscreenModel* m_videoFullscreenModel;
</span><span class="cx"> WebVideoFullscreenChangeObserver* m_fullscreenChangeObserver;
</span><del>-
</del><ins>+
+ // These are only used when fullscreen is presented in a separate window.
+ RetainPtr<UIWindow> m_window;
+ RetainPtr<UIViewController> m_viewController;
+ RetainPtr<UIView> m_parentView;
+
</ins><span class="cx"> WebAVPlayerController *playerController();
</span><span class="cx">
</span><span class="cx"> void doEnterFullscreen();
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (172084 => 172085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-08-05 21:37:10 UTC (rev 172084)
+++ branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-08-05 21:39:21 UTC (rev 172085)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #import <AVKit/AVVideoLayer.h>
</span><span class="cx"> #import <CoreMedia/CMTime.h>
</span><span class="cx"> #import <UIKit/UIKit.h>
</span><ins>+#import <WebCore/RuntimeApplicationChecksIOS.h>
</ins><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <WebCore/TimeRanges.h>
</span><span class="cx"> #import <WebCore/WebCoreThreadRun.h>
</span><span class="lines">@@ -59,6 +60,7 @@
</span><span class="cx"> SOFT_LINK_CLASS(AVKit, AVValueTiming)
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK(UIKit)
</span><ins>+SOFT_LINK_CLASS(UIKit, UIApplication)
</ins><span class="cx"> SOFT_LINK_CLASS(UIKit, UIScreen)
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIWindow)
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIView)
</span><span class="lines">@@ -515,7 +517,7 @@
</span><span class="cx"> if (![_avPlayerController delegate] || !_avPlayerViewController)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- UIView* rootView = [[_avPlayerViewController parentViewController] view];
</del><ins>+ UIView* rootView = [[_avPlayerViewController view] window];
</ins><span class="cx"> if (!rootView)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -742,10 +744,16 @@
</span><span class="cx">
</span><span class="cx"> [CATransaction begin];
</span><span class="cx"> [CATransaction setDisableActions:YES];
</span><ins>+ m_parentView = parentView;
</ins><span class="cx">
</span><del>- m_viewController = adoptNS([[getUIViewControllerClass() alloc] init]);
- [[m_viewController view] setFrame:parentView.bounds];
- [parentView addSubview:[m_viewController view]];
</del><ins>+ if (!applicationIsAdSheet()) {
+ m_window = adoptNS([[getUIWindowClass() alloc] initWithFrame:[[getUIScreenClass() mainScreen] bounds]]);
+ [m_window setBackgroundColor:[getUIColorClass() clearColor]];
+ m_viewController = adoptNS([[getUIViewControllerClass() alloc] init]);
+ [[m_viewController view] setFrame:[m_window bounds]];
+ [m_window setRootViewController:m_viewController.get()];
+ [m_window makeKeyAndVisible];
+ }
</ins><span class="cx">
</span><span class="cx"> [m_videoLayer removeFromSuperlayer];
</span><span class="cx">
</span><span class="lines">@@ -763,10 +771,17 @@
</span><span class="cx"> [m_playerViewController setDelegate:playerController()];
</span><span class="cx"> [m_videoLayerContainer setPlayerViewController:m_playerViewController.get()];
</span><span class="cx">
</span><del>- [m_viewController addChildViewController:m_playerViewController.get()];
- [[m_viewController view] addSubview:[m_playerViewController view]];
- [m_playerViewController view].frame = initialRect;
</del><ins>+ if (m_viewController) {
+ [m_viewController addChildViewController:m_playerViewController.get()];
+ [[m_viewController view] addSubview:[m_playerViewController view]];
+ [m_playerViewController view].frame = [parentView convertRect:initialRect toView:nil];
+ } else {
+ [parentView addSubview:[m_playerViewController view]];
+ [m_playerViewController view].frame = initialRect;
+ }
+
</ins><span class="cx"> [[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
</span><ins>+ [[m_playerViewController view] setNeedsLayout];
</ins><span class="cx"> [[m_playerViewController view] layoutIfNeeded];
</span><span class="cx">
</span><span class="cx"> [CATransaction commit];
</span><span class="lines">@@ -785,7 +800,7 @@
</span><span class="cx"> __block RefPtr<WebVideoFullscreenInterfaceAVKit> protect(this);
</span><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><del>- [[m_playerViewController view] setBackgroundColor:[getUIColorClass() blackColor]];
</del><ins>+ [m_videoLayerContainer setBackgroundColor:[[getUIColorClass() blackColor] CGColor]];
</ins><span class="cx"> [m_playerViewController enterFullScreenWithCompletionHandler:^(BOOL, NSError*)
</span><span class="cx"> {
</span><span class="cx"> [m_playerViewController setShowsPlaybackControls:YES];
</span><span class="lines">@@ -804,11 +819,16 @@
</span><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> [m_playerViewController setShowsPlaybackControls:NO];
</span><del>- [m_playerViewController view].frame = finalRect;
</del><ins>+ if (m_viewController)
+ [m_playerViewController view].frame = [m_parentView convertRect:finalRect toView:nil];
+ else
+ [m_playerViewController view].frame = finalRect;
+
</ins><span class="cx"> if ([m_videoLayerContainer videoLayerGravity] != AVVideoLayerGravityResizeAspect)
</span><span class="cx"> [m_videoLayerContainer setVideoLayerGravity:AVVideoLayerGravityResizeAspect];
</span><span class="cx"> [[m_playerViewController view] layoutIfNeeded];
</span><span class="cx"> [m_playerViewController exitFullScreenWithCompletionHandler:^(BOOL, NSError*) {
</span><ins>+ [m_videoLayerContainer setBackgroundColor:[[getUIColorClass() clearColor] CGColor]];
</ins><span class="cx"> [[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
</span><span class="cx"> if (m_fullscreenChangeObserver)
</span><span class="cx"> m_fullscreenChangeObserver->didExitFullscreen();
</span><span class="lines">@@ -817,15 +837,29 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@interface UIApplication ()
+-(void)_setStatusBarOrientation:(UIInterfaceOrientation)o;
+@end
+
+@interface UIWindow ()
+-(UIInterfaceOrientation)interfaceOrientation;
+@end
+
</ins><span class="cx"> void WebVideoFullscreenInterfaceAVKit::cleanupFullscreen()
</span><span class="cx"> {
</span><span class="cx"> // Retain this to extend object life until async block completes.
</span><span class="cx"> __block RefPtr<WebVideoFullscreenInterfaceAVKit> protect(this);
</span><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><ins>+ if (m_window) {
+ [m_window setHidden:YES];
+ [m_window setRootViewController:nil];
+ [[getUIApplicationClass() sharedApplication] _setStatusBarOrientation:[[m_parentView window] interfaceOrientation]];
+ }
</ins><span class="cx"> [m_playerViewController setDelegate:nil];
</span><span class="cx"> [[m_playerViewController view] removeFromSuperview];
</span><del>- [m_playerViewController removeFromParentViewController];
</del><ins>+ if (m_viewController)
+ [m_playerViewController removeFromParentViewController];
</ins><span class="cx"> [m_playerViewController setPlayerController:nil];
</span><span class="cx"> m_playerViewController = nil;
</span><span class="cx"> [m_videoLayer removeFromSuperlayer];
</span><span class="lines">@@ -835,6 +869,8 @@
</span><span class="cx"> m_videoLayerContainer = nil;
</span><span class="cx"> [[m_viewController view] removeFromSuperview];
</span><span class="cx"> m_viewController = nil;
</span><ins>+ m_window = nil;
+ m_parentView = nil;
</ins><span class="cx">
</span><span class="cx"> if (m_fullscreenChangeObserver)
</span><span class="cx"> m_fullscreenChangeObserver->didCleanupFullscreen();
</span><span class="lines">@@ -844,10 +880,14 @@
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenInterfaceAVKit::invalidate()
</span><span class="cx"> {
</span><ins>+ [m_window setHidden:YES];
+ [m_window setRootViewController:nil];
+ [m_playerViewController exitFullScreenAnimated:NO completionHandler:nil];
</ins><span class="cx"> m_playerController = nil;
</span><span class="cx"> [m_playerViewController setDelegate:nil];
</span><span class="cx"> [[m_playerViewController view] removeFromSuperview];
</span><del>- [m_playerViewController removeFromParentViewController];
</del><ins>+ if (m_viewController)
+ [m_playerViewController removeFromParentViewController];
</ins><span class="cx"> [m_playerViewController setPlayerController:nil];
</span><span class="cx"> m_playerViewController = nil;
</span><span class="cx"> [m_videoLayer removeFromSuperlayer];
</span><span class="lines">@@ -857,6 +897,8 @@
</span><span class="cx"> m_videoLayerContainer = nil;
</span><span class="cx"> [[m_viewController view] removeFromSuperview];
</span><span class="cx"> m_viewController = nil;
</span><ins>+ m_window = nil;
+ m_parentView = nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen()
</span><span class="lines">@@ -864,7 +906,8 @@
</span><span class="cx"> __block RefPtr<WebVideoFullscreenInterfaceAVKit> protect(this);
</span><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><del>- [m_playerViewController exitFullScreenWithCompletionHandler:^(BOOL, NSError*) {
</del><ins>+ [m_window setHidden:YES];
+ [m_playerViewController exitFullScreenAnimated:NO completionHandler:^(BOOL, NSError*) {
</ins><span class="cx"> protect = nullptr;
</span><span class="cx"> }];
</span><span class="cx"> });
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreplatformiosWebVideoFullscreenModelMediaElementmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm (172084 => 172085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm 2014-08-05 21:37:10 UTC (rev 172084)
+++ branches/safari-600.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm 2014-08-05 21:39:21 UTC (rev 172085)
</span><span class="lines">@@ -158,6 +158,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_videoFullscreenLayer = videoLayer;
</span><ins>+ [m_videoFullscreenLayer setFrame:m_videoFrame];
</ins><span class="cx">
</span><span class="cx"> __block RefPtr<WebVideoFullscreenModelMediaElement> protect(this);
</span><span class="cx"> WebThreadRun(^{
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog (172084 => 172085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog 2014-08-05 21:37:10 UTC (rev 172084)
+++ branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog 2014-08-05 21:39:21 UTC (rev 172085)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-08-05 Lucas Forschler <lforschler@apple.com>
+
+ Merge r171973
+
+ 2014-08-02 Jeremy Jones <jeremyj@apple.com>
+
+ Support both window and view based video fullscreen.
+ https://bugs.webkit.org/show_bug.cgi?id=135525
+
+ Reviewed by Simon Fraser.
+
+ Parenting in the view instead of the window gives the fullscreen implementation more latitude
+ in how it implements the animation.
+
+ * WebView/WebView.mm:
+ (-[WebView _enterFullscreenForNode:]): Use view instead of window.
+
</ins><span class="cx"> 2014-07-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171635. <rdar://problem/17782407>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebView.mm (172084 => 172085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebView.mm 2014-08-05 21:37:10 UTC (rev 172084)
+++ branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebView.mm 2014-08-05 21:39:21 UTC (rev 172085)
</span><span class="lines">@@ -227,7 +227,6 @@
</span><span class="cx"> #import "WebVisiblePosition.h"
</span><span class="cx"> #import <CFNetwork/CFURLCachePriv.h>
</span><span class="cx"> #import <MobileGestalt.h>
</span><del>-#import <UIKit/UIKit.h>
</del><span class="cx"> #import <WebCore/EventNames.h>
</span><span class="cx"> #import <WebCore/FontCache.h>
</span><span class="cx"> #import <WebCore/GraphicsLayer.h>
</span><span class="lines">@@ -8409,7 +8408,7 @@
</span><span class="cx"> _private->fullscreenController = [[WebVideoFullscreenController alloc] init];
</span><span class="cx"> [_private->fullscreenController setMediaElement:videoElement];
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- [_private->fullscreenController enterFullscreen:[(UIView *)[[[self window] hostLayer] delegate] window]];
</del><ins>+ [_private->fullscreenController enterFullscreen:(UIView *)[[[self window] hostLayer] delegate]];
</ins><span class="cx"> #else
</span><span class="cx"> [_private->fullscreenController enterFullscreen:[[self window] screen]];
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (172084 => 172085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-05 21:37:10 UTC (rev 172084)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-05 21:39:21 UTC (rev 172085)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2014-08-05 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171973
+
+ 2014-08-02 Jeremy Jones <jeremyj@apple.com>
+
+ Support both window and view based video fullscreen.
+ https://bugs.webkit.org/show_bug.cgi?id=135525
+
+ Reviewed by Simon Fraser.
+
+ Parenting in the view instead of the window gives the fullscreen implementation more latitude
+ in how it implements the animation.
+
+ * UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
+ (WebKit::WebVideoFullscreenManagerProxy::setupFullscreenWithID): Use view instead of window.
+ * WebProcess/ios/WebVideoFullscreenManager.mm:
+ (WebKit::clientRectForNode): Use client rect instead of screen rect.
+ (WebKit::WebVideoFullscreenManager::enterFullscreenForNode): ditto
+ (WebKit::WebVideoFullscreenManager::exitFullscreenForNode): ditto
+ (WebKit::screenRectForNode): Deleted.
+
+2014-08-05 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r171959
</span><span class="cx">
</span><span class="cx"> 2014-08-01 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessiosWebVideoFullscreenManagerProxymm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm (172084 => 172085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2014-08-05 21:37:10 UTC (rev 172084)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2014-08-05 21:39:21 UTC (rev 172085)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "WebVideoFullscreenManagerMessages.h"
</span><span class="cx"> #include "WebVideoFullscreenManagerProxyMessages.h"
</span><span class="cx"> #include <QuartzCore/CoreAnimation.h>
</span><del>-#include <UIKit/UIKit.h>
</del><span class="cx"> #include <WebKitSystemInterface.h>
</span><span class="cx"> #include <WebCore/TimeRanges.h>
</span><span class="cx">
</span><span class="lines">@@ -78,7 +77,7 @@
</span><span class="cx"> ASSERT(videoLayerID);
</span><span class="cx"> m_layerHost = WKMakeRenderLayer(videoLayerID);
</span><span class="cx"> UIView *parentView = toRemoteLayerTreeDrawingAreaProxy(m_page->drawingArea())->remoteLayerTreeHost().rootLayer();
</span><del>- setupFullscreen(*m_layerHost.get(), initialRect, [parentView window]);
</del><ins>+ setupFullscreen(*m_layerHost.get(), initialRect, parentView);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenManagerProxy::setSeekableRangesVector(Vector<std::pair<double, double>>& ranges)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebProcessiosWebVideoFullscreenManagermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm (172084 => 172085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2014-08-05 21:37:10 UTC (rev 172084)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2014-08-05 21:39:21 UTC (rev 172085)
</span><span class="lines">@@ -50,12 +50,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-static IntRect screenRectForNode(Node* node)
</del><ins>+static IntRect clientRectForNode(Node* node)
</ins><span class="cx"> {
</span><span class="cx"> if (!node || !node->isElementNode())
</span><span class="cx"> return IntRect();
</span><span class="cx">
</span><del>- return toElement(node)->screenRect();
</del><ins>+ return toElement(node)->clientRect();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebVideoFullscreenManager> WebVideoFullscreenManager::create(PassRefPtr<WebPage> page)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> m_layerHostingContext = LayerHostingContext::createForExternalHostingProcess();
</span><span class="cx">
</span><del>- m_page->send(Messages::WebVideoFullscreenManagerProxy::SetupFullscreenWithID(m_layerHostingContext->contextID(), screenRectForNode(node)), m_page->pageID());
</del><ins>+ m_page->send(Messages::WebVideoFullscreenManagerProxy::SetupFullscreenWithID(m_layerHostingContext->contextID(), clientRectForNode(node)), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenManager::exitFullscreenForNode(Node* node)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_isAnimating = true;
</span><del>- m_page->send(Messages::WebVideoFullscreenManagerProxy::ExitFullscreen(screenRectForNode(node)), m_page->pageID());
</del><ins>+ m_page->send(Messages::WebVideoFullscreenManagerProxy::ExitFullscreen(clientRectForNode(node)), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenManager::setDuration(double duration)
</span></span></pre>
</div>
</div>
</body>
</html>