diff options
Diffstat (limited to 'Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.cpp')
| -rw-r--r-- | Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.cpp | 252 |
1 files changed, 126 insertions, 126 deletions
diff --git a/Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.cpp b/Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.cpp index 1ff45a2fd..3af454f0a 100644 --- a/Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.cpp +++ b/Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.cpp @@ -137,33 +137,33 @@ namespace IDBLevelDBCoding { #define INT32_MAX 0x7fffffffL #endif -static const unsigned char kIDBKeyNullTypeByte = 0; -static const unsigned char kIDBKeyStringTypeByte = 1; -static const unsigned char kIDBKeyDateTypeByte = 2; -static const unsigned char kIDBKeyNumberTypeByte = 3; -static const unsigned char kIDBKeyArrayTypeByte = 4; -static const unsigned char kIDBKeyMinKeyTypeByte = 5; - -static const unsigned char kIDBKeyPathTypeCodedByte1 = 0; -static const unsigned char kIDBKeyPathTypeCodedByte2 = 0; - -static const unsigned char kObjectStoreDataIndexId = 1; -static const unsigned char kExistsEntryIndexId = 2; - -static const unsigned char kSchemaVersionTypeByte = 0; -static const unsigned char kMaxDatabaseIdTypeByte = 1; -static const unsigned char kDatabaseFreeListTypeByte = 100; -static const unsigned char kDatabaseNameTypeByte = 201; - -static const unsigned char kObjectStoreMetaDataTypeByte = 50; -static const unsigned char kIndexMetaDataTypeByte = 100; -static const unsigned char kObjectStoreFreeListTypeByte = 150; -static const unsigned char kIndexFreeListTypeByte = 151; -static const unsigned char kObjectStoreNamesTypeByte = 200; -static const unsigned char kIndexNamesKeyTypeByte = 201; - -static const int64_t kObjectMetaDataTypeMaximum = INT64_MAX; -static const unsigned char kIndexMetaDataTypeMaximum = 255; +static const unsigned char IDBKeyNullTypeByte = 0; +static const unsigned char IDBKeyStringTypeByte = 1; +static const unsigned char IDBKeyDateTypeByte = 2; +static const unsigned char IDBKeyNumberTypeByte = 3; +static const unsigned char IDBKeyArrayTypeByte = 4; +static const unsigned char IDBKeyMinKeyTypeByte = 5; + +static const unsigned char IDBKeyPathTypeCodedByte1 = 0; +static const unsigned char IDBKeyPathTypeCodedByte2 = 0; + +static const unsigned char ObjectStoreDataIndexId = 1; +static const unsigned char ExistsEntryIndexId = 2; + +static const unsigned char SchemaVersionTypeByte = 0; +static const unsigned char MaxDatabaseIdTypeByte = 1; +static const unsigned char DatabaseFreeListTypeByte = 100; +static const unsigned char DatabaseNameTypeByte = 201; + +static const unsigned char ObjectStoreMetaDataTypeByte = 50; +static const unsigned char IndexMetaDataTypeByte = 100; +static const unsigned char ObjectStoreFreeListTypeByte = 150; +static const unsigned char IndexFreeListTypeByte = 151; +static const unsigned char ObjectStoreNamesTypeByte = 200; +static const unsigned char IndexNamesKeyTypeByte = 201; + +static const int64_t ObjectMetaDataTypeMaximum = INT64_MAX; +static const unsigned char IndexMetaDataTypeMaximum = 255; Vector<char> encodeByte(unsigned char c) { @@ -174,12 +174,12 @@ Vector<char> encodeByte(unsigned char c) Vector<char> maxIDBKey() { - return encodeByte(kIDBKeyNullTypeByte); + return encodeByte(IDBKeyNullTypeByte); } Vector<char> minIDBKey() { - return encodeByte(kIDBKeyMinKeyTypeByte); + return encodeByte(IDBKeyMinKeyTypeByte); } Vector<char> encodeBool(bool b) @@ -255,7 +255,7 @@ Vector<char> encodeVarInt(int64_t nParam) return ret; } -const char* decodeVarInt(const char *p, const char* limit, int64_t& foundInt) +const char* decodeVarInt(const char* p, const char* limit, int64_t& foundInt) { ASSERT(limit >= p); foundInt = 0; @@ -396,10 +396,10 @@ void encodeIDBKey(const IDBKey& key, Vector<char>& into) case IDBKey::InvalidType: case IDBKey::MinType: ASSERT_NOT_REACHED(); - into.append(encodeByte(kIDBKeyNullTypeByte)); + into.append(encodeByte(IDBKeyNullTypeByte)); return; case IDBKey::ArrayType: { - into.append(encodeByte(kIDBKeyArrayTypeByte)); + into.append(encodeByte(IDBKeyArrayTypeByte)); size_t length = key.array().size(); into.append(encodeVarInt(length)); for (size_t i = 0; i < length; ++i) @@ -408,17 +408,17 @@ void encodeIDBKey(const IDBKey& key, Vector<char>& into) return; } case IDBKey::StringType: - into.append(encodeByte(kIDBKeyStringTypeByte)); + into.append(encodeByte(IDBKeyStringTypeByte)); into.append(encodeStringWithLength(key.string())); ASSERT_UNUSED(previousSize, into.size() > previousSize); return; case IDBKey::DateType: - into.append(encodeByte(kIDBKeyDateTypeByte)); + into.append(encodeByte(IDBKeyDateTypeByte)); into.append(encodeDouble(key.date())); ASSERT_UNUSED(previousSize, into.size() - previousSize == 9); return; case IDBKey::NumberType: - into.append(encodeByte(kIDBKeyNumberTypeByte)); + into.append(encodeByte(IDBKeyNumberTypeByte)); into.append(encodeDouble(key.number())); ASSERT_UNUSED(previousSize, into.size() - previousSize == 9); return; @@ -437,11 +437,11 @@ const char* decodeIDBKey(const char* p, const char* limit, RefPtr<IDBKey>& found unsigned char type = *p++; switch (type) { - case kIDBKeyNullTypeByte: + case IDBKeyNullTypeByte: foundKey = IDBKey::createInvalid(); return p; - case kIDBKeyArrayTypeByte: { + case IDBKeyArrayTypeByte: { int64_t length; p = decodeVarInt(p, limit, length); if (!p) @@ -459,7 +459,7 @@ const char* decodeIDBKey(const char* p, const char* limit, RefPtr<IDBKey>& found foundKey = IDBKey::createArray(array); return p; } - case kIDBKeyStringTypeByte: { + case IDBKeyStringTypeByte: { String s; p = decodeStringWithLength(p, limit, s); if (!p) @@ -467,7 +467,7 @@ const char* decodeIDBKey(const char* p, const char* limit, RefPtr<IDBKey>& found foundKey = IDBKey::createString(s); return p; } - case kIDBKeyDateTypeByte: { + case IDBKeyDateTypeByte: { double d; p = decodeDouble(p, limit, &d); if (!p) @@ -475,7 +475,7 @@ const char* decodeIDBKey(const char* p, const char* limit, RefPtr<IDBKey>& found foundKey = IDBKey::createDate(d); return p; } - case kIDBKeyNumberTypeByte: { + case IDBKeyNumberTypeByte: { double d; p = decodeDouble(p, limit, &d); if (!p) @@ -499,11 +499,11 @@ const char* extractEncodedIDBKey(const char* start, const char* limit, Vector<ch unsigned char type = *p++; switch (type) { - case kIDBKeyNullTypeByte: - case kIDBKeyMinKeyTypeByte: + case IDBKeyNullTypeByte: + case IDBKeyMinKeyTypeByte: *result = encodeByte(type); return p; - case kIDBKeyArrayTypeByte: { + case IDBKeyArrayTypeByte: { int64_t length; p = decodeVarInt(p, limit, length); if (!p) @@ -521,7 +521,7 @@ const char* extractEncodedIDBKey(const char* start, const char* limit, Vector<ch } return p; } - case kIDBKeyStringTypeByte: { + case IDBKeyStringTypeByte: { int64_t length; p = decodeVarInt(p, limit, length); if (!p) @@ -532,8 +532,8 @@ const char* extractEncodedIDBKey(const char* start, const char* limit, Vector<ch result->append(start, p - start + length * 2); return p + length * 2; } - case kIDBKeyDateTypeByte: - case kIDBKeyNumberTypeByte: + case IDBKeyDateTypeByte: + case IDBKeyNumberTypeByte: if (p + sizeof(double) > limit) return 0; result->clear(); @@ -547,17 +547,17 @@ const char* extractEncodedIDBKey(const char* start, const char* limit, Vector<ch static IDBKey::Type keyTypeByteToKeyType(unsigned char type) { switch (type) { - case kIDBKeyNullTypeByte: + case IDBKeyNullTypeByte: return IDBKey::InvalidType; - case kIDBKeyArrayTypeByte: + case IDBKeyArrayTypeByte: return IDBKey::ArrayType; - case kIDBKeyStringTypeByte: + case IDBKeyStringTypeByte: return IDBKey::StringType; - case kIDBKeyDateTypeByte: + case IDBKeyDateTypeByte: return IDBKey::DateType; - case kIDBKeyNumberTypeByte: + case IDBKeyNumberTypeByte: return IDBKey::NumberType; - case kIDBKeyMinKeyTypeByte: + case IDBKeyMinKeyTypeByte: return IDBKey::MinType; } @@ -577,11 +577,11 @@ int compareEncodedIDBKeys(const char*& p, const char* limitA, const char*& q, co return x; switch (typeA) { - case kIDBKeyNullTypeByte: - case kIDBKeyMinKeyTypeByte: + case IDBKeyNullTypeByte: + case IDBKeyMinKeyTypeByte: // Null type or max type; no payload to compare. return 0; - case kIDBKeyArrayTypeByte: { + case IDBKeyArrayTypeByte: { int64_t lengthA, lengthB; p = decodeVarInt(p, limitA, lengthA); if (!p) @@ -601,10 +601,10 @@ int compareEncodedIDBKeys(const char*& p, const char* limitA, const char*& q, co return 1; return 0; } - case kIDBKeyStringTypeByte: + case IDBKeyStringTypeByte: return compareEncodedStringsWithLength(p, limitA, q, limitB); - case kIDBKeyDateTypeByte: - case kIDBKeyNumberTypeByte: { + case IDBKeyDateTypeByte: + case IDBKeyNumberTypeByte: { double d, e; p = decodeDouble(p, limitA, &d); ASSERT(p); @@ -641,8 +641,8 @@ Vector<char> encodeIDBKeyPath(const IDBKeyPath& keyPath) // byte is used to identify typed coding. New records are // always written as typed. Vector<char> ret; - ret.append(kIDBKeyPathTypeCodedByte1); - ret.append(kIDBKeyPathTypeCodedByte2); + ret.append(IDBKeyPathTypeCodedByte1); + ret.append(IDBKeyPathTypeCodedByte2); ret.append(static_cast<char>(keyPath.type())); switch (keyPath.type()) { case IDBKeyPath::NullType: @@ -667,7 +667,7 @@ IDBKeyPath decodeIDBKeyPath(const char* p, const char* limit) // May be typed, or may be a raw string. An invalid leading // byte sequence is used to identify typed coding. New records are // always written as typed. - if (p == limit || (limit - p >= 2 && (*p != kIDBKeyPathTypeCodedByte1 || *(p + 1) != kIDBKeyPathTypeCodedByte2))) + if (p == limit || (limit - p >= 2 && (*p != IDBKeyPathTypeCodedByte1 || *(p + 1) != IDBKeyPathTypeCodedByte2))) return IDBKeyPath(decodeString(p, limit)); p += 2; @@ -737,7 +737,7 @@ int compare(const LevelDBSlice& a, const LevelDBSlice& b, bool indexKeys) if (int x = prefixA.compare(prefixB)) return x; - if (prefixA.type() == KeyPrefix::kGlobalMetaData) { + if (prefixA.type() == KeyPrefix::GlobalMetaData) { ASSERT(ptrA != endA); ASSERT(ptrB != endB); @@ -749,13 +749,13 @@ int compare(const LevelDBSlice& a, const LevelDBSlice& b, bool indexKeys) if (typeByteA <= 1) return 0; - if (typeByteA == kDatabaseFreeListTypeByte) + if (typeByteA == DatabaseFreeListTypeByte) return decodeAndCompare<DatabaseFreeListKey>(a, b); - if (typeByteA == kDatabaseNameTypeByte) + if (typeByteA == DatabaseNameTypeByte) return decodeAndCompare<DatabaseNameKey>(a, b); } - if (prefixA.type() == KeyPrefix::kDatabaseMetaData) { + if (prefixA.type() == KeyPrefix::DatabaseMetaData) { ASSERT(ptrA != endA); ASSERT(ptrB != endB); @@ -768,24 +768,24 @@ int compare(const LevelDBSlice& a, const LevelDBSlice& b, bool indexKeys) if (typeByteA <= 3) return 0; - if (typeByteA == kObjectStoreMetaDataTypeByte) + if (typeByteA == ObjectStoreMetaDataTypeByte) return decodeAndCompare<ObjectStoreMetaDataKey>(a, b); - if (typeByteA == kIndexMetaDataTypeByte) + if (typeByteA == IndexMetaDataTypeByte) return decodeAndCompare<IndexMetaDataKey>(a, b); - if (typeByteA == kObjectStoreFreeListTypeByte) + if (typeByteA == ObjectStoreFreeListTypeByte) return decodeAndCompare<ObjectStoreFreeListKey>(a, b); - if (typeByteA == kIndexFreeListTypeByte) + if (typeByteA == IndexFreeListTypeByte) return decodeAndCompare<IndexFreeListKey>(a, b); - if (typeByteA == kObjectStoreNamesTypeByte) + if (typeByteA == ObjectStoreNamesTypeByte) return decodeAndCompare<ObjectStoreNamesKey>(a, b); - if (typeByteA == kIndexNamesKeyTypeByte) + if (typeByteA == IndexNamesKeyTypeByte) return decodeAndCompare<IndexNamesKey>(a, b); return 0; ASSERT_NOT_REACHED(); } - if (prefixA.type() == KeyPrefix::kObjectStoreData) { + if (prefixA.type() == KeyPrefix::ObjectStoreData) { if (ptrA == endA && ptrB == endB) return 0; if (ptrA == endA) @@ -795,7 +795,7 @@ int compare(const LevelDBSlice& a, const LevelDBSlice& b, bool indexKeys) return decodeAndCompare<ObjectStoreDataKey>(a, b); } - if (prefixA.type() == KeyPrefix::kExistsEntry) { + if (prefixA.type() == KeyPrefix::ExistsEntry) { if (ptrA == endA && ptrB == endB) return 0; if (ptrA == endA) @@ -805,7 +805,7 @@ int compare(const LevelDBSlice& a, const LevelDBSlice& b, bool indexKeys) return decodeAndCompare<ExistsEntryKey>(a, b); } - if (prefixA.type() == KeyPrefix::kIndexData) { + if (prefixA.type() == KeyPrefix::IndexData) { if (ptrA == endA && ptrB == endB) return 0; if (ptrA == endA) @@ -831,9 +831,9 @@ int compare(const LevelDBSlice& a, const LevelDBSlice& b, bool indexKeys) KeyPrefix::KeyPrefix() - : m_databaseId(kInvalidType) - , m_objectStoreId(kInvalidType) - , m_indexId(kInvalidType) + : m_databaseId(InvalidType) + , m_objectStoreId(InvalidType) + , m_indexId(InvalidType) { } @@ -870,9 +870,9 @@ const char* KeyPrefix::decode(const char* start, const char* limit, KeyPrefix* r Vector<char> KeyPrefix::encode() const { - ASSERT(m_databaseId != kInvalidId); - ASSERT(m_objectStoreId != kInvalidId); - ASSERT(m_indexId != kInvalidId); + ASSERT(m_databaseId != InvalidId); + ASSERT(m_objectStoreId != InvalidId); + ASSERT(m_indexId != InvalidId); Vector<char> databaseIdString = encodeInt(m_databaseId); Vector<char> objectStoreIdString = encodeInt(m_objectStoreId); @@ -895,9 +895,9 @@ Vector<char> KeyPrefix::encode() const int KeyPrefix::compare(const KeyPrefix& other) const { - ASSERT(m_databaseId != kInvalidId); - ASSERT(m_objectStoreId != kInvalidId); - ASSERT(m_indexId != kInvalidId); + ASSERT(m_databaseId != InvalidId); + ASSERT(m_objectStoreId != InvalidId); + ASSERT(m_indexId != InvalidId); if (m_databaseId != other.m_databaseId) return compareInts(m_databaseId, other.m_databaseId); @@ -910,30 +910,30 @@ int KeyPrefix::compare(const KeyPrefix& other) const KeyPrefix::Type KeyPrefix::type() const { - ASSERT(m_databaseId != kInvalidId); - ASSERT(m_objectStoreId != kInvalidId); - ASSERT(m_indexId != kInvalidId); + ASSERT(m_databaseId != InvalidId); + ASSERT(m_objectStoreId != InvalidId); + ASSERT(m_indexId != InvalidId); if (!m_databaseId) - return kGlobalMetaData; + return GlobalMetaData; if (!m_objectStoreId) - return kDatabaseMetaData; - if (m_indexId == kObjectStoreDataIndexId) - return kObjectStoreData; - if (m_indexId == kExistsEntryIndexId) - return kExistsEntry; - if (m_indexId >= kMinimumIndexId) - return kIndexData; + return DatabaseMetaData; + if (m_indexId == ObjectStoreDataIndexId) + return ObjectStoreData; + if (m_indexId == ExistsEntryIndexId) + return ExistsEntry; + if (m_indexId >= MinimumIndexId) + return IndexData; ASSERT_NOT_REACHED(); - return kInvalidType; + return InvalidType; } Vector<char> SchemaVersionKey::encode() { KeyPrefix prefix(0, 0, 0); Vector<char> ret = prefix.encode(); - ret.append(encodeByte(kSchemaVersionTypeByte)); + ret.append(encodeByte(SchemaVersionTypeByte)); return ret; } @@ -941,7 +941,7 @@ Vector<char> MaxDatabaseIdKey::encode() { KeyPrefix prefix(0, 0, 0); Vector<char> ret = prefix.encode(); - ret.append(encodeByte(kMaxDatabaseIdTypeByte)); + ret.append(encodeByte(MaxDatabaseIdTypeByte)); return ret; } @@ -953,7 +953,7 @@ DatabaseFreeListKey::DatabaseFreeListKey() const char* DatabaseFreeListKey::decode(const char* start, const char* limit, DatabaseFreeListKey* result) { KeyPrefix prefix; - const char *p = KeyPrefix::decode(start, limit, &prefix); + const char* p = KeyPrefix::decode(start, limit, &prefix); if (!p) return 0; ASSERT(!prefix.m_databaseId); @@ -962,7 +962,7 @@ const char* DatabaseFreeListKey::decode(const char* start, const char* limit, Da if (p == limit) return 0; unsigned char typeByte = *p++; - ASSERT_UNUSED(typeByte, typeByte == kDatabaseFreeListTypeByte); + ASSERT_UNUSED(typeByte, typeByte == DatabaseFreeListTypeByte); if (p == limit) return 0; return decodeVarInt(p, limit, result->m_databaseId); @@ -972,7 +972,7 @@ Vector<char> DatabaseFreeListKey::encode(int64_t databaseId) { KeyPrefix prefix(0, 0, 0); Vector<char> ret = prefix.encode(); - ret.append(encodeByte(kDatabaseFreeListTypeByte)); + ret.append(encodeByte(DatabaseFreeListTypeByte)); ret.append(encodeVarInt(databaseId)); return ret; } @@ -1006,7 +1006,7 @@ const char* DatabaseNameKey::decode(const char* start, const char* limit, Databa if (p == limit) return 0; unsigned char typeByte = *p++; - ASSERT_UNUSED(typeByte, typeByte == kDatabaseNameTypeByte); + ASSERT_UNUSED(typeByte, typeByte == DatabaseNameTypeByte); if (p == limit) return 0; p = decodeStringWithLength(p, limit, result->m_origin); @@ -1019,7 +1019,7 @@ Vector<char> DatabaseNameKey::encode(const String& origin, const String& databas { KeyPrefix prefix(0, 0, 0); Vector<char> ret = prefix.encode(); - ret.append(encodeByte(kDatabaseNameTypeByte)); + ret.append(encodeByte(DatabaseNameTypeByte)); ret.append(encodeStringWithLength(origin)); ret.append(encodeStringWithLength(databaseName)); return ret; @@ -1069,7 +1069,7 @@ const char* ObjectStoreMetaDataKey::decode(const char* start, const char* limit, if (p == limit) return 0; unsigned char typeByte = *p++; - ASSERT_UNUSED(typeByte, typeByte == kObjectStoreMetaDataTypeByte); + ASSERT_UNUSED(typeByte, typeByte == ObjectStoreMetaDataTypeByte); if (p == limit) return 0; p = decodeVarInt(p, limit, result->m_objectStoreId); @@ -1085,7 +1085,7 @@ Vector<char> ObjectStoreMetaDataKey::encode(int64_t databaseId, int64_t objectSt { KeyPrefix prefix(databaseId, 0, 0); Vector<char> ret = prefix.encode(); - ret.append(encodeByte(kObjectStoreMetaDataTypeByte)); + ret.append(encodeByte(ObjectStoreMetaDataTypeByte)); ret.append(encodeVarInt(objectStoreId)); ret.append(encodeVarInt(metaDataType)); return ret; @@ -1093,12 +1093,12 @@ Vector<char> ObjectStoreMetaDataKey::encode(int64_t databaseId, int64_t objectSt Vector<char> ObjectStoreMetaDataKey::encodeMaxKey(int64_t databaseId) { - return encode(databaseId, INT64_MAX, kObjectMetaDataTypeMaximum); + return encode(databaseId, INT64_MAX, ObjectMetaDataTypeMaximum); } Vector<char> ObjectStoreMetaDataKey::encodeMaxKey(int64_t databaseId, int64_t objectStoreId) { - return encode(databaseId, objectStoreId, kObjectMetaDataTypeMaximum); + return encode(databaseId, objectStoreId, ObjectMetaDataTypeMaximum); } int64_t ObjectStoreMetaDataKey::objectStoreId() const @@ -1143,7 +1143,7 @@ const char* IndexMetaDataKey::decode(const char* start, const char* limit, Index if (p == limit) return 0; unsigned char typeByte = *p++; - ASSERT_UNUSED(typeByte, typeByte == kIndexMetaDataTypeByte); + ASSERT_UNUSED(typeByte, typeByte == IndexMetaDataTypeByte); if (p == limit) return 0; p = decodeVarInt(p, limit, result->m_objectStoreId); @@ -1162,7 +1162,7 @@ Vector<char> IndexMetaDataKey::encode(int64_t databaseId, int64_t objectStoreId, { KeyPrefix prefix(databaseId, 0, 0); Vector<char> ret = prefix.encode(); - ret.append(encodeByte(kIndexMetaDataTypeByte)); + ret.append(encodeByte(IndexMetaDataTypeByte)); ret.append(encodeVarInt(objectStoreId)); ret.append(encodeVarInt(indexId)); ret.append(encodeByte(metaDataType)); @@ -1171,12 +1171,12 @@ Vector<char> IndexMetaDataKey::encode(int64_t databaseId, int64_t objectStoreId, Vector<char> IndexMetaDataKey::encodeMaxKey(int64_t databaseId, int64_t objectStoreId) { - return encode(databaseId, objectStoreId, INT64_MAX, kIndexMetaDataTypeMaximum); + return encode(databaseId, objectStoreId, INT64_MAX, IndexMetaDataTypeMaximum); } Vector<char> IndexMetaDataKey::encodeMaxKey(int64_t databaseId, int64_t objectStoreId, int64_t indexId) { - return encode(databaseId, objectStoreId, indexId, kIndexMetaDataTypeMaximum); + return encode(databaseId, objectStoreId, indexId, IndexMetaDataTypeMaximum); } int IndexMetaDataKey::compare(const IndexMetaDataKey& other) @@ -1205,7 +1205,7 @@ ObjectStoreFreeListKey::ObjectStoreFreeListKey() const char* ObjectStoreFreeListKey::decode(const char* start, const char* limit, ObjectStoreFreeListKey* result) { KeyPrefix prefix; - const char *p = KeyPrefix::decode(start, limit, &prefix); + const char* p = KeyPrefix::decode(start, limit, &prefix); if (!p) return 0; ASSERT(prefix.m_databaseId); @@ -1214,7 +1214,7 @@ const char* ObjectStoreFreeListKey::decode(const char* start, const char* limit, if (p == limit) return 0; unsigned char typeByte = *p++; - ASSERT_UNUSED(typeByte, typeByte == kObjectStoreFreeListTypeByte); + ASSERT_UNUSED(typeByte, typeByte == ObjectStoreFreeListTypeByte); if (p == limit) return 0; return decodeVarInt(p, limit, result->m_objectStoreId); @@ -1224,7 +1224,7 @@ Vector<char> ObjectStoreFreeListKey::encode(int64_t databaseId, int64_t objectSt { KeyPrefix prefix(databaseId, 0, 0); Vector<char> ret = prefix.encode(); - ret.append(encodeByte(kObjectStoreFreeListTypeByte)); + ret.append(encodeByte(ObjectStoreFreeListTypeByte)); ret.append(encodeVarInt(objectStoreId)); return ret; } @@ -1267,7 +1267,7 @@ const char* IndexFreeListKey::decode(const char* start, const char* limit, Index if (p == limit) return 0; unsigned char typeByte = *p++; - ASSERT_UNUSED(typeByte, typeByte == kIndexFreeListTypeByte); + ASSERT_UNUSED(typeByte, typeByte == IndexFreeListTypeByte); if (p == limit) return 0; p = decodeVarInt(p, limit, result->m_objectStoreId); @@ -1280,7 +1280,7 @@ Vector<char> IndexFreeListKey::encode(int64_t databaseId, int64_t objectStoreId, { KeyPrefix prefix(databaseId, 0, 0); Vector<char> ret = prefix.encode(); - ret.append(encodeByte(kIndexFreeListTypeByte)); + ret.append(encodeByte(IndexFreeListTypeByte)); ret.append(encodeVarInt(objectStoreId)); ret.append(encodeVarInt(indexId)); return ret; @@ -1327,7 +1327,7 @@ const char* ObjectStoreNamesKey::decode(const char* start, const char* limit, Ob if (p == limit) return 0; unsigned char typeByte = *p++; - ASSERT_UNUSED(typeByte, typeByte == kObjectStoreNamesTypeByte); + ASSERT_UNUSED(typeByte, typeByte == ObjectStoreNamesTypeByte); return decodeStringWithLength(p, limit, result->m_objectStoreName); } @@ -1335,7 +1335,7 @@ Vector<char> ObjectStoreNamesKey::encode(int64_t databaseId, const String& objec { KeyPrefix prefix(databaseId, 0, 0); Vector<char> ret = prefix.encode(); - ret.append(encodeByte(kObjectStoreNamesTypeByte)); + ret.append(encodeByte(ObjectStoreNamesTypeByte)); ret.append(encodeStringWithLength(objectStoreName)); return ret; } @@ -1364,7 +1364,7 @@ const char* IndexNamesKey::decode(const char* start, const char* limit, IndexNam if (p == limit) return 0; unsigned char typeByte = *p++; - ASSERT_UNUSED(typeByte, typeByte == kIndexNamesKeyTypeByte); + ASSERT_UNUSED(typeByte, typeByte == IndexNamesKeyTypeByte); if (p == limit) return 0; p = decodeVarInt(p, limit, result->m_objectStoreId); @@ -1377,7 +1377,7 @@ Vector<char> IndexNamesKey::encode(int64_t databaseId, int64_t objectStoreId, co { KeyPrefix prefix(databaseId, 0, 0); Vector<char> ret = prefix.encode(); - ret.append(encodeByte(kIndexNamesKeyTypeByte)); + ret.append(encodeByte(IndexNamesKeyTypeByte)); ret.append(encodeVarInt(objectStoreId)); ret.append(encodeStringWithLength(indexName)); return ret; @@ -1399,7 +1399,7 @@ const char* ObjectStoreDataKey::decode(const char* start, const char* end, Objec return 0; ASSERT(prefix.m_databaseId); ASSERT(prefix.m_objectStoreId); - ASSERT(prefix.m_indexId == kSpecialIndexNumber); + ASSERT(prefix.m_indexId == SpecialIndexNumber); if (p == end) return 0; return extractEncodedIDBKey(p, end, &result->m_encodedUserKey); @@ -1407,7 +1407,7 @@ const char* ObjectStoreDataKey::decode(const char* start, const char* end, Objec Vector<char> ObjectStoreDataKey::encode(int64_t databaseId, int64_t objectStoreId, const Vector<char> encodedUserKey) { - KeyPrefix prefix(databaseId, objectStoreId, kSpecialIndexNumber); + KeyPrefix prefix(databaseId, objectStoreId, SpecialIndexNumber); Vector<char> ret = prefix.encode(); ret.append(encodedUserKey); @@ -1431,7 +1431,7 @@ PassRefPtr<IDBKey> ObjectStoreDataKey::userKey() const return key; } -const int64_t ObjectStoreDataKey::kSpecialIndexNumber = kObjectStoreDataIndexId; +const int64_t ObjectStoreDataKey::SpecialIndexNumber = ObjectStoreDataIndexId; const char* ExistsEntryKey::decode(const char* start, const char* end, ExistsEntryKey* result) { @@ -1441,7 +1441,7 @@ const char* ExistsEntryKey::decode(const char* start, const char* end, ExistsEnt return 0; ASSERT(prefix.m_databaseId); ASSERT(prefix.m_objectStoreId); - ASSERT(prefix.m_indexId == kSpecialIndexNumber); + ASSERT(prefix.m_indexId == SpecialIndexNumber); if (p == end) return 0; return extractEncodedIDBKey(p, end, &result->m_encodedUserKey); @@ -1449,7 +1449,7 @@ const char* ExistsEntryKey::decode(const char* start, const char* end, ExistsEnt Vector<char> ExistsEntryKey::encode(int64_t databaseId, int64_t objectStoreId, const Vector<char>& encodedKey) { - KeyPrefix prefix(databaseId, objectStoreId, kSpecialIndexNumber); + KeyPrefix prefix(databaseId, objectStoreId, SpecialIndexNumber); Vector<char> ret = prefix.encode(); ret.append(encodedKey); return ret; @@ -1472,7 +1472,7 @@ PassRefPtr<IDBKey> ExistsEntryKey::userKey() const return key; } -const int64_t ExistsEntryKey::kSpecialIndexNumber = kExistsEntryIndexId; +const int64_t ExistsEntryKey::SpecialIndexNumber = ExistsEntryIndexId; IndexDataKey::IndexDataKey() : m_databaseId(-1) @@ -1490,7 +1490,7 @@ const char* IndexDataKey::decode(const char* start, const char* limit, IndexData return 0; ASSERT(prefix.m_databaseId); ASSERT(prefix.m_objectStoreId); - ASSERT(prefix.m_indexId >= kMinimumIndexId); + ASSERT(prefix.m_indexId >= MinimumIndexId); result->m_databaseId = prefix.m_databaseId; result->m_objectStoreId = prefix.m_objectStoreId; result->m_indexId = prefix.m_indexId; |