74205 2011-12-09 13:10:10 -0800 IndexedDB: Clean up WebIDBObjectStore createIndex temp code 2011-12-15 22:00:19 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jsbell jsbell dgrogan fishd hans tony webkit.review.bot oldest_to_newest 518435 0 jsbell 2011-12-09 13:10:10 -0800 Now that callers (i.e. Chromium) are updated to implement the new signatures, the old methods can be removed: diff --git a/Source/WebKit/chromium/public/WebIDBObjectStore.h b/Source/WebKit/chromium/public/WebIDBObjectStore.h index 4448a9b..ab3df5f 100755 --- a/Source/WebKit/chromium/public/WebIDBObjectStore.h +++ b/Source/WebKit/chromium/public/WebIDBObjectStore.h @@ -70,16 +70,7 @@ public: virtual void put(const WebSerializedScriptValue&, const WebIDBKey&, PutMode, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void deleteFunction(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } virtual void clear(WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } - // FIXME: Remove once callers are updated. - virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, const WebIDBTransaction& transaction, WebExceptionCode& ec) - { - return createIndex(name, keyPath, unique, false, transaction, ec); - } - virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, bool multiEntry, const WebIDBTransaction& transaction, WebExceptionCode& ec) - { - // FIXME: Assert not reached once implementing classes are updated. - return createIndex(name, keyPath, unique, transaction, ec); - } + virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, bool multiEntry, const WebIDBTransaction& transaction, WebExceptionCode& ec) { WEBKIT_ASSERT_NOT_REACHED(); } // Transfers ownership of the WebIDBIndex to the caller. virtual WebIDBIndex* index(const WebString& name, WebExceptionCode&) { 522229 1 119500 jsbell 2011-12-15 14:07:03 -0800 Created attachment 119500 Patch 522230 2 webkit.review.bot 2011-12-15 14:09:45 -0800 Please wait for approval from fishd@chromium.org before submitting because this patch contains changes to the Chromium public API. 522528 3 119500 webkit.review.bot 2011-12-15 22:00:15 -0800 Comment on attachment 119500 Patch Clearing flags on attachment: 119500 Committed r103025: <http://trac.webkit.org/changeset/103025> 522529 4 webkit.review.bot 2011-12-15 22:00:19 -0800 All reviewed patches have been landed. Closing bug. 119500 2011-12-15 14:07:03 -0800 2011-12-15 22:00:15 -0800 Patch bug-74205-20111215140702.patch text/plain 2448 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDhlNGEwNzA2MzE3MzM4YTc1M2VjNDZiZWUyODhhOWIwMWNlZmRjOTkuLjRiNjc1ODAwZDY0M2Fh Y2JjMzNhODU3NjdmODI1YmNkMmExY2U5YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTEtMTItMTUgIEpvc2h1YSBCZWxsICA8anNiZWxsQGNocm9taXVt Lm9yZz4KKworICAgICAgICBJbmRleGVkREI6IENsZWFuIHVwIFdlYklEQk9iamVjdFN0b3JlIGNy ZWF0ZUluZGV4IHRlbXAgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzQyMDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSZW1vdmUgYSBtZXRob2QgYW5kIGFuIGltcGxlbWVudGF0aW9uIHRoYXQgb25s eSBuZWVkZWQgZm9yCisgICAgICAgIG9sZGVyIENocm9taXVtIHJldmlzaW9ucy4KKworICAgICAg ICAqIHB1YmxpYy9XZWJJREJPYmplY3RTdG9yZS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJJREJP YmplY3RTdG9yZTo6Y3JlYXRlSW5kZXgpOgorCiAyMDExLTEyLTEyICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFdlYktpdCBjb2RlIHNob3VsZG4ndCBiZSBjYWxs aW5nIGFwcGx5Q29tbWFuZCBkaXJlY3RseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViSURCT2JqZWN0U3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYklEQk9iamVjdFN0b3JlLmgKaW5kZXggNDQ0OGE5YmI0NzgxMDI0MmVjN2E3YzRl YWY3ZTM4NWQwN2YzYzUwMS4uNmJkNTFmNDE5YWViMWFjNjljNGMzYjlkY2YxODRmZWQwMGIwOTA4 ZiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSURCT2JqZWN0 U3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJREJPYmplY3RT dG9yZS5oCkBAIC03MCwxNSArNzAsMTAgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBwdXQo Y29uc3QgV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlJiwgY29uc3QgV2ViSURCS2V5JiwgUHV0TW9k ZSwgV2ViSURCQ2FsbGJhY2tzKiwgY29uc3QgV2ViSURCVHJhbnNhY3Rpb24mLCBXZWJFeGNlcHRp b25Db2RlJikgeyBXRUJLSVRfQVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KICAgICB2aXJ0dWFsIHZv aWQgZGVsZXRlRnVuY3Rpb24oY29uc3QgV2ViSURCS2V5JiwgV2ViSURCQ2FsbGJhY2tzKiwgY29u c3QgV2ViSURCVHJhbnNhY3Rpb24mLCBXZWJFeGNlcHRpb25Db2RlJikgeyBXRUJLSVRfQVNTRVJU X05PVF9SRUFDSEVEKCk7IH0KICAgICB2aXJ0dWFsIHZvaWQgY2xlYXIoV2ViSURCQ2FsbGJhY2tz KiwgY29uc3QgV2ViSURCVHJhbnNhY3Rpb24mLCBXZWJFeGNlcHRpb25Db2RlJikgeyBXRUJLSVRf QVNTRVJUX05PVF9SRUFDSEVEKCk7IH0KLSAgICAvLyBGSVhNRTogUmVtb3ZlIG9uY2UgY2FsbGVy cyBhcmUgdXBkYXRlZC4KLSAgICB2aXJ0dWFsIFdlYklEQkluZGV4KiBjcmVhdGVJbmRleChjb25z dCBXZWJTdHJpbmcmIG5hbWUsIGNvbnN0IFdlYlN0cmluZyYga2V5UGF0aCwgYm9vbCB1bmlxdWUs IGNvbnN0IFdlYklEQlRyYW5zYWN0aW9uJiB0cmFuc2FjdGlvbiwgV2ViRXhjZXB0aW9uQ29kZSYg ZWMpCi0gICAgewotICAgICAgICByZXR1cm4gY3JlYXRlSW5kZXgobmFtZSwga2V5UGF0aCwgdW5p cXVlLCBmYWxzZSwgdHJhbnNhY3Rpb24sIGVjKTsKLSAgICB9CiAgICAgdmlydHVhbCBXZWJJREJJ bmRleCogY3JlYXRlSW5kZXgoY29uc3QgV2ViU3RyaW5nJiBuYW1lLCBjb25zdCBXZWJTdHJpbmcm IGtleVBhdGgsIGJvb2wgdW5pcXVlLCBib29sIG11bHRpRW50cnksIGNvbnN0IFdlYklEQlRyYW5z YWN0aW9uJiB0cmFuc2FjdGlvbiwgV2ViRXhjZXB0aW9uQ29kZSYgZWMpCiAgICAgewotICAgICAg ICAvLyBGSVhNRTogQXNzZXJ0IG5vdCByZWFjaGVkIG9uY2UgaW1wbGVtZW50aW5nIGNsYXNzZXMg YXJlIHVwZGF0ZWQuCi0gICAgICAgIHJldHVybiBjcmVhdGVJbmRleChuYW1lLCBrZXlQYXRoLCB1 bmlxdWUsIHRyYW5zYWN0aW9uLCBlYyk7CisgICAgICAgIFdFQktJVF9BU1NFUlRfTk9UX1JFQUNI RUQoKTsKKyAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogICAgIC8vIFRyYW5zZmVycyBvd25lcnNo aXAgb2YgdGhlIFdlYklEQkluZGV4IHRvIHRoZSBjYWxsZXIuCiAgICAgdmlydHVhbCBXZWJJREJJ bmRleCogaW5kZXgoY29uc3QgV2ViU3RyaW5nJiBuYW1lLCBXZWJFeGNlcHRpb25Db2RlJikK