| Index: third_party/WebKit/Source/modules/webaudio/BaseAudioContextTest.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webaudio/BaseAudioContextTest.cpp b/third_party/WebKit/Source/modules/webaudio/BaseAudioContextTest.cpp
|
| index 1eecc8a7ebebaf2beb07897a427e283e83a75223..0dba8a36e058decc923a61317cf976f8027951f0 100644
|
| --- a/third_party/WebKit/Source/modules/webaudio/BaseAudioContextTest.cpp
|
| +++ b/third_party/WebKit/Source/modules/webaudio/BaseAudioContextTest.cpp
|
| @@ -13,10 +13,12 @@
|
| #include "core/loader/DocumentLoader.h"
|
| #include "core/loader/EmptyClients.h"
|
| #include "core/testing/DummyPageHolder.h"
|
| +#include "modules/webaudio/AudioContextOptions.h"
|
| #include "platform/UserGestureIndicator.h"
|
| #include "platform/testing/HistogramTester.h"
|
| #include "platform/testing/TestingPlatformSupport.h"
|
| #include "public/platform/WebAudioDevice.h"
|
| +#include "public/platform/WebAudioLatencyHint.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace blink {
|
| @@ -47,30 +49,34 @@ class MockCrossOriginFrameLoaderClient final : public EmptyFrameLoaderClient {
|
|
|
| class MockWebAudioDevice : public WebAudioDevice {
|
| public:
|
| - explicit MockWebAudioDevice(double sampleRate) : m_sampleRate(sampleRate) {}
|
| + explicit MockWebAudioDevice(double sampleRate, int framesPerBuffer)
|
| + : m_sampleRate(sampleRate), m_framesPerBuffer(framesPerBuffer) {}
|
| ~MockWebAudioDevice() override = default;
|
|
|
| void start() override {}
|
| void stop() override {}
|
| double sampleRate() override { return m_sampleRate; }
|
| + int framesPerBuffer() override { return m_framesPerBuffer; }
|
|
|
| private:
|
| double m_sampleRate;
|
| + int m_framesPerBuffer;
|
| };
|
|
|
| class BaseAudioContextTestPlatform : public TestingPlatformSupport {
|
| public:
|
| - WebAudioDevice* createAudioDevice(size_t bufferSize,
|
| - unsigned numberOfInputChannels,
|
| + WebAudioDevice* createAudioDevice(unsigned numberOfInputChannels,
|
| unsigned numberOfChannels,
|
| - double sampleRate,
|
| + const WebAudioLatencyHint& latencyHint,
|
| WebAudioDevice::RenderCallback*,
|
| const WebString& deviceId,
|
| const WebSecurityOrigin&) override {
|
| - return new MockWebAudioDevice(sampleRate);
|
| + return new MockWebAudioDevice(audioHardwareSampleRate(),
|
| + audioHardwareBufferSize());
|
| }
|
|
|
| double audioHardwareSampleRate() override { return 44100; }
|
| + size_t audioHardwareBufferSize() override { return 128; }
|
| };
|
|
|
| } // anonymous namespace
|
| @@ -128,8 +134,8 @@ class BaseAudioContextTest : public ::testing::Test {
|
| TEST_F(BaseAudioContextTest, AutoplayMetrics_NoRestriction) {
|
| HistogramTester histogramTester;
|
|
|
| - BaseAudioContext* audioContext =
|
| - BaseAudioContext::create(document(), ASSERT_NO_EXCEPTION);
|
| + BaseAudioContext* audioContext = BaseAudioContext::create(
|
| + document(), AudioContextOptions(), ASSERT_NO_EXCEPTION);
|
| recordAutoplayStatus(audioContext);
|
|
|
| histogramTester.expectTotalCount(kCrossOriginMetric, 0);
|
| @@ -140,8 +146,8 @@ TEST_F(BaseAudioContextTest, AutoplayMetrics_CreateNoGesture) {
|
| createChildFrame();
|
| childDocument().settings()->setMediaPlaybackRequiresUserGesture(true);
|
|
|
| - BaseAudioContext* audioContext =
|
| - BaseAudioContext::create(childDocument(), ASSERT_NO_EXCEPTION);
|
| + BaseAudioContext* audioContext = BaseAudioContext::create(
|
| + childDocument(), AudioContextOptions(), ASSERT_NO_EXCEPTION);
|
| recordAutoplayStatus(audioContext);
|
|
|
| histogramTester.expectBucketCount(kCrossOriginMetric,
|
| @@ -156,8 +162,8 @@ TEST_F(BaseAudioContextTest, AutoplayMetrics_CallResumeNoGesture) {
|
|
|
| ScriptState::Scope scope(getScriptStateFrom(childDocument()));
|
|
|
| - BaseAudioContext* audioContext =
|
| - BaseAudioContext::create(childDocument(), ASSERT_NO_EXCEPTION);
|
| + BaseAudioContext* audioContext = BaseAudioContext::create(
|
| + childDocument(), AudioContextOptions(), ASSERT_NO_EXCEPTION);
|
| audioContext->resumeContext(getScriptStateFrom(childDocument()));
|
| rejectPendingResolvers(audioContext);
|
| recordAutoplayStatus(audioContext);
|
| @@ -175,8 +181,8 @@ TEST_F(BaseAudioContextTest, AutoplayMetrics_CreateGesture) {
|
| UserGestureIndicator userGestureScope(DocumentUserGestureToken::create(
|
| &childDocument(), UserGestureToken::NewGesture));
|
|
|
| - BaseAudioContext* audioContext =
|
| - BaseAudioContext::create(childDocument(), ASSERT_NO_EXCEPTION);
|
| + BaseAudioContext* audioContext = BaseAudioContext::create(
|
| + childDocument(), AudioContextOptions(), ASSERT_NO_EXCEPTION);
|
| recordAutoplayStatus(audioContext);
|
|
|
| histogramTester.expectBucketCount(kCrossOriginMetric,
|
| @@ -191,8 +197,8 @@ TEST_F(BaseAudioContextTest, AutoplayMetrics_CallResumeGesture) {
|
|
|
| ScriptState::Scope scope(getScriptStateFrom(childDocument()));
|
|
|
| - BaseAudioContext* audioContext =
|
| - BaseAudioContext::create(childDocument(), ASSERT_NO_EXCEPTION);
|
| + BaseAudioContext* audioContext = BaseAudioContext::create(
|
| + childDocument(), AudioContextOptions(), ASSERT_NO_EXCEPTION);
|
|
|
| UserGestureIndicator userGestureScope(DocumentUserGestureToken::create(
|
| &childDocument(), UserGestureToken::NewGesture));
|
| @@ -211,8 +217,8 @@ TEST_F(BaseAudioContextTest, AutoplayMetrics_NodeStartNoGesture) {
|
| createChildFrame();
|
| childDocument().settings()->setMediaPlaybackRequiresUserGesture(true);
|
|
|
| - BaseAudioContext* audioContext =
|
| - BaseAudioContext::create(childDocument(), ASSERT_NO_EXCEPTION);
|
| + BaseAudioContext* audioContext = BaseAudioContext::create(
|
| + childDocument(), AudioContextOptions(), ASSERT_NO_EXCEPTION);
|
| audioContext->maybeRecordStartAttempt();
|
| recordAutoplayStatus(audioContext);
|
|
|
| @@ -226,8 +232,8 @@ TEST_F(BaseAudioContextTest, AutoplayMetrics_NodeStartGesture) {
|
| createChildFrame();
|
| childDocument().settings()->setMediaPlaybackRequiresUserGesture(true);
|
|
|
| - BaseAudioContext* audioContext =
|
| - BaseAudioContext::create(childDocument(), ASSERT_NO_EXCEPTION);
|
| + BaseAudioContext* audioContext = BaseAudioContext::create(
|
| + childDocument(), AudioContextOptions(), ASSERT_NO_EXCEPTION);
|
|
|
| UserGestureIndicator userGestureScope(DocumentUserGestureToken::create(
|
| &childDocument(), UserGestureToken::NewGesture));
|
| @@ -246,8 +252,8 @@ TEST_F(BaseAudioContextTest, AutoplayMetrics_NodeStartNoGestureThenSuccess) {
|
|
|
| ScriptState::Scope scope(getScriptStateFrom(childDocument()));
|
|
|
| - BaseAudioContext* audioContext =
|
| - BaseAudioContext::create(childDocument(), ASSERT_NO_EXCEPTION);
|
| + BaseAudioContext* audioContext = BaseAudioContext::create(
|
| + childDocument(), AudioContextOptions(), ASSERT_NO_EXCEPTION);
|
| audioContext->maybeRecordStartAttempt();
|
|
|
| UserGestureIndicator userGestureScope(DocumentUserGestureToken::create(
|
| @@ -268,8 +274,8 @@ TEST_F(BaseAudioContextTest, AutoplayMetrics_NodeStartGestureThenSucces) {
|
|
|
| ScriptState::Scope scope(getScriptStateFrom(childDocument()));
|
|
|
| - BaseAudioContext* audioContext =
|
| - BaseAudioContext::create(childDocument(), ASSERT_NO_EXCEPTION);
|
| + BaseAudioContext* audioContext = BaseAudioContext::create(
|
| + childDocument(), AudioContextOptions(), ASSERT_NO_EXCEPTION);
|
|
|
| UserGestureIndicator userGestureScope(DocumentUserGestureToken::create(
|
| &childDocument(), UserGestureToken::NewGesture));
|
|
|