115493 2013-05-01 16:00:40 -0700 Implement LocalStorageDatabase::importItems 2013-05-01 16:16:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 883569 0 andersca 2013-05-01 16:00:40 -0700 Implement LocalStorageDatabase::importItems 883571 1 200249 andersca 2013-05-01 16:01:41 -0700 Created attachment 200249 Patch 883575 2 200249 kling 2013-05-01 16:11:04 -0700 Comment on attachment 200249 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=200249&action=review > Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp:139 > +void LocalStorageDatabase::importItems(StorageMap& storageMap) Why doesn't this method return something to indicate success/failure? > Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp:158 > + items.set(query.getColumnText(0), query.getColumnBlobAsString(1)); You're not gonna sanity-check the column types? 883578 3 andersca 2013-05-01 16:12:58 -0700 (In reply to comment #2) > (From update of attachment 200249 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=200249&action=review > > > Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp:139 > > +void LocalStorageDatabase::importItems(StorageMap& storageMap) > > Why doesn't this method return something to indicate success/failure? It indicates success by adding the items to the map. > > > Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp:158 > > + items.set(query.getColumnText(0), query.getColumnBlobAsString(1)); > > You're not gonna sanity-check the column types? We already know that column 1 is a blob (taken care of by migrateItemTableIfNeeded()), and column 0 will always be coerced to a string. 883579 4 200249 kling 2013-05-01 16:13:45 -0700 Comment on attachment 200249 Patch Okay, r=me. 883580 5 andersca 2013-05-01 16:16:32 -0700 Committed r149460: <http://trac.webkit.org/changeset/149460> 200249 2013-05-01 16:01:41 -0700 2013-05-01 16:13:43 -0700 Patch bug-115493-20130501160055.patch text/plain 5560 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5NDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDRiYzFkZGJkNmI3NDA1 ZjcyYzk2NTU4OTA0ZjQ2ZmQ4MTAzNTlhNy4uYzNlOTU5M2Y2NGZlMDVjMjk3ZDcwMjE0ZjgyYmU4 YWVkZjMxMzQwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDEzLTA1LTAxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgSW1wbGVtZW50IExv Y2FsU3RvcmFnZURhdGFiYXNlOjppbXBvcnRJdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1NDkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRXhwb3J0IHN5bWJvbHMgbmVlZGVkIGJ5IFdlYktpdDIu CisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKworMjAxMy0wNS0wMSAgQW5kZXJzIENhcmxz c29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIEJlZ2luIHdvcmsgb24gbG9hZGlu ZyBpdGVtcyBmcm9tIHRoZSBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTU0ODkKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDNm NTdmNzA4MTI0NGNlMWE3NDIzMjg2ZmIzMmQwNmY2YzdkYjFiMWIuLjIyN2ViOTA5MmY0ZWQyZTVm YTZhZWE4OWVjZTM2NzFiNDJiZjRlOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNiBAQAogMjAx My0wNS0wMSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAg IEltcGxlbWVudCBMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6aW1wb3J0SXRlbXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTQ5MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZldGNoIGl0ZW1zIGFuZCBpbnNl cnQgdGhlbSBpbiB0aGUgc3RvcmFnZSBtYXAuCisgICAgICAgICogVUlQcm9jZXNzL1N0b3JhZ2Uv TG9jYWxTdG9yYWdlRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpMb2NhbFN0b3JhZ2VE YXRhYmFzZTo6aW1wb3J0SXRlbXMpOgorCisyMDEzLTA1LTAxICBBbmRlcnMgQ2FybHNzb24gIDxh bmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgQmVnaW4gd29yayBvbiBsb2FkaW5nIGl0ZW1z IGZyb20gdGhlIGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2UKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTQ4OQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4 IDRlMGIwOTY2Y2I1Mjg4MzRhMTdhMTMzYTY5NWVlMzM5NDY0OTJkYjEuLmZjY2FhYjI3MzkwMTk3 Zjk3NzM3MWZiMzFkYTY1NGI4ZTEzYWI5ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0yNzIs NiArMjcyLDcgQEAgX19aTjdXZWJDb3JlMTNRdWFsaWZpZWROYW1lRDFFdgogX19aTjdXZWJDb3Jl MTNwb2ludGVyQ3Vyc29yRXYKIF9fWk43V2ViQ29yZTEzUmVzb3VyY2VFcnJvckMxRVA3TlNFcnJv cgogX19aTjdXZWJDb3JlMTNSZXNvdXJjZUVycm9yQzFFUDlfX0NGRXJyb3IKK19fWk43V2ViQ29y ZTEzU1FMUmVzdWx0RG9uZUUKIF9fWk43V2ViQ29yZTEzU3R5bGVkRWxlbWVudDIyc2V0SW5saW5l U3R5bGVQcm9wZXJ0eUVOU18xM0NTU1Byb3BlcnR5SURFUktOM1dURjZTdHJpbmdFYgogX19aTjdX ZWJDb3JlMTNTdHlsZWRFbGVtZW50MjJzZXRJbmxpbmVTdHlsZVByb3BlcnR5RU5TXzEzQ1NTUHJv cGVydHlJREVkTlNfMTdDU1NQcmltaXRpdmVWYWx1ZTlVbml0VHlwZXNFYgogX19aTjdXZWJDb3Jl MTNjb29raWVzRm9yRE9NRVJLTlNfMjFOZXR3b3JrU3RvcmFnZVNlc3Npb25FUktOU180S1VSTEVT NV8KQEAgLTQ3NCw3ICs0NzUsMTEgQEAgX19aTjdXZWJDb3JlMTVQcm90ZWN0aW9uU3BhY2VDMUVS S04zV1RGNlN0cmluZ0VpTlNfMjVQcm90ZWN0aW9uU3BhY2VTZXJ2ZXJUeXBlRVMKIF9fWk43V2Vi Q29yZTE1UHJvdGVjdGlvblNwYWNlQzFFdgogX19aTjdXZWJDb3JlMTVSZXNvdXJjZVJlcXVlc3Qy MWh0dHBQaXBlbGluaW5nRW5hYmxlZEV2CiBfX1pON1dlYkNvcmUxNVJlc291cmNlUmVxdWVzdDI0 c2V0SFRUUFBpcGVsaW5pbmdFbmFibGVkRWIKK19fWk43V2ViQ29yZTE1U1FMaXRlU3RhdGVtZW50 MTNnZXRDb2x1bW5UZXh0RWkKK19fWk43V2ViQ29yZTE1U1FMaXRlU3RhdGVtZW50MjFnZXRDb2x1 bW5CbG9iQXNTdHJpbmdFaQogX19aTjdXZWJDb3JlMTVTUUxpdGVTdGF0ZW1lbnQyMmlzQ29sdW1u RGVjbGFyZWRBc0Jsb2JFaQorX19aTjdXZWJDb3JlMTVTUUxpdGVTdGF0ZW1lbnQ0c3RlcEV2Citf X1pON1dlYkNvcmUxNVNRTGl0ZVN0YXRlbWVudDdwcmVwYXJlRXYKIF9fWk43V2ViQ29yZTE1U1FM aXRlU3RhdGVtZW50QzFFUk5TXzE0U1FMaXRlRGF0YWJhc2VFUktOM1dURjZTdHJpbmdFCiBfX1pO N1dlYkNvcmUxNVNRTGl0ZVN0YXRlbWVudEQxRXYKIF9fWk43V2ViQ29yZTE1U2Nyb2xsQWxpZ25t ZW50MTdhbGlnbkNlbnRlckFsd2F5c0UKQEAgLTE3OTIsNiArMTc5Nyw3IEBAIF9fWk5LN1dlYkNv cmU2RWRpdG9yMzJpc0NvbnRpbnVvdXNTcGVsbENoZWNraW5nRW5hYmxlZEV2CiBfX1pON1dlYkNv cmUxMEZsb2F0UG9pbnRDMUVSSzhfTlNQb2ludAogX19aTjdXZWJDb3JlMTBoYW5kQ3Vyc29yRXYK IF9fWk43V2ViQ29yZTExQ2FjaGVkSW1hZ2U1aW1hZ2VFdgorX19aTjdXZWJDb3JlMTFTUUxSZXN1 bHRPa0UKIF9fWk43V2ViQ29yZTExZ2xvYmFsUG9pbnRFUks4X05TUG9pbnRQOE5TV2luZG93CiBf X1pON1dlYkNvcmUxMXRvVXNlclNwYWNlRVJLN19OU1JlY3RQOE5TV2luZG93CiBfX1pON1dlYkNv cmUxMkV2ZW50SGFuZGxlcjEwbW91c2VNb3ZlZEVQN05TRXZlbnQKQEAgLTE4MDMsNiArMTgwOSw3 IEBAIF9fWk43V2ViQ29yZTEyRXZlbnRIYW5kbGVyN21vdXNlVXBFUDdOU0V2ZW50CiBfX1pON1dl YkNvcmUxMkV2ZW50SGFuZGxlcjhrZXlFdmVudEVQN05TRXZlbnQKIF9fWk43V2ViQ29yZTEyRXZl bnRIYW5kbGVyOW1vdXNlRG93bkVQN05TRXZlbnQKIF9fWk43V2ViQ29yZTEyUG9wdXBNZW51TWFj QzFFUE5TXzE1UG9wdXBNZW51Q2xpZW50RQorX19aTjdXZWJDb3JlMTJTUUxSZXN1bHRSb3dFCiBf X1pON1dlYkNvcmUxM3RvRGV2aWNlU3BhY2VFUktOU185RmxvYXRSZWN0RVA4TlNXaW5kb3cKIF9f Wk43V2ViQ29yZTEzZ2V0UmF3Q29va2llc0VSS05TXzIxTmV0d29ya1N0b3JhZ2VTZXNzaW9uRVJL TlNfNEtVUkxFUzVfUk4zV1RGNlZlY3RvcklOU182Q29va2llRUxtMEVOUzZfMTVDcmFzaE9uT3Zl cmZsb3dFRUUKIF9fWk43V2ViQ29yZTE1R3JhcGhpY3NDb250ZXh0QzFFUDlDR0NvbnRleHQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURh dGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFn ZURhdGFiYXNlLmNwcAppbmRleCBmYjRlYjM5M2RiMDRhYjEyOGM2MzdhMDdkYzM0MGQwYTRmMzE1 ZDBmLi5mMjdmMTZhODM4YzY1NTZlNWY2NTAyMDQxM2UxOTkxNDcxNDc4ZWVkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0 YWJhc2UuY3BwCkBAIC0zMCw3ICszMCw5IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9GaWxlU3lzdGVt Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TUUxpdGVTdGF0ZW1lbnQuaD4KICNpbmNsdWRlIDxXZWJD b3JlL1NRTGl0ZVRyYW5zYWN0aW9uLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9TdG9yYWdlTWFwLmg+ CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdI YXNoLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwpAQCAtMTM0LDcgKzEzNiw3IEBAIGJvb2wgTG9jYWxTdG9yYWdlRGF0YWJhc2U6 Om1pZ3JhdGVJdGVtVGFibGVJZk5lZWRlZCgpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQg TG9jYWxTdG9yYWdlRGF0YWJhc2U6OmltcG9ydEl0ZW1zKFN0b3JhZ2VNYXAmKQordm9pZCBMb2Nh bFN0b3JhZ2VEYXRhYmFzZTo6aW1wb3J0SXRlbXMoU3RvcmFnZU1hcCYgc3RvcmFnZU1hcCkKIHsK ICAgICAvLyBGSVhNRTogSWYgaXQgY2FuJ3QgaW1wb3J0LCB0aGVuIHRoZSBkZWZhdWx0IFdlYktp dCBiZWhhdmlvciBzaG91bGQgYmUgdGhhdCBvZiBwcml2YXRlIGJyb3dzaW5nLAogICAgIC8vIG5v dCBzaWxlbnRseSBpZ25vcmluZyBpdC4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI1ODk0CkBAIC0xNDMsNyArMTQ1LDI2IEBAIHZvaWQgTG9jYWxTdG9yYWdlRGF0YWJh c2U6OmltcG9ydEl0ZW1zKFN0b3JhZ2VNYXAmKQogICAgIGlmICghbV9kYXRhYmFzZS5pc09wZW4o KSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gRklYTUU6IEFjdHVhbGx5IGltcG9ydCB0aGUg aXRlbXMuCisgICAgU1FMaXRlU3RhdGVtZW50IHF1ZXJ5KG1fZGF0YWJhc2UsICJTRUxFQ1Qga2V5 LCB2YWx1ZSBGUk9NIEl0ZW1UYWJsZSIpOworICAgIGlmIChxdWVyeS5wcmVwYXJlKCkgIT0gU1FM UmVzdWx0T2spIHsKKyAgICAgICAgTE9HX0VSUk9SKCJVbmFibGUgdG8gc2VsZWN0IGl0ZW1zIGZy b20gSXRlbVRhYmxlIGZvciBsb2NhbCBzdG9yYWdlIik7CisgICAgICAgIHJldHVybjsKKyAgICB9 CisKKyAgICBIYXNoTWFwPFN0cmluZywgU3RyaW5nPiBpdGVtczsKKworICAgIGludCByZXN1bHQg PSBxdWVyeS5zdGVwKCk7CisgICAgd2hpbGUgKHJlc3VsdCA9PSBTUUxSZXN1bHRSb3cpIHsKKyAg ICAgICAgaXRlbXMuc2V0KHF1ZXJ5LmdldENvbHVtblRleHQoMCksIHF1ZXJ5LmdldENvbHVtbkJs b2JBc1N0cmluZygxKSk7CisgICAgICAgIHJlc3VsdCA9IHF1ZXJ5LnN0ZXAoKTsKKyAgICB9CisK KyAgICBpZiAocmVzdWx0ICE9IFNRTFJlc3VsdERvbmUpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJF cnJvciByZWFkaW5nIGl0ZW1zIGZyb20gSXRlbVRhYmxlIGZvciBsb2NhbCBzdG9yYWdlIik7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBzdG9yYWdlTWFwLmltcG9ydEl0ZW1zKGl0ZW1z KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==