<!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>[182623] trunk/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/182623">182623</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2015-04-10 01:33:41 -0700 (Fri, 10 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Add a HAVE(AVKIT) and use it
https://bugs.webkit.org/show_bug.cgi?id=143593
Reviewed by David Kilzer.
Source/WebCore:
* page/Settings.h: Only defined setAVKitEnabled() if HAVE(AVKIT).
* platform/ios/WebVideoFullscreenControllerAVKit.mm: Only compiled if HAVE(AVKIT).
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm: Ditto.
Source/WebKit/mac:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]): Only set WebKitAVKitEnabled to YES if HAVE(AVKIT).
(-[WebPreferences setAVKitEnabled:]): Only set value for WebKitAVKitEnabled if HAVE(AVKIT).
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]): Only called Settings::setAVKitEnabled() if HAVE(AVKIT).
Source/WebKit2:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _mayAutomaticallyShowVideoOptimized]): Returned false if !HAVE(AVKIT).
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy): Removed the check for < iOS 8.2.
(WebKit::WebPageProxy::reattachToWebProcess): Ditto.
* UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
(WebKit::WebVideoFullscreenManagerProxy::create): Created a version of this function that returns nullptr if
the minimum required version of iOS is less than 8.2 or if !HAVE(AVKIT).
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences): Only called Settings::setAVKitEnabled(true) if HAVE(AVKIT).
Source/WTF:
* wtf/Platform.h: Defined HAVE(AVKIT) to be true on all Cocoa platforms except Watch OS.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebVideoFullscreenManagerProxymm">trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (182622 => 182623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-04-10 06:07:56 UTC (rev 182622)
+++ trunk/Source/WTF/ChangeLog 2015-04-10 08:33:41 UTC (rev 182623)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2015-04-09 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><ins>+ [Cocoa] Add a HAVE(AVKIT) and use it
+ https://bugs.webkit.org/show_bug.cgi?id=143593
+
+ Reviewed by David Kilzer.
+
+ * wtf/Platform.h: Defined HAVE(AVKIT) to be true on all Cocoa platforms except Watch OS.
+
+2015-04-09 Andy Estes <aestes@apple.com>
+
</ins><span class="cx"> [Content Filtering] Add a HAVE(PARENTAL_CONTROLS) and use it
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143559
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (182622 => 182623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2015-04-10 06:07:56 UTC (rev 182622)
+++ trunk/Source/WTF/wtf/Platform.h 2015-04-10 08:33:41 UTC (rev 182623)
</span><span class="lines">@@ -503,6 +503,7 @@
</span><span class="cx"> #define HAVE_DTRACE 1
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(WATCHOS)
</span><ins>+#define HAVE_AVKIT 1
</ins><span class="cx"> #define HAVE_PARENTAL_CONTROLS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182622 => 182623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-10 06:07:56 UTC (rev 182622)
+++ trunk/Source/WebCore/ChangeLog 2015-04-10 08:33:41 UTC (rev 182623)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-09 Andy Estes <aestes@apple.com>
+
+ [Cocoa] Add a HAVE(AVKIT) and use it
+ https://bugs.webkit.org/show_bug.cgi?id=143593
+
+ Reviewed by David Kilzer.
+
+ * page/Settings.h: Only defined setAVKitEnabled() if HAVE(AVKIT).
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm: Only compiled if HAVE(AVKIT).
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm: Ditto.
+
</ins><span class="cx"> 2015-04-09 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Some CSS3 filters tests crash under iOS testing
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (182622 => 182623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2015-04-10 06:07:56 UTC (rev 182622)
+++ trunk/Source/WebCore/page/Settings.h 2015-04-10 08:33:41 UTC (rev 182623)
</span><span class="lines">@@ -251,7 +251,9 @@
</span><span class="cx"> WEBCORE_EXPORT static void setNetworkInterfaceName(const String&);
</span><span class="cx"> static const String& networkInterfaceName();
</span><span class="cx">
</span><ins>+#if HAVE(AVKIT)
</ins><span class="cx"> static void setAVKitEnabled(bool flag) { gAVKitEnabled = flag; }
</span><ins>+#endif
</ins><span class="cx"> static bool avKitEnabled() { return gAVKitEnabled; }
</span><span class="cx">
</span><span class="cx"> static void setShouldOptOutOfNetworkStateObservation(bool flag) { gShouldOptOutOfNetworkStateObservation = flag; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (182622 => 182623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2015-04-10 06:07:56 UTC (rev 182622)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2015-04-10 08:33:41 UTC (rev 182623)
</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 <= 80200
</del><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED <= 80200 || !HAVE(AVKIT)
</ins><span class="cx">
</span><span class="cx"> @implementation WebVideoFullscreenController
</span><span class="cx"> - (void)setVideoElement:(WebCore::HTMLVideoElement*)videoElement
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (182622 => 182623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-04-10 06:07:56 UTC (rev 182622)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-04-10 08:33:41 UTC (rev 182623)
</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 > 80200
</del><ins>+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 80200 && HAVE(AVKIT)
</ins><span class="cx">
</span><span class="cx"> #import "WebVideoFullscreenInterfaceAVKit.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (182622 => 182623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-04-10 06:07:56 UTC (rev 182622)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-10 08:33:41 UTC (rev 182623)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-09 Andy Estes <aestes@apple.com>
+
+ [Cocoa] Add a HAVE(AVKIT) and use it
+ https://bugs.webkit.org/show_bug.cgi?id=143593
+
+ Reviewed by David Kilzer.
+
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]): Only set WebKitAVKitEnabled to YES if HAVE(AVKIT).
+ (-[WebPreferences setAVKitEnabled:]): Only set value for WebKitAVKitEnabled if HAVE(AVKIT).
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]): Only called Settings::setAVKitEnabled() if HAVE(AVKIT).
+
</ins><span class="cx"> 2015-04-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][iOS] editorState() should not cause a synchronous layout
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (182622 => 182623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-04-10 06:07:56 UTC (rev 182622)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-04-10 08:33:41 UTC (rev 182623)
</span><span class="lines">@@ -527,7 +527,9 @@
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitMediaPlaybackAllowsInlinePreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitMediaPlaybackAllowsAirPlayPreferenceKey,
</span><span class="cx"> [NSNumber numberWithUnsignedInt:AudioSession::None], WebKitAudioSessionCategoryOverride,
</span><ins>+#if HAVE(AVKIT)
</ins><span class="cx"> [NSNumber numberWithBool:YES], WebKitAVKitEnabled,
</span><ins>+#endif
</ins><span class="cx"> [NSNumber numberWithLongLong:WebCore::ApplicationCacheStorage::noQuota()], WebKitApplicationCacheTotalQuota,
</span><span class="cx">
</span><span class="cx"> // Per-Origin Quota on iOS is 25MB. When the quota is reached for a particular origin
</span><span class="lines">@@ -2126,7 +2128,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)setAVKitEnabled:(bool)flag
</span><span class="cx"> {
</span><ins>+#if HAVE(AVKIT)
</ins><span class="cx"> [self _setBoolValue:flag forKey:WebKitAVKitEnabled];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)networkDataUsageTrackingEnabled
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (182622 => 182623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-04-10 06:07:56 UTC (rev 182622)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-04-10 08:33:41 UTC (rev 182623)
</span><span class="lines">@@ -2340,7 +2340,9 @@
</span><span class="cx"> settings.setAudioSessionCategoryOverride([preferences audioSessionCategoryOverride]);
</span><span class="cx"> settings.setNetworkDataUsageTrackingEnabled([preferences networkDataUsageTrackingEnabled]);
</span><span class="cx"> settings.setNetworkInterfaceName([preferences networkInterfaceName]);
</span><ins>+#if HAVE(AVKIT)
</ins><span class="cx"> settings.setAVKitEnabled([preferences avKitEnabled]);
</span><ins>+#endif
</ins><span class="cx"> settings.setShouldTransformsAffectOverflow(shouldTransformsAffectOverflow());
</span><span class="cx"> settings.setShouldDispatchJavaScriptWindowOnErrorEvents(shouldDispatchJavaScriptWindowOnErrorEvents());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182622 => 182623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-10 06:07:56 UTC (rev 182622)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-10 08:33:41 UTC (rev 182623)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-04-09 Andy Estes <aestes@apple.com>
+
+ [Cocoa] Add a HAVE(AVKIT) and use it
+ https://bugs.webkit.org/show_bug.cgi?id=143593
+
+ Reviewed by David Kilzer.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _mayAutomaticallyShowVideoOptimized]): Returned false if !HAVE(AVKIT).
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy): Removed the check for < iOS 8.2.
+ (WebKit::WebPageProxy::reattachToWebProcess): Ditto.
+ * UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
+ (WebKit::WebVideoFullscreenManagerProxy::create): Created a version of this function that returns nullptr if
+ the minimum required version of iOS is less than 8.2 or if !HAVE(AVKIT).
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Only called Settings::setAVKitEnabled(true) if HAVE(AVKIT).
+
</ins><span class="cx"> 2015-04-09 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> Use modern loops in WebProcess
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (182622 => 182623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-04-10 06:07:56 UTC (rev 182622)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-04-10 08:33:41 UTC (rev 182623)
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)_mayAutomaticallyShowVideoOptimized
</span><span class="cx"> {
</span><del>-#if (__IPHONE_OS_VERSION_MIN_REQUIRED <= 80200)
</del><ins>+#if (__IPHONE_OS_VERSION_MIN_REQUIRED <= 80200) || !HAVE(AVKIT)
</ins><span class="cx"> return false;
</span><span class="cx"> #else
</span><span class="cx"> if (!_page || !_page->videoFullscreenManager())
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (182622 => 182623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-10 06:07:56 UTC (rev 182622)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-10 08:33:41 UTC (rev 182623)
</span><span class="lines">@@ -438,7 +438,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 > 80200)
</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">@@ -664,7 +664,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 > 80200)
</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="trunkSourceWebKit2UIProcessiosWebVideoFullscreenManagerProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm (182622 => 182623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2015-04-10 06:07:56 UTC (rev 182622)
+++ trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2015-04-10 08:33:41 UTC (rev 182623)
</span><span class="lines">@@ -46,8 +46,15 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-#if __IPHONE_OS_VERSION_MIN_REQUIRED > 80200
</del><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED <= 80200 || !HAVE(AVKIT)
</ins><span class="cx">
</span><ins>+PassRefPtr<WebVideoFullscreenManagerProxy> WebVideoFullscreenManagerProxy::create(WebPageProxy&)
+{
+ return nullptr;
+}
+
+#else
+
</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></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (182622 => 182623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-04-10 06:07:56 UTC (rev 182622)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-04-10 08:33:41 UTC (rev 182623)
</span><span class="lines">@@ -2740,7 +2740,7 @@
</span><span class="cx"> settings.setQTKitEnabled(store.getBoolValueForKey(WebPreferencesKey::isQTKitEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><ins>+#if PLATFORM(IOS) && HAVE(AVKIT)
</ins><span class="cx"> settings.setAVKitEnabled(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>