<!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>[171713] tags/Safari-600.1.3.2/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/171713">171713</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-28 17:11:09 -0700 (Mon, 28 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171635">r171635</a>. <rdar://problem/17782407></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari600132SourceWebKitmacChangeLog">tags/Safari-600.1.3.2/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#tagsSafari600132SourceWebKitmacWebViewWebViewmm">tags/Safari-600.1.3.2/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#tagsSafari600132SourceWebKit2ChangeLog">tags/Safari-600.1.3.2/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari600132SourceWebKit2UIProcessiosWebVideoFullscreenManagerProxymm">tags/Safari-600.1.3.2/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm</a></li>
<li><a href="#tagsSafari600132SourceWebKit2WebProcessiosWebVideoFullscreenManagermm">tags/Safari-600.1.3.2/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari600132SourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3.2/Source/WebKit/mac/ChangeLog (171712 => 171713)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.2/Source/WebKit/mac/ChangeLog 2014-07-29 00:02:37 UTC (rev 171712)
+++ tags/Safari-600.1.3.2/Source/WebKit/mac/ChangeLog 2014-07-29 00:11:09 UTC (rev 171713)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-07-28 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r171635. <rdar://problem/17782407>
+
+ 2014-07-25 Jeremy Jones <jeremyj@apple.com>
+
+ Parent fullscreen from window instead of view
+ https://bugs.webkit.org/show_bug.cgi?id=135310
+
+ Reviewed by Jer Noble.
+
+ Parenting in the view causes an incorrect animation to fullscreen, and can cause
+ fullscreen to only expand to the size of the view instead of the whole window.
+
+ * WebView/WebView.mm:
+ (-[WebView _enterFullscreenForNode:]): Pass window instead of view.
+
</ins><span class="cx"> 2014-07-24 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171575
</span></span></pre></div>
<a id="tagsSafari600132SourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3.2/Source/WebKit/mac/WebView/WebView.mm (171712 => 171713)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.2/Source/WebKit/mac/WebView/WebView.mm 2014-07-29 00:02:37 UTC (rev 171712)
+++ tags/Safari-600.1.3.2/Source/WebKit/mac/WebView/WebView.mm 2014-07-29 00:11:09 UTC (rev 171713)
</span><span class="lines">@@ -227,6 +227,7 @@
</span><span class="cx"> #import "WebVisiblePosition.h"
</span><span class="cx"> #import <CFNetwork/CFURLCachePriv.h>
</span><span class="cx"> #import <MobileGestalt.h>
</span><ins>+#import <UIKit/UIKit.h>
</ins><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">@@ -8408,7 +8409,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]];
</del><ins>+ [_private->fullscreenController enterFullscreen:[(UIView *)[[[self window] hostLayer] delegate] window]];
</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="tagsSafari600132SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3.2/Source/WebKit2/ChangeLog (171712 => 171713)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.2/Source/WebKit2/ChangeLog 2014-07-29 00:02:37 UTC (rev 171712)
+++ tags/Safari-600.1.3.2/Source/WebKit2/ChangeLog 2014-07-29 00:11:09 UTC (rev 171713)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-07-28 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r171635. <rdar://problem/17782407>
+
+ 2014-07-25 Jeremy Jones <jeremyj@apple.com>
+
+ Parent fullscreen from window instead of view
+ https://bugs.webkit.org/show_bug.cgi?id=135310
+
+ Reviewed by Jer Noble.
+
+ Parenting in the view causes an incorrect animation to fullscreen, and can cause
+ fullscreen to only expand to the size of the view instead of the whole window.
+
+ * UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
+ (WebKit::WebVideoFullscreenManagerProxy::setupFullscreenWithID): pass view's window.
+ * WebProcess/ios/WebVideoFullscreenManager.mm: screenRect instead of clientRect
+ (WebKit::screenRectForNode): was clientRectForNode
+ (WebKit::WebVideoFullscreenManager::enterFullscreenForNode): use screenRectForNode
+ (WebKit::WebVideoFullscreenManager::exitFullscreenForNode): ditto
+ (WebKit::clientRectForNode): Deleted.
+
</ins><span class="cx"> 2014-07-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171663. <rdar://problem/17818308>
</span></span></pre></div>
<a id="tagsSafari600132SourceWebKit2UIProcessiosWebVideoFullscreenManagerProxymm"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3.2/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm (171712 => 171713)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.2/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2014-07-29 00:02:37 UTC (rev 171712)
+++ tags/Safari-600.1.3.2/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2014-07-29 00:11:09 UTC (rev 171713)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "WebVideoFullscreenManagerMessages.h"
</span><span class="cx"> #include "WebVideoFullscreenManagerProxyMessages.h"
</span><span class="cx"> #include <QuartzCore/CoreAnimation.h>
</span><ins>+#include <UIKit/UIKit.h>
</ins><span class="cx"> #include <WebKitSystemInterface.h>
</span><span class="cx"> #include <WebCore/TimeRanges.h>
</span><span class="cx">
</span><span class="lines">@@ -77,7 +78,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);
</del><ins>+ setupFullscreen(*m_layerHost.get(), initialRect, [parentView window]);
</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="tagsSafari600132SourceWebKit2WebProcessiosWebVideoFullscreenManagermm"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3.2/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm (171712 => 171713)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3.2/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2014-07-29 00:02:37 UTC (rev 171712)
+++ tags/Safari-600.1.3.2/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2014-07-29 00:11:09 UTC (rev 171713)
</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 clientRectForNode(Node* node)
</del><ins>+static IntRect screenRectForNode(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)->clientRect();
</del><ins>+ return toElement(node)->screenRect();
</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(), clientRectForNode(node)), m_page->pageID());
</del><ins>+ m_page->send(Messages::WebVideoFullscreenManagerProxy::SetupFullscreenWithID(m_layerHostingContext->contextID(), screenRectForNode(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(clientRectForNode(node)), m_page->pageID());
</del><ins>+ m_page->send(Messages::WebVideoFullscreenManagerProxy::ExitFullscreen(screenRectForNode(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>