Diff
Modified: branches/safari-602-branch/LayoutTests/ChangeLog (207743 => 207744)
--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-24 07:18:37 UTC (rev 207744)
@@ -1,5 +1,35 @@
2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r207159. rdar://problem/28857481
+
+ 2016-10-11 Daniel Bates <daba...@apple.com>
+
+ [iOS] REGRESSION (r197953): User gesture required to load video in iOS 9-built apps
+ https://bugs.webkit.org/show_bug.cgi?id=163244
+ <rdar://problem/27250015>
+
+ Reviewed by Jer Noble.
+
+ Add tests to ensure that Settings::setRequiresUserGestureToLoadVideo() behaves as expected.
+
+ * media/loadedmetadata-fires-without-user-gesture-when-setRequiresUserGestureToLoadVideo-false-expected.txt: Added.
+ * media/loadedmetadata-fires-without-user-gesture-when-setRequiresUserGestureToLoadVideo-false.html: Added.
+ * media/media-controls.js:
+ (clickPlayButton): Added.
+ * media/require-user-gesture-to-load-video-expected.txt: Added.
+ * media/require-user-gesture-to-load-video.html: Added.
+ * media/video-controls-transformed.html: Write in terms of clickPlayButton().
+ * media/video-controls-visible-audio-only.html: Ditto.
+ * media/video-fullscreeen-only-playback.html: Ditto.
+ * media/video-play-audio-require-user-gesture.html: Ditto.
+ * media/video-play-require-user-gesture.html: Ditto.
+ * media/video-test.js:
+ (passTest): Added.
+ * platform/ios-simulator/TestExpectations: Skip test media/require-user-gesture-to-load-video.html as
+ we need to fix <https://bugs.webkit.org/show_bug.cgi?id=163291> to support tapping the play button on iOS.
+
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r206712. rdar://problem/28216065
2016-10-01 Simon Fraser <simon.fra...@apple.com>
Added: branches/safari-602-branch/LayoutTests/media/loadedmetadata-fires-without-user-gesture-when-setRequiresUserGestureToLoadVideo-false-expected.txt (0 => 207744)
--- branches/safari-602-branch/LayoutTests/media/loadedmetadata-fires-without-user-gesture-when-setRequiresUserGestureToLoadVideo-false-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/media/loadedmetadata-fires-without-user-gesture-when-setRequiresUserGestureToLoadVideo-false-expected.txt 2016-10-24 07:18:37 UTC (rev 207744)
@@ -0,0 +1,5 @@
+
+EVENT(loadedmetadata)
+Did load metadata without user gesture OK
+END OF TEST
+
Added: branches/safari-602-branch/LayoutTests/media/loadedmetadata-fires-without-user-gesture-when-setRequiresUserGestureToLoadVideo-false.html (0 => 207744)
--- branches/safari-602-branch/LayoutTests/media/loadedmetadata-fires-without-user-gesture-when-setRequiresUserGestureToLoadVideo-false.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/media/loadedmetadata-fires-without-user-gesture-when-setRequiresUserGestureToLoadVideo-false.html 2016-10-24 07:18:37 UTC (rev 207744)
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+if (window.internals) {
+ internals.settings.setVideoPlaybackRequiresUserGesture(true);
+ internals.settings.setRequiresUserGestureToLoadVideo(false);
+}
+
+function done()
+{
+ passTest("Did load metadata without user gesture");
+}
+
+function start()
+{
+ findMediaElement();
+ waitForEvent("loadedmetadata", done);
+ video.src = "" "content/test");
+}
+</script>
+</head>
+<body _onload_="start()">
+ <video id="video"></video>
+</body>
+</html>
Modified: branches/safari-602-branch/LayoutTests/media/media-controls.js (207743 => 207744)
--- branches/safari-602-branch/LayoutTests/media/media-controls.js 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/LayoutTests/media/media-controls.js 2016-10-24 07:18:37 UTC (rev 207744)
@@ -92,3 +92,18 @@
return displayElement;
}
+
+// FIXME: Make this work for iOS.
+function clickPlayButton(video)
+{
+ if (!window.eventSender)
+ return;
+
+ var playButtonCoordinates = mediaControlsButtonCoordinates(video, "play-button");
+ var x = playButtonCoordinates[0];
+ var y = playButtonCoordinates[1];
+
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+}
Added: branches/safari-602-branch/LayoutTests/media/require-user-gesture-to-load-video-expected.txt (0 => 207744)
--- branches/safari-602-branch/LayoutTests/media/require-user-gesture-to-load-video-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/media/require-user-gesture-to-load-video-expected.txt 2016-10-24 07:18:37 UTC (rev 207744)
@@ -0,0 +1,5 @@
+
+EVENT(loadedmetadata)
+Did load metadata after user gesture. OK
+END OF TEST
+
Added: branches/safari-602-branch/LayoutTests/media/require-user-gesture-to-load-video.html (0 => 207744)
--- branches/safari-602-branch/LayoutTests/media/require-user-gesture-to-load-video.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/media/require-user-gesture-to-load-video.html 2016-10-24 07:18:37 UTC (rev 207744)
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src=""
+<script src=""
+<script src=""
+<script>
+if (window.internals) {
+ internals.settings.setVideoPlaybackRequiresUserGesture(true);
+ internals.settings.setRequiresUserGestureToLoadVideo(true);
+}
+
+var didUserGesture = false;
+
+function checkDidLoadMetadataAfterUserGesture()
+{
+ if (didUserGesture)
+ passTest("Did load metadata after user gesture.");
+ else
+ failTest("Did load metadata without user gesture");
+}
+
+function performClickOnPlayButton()
+{
+ didUserGesture = true;
+ clickPlayButton(video);
+}
+
+function start()
+{
+ findMediaElement();
+ waitForEvent("loadedmetadata", checkDidLoadMetadataAfterUserGesture);
+ video.src = "" "content/test");
+
+ window.setTimeout(performClickOnPlayButton, 0);
+}
+</script>
+</head>
+<body _onload_="start()">
+ <video id="video" controls></video>
+</body>
+</html>
Modified: branches/safari-602-branch/LayoutTests/media/video-controls-transformed.html (207743 => 207744)
--- branches/safari-602-branch/LayoutTests/media/video-controls-transformed.html 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/LayoutTests/media/video-controls-transformed.html 2016-10-24 07:18:37 UTC (rev 207744)
@@ -18,20 +18,11 @@
<script>
testExpected("video.controls", null, '!=');
waitForEvent('canplaythrough', function () {
- if (window.eventSender) {
- // Find the play button and click the middle of its bounding box.
- var playCoords;
- try {
- playCoords = mediaControlsButtonCoordinates(video, "play-button");
- } catch (exception) {
- failTest(exception.description);
- return;
- }
- var clickX = playCoords[0];
- var clickY = playCoords[1];
- eventSender.mouseMoveTo(clickX, clickY);
- eventSender.mouseDown();
- eventSender.mouseUp();
+ try {
+ clickPlayButton(video);
+ } catch (exception) {
+ failTest(exception.description);
+ return;
}
testExpected("video.paused", false);
endTest();
Modified: branches/safari-602-branch/LayoutTests/media/video-controls-visible-audio-only.html (207743 => 207744)
--- branches/safari-602-branch/LayoutTests/media/video-controls-visible-audio-only.html 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/LayoutTests/media/video-controls-visible-audio-only.html 2016-10-24 07:18:37 UTC (rev 207744)
@@ -37,20 +37,13 @@
if (!window.testRunner)
return;
- // start playback
- var playCoords
try {
- playCoords = mediaControlsButtonCoordinates(video, "play-button");
+ clickPlayButton(video);
} catch (exception) {
consoleWrite(exception.description);
testRunner.notifyDone();
return;
}
- var clickX = playCoords[0];
- var clickY = playCoords[1];
- eventSender.mouseMoveTo(clickX, clickY);
- eventSender.mouseDown();
- eventSender.mouseUp();
testcondition("!video.paused");
// move the mouse off of the element
Modified: branches/safari-602-branch/LayoutTests/media/video-fullscreeen-only-playback.html (207743 => 207744)
--- branches/safari-602-branch/LayoutTests/media/video-fullscreeen-only-playback.html 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/LayoutTests/media/video-fullscreeen-only-playback.html 2016-10-24 07:18:37 UTC (rev 207744)
@@ -33,17 +33,12 @@
consoleWrite("<br>** Clicking \'play\' button...");
- var playCoords;
try {
- playCoords = mediaControlsButtonCoordinates(video, "play-button");
+ clickPlayButton(video);
} catch (exception) {
failTest(exception.description);
return;
}
-
- eventSender.mouseMoveTo(playCoords[0], playCoords[1]);
- eventSender.mouseDown();
- eventSender.mouseUp();
}
Modified: branches/safari-602-branch/LayoutTests/media/video-play-audio-require-user-gesture.html (207743 => 207744)
--- branches/safari-602-branch/LayoutTests/media/video-play-audio-require-user-gesture.html 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/LayoutTests/media/video-play-audio-require-user-gesture.html 2016-10-24 07:18:37 UTC (rev 207744)
@@ -9,26 +9,6 @@
if (window.internals)
window.internals.settings.setAudioPlaybackRequiresUserGesture(true);
- function click()
- {
- if (window.eventSender) {
- var playCoords;
- try {
- playCoords = mediaControlsButtonCoordinates(video, "play-button");
- } catch (exception) {
- failTest(exception.description);
- return;
- }
- var x = playCoords[0];
- var y = playCoords[1];
-
- userGestureInitiated = 1;
- eventSender.mouseMoveTo(x, y);
- eventSender.mouseDown();
- eventSender.mouseUp();
- }
- }
-
function playing()
{
if (userGestureInitiated == 0) {
@@ -62,7 +42,13 @@
consoleWrite("");
consoleWrite("* User gesture initiated");
- click();
+ userGestureInitiated = 1;
+ try {
+ clickPlayButton(video);
+ } catch (exception) {
+ failTest(exception.description);
+ return;
+ }
}
function start()
Modified: branches/safari-602-branch/LayoutTests/media/video-play-require-user-gesture.html (207743 => 207744)
--- branches/safari-602-branch/LayoutTests/media/video-play-require-user-gesture.html 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/LayoutTests/media/video-play-require-user-gesture.html 2016-10-24 07:18:37 UTC (rev 207744)
@@ -9,26 +9,6 @@
if (window.internals)
window.internals.settings.setVideoPlaybackRequiresUserGesture(true);
- function click()
- {
- if (window.eventSender) {
- var playCoords;
- try {
- playCoords = mediaControlsButtonCoordinates(video, "play-button");
- } catch (exception) {
- failTest(exception.description);
- return;
- }
- var x = playCoords[0];
- var y = playCoords[1];
-
- userGestureInitiated = 1;
- eventSender.mouseMoveTo(x, y);
- eventSender.mouseDown();
- eventSender.mouseUp();
- }
- }
-
function playing()
{
if (userGestureInitiated == 0) {
@@ -62,7 +42,13 @@
consoleWrite("");
consoleWrite("* User gesture initiated");
- click();
+ userGestureInitiated = 1;
+ try {
+ clickPlayButton(video);
+ } catch (exception) {
+ failTest(exception.description);
+ return;
+ }
}
function start()
Modified: branches/safari-602-branch/LayoutTests/media/video-test.js (207743 => 207744)
--- branches/safari-602-branch/LayoutTests/media/video-test.js 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/LayoutTests/media/video-test.js 2016-10-24 07:18:37 UTC (rev 207744)
@@ -4,6 +4,7 @@
var consoleElement = null;
var printFullTestDetails = true; // This is optionaly switched of by test whose tested values can differ. (see disableFullTestDetailsPrinting())
var Failed = false;
+var Success = true;
var track = null; // Current TextTrack being tested.
var cues = null; // Current TextTrackCueList being tested.
@@ -266,6 +267,11 @@
endTest();
}
+function passTest(text)
+{
+ logResult(Success, text);
+ endTest();
+}
function logResult(success, text)
{
Modified: branches/safari-602-branch/LayoutTests/platform/ios-simulator/TestExpectations (207743 => 207744)
--- branches/safari-602-branch/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-24 07:18:37 UTC (rev 207744)
@@ -3020,3 +3020,11 @@
# System font on iOS 9 cannot be bold and italic.
fast/text/system-font-weight-italic.html [ Failure ]
+
+# Media tests cannot tap play button on iOS.
+webkit.org/b/163291 media/require-user-gesture-to-load-video.html
+webkit.org/b/163291 media/video-controls-transformed.html [ Failure ]
+webkit.org/b/163291 media/video-controls-visible-audio-only.html [ Failure ]
+webkit.org/b/163291 media/video-fullscreeen-only-playback.html [ Failure ]
+webkit.org/b/163291 media/video-play-audio-require-user-gesture.html [ Failure ]
+webkit.org/b/163291 media/video-play-require-user-gesture.html
\ No newline at end of file
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207743 => 207744)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-24 07:18:37 UTC (rev 207744)
@@ -1,5 +1,29 @@
2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r207159. rdar://problem/28857481
+
+ 2016-10-11 Daniel Bates <daba...@apple.com>
+
+ [iOS] REGRESSION (r197953): User gesture required to load video in iOS 9-built apps
+ https://bugs.webkit.org/show_bug.cgi?id=163244
+ <rdar://problem/27250015>
+
+ Reviewed by Jer Noble.
+
+ Adds a new setting to toggle requiring a user gesture to load a video (enabled by default).
+ Disable this setting for apps built against iOS 9 or earlier.
+
+ Tests: media/loadedmetadata-fires-without-user-gesture-when-setRequiresUserGestureToLoadVideo-false.html
+ media/require-user-gesture-to-load-video.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::HTMLMediaElement): Only require a user gesture to load a video
+ when Settings::requiresUserGestureToLoadVideo() is true.
+ * page/Settings.cpp: Enable setting requiresUserGestureToLoadVideo by default.
+ * page/Settings.in: Add setting, requiresUserGestureToLoadVideo.
+
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r206712. rdar://problem/28216065
2016-10-01 Simon Fraser <simon.fra...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp (207743 => 207744)
--- branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-10-24 07:18:37 UTC (rev 207744)
@@ -522,7 +522,8 @@
if (document.ownerElement() || !document.isMediaDocument()) {
if (settings && settings->videoPlaybackRequiresUserGesture()) {
m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureForVideoRateChange);
- m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureForLoad);
+ if (settings->requiresUserGestureToLoadVideo())
+ m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureForLoad);
}
if (settings && settings->audioPlaybackRequiresUserGesture())
Modified: branches/safari-602-branch/Source/WebCore/page/Settings.cpp (207743 => 207744)
--- branches/safari-602-branch/Source/WebCore/page/Settings.cpp 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/Source/WebCore/page/Settings.cpp 2016-10-24 07:18:37 UTC (rev 207744)
@@ -169,6 +169,8 @@
static const bool defaultQuickTimePluginReplacementEnabled = false;
#endif
+static const bool defaultRequiresUserGestureToLoadVideo = true;
+
static const bool defaultAllowsPictureInPictureMediaPlayback = true;
static const double defaultIncrementalRenderingSuppressionTimeoutInSeconds = 5;
Modified: branches/safari-602-branch/Source/WebCore/page/Settings.in (207743 => 207744)
--- branches/safari-602-branch/Source/WebCore/page/Settings.in 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/Source/WebCore/page/Settings.in 2016-10-24 07:18:37 UTC (rev 207744)
@@ -127,6 +127,7 @@
fixedElementsLayoutRelativeToFrame initial=false
allowDisplayOfInsecureContent initial=false
allowRunningOfInsecureContent initial=false
+requiresUserGestureToLoadVideo initial=defaultRequiresUserGestureToLoadVideo
videoPlaybackRequiresUserGesture initial=defaultVideoPlaybackRequiresUserGesture
audioPlaybackRequiresUserGesture initial=defaultAudioPlaybackRequiresUserGesture
mainContentUserGestureOverrideEnabled initial=false
Modified: branches/safari-602-branch/Source/WebKit/mac/ChangeLog (207743 => 207744)
--- branches/safari-602-branch/Source/WebKit/mac/ChangeLog 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/Source/WebKit/mac/ChangeLog 2016-10-24 07:18:37 UTC (rev 207744)
@@ -1,3 +1,24 @@
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r207159. rdar://problem/28857481
+
+ 2016-10-11 Daniel Bates <daba...@apple.com>
+
+ [iOS] REGRESSION (r197953): User gesture required to load video in iOS 9-built apps
+ https://bugs.webkit.org/show_bug.cgi?id=163244
+ <rdar://problem/27250015>
+
+ Reviewed by Jer Noble.
+
+ Enable or disable the Setting::requiresUserGestureToLoadVideo() in legacy WebKit depending
+ on the version of iOS SDK that the app was linked against. We require a user gesture to
+ begin loading a video as of iOS 10.
+
+ * WebView/WebView.mm:
+ (shouldRequireUserGestureToLoadVideo):
+ (-[WebView _preferencesChanged:]): Modified to pass the WebKit requiresUserGestureToLoadVideo
+ preference to WebCore.
+
2016-10-20 Matthew Hanson <matthew_hanson>
Merge r207385. rdar://problem/28811872
Modified: branches/safari-602-branch/Source/WebKit/mac/WebView/WebView.mm (207743 => 207744)
--- branches/safari-602-branch/Source/WebKit/mac/WebView/WebView.mm 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/Source/WebKit/mac/WebView/WebView.mm 2016-10-24 07:18:37 UTC (rev 207744)
@@ -899,6 +899,12 @@
return shouldConvertInvalidURLsToBlank;
}
+static bool shouldRequireUserGestureToLoadVideo()
+{
+ static bool shouldRequireUserGestureToLoadVideo = dyld_get_program_sdk_version() >= DYLD_IOS_VERSION_10_0;
+ return shouldRequireUserGestureToLoadVideo;
+}
+
#if ENABLE(GAMEPAD)
static void WebKitInitializeGamepadProviderIfNecessary()
{
@@ -2348,6 +2354,7 @@
BOOL mediaPlaybackRequiresUserGesture = [preferences mediaPlaybackRequiresUserGesture];
settings.setVideoPlaybackRequiresUserGesture(mediaPlaybackRequiresUserGesture || [preferences videoPlaybackRequiresUserGesture]);
settings.setAudioPlaybackRequiresUserGesture(mediaPlaybackRequiresUserGesture || [preferences audioPlaybackRequiresUserGesture]);
+ settings.setRequiresUserGestureToLoadVideo(shouldRequireUserGestureToLoadVideo());
settings.setMainContentUserGestureOverrideEnabled([preferences overrideUserGestureRequirementForMainContent]);
settings.setAllowsInlineMediaPlayback([preferences mediaPlaybackAllowsInline]);
settings.setAllowsInlineMediaPlaybackAfterFullscreen([preferences allowsInlineMediaPlaybackAfterFullscreen]);
Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (207743 => 207744)
--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-24 07:18:37 UTC (rev 207744)
@@ -1,5 +1,29 @@
2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r207159. rdar://problem/28857481
+
+ 2016-10-11 Daniel Bates <daba...@apple.com>
+
+ [iOS] REGRESSION (r197953): User gesture required to load video in iOS 9-built apps
+ https://bugs.webkit.org/show_bug.cgi?id=163244
+ <rdar://problem/27250015>
+
+ Reviewed by Jer Noble.
+
+ Enable or disable the Setting::requiresUserGestureToLoadVideo() in WebKit depending on the
+ version of iOS SDK that the app was linked against. We require a user gesture to begin
+ loading a video as of iOS 10.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (shouldRequireUserGestureToLoadVideo): Added.
+ (-[WKWebView _initializeWithConfiguration:]): Set the requiresUserGestureToLoadVideo preference.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Modified to pass the WebKit requiresUserGestureToLoadVideo
+ preference to WebCore.
+
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r203809. rdar://problem/28433607
2016-07-27 Andy Estes <aes...@apple.com>
Modified: branches/safari-602-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (207743 => 207744)
--- branches/safari-602-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-10-24 07:18:37 UTC (rev 207744)
@@ -149,6 +149,7 @@
macro(RequiresUserGestureForMediaPlayback, requiresUserGestureForMediaPlayback, Bool, bool, false, "", "") \
macro(RequiresUserGestureForVideoPlayback, requiresUserGestureForVideoPlayback, Bool, bool, false, "", "") \
macro(RequiresUserGestureForAudioPlayback, requiresUserGestureForAudioPlayback, Bool, bool, DEFAULT_REQUIRES_USER_GESTURE_FOR_AUDIO_PLAYBACK, "", "") \
+ macro(RequiresUserGestureToLoadVideo, requiresUserGestureToLoadVideo, Bool, bool, false, "", "") \
macro(MainContentUserGestureOverrideEnabled, mainContentUserGestureOverrideEnabled, Bool, bool, false, "", "") \
macro(AllowsInlineMediaPlayback, allowsInlineMediaPlayback, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK, "", "") \
macro(AllowsInlineMediaPlaybackAfterFullscreen, allowsInlineMediaPlaybackAfterFullscreen, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_AFTER_FULLSCREEN, "", "") \
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (207743 => 207744)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-10-24 07:18:37 UTC (rev 207744)
@@ -325,6 +325,12 @@
#endif
+static bool shouldRequireUserGestureToLoadVideo()
+{
+ static bool shouldRequireUserGestureToLoadVideo = dyld_get_program_sdk_version() >= DYLD_IOS_VERSION_10_0;
+ return shouldRequireUserGestureToLoadVideo;
+}
+
#if ENABLE(DATA_DETECTION) && PLATFORM(IOS)
static WebCore::DataDetectorTypes fromWKDataDetectorTypes(uint64_t types)
{
@@ -454,6 +460,7 @@
WKAudiovisualMediaTypes mediaTypesRequiringUserGesture = [_configuration mediaTypesRequiringUserActionForPlayback];
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::requiresUserGestureForVideoPlaybackKey(), WebKit::WebPreferencesStore::Value((mediaTypesRequiringUserGesture & WKAudiovisualMediaTypeVideo) == WKAudiovisualMediaTypeVideo));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::requiresUserGestureForAudioPlaybackKey(), WebKit::WebPreferencesStore::Value(((mediaTypesRequiringUserGesture & WKAudiovisualMediaTypeAudio) == WKAudiovisualMediaTypeAudio)));
+ pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::requiresUserGestureToLoadVideoKey(), WebKit::WebPreferencesStore::Value(shouldRequireUserGestureToLoadVideo()));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::mainContentUserGestureOverrideEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _mainContentUserGestureOverrideEnabled]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::invisibleAutoplayNotPermittedKey(), WebKit::WebPreferencesStore::Value(!![_configuration _invisibleAutoplayNotPermitted]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::mediaDataLoadsAutomaticallyKey(), WebKit::WebPreferencesStore::Value(!![_configuration _mediaDataLoadsAutomatically]));
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (207743 => 207744)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-24 07:18:28 UTC (rev 207743)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-24 07:18:37 UTC (rev 207744)
@@ -3006,6 +3006,7 @@
bool requiresUserGestureForMedia = store.getBoolValueForKey(WebPreferencesKey::requiresUserGestureForMediaPlaybackKey());
settings.setVideoPlaybackRequiresUserGesture(requiresUserGestureForMedia || store.getBoolValueForKey(WebPreferencesKey::requiresUserGestureForVideoPlaybackKey()));
settings.setAudioPlaybackRequiresUserGesture(requiresUserGestureForMedia || store.getBoolValueForKey(WebPreferencesKey::requiresUserGestureForAudioPlaybackKey()));
+ settings.setRequiresUserGestureToLoadVideo(store.getBoolValueForKey(WebPreferencesKey::requiresUserGestureToLoadVideoKey()));
settings.setMainContentUserGestureOverrideEnabled(store.getBoolValueForKey(WebPreferencesKey::mainContentUserGestureOverrideEnabledKey()));
settings.setAllowsInlineMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackKey()));
settings.setAllowsInlineMediaPlaybackAfterFullscreen(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackAfterFullscreenKey()));
