Merge 143347

Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 43 matching lines @@
 Vector<char> encodeBool(bool);
 bool decodeBool(const char* begin, const char* end);
 Vector<char> encodeInt(int64_t);
 int64_t decodeInt(const char* begin, const char* end);
 Vector<char> encodeVarInt(int64_t);
 const char* decodeVarInt(const char* p, const char* limit, int64_t& foundInt);
 Vector<char> encodeString(const String&);
 String decodeString(const char* p, const char* end);
 Vector<char> encodeStringWithLength(const String&);
 const char* decodeStringWithLength(const char* p, const char* limit, String& foundString);
-int compareEncodedStringsWithLength(const char*& p, const char* limitP, const char*& q, const char* limitQ);
+int compareEncodedStringsWithLength(const char*& p, const char* limitP, const char*& q, const char* limitQ, bool& ok);
 Vector<char> encodeDouble(double);
 const char* decodeDouble(const char* p, const char* limit, double*);
 void encodeIDBKey(const IDBKey&, Vector<char, DefaultInlineBufferSize>& into);
 Vector<char> encodeIDBKey(const IDBKey&);
 const char* decodeIDBKey(const char* p, const char* limit, RefPtr<IDBKey>& foundKey);
 const char* extractEncodedIDBKey(const char* start, const char* limit, Vector<char>* result);
-int compareEncodedIDBKeys(const Vector<char>&, const Vector<char>&);
+int compareEncodedIDBKeys(const Vector<char>&, const Vector<char>&, bool& ok);
 Vector<char> encodeIDBKeyPath(const IDBKeyPath&);
 IDBKeyPath decodeIDBKeyPath(const char*, const char*);
 
 int compare(const LevelDBSlice&, const LevelDBSlice&, bool indexKeys = false);
 
 class KeyPrefix {
 public:
     KeyPrefix();
     KeyPrefix(int64_t databaseId, int64_t objectStoreId, int64_t indexId);
 
@@ skipping 182 matching lines @@
 private:
     int64_t m_objectStoreId;
     String m_indexName;
 };
 
 class ObjectStoreDataKey {
 public:
     static const char* decode(const char* start, const char* end, ObjectStoreDataKey* result);
     static Vector<char> encode(int64_t databaseId, int64_t objectStoreId, const Vector<char> encodedUserKey);
     static Vector<char> encode(int64_t databaseId, int64_t objectStoreId, const IDBKey& userKey);
-    int compare(const ObjectStoreDataKey& other);
+    int compare(const ObjectStoreDataKey& other, bool& ok);
     PassRefPtr<IDBKey> userKey() const;
     static const int64_t SpecialIndexNumber;
 
 private:
     Vector<char> m_encodedUserKey;
 };
 
 class ExistsEntryKey {
 public:
     static const char* decode(const char* start, const char* end, ExistsEntryKey* result);
     static Vector<char> encode(int64_t databaseId, int64_t objectStoreId, const Vector<char>& encodedKey);
     static Vector<char> encode(int64_t databaseId, int64_t objectStoreId, const IDBKey& userKey);
-    int compare(const ExistsEntryKey& other);
+    int compare(const ExistsEntryKey& other, bool& ok);
     PassRefPtr<IDBKey> userKey() const;
 
     static const int64_t SpecialIndexNumber;
 
 private:
     Vector<char> m_encodedUserKey;
 };
 
 class IndexDataKey {
 public:
     IndexDataKey();
     static const char* decode(const char* start, const char* limit, IndexDataKey* result);
     static Vector<char> encode(int64_t databaseId, int64_t objectStoreId, int64_t indexId, const Vector<char>& encodedUserKey, const Vector<char>& encodedPrimaryKey, int64_t sequenceNumber = 0);
     static Vector<char> encode(int64_t databaseId, int64_t objectStoreId, int64_t indexId, const IDBKey& userKey);
     static Vector<char> encodeMinKey(int64_t databaseId, int64_t objectStoreId, int64_t indexId);
     static Vector<char> encodeMaxKey(int64_t databaseId, int64_t objectStoreId, int64_t indexId);
-    int compare(const IndexDataKey& other, bool ignoreDuplicates);
+    int compare(const IndexDataKey& other, bool ignoreDuplicates, bool& ok);
     int64_t databaseId() const;
     int64_t objectStoreId() const;
     int64_t indexId() const;
     PassRefPtr<IDBKey> userKey() const;
     PassRefPtr<IDBKey> primaryKey() const;
 
 private:
     int64_t m_databaseId;
     int64_t m_objectStoreId;
     int64_t m_indexId;
     Vector<char> m_encodedUserKey;
     Vector<char> m_encodedPrimaryKey;
     int64_t m_sequenceNumber;
 };
 
 } // namespace IDBLevelDBCoding
 
 } // namespace WebCore
 
 #endif // USE(LEVELDB)
 #endif // ENABLE(INDEXED_DATABASE)
 
 #endif // IDBLevelDBCoding_h