Diff
Modified: trunk/LayoutTests/ChangeLog (203483 => 203484)
--- trunk/LayoutTests/ChangeLog 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/LayoutTests/ChangeLog 2016-07-21 00:45:39 UTC (rev 203484)
@@ -1,3 +1,18 @@
+2016-07-20 Commit Queue <commit-qu...@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_...@apple.com>
Fix timeout of imported/w3c/WebCryptoAPI/idlharness.html
Modified: trunk/LayoutTests/media/video-playsinline-expected.txt (203483 => 203484)
--- trunk/LayoutTests/media/video-playsinline-expected.txt 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/LayoutTests/media/video-playsinline-expected.txt 2016-07-21 00:45:39 UTC (rev 203484)
@@ -1,130 +1,26 @@
-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(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(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(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(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(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(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(video.playsinline = true)
-RUN(video.removeAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
END OF TEST
Modified: trunk/LayoutTests/media/video-playsinline.html (203483 => 203484)
--- trunk/LayoutTests/media/video-playsinline.html 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/LayoutTests/media/video-playsinline.html 2016-07-21 00:45:39 UTC (rev 203484)
@@ -17,16 +17,14 @@
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 = "" 'content/test');
run('video.playsinline = ' + hasPlaysInline);
- run('video.' + (hasWebKitPlaysInline ? 'set' : 'remove') + 'Attribute("webkit-playsinline")');
waitForEventOnce('canplaythrough', () => {
runWithKeyDown(() => {
run('video.play()');
@@ -41,101 +39,29 @@
function testRequiresPlaysInlineAndDoesntHaveIt()
{
- testPlaysInline(true, true, false, false, true);
+ testPlaysInline(true, 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);
-}
-
function testRequiresPlaysInlineAndDoesHaveIt()
{
- testPlaysInline(true, true, true, true, false);
+ testPlaysInline(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);
-}
-
function testDoesNotRequirePlaysInlineAndDoesntHaveIt()
{
- testPlaysInline(false, true, false, true, false);
+ testPlaysInline(false, false, 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);
-}
-
function testDoesNotRequirePlaysInlineAndDoesHaveIt()
{
- testPlaysInline(false, true, true, true, false);
+ testPlaysInline(false, 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);
-}
-
var tests = [
testRequiresPlaysInlineAndDoesntHaveIt,
- testRequiresPlaysInlineAndDoesntHaveIt2,
- testRequiresPlaysInlineAndDoesntHaveIt3,
- testRequiresPlaysInlineAndDoesntHaveIt4,
testRequiresPlaysInlineAndDoesHaveIt,
- testRequiresPlaysInlineAndDoesHaveIt2,
- testRequiresPlaysInlineAndDoesHaveIt3,
- testRequiresPlaysInlineAndDoesHaveIt4,
testDoesNotRequirePlaysInlineAndDoesntHaveIt,
- testDoesNotRequirePlaysInlineAndDoesntHaveIt2,
- testDoesNotRequirePlaysInlineAndDoesntHaveIt3,
- testDoesNotRequirePlaysInlineAndDoesntHaveIt4,
testDoesNotRequirePlaysInlineAndDoesHaveIt,
- testDoesNotRequirePlaysInlineAndDoesHaveIt2,
- testDoesNotRequirePlaysInlineAndDoesHaveIt3,
- testDoesNotRequirePlaysInlineAndDoesHaveIt4
];
</script>
@@ -142,4 +68,4 @@
</head>
<body _onload_="go()">
</body>
-</html>
+</html>
\ No newline at end of file
Added: trunk/LayoutTests/media/video-webkit-playsinline-expected.txt (0 => 203484)
--- trunk/LayoutTests/media/video-webkit-playsinline-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-webkit-playsinline-expected.txt 2016-07-21 00:45:39 UTC (rev 203484)
@@ -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
+
Added: trunk/LayoutTests/media/video-webkit-playsinline.html (0 => 203484)
--- trunk/LayoutTests/media/video-webkit-playsinline.html (rev 0)
+++ trunk/LayoutTests/media/video-webkit-playsinline.html 2016-07-21 00:45:39 UTC (rev 203484)
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src=""
+<script src=""
+<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 = "" '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
Modified: trunk/Source/WebCore/ChangeLog (203483 => 203484)
--- trunk/Source/WebCore/ChangeLog 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebCore/ChangeLog 2016-07-21 00:45:39 UTC (rev 203484)
@@ -1,3 +1,18 @@
+2016-07-20 Commit Queue <commit-qu...@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 <rn...@webkit.org>
iOS: Cannot paste images in RTF content
Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (203483 => 203484)
--- trunk/Source/WebCore/html/MediaElementSession.cpp 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2016-07-21 00:45:39 UTC (rev 203484)
@@ -455,16 +455,7 @@
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
Modified: trunk/Source/WebCore/page/Settings.cpp (203483 => 203484)
--- trunk/Source/WebCore/page/Settings.cpp 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebCore/page/Settings.cpp 2016-07-21 00:45:39 UTC (rev 203484)
@@ -139,8 +139,6 @@
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 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;
Modified: trunk/Source/WebCore/page/Settings.in (203483 => 203484)
--- trunk/Source/WebCore/page/Settings.in 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebCore/page/Settings.in 2016-07-21 00:45:39 UTC (rev 203484)
@@ -132,8 +132,6 @@
allowsInlineMediaPlayback initial=defaultAllowsInlineMediaPlayback
allowsInlineMediaPlaybackAfterFullscreen initial=true
inlineMediaPlaybackRequiresPlaysInlineAttribute initial=defaultInlineMediaPlaybackRequiresPlaysInlineAttribute
-allowsInlineMediaPlaybackWithPlaysInlineAttribute initial=defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute
-allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute initial=defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
allowsPictureInPictureMediaPlayback initial=defaultAllowsPictureInPictureMediaPlayback
mediaControlsScaleWithPageZoom initial=defaultMediaControlsScaleWithPageZoom
invisibleAutoplayNotPermitted initial=false
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (203483 => 203484)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2016-07-21 00:45:39 UTC (rev 203484)
@@ -108,8 +108,6 @@
, 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 @@
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 @@
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)
Modified: trunk/Source/WebCore/testing/InternalSettings.h (203483 => 203484)
--- trunk/Source/WebCore/testing/InternalSettings.h 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2016-07-21 00:45:39 UTC (rev 203484)
@@ -108,8 +108,6 @@
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 @@
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&);
Modified: trunk/Source/WebCore/testing/InternalSettings.idl (203483 => 203484)
--- trunk/Source/WebCore/testing/InternalSettings.idl 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2016-07-21 00:45:39 UTC (rev 203484)
@@ -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);
Modified: trunk/Source/WebKit/mac/ChangeLog (203483 => 203484)
--- trunk/Source/WebKit/mac/ChangeLog 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-07-21 00:45:39 UTC (rev 203484)
@@ -1,3 +1,18 @@
+2016-07-20 Commit Queue <commit-qu...@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 <mmaxfi...@apple.com>
[iPhone] Playing a video on tudou.com plays only sound, no video
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (203483 => 203484)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-07-21 00:45:39 UTC (rev 203484)
@@ -127,8 +127,6 @@
#define WebKitAllowsInlineMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsInline"
#define WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey @"WebKitAllowsInlineMediaPlaybackAfterFullscreen"
#define WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey @"InlineMediaPlaybackRequiresPlaysInlineAttribute"
-#define WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey @"AllowsInlineMediaPlaybackWithPlaysInlineAttribute"
-#define WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey @"AllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute"
#define WebKitInvisibleAutoplayNotPermittedKey @"InvisibleAutoplayNotPermitted"
#define WebKitAllowsPictureInPictureMediaPlaybackPreferenceKey @"WebKitAllowsPictureInPictureMediaPlayback"
#define WebKitAllowsAirPlayForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsAirPlay"
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (203483 => 203484)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-07-21 00:45:39 UTC (rev 203484)
@@ -525,9 +525,7 @@
#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 @@
[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 @@
[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];
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (203483 => 203484)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-07-21 00:45:39 UTC (rev 203484)
@@ -265,12 +265,6 @@
- (void)setInlineMediaPlaybackRequiresPlaysInlineAttribute:(BOOL)flag;
- (BOOL)inlineMediaPlaybackRequiresPlaysInlineAttribute;
-- (void)setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)flag;
-- (BOOL)allowsInlineMediaPlaybackWithPlaysInlineAttribute;
-
-- (void)setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:(BOOL)flag;
-- (BOOL)allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
-
- (void)setInvisibleAutoplayNotPermitted:(BOOL)flag;
- (BOOL)invisibleAutoplayNotPermitted;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (203483 => 203484)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-07-21 00:45:39 UTC (rev 203484)
@@ -2349,8 +2349,6 @@
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]);
Modified: trunk/Source/WebKit2/ChangeLog (203483 => 203484)
--- trunk/Source/WebKit2/ChangeLog 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-21 00:45:39 UTC (rev 203484)
@@ -1,3 +1,18 @@
+2016-07-20 Commit Queue <commit-qu...@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.fra...@apple.com>
REGRESSION (r203189): Webpage snapshots are partially or fully blank when edge swiping back
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (203483 => 203484)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-07-21 00:45:39 UTC (rev 203484)
@@ -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
@@ -157,8 +153,6 @@
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, "", "") \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (203483 => 203484)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-07-21 00:45:39 UTC (rev 203484)
@@ -803,26 +803,6 @@
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);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (203483 => 203484)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-07-21 00:45:39 UTC (rev 203484)
@@ -195,14 +195,6 @@
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);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (203483 => 203484)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-07-21 00:45:39 UTC (rev 203484)
@@ -456,8 +456,6 @@
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)));
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (203483 => 203484)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-07-21 00:45:39 UTC (rev 203484)
@@ -108,8 +108,6 @@
BOOL _alwaysRunsAtForegroundPriority;
BOOL _allowsInlineMediaPlayback;
BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute;
- BOOL _allowsInlineMediaPlaybackWithPlaysInlineAttribute;
- BOOL _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
BOOL _allowsInlineMediaPlaybackAfterFullscreen;
#endif
@@ -140,8 +138,6 @@
_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 @@
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 @@
_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;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (203483 => 203484)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-07-21 00:45:39 UTC (rev 203484)
@@ -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));
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (203483 => 203484)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-07-21 00:36:12 UTC (rev 203483)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-07-21 00:45:39 UTC (rev 203484)
@@ -2986,8 +2986,6 @@
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)
