wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 3f1a5417af05 (bug 879475)

Browse Source
This commit is contained in:
Ed Morley 2014-06-09 11:28:13 +01:00
parent b3364f9f9a
commit ad1860817f
10 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/indexedDB/IDBCursor.cpp
View File

@ -1133,7 +1133,7 @@ ContinueHelper::SendResponseToChildProcess(nsresult aResultCode)
IDBDatabase* database = mTransaction->Database();
NS_ASSERTION(database, "This should never be null!");
nsIContentParent* contentParent = database->GetContentParent();
ContentParent* contentParent = database->GetContentParent();
NS_ASSERTION(contentParent, "This should never be null!");
FileManager* fileManager = database->Manager();

6
dom/indexedDB/IDBDatabase.cpp
View File

@ -11,7 +11,7 @@
#include "mozilla/EventDispatcher.h"
#include "mozilla/Mutex.h"
#include "mozilla/storage.h"
#include "mozilla/dom/nsIContentParent.h"
#include "mozilla/dom/ContentParent.h"
#include "mozilla/dom/DOMStringList.h"
#include "mozilla/dom/DOMStringListBinding.h"
#include "mozilla/dom/quota/Client.h"
@ -39,7 +39,7 @@
#include "mozilla/dom/IDBDatabaseBinding.h"
USING_INDEXEDDB_NAMESPACE
using mozilla::dom::nsIContentParent;
using mozilla::dom::ContentParent;
using mozilla::dom::quota::AssertIsOnIOThread;
using mozilla::dom::quota::Client;
using mozilla::dom::quota::QuotaManager;
@ -183,7 +183,7 @@ IDBDatabase::Create(IDBWrapperCache* aOwnerCache,
already_AddRefed<DatabaseInfo> aDatabaseInfo,
const nsACString& aASCIIOrigin,
FileManager* aFileManager,
mozilla::dom::nsIContentParent* aContentParent)
mozilla::dom::ContentParent* aContentParent)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
NS_ASSERTION(aFactory, "Null pointer!");

8
dom/indexedDB/IDBDatabase.h
View File

@ -28,7 +28,7 @@ class nsPIDOMWindow;
namespace mozilla {
class EventChainPostVisitor;
namespace dom {
class nsIContentParent;
class ContentParent;
namespace quota {
class Client;
}
@ -68,7 +68,7 @@ public:
already_AddRefed<DatabaseInfo> aDatabaseInfo,
const nsACString& aASCIIOrigin,
FileManager* aFileManager,
mozilla::dom::nsIContentParent* aContentParent);
mozilla::dom::ContentParent* aContentParent);
static IDBDatabase*
FromStorage(nsIOfflineStorage* aStorage);
@ -153,7 +153,7 @@ public:
return mActorParent;
}
mozilla::dom::nsIContentParent*
mozilla::dom::ContentParent*
GetContentParent() const
{
return mContentParent;
@ -258,7 +258,7 @@ private:
IndexedDBDatabaseChild* mActorChild;
IndexedDBDatabaseParent* mActorParent;
mozilla::dom::nsIContentParent* mContentParent;
mozilla::dom::ContentParent* mContentParent;
nsRefPtr<mozilla::dom::quota::Client> mQuotaClient;

10
dom/indexedDB/IDBFactory.cpp
View File

@ -14,7 +14,7 @@
#include "nsIXPCScriptable.h"
#include <algorithm>
#include "mozilla/dom/nsIContentParent.h"
#include "mozilla/dom/ContentParent.h"
#include "mozilla/dom/ContentChild.h"
#include "mozilla/dom/IDBFactoryBinding.h"
#include "mozilla/dom/PBrowserChild.h"
@ -55,7 +55,7 @@ USING_INDEXEDDB_NAMESPACE
USING_QUOTA_NAMESPACE
using mozilla::dom::ContentChild;
using mozilla::dom::nsIContentParent;
using mozilla::dom::ContentParent;
using mozilla::dom::IDBOpenDBOptions;
using mozilla::dom::NonNull;
using mozilla::dom::Optional;
@ -103,7 +103,7 @@ nsresult
IDBFactory::Create(nsPIDOMWindow* aWindow,
const nsACString& aGroup,
const nsACString& aASCIIOrigin,
nsIContentParent* aContentParent,
ContentParent* aContentParent,
IDBFactory** aFactory)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@ -179,7 +179,7 @@ IDBFactory::Create(nsPIDOMWindow* aWindow,
nsresult
IDBFactory::Create(JSContext* aCx,
JS::Handle<JSObject*> aOwningObject,
nsIContentParent* aContentParent,
ContentParent* aContentParent,
IDBFactory** aFactory)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@ -229,7 +229,7 @@ IDBFactory::Create(JSContext* aCx,
// static
nsresult
IDBFactory::Create(nsIContentParent* aContentParent,
IDBFactory::Create(ContentParent* aContentParent,
IDBFactory** aFactory)
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");

14
dom/indexedDB/IDBFactory.h
View File

@ -26,7 +26,7 @@ namespace mozilla {
class ErrorResult;
namespace dom {
class nsIContentParent;
class ContentParent;
class IDBOpenDBOptions;
namespace indexedDB {
@ -42,7 +42,7 @@ struct ObjectStoreInfo;
class IDBFactory MOZ_FINAL : public nsISupports,
public nsWrapperCache
{
typedef mozilla::dom::nsIContentParent nsIContentParent;
typedef mozilla::dom::ContentParent ContentParent;
typedef mozilla::dom::quota::PersistenceType PersistenceType;
typedef nsTArray<nsRefPtr<ObjectStoreInfo> > ObjectStoreInfoArray;
typedef mozilla::dom::quota::StoragePrivilege StoragePrivilege;
@ -55,12 +55,12 @@ public:
static nsresult Create(nsPIDOMWindow* aWindow,
const nsACString& aGroup,
const nsACString& aASCIIOrigin,
nsIContentParent* aContentParent,
ContentParent* aContentParent,
IDBFactory** aFactory);
// Called when using IndexedDB from a window in the current process.
static nsresult Create(nsPIDOMWindow* aWindow,
nsIContentParent* aContentParent,
ContentParent* aContentParent,
IDBFactory** aFactory)
{
return Create(aWindow, EmptyCString(), EmptyCString(), aContentParent,
@ -71,12 +71,12 @@ public:
// process.
static nsresult Create(JSContext* aCx,
JS::Handle<JSObject*> aOwningObject,
nsIContentParent* aContentParent,
ContentParent* aContentParent,
IDBFactory** aFactory);
// Called when using IndexedDB from a JS component or a JSM in a different
// process or from a C++ component.
static nsresult Create(nsIContentParent* aContentParent,
static nsresult Create(ContentParent* aContentParent,
IDBFactory** aFactory);
static already_AddRefed<nsIFileURL>
@ -217,7 +217,7 @@ private:
IndexedDBChild* mActorChild;
IndexedDBParent* mActorParent;
mozilla::dom::nsIContentParent* mContentParent;
mozilla::dom::ContentParent* mContentParent;
bool mRootedOwningObject;
};

6
dom/indexedDB/IDBIndex.cpp
View File

@ -1300,7 +1300,7 @@ GetHelper::SendResponseToChildProcess(nsresult aResultCode)
IDBDatabase* database = mIndex->ObjectStore()->Transaction()->Database();
NS_ASSERTION(database, "This should never be null!");
nsIContentParent* contentParent = database->GetContentParent();
ContentParent* contentParent = database->GetContentParent();
NS_ASSERTION(contentParent, "This should never be null!");
FileManager* fileManager = database->Manager();
@ -1674,7 +1674,7 @@ GetAllHelper::SendResponseToChildProcess(nsresult aResultCode)
IDBDatabase* database = mIndex->ObjectStore()->Transaction()->Database();
NS_ASSERTION(database, "This should never be null!");
nsIContentParent* contentParent = database->GetContentParent();
ContentParent* contentParent = database->GetContentParent();
NS_ASSERTION(contentParent, "This should never be null!");
FileManager* fileManager = database->Manager();
@ -2358,7 +2358,7 @@ OpenCursorHelper::SendResponseToChildProcess(nsresult aResultCode)
IDBDatabase* database = mIndex->ObjectStore()->Transaction()->Database();
NS_ASSERTION(database, "This should never be null!");
nsIContentParent* contentParent = database->GetContentParent();
ContentParent* contentParent = database->GetContentParent();
NS_ASSERTION(contentParent, "This should never be null!");
FileManager* fileManager = database->Manager();

10
dom/indexedDB/IDBObjectStore.cpp
View File

@ -14,7 +14,7 @@
#include <algorithm>
#include "jsfriendapi.h"
#include "mozilla/dom/ContentChild.h"
#include "mozilla/dom/nsIContentParent.h"
#include "mozilla/dom/ContentParent.h"
#include "mozilla/dom/FileHandleBinding.h"
#include "mozilla/dom/StructuredCloneTags.h"
#include "mozilla/dom/ipc/Blob.h"
@ -1748,7 +1748,7 @@ IDBObjectStore::ConvertActorsToBlobs(
// static
nsresult
IDBObjectStore::ConvertBlobsToActors(
nsIContentParent* aContentParent,
ContentParent* aContentParent,
FileManager* aFileManager,
const nsTArray<StructuredCloneFile>& aFiles,
InfallibleTArray<PBlobParent*>& aActors)
@ -3522,7 +3522,7 @@ GetHelper::SendResponseToChildProcess(nsresult aResultCode)
IDBDatabase* database = mObjectStore->Transaction()->Database();
NS_ASSERTION(database, "This should never be null!");
nsIContentParent* contentParent = database->GetContentParent();
ContentParent* contentParent = database->GetContentParent();
NS_ASSERTION(contentParent, "This should never be null!");
FileManager* fileManager = database->Manager();
@ -3987,7 +3987,7 @@ OpenCursorHelper::SendResponseToChildProcess(nsresult aResultCode)
IDBDatabase* database = mObjectStore->Transaction()->Database();
NS_ASSERTION(database, "This should never be null!");
nsIContentParent* contentParent = database->GetContentParent();
ContentParent* contentParent = database->GetContentParent();
NS_ASSERTION(contentParent, "This should never be null!");
FileManager* fileManager = database->Manager();
@ -4747,7 +4747,7 @@ GetAllHelper::SendResponseToChildProcess(nsresult aResultCode)
IDBDatabase* database = mObjectStore->Transaction()->Database();
NS_ASSERTION(database, "This should never be null!");
nsIContentParent* contentParent = database->GetContentParent();
ContentParent* contentParent = database->GetContentParent();
NS_ASSERTION(contentParent, "This should never be null!");
FileManager* fileManager = database->Manager();

4
dom/indexedDB/IDBObjectStore.h
View File

@ -26,7 +26,7 @@ class nsPIDOMWindow;
namespace mozilla {
namespace dom {
class nsIContentParent;
class ContentParent;
class PBlobChild;
class PBlobParent;
}
@ -122,7 +122,7 @@ public:
// Called only in the main process.
static nsresult
ConvertBlobsToActors(nsIContentParent* aContentParent,
ConvertBlobsToActors(ContentParent* aContentParent,
FileManager* aFileManager,
const nsTArray<StructuredCloneFile>& aFiles,
InfallibleTArray<PBlobParent*>& aActors);

6
dom/indexedDB/OpenDatabaseHelper.h
View File

@ -19,7 +19,7 @@ class mozIStorageConnection;
namespace mozilla {
namespace dom {
class nsIContentParent;
class ContentParent;
}
}
@ -42,7 +42,7 @@ public:
uint64_t aRequestedVersion,
PersistenceType aPersistenceType,
bool aForDeletion,
mozilla::dom::nsIContentParent* aContentParent,
mozilla::dom::ContentParent* aContentParent,
StoragePrivilege aPrivilege)
: HelperBase(aRequest), mOpenDBRequest(aRequest), mName(aName),
mGroup(aGroup), mASCIIOrigin(aASCIIOrigin),
@ -137,7 +137,7 @@ protected:
bool mForDeletion;
StoragePrivilege mPrivilege;
nsCString mDatabaseId;
mozilla::dom::nsIContentParent* mContentParent;
mozilla::dom::ContentParent* mContentParent;
// Out-params.
nsTArray<nsRefPtr<ObjectStoreInfo> > mObjectStores;

3
dom/ipc/TabParent.cpp
View File

@ -1713,7 +1713,8 @@ TabParent::RecvPIndexedDBConstructor(PIndexedDBParent* aActor,
NS_ASSERTION(Manager(), "Null manager?!");
nsRefPtr<IDBFactory> factory;
rv = IDBFactory::Create(window, aGroup, aASCIIOrigin, Manager(),
rv = IDBFactory::Create(window, aGroup, aASCIIOrigin,
Manager()->AsContentParent(),
getter_AddRefs(factory));
NS_ENSURE_SUCCESS(rv, false);