<!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>[177197] tags/Safari-601.1.12/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/177197">177197</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-12-11 17:37:07 -0800 (Thu, 11 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/177196">r177196</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari601112SourceWebCoreChangeLog">tags/Safari-601.1.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari601112SourceWebCoreWebCoreexpin">tags/Safari-601.1.12/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#tagsSafari601112SourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm">tags/Safari-601.1.12/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</a></li>
<li><a href="#tagsSafari601112SourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">tags/Safari-601.1.12/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
<li><a href="#tagsSafari601112SourceWebKit2ChangeLog">tags/Safari-601.1.12/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari601112SourceWebKit2UIProcessAPICocoaWKWebViewmm">tags/Safari-601.1.12/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#tagsSafari601112SourceWebKit2UIProcessWebPageProxycpp">tags/Safari-601.1.12/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#tagsSafari601112SourceWebKit2UIProcessiosWebVideoFullscreenManagerProxymm">tags/Safari-601.1.12/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari601112SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.12/Source/WebCore/ChangeLog (177196 => 177197)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.12/Source/WebCore/ChangeLog 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebCore/ChangeLog 2014-12-12 01:37:07 UTC (rev 177197)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-12-11 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r177196.
+
+ 2014-12-11 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r177081.
+ https://bugs.webkit.org/show_bug.cgi?id=139569
+
+ broke iOS video playback (Requested by eric_carlson on
+ #webkit).
+
+ Reverted changeset:
+
+ "Fix iOS builders for 8.0"
+ https://bugs.webkit.org/show_bug.cgi?id=139495
+ http://trac.webkit.org/changeset/177081
+
</ins><span class="cx"> 2014-12-11 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Call StorageThread::releaseFastMallocFreeMemoryInAllThreads from WebKit
</span></span></pre></div>
<a id="tagsSafari601112SourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.12/Source/WebCore/WebCore.exp.in (177196 => 177197)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.12/Source/WebCore/WebCore.exp.in 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebCore/WebCore.exp.in 2014-12-12 01:37:07 UTC (rev 177197)
</span><span class="lines">@@ -3489,7 +3489,7 @@
</span><span class="cx"> __ZThn?_N7WebCore35WebVideoFullscreenModelVideoElement11handleEventEPNS_22ScriptExecutionContextEPNS_5EventE
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO) && PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 82000
</del><ins>+#if ENABLE(VIDEO) && PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
</ins><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit10invalidateEv
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit11setDurationEd
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit14exitFullscreenENS_7IntRectE
</span></span></pre></div>
<a id="tagsSafari601112SourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.12/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (177196 => 177197)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.12/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-12-12 01:37:07 UTC (rev 177197)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED <= 82000
</del><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
</ins><span class="cx">
</span><span class="cx"> @implementation WebVideoFullscreenController
</span><span class="cx"> - (void)setVideoElement:(WebCore::HTMLVideoElement*)videoElement
</span><span class="lines">@@ -50,16 +50,11 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)enterFullscreen:(UIView *)view mode:(WebCore::HTMLMediaElement::VideoFullscreenMode)mode
</del><ins>+- (void)enterFullscreen:(UIView *)view
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(view);
</span><del>- UNUSED_PARAM(mode);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)requestHideAndExitFullscreen
-{
-}
-
</del><span class="cx"> - (void)exitFullscreen
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="tagsSafari601112SourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.12/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (177196 => 177197)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.12/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-12-12 01:37:07 UTC (rev 177197)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 82000
</del><ins>+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
</ins><span class="cx">
</span><span class="cx"> #import "WebVideoFullscreenInterfaceAVKit.h"
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari601112SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.12/Source/WebKit2/ChangeLog (177196 => 177197)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.12/Source/WebKit2/ChangeLog 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebKit2/ChangeLog 2014-12-12 01:37:07 UTC (rev 177197)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-12-11 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r177196.
+
+ 2014-12-11 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r177081.
+ https://bugs.webkit.org/show_bug.cgi?id=139569
+
+ broke iOS video playback (Requested by eric_carlson on
+ #webkit).
+
+ Reverted changeset:
+
+ "Fix iOS builders for 8.0"
+ https://bugs.webkit.org/show_bug.cgi?id=139495
+ http://trac.webkit.org/changeset/177081
+
</ins><span class="cx"> 2014-12-11 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Inspector Process crash when navigating to non-inspectable page
</span></span></pre></div>
<a id="tagsSafari601112SourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.12/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (177196 => 177197)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.12/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-12-12 01:37:07 UTC (rev 177197)
</span><span class="lines">@@ -243,14 +243,10 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)_mayAutomaticallyShowVideoOptimized
</span><span class="cx"> {
</span><del>-#if (__IPHONE_OS_VERSION_MIN_REQUIRED <= 82000)
- return false;
-#else
</del><span class="cx"> if (!_page || !_page->videoFullscreenManager())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return _page->videoFullscreenManager()->mayAutomaticallyShowVideoOptimized();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="tagsSafari601112SourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.12/Source/WebKit2/UIProcess/WebPageProxy.cpp (177196 => 177197)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.12/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-12 01:37:07 UTC (rev 177197)
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> m_fullScreenManager = WebFullScreenManagerProxy::create(*this, m_pageClient.fullScreenManagerProxyClient());
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(IOS) && (__IPHONE_OS_VERSION_MIN_REQUIRED > 82000)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> m_videoFullscreenManager = WebVideoFullscreenManagerProxy::create(*this);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(VIBRATION)
</span><span class="lines">@@ -583,7 +583,7 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> m_fullScreenManager = WebFullScreenManagerProxy::create(*this, m_pageClient.fullScreenManagerProxyClient());
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(IOS) && (__IPHONE_OS_VERSION_MIN_REQUIRED > 82000)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> m_videoFullscreenManager = WebVideoFullscreenManagerProxy::create(*this);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari601112SourceWebKit2UIProcessiosWebVideoFullscreenManagerProxymm"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.12/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm (177196 => 177197)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.12/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2014-12-12 01:02:01 UTC (rev 177196)
+++ tags/Safari-601.1.12/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2014-12-12 01:37:07 UTC (rev 177197)
</span><span class="lines">@@ -49,9 +49,7 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><del>-
-#if __IPHONE_OS_VERSION_MIN_REQUIRED > 82000
-
</del><ins>+
</ins><span class="cx"> PassRefPtr<WebVideoFullscreenManagerProxy> WebVideoFullscreenManagerProxy::create(WebPageProxy& page)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(new WebVideoFullscreenManagerProxy(page));
</span><span class="lines">@@ -230,7 +228,6 @@
</span><span class="cx"> {
</span><span class="cx"> m_page->send(Messages::WebVideoFullscreenManager::SelectLegibleMediaOption(index), m_page->pageID());
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>