mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:37:11 +00:00
8a0a002cf2
- Bug 1148708: Add missing 'override' annotations in DocAccessibleChild.h. rs=ehsan (d606358545)
- Bug 1210408 - make nsMaiInterfaceAction work with proxies, r=tbsaunde (f7c819c6ae)
- Bug 1210407 - teach nsMaiInterfaceTable to use proxies, r=tbsaunde (4ca4f10b5f)
- bug 1185157 make sure we don't send an event to a destroyed ipc document r=billm (23acf53f75)
- bug 1214864 - make SetCarretOffset() async r=davidb (e3079e9b2d)
- missing of Bug 1139972 - IPC Proxy for charAt, r=tbsaunde (e9593ed752)
- bug 1191598 - Pass MOZ_CURRENT_PROJECT in environment when running post-build automation steps for universal mac builds. r=gps (fc342c6ced)
- Bug 1164596 - Add mach android-emulator command; r=ahal (afeb9b27d1)
- Bug 1223149 - Add basic usage documentation for mach build; r=glandium (bfb802d175)
- Bug 1182301 - Improve 'mach build' notifications. r=gps (2c65a122d1)
- Bug 1184696 - Add clobber targets to |mach clobber|; Ability to clobber compiled python files, r=gps (35d8be292e)
- Bug 1117958 - Allow any debugging options to the run or gtest mach subcommands to automatically enable debugging. r=gps (32f986af4b)
- Bug 1180081 - Properly rebuild gtest/libxul before running gtests. r=gps (80db9a3d49)
- Bug 1171647, part 1 - Define a new function to convert the mode to a string. r=njn (61ad16f5ba)
- Bug 1171647, part 2 - Remove redundant assertion for dark matter mode. r=njn (b5ac9519f3)
- Bug 1058178, part 1 - Implement DMD heap scanning mode. r=njn (60e1079536)
- Bug 1058178, part 2 - Implement address clamping analysis for DMD scan logs. r=njn (45c0326b93)
- Bug 1102388 - Fix DMD static constructor ordering dependency. r=mccr8 (59b87897a1)
- Bug 1128705 - Don't redefine PAGE_SIZE in DMD if it's already defined. r=erahm (49216348ee)
- Bug 1179042 - Add a script for analyzing memory blocks using a heap scan DMD log. r=njn DONTBUILD (1c08d2d66e)
- Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat (1c999d139b)
- Bug 1158772 - fix non-idiomatic memset call in nsDeque.cpp; r=erahm (de6b555245)
- Bug 1199400 - Part 1: Use CheckedInt when growing nsDeque capacity. r=froydnj (dfdf6814a3)
- Bug 1199400 - Part 0: Remove unused nsDequeIterator. r=froydnj (38d69d7f47)
- Bug 1199400 - Part 2: Add tests for possible nsDeque corner cases. r=froydnj (931baff195)
- Bug 1201997 - Part 1 - Converted compiled test to gtest for nsDeque class. Added tests to test untested methods. r=froydn (e893916651)
- Bug 1201997 - Part 2 - Removing unused methods from the nsDeque class. r=froydn (41595a90ac)
- Bug 1201997 - Part 3 - Make internally used methods private. r=froydn (8cd3afd96f)
- Bug 1201997 - Part 4 - Change size and offset variables to size_t.r=froydn (73eabc8d60)
- Bug 1215140 P1 Add an nsIConsoleReportCollector interface to support navigation channel logging. r=bz (8a41535e2b)
- Bug 1215140 P2 Make HttpBaseChannel implement nsIConsoleReportCollector. r=bz (75fca301f2)
- Bug 1197679 - If nsUnknownDecoder is involved in e10s DivertToParent can break. r=jduell (5d94a12504)
- Bug 1178991 - smartptr for http converter r=hurley (8e7fbc8443)
- bug 366559 - patch 2, fix nsHTTPCompressConv indentation r=bagder (ba762da587)
- bug 366559 - patch 3, fix nsHTTPCompressConv bracing style r=bagder (54195ab451)
- bits of bug 366559 - patch 7, content-encoding brotli for http (f0b4051022)
- Bug 1205112 - Make PushEvent.data nullable. r=mt,smaug (775db32856)
- Bug 1193414 - SharedWorkers thread should be kept alive also when the SharedWorker object is CCed, r=khuey (b77ea8125c)
- Bug 1206520: Add about:config prefs to enable throwing on asm.js validation failures; r=bz (c42126665d)
- Bug 1193414 - Telemetry for SharedWorker spawning. r=bkelly (77984b7bcc)
- Bug 1205676 - Enable WPT service-worker/unregister-then-register-new-script.https.html in e10s, r=nsm (ec24939cf6)
- Bug 1193133 - Throw when calling postMessage from a Service Worker dom object with no global. r=bkelly (526dcacfab)
- Bug 1181871 P1 Only enforce Cache Context shared data destruction on target thread after init. r=ehsan (cdbf3ed3a8)
- Bug 1181871 P2 Fix ServiceWorkerManager usage of stack-based ErrorResult. r=ehsan (c449195d90)
- minor cleanup and missing bit of 1198230 (02f459db05)
- Bug 1143717 - Implement the ServiceWorkerMessageEvent interface. r=baku (027b3465f2)
- fix misspatch (708eee4e84)
- Bug 1188545 - Disentangle service workers from shared workers and refactor event dispatching code into a separate class. r=nsm,mrbkap (fb5b5341c9)
- Bug 1205228 - Change PackagedAppVerifier to notify the verification result asynchronously. r=valentin. (9edda0fa00)
- Bug 1178518 - Packaged App Utils. r=valentin (f60f3b7a93)
- Bug 1213150 - Part 1: Add a nsContentUtils::IsNonSubresourceRequest helper; r=jdm (b509cc3cc9)
- Bug 1213150 - Part 2: Rework ShouldPrepareForIntercept() in terms of subresource requests; r=jdm (2e92fe8780)
- Bug 1213150 - Part 3: Remove nsIInterceptedChannel.isNavigation; r=jdm (becf1cc12f)
- Bug 1213150 follow-up: fix build bustage (8d73d6ca73)
- Bug 1198394 - Part 1: Allow interception of HSTS upgraded connections in non-e10s mode; r=mcmanus (f504c5be08)
- Bug 1198394 - Part 2: Add a test for interception of HSTS upgraded connections; r=jdm (054e984eef)
- Bug 1187011 - Don't allow response body with null body status. r=bkelly (b1860741d1)
- missing bit of 1140788 (29d319712e)
- Bug 1213436 - Reject core dumps with node IDs that don't fit in an IEEE 754 double; r=sfink (3c1f6fdda0)
- Bug 1211006 - Add Debugger.Source.prototype.canonicalId; r=ejpbruel (eef7b79fce)
- Bug 1199218 - Implement JS::ubi::Node::size for js::LazyScript referents; r=sfink (098a48d240)
- Bug 1220031 - Add JS::ubi::Node::scriptFilename; r=sfink (6b824ae680)
- Bug 1143575. Remove unused MediaQueue::Empty. r=cpearce (de737f3433)
- Bug 1209933 - Make sure all parent runtime pointers are the topmost parent, r=billm. (fe824d967d)
- Bug 1197012 - Fix ThrowTypeError in Notification. r=mccr8 (0b1a097526)
- Bug 1197893 - Check the number of arguments for ThrowTypeError() and ThrowRangeError() at compile time. r=peterv (d98c7d78a0)
- Bug 1142083 - Add test for IDN Unicode domain redirect. r=mcmanus (0c8961fe17)
- Bug 1187159 - Add mochitest for loading packaged apps (iframe+fetch+mozapp) r=jduell (ce90ea561b)
- Bug 1186290 - Notify TabParent to switch process when loading a signed package. r=honzab, r=kanru. (c58a14554a)
- fix (15e2df75eb)
- Bug 1206124 P1 Fix "same-origin" CORS credentials in FetchDriver. r=ehsan (fae1bb6ab3)
- Bug 1206124 P2 Test fetch() with credentials and redirects. r=ehsan (ffc6254112)
- Bug 1211751: Remove nsIChannelEventSink-forwarding from EventSource and FetchDriver. It's never needed. r=smaug (adafe5737a)
- Bug 1212433 Fail fetch() calls that require preflight and also redirect. r=sicking a=abillings (c0d6742b9e)
- Bug 1193128 - Fix base64 decoding when fetching data URIs. r=baku (80bafa291a)
- Bug 1195167 part 1: Let necko handle all protocols. r=bkelly (bb932b0ada)
- Bug 1195167 part 2: Remove redundant aCORSFlag argument and instead use mCORSFlagEverSet. r=bkelly (beadafcad0)
- Bug 1195167 part 3: Remove more scheme-specific handling from FetchDriver. r=bkelly (d00b38db9e)
- Bug 1195167 part 4: Remove FetchDriver::BasicFetch since it is empty. r=bkelly (c5ed097267)
- Bug 1210413 P2 Test CORS credentials on cross-origin redirects. r=sicking a=dveditz (b4eeb8aac0)
- Bug 1210413 P1 Propagate new channel load flags from child to parent on redirect. r=jduell a=dveditz (8b329af4fa)
- Bug 1195167 part 5: Make FetchDriver use AsyncOpen2. r=bkelly (cc217c4cc1)
- Bug 1195167 part 6: Some code simplification since necko handles fetch recursion. r=bkelly (f3b6da2262)
- Bug 1195167: Followup to fix test which I forgot to change (81e7439a2e)
- Bug 1215746: Remove RequestMode::Cors_with_forced_preflight. r=bkelly (0336e812b6)
- Bug 1211000: Move CORS preflight logic from nsCORSListenerProxy to nsCORSPreflightListener. r=ehsan (bf2f71cf22)
- missing bit of Bug 1211443 - Drop scheduled update if decoder initialization isn't done yet. r=jya (f6bc074e33)
- Bug 1182571: Fix nsILoadInfo->GetContentPolicyType API to be less ambigious. Audit and fix all users of it. r=ckerschb (5af6fa7442)
- fix (e40c8e7625)
- Bug 1173811 - Part 1: Propagate the response URL to intercepted channels when necessary (non-e10s). r=mayhemer,bkelly (26f4f13c28)
- Bug 1173811 - Part 2: Propagate the response URL to intercepted channels when necessary (e10s). r=mayhemer,bkelly (a603fe1df2)
- Bug 1154309 - Add New Resource Timing Fields r=bz,hurley (1d14eb6bef)
- Bug 1175685 - add OriginAttribute to LoadInfo. r=jonas, r=ckerschb, r=michal (a5d18bb637)
- Bug 1175685 - add OriginAttribute to LoadInfo. r=jonas, r=ckerschb, r=michal (fb07d2c8aa)
- Bug 1212904 P1 Add a LoadTainting enumeration. r=jduell (a1db8a3e99)
- Bug 1212904 P2 Add LoadTainting information to nsILoadInfo. r=jduell (2482e5e334)
- Bug 1221151 - use [infallible] in nsILoadInfo.idl instead of manual %{C++ blocks; r=jduell (aae73129b6)
- Bug 1045891 - CSP 2 child-src implementation r=ckerschb (792920aeb9)
- Bug 1219931 - CSP: Don't allow removing a policy (r=sicking) (9daaab4186)
- Bug 1208661 - Dump client-side layer textures. r=BenWa (1f2d17d515)
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
|