Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog (184626 => 184627)
--- 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)
@@ -1,3 +1,16 @@
+2015-05-20 Babak Shafiei <[email protected]>
+
+ Merge r184404.
+
+ 2015-05-15 Jeremy Jones <[email protected]>
+
+ 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
+
2015-05-19 Babak Shafiei <[email protected]>
Merge r184406.
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h (184626 => 184627)
--- 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)
@@ -33,6 +33,9 @@
wkIOSSystemVersion_4_2 = __IPHONE_4_2,
wkIOSSystemVersion_5_0 = __IPHONE_5_0,
wkIOSSystemVersion_6_0 = __IPHONE_6_0,
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+ wkIOSSystemVersion_9_0 = __IPHONE_9_0,
+#endif
} wkIOSSystemVersion;
bool iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion);
Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/ChangeLog (184626 => 184627)
--- 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)
@@ -1,3 +1,18 @@
+2015-05-20 Babak Shafiei <[email protected]>
+
+ Merge r184404.
+
+ 2015-05-15 Jeremy Jones <[email protected]>
+
+ 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:]):
+
2015-05-13 Babak Shafiei <[email protected]>
Merge r183976.
Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/WebView/WebView.mm (184626 => 184627)
--- 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)
@@ -855,6 +855,16 @@
return shouldAllowDisplayAndRunningOfInsecureContent;
}
+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
+}
+
#if ENABLE(GAMEPAD)
static void WebKitInitializeGamepadProviderIfNecessary()
{
@@ -2298,7 +2308,7 @@
settings.setMediaPlaybackRequiresUserGesture([preferences mediaPlaybackRequiresUserGesture]);
settings.setMediaPlaybackAllowsInline([preferences mediaPlaybackAllowsInline]);
- settings.setAllowsAlternateFullscreen([preferences allowsAlternateFullscreen]);
+ settings.setAllowsAlternateFullscreen([preferences allowsAlternateFullscreen] && shouldAllowAlternateFullscreen());
settings.setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]);
settings.setBackspaceKeyNavigationEnabled([preferences backspaceKeyNavigationEnabled]);
settings.setWantsBalancedSetDefersLoadingBehavior([preferences wantsBalancedSetDefersLoadingBehavior]);
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184626 => 184627)
--- 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)
@@ -1,3 +1,18 @@
+2015-05-20 Babak Shafiei <[email protected]>
+
+ Merge r184404.
+
+ 2015-05-15 Jeremy Jones <[email protected]>
+
+ 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:]):
+
2015-05-18 Matthew Hanson <[email protected]>
Merge r184439. rdar://problem/20975978
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (184626 => 184627)
--- 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)
@@ -79,6 +79,7 @@
#import <_javascript_Core/JSContext.h>
#import <_javascript_Core/JSValue.h>
#import <WebCore/IOSurface.h>
+#import <WebCore/WebCoreSystemInterface.h>
#import <wtf/HashMap.h>
#import <wtf/MathExtras.h>
#import <wtf/NeverDestroyed.h>
@@ -259,8 +260,18 @@
#endif
}
+static bool shouldAllowAlternateFullscreen()
+{
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+ static bool shouldAllowAlternateFullscreen = iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion_9_0);
+ return shouldAllowAlternateFullscreen;
+#else
+ return false;
#endif
+}
+#endif
+
- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration
{
if (!(self = [super initWithFrame:frame]))
@@ -308,7 +319,7 @@
#if PLATFORM(IOS)
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsInlineKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
- webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsAlternateFullscreen]));
+ webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsAlternateFullscreen] && shouldAllowAlternateFullscreen()));
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackRequiresUserGestureKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackRequiresUserAction]));
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsAirPlayKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackAllowsAirPlay]));
#endif
