mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
86a3aa0b54
- missing part of Bug 1165772: P1. (7311039be4) - missing gstreamer stuff (54a80d69b2) - Bug 1214208: Do not use MP3Decoder on B2G. r=alfredo (0a19e7946e) - Bug 1194014 - Remove redundant includes. r=jya (ccc3753113) - Bug 1039639 - Add support for Flac on Firefox OS. r=cajbir (7d76197e07) - Bug 875573 - Add video/x-m4v mime type. r=kentuckyfriedtakahe (6ec8af93e6) - cleanup (6fb3d5dd26) - Bug 1180621 - [FxOS] Enable VP9 codec for the Android version after KK. r=sotaro (58f7c2b657) - Bug 1187247: [MSE] P2. Enable WebM in MediaSource. r=jya (2df0ee1f7a) - Bug 1187247: [MSE] P1. Continue parsing MediaSegment if buffer starts with SimpleBlock/Block. r=kinetik (574475ed6f) - Bug 1217170: P1. Rename functions to explicitly reflect what they are doing. r=kentuckyfriedtakahe (70c81a8179) - Bug 1070216 - Split DOMMediaStream::InitStreamCommon into three. r=roc (1bda71cc88) - Bug 1215582 - Rename Blacklist to Block list in GStreamerFormatReader. r=gerald (4f08077f5e) - Bug 1170958 - Destroy track-locked MediaInputPorts when the track ends. r=roc (ff3922a2d6) - Bug 1070216 - constify DOMMediaStream::Get[Audio/Video]Tracks(). r=roc (ba09f6f191) - Bug 1070216 - Guard against adding a track owned by one MSG to a stream owned by another. r=padenot (a80deb8b30) - Bug 1070216 - Implement MediaStream constructors. r=smaug,jib,padenot (3403ef2599) - Bug 1070216 - Guard against a null MediaInputPort in DOMMediaStream::FindPlaybackDOMTrack(). r=roc (453a9ffbc1) - Bug 1212783 - Expose TrackPort in DOMMediaStream.h r=roc (fb61c79ae7) - Bug 1219711 - Ensure MediaStreamTrack.enabled propagates across peer connections. r=jesup (d9d1e54dae) - Bug 1129051 - Fix double free in Camera Control Listener. Fix webrtc memory leak. r=aosmond (3e9b3bccfd) - Bug 1152260 - Generate focused event for drivers that do not notify us when using continuous auto focus. r=mikeh (6c7bd42fdc) - Bug 1175656 - Implement generation of recording posters in Gecko. r=dhylands,bz (51b2c66dc7) - Bug 1187364 - Part 1. Add ability for camera to pause/resume recording. r=dhylands,bz (c54c735e37) - Bug 1187364 - Part 2. Ensure that recording is resumed with a key frame. r=mchiang (c1c6048982) - Bug 1187364 - Part 3. Fix missing end comment in WebIDL. r=me,bz (7faf106cc1) - Bug 1212783 - Add a MediaStreamTrack to DOMCameraControl. r=aosmond (91e11efd3a) - Bug 1124338 - Fix possible camera cached parameters invalidation from underlying driver modification. r=aosmond (dea67dc155) - Bug 1196330 - Do not restart preview if configuration is unchanged. r=dhylands (097644f5d9) - Bug 1215372 - Filter empty camera face detected events at gonk layer. r=dhylands (733efe50eb) - Bug 1179726 - Prefer lower resolutions than 4kuhd as the default video recording profile. r=dhylands (27c71273dc) - Bug 1222122 - Add picture size to verified parameters when reconfiguring the camera. r=dhylands (8c1fac6a4a) - Bug 1141267 - register CameraThread with profiler, r=aosmond (299592a024) - Bug 1008483 - removes the RW lock in CameraControlImpl and replaces it with a standard mutex. r=aosmond (45936cb90d) - Bug 1008483 - Part 2. Readd missing nsPrintfCString.h include which has broken some local builds. r=me (9dd84b0f19) - Bug 1191731 - Update poster API to allow application control over when poster is saved. r=bz, r=dhylands (73f9e7e0f4) - Bug 1155648 - Fix documentation for DOMMediaStream::OnTracksAvailable. r=jesup (702828c304) - Bug 1217170: [MSE] P2. Enable WebM/MSE on systems with no MP4/H264 support. r=kentuckyfriedtakahe (0b814b0708) - Bug 1213177: Enable WebM on machines where H264 HW decoding is disabled. r=kentuckyfriedtakahe (e64da2ea24) - add back some sps telemetry (52c2c64f5b) - missing bit of Bug 1195073: [MSE/webm] P1 (9c45e82c3d) - Bug 1150305 - sourcebuffer.buffered returns the same object if not changed. r=roc, r=bz, r=jya (6005d56c0c) - Bug 1215447 - move flag setting from SeekStarted() to Seek(). r=roc. (a646b744c1) - Bug 1119936 - Audio from FM Radio or Music app ceases to play when switching between front/back camera. r=roc (1a60aa7d69) - Bug 1186806 - Part 1: Replace nsBaseHashtable::EnumerateRead() with iterators in HTMLFormControlsCollection. r=khuey (ccb8cb180a) - Bug 1186806 - Part 2: Use NS_IMPL_CYCLE_COLLECTION_TRAVERSE instead of manual traversal in HTMLFormElement. r=khuey (57e6eabf1b) - Bug 1186806 - Part 3: Replace nsBaseHashtable::EnumerateRead() with iterators in HTMLMediaElement. r=khuey (243ef6e83b) - Bug 1186806 - Part 4: Replace nsBaseHashtable::EnumerateRead() with iterators in HTMLPropertiesCollection. r=khuey (499bdef85f) - Bug 1163958 - Reduce the allocation in MediaStreamGraph - patch 3 CLOSED TREE (a557661df1) - Bug 1219330 - Prevent the creation of TextureClient after shutdown. r=mattwoodrow (a6c047d54f) - Bug 1205559: Make TextureChild/TextureClient thread-safe. r=nical (307c089631) - missing bit of 1219330 (0e351ea419) - nsRefPtr -> RefPtr (07ba248e69) - Bug 1215023. Part 1 - make MediaDecoder::mOwner a const member. We will check mShuttingDown before calling functions of mOwner. r=kinetik. (da7f201815) - Bug 1215023. Part 2 - remove null check of mOwner. We check mShuttingDown to know whether it is valid to call functions of mOwner. r=kinetik. (8d28a04bbe) - Bug 1220558. Part 2 - remove unused members. r=jya. (d3a9ed8c68) - Bug 1223599 - Remove the throttling argument from AbstractMediaDecoder::NotifyDataArrived(). r=jya. (320323ff1d) - Bug 1194606 - Make MediaDecoderStateMachine capable of requesting different kind (decoded/raw) of media data. r=jya (1e2b6a5c44) - Bug 1197075: P3. Decode frames ahead of MDSM requesting them. r=edwin This makes the media.*-decode-ahead pref performs more according to its name. We decode audio and video in advance so a MediaDataPromise can be resolved almost instantly. Default is 2. (b3f56447c4) - Bug 1189964 - Fix bustage. r=bustage CLOSED TREE (afaa49b4b5) - Bug 1212149 - e10s support for opening notification settings. r=wchen (f0e7778fb6) - Bug 1215644 - Use child process volume service cache for available and storage status requests. r=dhylands (dfd49f2ef3) - bug 1215552 - nsHttpConnectionMgr::PostEvent shouldnt manually ref count r=hurley (5e2f1886e6) - Bug 1219392 - Capitalize mozilla::unused to avoid conflicts. r=froydnj (0c8bb7f15a) - bug 1217834 - buzzfeed packet loss r=dragana (e9a60b605f) - Bug 1168033 - Add a comment to nsHttpConnectionMgr.cpp explaining the assignment of attemptedOptimisticPipeline. r=mcmanus (2451996350) - bug 1189645 - remove spdy telem r=hurley (cda90abbdb) - Bug 1148268 - fixed misspelling attribute mActorDestoryed. r=dhyland. (3615d68765) - Bug 1216031 - Make MediaDecoder::mVideoFrameContainer const. r=kinetik. (a3feb9d6bc) - missing bits of Bug 1165515 - Part 13-2 (009e32281f) - Bug 1131473 - crash in -[NativeMenuItemTarget menuItemHit:]. r=spohl (ea2da6441c) - Bug 1216416 - Fix -Wimplicit-fallthrough warnings in widget/cocoa. r=spohl (faaa390b20) - Bug 1181977 - Firefox app menu contains only "Quit" in certain edgecases. r=spohl (0b9d912961)
542 lines
13 KiB
C++
542 lines
13 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "mozilla/dom/cache/ReadStream.h"
|
|
|
|
#include "mozilla/unused.h"
|
|
#include "mozilla/dom/cache/CacheStreamControlChild.h"
|
|
#include "mozilla/dom/cache/CacheStreamControlParent.h"
|
|
#include "mozilla/dom/cache/CacheTypes.h"
|
|
#include "mozilla/ipc/FileDescriptor.h"
|
|
#include "mozilla/ipc/InputStreamUtils.h"
|
|
#include "mozilla/SnappyUncompressInputStream.h"
|
|
#include "nsIAsyncInputStream.h"
|
|
#include "nsTArray.h"
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
namespace cache {
|
|
|
|
using mozilla::Unused;
|
|
using mozilla::ipc::FileDescriptor;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// The inner stream class. This is where all of the real work is done. As
|
|
// an invariant Inner::Close() must be called before ~Inner(). This is
|
|
// guaranteed by our outer ReadStream class.
|
|
class ReadStream::Inner final : public ReadStream::Controllable
|
|
{
|
|
public:
|
|
Inner(StreamControl* aControl, const nsID& aId,
|
|
nsIInputStream* aStream);
|
|
|
|
void
|
|
Serialize(CacheReadStreamOrVoid* aReadStreamOut);
|
|
|
|
void
|
|
Serialize(CacheReadStream* aReadStreamOut);
|
|
|
|
// ReadStream::Controllable methods
|
|
virtual void
|
|
CloseStream() override;
|
|
|
|
virtual void
|
|
CloseStreamWithoutReporting() override;
|
|
|
|
virtual bool
|
|
MatchId(const nsID& aId) const override;
|
|
|
|
virtual bool
|
|
HasEverBeenRead() const override;
|
|
|
|
// Simulate nsIInputStream methods, but we don't actually inherit from it
|
|
NS_METHOD
|
|
Close();
|
|
|
|
NS_METHOD
|
|
Available(uint64_t *aNumAvailableOut);
|
|
|
|
NS_METHOD
|
|
Read(char *aBuf, uint32_t aCount, uint32_t *aNumReadOut);
|
|
|
|
NS_METHOD
|
|
ReadSegments(nsWriteSegmentFun aWriter, void *aClosure, uint32_t aCount,
|
|
uint32_t *aNumReadOut);
|
|
|
|
NS_METHOD
|
|
IsNonBlocking(bool *aNonBlockingOut);
|
|
|
|
private:
|
|
class NoteClosedRunnable;
|
|
class ForgetRunnable;
|
|
|
|
~Inner();
|
|
|
|
void
|
|
NoteClosed();
|
|
|
|
void
|
|
Forget();
|
|
|
|
void
|
|
NoteClosedOnOwningThread();
|
|
|
|
void
|
|
ForgetOnOwningThread();
|
|
|
|
// Weak ref to the stream control actor. The actor will always call either
|
|
// CloseStream() or CloseStreamWithoutReporting() before it's destroyed. The
|
|
// weak ref is cleared in the resulting NoteClosedOnOwningThread() or
|
|
// ForgetOnOwningThread() method call.
|
|
StreamControl* mControl;
|
|
|
|
const nsID mId;
|
|
nsCOMPtr<nsIInputStream> mStream;
|
|
nsCOMPtr<nsIInputStream> mSnappyStream;
|
|
nsCOMPtr<nsIThread> mOwningThread;
|
|
|
|
enum State
|
|
{
|
|
Open,
|
|
Closed,
|
|
NumStates
|
|
};
|
|
Atomic<State> mState;
|
|
Atomic<bool> mHasEverBeenRead;
|
|
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(cache::ReadStream::Inner)
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// Runnable to notify actors that the ReadStream has closed. This must
|
|
// be done on the thread associated with the PBackground actor. Must be
|
|
// cancelable to execute on Worker threads (which can occur when the
|
|
// ReadStream is constructed on a child process Worker thread).
|
|
class ReadStream::Inner::NoteClosedRunnable final : public nsCancelableRunnable
|
|
{
|
|
public:
|
|
explicit NoteClosedRunnable(ReadStream::Inner* aStream)
|
|
: mStream(aStream)
|
|
{ }
|
|
|
|
NS_IMETHOD Run()
|
|
{
|
|
mStream->NoteClosedOnOwningThread();
|
|
mStream = nullptr;
|
|
return NS_OK;
|
|
}
|
|
|
|
// Note, we must proceed with the Run() method since our actor will not
|
|
// clean itself up until we note that the stream is closed.
|
|
NS_IMETHOD Cancel()
|
|
{
|
|
Run();
|
|
return NS_OK;
|
|
}
|
|
|
|
private:
|
|
~NoteClosedRunnable() { }
|
|
|
|
RefPtr<ReadStream::Inner> mStream;
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// Runnable to clear actors without reporting that the ReadStream has
|
|
// closed. Since this can trigger actor destruction, we need to do
|
|
// it on the thread associated with the PBackground actor. Must be
|
|
// cancelable to execute on Worker threads (which can occur when the
|
|
// ReadStream is constructed on a child process Worker thread).
|
|
class ReadStream::Inner::ForgetRunnable final : public nsCancelableRunnable
|
|
{
|
|
public:
|
|
explicit ForgetRunnable(ReadStream::Inner* aStream)
|
|
: mStream(aStream)
|
|
{ }
|
|
|
|
NS_IMETHOD Run()
|
|
{
|
|
mStream->ForgetOnOwningThread();
|
|
mStream = nullptr;
|
|
return NS_OK;
|
|
}
|
|
|
|
// Note, we must proceed with the Run() method so that we properly
|
|
// call RemoveListener on the actor.
|
|
NS_IMETHOD Cancel()
|
|
{
|
|
Run();
|
|
return NS_OK;
|
|
}
|
|
|
|
private:
|
|
~ForgetRunnable() { }
|
|
|
|
RefPtr<ReadStream::Inner> mStream;
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
|
|
ReadStream::Inner::Inner(StreamControl* aControl, const nsID& aId,
|
|
nsIInputStream* aStream)
|
|
: mControl(aControl)
|
|
, mId(aId)
|
|
, mStream(aStream)
|
|
, mSnappyStream(new SnappyUncompressInputStream(aStream))
|
|
, mOwningThread(NS_GetCurrentThread())
|
|
, mState(Open)
|
|
{
|
|
MOZ_ASSERT(mStream);
|
|
MOZ_ASSERT(mControl);
|
|
mControl->AddReadStream(this);
|
|
}
|
|
|
|
void
|
|
ReadStream::Inner::Serialize(CacheReadStreamOrVoid* aReadStreamOut)
|
|
{
|
|
MOZ_ASSERT(NS_GetCurrentThread() == mOwningThread);
|
|
MOZ_ASSERT(aReadStreamOut);
|
|
CacheReadStream stream;
|
|
Serialize(&stream);
|
|
*aReadStreamOut = stream;
|
|
}
|
|
|
|
void
|
|
ReadStream::Inner::Serialize(CacheReadStream* aReadStreamOut)
|
|
{
|
|
MOZ_ASSERT(NS_GetCurrentThread() == mOwningThread);
|
|
MOZ_ASSERT(aReadStreamOut);
|
|
MOZ_ASSERT(mState == Open);
|
|
MOZ_ASSERT(mControl);
|
|
|
|
// If we are sending a ReadStream, then we never want to set the
|
|
// pushStream actors at the same time.
|
|
aReadStreamOut->pushStreamChild() = nullptr;
|
|
aReadStreamOut->pushStreamParent() = nullptr;
|
|
|
|
aReadStreamOut->id() = mId;
|
|
mControl->SerializeControl(aReadStreamOut);
|
|
|
|
nsAutoTArray<FileDescriptor, 4> fds;
|
|
SerializeInputStream(mStream, aReadStreamOut->params(), fds);
|
|
|
|
mControl->SerializeFds(aReadStreamOut, fds);
|
|
|
|
// We're passing ownership across the IPC barrier with the control, so
|
|
// do not signal that the stream is closed here.
|
|
Forget();
|
|
}
|
|
|
|
void
|
|
ReadStream::Inner::CloseStream()
|
|
{
|
|
MOZ_ASSERT(NS_GetCurrentThread() == mOwningThread);
|
|
Close();
|
|
}
|
|
|
|
void
|
|
ReadStream::Inner::CloseStreamWithoutReporting()
|
|
{
|
|
MOZ_ASSERT(NS_GetCurrentThread() == mOwningThread);
|
|
Forget();
|
|
}
|
|
|
|
bool
|
|
ReadStream::Inner::MatchId(const nsID& aId) const
|
|
{
|
|
MOZ_ASSERT(NS_GetCurrentThread() == mOwningThread);
|
|
return mId.Equals(aId);
|
|
}
|
|
|
|
bool
|
|
ReadStream::Inner::HasEverBeenRead() const
|
|
{
|
|
MOZ_ASSERT(NS_GetCurrentThread() == mOwningThread);
|
|
return mHasEverBeenRead;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ReadStream::Inner::Close()
|
|
{
|
|
// stream ops can happen on any thread
|
|
nsresult rv = mStream->Close();
|
|
NoteClosed();
|
|
return rv;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ReadStream::Inner::Available(uint64_t* aNumAvailableOut)
|
|
{
|
|
// stream ops can happen on any thread
|
|
nsresult rv = mSnappyStream->Available(aNumAvailableOut);
|
|
|
|
if (NS_FAILED(rv)) {
|
|
Close();
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ReadStream::Inner::Read(char* aBuf, uint32_t aCount, uint32_t* aNumReadOut)
|
|
{
|
|
// stream ops can happen on any thread
|
|
MOZ_ASSERT(aNumReadOut);
|
|
|
|
nsresult rv = mSnappyStream->Read(aBuf, aCount, aNumReadOut);
|
|
|
|
if ((NS_FAILED(rv) && rv != NS_BASE_STREAM_WOULD_BLOCK) ||
|
|
*aNumReadOut == 0) {
|
|
Close();
|
|
}
|
|
|
|
mHasEverBeenRead = true;
|
|
|
|
return rv;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ReadStream::Inner::ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
|
|
uint32_t aCount, uint32_t* aNumReadOut)
|
|
{
|
|
// stream ops can happen on any thread
|
|
MOZ_ASSERT(aNumReadOut);
|
|
|
|
if (aCount) {
|
|
mHasEverBeenRead = true;
|
|
}
|
|
|
|
nsresult rv = mSnappyStream->ReadSegments(aWriter, aClosure, aCount,
|
|
aNumReadOut);
|
|
|
|
if ((NS_FAILED(rv) && rv != NS_BASE_STREAM_WOULD_BLOCK &&
|
|
rv != NS_ERROR_NOT_IMPLEMENTED) || *aNumReadOut == 0) {
|
|
Close();
|
|
}
|
|
|
|
// Verify bytes were actually read before marking as being ever read. For
|
|
// example, code can test if the stream supports ReadSegments() by calling
|
|
// this method with a dummy callback which doesn't read anything. We don't
|
|
// want to trigger on that.
|
|
if (*aNumReadOut) {
|
|
mHasEverBeenRead = true;
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ReadStream::Inner::IsNonBlocking(bool* aNonBlockingOut)
|
|
{
|
|
// stream ops can happen on any thread
|
|
return mSnappyStream->IsNonBlocking(aNonBlockingOut);
|
|
}
|
|
|
|
ReadStream::Inner::~Inner()
|
|
{
|
|
// Any thread
|
|
MOZ_ASSERT(mState == Closed);
|
|
MOZ_ASSERT(!mControl);
|
|
}
|
|
|
|
void
|
|
ReadStream::Inner::NoteClosed()
|
|
{
|
|
// Any thread
|
|
if (mState == Closed) {
|
|
return;
|
|
}
|
|
|
|
if (NS_GetCurrentThread() == mOwningThread) {
|
|
NoteClosedOnOwningThread();
|
|
return;
|
|
}
|
|
|
|
nsCOMPtr<nsIRunnable> runnable = new NoteClosedRunnable(this);
|
|
MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
|
|
mOwningThread->Dispatch(runnable, nsIThread::DISPATCH_NORMAL)));
|
|
}
|
|
|
|
void
|
|
ReadStream::Inner::Forget()
|
|
{
|
|
// Any thread
|
|
if (mState == Closed) {
|
|
return;
|
|
}
|
|
|
|
if (NS_GetCurrentThread() == mOwningThread) {
|
|
ForgetOnOwningThread();
|
|
return;
|
|
}
|
|
|
|
nsCOMPtr<nsIRunnable> runnable = new ForgetRunnable(this);
|
|
MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
|
|
mOwningThread->Dispatch(runnable, nsIThread::DISPATCH_NORMAL)));
|
|
}
|
|
|
|
void
|
|
ReadStream::Inner::NoteClosedOnOwningThread()
|
|
{
|
|
MOZ_ASSERT(NS_GetCurrentThread() == mOwningThread);
|
|
|
|
// Mark closed and do nothing if we were already closed
|
|
if (!mState.compareExchange(Open, Closed)) {
|
|
return;
|
|
}
|
|
|
|
MOZ_ASSERT(mControl);
|
|
mControl->NoteClosed(this, mId);
|
|
mControl = nullptr;
|
|
}
|
|
|
|
void
|
|
ReadStream::Inner::ForgetOnOwningThread()
|
|
{
|
|
MOZ_ASSERT(NS_GetCurrentThread() == mOwningThread);
|
|
|
|
// Mark closed and do nothing if we were already closed
|
|
if (!mState.compareExchange(Open, Closed)) {
|
|
return;
|
|
}
|
|
|
|
MOZ_ASSERT(mControl);
|
|
mControl->ForgetReadStream(this);
|
|
mControl = nullptr;
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
|
|
NS_IMPL_ISUPPORTS(cache::ReadStream, nsIInputStream, ReadStream);
|
|
|
|
// static
|
|
already_AddRefed<ReadStream>
|
|
ReadStream::Create(const CacheReadStreamOrVoid& aReadStreamOrVoid)
|
|
{
|
|
if (aReadStreamOrVoid.type() == CacheReadStreamOrVoid::Tvoid_t) {
|
|
return nullptr;
|
|
}
|
|
|
|
return Create(aReadStreamOrVoid.get_CacheReadStream());
|
|
}
|
|
|
|
// static
|
|
already_AddRefed<ReadStream>
|
|
ReadStream::Create(const CacheReadStream& aReadStream)
|
|
{
|
|
// The parameter may or may not be for a Cache created stream. The way we
|
|
// tell is by looking at the stream control actor. If the actor exists,
|
|
// then we know the Cache created it.
|
|
if (!aReadStream.controlChild() && !aReadStream.controlParent()) {
|
|
return nullptr;
|
|
}
|
|
|
|
MOZ_ASSERT(!aReadStream.pushStreamChild());
|
|
MOZ_ASSERT(!aReadStream.pushStreamParent());
|
|
|
|
// Control is guaranteed to survive this method as ActorDestroy() cannot
|
|
// run on this thread until we complete.
|
|
StreamControl* control;
|
|
if (aReadStream.controlChild()) {
|
|
auto actor = static_cast<CacheStreamControlChild*>(aReadStream.controlChild());
|
|
control = actor;
|
|
} else {
|
|
auto actor = static_cast<CacheStreamControlParent*>(aReadStream.controlParent());
|
|
control = actor;
|
|
}
|
|
MOZ_ASSERT(control);
|
|
|
|
nsAutoTArray<FileDescriptor, 4> fds;
|
|
control->DeserializeFds(aReadStream, fds);
|
|
|
|
nsCOMPtr<nsIInputStream> stream =
|
|
DeserializeInputStream(aReadStream.params(), fds);
|
|
MOZ_ASSERT(stream);
|
|
|
|
// Currently we expect all cache read streams to be blocking file streams.
|
|
#ifdef DEBUG
|
|
nsCOMPtr<nsIAsyncInputStream> asyncStream = do_QueryInterface(stream);
|
|
MOZ_ASSERT(!asyncStream);
|
|
#endif
|
|
|
|
RefPtr<Inner> inner = new Inner(control, aReadStream.id(), stream);
|
|
RefPtr<ReadStream> ref = new ReadStream(inner);
|
|
return ref.forget();
|
|
}
|
|
|
|
// static
|
|
already_AddRefed<ReadStream>
|
|
ReadStream::Create(PCacheStreamControlParent* aControl, const nsID& aId,
|
|
nsIInputStream* aStream)
|
|
{
|
|
MOZ_ASSERT(aControl);
|
|
auto actor = static_cast<CacheStreamControlParent*>(aControl);
|
|
RefPtr<Inner> inner = new Inner(actor, aId, aStream);
|
|
RefPtr<ReadStream> ref = new ReadStream(inner);
|
|
return ref.forget();
|
|
}
|
|
|
|
void
|
|
ReadStream::Serialize(CacheReadStreamOrVoid* aReadStreamOut)
|
|
{
|
|
mInner->Serialize(aReadStreamOut);
|
|
}
|
|
|
|
void
|
|
ReadStream::Serialize(CacheReadStream* aReadStreamOut)
|
|
{
|
|
mInner->Serialize(aReadStreamOut);
|
|
}
|
|
|
|
ReadStream::ReadStream(ReadStream::Inner* aInner)
|
|
: mInner(aInner)
|
|
{
|
|
MOZ_ASSERT(mInner);
|
|
}
|
|
|
|
ReadStream::~ReadStream()
|
|
{
|
|
// Explicitly close the inner stream so that it does not have to
|
|
// deal with implicitly closing at destruction time.
|
|
mInner->Close();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ReadStream::Close()
|
|
{
|
|
return mInner->Close();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ReadStream::Available(uint64_t* aNumAvailableOut)
|
|
{
|
|
return mInner->Available(aNumAvailableOut);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ReadStream::Read(char* aBuf, uint32_t aCount, uint32_t* aNumReadOut)
|
|
{
|
|
return mInner->Read(aBuf, aCount, aNumReadOut);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ReadStream::ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
|
|
uint32_t aCount, uint32_t* aNumReadOut)
|
|
{
|
|
return mInner->ReadSegments(aWriter, aClosure, aCount, aNumReadOut);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ReadStream::IsNonBlocking(bool* aNonBlockingOut)
|
|
{
|
|
return mInner->IsNonBlocking(aNonBlockingOut);
|
|
}
|
|
|
|
} // namespace cache
|
|
} // namespace dom
|
|
} // namespace mozilla
|