mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-04 13:07:52 +00:00
Bug 734784 - Clean up some include lists in content/media. r=cpearce
This commit is contained in:
parent
a2a33010c6
commit
363f0bdf7a
@ -37,9 +37,6 @@
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nsISeekableStream.h"
|
||||
#include "nsClassHashtable.h"
|
||||
#include "nsTArray.h"
|
||||
#include "nsBuiltinDecoder.h"
|
||||
#include "nsBuiltinDecoderReader.h"
|
||||
#include "nsBuiltinDecoderStateMachine.h"
|
||||
|
@ -40,16 +40,10 @@
|
||||
#define nsBuiltinDecoderReader_h_
|
||||
|
||||
#include <nsDeque.h>
|
||||
#include "Layers.h"
|
||||
#include "ImageLayers.h"
|
||||
#include "nsClassHashtable.h"
|
||||
#include "mozilla/TimeStamp.h"
|
||||
#include "nsSize.h"
|
||||
#include "nsRect.h"
|
||||
#include "mozilla/ReentrantMonitor.h"
|
||||
|
||||
class nsBuiltinDecoderStateMachine;
|
||||
|
||||
// Stores info relevant to presenting media frames.
|
||||
class nsVideoInfo {
|
||||
public:
|
||||
|
@ -39,20 +39,8 @@
|
||||
#include "nsMediaDecoder.h"
|
||||
#include "MediaResource.h"
|
||||
|
||||
#include "prlog.h"
|
||||
#include "prmem.h"
|
||||
#include "nsIFrame.h"
|
||||
#include "nsIDocument.h"
|
||||
#include "nsThreadUtils.h"
|
||||
#include "nsIDOMHTMLMediaElement.h"
|
||||
#include "nsNetUtil.h"
|
||||
#include "nsHTMLMediaElement.h"
|
||||
#include "gfxContext.h"
|
||||
#include "nsPresContext.h"
|
||||
#include "nsDOMError.h"
|
||||
#include "nsDisplayList.h"
|
||||
#include "nsSVGEffects.h"
|
||||
#include "VideoUtils.h"
|
||||
|
||||
using namespace mozilla;
|
||||
|
||||
|
@ -38,22 +38,16 @@
|
||||
#if !defined(nsMediaDecoder_h_)
|
||||
#define nsMediaDecoder_h_
|
||||
|
||||
#include "mozilla/XPCOM.h"
|
||||
|
||||
#include "nsIPrincipal.h"
|
||||
#include "nsSize.h"
|
||||
#include "prlog.h"
|
||||
#include "gfxContext.h"
|
||||
#include "gfxRect.h"
|
||||
#include "nsITimer.h"
|
||||
#include "ImageLayers.h"
|
||||
#include "mozilla/ReentrantMonitor.h"
|
||||
#include "nsIMemoryReporter.h"
|
||||
#include "VideoFrameContainer.h"
|
||||
|
||||
class nsHTMLMediaElement;
|
||||
class nsIStreamListener;
|
||||
class nsTimeRanges;
|
||||
class nsIMemoryReporter;
|
||||
class nsIPrincipal;
|
||||
class nsITimer;
|
||||
|
||||
namespace mozilla {
|
||||
class MediaResource;
|
||||
|
@ -36,7 +36,6 @@
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#include "nsError.h"
|
||||
#include "nsBuiltinDecoderStateMachine.h"
|
||||
#include "nsBuiltinDecoder.h"
|
||||
#include "MediaResource.h"
|
||||
#include "nsWaveReader.h"
|
||||
|
@ -40,7 +40,8 @@
|
||||
|
||||
#include "nsBuiltinDecoderReader.h"
|
||||
|
||||
class nsMediaDecoder;
|
||||
class nsBuiltinDecoder;
|
||||
class nsTimeRanges;
|
||||
|
||||
class nsWaveReader : public nsBuiltinDecoderReader
|
||||
{
|
||||
|
@ -41,10 +41,15 @@
|
||||
#include "nsBuiltinDecoder.h"
|
||||
#include "MediaResource.h"
|
||||
#include "nsWebMReader.h"
|
||||
#include "nsWebMBufferedParser.h"
|
||||
#include "VideoUtils.h"
|
||||
#include "nsTimeRanges.h"
|
||||
#include "mozilla/Preferences.h"
|
||||
|
||||
#define VPX_DONT_DEFINE_STDINT_TYPES
|
||||
#include "vpx/vp8dx.h"
|
||||
#include "vpx/vpx_decoder.h"
|
||||
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::layers;
|
||||
|
||||
|
@ -43,13 +43,11 @@
|
||||
|
||||
#include "nsDeque.h"
|
||||
#include "nsBuiltinDecoderReader.h"
|
||||
#include "nsWebMBufferedParser.h"
|
||||
#include "nsAutoRef.h"
|
||||
#include "nestegg/nestegg.h"
|
||||
|
||||
#define VPX_DONT_DEFINE_STDINT_TYPES
|
||||
#include "vpx/vpx_decoder.h"
|
||||
#include "vpx/vp8dx.h"
|
||||
#include "vpx/vpx_codec.h"
|
||||
|
||||
#ifdef MOZ_TREMOR
|
||||
#include "tremor/ivorbiscodec.h"
|
||||
@ -57,7 +55,7 @@
|
||||
#include "vorbis/codec.h"
|
||||
#endif
|
||||
|
||||
class nsMediaDecoder;
|
||||
class nsWebMBufferedState;
|
||||
|
||||
// Holds a nestegg_packet, and its file offset. This is needed so we
|
||||
// know the offset in the file we've played up to, in order to calculate
|
||||
|
Loading…
x
Reference in New Issue
Block a user