Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(298)

Side by Side Diff: third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.cpp

Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, Google Inc. All rights reserved. 2 * Copyright (C) 2011, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 15 matching lines...) Expand all
26 #include "core/dom/CrossThreadTask.h" 26 #include "core/dom/CrossThreadTask.h"
27 #include "core/frame/ConsoleTypes.h" 27 #include "core/frame/ConsoleTypes.h"
28 #include "core/html/HTMLMediaElement.h" 28 #include "core/html/HTMLMediaElement.h"
29 #include "core/inspector/ConsoleMessage.h" 29 #include "core/inspector/ConsoleMessage.h"
30 #include "modules/webaudio/AbstractAudioContext.h" 30 #include "modules/webaudio/AbstractAudioContext.h"
31 #include "modules/webaudio/AudioNodeOutput.h" 31 #include "modules/webaudio/AudioNodeOutput.h"
32 #include "platform/Logging.h" 32 #include "platform/Logging.h"
33 #include "platform/audio/AudioUtilities.h" 33 #include "platform/audio/AudioUtilities.h"
34 #include "platform/weborigin/SecurityOrigin.h" 34 #include "platform/weborigin/SecurityOrigin.h"
35 #include "wtf/Locker.h" 35 #include "wtf/Locker.h"
36 #include "wtf/MainThread.h"
37 36
38 namespace blink { 37 namespace blink {
39 38
40 MediaElementAudioSourceHandler::MediaElementAudioSourceHandler(AudioNode& node, HTMLMediaElement& mediaElement) 39 MediaElementAudioSourceHandler::MediaElementAudioSourceHandler(AudioNode& node, HTMLMediaElement& mediaElement)
41 : AudioHandler(NodeTypeMediaElementAudioSource, node, node.context()->sample Rate()) 40 : AudioHandler(NodeTypeMediaElementAudioSource, node, node.context()->sample Rate())
42 , m_mediaElement(mediaElement) 41 , m_mediaElement(mediaElement)
43 , m_sourceNumberOfChannels(0) 42 , m_sourceNumberOfChannels(0)
44 , m_sourceSampleRate(0) 43 , m_sourceSampleRate(0)
45 , m_passesCurrentSrcCORSAccessCheck(passesCurrentSrcCORSAccessCheck(mediaEle ment.currentSrc())) 44 , m_passesCurrentSrcCORSAccessCheck(passesCurrentSrcCORSAccessCheck(mediaEle ment.currentSrc()))
46 , m_maybePrintCORSMessage(!m_passesCurrentSrcCORSAccessCheck) 45 , m_maybePrintCORSMessage(!m_passesCurrentSrcCORSAccessCheck)
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 mediaElementAudioSourceHandler().lock(); 245 mediaElementAudioSourceHandler().lock();
247 } 246 }
248 247
249 void MediaElementAudioSourceNode::unlock() 248 void MediaElementAudioSourceNode::unlock()
250 { 249 {
251 mediaElementAudioSourceHandler().unlock(); 250 mediaElementAudioSourceHandler().unlock();
252 } 251 }
253 252
254 } // namespace blink 253 } // namespace blink
255 254
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698