Diff
Added: trunk/LayoutTests/media/video-playsinline-expected.txt (0 => 202660)
--- trunk/LayoutTests/media/video-playsinline-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-playsinline-expected.txt 2016-06-30 00:12:07 UTC (rev 202660)
@@ -0,0 +1,26 @@
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
+RUN(video.playsinline = false)
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
+RUN(video.playsinline = true)
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
+RUN(video.playsinline = false)
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
+RUN(video.playsinline = true)
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
+END OF TEST
+
Added: trunk/LayoutTests/media/video-playsinline.html (0 => 202660)
--- trunk/LayoutTests/media/video-playsinline.html (rev 0)
+++ trunk/LayoutTests/media/video-playsinline.html 2016-06-30 00:12:07 UTC (rev 202660)
@@ -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, hasPlaysInline, expectedDisplayingFullscreen)
+{
+ 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);
+ 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
Added: trunk/LayoutTests/media/video-webkit-playsinline-expected.txt (0 => 202660)
--- trunk/LayoutTests/media/video-webkit-playsinline-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-webkit-playsinline-expected.txt 2016-06-30 00:12:07 UTC (rev 202660)
@@ -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 => 202660)
--- trunk/LayoutTests/media/video-webkit-playsinline.html (rev 0)
+++ trunk/LayoutTests/media/video-webkit-playsinline.html 2016-06-30 00:12:07 UTC (rev 202660)
@@ -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 (202659 => 202660)
--- trunk/Source/WebCore/ChangeLog 2016-06-29 23:59:35 UTC (rev 202659)
+++ trunk/Source/WebCore/ChangeLog 2016-06-30 00:12:07 UTC (rev 202660)
@@ -1,3 +1,23 @@
+2016-06-29 Jer Noble <[email protected]>
+
+ Unprefix webkit-playsinline.
+ https://bugs.webkit.org/show_bug.cgi?id=159283
+
+ Reviewed by Eric Carlson.
+
+ Tests: media/video-playsinline.html
+ media/video-webkit-playsinline.html
+
+ Unprefix the webkit-playsinline content attribute, as an unprefixed version
+ was added to the HTML spec by <https://github.com/whatwg/html/pull/1444>.
+ The new 'playsinline' content attribute reflects to a new DOM property of
+ the same name.
+
+ * html/HTMLAttributeNames.in:
+ * html/HTMLVideoElement.idl:
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::requiresFullscreenForVideoPlayback):
+
2016-06-29 Alex Christensen <[email protected]>
Fix null dereferencing after r201441
Modified: trunk/Source/WebCore/html/HTMLAttributeNames.in (202659 => 202660)
--- trunk/Source/WebCore/html/HTMLAttributeNames.in 2016-06-29 23:59:35 UTC (rev 202659)
+++ trunk/Source/WebCore/html/HTMLAttributeNames.in 2016-06-30 00:12:07 UTC (rev 202660)
@@ -299,6 +299,7 @@
optimum
pattern
placeholder
+playsinline
pluginspage
pluginurl
ping
Modified: trunk/Source/WebCore/html/HTMLVideoElement.idl (202659 => 202660)
--- trunk/Source/WebCore/html/HTMLVideoElement.idl 2016-06-29 23:59:35 UTC (rev 202659)
+++ trunk/Source/WebCore/html/HTMLVideoElement.idl 2016-06-30 00:12:07 UTC (rev 202660)
@@ -33,6 +33,7 @@
readonly attribute unsigned long videoHeight;
[Reflect, URL] attribute DOMString poster;
+ [Reflect] attribute boolean playsinline;
readonly attribute boolean webkitSupportsFullscreen;
readonly attribute boolean webkitDisplayingFullscreen;
Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (202659 => 202660)
--- trunk/Source/WebCore/html/MediaElementSession.cpp 2016-06-29 23:59:35 UTC (rev 202659)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2016-06-30 00:12:07 UTC (rev 202660)
@@ -450,7 +450,7 @@
if (!settings || !settings->allowsInlineMediaPlayback())
return true;
- return settings->inlineMediaPlaybackRequiresPlaysInlineAttribute() && !element.fastHasAttribute(HTMLNames::webkit_playsinlineAttr);
+ return settings->inlineMediaPlaybackRequiresPlaysInlineAttribute() && !(element.fastHasAttribute(HTMLNames::webkit_playsinlineAttr) || element.fastHasAttribute(HTMLNames::playsinlineAttr));
}
bool MediaElementSession::allowsAutomaticMediaDataLoading(const HTMLMediaElement& element) const