Changeset 279487 in webkit

Timestamp:

Jul 1, 2021, 5:08:31 PM (5 years ago)

Author:

eric.carlson@apple.com

Message:

WebAudio auto-play policy should come from top document
​https://bugs.webkit.org/show_bug.cgi?id=227593
rdar://76920375

Reviewed by Chris Dumez.

Source/WebCore:

Tests: media/auto-play-video-in-about-blank-iframe.html

media/auto-play-web-audio-in-about-blank-iframe.html

• Modules/webaudio/AudioContext.cpp:

(WebCore::AudioContext::constructCommon): Get auto-play policy from document()->topDocument().

• testing/Internals.cpp:

(WebCore::Internals::setDocumentAutoplayPolicy): New method to test auto-play policy.

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

• media/auto-play-video-in-about-blank-iframe-expected.txt: Added.
• media/auto-play-video-in-about-blank-iframe.html: Added.
• media/auto-play-web-audio-in-about-blank-iframe-expected.txt: Added.
• media/auto-play-web-audio-in-about-blank-iframe.html: Added.

• media/video-test.js:

(waitForEventWithTimeout): Return event.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/auto-play-video-in-about-blank-iframe-expected.txt (added)
• LayoutTests/media/auto-play-video-in-about-blank-iframe.html (added)
• LayoutTests/media/auto-play-web-audio-in-about-blank-iframe-expected.txt (added)
• LayoutTests/media/auto-play-web-audio-in-about-blank-iframe.html (added)
• LayoutTests/media/video-test.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webaudio/AudioContext.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (2 diffs)
• Source/WebCore/testing/Internals.idl (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-07-01  Eric Carlson  <eric.carlson@apple.com>
+
+        WebAudio auto-play policy should come from top document
+        https://bugs.webkit.org/show_bug.cgi?id=227593
+        rdar://76920375
+
+        Reviewed by Chris Dumez.
+
+        * media/auto-play-video-in-about-blank-iframe-expected.txt: Added.
+        * media/auto-play-video-in-about-blank-iframe.html: Added.
+        * media/auto-play-web-audio-in-about-blank-iframe-expected.txt: Added.
+        * media/auto-play-web-audio-in-about-blank-iframe.html: Added.
+
+        * media/video-test.js:
+        (waitForEventWithTimeout): Return event.
+
 2021-07-01  Cameron McCormack  <heycam@apple.com>
 

trunk/LayoutTests/media/video-test.js

@@ -214 +214 @@
         
         consoleWrite(`EVENT(${result.type})`);
-        Promise.resolve(result);
+        return Promise.resolve(result);
     });
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-07-01  Eric Carlson  <eric.carlson@apple.com>
+
+        WebAudio auto-play policy should come from top document
+        https://bugs.webkit.org/show_bug.cgi?id=227593
+        rdar://76920375
+
+        Reviewed by Chris Dumez.
+
+        Tests: media/auto-play-video-in-about-blank-iframe.html
+               media/auto-play-web-audio-in-about-blank-iframe.html
+
+        * Modules/webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::constructCommon): Get auto-play policy from document()->topDocument().
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::setDocumentAutoplayPolicy): New method to test auto-play policy.
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2021-07-01  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp

@@ -136 +136 @@
 {
     ASSERT(document());
-    if (document()->audioPlaybackRequiresUserGesture())
+    if (document()->topDocument().audioPlaybackRequiresUserGesture())
         addBehaviorRestriction(RequireUserGestureForAudioStartRestriction);
     else

trunk/Source/WebCore/testing/Internals.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
- * Copyright (C) 2013-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2021 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -6419 +6419 @@
 }
 
+ExceptionOr<void> Internals::setDocumentAutoplayPolicy(Document& document, Internals::AutoplayPolicy policy)
+{
+    static_assert(static_cast<uint8_t>(WebCore::AutoplayPolicy::Default) == static_cast<uint8_t>(Internals::AutoplayPolicy::Default), "Internals::Default != WebCore::Default");
+    static_assert(static_cast<uint8_t>(WebCore::AutoplayPolicy::Allow) == static_cast<uint8_t>(Internals::AutoplayPolicy::Allow), "Internals::Allow != WebCore::Allow");
+    static_assert(static_cast<uint8_t>(WebCore::AutoplayPolicy::AllowWithoutSound) == static_cast<uint8_t>(Internals::AutoplayPolicy::AllowWithoutSound), "Internals::AllowWithoutSound != WebCore::AllowWithoutSound");
+    static_assert(static_cast<uint8_t>(WebCore::AutoplayPolicy::Deny) == static_cast<uint8_t>(Internals::AutoplayPolicy::Deny), "Internals::Deny != WebCore::Deny");
+
+    auto* loader = document.loader();
+    if (!loader)
+        return Exception { InvalidStateError };
+
+    loader->setAutoplayPolicy(static_cast<WebCore::AutoplayPolicy>(policy));
+
+    return { };
+}
 
 } // namespace WebCore

trunk/Source/WebCore/testing/Internals.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
- * Copyright (C) 2013-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2021 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1170 +1170 @@
     String dumpStyleResolvers();
 
+    enum class AutoplayPolicy : uint8_t {
+        Default,
+        Allow,
+        AllowWithoutSound,
+        Deny,
+    };
+    ExceptionOr<void> setDocumentAutoplayPolicy(Document&, AutoplayPolicy);
+
 private:
     explicit Internals(Document&);

trunk/Source/WebCore/testing/Internals.idl

@@ -1 +1 @@
 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
- * Copyright (C) 2013-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2021 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -104 +104 @@
     "GPUStatusFailure",
     "Timeout"
+};
+
+enum AutoplayPolicy {
+    "Default",
+    "Allow",
+    "AllowWithoutSound",
+    "Deny"
 };
 
@@ -1039 +1046 @@
 
     DOMString dumpStyleResolvers();
-};
+
+    undefined setDocumentAutoplayPolicy(Document document, AutoplayPolicy policy);
+};