| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "modules/webaudio/BaseAudioContext.h" | 5 #include "modules/webaudio/BaseAudioContext.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/V8Binding.h" |
| 7 #include "core/dom/Document.h" | 8 #include "core/dom/Document.h" |
| 8 #include "core/dom/DocumentUserGestureToken.h" | 9 #include "core/dom/DocumentUserGestureToken.h" |
| 9 #include "core/frame/FrameOwner.h" | 10 #include "core/frame/FrameOwner.h" |
| 10 #include "core/frame/FrameTypes.h" | 11 #include "core/frame/FrameTypes.h" |
| 11 #include "core/frame/FrameView.h" | 12 #include "core/frame/FrameView.h" |
| 12 #include "core/frame/Settings.h" | 13 #include "core/frame/Settings.h" |
| 13 #include "core/loader/DocumentLoader.h" | 14 #include "core/loader/DocumentLoader.h" |
| 14 #include "core/loader/EmptyClients.h" | 15 #include "core/loader/EmptyClients.h" |
| 15 #include "core/testing/DummyPageHolder.h" | 16 #include "core/testing/DummyPageHolder.h" |
| 16 #include "modules/webaudio/AudioContextOptions.h" | 17 #include "modules/webaudio/AudioContextOptions.h" |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 | 107 |
| 107 childDocument().updateSecurityOrigin( | 108 childDocument().updateSecurityOrigin( |
| 108 SecurityOrigin::create("https", "cross-origin.com", 80)); | 109 SecurityOrigin::create("https", "cross-origin.com", 80)); |
| 109 } | 110 } |
| 110 | 111 |
| 111 Document& document() { return m_dummyPageHolder->document(); } | 112 Document& document() { return m_dummyPageHolder->document(); } |
| 112 | 113 |
| 113 Document& childDocument() { return *m_childFrame->document(); } | 114 Document& childDocument() { return *m_childFrame->document(); } |
| 114 | 115 |
| 115 ScriptState* getScriptStateFrom(const Document& document) { | 116 ScriptState* getScriptStateFrom(const Document& document) { |
| 116 return ScriptState::forMainWorld(document.frame()); | 117 return toScriptStateForMainWorld(document.frame()); |
| 117 } | 118 } |
| 118 | 119 |
| 119 void rejectPendingResolvers(BaseAudioContext* audioContext) { | 120 void rejectPendingResolvers(BaseAudioContext* audioContext) { |
| 120 audioContext->rejectPendingResolvers(); | 121 audioContext->rejectPendingResolvers(); |
| 121 } | 122 } |
| 122 | 123 |
| 123 void recordAutoplayStatus(BaseAudioContext* audioContext) { | 124 void recordAutoplayStatus(BaseAudioContext* audioContext) { |
| 124 audioContext->recordAutoplayStatus(); | 125 audioContext->recordAutoplayStatus(); |
| 125 } | 126 } |
| 126 | 127 |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 audioContext->resumeContext(getScriptStateFrom(childDocument())); | 284 audioContext->resumeContext(getScriptStateFrom(childDocument())); |
| 284 rejectPendingResolvers(audioContext); | 285 rejectPendingResolvers(audioContext); |
| 285 recordAutoplayStatus(audioContext); | 286 recordAutoplayStatus(audioContext); |
| 286 | 287 |
| 287 histogramTester.expectBucketCount(kCrossOriginMetric, | 288 histogramTester.expectBucketCount(kCrossOriginMetric, |
| 288 AutoplayStatus::AutoplayStatusSucceeded, 1); | 289 AutoplayStatus::AutoplayStatusSucceeded, 1); |
| 289 histogramTester.expectTotalCount(kCrossOriginMetric, 1); | 290 histogramTester.expectTotalCount(kCrossOriginMetric, 1); |
| 290 } | 291 } |
| 291 | 292 |
| 292 } // namespace blink | 293 } // namespace blink |
| OLD | NEW |