We need to reimplement a MediaResource for Servo, so to facilitate that, I need to move the definitions related to Necko channels out of MediaResource.h into their own headers, as we don't want to be including Necko in Servo.

Comment on attachment 8915259 [details] Bug 1405697 - Move MediaChannelStatistics to its own file. https://reviewboard.mozilla.org/r/186482/#review191760

Comment on attachment 8915260 [details] Bug 1405697 - Move ChannelSuspendAgent to ChannelMediaResource.h. https://reviewboard.mozilla.org/r/186484/#review191762

Comment on attachment 8915261 [details] Bug 1405697 - Move HTTP_REQUESTED_RANGE_NOT_SATISFIABLE_CODE to the file it's used in. https://reviewboard.mozilla.org/r/186486/#review191764

Comment on attachment 8915262 [details] Bug 1405697 - Move SEEK_VS_READ_THRESHOLD to where it's used. https://reviewboard.mozilla.org/r/186488/#review191766

Comment on attachment 8915263 [details] Bug 1405697 - Move BaseMediaResource declaration to its own file. https://reviewboard.mozilla.org/r/186490/#review191768 ::: dom/media/BaseMediaResource.h:20 (Diff revision 3) > + > +class nsIPrincipal; > + > +namespace mozilla { > + > +class BaseMediaResource : public MediaResource It would be nice to preserve the history when moving code. ::: dom/media/MediaResource.h:15 (Diff revision 3) > -#include "MediaResourceCallback.h" > -#include "mozilla/Atomics.h" > #include "mozilla/Attributes.h" > -#include "mozilla/TimeStamp.h" > +#include "mozilla/GuardObjects.h" > #include "mozilla/UniquePtr.h" > +#include "nsISeekableStream.h" I think this is used by FileMediaResource only.

Comment on attachment 8915264 [details] Bug 1405697 - Move BaseMediaResource implementation into cpp file. https://reviewboard.mozilla.org/r/186492/#review191770

Comment on attachment 8915265 [details] Bug 1405697 - Move MediaResourceIndex implementation to MediaResource.cpp. https://reviewboard.mozilla.org/r/186496/#review191772

Comment on attachment 8915489 [details] Bug 1405697 - Move MediaPrefs include from MediaResource.h into cpp file. https://reviewboard.mozilla.org/r/186706/#review191774 Comfortable level has been increased.

(In reply to JW Wang [:jwwang] [:jw_wang] from comment #27) > ::: dom/media/MediaResource.h:15 > (Diff revision 3) > > -#include "MediaResourceCallback.h" > > -#include "mozilla/Atomics.h" > > #include "mozilla/Attributes.h" > > -#include "mozilla/TimeStamp.h" > > +#include "mozilla/GuardObjects.h" > > #include "mozilla/UniquePtr.h" > > +#include "nsISeekableStream.h" > > I think this is used by FileMediaResource only. MediaResourceIndex::Seek() uses nsISeekableStream defines.

Comment on attachment 8915263 [details] Bug 1405697 - Move BaseMediaResource declaration to its own file. https://reviewboard.mozilla.org/r/186490/#review191768 > It would be nice to preserve the history when moving code. Good idea, done. Thanks!

Pushed by cpearce@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/44b026781b82 Move MediaChannelStatistics to its own file. r=jwwang https://hg.mozilla.org/integration/autoland/rev/62643787da2b Move ChannelSuspendAgent to ChannelMediaResource.h. r=jwwang https://hg.mozilla.org/integration/autoland/rev/d626833c3f4c Move HTTP_REQUESTED_RANGE_NOT_SATISFIABLE_CODE to the file it's used in. r=jwwang https://hg.mozilla.org/integration/autoland/rev/34e8c0b24dda Move SEEK_VS_READ_THRESHOLD to where it's used. r=jwwang https://hg.mozilla.org/integration/autoland/rev/a27f0f4180ef Move BaseMediaResource declaration to its own file. r=jwwang https://hg.mozilla.org/integration/autoland/rev/fb6818a58e11 Move BaseMediaResource implementation into cpp file. r=jwwang https://hg.mozilla.org/integration/autoland/rev/24f895e73649 Move MediaResourceIndex implementation to MediaResource.cpp. r=jwwang https://hg.mozilla.org/integration/autoland/rev/c82b0e52307c Move MediaPrefs include from MediaResource.h into cpp file. r=jwwang

https://hg.mozilla.org/mozilla-central/rev/44b026781b82 https://hg.mozilla.org/mozilla-central/rev/62643787da2b https://hg.mozilla.org/mozilla-central/rev/d626833c3f4c https://hg.mozilla.org/mozilla-central/rev/34e8c0b24dda https://hg.mozilla.org/mozilla-central/rev/a27f0f4180ef https://hg.mozilla.org/mozilla-central/rev/fb6818a58e11 https://hg.mozilla.org/mozilla-central/rev/24f895e73649 https://hg.mozilla.org/mozilla-central/rev/c82b0e52307c