Unreviewed, rolling out r203471.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Jul 2016 00:45:39 +0000 (00:45 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Jul 2016 00:45:39 +0000 (00:45 +0000)
https://bugs.webkit.org/show_bug.cgi?id=160003

many iOS-simulator tests are failing (Requested by litherum on
#webkit).

Reverted changeset:

"[iPhone] Playing a video on tudou.com plays only sound, no
video"
https://bugs.webkit.org/show_bug.cgi?id=159967
http://trac.webkit.org/changeset/203471

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@203484 268f45cc-cd09-0410-ab3c-d52691b4dbfc

25 files changed:
LayoutTests/ChangeLog
LayoutTests/media/video-playsinline-expected.txt
LayoutTests/media/video-playsinline.html
LayoutTests/media/video-webkit-playsinline-expected.txt [new file with mode: 0644]
LayoutTests/media/video-webkit-playsinline.html [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/html/MediaElementSession.cpp
Source/WebCore/page/Settings.cpp
Source/WebCore/page/Settings.in
Source/WebCore/testing/InternalSettings.cpp
Source/WebCore/testing/InternalSettings.h
Source/WebCore/testing/InternalSettings.idl
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
Source/WebKit/mac/WebView/WebPreferences.mm
Source/WebKit/mac/WebView/WebPreferencesPrivate.h
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/WebPreferencesDefinitions.h
Source/WebKit2/UIProcess/API/C/WKPreferences.cpp
Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h
Source/WebKit2/WebProcess/WebPage/WebPage.cpp

index 82b8323..3ee4536 100644 (file)
@@ -1,3 +1,18 @@
+2016-07-20  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r203471.
+        https://bugs.webkit.org/show_bug.cgi?id=160003
+
+        many iOS-simulator tests are failing (Requested by litherum on
+        #webkit).
+
+        Reverted changeset:
+
+        "[iPhone] Playing a video on tudou.com plays only sound, no
+        video"
+        https://bugs.webkit.org/show_bug.cgi?id=159967
+        http://trac.webkit.org/changeset/203471
+
 2016-07-20  Jiewen Tan  <jiewen_tan@apple.com>
 
         Fix timeout of imported/w3c/WebCryptoAPI/idlharness.html
index 1201f5d..ec59df9 100644 (file)
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
 RUN(video.playsinline = false)
-RUN(video.removeAttribute("webkit-playsinline"))
 EVENT(canplaythrough)
 RUN(video.play())
 EVENT(playing)
 EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
-RUN(video.playsinline = false)
-RUN(video.setAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
-RUN(video.playsinline = false)
-RUN(video.setAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
-RUN(video.playsinline = false)
-RUN(video.removeAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
-RUN(video.playsinline = true)
-RUN(video.setAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
-RUN(video.playsinline = true)
-RUN(video.removeAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
-RUN(video.playsinline = true)
-RUN(video.setAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
 RUN(video.playsinline = true)
-RUN(video.removeAttribute("webkit-playsinline"))
 EVENT(canplaythrough)
 RUN(video.play())
 EVENT(playing)
 EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
 RUN(video.playsinline = false)
-RUN(video.setAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
-RUN(video.playsinline = false)
-RUN(video.removeAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
-RUN(video.playsinline = false)
-RUN(video.setAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
-RUN(video.playsinline = false)
-RUN(video.removeAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
-RUN(video.playsinline = true)
-RUN(video.setAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
-RUN(video.playsinline = true)
-RUN(video.removeAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
-RUN(video.playsinline = true)
-RUN(video.setAttribute("webkit-playsinline"))
 EVENT(canplaythrough)
 RUN(video.play())
 EVENT(playing)
 EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
 RUN(video.playsinline = true)
-RUN(video.removeAttribute("webkit-playsinline"))
 EVENT(canplaythrough)
 RUN(video.play())
 EVENT(playing)
index 8160e1b..c9935d0 100644 (file)
@@ -17,16 +17,14 @@ function runNextTest()
         endTest();
 }
 
-function testPlaysInline(requiresPlaysInline, requiresWebKitPlaysInline, hasPlaysInline, hasWebKitPlaysInline, expectedDisplayingFullscreen)
+function testPlaysInline(requiresPlaysInline, hasPlaysInline, expectedDisplayingFullscreen)
 {
-    run('internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(' + requiresPlaysInline + ')');
-    run('internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(' + requiresWebKitPlaysInline + ')');
+    run('internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(' + requiresPlaysInline + ')');
     video = media = document.createElement('video');
     document.body.appendChild(video);
     video.controls = true;
     video.src = findMediaFile('video', 'content/test');
     run('video.playsinline = ' + hasPlaysInline);
-    run('video.' + (hasWebKitPlaysInline ? 'set' : 'remove') + 'Attribute("webkit-playsinline")');
     waitForEventOnce('canplaythrough', () => {
         runWithKeyDown(() => {
             run('video.play()');
@@ -41,105 +39,33 @@ function testPlaysInline(requiresPlaysInline, requiresWebKitPlaysInline, hasPlay
 
 function testRequiresPlaysInlineAndDoesntHaveIt()
 {
-    testPlaysInline(true, true, false, false, true);
-}
-
-function testRequiresPlaysInlineAndDoesntHaveIt2()
-{
-    testPlaysInline(true, true, false, true, false);
-}
-
-function testRequiresPlaysInlineAndDoesntHaveIt3()
-{
-    testPlaysInline(true, false, false, true, true);
-}
-
-function testRequiresPlaysInlineAndDoesntHaveIt4()
-{
-    testPlaysInline(true, false, false, false, true);
+    testPlaysInline(true, false, true);
 }
 
 function testRequiresPlaysInlineAndDoesHaveIt()
 {
-    testPlaysInline(true, true, true, true, false);
-}
-
-function testRequiresPlaysInlineAndDoesHaveIt2()
-{
-    testPlaysInline(true, true, true, false, false);
-}
-
-function testRequiresPlaysInlineAndDoesHaveIt3()
-{
-    testPlaysInline(true, false, true, true, false);
-}
-
-function testRequiresPlaysInlineAndDoesHaveIt4()
-{
-    testPlaysInline(true, false, true, false, false);
+    testPlaysInline(true, true, false);
 }
 
 function testDoesNotRequirePlaysInlineAndDoesntHaveIt()
 {
-    testPlaysInline(false, true, false, true, false);
-}
-
-function testDoesNotRequirePlaysInlineAndDoesntHaveIt2()
-{
-    testPlaysInline(false, true, false, false, true);
-}
-
-function testDoesNotRequirePlaysInlineAndDoesntHaveIt3()
-{
-    testPlaysInline(false, false, false, true, false);
-}
-
-function testDoesNotRequirePlaysInlineAndDoesntHaveIt4()
-{
-    testPlaysInline(false, false, false, false, false);
+    testPlaysInline(false, false, false);
 }
 
 function testDoesNotRequirePlaysInlineAndDoesHaveIt()
 {
-    testPlaysInline(false, true, true, true, false);
-}
-
-function testDoesNotRequirePlaysInlineAndDoesHaveIt2()
-{
-    testPlaysInline(false, true, true, false, true);
-}
-
-function testDoesNotRequirePlaysInlineAndDoesHaveIt3()
-{
-    testPlaysInline(false, false, true, true, false);
-}
-
-function testDoesNotRequirePlaysInlineAndDoesHaveIt4()
-{
-    testPlaysInline(false, false, true, false, false);
+    testPlaysInline(false, true, false);
 }
 
 var tests = [
     testRequiresPlaysInlineAndDoesntHaveIt,
-    testRequiresPlaysInlineAndDoesntHaveIt2,
-    testRequiresPlaysInlineAndDoesntHaveIt3,
-    testRequiresPlaysInlineAndDoesntHaveIt4,
     testRequiresPlaysInlineAndDoesHaveIt,
-    testRequiresPlaysInlineAndDoesHaveIt2,
-    testRequiresPlaysInlineAndDoesHaveIt3,
-    testRequiresPlaysInlineAndDoesHaveIt4,
     testDoesNotRequirePlaysInlineAndDoesntHaveIt,
-    testDoesNotRequirePlaysInlineAndDoesntHaveIt2,
-    testDoesNotRequirePlaysInlineAndDoesntHaveIt3,
-    testDoesNotRequirePlaysInlineAndDoesntHaveIt4,
     testDoesNotRequirePlaysInlineAndDoesHaveIt,
-    testDoesNotRequirePlaysInlineAndDoesHaveIt2,
-    testDoesNotRequirePlaysInlineAndDoesHaveIt3,
-    testDoesNotRequirePlaysInlineAndDoesHaveIt4
 ];
 
 </script>
 </head>
 <body onload="go()">
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/media/video-webkit-playsinline-expected.txt b/LayoutTests/media/video-webkit-playsinline-expected.txt
new file mode 100644 (file)
index 0000000..7ade33c
--- /dev/null
@@ -0,0 +1,26 @@
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
+RUN(video.removeAttribute("webkit-playsinline"))
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
+RUN(video.setAttribute("webkit-playsinline"))
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
+RUN(video.removeAttribute("webkit-playsinline"))
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
+RUN(video.setAttribute("webkit-playsinline"))
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
+END OF TEST
+
diff --git a/LayoutTests/media/video-webkit-playsinline.html b/LayoutTests/media/video-webkit-playsinline.html
new file mode 100644 (file)
index 0000000..c6251c2
--- /dev/null
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src="media-file.js"></script>
+<script src="video-test.js"></script>
+<script>
+function go()
+{
+    runNextTest();
+}
+
+function runNextTest()
+{
+    if (tests.length)
+        tests.shift()();
+    else
+        endTest();
+}
+
+function testPlaysInline(requiresPlaysInline, hasWebkitPlaysInline, expectedDisplayingFullscreen)
+{
+    run('internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(' + requiresPlaysInline + ')');
+    video = media = document.createElement('video');
+    document.body.appendChild(video);
+    video.controls = true;
+    video.src = findMediaFile('video', 'content/test');
+    run('video.' + (hasWebkitPlaysInline ? 'set' : 'remove') + 'Attribute("webkit-playsinline")');
+    waitForEventOnce('canplaythrough', () => {
+        runWithKeyDown(() => {
+            run('video.play()');
+        });
+    })
+    waitForEventOnce('playing', () => {
+        testExpected('video.webkitDisplayingFullscreen', expectedDisplayingFullscreen);
+        document.body.removeChild(video);
+        runNextTest();
+    });
+}
+
+function testRequiresPlaysInlineAndDoesntHaveIt()
+{
+    testPlaysInline(true, false, true);
+}
+
+function testRequiresPlaysInlineAndDoesHaveIt()
+{
+    testPlaysInline(true, true, false);
+}
+
+function testDoesNotRequirePlaysInlineAndDoesntHaveIt()
+{
+    testPlaysInline(false, false, false);
+}
+
+function testDoesNotRequirePlaysInlineAndDoesHaveIt()
+{
+    testPlaysInline(false, true, false);
+}
+
+var tests = [
+    testRequiresPlaysInlineAndDoesntHaveIt,
+    testRequiresPlaysInlineAndDoesHaveIt,
+    testDoesNotRequirePlaysInlineAndDoesntHaveIt,
+    testDoesNotRequirePlaysInlineAndDoesHaveIt,
+];
+
+</script>
+</head>
+<body onload="go()">
+</body>
+</html>
\ No newline at end of file
index 66d4ce8..6ab05c1 100644 (file)
@@ -1,3 +1,18 @@
+2016-07-20  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r203471.
+        https://bugs.webkit.org/show_bug.cgi?id=160003
+
+        many iOS-simulator tests are failing (Requested by litherum on
+        #webkit).
+
+        Reverted changeset:
+
+        "[iPhone] Playing a video on tudou.com plays only sound, no
+        video"
+        https://bugs.webkit.org/show_bug.cgi?id=159967
+        http://trac.webkit.org/changeset/203471
+
 2016-07-19  Ryosuke Niwa  <rniwa@webkit.org>
 
         iOS: Cannot paste images in RTF content
index 832ab6d..2f5b86e 100644 (file)
@@ -455,16 +455,7 @@ bool MediaElementSession::requiresFullscreenForVideoPlayback(const HTMLMediaElem
     if (!settings || !settings->allowsInlineMediaPlayback())
         return true;
 
-    bool requiresPlaysInline = settings->allowsInlineMediaPlaybackWithPlaysInlineAttribute();
-    bool requiresWebKitPlaysInline = settings->allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute();
-
-    if (!requiresPlaysInline && !requiresWebKitPlaysInline)
-        return false;
-
-    bool hasPlaysInline = element.hasAttributeWithoutSynchronization(HTMLNames::playsinlineAttr);
-    bool hasWebKitPlaysInline = element.hasAttributeWithoutSynchronization(HTMLNames::webkit_playsinlineAttr);
-
-    return !((requiresPlaysInline && hasPlaysInline) || (requiresWebKitPlaysInline && hasWebKitPlaysInline));
+    return settings->inlineMediaPlaybackRequiresPlaysInlineAttribute() && !(element.hasAttributeWithoutSynchronization(HTMLNames::webkit_playsinlineAttr) || element.hasAttributeWithoutSynchronization(HTMLNames::playsinlineAttr));
 }
 
 bool MediaElementSession::allowsAutomaticMediaDataLoading(const HTMLMediaElement& element) const
index e76ba34..f0ea240 100644 (file)
@@ -139,8 +139,6 @@ static const bool defaultFixedBackgroundsPaintRelativeToDocument = true;
 static const bool defaultAcceleratedCompositingForFixedPositionEnabled = true;
 static const bool defaultAllowsInlineMediaPlayback = false;
 static const bool defaultInlineMediaPlaybackRequiresPlaysInlineAttribute = true;
-static const bool defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute = true;
-static const bool defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = true;
 static const bool defaultVideoPlaybackRequiresUserGesture = true;
 static const bool defaultAudioPlaybackRequiresUserGesture = true;
 static const bool defaultMediaDataLoadsAutomatically = false;
@@ -154,8 +152,6 @@ static const bool defaultFixedBackgroundsPaintRelativeToDocument = false;
 static const bool defaultAcceleratedCompositingForFixedPositionEnabled = false;
 static const bool defaultAllowsInlineMediaPlayback = true;
 static const bool defaultInlineMediaPlaybackRequiresPlaysInlineAttribute = false;
-static const bool defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute = false;
-static const bool defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = false;
 static const bool defaultVideoPlaybackRequiresUserGesture = false;
 static const bool defaultAudioPlaybackRequiresUserGesture = false;
 static const bool defaultMediaDataLoadsAutomatically = true;
index 5a5fd59..98dcf86 100644 (file)
@@ -132,8 +132,6 @@ mainContentUserGestureOverrideEnabled initial=false
 allowsInlineMediaPlayback initial=defaultAllowsInlineMediaPlayback
 allowsInlineMediaPlaybackAfterFullscreen initial=true
 inlineMediaPlaybackRequiresPlaysInlineAttribute initial=defaultInlineMediaPlaybackRequiresPlaysInlineAttribute
-allowsInlineMediaPlaybackWithPlaysInlineAttribute initial=defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute
-allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute initial=defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
 allowsPictureInPictureMediaPlayback initial=defaultAllowsPictureInPictureMediaPlayback
 mediaControlsScaleWithPageZoom initial=defaultMediaControlsScaleWithPageZoom
 invisibleAutoplayNotPermitted initial=false
index 8135d09..6f25a5f 100644 (file)
@@ -108,8 +108,6 @@ InternalSettings::Backup::Backup(Settings& settings)
     , m_allowsInlineMediaPlayback(settings.allowsInlineMediaPlayback())
     , m_allowsInlineMediaPlaybackAfterFullscreen(settings.allowsInlineMediaPlaybackAfterFullscreen())
     , m_inlineMediaPlaybackRequiresPlaysInlineAttribute(settings.inlineMediaPlaybackRequiresPlaysInlineAttribute())
-    , m_allowsInlineMediaPlaybackWithPlaysInlineAttribute(settings.allowsInlineMediaPlaybackWithPlaysInlineAttribute())
-    , m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(settings.allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute())
 #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
     , m_indexedDBWorkersEnabled(RuntimeEnabledFeatures::sharedFeatures().indexedDBWorkersEnabled())
 #endif
@@ -186,8 +184,6 @@ void InternalSettings::Backup::restoreTo(Settings& settings)
     settings.setAllowsInlineMediaPlayback(m_allowsInlineMediaPlayback);
     settings.setAllowsInlineMediaPlaybackAfterFullscreen(m_allowsInlineMediaPlaybackAfterFullscreen);
     settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(m_inlineMediaPlaybackRequiresPlaysInlineAttribute);
-    settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(m_allowsInlineMediaPlaybackWithPlaysInlineAttribute);
-    settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute);
     RuntimeEnabledFeatures::sharedFeatures().setPluginReplacementEnabled(m_pluginReplacementEnabled);
 #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
     RuntimeEnabledFeatures::sharedFeatures().setIndexedDBWorkersEnabled(m_indexedDBWorkersEnabled);
@@ -584,18 +580,6 @@ void InternalSettings::setInlineMediaPlaybackRequiresPlaysInlineAttribute(bool r
     settings()->setInlineMediaPlaybackRequiresPlaysInlineAttribute(requires);
 }
 
-void InternalSettings::setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(bool requires, ExceptionCode& ec)
-{
-    InternalSettingsGuardForSettings();
-    settings()->setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(requires);
-}
-
-void InternalSettings::setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(bool requires, ExceptionCode& ec)
-{
-    InternalSettingsGuardForSettings();
-    settings()->setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(requires);
-}
-
 void InternalSettings::setIndexedDBWorkersEnabled(bool enabled, ExceptionCode&)
 {
 #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
index bbe2906..d04bcfc 100644 (file)
@@ -108,8 +108,6 @@ public:
         bool m_allowsInlineMediaPlayback;
         bool m_allowsInlineMediaPlaybackAfterFullscreen;
         bool m_inlineMediaPlaybackRequiresPlaysInlineAttribute;
-        bool m_allowsInlineMediaPlaybackWithPlaysInlineAttribute;
-        bool m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
 #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
         bool m_indexedDBWorkersEnabled;
 #endif
@@ -165,8 +163,6 @@ public:
     void setAllowsInlineMediaPlayback(bool, ExceptionCode&);
     void setAllowsInlineMediaPlaybackAfterFullscreen(bool, ExceptionCode&);
     void setInlineMediaPlaybackRequiresPlaysInlineAttribute(bool, ExceptionCode&);
-    void setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(bool, ExceptionCode&);
-    void setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(bool, ExceptionCode&);
     void setIndexedDBWorkersEnabled(bool, ExceptionCode&);
     String userInterfaceDirectionPolicy(ExceptionCode&);
     void setUserInterfaceDirectionPolicy(const String& policy, ExceptionCode&);
index 8455055..eecc6ea 100644 (file)
@@ -78,8 +78,6 @@
     [RaisesException] void setAllowsInlineMediaPlayback(boolean allows);
     [RaisesException] void setAllowsInlineMediaPlaybackAfterFullscreen(boolean allows);
     [RaisesException] void setInlineMediaPlaybackRequiresPlaysInlineAttribute(boolean requires);
-    [RaisesException] void setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(boolean requires);
-    [RaisesException] void setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(boolean requires);
 
     [RaisesException] void setIndexedDBWorkersEnabled(boolean requires);
 
index 4a2de88..c163073 100644 (file)
@@ -1,3 +1,18 @@
+2016-07-20  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r203471.
+        https://bugs.webkit.org/show_bug.cgi?id=160003
+
+        many iOS-simulator tests are failing (Requested by litherum on
+        #webkit).
+
+        Reverted changeset:
+
+        "[iPhone] Playing a video on tudou.com plays only sound, no
+        video"
+        https://bugs.webkit.org/show_bug.cgi?id=159967
+        http://trac.webkit.org/changeset/203471
+
 2016-07-20  Myles C. Maxfield  <mmaxfield@apple.com>
 
         [iPhone] Playing a video on tudou.com plays only sound, no video
index 0fabc6d..82af1a1 100644 (file)
 #define WebKitAllowsInlineMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsInline"
 #define WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey @"WebKitAllowsInlineMediaPlaybackAfterFullscreen"
 #define WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey @"InlineMediaPlaybackRequiresPlaysInlineAttribute"
-#define WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey @"AllowsInlineMediaPlaybackWithPlaysInlineAttribute"
-#define WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey @"AllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute"
 #define WebKitInvisibleAutoplayNotPermittedKey @"InvisibleAutoplayNotPermitted"
 #define WebKitAllowsPictureInPictureMediaPlaybackPreferenceKey @"WebKitAllowsPictureInPictureMediaPlayback"
 #define WebKitAllowsAirPlayForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsAirPlay"
index 1c9449d..52f1446 100644 (file)
@@ -525,9 +525,7 @@ public:
 #if !PLATFORM(IOS)
         [NSNumber numberWithBool:YES],  WebKitAllowsInlineMediaPlaybackPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey,
-        [NSNumber numberWithBool:NO],   WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
-        [NSNumber numberWithBool:NO],   WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey,
-        [NSNumber numberWithBool:NO],   WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey,
+        [NSNumber numberWithBool:NO],  WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
         [NSNumber numberWithBool:YES],  WebKitMediaControlsScaleWithPageZoomPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitWebAudioEnabledPreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitBackspaceKeyNavigationEnabledKey,
@@ -541,8 +539,6 @@ public:
         [NSNumber numberWithBool:allowsInlineMediaPlayback],   WebKitAllowsInlineMediaPlaybackPreferenceKey,
         [NSNumber numberWithBool:allowsInlineMediaPlaybackAfterFullscreen],   WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey,
         [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
-        [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey,
-        [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey,
         [NSNumber numberWithBool:NO],   WebKitMediaControlsScaleWithPageZoomPreferenceKey,
         [NSNumber numberWithUnsignedInt:AudioSession::None],  WebKitAudioSessionCategoryOverride,
         [NSNumber numberWithBool:NO],   WebKitMediaDataLoadsAutomaticallyPreferenceKey,
@@ -2297,26 +2293,6 @@ static NSString *classIBCreatorID = nil;
     [self _setBoolValue:flag forKey:WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey];
 }
 
-- (BOOL)allowsInlineMediaPlaybackWithPlaysInlineAttribute
-{
-    return [self _boolValueForKey:WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey];
-}
-
-- (void)setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)flag
-{
-    [self _setBoolValue:flag forKey:WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey];
-}
-
-- (BOOL)allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
-{
-    return [self _boolValueForKey:WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey];
-}
-
-- (void)setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:(BOOL)flag
-{
-    [self _setBoolValue:flag forKey:WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey];
-}
-
 - (BOOL)invisibleAutoplayNotPermitted
 {
     return [self _boolValueForKey:WebKitInvisibleAutoplayNotPermittedKey];
index 8c3efb2..c10edc0 100644 (file)
@@ -265,12 +265,6 @@ extern NSString *WebPreferencesCacheModelChangedInternalNotification;
 - (void)setInlineMediaPlaybackRequiresPlaysInlineAttribute:(BOOL)flag;
 - (BOOL)inlineMediaPlaybackRequiresPlaysInlineAttribute;
 
-- (void)setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)flag;
-- (BOOL)allowsInlineMediaPlaybackWithPlaysInlineAttribute;
-
-- (void)setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:(BOOL)flag;
-- (BOOL)allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
-
 - (void)setInvisibleAutoplayNotPermitted:(BOOL)flag;
 - (BOOL)invisibleAutoplayNotPermitted;
 
index 231f900..30f9211 100644 (file)
@@ -2349,8 +2349,6 @@ static bool needsSelfRetainWhileLoadingQuirk()
     settings.setAllowsInlineMediaPlayback([preferences mediaPlaybackAllowsInline]);
     settings.setAllowsInlineMediaPlaybackAfterFullscreen([preferences allowsInlineMediaPlaybackAfterFullscreen]);
     settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute([preferences inlineMediaPlaybackRequiresPlaysInlineAttribute]);
-    settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute([preferences allowsInlineMediaPlaybackWithPlaysInlineAttribute]);
-    settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute([preferences allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]);
     settings.setInvisibleAutoplayNotPermitted([preferences invisibleAutoplayNotPermitted]);
     settings.setAllowsPictureInPictureMediaPlayback([preferences allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback());
     settings.setMediaControlsScaleWithPageZoom([preferences mediaControlsScaleWithPageZoom]);
index 58dad6f..293e217 100644 (file)
@@ -1,3 +1,18 @@
+2016-07-20  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r203471.
+        https://bugs.webkit.org/show_bug.cgi?id=160003
+
+        many iOS-simulator tests are failing (Requested by litherum on
+        #webkit).
+
+        Reverted changeset:
+
+        "[iPhone] Playing a video on tudou.com plays only sound, no
+        video"
+        https://bugs.webkit.org/show_bug.cgi?id=159967
+        http://trac.webkit.org/changeset/203471
+
 2016-07-20  Simon Fraser  <simon.fraser@apple.com>
 
         REGRESSION (r203189): Webpage snapshots are partially or fully blank when edge swiping back
index 623a1a8..a52f66c 100644 (file)
@@ -66,8 +66,6 @@
 #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK false
 #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_AFTER_FULLSCREEN true
 #define DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE true
-#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_PLAYS_INLINE_ATTRIBUTE true
-#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_WEBKIT_PLAYS_INLINE_ATTRIBUTE true
 #define DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED true
 #define DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY false
 #define DEFAULT_MEDIA_CONTROLS_SCALE_WITH_PAGE_ZOOM false
@@ -85,8 +83,6 @@
 #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK true
 #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_AFTER_FULLSCREEN false
 #define DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE false
-#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_PLAYS_INLINE_ATTRIBUTE false
-#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_WEBKIT_PLAYS_INLINE_ATTRIBUTE false
 #define DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED false
 #define DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY true
 #define DEFAULT_MEDIA_CONTROLS_SCALE_WITH_PAGE_ZOOM true
     macro(AllowsInlineMediaPlayback, allowsInlineMediaPlayback, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK, "", "") \
     macro(AllowsInlineMediaPlaybackAfterFullscreen, allowsInlineMediaPlaybackAfterFullscreen, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_AFTER_FULLSCREEN, "", "") \
     macro(InlineMediaPlaybackRequiresPlaysInlineAttribute, inlineMediaPlaybackRequiresPlaysInlineAttribute, Bool, bool, DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE, "", "") \
-    macro(AllowsInlineMediaPlaybackWithPlaysInlineAttribute, allowsInlineMediaPlaybackWithPlaysInlineAttribute, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_PLAYS_INLINE_ATTRIBUTE, "", "") \
-    macro(AllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute, allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_WEBKIT_PLAYS_INLINE_ATTRIBUTE, "", "") \
     macro(InvisibleAutoplayNotPermitted, invisibleAutoplayNotPermitted, Bool, bool, DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED, "", "") \
     macro(MediaDataLoadsAutomatically, mediaDataLoadsAutomatically, Bool, bool, DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY, "", "") \
     macro(AllowsPictureInPictureMediaPlayback, allowsPictureInPictureMediaPlayback, Bool, bool, DEFAULT_ALLOWS_PICTURE_IN_PICTURE_MEDIA_PLAYBACK, "", "") \
index 5ece5e1..beefb07 100644 (file)
@@ -803,26 +803,6 @@ bool WKPreferencesGetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferenc
     return toImpl(preferencesRef)->inlineMediaPlaybackRequiresPlaysInlineAttribute();
 }
 
-void WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag)
-{
-    toImpl(preferencesRef)->setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(flag);
-}
-
-bool WKPreferencesGetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef)
-{
-    return toImpl(preferencesRef)->allowsInlineMediaPlaybackWithPlaysInlineAttribute();
-}
-
-void WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag)
-{
-    toImpl(preferencesRef)->setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(flag);
-}
-
-bool WKPreferencesGetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef)
-{
-    return toImpl(preferencesRef)->allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute();
-}
-
 void WKPreferencesSetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef, bool flag)
 {
     toImpl(preferencesRef)->setMediaControlsScaleWithPageZoom(flag);
index 011eb77..8c040f0 100644 (file)
@@ -195,14 +195,6 @@ WK_EXPORT bool WKPreferencesGetMediaPlaybackAllowsInline(WKPreferencesRef prefer
 WK_EXPORT void WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag);
 WK_EXPORT bool WKPreferencesGetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferencesRef preferencesRef);
 
-// Defaults to true on iOS, false elsewhere.
-WK_EXPORT void WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag);
-WK_EXPORT bool WKPreferencesGetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef);
-
-// Defaults to true on iOS, false elsewhere.
-WK_EXPORT void WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag);
-WK_EXPORT bool WKPreferencesGetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef);
-
 // Defaults to false on iOS, true elsewhere.
 WK_EXPORT void WKPreferencesSetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef, bool flag);
 WK_EXPORT bool WKPreferencesGetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef);
index f84be64..099fd09 100644 (file)
@@ -456,8 +456,6 @@ static uint32_t convertSystemLayoutDirection(NSUserInterfaceLayoutDirection dire
     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackAfterFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackAfterFullscreen]));
     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::inlineMediaPlaybackRequiresPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _inlineMediaPlaybackRequiresPlaysInlineAttribute]));
-    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackWithPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackWithPlaysInlineAttribute]));
-    pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]));
     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsPictureInPictureMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback()));
     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::userInterfaceDirectionPolicyKey(), WebKit::WebPreferencesStore::Value(static_cast<uint32_t>(WebCore::UserInterfaceDirectionPolicy::Content)));
     pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::systemLayoutDirectionKey(), WebKit::WebPreferencesStore::Value(static_cast<uint32_t>(WebCore::LTR)));
index 826c448..3f581b8 100644 (file)
@@ -108,8 +108,6 @@ private:
     BOOL _alwaysRunsAtForegroundPriority;
     BOOL _allowsInlineMediaPlayback;
     BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute;
-    BOOL _allowsInlineMediaPlaybackWithPlaysInlineAttribute;
-    BOOL _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
     BOOL _allowsInlineMediaPlaybackAfterFullscreen;
 #endif
 
@@ -140,8 +138,6 @@ private:
     _allowsPictureInPictureMediaPlayback = YES;
     _allowsInlineMediaPlayback = WebCore::deviceClass() == MGDeviceClassiPad;
     _inlineMediaPlaybackRequiresPlaysInlineAttribute = !_allowsInlineMediaPlayback;
-    _allowsInlineMediaPlaybackWithPlaysInlineAttribute = !_allowsInlineMediaPlayback;
-    _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = !_allowsInlineMediaPlayback;
     _allowsInlineMediaPlaybackAfterFullscreen = !_allowsInlineMediaPlayback;
     _mediaDataLoadsAutomatically = NO;
     if (linkedOnOrAfter(WebKit::LibraryVersion::FirstWithMediaTypesRequiringUserActionForPlayback))
@@ -293,8 +289,6 @@ private:
     configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
     configuration->_allowsInlineMediaPlaybackAfterFullscreen = self->_allowsInlineMediaPlaybackAfterFullscreen;
     configuration->_inlineMediaPlaybackRequiresPlaysInlineAttribute = self->_inlineMediaPlaybackRequiresPlaysInlineAttribute;
-    configuration->_allowsInlineMediaPlaybackWithPlaysInlineAttribute = self->_allowsInlineMediaPlaybackWithPlaysInlineAttribute;
-    configuration->_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = self->_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
     configuration->_allowsPictureInPictureMediaPlayback = self->_allowsPictureInPictureMediaPlayback;
     configuration->_alwaysRunsAtForegroundPriority = _alwaysRunsAtForegroundPriority;
     configuration->_selectionGranularity = self->_selectionGranularity;
@@ -584,26 +578,6 @@ static NSString *defaultApplicationNameForUserAgent()
     _inlineMediaPlaybackRequiresPlaysInlineAttribute = requires;
 }
 
-- (BOOL)_allowsInlineMediaPlaybackWithPlaysInlineAttribute
-{
-    return _allowsInlineMediaPlaybackWithPlaysInlineAttribute;
-}
-
-- (void)_setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)requires
-{
-    _allowsInlineMediaPlaybackWithPlaysInlineAttribute = requires;
-}
-
-- (BOOL)_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
-{
-    return _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
-}
-
-- (void)_setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:(BOOL)requires
-{
-    _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = requires;
-}
-
 - (BOOL)_allowsInlineMediaPlaybackAfterFullscreen
 {
     return _allowsInlineMediaPlaybackAfterFullscreen;
index e52901b..b8cd48d 100644 (file)
@@ -60,8 +60,6 @@
 #if TARGET_OS_IPHONE
 @property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_API_AVAILABLE(ios(9_0));
 @property (nonatomic, setter=_setInlineMediaPlaybackRequiresPlaysInlineAttribute:) BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
-@property (nonatomic, setter=_setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:) BOOL _allowsInlineMediaPlaybackWithPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
-@property (nonatomic, setter=_setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:) BOOL _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
 @property (nonatomic, setter=_setAllowsInlineMediaPlaybackAfterFullscreen:) BOOL _allowsInlineMediaPlaybackAfterFullscreen  WK_API_AVAILABLE(ios(WK_IOS_TBA));
 #else
 @property (nonatomic, setter=_setShowsURLsInToolTips:) BOOL _showsURLsInToolTips WK_API_AVAILABLE(macosx(WK_MAC_TBA));
index 2a63e21..dbf8f10 100644 (file)
@@ -2986,8 +2986,6 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
     settings.setAllowsInlineMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackKey()));
     settings.setAllowsInlineMediaPlaybackAfterFullscreen(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackAfterFullscreenKey()));
     settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::inlineMediaPlaybackRequiresPlaysInlineAttributeKey()));
-    settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackWithPlaysInlineAttributeKey()));
-    settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey()));
     settings.setInvisibleAutoplayNotPermitted(store.getBoolValueForKey(WebPreferencesKey::invisibleAutoplayNotPermittedKey()));
     settings.setMediaDataLoadsAutomatically(store.getBoolValueForKey(WebPreferencesKey::mediaDataLoadsAutomaticallyKey()));
 #if ENABLE(ATTACHMENT_ELEMENT)