mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 889734 - Clean up indexedDB ipdl files r=bent 

--HG--
rename : dom/indexedDB/ipc/PIndexedDBIndex.ipdl => dom/indexedDB/ipc/IndexedDBParams.ipdlh
This commit is contained in:
David Zbarsky 2013-08-06 08:44:01 -04:00
Родитель 7925f93e7e
Коммит 532b86a81a
11 изменённых файлов: 112 добавлений и 169 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
dom/indexedDB/IDBIndex.cpp
Просмотреть файл

@ -1281,7 +1281,7 @@ GetHelper::PackArgumentsForParentProcess(IndexRequestParams& aParams)
"GetHelper::PackArgumentsForParentProcess "
"[IDBIndex.cpp]");
FIXME_Bug_521898_index::GetParams params;
GetParams params;
mKeyRange->ToSerializedKeyRange(params.keyRange());
@ -1485,7 +1485,7 @@ GetAllKeysHelper::PackArgumentsForParentProcess(IndexRequestParams& aParams)
GetAllKeysParams params;
if (mKeyRange) {
FIXME_Bug_521898_index::KeyRange keyRange;
KeyRange keyRange;
mKeyRange->ToSerializedKeyRange(keyRange);
params.optionalKeyRange() = keyRange;
}
@ -1641,10 +1641,10 @@ GetAllHelper::PackArgumentsForParentProcess(IndexRequestParams& aParams)
"GetAllHelper::PackArgumentsForParentProcess "
"[IDBIndex.cpp]");
FIXME_Bug_521898_index::GetAllParams params;
GetAllParams params;
if (mKeyRange) {
FIXME_Bug_521898_index::KeyRange keyRange;
KeyRange keyRange;
mKeyRange->ToSerializedKeyRange(keyRange);
params.optionalKeyRange() = keyRange;
}
@ -1986,7 +1986,7 @@ OpenKeyCursorHelper::PackArgumentsForParentProcess(IndexRequestParams& aParams)
OpenKeyCursorParams params;
if (mKeyRange) {
FIXME_Bug_521898_index::KeyRange keyRange;
KeyRange keyRange;
mKeyRange->ToSerializedKeyRange(keyRange);
params.optionalKeyRange() = keyRange;
}
@ -2327,10 +2327,10 @@ OpenCursorHelper::PackArgumentsForParentProcess(IndexRequestParams& aParams)
"OpenCursorHelper::PackArgumentsForParentProcess "
"[IDBIndex.cpp]");
FIXME_Bug_521898_index::OpenCursorParams params;
OpenCursorParams params;
if (mKeyRange) {
FIXME_Bug_521898_index::KeyRange keyRange;
KeyRange keyRange;
mKeyRange->ToSerializedKeyRange(keyRange);
params.optionalKeyRange() = keyRange;
}
@ -2521,10 +2521,10 @@ CountHelper::PackArgumentsForParentProcess(IndexRequestParams& aParams)
"CountHelper::PackArgumentsForParentProcess "
"[IDBIndex.cpp]");
FIXME_Bug_521898_index::CountParams params;
CountParams params;
if (mKeyRange) {
FIXME_Bug_521898_index::KeyRange keyRange;
KeyRange keyRange;
mKeyRange->ToSerializedKeyRange(keyRange);
params.optionalKeyRange() = keyRange;
}

14
dom/indexedDB/IDBKeyRange.cpp
Просмотреть файл

@ -418,17 +418,7 @@ IDBKeyRange::GetUpperOpen(bool* aUpperOpen)
// Explicitly instantiate for all our key range types... Grumble.
template already_AddRefed<IDBKeyRange>
IDBKeyRange::FromSerializedKeyRange<FIXME_Bug_521898_objectstore::KeyRange>
(const FIXME_Bug_521898_objectstore::KeyRange& aKeyRange);
template already_AddRefed<IDBKeyRange>
IDBKeyRange::FromSerializedKeyRange<FIXME_Bug_521898_index::KeyRange>
(const FIXME_Bug_521898_index::KeyRange& aKeyRange);
IDBKeyRange::FromSerializedKeyRange<KeyRange> (const KeyRange& aKeyRange);
template void
IDBKeyRange::ToSerializedKeyRange<FIXME_Bug_521898_objectstore::KeyRange>
(FIXME_Bug_521898_objectstore::KeyRange& aKeyRange);
template void
IDBKeyRange::ToSerializedKeyRange<FIXME_Bug_521898_index::KeyRange>
(FIXME_Bug_521898_index::KeyRange& aKeyRange);
IDBKeyRange::ToSerializedKeyRange<KeyRange> (KeyRange& aKeyRange);

2
dom/indexedDB/IDBKeyRange.h
Просмотреть файл

@ -19,9 +19,7 @@ class mozIStorageStatement;
BEGIN_INDEXEDDB_NAMESPACE
namespace ipc {
namespace FIXME_Bug_521898_objectstore {
class KeyRange;
} // namespace FIXME_Bug_521898_objectstore
} // namespace ipc
class IDBKeyRange MOZ_FINAL : public nsIIDBKeyRange

14
dom/indexedDB/IDBObjectStore.cpp
Просмотреть файл

@ -3259,7 +3259,7 @@ GetHelper::PackArgumentsForParentProcess(ObjectStoreRequestParams& aParams)
"GetHelper::PackArgumentsForParentProcess "
"[IDBObjectStore.cpp]");
FIXME_Bug_521898_objectstore::GetParams params;
GetParams params;
mKeyRange->ToSerializedKeyRange(params.keyRange());
@ -3714,10 +3714,10 @@ OpenCursorHelper::PackArgumentsForParentProcess(
"OpenCursorHelper::PackArgumentsForParentProcess "
"[IDBObjectStore.cpp]");
FIXME_Bug_521898_objectstore::OpenCursorParams params;
OpenCursorParams params;
if (mKeyRange) {
FIXME_Bug_521898_objectstore::KeyRange keyRange;
KeyRange keyRange;
mKeyRange->ToSerializedKeyRange(keyRange);
params.optionalKeyRange() = keyRange;
}
@ -4176,10 +4176,10 @@ GetAllHelper::PackArgumentsForParentProcess(ObjectStoreRequestParams& aParams)
"GetAllHelper::PackArgumentsForParentProcess "
"[IDBObjectStore.cpp]");
FIXME_Bug_521898_objectstore::GetAllParams params;
GetAllParams params;
if (mKeyRange) {
FIXME_Bug_521898_objectstore::KeyRange keyRange;
KeyRange keyRange;
mKeyRange->ToSerializedKeyRange(keyRange);
params.optionalKeyRange() = keyRange;
}
@ -4389,10 +4389,10 @@ CountHelper::PackArgumentsForParentProcess(ObjectStoreRequestParams& aParams)
"CountHelper::PackArgumentsForParentProcess "
"[IDBObjectStore.cpp]");
FIXME_Bug_521898_objectstore::CountParams params;
CountParams params;
if (mKeyRange) {
FIXME_Bug_521898_objectstore::KeyRange keyRange;
KeyRange keyRange;
mKeyRange->ToSerializedKeyRange(keyRange);
params.optionalKeyRange() = keyRange;
}

57
dom/indexedDB/ipc/IndexedDBParams.ipdlh Normal file
Просмотреть файл

@ -0,0 +1,57 @@
/* 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/indexedDB/SerializationHelpers.h";
using mozilla::dom::indexedDB::Key;
using mozilla::dom::indexedDB::IDBCursor::Direction;
using mozilla::void_t;
namespace mozilla {
namespace dom {
namespace indexedDB {
namespace ipc {
struct KeyRange
{
Key lower;
Key upper;
bool lowerOpen;
bool upperOpen;
bool isOnly;
};
union OptionalKeyRange
{
KeyRange;
void_t;
};
struct GetParams
{
KeyRange keyRange;
};
struct GetAllParams
{
OptionalKeyRange optionalKeyRange;
uint32_t limit;
};
struct CountParams
{
OptionalKeyRange optionalKeyRange;
};
struct OpenCursorParams
{
OptionalKeyRange optionalKeyRange;
Direction direction;
};
} // namespace ipc
} // namespace indexedDB
} // namespace dom
} // namespace mozilla

56
dom/indexedDB/ipc/IndexedDBParent.cpp
Просмотреть файл

@ -1517,18 +1517,17 @@ IndexedDBObjectStoreRequestParent::GetAll(const GetAllParams& aParams)
nsRefPtr<IDBRequest> request;
const ipc::FIXME_Bug_521898_objectstore::OptionalKeyRange keyRangeUnion =
aParams.optionalKeyRange();
const ipc::OptionalKeyRange keyRangeUnion = aParams.optionalKeyRange();
nsRefPtr<IDBKeyRange> keyRange;
switch (keyRangeUnion.type()) {
case ipc::FIXME_Bug_521898_objectstore::OptionalKeyRange::TKeyRange:
case ipc::OptionalKeyRange::TKeyRange:
keyRange =
IDBKeyRange::FromSerializedKeyRange(keyRangeUnion.get_KeyRange());
break;
case ipc::FIXME_Bug_521898_objectstore::OptionalKeyRange::Tvoid_t:
case ipc::OptionalKeyRange::Tvoid_t:
break;
default:
@ -1656,18 +1655,17 @@ IndexedDBObjectStoreRequestParent::Count(const CountParams& aParams)
MOZ_ASSERT(mRequestType == ParamsUnionType::TCountParams);
MOZ_ASSERT(mObjectStore);
const ipc::FIXME_Bug_521898_objectstore::OptionalKeyRange keyRangeUnion =
aParams.optionalKeyRange();
const ipc::OptionalKeyRange keyRangeUnion = aParams.optionalKeyRange();
nsRefPtr<IDBKeyRange> keyRange;
switch (keyRangeUnion.type()) {
case ipc::FIXME_Bug_521898_objectstore::OptionalKeyRange::TKeyRange:
case ipc::OptionalKeyRange::TKeyRange:
keyRange =
IDBKeyRange::FromSerializedKeyRange(keyRangeUnion.get_KeyRange());
break;
case ipc::FIXME_Bug_521898_objectstore::OptionalKeyRange::Tvoid_t:
case ipc::OptionalKeyRange::Tvoid_t:
break;
default:
@ -1695,18 +1693,17 @@ IndexedDBObjectStoreRequestParent::OpenCursor(const OpenCursorParams& aParams)
MOZ_ASSERT(mRequestType == ParamsUnionType::TOpenCursorParams);
MOZ_ASSERT(mObjectStore);
const ipc::FIXME_Bug_521898_objectstore::OptionalKeyRange keyRangeUnion =
aParams.optionalKeyRange();
const ipc::OptionalKeyRange keyRangeUnion = aParams.optionalKeyRange();
nsRefPtr<IDBKeyRange> keyRange;
switch (keyRangeUnion.type()) {
case ipc::FIXME_Bug_521898_objectstore::OptionalKeyRange::TKeyRange:
case ipc::OptionalKeyRange::TKeyRange:
keyRange =
IDBKeyRange::FromSerializedKeyRange(keyRangeUnion.get_KeyRange());
break;
case ipc::FIXME_Bug_521898_objectstore::OptionalKeyRange::Tvoid_t:
case ipc::OptionalKeyRange::Tvoid_t:
break;
default:
@ -1816,18 +1813,17 @@ IndexedDBIndexRequestParent::GetAll(const GetAllParams& aParams)
nsRefPtr<IDBRequest> request;
const ipc::FIXME_Bug_521898_index::OptionalKeyRange keyRangeUnion =
aParams.optionalKeyRange();
const ipc::OptionalKeyRange keyRangeUnion = aParams.optionalKeyRange();
nsRefPtr<IDBKeyRange> keyRange;
switch (keyRangeUnion.type()) {
case ipc::FIXME_Bug_521898_index::OptionalKeyRange::TKeyRange:
case ipc::OptionalKeyRange::TKeyRange:
keyRange =
IDBKeyRange::FromSerializedKeyRange(keyRangeUnion.get_KeyRange());
break;
case ipc::FIXME_Bug_521898_index::OptionalKeyRange::Tvoid_t:
case ipc::OptionalKeyRange::Tvoid_t:
break;
default:
@ -1855,18 +1851,17 @@ IndexedDBIndexRequestParent::GetAllKeys(const GetAllKeysParams& aParams)
nsRefPtr<IDBRequest> request;
const ipc::FIXME_Bug_521898_index::OptionalKeyRange keyRangeUnion =
aParams.optionalKeyRange();
const ipc::OptionalKeyRange keyRangeUnion = aParams.optionalKeyRange();
nsRefPtr<IDBKeyRange> keyRange;
switch (keyRangeUnion.type()) {
case ipc::FIXME_Bug_521898_index::OptionalKeyRange::TKeyRange:
case ipc::OptionalKeyRange::TKeyRange:
keyRange =
IDBKeyRange::FromSerializedKeyRange(keyRangeUnion.get_KeyRange());
break;
case ipc::FIXME_Bug_521898_index::OptionalKeyRange::Tvoid_t:
case ipc::OptionalKeyRange::Tvoid_t:
break;
default:
@ -1892,18 +1887,17 @@ IndexedDBIndexRequestParent::Count(const CountParams& aParams)
MOZ_ASSERT(mRequestType == ParamsUnionType::TCountParams);
MOZ_ASSERT(mIndex);
const ipc::FIXME_Bug_521898_index::OptionalKeyRange keyRangeUnion =
aParams.optionalKeyRange();
const ipc::OptionalKeyRange keyRangeUnion = aParams.optionalKeyRange();
nsRefPtr<IDBKeyRange> keyRange;
switch (keyRangeUnion.type()) {
case ipc::FIXME_Bug_521898_index::OptionalKeyRange::TKeyRange:
case ipc::OptionalKeyRange::TKeyRange:
keyRange =
IDBKeyRange::FromSerializedKeyRange(keyRangeUnion.get_KeyRange());
break;
case ipc::FIXME_Bug_521898_index::OptionalKeyRange::Tvoid_t:
case ipc::OptionalKeyRange::Tvoid_t:
break;
default:
@ -1931,18 +1925,17 @@ IndexedDBIndexRequestParent::OpenCursor(const OpenCursorParams& aParams)
MOZ_ASSERT(mRequestType == ParamsUnionType::TOpenCursorParams);
MOZ_ASSERT(mIndex);
const ipc::FIXME_Bug_521898_index::OptionalKeyRange keyRangeUnion =
aParams.optionalKeyRange();
const ipc::OptionalKeyRange keyRangeUnion = aParams.optionalKeyRange();
nsRefPtr<IDBKeyRange> keyRange;
switch (keyRangeUnion.type()) {
case ipc::FIXME_Bug_521898_index::OptionalKeyRange::TKeyRange:
case ipc::OptionalKeyRange::TKeyRange:
keyRange =
IDBKeyRange::FromSerializedKeyRange(keyRangeUnion.get_KeyRange());
break;
case ipc::FIXME_Bug_521898_objectstore::OptionalKeyRange::Tvoid_t:
case ipc::OptionalKeyRange::Tvoid_t:
break;
default:
@ -1972,18 +1965,17 @@ IndexedDBIndexRequestParent::OpenKeyCursor(const OpenKeyCursorParams& aParams)
MOZ_ASSERT(mRequestType == ParamsUnionType::TOpenKeyCursorParams);
MOZ_ASSERT(mIndex);
const ipc::FIXME_Bug_521898_index::OptionalKeyRange keyRangeUnion =
aParams.optionalKeyRange();
const ipc::OptionalKeyRange keyRangeUnion = aParams.optionalKeyRange();
nsRefPtr<IDBKeyRange> keyRange;
switch (keyRangeUnion.type()) {
case ipc::FIXME_Bug_521898_index::OptionalKeyRange::TKeyRange:
case ipc::OptionalKeyRange::TKeyRange:
keyRange =
IDBKeyRange::FromSerializedKeyRange(keyRangeUnion.get_KeyRange());
break;
case ipc::FIXME_Bug_521898_objectstore::OptionalKeyRange::Tvoid_t:
case ipc::OptionalKeyRange::Tvoid_t:
break;
default:

16
dom/indexedDB/ipc/IndexedDBParent.h
Просмотреть файл

@ -697,10 +697,10 @@ class IndexedDBObjectStoreRequestParent : public IndexedDBRequestParentBase
typedef ipc::PutParams PutParams;
typedef ipc::ClearParams ClearParams;
typedef ipc::DeleteParams DeleteParams;
typedef ipc::FIXME_Bug_521898_objectstore::GetParams GetParams;
typedef ipc::FIXME_Bug_521898_objectstore::GetAllParams GetAllParams;
typedef ipc::FIXME_Bug_521898_objectstore::CountParams CountParams;
typedef ipc::FIXME_Bug_521898_objectstore::OpenCursorParams OpenCursorParams;
typedef ipc::GetParams GetParams;
typedef ipc::GetAllParams GetAllParams;
typedef ipc::CountParams CountParams;
typedef ipc::OpenCursorParams OpenCursorParams;
public:
IndexedDBObjectStoreRequestParent(IDBObjectStore* aObjectStore,
@ -758,10 +758,10 @@ class IndexedDBIndexRequestParent : public IndexedDBRequestParentBase
typedef ipc::GetKeyParams GetKeyParams;
typedef ipc::GetAllKeysParams GetAllKeysParams;
typedef ipc::OpenKeyCursorParams OpenKeyCursorParams;
typedef ipc::FIXME_Bug_521898_index::GetParams GetParams;
typedef ipc::FIXME_Bug_521898_index::GetAllParams GetAllParams;
typedef ipc::FIXME_Bug_521898_index::CountParams CountParams;
typedef ipc::FIXME_Bug_521898_index::OpenCursorParams OpenCursorParams;
typedef ipc::GetParams GetParams;
typedef ipc::GetAllParams GetAllParams;
typedef ipc::CountParams CountParams;
typedef ipc::OpenCursorParams OpenCursorParams;
public:
IndexedDBIndexRequestParent(IDBIndex* aIndex, RequestType aRequestType);

47
dom/indexedDB/ipc/PIndexedDBIndex.ipdl
Просмотреть файл

@ -7,61 +7,16 @@ include protocol PIndexedDBCursor;
include protocol PIndexedDBObjectStore;
include protocol PIndexedDBRequest;
include "mozilla/dom/indexedDB/SerializationHelpers.h";
include IndexedDBParams;
using mozilla::dom::indexedDB::Key;
using mozilla::dom::indexedDB::IDBCursor::Direction;
using mozilla::dom::indexedDB::SerializedStructuredCloneReadInfo;
using mozilla::void_t;
namespace mozilla {
namespace dom {
namespace indexedDB {
namespace ipc {
namespace FIXME_Bug_521898_index {
struct KeyRange
{
Key lower;
Key upper;
bool lowerOpen;
bool upperOpen;
bool isOnly;
};
union OptionalKeyRange
{
KeyRange;
void_t;
};
struct GetParams
{
KeyRange keyRange;
};
struct GetAllParams
{
OptionalKeyRange optionalKeyRange;
uint32_t limit;
};
struct CountParams
{
OptionalKeyRange optionalKeyRange;
};
struct OpenCursorParams
{
OptionalKeyRange optionalKeyRange;
Direction direction;
};
} // namespace FIXME_Bug_521898_index
struct GetKeyParams
{
KeyRange keyRange;

48
dom/indexedDB/ipc/PIndexedDBObjectStore.ipdl
Просмотреть файл

@ -8,64 +8,19 @@ include protocol PIndexedDBIndex;
include protocol PIndexedDBRequest;
include protocol PIndexedDBTransaction;
include "mozilla/dom/indexedDB/SerializationHelpers.h";
include IndexedDBParams;
using mozilla::dom::indexedDB::Key;
using mozilla::dom::indexedDB::IDBCursor::Direction;
using mozilla::dom::indexedDB::IndexInfo;
using mozilla::dom::indexedDB::IndexUpdateInfo;
using mozilla::dom::indexedDB::SerializedStructuredCloneReadInfo;
using mozilla::dom::indexedDB::SerializedStructuredCloneWriteInfo;
using mozilla::void_t;
namespace mozilla {
namespace dom {
namespace indexedDB {
namespace ipc {
namespace FIXME_Bug_521898_objectstore {
struct KeyRange
{
Key lower;
Key upper;
bool lowerOpen;
bool upperOpen;
bool isOnly;
};
union OptionalKeyRange
{
KeyRange;
void_t;
};
struct GetParams
{
KeyRange keyRange;
};
struct GetAllParams
{
OptionalKeyRange optionalKeyRange;
uint32_t limit;
};
struct CountParams
{
OptionalKeyRange optionalKeyRange;
};
struct OpenCursorParams
{
OptionalKeyRange optionalKeyRange;
Direction direction;
};
} // namespace FIXME_Bug_521898_objectstore
struct AddPutParams
{
SerializedStructuredCloneWriteInfo cloneInfo;
@ -91,7 +46,6 @@ struct DeleteParams
struct ClearParams
{
void_t FIXME_Bug_753159;
};
union ObjectStoreRequestParams

8
dom/indexedDB/ipc/PIndexedDBRequest.ipdl
Просмотреть файл

@ -58,14 +58,10 @@ struct PutResponse
};
struct DeleteResponse
{
void_t FIXME_Bug_753159;
};
{ };
struct ClearResponse
{
void_t FIXME_Bug_753159;
};
{ };
struct CountResponse
{

1
dom/indexedDB/ipc/moz.build
Просмотреть файл

@ -19,6 +19,7 @@ CPP_SOURCES += [
]
IPDL_SOURCES += [
'IndexedDBParams.ipdlh',
'PIndexedDB.ipdl',
'PIndexedDBCursor.ipdl',
'PIndexedDBDatabase.ipdl',