зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1374596: P3. Fix MediaStream* headers. r=padenot
MozReview-Commit-ID: 5dIPrLqxUtm --HG-- extra : rebase_source : d672119a7805738e6f04bf0691d2f9afce509757
This commit is contained in:
Родитель
9346079e8d
Коммит
b930da7f1c
|
@ -8,6 +8,7 @@
|
|||
#include "gfxPlatform.h"
|
||||
#include "ImageContainer.h"
|
||||
#include "MediaStreamGraph.h"
|
||||
#include "MediaStreamListener.h"
|
||||
#include "mozilla/dom/CanvasCaptureMediaStreamBinding.h"
|
||||
#include "mozilla/gfx/2D.h"
|
||||
#include "mozilla/Atomics.h"
|
||||
|
|
|
@ -23,9 +23,11 @@
|
|||
#include "mozilla/dom/HTMLCanvasElement.h"
|
||||
#include "mozilla/media/MediaUtils.h"
|
||||
#include "MediaStreamGraph.h"
|
||||
#include "AudioCaptureStream.h"
|
||||
#include "AudioStreamTrack.h"
|
||||
#include "VideoStreamTrack.h"
|
||||
#include "Layers.h"
|
||||
#include "MediaStreamListener.h"
|
||||
|
||||
// GetCurrentTime is defined in winbase.h as zero argument macro forwarding to
|
||||
// GetTickCount() and conflicts with NS_DECL_NSIDOMMEDIASTREAM, containing
|
||||
|
|
|
@ -7,8 +7,10 @@
|
|||
|
||||
#include "DOMMediaStream.h"
|
||||
#include "MediaStreamGraph.h"
|
||||
#include "nsContentUtils.h"
|
||||
#include "nsIUUIDGenerator.h"
|
||||
#include "nsServiceManagerUtils.h"
|
||||
#include "MediaStreamError.h"
|
||||
#include "MediaStreamListener.h"
|
||||
#include "systemservices/MediaUtils.h"
|
||||
|
||||
|
@ -21,6 +23,8 @@
|
|||
static mozilla::LazyLogModule gMediaStreamTrackLog("MediaStreamTrack");
|
||||
#define LOG(type, msg) MOZ_LOG(gMediaStreamTrackLog, type, msg)
|
||||
|
||||
using namespace mozilla::media;
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче