<!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>[184627] branches/safari-601.1.32.2-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/184627">184627</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-05-20 02:05:38 -0700 (Wed, 20 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/184404">r184404</a>. rdar://problem/20619179</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011322branchSourceWebCoreChangeLog">branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreplatformiosWebCoreSystemInterfaceIOSh">branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebKitmacChangeLog">branches/safari-601.1.32.2-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceWebKitmacWebViewWebViewmm">branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2ChangeLog">branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011322branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog (184626 => 184627)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-20 07:58:18 UTC (rev 184626)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-20 09:05:38 UTC (rev 184627)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-05-20 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r184404.
+
+ 2015-05-15 Jeremy Jones <jeremyj@apple.com>
+
+ Limit alternate fullscreen with linked on or after.
+ https://bugs.webkit.org/show_bug.cgi?id=144894
+
+ Reviewed by Dean Jackson.
+
+ * platform/ios/WebCoreSystemInterfaceIOS.h: add new wkIOSSystemVersion
+
</ins><span class="cx"> 2015-05-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r184406.
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreplatformiosWebCoreSystemInterfaceIOSh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h (184626 => 184627)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h 2015-05-20 07:58:18 UTC (rev 184626)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h 2015-05-20 09:05:38 UTC (rev 184627)
</span><span class="lines">@@ -33,6 +33,9 @@
</span><span class="cx"> wkIOSSystemVersion_4_2 = __IPHONE_4_2,
</span><span class="cx"> wkIOSSystemVersion_5_0 = __IPHONE_5_0,
</span><span class="cx"> wkIOSSystemVersion_6_0 = __IPHONE_6_0,
</span><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+ wkIOSSystemVersion_9_0 = __IPHONE_9_0,
+#endif
</ins><span class="cx"> } wkIOSSystemVersion;
</span><span class="cx">
</span><span class="cx"> bool iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion);
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/ChangeLog (184626 => 184627)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit/mac/ChangeLog 2015-05-20 07:58:18 UTC (rev 184626)
+++ branches/safari-601.1.32.2-branch/Source/WebKit/mac/ChangeLog 2015-05-20 09:05:38 UTC (rev 184627)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-05-20 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r184404.
+
+ 2015-05-15 Jeremy Jones <jeremyj@apple.com>
+
+ Limit alternate fullscreen with linked on or after.
+ https://bugs.webkit.org/show_bug.cgi?id=144894
+
+ Reviewed by Dean Jackson.
+
+ * WebView/WebView.mm:
+ (shouldAllowAlternateFullscreen): Added.
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2015-05-13 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r183976.
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebView.mm (184626 => 184627)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebView.mm 2015-05-20 07:58:18 UTC (rev 184626)
+++ branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebView.mm 2015-05-20 09:05:38 UTC (rev 184627)
</span><span class="lines">@@ -855,6 +855,16 @@
</span><span class="cx"> return shouldAllowDisplayAndRunningOfInsecureContent;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldAllowAlternateFullscreen()
+{
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+ static bool shouldAllowAlternateFullscreen = iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion_9_0);
+ return shouldAllowAlternateFullscreen;
+#else
+ return false;
+#endif
+}
+
</ins><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx"> static void WebKitInitializeGamepadProviderIfNecessary()
</span><span class="cx"> {
</span><span class="lines">@@ -2298,7 +2308,7 @@
</span><span class="cx">
</span><span class="cx"> settings.setMediaPlaybackRequiresUserGesture([preferences mediaPlaybackRequiresUserGesture]);
</span><span class="cx"> settings.setMediaPlaybackAllowsInline([preferences mediaPlaybackAllowsInline]);
</span><del>- settings.setAllowsAlternateFullscreen([preferences allowsAlternateFullscreen]);
</del><ins>+ settings.setAllowsAlternateFullscreen([preferences allowsAlternateFullscreen] && shouldAllowAlternateFullscreen());
</ins><span class="cx"> settings.setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]);
</span><span class="cx"> settings.setBackspaceKeyNavigationEnabled([preferences backspaceKeyNavigationEnabled]);
</span><span class="cx"> settings.setWantsBalancedSetDefersLoadingBehavior([preferences wantsBalancedSetDefersLoadingBehavior]);
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184626 => 184627)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-20 07:58:18 UTC (rev 184626)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-20 09:05:38 UTC (rev 184627)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-05-20 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r184404.
+
+ 2015-05-15 Jeremy Jones <jeremyj@apple.com>
+
+ Limit alternate fullscreen with linked on or after.
+ https://bugs.webkit.org/show_bug.cgi?id=144894
+
+ Reviewed by Dean Jackson.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (shouldAllowAlternateFullscreen): Added.
+ (-[WKWebView initWithFrame:configuration:]):
+
</ins><span class="cx"> 2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r184439. rdar://problem/20975978
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (184626 => 184627)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-20 07:58:18 UTC (rev 184626)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-20 09:05:38 UTC (rev 184627)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> #import <JavaScriptCore/JSContext.h>
</span><span class="cx"> #import <JavaScriptCore/JSValue.h>
</span><span class="cx"> #import <WebCore/IOSurface.h>
</span><ins>+#import <WebCore/WebCoreSystemInterface.h>
</ins><span class="cx"> #import <wtf/HashMap.h>
</span><span class="cx"> #import <wtf/MathExtras.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -259,8 +260,18 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldAllowAlternateFullscreen()
+{
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+ static bool shouldAllowAlternateFullscreen = iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion_9_0);
+ return shouldAllowAlternateFullscreen;
+#else
+ return false;
</ins><span class="cx"> #endif
</span><ins>+}
</ins><span class="cx">
</span><ins>+#endif
+
</ins><span class="cx"> - (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration
</span><span class="cx"> {
</span><span class="cx"> if (!(self = [super initWithFrame:frame]))
</span><span class="lines">@@ -308,7 +319,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsInlineKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
</span><del>- webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsAlternateFullscreen]));
</del><ins>+ webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsAlternateFullscreen] && shouldAllowAlternateFullscreen()));
</ins><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackRequiresUserGestureKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackRequiresUserAction]));
</span><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsAirPlayKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackAllowsAirPlay]));
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>