Bug 1374596: P5. Fix MediaDecoder* headers. r=padenot

MozReview-Commit-ID: AjSjYXXcutJ

--HG--
extra : rebase_source : 13705fb658bdfa6e98884f9e1ab142355aab399d

dom/media/MediaDecoder.cpp

@@ -44,6 +44,12 @@ using namespace mozilla::media;
 
 namespace mozilla {
 
+// GetCurrentTime is defined in winbase.h as zero argument macro forwarding to
+// GetTickCount() and conflicts with MediaDecoder::GetCurrentTime implementation.
+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
+
 // avoid redefined macro in unified build
 #undef LOG
 #undef DUMP

dom/media/MediaDecoderReader.cpp

@@ -14,6 +14,8 @@
 #include "nsPrintfCString.h"
 #include "mozilla/mozalloc.h"
 #include "mozilla/Mutex.h"
+#include "mozilla/SharedThreadPool.h"
+#include "mozilla/TaskQueue.h"
 #include <stdint.h>
 #include <algorithm>
 

dom/media/MediaDecoderReader.h

@@ -26,6 +26,7 @@ namespace mozilla {
 
 class CDMProxy;
 class MediaDecoderReader;
+class TaskQueue;
 
 struct WaitForDataRejectValue
 {