mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
a0e1e57395
- cleanup whitespace (402d7b83b) - Bug 1140658 - Part 7: Close underlying file stream in ReadStream before reporting closed; (2bce37716) - Bug 1143223 - Teach Cache ReadStream not to AddRef() itself in its destructor. (b262891bd) - Bug 1140658 - Part 1: Create a mini-framework for running tests in the worker, service worker and window contexts (ff56f6f4e) - Bug 1140658 - Part 2: Merge test_cache.js and test_cache_frame.html (b6eabb6fd) - Bug 1140658 - Part 5: Remove test_cache_quick_close.html because it makes no sense after bug 1131353 (19d0a7f24) - Bug 1142333 - Add a test for passing Request objects to DOM cache match methods (506346266) - Bug 1142790 - Add a test for passing Request objects to DOM cache matchAll method; (7629a098e) - Bug 1142269 - Auto-vacuum the DOM Cache database; r=bkelly (7918837f0) - Bug 1143959 - Set the journal mode and foreign key pragmas for all DBActions; r=bkelly (72203a916) - Bug 1143894 - Part 1: Clear the ErrorResult message if InternalHeaders::Get fails; r=bkelly (fd5afc218) - Bug 1143894 - Part 2: Support Vary headers including multiple header names in DOM Cache; r=bkelly (cb3d7129d) - Bug 1143894 - Part 3: Do not propagate errors in getting the headers to the outside world; r=bkelly (de058497a) - Bug 1143894 - Part 4: Add tests for handling of the Vary header in DOM Cache (bd174ede9) - Bug 1143894 - Part 5: Add a test for handling of the Vary header with multiple entries in the cache; r=bkelly (780cf31ce) - Bug 1142790 - Add a test for passing Request objects to DOM cache matchAll method; (318bacb44) - Bug 1140658 - Part 4: Port test_cache_add.html to the new mini-framework; (fbd80b0f6) - Bug 1142772 - Interleave the DOM Cache tests run through the mini-framework; r=bkelly (37c61b81f) - Bug 1143193 - Run the tests for match and matchAll on both Request objects and string URLs; (cb6a122f9) - Bug 1143219 - Add tests for passing an unknown request to match and matchAll; (6eed5fb13) - Bug 1143511 - Correct the usages of .catch() in DOM cache tests; r=bkelly (aa7fbd0f7) - Bug 1143813 - Add tests for attempting to store a non-GET request in the DOM Cache (573164971) - Bug 1143820 - Add tests to ensure that the URL fragments are correctly ignored by the DOM Cache API; (81c4bea52) - Bug 1143833 - Add tests for the ignoreSearch match mode in DOM cache; (013de8632) - Bug 1143222 - Avoid dumping out extremely long response bodies to the mochitest log, and re-enable the newly added DOM cache tests to run both in seqential and parallel modes; r=bkelly (be68c42b0) - Bug 1144337 - Add tests to ensure that cacheName is only honored on CacheStorage, and not Cache (fa38be4f8) - Bug 1145445 - Add a test for CacheStorage; (3512d19fc) - Bug 1145792 - Add a test for the Cache.keys method; (ceae47df5) - Bug 1110814 P1 Implement Cache IPC actor for streaming data from child to parent. (a72a00cd2) - Bug 1110814 P0 Fully initialize Response before resolve Fetch promise. (443df9f44) - Bug 1110814 follow-up: Fix a typo in order to fix the test failures (c89dce5f6) - Bug 1110814 followup: Add missing 'override' annotations to new methods in CacheParent. (3b01c389d)
467 lines
12 KiB
C++
467 lines
12 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/AutoUtils.h"
|
|
|
|
#include "mozilla/unused.h"
|
|
#include "mozilla/dom/cache/CachePushStreamChild.h"
|
|
#include "mozilla/dom/cache/CacheStreamControlParent.h"
|
|
#include "mozilla/dom/cache/ReadStream.h"
|
|
#include "mozilla/dom/cache/SavedTypes.h"
|
|
#include "mozilla/dom/cache/StreamList.h"
|
|
#include "mozilla/dom/cache/TypeUtils.h"
|
|
#include "mozilla/ipc/FileDescriptorSetChild.h"
|
|
#include "mozilla/ipc/FileDescriptorSetParent.h"
|
|
#include "mozilla/ipc/PBackgroundParent.h"
|
|
|
|
namespace {
|
|
|
|
using mozilla::unused;
|
|
using mozilla::dom::cache::CachePushStreamChild;
|
|
using mozilla::dom::cache::PCacheReadStream;
|
|
using mozilla::dom::cache::PCacheReadStreamOrVoid;
|
|
using mozilla::ipc::FileDescriptor;
|
|
using mozilla::ipc::FileDescriptorSetChild;
|
|
using mozilla::ipc::FileDescriptorSetParent;
|
|
using mozilla::ipc::OptionalFileDescriptorSet;
|
|
|
|
enum CleanupAction
|
|
{
|
|
Forget,
|
|
Delete
|
|
};
|
|
|
|
void
|
|
CleanupChildFds(PCacheReadStream& aReadStream, CleanupAction aAction)
|
|
{
|
|
if (aReadStream.fds().type() !=
|
|
OptionalFileDescriptorSet::TPFileDescriptorSetChild) {
|
|
return;
|
|
}
|
|
|
|
nsAutoTArray<FileDescriptor, 4> fds;
|
|
|
|
FileDescriptorSetChild* fdSetActor =
|
|
static_cast<FileDescriptorSetChild*>(aReadStream.fds().get_PFileDescriptorSetChild());
|
|
MOZ_ASSERT(fdSetActor);
|
|
|
|
if (aAction == Delete) {
|
|
unused << fdSetActor->Send__delete__(fdSetActor);
|
|
}
|
|
|
|
// FileDescriptorSet doesn't clear its fds in its ActorDestroy, so we
|
|
// unconditionally forget them here. The fds themselves are auto-closed in
|
|
// ~FileDescriptor since they originated in this process.
|
|
fdSetActor->ForgetFileDescriptors(fds);
|
|
}
|
|
|
|
void
|
|
CleanupChildPushStream(PCacheReadStream& aReadStream, CleanupAction aAction)
|
|
{
|
|
if (!aReadStream.pushStreamChild()) {
|
|
return;
|
|
}
|
|
|
|
auto pushStream =
|
|
static_cast<CachePushStreamChild*>(aReadStream.pushStreamChild());
|
|
|
|
if (aAction == Delete) {
|
|
pushStream->StartDestroy();
|
|
return;
|
|
}
|
|
|
|
// If we send the stream, then we need to start it before forgetting about it.
|
|
pushStream->Start();
|
|
}
|
|
|
|
void
|
|
CleanupChild(PCacheReadStream& aReadStream, CleanupAction aAction)
|
|
{
|
|
CleanupChildFds(aReadStream, aAction);
|
|
CleanupChildPushStream(aReadStream, aAction);
|
|
}
|
|
|
|
void
|
|
CleanupChild(PCacheReadStreamOrVoid& aReadStreamOrVoid, CleanupAction aAction)
|
|
{
|
|
if (aReadStreamOrVoid.type() == PCacheReadStreamOrVoid::Tvoid_t) {
|
|
return;
|
|
}
|
|
|
|
CleanupChild(aReadStreamOrVoid.get_PCacheReadStream(), aAction);
|
|
}
|
|
|
|
void
|
|
CleanupParentFds(PCacheReadStream& aReadStream, CleanupAction aAction)
|
|
{
|
|
if (aReadStream.fds().type() !=
|
|
OptionalFileDescriptorSet::TPFileDescriptorSetParent) {
|
|
return;
|
|
}
|
|
|
|
nsAutoTArray<FileDescriptor, 4> fds;
|
|
|
|
FileDescriptorSetParent* fdSetActor =
|
|
static_cast<FileDescriptorSetParent*>(aReadStream.fds().get_PFileDescriptorSetParent());
|
|
MOZ_ASSERT(fdSetActor);
|
|
|
|
if (aAction == Delete) {
|
|
unused << fdSetActor->Send__delete__(fdSetActor);
|
|
}
|
|
|
|
// FileDescriptorSet doesn't clear its fds in its ActorDestroy, so we
|
|
// unconditionally forget them here. The fds themselves are auto-closed in
|
|
// ~FileDescriptor since they originated in this process.
|
|
fdSetActor->ForgetFileDescriptors(fds);
|
|
}
|
|
|
|
void
|
|
CleanupParentFds(PCacheReadStreamOrVoid& aReadStreamOrVoid, CleanupAction aAction)
|
|
{
|
|
if (aReadStreamOrVoid.type() == PCacheReadStreamOrVoid::Tvoid_t) {
|
|
return;
|
|
}
|
|
|
|
CleanupParentFds(aReadStreamOrVoid.get_PCacheReadStream(), aAction);
|
|
}
|
|
|
|
} // anonymous namespace
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
namespace cache {
|
|
|
|
using mozilla::ipc::PBackgroundParent;
|
|
|
|
AutoChildBase::AutoChildBase(TypeUtils* aTypeUtils)
|
|
: mTypeUtils(aTypeUtils)
|
|
, mSent(false)
|
|
{
|
|
MOZ_ASSERT(mTypeUtils);
|
|
}
|
|
|
|
AutoChildBase::~AutoChildBase()
|
|
{
|
|
}
|
|
|
|
// --------------------------------------------
|
|
|
|
AutoChildRequest::AutoChildRequest(TypeUtils* aTypeUtils)
|
|
: AutoChildBase(aTypeUtils)
|
|
{
|
|
mRequestOrVoid = void_t();
|
|
}
|
|
|
|
AutoChildRequest::~AutoChildRequest()
|
|
{
|
|
if (mRequestOrVoid.type() != PCacheRequestOrVoid::TPCacheRequest) {
|
|
return;
|
|
}
|
|
|
|
CleanupAction action = mSent ? Forget : Delete;
|
|
CleanupChild(mRequestOrVoid.get_PCacheRequest().body(), action);
|
|
}
|
|
|
|
void
|
|
AutoChildRequest::Add(InternalRequest* aRequest, BodyAction aBodyAction,
|
|
ReferrerAction aReferrerAction, SchemeAction aSchemeAction,
|
|
ErrorResult& aRv)
|
|
{
|
|
MOZ_ASSERT(!mSent);
|
|
MOZ_ASSERT(mRequestOrVoid.type() == PCacheRequestOrVoid::Tvoid_t);
|
|
mRequestOrVoid = PCacheRequest();
|
|
mTypeUtils->ToPCacheRequest(mRequestOrVoid.get_PCacheRequest(), aRequest,
|
|
aBodyAction, aReferrerAction, aSchemeAction, aRv);
|
|
}
|
|
|
|
const PCacheRequest&
|
|
AutoChildRequest::SendAsRequest()
|
|
{
|
|
MOZ_ASSERT(mRequestOrVoid.type() == PCacheRequestOrVoid::TPCacheRequest);
|
|
return mRequestOrVoid.get_PCacheRequest();
|
|
}
|
|
|
|
const PCacheRequestOrVoid&
|
|
AutoChildRequest::SendAsRequestOrVoid()
|
|
{
|
|
return mRequestOrVoid;
|
|
}
|
|
|
|
// --------------------------------------------
|
|
|
|
AutoChildRequestList::AutoChildRequestList(TypeUtils* aTypeUtils,
|
|
uint32_t aCapacity)
|
|
: AutoChildBase(aTypeUtils)
|
|
{
|
|
mRequestList.SetCapacity(aCapacity);
|
|
}
|
|
|
|
AutoChildRequestList::~AutoChildRequestList()
|
|
{
|
|
CleanupAction action = mSent ? Forget : Delete;
|
|
for (uint32_t i = 0; i < mRequestList.Length(); ++i) {
|
|
CleanupChild(mRequestList[i].body(), action);
|
|
}
|
|
}
|
|
|
|
void
|
|
AutoChildRequestList::Add(InternalRequest* aRequest, BodyAction aBodyAction,
|
|
ReferrerAction aReferrerAction,
|
|
SchemeAction aSchemeAction, ErrorResult& aRv)
|
|
{
|
|
MOZ_ASSERT(!mSent);
|
|
|
|
// The FileDescriptorSetChild asserts in its destructor that all fds have
|
|
// been removed. The copy constructor, however, simply duplicates the
|
|
// fds without removing any. This means each temporary and copy must be
|
|
// explicitly cleaned up.
|
|
//
|
|
// Avoid a lot of this hassle by making sure we only create one here. On
|
|
// error we remove it.
|
|
|
|
PCacheRequest* request = mRequestList.AppendElement();
|
|
mTypeUtils->ToPCacheRequest(*request, aRequest, aBodyAction, aReferrerAction,
|
|
aSchemeAction, aRv);
|
|
if (aRv.Failed()) {
|
|
mRequestList.RemoveElementAt(mRequestList.Length() - 1);
|
|
}
|
|
}
|
|
|
|
const nsTArray<PCacheRequest>&
|
|
AutoChildRequestList::SendAsRequestList()
|
|
{
|
|
MOZ_ASSERT(!mSent);
|
|
mSent = true;
|
|
return mRequestList;
|
|
}
|
|
|
|
// --------------------------------------------
|
|
|
|
AutoChildRequestResponse::AutoChildRequestResponse(TypeUtils* aTypeUtils)
|
|
: AutoChildBase(aTypeUtils)
|
|
{
|
|
// Default IPC-generated constructor does not initialize these correctly
|
|
// and we check them later when cleaning up.
|
|
mRequestResponse.request().body() = void_t();
|
|
mRequestResponse.response().body() = void_t();
|
|
}
|
|
|
|
AutoChildRequestResponse::~AutoChildRequestResponse()
|
|
{
|
|
CleanupAction action = mSent ? Forget : Delete;
|
|
CleanupChild(mRequestResponse.request().body(), action);
|
|
CleanupChild(mRequestResponse.response().body(), action);
|
|
}
|
|
|
|
void
|
|
AutoChildRequestResponse::Add(InternalRequest* aRequest, BodyAction aBodyAction,
|
|
ReferrerAction aReferrerAction,
|
|
SchemeAction aSchemeAction, ErrorResult& aRv)
|
|
{
|
|
MOZ_ASSERT(!mSent);
|
|
mTypeUtils->ToPCacheRequest(mRequestResponse.request(), aRequest, aBodyAction,
|
|
aReferrerAction, aSchemeAction, aRv);
|
|
}
|
|
|
|
void
|
|
AutoChildRequestResponse::Add(Response& aResponse, ErrorResult& aRv)
|
|
{
|
|
MOZ_ASSERT(!mSent);
|
|
mTypeUtils->ToPCacheResponse(mRequestResponse.response(), aResponse, aRv);
|
|
}
|
|
|
|
const CacheRequestResponse&
|
|
AutoChildRequestResponse::SendAsRequestResponse()
|
|
{
|
|
MOZ_ASSERT(!mSent);
|
|
mSent = true;
|
|
return mRequestResponse;
|
|
}
|
|
|
|
// --------------------------------------------
|
|
|
|
AutoParentBase::AutoParentBase(PBackgroundParent* aManager)
|
|
: mManager(aManager)
|
|
, mStreamControl(nullptr)
|
|
, mSent(false)
|
|
{
|
|
MOZ_ASSERT(mManager);
|
|
}
|
|
|
|
AutoParentBase::~AutoParentBase()
|
|
{
|
|
if (!mSent && mStreamControl) {
|
|
unused << PCacheStreamControlParent::Send__delete__(mStreamControl);
|
|
}
|
|
}
|
|
|
|
void
|
|
AutoParentBase::SerializeReadStream(const nsID& aId, StreamList* aStreamList,
|
|
PCacheReadStream* aReadStreamOut)
|
|
{
|
|
MOZ_ASSERT(aStreamList);
|
|
MOZ_ASSERT(aReadStreamOut);
|
|
MOZ_ASSERT(!mSent);
|
|
|
|
nsCOMPtr<nsIInputStream> stream = aStreamList->Extract(aId);
|
|
MOZ_ASSERT(stream);
|
|
|
|
if (!mStreamControl) {
|
|
mStreamControl = static_cast<CacheStreamControlParent*>(
|
|
mManager->SendPCacheStreamControlConstructor(new CacheStreamControlParent()));
|
|
|
|
// If this failed, then the child process is gone. Warn and allow actor
|
|
// cleanup to proceed as normal.
|
|
if (!mStreamControl) {
|
|
NS_WARNING("Cache failed to create stream control actor.");
|
|
return;
|
|
}
|
|
}
|
|
|
|
aStreamList->SetStreamControl(mStreamControl);
|
|
|
|
nsRefPtr<ReadStream> readStream = ReadStream::Create(mStreamControl,
|
|
aId, stream);
|
|
readStream->Serialize(aReadStreamOut);
|
|
}
|
|
|
|
// --------------------------------------------
|
|
|
|
AutoParentRequestList::AutoParentRequestList(PBackgroundParent* aManager,
|
|
uint32_t aCapacity)
|
|
: AutoParentBase(aManager)
|
|
{
|
|
mRequestList.SetCapacity(aCapacity);
|
|
}
|
|
|
|
AutoParentRequestList::~AutoParentRequestList()
|
|
{
|
|
CleanupAction action = mSent ? Forget : Delete;
|
|
for (uint32_t i = 0; i < mRequestList.Length(); ++i) {
|
|
CleanupParentFds(mRequestList[i].body(), action);
|
|
}
|
|
}
|
|
|
|
void
|
|
AutoParentRequestList::Add(const SavedRequest& aSavedRequest,
|
|
StreamList* aStreamList)
|
|
{
|
|
MOZ_ASSERT(!mSent);
|
|
|
|
mRequestList.AppendElement(aSavedRequest.mValue);
|
|
PCacheRequest& request = mRequestList.LastElement();
|
|
|
|
if (!aSavedRequest.mHasBodyId) {
|
|
request.body() = void_t();
|
|
return;
|
|
}
|
|
|
|
request.body() = PCacheReadStream();
|
|
SerializeReadStream(aSavedRequest.mBodyId, aStreamList,
|
|
&request.body().get_PCacheReadStream());
|
|
}
|
|
|
|
const nsTArray<PCacheRequest>&
|
|
AutoParentRequestList::SendAsRequestList()
|
|
{
|
|
MOZ_ASSERT(!mSent);
|
|
mSent = true;
|
|
return mRequestList;
|
|
}
|
|
|
|
// --------------------------------------------
|
|
|
|
AutoParentResponseList::AutoParentResponseList(PBackgroundParent* aManager,
|
|
uint32_t aCapacity)
|
|
: AutoParentBase(aManager)
|
|
{
|
|
mResponseList.SetCapacity(aCapacity);
|
|
}
|
|
|
|
AutoParentResponseList::~AutoParentResponseList()
|
|
{
|
|
CleanupAction action = mSent ? Forget : Delete;
|
|
for (uint32_t i = 0; i < mResponseList.Length(); ++i) {
|
|
CleanupParentFds(mResponseList[i].body(), action);
|
|
}
|
|
}
|
|
|
|
void
|
|
AutoParentResponseList::Add(const SavedResponse& aSavedResponse,
|
|
StreamList* aStreamList)
|
|
{
|
|
MOZ_ASSERT(!mSent);
|
|
|
|
mResponseList.AppendElement(aSavedResponse.mValue);
|
|
PCacheResponse& response = mResponseList.LastElement();
|
|
|
|
if (!aSavedResponse.mHasBodyId) {
|
|
response.body() = void_t();
|
|
return;
|
|
}
|
|
|
|
response.body() = PCacheReadStream();
|
|
SerializeReadStream(aSavedResponse.mBodyId, aStreamList,
|
|
&response.body().get_PCacheReadStream());
|
|
}
|
|
|
|
const nsTArray<PCacheResponse>&
|
|
AutoParentResponseList::SendAsResponseList()
|
|
{
|
|
MOZ_ASSERT(!mSent);
|
|
mSent = true;
|
|
return mResponseList;
|
|
}
|
|
|
|
// --------------------------------------------
|
|
|
|
AutoParentResponseOrVoid::AutoParentResponseOrVoid(ipc::PBackgroundParent* aManager)
|
|
: AutoParentBase(aManager)
|
|
{
|
|
mResponseOrVoid = void_t();
|
|
}
|
|
|
|
AutoParentResponseOrVoid::~AutoParentResponseOrVoid()
|
|
{
|
|
if (mResponseOrVoid.type() != PCacheResponseOrVoid::TPCacheResponse) {
|
|
return;
|
|
}
|
|
|
|
CleanupAction action = mSent ? Forget : Delete;
|
|
CleanupParentFds(mResponseOrVoid.get_PCacheResponse().body(), action);
|
|
}
|
|
|
|
void
|
|
AutoParentResponseOrVoid::Add(const SavedResponse& aSavedResponse,
|
|
StreamList* aStreamList)
|
|
{
|
|
MOZ_ASSERT(!mSent);
|
|
|
|
mResponseOrVoid = aSavedResponse.mValue;
|
|
PCacheResponse& response = mResponseOrVoid.get_PCacheResponse();
|
|
|
|
if (!aSavedResponse.mHasBodyId) {
|
|
response.body() = void_t();
|
|
return;
|
|
}
|
|
|
|
response.body() = PCacheReadStream();
|
|
SerializeReadStream(aSavedResponse.mBodyId, aStreamList,
|
|
&response.body().get_PCacheReadStream());
|
|
}
|
|
|
|
const PCacheResponseOrVoid&
|
|
AutoParentResponseOrVoid::SendAsResponseOrVoid()
|
|
{
|
|
MOZ_ASSERT(!mSent);
|
|
mSent = true;
|
|
return mResponseOrVoid;
|
|
}
|
|
|
|
} // namespace cache
|
|
} // namespace dom
|
|
} // namespace mozilla
|