Changeset 73633 in webkit
- Timestamp:
- Dec 9, 2010 11:35:28 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r73632 r73633 1 2010-12-09 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r73616. 4 http://trac.webkit.org/changeset/73616 5 https://bugs.webkit.org/show_bug.cgi?id=50772 6 7 Breaks chromium win build (Requested by hwennborg on #webkit). 8 9 * storage/indexeddb/index-basics-expected.txt: 10 * storage/indexeddb/index-basics.html: 11 * storage/indexeddb/index-cursor.html: 12 * storage/indexeddb/keyrange-expected.txt: 13 * storage/indexeddb/keyrange.html: 14 * storage/indexeddb/objectstore-cursor.html: 15 1 16 2010-12-09 Brian Weinstein <bweinstein@apple.com> 2 17 -
trunk/LayoutTests/storage/indexeddb/index-basics-expected.txt
r73616 r73633 46 46 store.createIndex('indexName', 'x') 47 47 store.createIndex('indexName2', 'y', false) 48 store.createIndex('zIndex', 'z', true)49 48 PASS 'name' in indexObject is true 50 49 PASS indexObject.name is "indexName" … … 59 58 PASS 'getKey' in indexObject is true 60 59 PASS 'get' in indexObject is true 61 store.add({x: 'value', y: 'zzz' , z: 2.72}, 'key')62 PASS 'onsuccess' in result is true 63 PASS 'onerror' in result is true 64 PASS 'readyState' in result is true 65 An event should fire shortly... 66 67 Success event fired: 68 PASS 'result' in event is true 69 PASS 'code' in event is false 70 PASS 'message' in event is false 71 PASS 'source' in event is true 72 PASS event.source != null is true 73 PASS 'onsuccess' in event.target is true 74 PASS 'onerror' in event.target is true 75 PASS 'readyState' in event.target is true 76 PASS event.target.readyState is event.target.DONE 77 78 event.source.add({x: 'value2', y: 'zzz2' , z: 2.71}, 'key2')60 store.add({x: 'value', y: 'zzz'}, 'key') 61 PASS 'onsuccess' in result is true 62 PASS 'onerror' in result is true 63 PASS 'readyState' in result is true 64 An event should fire shortly... 65 66 Success event fired: 67 PASS 'result' in event is true 68 PASS 'code' in event is false 69 PASS 'message' in event is false 70 PASS 'source' in event is true 71 PASS event.source != null is true 72 PASS 'onsuccess' in event.target is true 73 PASS 'onerror' in event.target is true 74 PASS 'readyState' in event.target is true 75 PASS event.target.readyState is event.target.DONE 76 77 event.source.add({x: 'value2', y: 'zzz2'}, 'key2') 79 78 PASS 'onsuccess' in result is true 80 79 PASS 'onerror' in result is true … … 129 128 130 129 PASS event.result is "key" 131 indexObject3.get(2.71)132 PASS 'onsuccess' in result is true133 PASS 'onerror' in result is true134 PASS 'readyState' in result is true135 An event should fire shortly...136 137 Success event fired:138 PASS 'result' in event is true139 PASS 'code' in event is false140 PASS 'message' in event is false141 PASS 'source' in event is true142 PASS event.source != null is true143 PASS 'onsuccess' in event.target is true144 PASS 'onerror' in event.target is true145 PASS 'readyState' in event.target is true146 PASS event.target.readyState is event.target.DONE147 148 PASS event.result.x is "value2"149 130 indexObject.get('value') 150 131 PASS 'onsuccess' in result is true -
trunk/LayoutTests/storage/indexeddb/index-basics.html
r73616 r73633 50 50 window.indexObject = evalAndLog("store.createIndex('indexName', 'x')"); 51 51 window.indexObject2 = evalAndLog("store.createIndex('indexName2', 'y', false)"); 52 window.indexObject3 = evalAndLog("store.createIndex('zIndex', 'z', true)");53 52 addData(); 54 53 } … … 69 68 shouldBeTrue("'get' in indexObject"); 70 69 71 result = evalAndLog("store.add({x: 'value', y: 'zzz' , z: 2.72}, 'key')");70 result = evalAndLog("store.add({x: 'value', y: 'zzz'}, 'key')"); 72 71 verifyResult(result); 73 72 result.onsuccess = addMore; … … 79 78 verifySuccessEvent(event); 80 79 81 result = evalAndLog("event.source.add({x: 'value2', y: 'zzz2' , z: 2.71}, 'key2')");80 result = evalAndLog("event.source.add({x: 'value2', y: 'zzz2'}, 'key2')"); 82 81 verifyResult(result); 83 82 result.onsuccess = getData; … … 110 109 verifySuccessEvent(event); 111 110 shouldBeEqualToString("event.result", "key"); 112 113 result = evalAndLog("indexObject3.get(2.71)");114 verifyResult(result);115 result.onsuccess = getObjectData3;116 result.onerror = unexpectedErrorCallback;117 }118 119 function getObjectData3()120 {121 verifySuccessEvent(event);122 shouldBeEqualToString("event.result.x", "value2");123 111 124 112 result = evalAndLog("indexObject.get('value')"); -
trunk/LayoutTests/storage/indexeddb/index-cursor.html
r73616 r73633 19 19 1, 20 20 1, 21 3.14159,22 3.14159,21 2, 22 2, 23 23 10, 24 24 // FIXME: Dates. -
trunk/LayoutTests/storage/indexeddb/keyrange-expected.txt
r73616 r73633 28 28 PASS keyRange.lowerOpen is false 29 29 PASS keyRange.upperOpen is false 30 webkitIDBKeyRange.only(3.14)31 PASS keyRange.lower is 3.1432 PASS keyRange.upper is 3.1433 PASS keyRange.lowerOpen is false34 PASS keyRange.upperOpen is false35 30 webkitIDBKeyRange.only('a') 36 31 PASS keyRange.lower is 'a' … … 50 45 webkitIDBKeyRange.lowerBound(12,undefined) 51 46 PASS keyRange.lower is 12 52 PASS keyRange.lowerOpen is false53 PASS keyRange.upper is null54 PASS keyRange.upperOpen is false55 webkitIDBKeyRange.lowerBound(10.1,true)56 PASS keyRange.lower is 10.157 PASS keyRange.lowerOpen is true58 PASS keyRange.upper is null59 PASS keyRange.upperOpen is false60 webkitIDBKeyRange.lowerBound(11.2,false)61 PASS keyRange.lower is 11.262 PASS keyRange.lowerOpen is false63 PASS keyRange.upper is null64 PASS keyRange.upperOpen is false65 webkitIDBKeyRange.lowerBound(12.3,undefined)66 PASS keyRange.lower is 12.367 47 PASS keyRange.lowerOpen is false 68 48 PASS keyRange.upper is null … … 95 75 webkitIDBKeyRange.upperBound(22,undefined) 96 76 PASS keyRange.upper is 22 97 PASS keyRange.upperOpen is false98 PASS keyRange.lower is null99 PASS keyRange.lowerOpen is false100 webkitIDBKeyRange.upperBound(20.2,true)101 PASS keyRange.upper is 20.2102 PASS keyRange.upperOpen is true103 PASS keyRange.lower is null104 PASS keyRange.lowerOpen is false105 webkitIDBKeyRange.upperBound(21.3,false)106 PASS keyRange.upper is 21.3107 PASS keyRange.upperOpen is false108 PASS keyRange.lower is null109 PASS keyRange.lowerOpen is false110 webkitIDBKeyRange.upperBound(22.4,undefined)111 PASS keyRange.upper is 22.4112 77 PASS keyRange.upperOpen is false 113 78 PASS keyRange.lower is null … … 150 115 webkitIDBKeyRange.bound(34,44, {lowerOpen: true, upperOpen:true}) 151 116 PASS keyRange.lower is 34 152 PASS keyRange.upper is 44153 PASS keyRange.lowerOpen is true154 PASS keyRange.upperOpen is true155 webkitIDBKeyRange.bound(30.1,40.2, {lowerOpen: undefined, upperOpen:undefined})156 PASS keyRange.lower is 30.1157 PASS keyRange.upper is 40.2158 PASS keyRange.lowerOpen is false159 PASS keyRange.upperOpen is false160 webkitIDBKeyRange.bound(31.3,41.4, {lowerOpen: false, upperOpen:false})161 PASS keyRange.lower is 31.3162 PASS keyRange.upper is 41.4163 PASS keyRange.lowerOpen is false164 PASS keyRange.upperOpen is false165 webkitIDBKeyRange.bound(32.5,42.6, {lowerOpen: false, upperOpen:true})166 PASS keyRange.lower is 32.5167 PASS keyRange.upper is 42.6168 PASS keyRange.lowerOpen is false169 PASS keyRange.upperOpen is true170 webkitIDBKeyRange.bound(33.7,43.8, {lowerOpen: true, upperOpen:false})171 PASS keyRange.lower is 33.7172 PASS keyRange.upper is 43.8173 PASS keyRange.lowerOpen is true174 PASS keyRange.upperOpen is false175 webkitIDBKeyRange.bound(34.9,44, {lowerOpen: true, upperOpen:true})176 PASS keyRange.lower is 34.9177 117 PASS keyRange.upper is 44 178 118 PASS keyRange.lowerOpen is true -
trunk/LayoutTests/storage/indexeddb/keyrange.html
r73616 r73633 85 85 86 86 checkSingleKeyRange(1); 87 checkSingleKeyRange(3.14);88 87 checkSingleKeyRange("'a'"); 89 88 … … 91 90 checkLowerBoundKeyRange(11, false); 92 91 checkLowerBoundKeyRange(12); 93 checkLowerBoundKeyRange(10.1, true);94 checkLowerBoundKeyRange(11.2, false);95 checkLowerBoundKeyRange(12.3);96 92 checkLowerBoundKeyRange("'aa'", true); 97 93 checkLowerBoundKeyRange("'ab'", false); … … 101 97 checkUpperBoundKeyRange(21, false); 102 98 checkUpperBoundKeyRange(22); 103 checkUpperBoundKeyRange(20.2, true);104 checkUpperBoundKeyRange(21.3, false);105 checkUpperBoundKeyRange(22.4);106 99 checkUpperBoundKeyRange("'ba'", true); 107 100 checkUpperBoundKeyRange("'bb'", false); … … 113 106 checkBoundKeyRange(33, 43, true, false); 114 107 checkBoundKeyRange(34, 44, true, true); 115 116 checkBoundKeyRange(30.1, 40.2);117 checkBoundKeyRange(31.3, 41.4, false, false);118 checkBoundKeyRange(32.5, 42.6, false, true);119 checkBoundKeyRange(33.7, 43.8, true, false);120 checkBoundKeyRange(34.9, 44.0, true, true);121 108 122 109 checkBoundKeyRange("'aaa'", "'aba'", false, false); -
trunk/LayoutTests/storage/indexeddb/objectstore-cursor.html
r73616 r73633 17 17 // In order of how it should be sorted by IndexedDB. 18 18 window.testData = [ 19 2.718281828459, 19 1, 20 2, 20 21 3, 21 3.14159265,22 22 10, 23 23 // FIXME: Dates. -
trunk/WebCore/ChangeLog
r73629 r73633 1 2010-12-09 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r73616. 4 http://trac.webkit.org/changeset/73616 5 https://bugs.webkit.org/show_bug.cgi?id=50772 6 7 Breaks chromium win build (Requested by hwennborg on #webkit). 8 9 * bindings/v8/IDBBindingUtilities.cpp: 10 (WebCore::createIDBKeyFromValue): 11 * bindings/v8/custom/V8IDBKeyCustom.cpp: 12 (WebCore::toV8): 13 * storage/IDBFactoryBackendImpl.cpp: 14 (WebCore::createTables): 15 (WebCore::IDBFactoryBackendImpl::open): 16 * storage/IDBKey.cpp: 17 (WebCore::IDBKey::IDBKey): 18 (WebCore::IDBKey::fromQuery): 19 (WebCore::IDBKey::bind): 20 (WebCore::IDBKey::bindWithNulls): 21 * storage/IDBKey.h: 22 (WebCore::IDBKey::create): 23 (WebCore::IDBKey::number): 24 1 25 2010-12-09 Antonio Gomes <agomes@rim.com> 2 26 -
trunk/WebCore/bindings/v8/IDBBindingUtilities.cpp
r73616 r73633 42 42 if (value->IsNull()) 43 43 return IDBKey::create(); 44 if (value->Is Number())45 return IDBKey::create(value-> NumberValue());44 if (value->IsInt32()) 45 return IDBKey::create(value->Int32Value()); 46 46 if (value->IsString()) 47 47 return IDBKey::create(v8ValueToWebCoreString(value)); -
trunk/WebCore/bindings/v8/custom/V8IDBKeyCustom.cpp
r73616 r73633 46 46 return v8::Null(); 47 47 case IDBKey::NumberType: 48 return v8:: Number::New(key->number());48 return v8::Integer::New(key->number()); 49 49 case IDBKey::StringType: 50 50 return v8String(key->string()); -
trunk/WebCore/storage/IDBFactoryBackendImpl.cpp
r73616 r73633 36 36 #include "IDBSQLiteDatabase.h" 37 37 #include "IDBTransactionCoordinator.h" 38 #include "SQLiteStatement.h"39 #include "SQLiteTransaction.h"40 38 #include "SecurityOrigin.h" 41 39 #include <wtf/Threading.h> … … 96 94 static bool createTables(SQLiteDatabase& sqliteDatabase) 97 95 { 98 if (sqliteDatabase.tableExists("Databases")) 99 return true; 96 static const char* commands[] = { 97 "CREATE TABLE IF NOT EXISTS Databases (id INTEGER PRIMARY KEY, name TEXT NOT NULL, description TEXT NOT NULL, version TEXT NOT NULL)", 98 "CREATE UNIQUE INDEX IF NOT EXISTS Databases_name ON Databases(name)", 100 99 101 static const char* commands[] = { 102 "CREATE TABLE Databases (id INTEGER PRIMARY KEY, name TEXT NOT NULL, description TEXT NOT NULL, version TEXT NOT NULL)", 103 "CREATE UNIQUE INDEX Databases_name ON Databases(name)", 100 "CREATE TABLE IF NOT EXISTS ObjectStores (id INTEGER PRIMARY KEY, name TEXT NOT NULL, keyPath TEXT, doAutoIncrement INTEGER NOT NULL, databaseId INTEGER NOT NULL REFERENCES Databases(id))", 101 "CREATE UNIQUE INDEX IF NOT EXISTS ObjectStores_composit ON ObjectStores(databaseId, name)", 104 102 105 "CREATE TABLE ObjectStores (id INTEGER PRIMARY KEY, name TEXT NOT NULL, keyPath TEXT, doAutoIncrement INTEGER NOT NULL, databaseId INTEGER NOT NULL REFERENCES Databases(id))",106 "CREATE UNIQUE INDEX ObjectStores_composit ON ObjectStores(databaseId, name)",103 "CREATE TABLE IF NOT EXISTS Indexes (id INTEGER PRIMARY KEY, objectStoreId INTEGER NOT NULL REFERENCES ObjectStore(id), name TEXT NOT NULL, keyPath TEXT, isUnique INTEGER NOT NULL)", 104 "CREATE UNIQUE INDEX IF NOT EXISTS Indexes_composit ON Indexes(objectStoreId, name)", 107 105 108 "CREATE TABLE I ndexes (id INTEGER PRIMARY KEY, objectStoreId INTEGER NOT NULL REFERENCES ObjectStore(id), name TEXT NOT NULL, keyPath TEXT, isUnique INTEGERNOT NULL)",109 "CREATE UNIQUE INDEX I ndexes_composit ON Indexes(objectStoreId, name)",106 "CREATE TABLE IF NOT EXISTS ObjectStoreData (id INTEGER PRIMARY KEY, objectStoreId INTEGER NOT NULL REFERENCES ObjectStore(id), keyString TEXT, keyDate INTEGER, keyNumber INTEGER, value TEXT NOT NULL)", 107 "CREATE UNIQUE INDEX IF NOT EXISTS ObjectStoreData_composit ON ObjectStoreData(keyString, keyDate, keyNumber, objectStoreId)", 110 108 111 "CREATE TABLE ObjectStoreData (id INTEGER PRIMARY KEY, objectStoreId INTEGER NOT NULL REFERENCES ObjectStore(id), keyString TEXT, keyDate INTEGER, keyNumber INTEGER, value TEXT NOT NULL)", 112 "CREATE UNIQUE INDEX ObjectStoreData_composit ON ObjectStoreData(keyString, keyDate, keyNumber, objectStoreId)", 113 114 "CREATE TABLE IndexData (id INTEGER PRIMARY KEY, indexId INTEGER NOT NULL REFERENCES Indexes(id), keyString TEXT, keyDate INTEGER, keyNumber INTEGER, objectStoreDataId INTEGER NOT NULL REFERENCES ObjectStoreData(id))", 115 "CREATE INDEX IndexData_composit ON IndexData(keyString, keyDate, keyNumber, indexId)", 116 "CREATE INDEX IndexData_objectStoreDataId ON IndexData(objectStoreDataId)", 117 "CREATE INDEX IndexData_indexId ON IndexData(indexId)", 109 "CREATE TABLE IF NOT EXISTS IndexData (id INTEGER PRIMARY KEY, indexId INTEGER NOT NULL REFERENCES Indexes(id), keyString TEXT, keyDate INTEGER, keyNumber INTEGER, objectStoreDataId INTEGER NOT NULL REFERENCES ObjectStoreData(id))", 110 "CREATE INDEX IF NOT EXISTS IndexData_composit ON IndexData(keyString, keyDate, keyNumber, indexId)", 111 "CREATE INDEX IF NOT EXISTS IndexData_objectStoreDataId ON IndexData(objectStoreDataId)", 112 "CREATE INDEX IF NOT EXISTS IndexData_indexId ON IndexData(indexId)" 118 113 }; 119 114 120 SQLiteTransaction transaction(sqliteDatabase, false);121 transaction.begin();122 115 for (size_t i = 0; i < arraysize(commands); ++i) { 123 116 if (!sqliteDatabase.executeCommand(commands[i])) { … … 127 120 } 128 121 } 129 transaction.commit();130 return true;131 }132 133 static bool createMetaDataTable(SQLiteDatabase& sqliteDatabase)134 {135 static const char* commands[] = {136 "CREATE TABLE MetaData (name TEXT PRIMARY KEY, value NONE)",137 "INSERT INTO MetaData VALUES ('version', 1)",138 };139 140 SQLiteTransaction transaction(sqliteDatabase, false);141 transaction.begin();142 for (size_t i = 0; i < arraysize(commands); ++i) {143 if (!sqliteDatabase.executeCommand(commands[i]))144 return false;145 }146 transaction.commit();147 return true;148 }149 150 static bool getDatabaseVersion(SQLiteDatabase& sqliteDatabase, int* databaseVersion)151 {152 SQLiteStatement query(sqliteDatabase, "SELECT value FROM MetaData WHERE name = 'version'");153 if (query.prepare() != SQLResultOk || query.step() != SQLResultRow)154 return false;155 156 *databaseVersion = query.getColumnInt(0);157 return query.finalize() == SQLResultOk;158 }159 160 static bool migrateDatabase(SQLiteDatabase& sqliteDatabase)161 {162 if (!sqliteDatabase.tableExists("MetaData")) {163 if (!createMetaDataTable(sqliteDatabase))164 return false;165 }166 167 int databaseVersion;168 if (!getDatabaseVersion(sqliteDatabase, &databaseVersion))169 return false;170 171 if (databaseVersion == 1) {172 static const char* commands[] = {173 "DROP TABLE IF EXISTS ObjectStoreData2",174 "CREATE TABLE ObjectStoreData2 (id INTEGER PRIMARY KEY, objectStoreId INTEGER NOT NULL REFERENCES ObjectStore(id), keyString TEXT, keyDate REAL, keyNumber REAL, value TEXT NOT NULL)",175 "INSERT INTO ObjectStoreData2 SELECT * FROM ObjectStoreData",176 "DROP TABLE ObjectStoreData", // This depends on SQLite not enforcing referential consistency.177 "ALTER TABLE ObjectStoreData2 RENAME TO ObjectStoreData",178 "CREATE UNIQUE INDEX ObjectStoreData_composit ON ObjectStoreData(keyString, keyDate, keyNumber, objectStoreId)",179 "DROP TABLE IF EXISTS IndexData2", // This depends on SQLite not enforcing referential consistency.180 "CREATE TABLE IndexData2 (id INTEGER PRIMARY KEY, indexId INTEGER NOT NULL REFERENCES Indexes(id), keyString TEXT, keyDate REAL, keyNumber REAL, objectStoreDataId INTEGER NOT NULL REFERENCES ObjectStoreData(id))",181 "INSERT INTO IndexData2 SELECT * FROM IndexData",182 "DROP TABLE IndexData",183 "ALTER TABLE IndexData2 RENAME TO IndexData",184 "CREATE INDEX IndexData_composit ON IndexData(keyString, keyDate, keyNumber, indexId)",185 "CREATE INDEX IndexData_objectStoreDataId ON IndexData(objectStoreDataId)",186 "CREATE INDEX IndexData_indexId ON IndexData(indexId)",187 "UPDATE MetaData SET value = 2 WHERE name = 'version'",188 };189 190 SQLiteTransaction transaction(sqliteDatabase, false);191 transaction.begin();192 for (size_t i = 0; i < arraysize(commands); ++i) {193 if (!sqliteDatabase.executeCommand(commands[i])) {194 LOG_ERROR("Failed to run the following command for IndexedDB: %s", commands[i]);195 return false;196 }197 }198 transaction.commit();199 200 databaseVersion = 2;201 }202 203 122 return true; 204 123 } … … 223 142 sqliteDatabase = openSQLiteDatabase(securityOrigin.get(), dataDir, maximumSize, fileIdentifier, this); 224 143 225 if (!sqliteDatabase || !createTables(sqliteDatabase->db()) || !migrateDatabase(sqliteDatabase->db())) {144 if (!sqliteDatabase || !createTables(sqliteDatabase->db())) { 226 145 callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UNKNOWN_ERR, "Internal error.")); 227 m_sqliteDatabaseMap.set(fileIdentifier, 0);228 146 return; 229 147 } … … 239 157 240 158 #endif // ENABLE(INDEXED_DATABASE) 159 -
trunk/WebCore/storage/IDBKey.cpp
r73616 r73633 39 39 } 40 40 41 IDBKey::IDBKey( doublenumber)41 IDBKey::IDBKey(int32_t number) 42 42 : m_type(NumberType) 43 43 , m_number(number) … … 66 66 67 67 if (!query.isColumnNull(baseColumn + 2)) 68 return IDBKey::create(query.getColumn Double(baseColumn + 2));68 return IDBKey::create(query.getColumnInt(baseColumn + 2)); 69 69 70 70 return IDBKey::create(); // Null. … … 148 148 return 1; 149 149 case IDBKey::NumberType: 150 query.bind Double(column, m_number);150 query.bindInt(column, m_number); 151 151 return 1; 152 152 case IDBKey::NullType: … … 169 169 query.bindNull(baseColumn + 0); 170 170 query.bindNull(baseColumn + 1); 171 query.bind Double(baseColumn + 2, m_number);171 query.bindInt(baseColumn + 2, m_number); 172 172 break; 173 173 case IDBKey::NullType: -
trunk/WebCore/storage/IDBKey.h
r73616 r73633 44 44 return adoptRef(new IDBKey()); 45 45 } 46 static PassRefPtr<IDBKey> create( doublenumber)46 static PassRefPtr<IDBKey> create(int32_t number) 47 47 { 48 48 return adoptRef(new IDBKey(number)); … … 69 69 } 70 70 71 doublenumber() const71 int32_t number() const 72 72 { 73 73 ASSERT(m_type == NumberType); … … 89 89 private: 90 90 IDBKey(); 91 explicit IDBKey( double);91 explicit IDBKey(int32_t); 92 92 explicit IDBKey(const String&); 93 93 94 94 Type m_type; 95 95 String m_string; 96 doublem_number;96 int32_t m_number; 97 97 }; 98 98 -
trunk/WebKit/chromium/ChangeLog
r73616 r73633 1 2010-12-09 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r73616. 4 http://trac.webkit.org/changeset/73616 5 https://bugs.webkit.org/show_bug.cgi?id=50772 6 7 Breaks chromium win build (Requested by hwennborg on #webkit). 8 9 * public/WebIDBKey.h: 10 (WebKit::WebIDBKey::WebIDBKey): 11 * src/WebIDBKey.cpp: 12 (WebKit::WebIDBKey::assign): 13 (WebKit::WebIDBKey::number): 14 1 15 2010-12-09 Hans Wennborg <hans@chromium.org> 2 16 -
trunk/WebKit/chromium/public/WebIDBKey.h
r73616 r73633 49 49 50 50 WebIDBKey(const WebString& string) { assign(string); } 51 WebIDBKey( doublenumber) { assign(number); }51 WebIDBKey(int32_t number) { assign(number); } 52 52 WebIDBKey(const WebIDBKey& e) { assign(e); } 53 53 WebIDBKey& operator=(const WebIDBKey& e) … … 60 60 WEBKIT_API void assignNull(); 61 61 WEBKIT_API void assign(const WebString&); 62 WEBKIT_API void assign( double);62 WEBKIT_API void assign(int32_t); 63 63 WEBKIT_API void assignInvalid(); 64 64 WEBKIT_API void reset(); … … 74 74 WEBKIT_API Type type() const; 75 75 WEBKIT_API WebString string() const; // Only valid for StringType. 76 WEBKIT_API doublenumber() const; // Only valid for numberType.76 WEBKIT_API int32_t number() const; // Only valid for numberType. 77 77 78 78 #if WEBKIT_IMPLEMENTATION -
trunk/WebKit/chromium/src/WebIDBKey.cpp
r73616 r73633 78 78 } 79 79 80 void WebIDBKey::assign( doublenumber)80 void WebIDBKey::assign(int32_t number) 81 81 { 82 82 m_private = IDBKey::create(number); … … 105 105 } 106 106 107 doubleWebIDBKey::number() const107 int32_t WebIDBKey::number() const 108 108 { 109 109 return m_private->number();
Note: See TracChangeset
for help on using the changeset viewer.