author | Kaku Kuo <tkuo@mozilla.com> |
Wed, 25 May 2016 20:12:27 +0800 | |
changeset 299190 | ebb8ec09a40a70d92416be63f08a7fed6c3a556b |
parent 299189 | ff7e1d26cbea646a2011600ef8f4a36d9a507ae9 |
child 299191 | 062491c6264039e58c2b300997ba9eef23dbc59a |
push id | 30291 |
push user | ryanvm@gmail.com |
push date | Fri, 27 May 2016 01:45:30 +0000 |
treeherder | mozilla-central@4d63dde701b4 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | padenot, jesup |
bugs | 1275541 |
milestone | 49.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/media/MediaStreamGraph.h +++ b/dom/media/MediaStreamGraph.h @@ -515,16 +515,23 @@ struct TrackBound * the DOM wrappers must keep upstream MediaStreams alive as long as they * could be being used in the media graph. * * At any time, however, a set of MediaStream wrappers could be * collected via cycle collection. Destroy messages will be sent * for those objects in arbitrary order and the MediaStreamGraph has to be able * to handle this. */ + +// GetCurrentTime is defined in winbase.h as zero argument macro forwarding to +// GetTickCount() and conflicts with MediaStream::GetCurrentTime. +#ifdef GetCurrentTime +#undef GetCurrentTime +#endif + class MediaStream : public mozilla::LinkedListElement<MediaStream> { public: NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaStream) explicit MediaStream(DOMMediaStream* aWrapper); protected: