107182 2013-01-17 14:48:55 -0800 IndexedDB: Conditionalize usage of env_idb.h to fix build for non-Chromium ports 2013-01-17 20:05:09 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 michael mrobinson dgrogan jsbell mrobinson tony oldest_to_newest 809823 0 michael 2013-01-17 14:48:55 -0800 Currently Source/WebCore/platform/leveldb/LevelDBDatabase.cpp includes <env_idb.h>. This file is available only for the Chromium port but an implementation should be made available for other ports. 809894 1 183301 mrobinson 2013-01-17 15:47:29 -0800 Created attachment 183301 Patch 809897 2 183301 dgrogan 2013-01-17 15:49:18 -0800 Comment on attachment 183301 Patch lgtm 809907 3 mrobinson 2013-01-17 16:02:32 -0800 Thanks David. I'll wait for all the bubbles to turn green before committing this. 809922 4 183301 tony 2013-01-17 16:13:25 -0800 Comment on attachment 183301 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183301&action=review > Source/WebCore/platform/leveldb/LevelDBDatabase.cpp:58 > +#if PLATFORM(CHROMIUM) > +static leveldb::Env* defaultLevelDBEnvironment() > +{ > + return leveldb::IDBEnv(); > +} > +#else > +static leveldb::Env* defaultLevelDBEnvironment() Nit: Why not scope the #if around the return? 809935 5 mrobinson 2013-01-17 16:22:11 -0800 (In reply to comment #4) > (From update of attachment 183301 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=183301&action=review > > > Source/WebCore/platform/leveldb/LevelDBDatabase.cpp:58 > > +#if PLATFORM(CHROMIUM) > > +static leveldb::Env* defaultLevelDBEnvironment() > > +{ > > + return leveldb::IDBEnv(); > > +} > > +#else > > +static leveldb::Env* defaultLevelDBEnvironment() > > Nit: Why not scope the #if around the return? Just my preference against having conditional compilation inside functions instead of surrounding them. Michael actually suggested a way to make this patch simpler, so I'll try that. 809969 6 183318 mrobinson 2013-01-17 16:57:24 -0800 Created attachment 183318 Patch 810155 7 mrobinson 2013-01-17 20:05:09 -0800 Committed r140099: <http://trac.webkit.org/changeset/140099> 183301 2013-01-17 15:47:29 -0800 2013-01-17 16:57:21 -0800 Patch bug-107182-20130117154429.patch text/plain 3525 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM0YzU0ZmQ5MTkzMDYz YjdjNGFmYzBjMTk5YWZmM2JkYTkzOGQzYS4uNzQxYmU5MGFhMTA3YmQwYjRkMjZjZTFhODkzY2Mw YjkzMjg1OGNjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAxLTE3ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICAyMDEzLTAxLTE3 ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBJbmRl eGVkREI6IENvbmRpdGlvbmFsaXplIHVzYWdlIG9mIGVudl9pZGIuaCB0byBmaXggYnVpbGQgZm9y IG5vbi1DaHJvbWl1bSBwb3J0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTA3MTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGlzIGEgYnVpbGQgZml4LgorCisgICAgICAg ICogcGxhdGZvcm0vbGV2ZWxkYi9MZXZlbERCRGF0YWJhc2UuY3BwOiBVc2UgdGhlIGRlZmF1bHQg ZW52aXJvbm1lbnQgZm9yIG5vbi1DaHJvbWl1bQorICAgICAgICBwb3J0cyBpbnN0ZWFkIG9mIHRo ZSBDaHJvbWl1bS1zcGVjaWZpYyBvbmUgcHJvdmlkZWQgYnkgZW52X2lkYi5oLgorCiAyMDEzLTAx LTE3ICBNaWNoYWVsIFBydWV0dCAgPG1pY2hhZWxANjhrLm9yZz4KIAogICAgICAgICBbR1RLXSBJ bmRleGVkREI6IEFkZCBMZXZlbERCIGhlYWRlcnMgdG8gaW5jbHVkZSBwYXRoIGlmIEluZGV4ZWRE QiBpcyBlbmFibGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9sZXZlbGRi L0xldmVsREJEYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9sZXZlbGRiL0xl dmVsREJEYXRhYmFzZS5jcHAKaW5kZXggMDgzMTI0YTZjYjQxYmI0NWYwYzZmYjM3MDJjNzdkNjI3 ZDI1YWEzNi4uN2I3YmU1MzZkM2ZhNTUwYjJlYWE3M2VkYzVhNzBiNTA0YzdmYTY3YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbGV2ZWxkYi9MZXZlbERCRGF0YWJhc2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2xldmVsZGIvTGV2ZWxEQkRhdGFiYXNlLmNw cApAQCAtMzMsNyArMzMsNiBAQAogI2luY2x1ZGUgIkxldmVsREJTbGljZS5oIgogI2luY2x1ZGUg IkxldmVsREJXcml0ZUJhdGNoLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgotI2luY2x1ZGUgPGVu dl9pZGIuaD4KICNpbmNsdWRlIDxoZWxwZXJzL21lbWVudi9tZW1lbnYuaD4KICNpbmNsdWRlIDxs ZXZlbGRiL2NvbXBhcmF0b3IuaD4KICNpbmNsdWRlIDxsZXZlbGRiL2RiLmg+CkBAIC00NCw4ICs0 MywyNCBAQAogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4 dC9XVEZTdHJpbmcuaD4KIAorI2lmIFBMQVRGT1JNKENIUk9NSVVNKQorI2luY2x1ZGUgPGVudl9p ZGIuaD4KKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKKyNpZiBQTEFURk9STShDSFJP TUlVTSkKK3N0YXRpYyBsZXZlbGRiOjpFbnYqIGRlZmF1bHRMZXZlbERCRW52aXJvbm1lbnQoKQor eworICAgIHJldHVybiBsZXZlbGRiOjpJREJFbnYoKTsKK30KKyNlbHNlCitzdGF0aWMgbGV2ZWxk Yjo6RW52KiBkZWZhdWx0TGV2ZWxEQkVudmlyb25tZW50KCkKK3sKKyAgICByZXR1cm4gbGV2ZWxk Yjo6RW52OjpEZWZhdWx0KCk7Cit9CisjZW5kaWYKKwogc3RhdGljIGxldmVsZGI6OlNsaWNlIG1h a2VTbGljZShjb25zdCBWZWN0b3I8Y2hhcj4mIHZhbHVlKQogewogICAgIHJldHVybiBsZXZlbGRi OjpTbGljZSh2YWx1ZS5kYXRhKCksIHZhbHVlLnNpemUoKSk7CkBAIC0xMjcsNyArMTQyLDcgQEAg c3RhdGljIGxldmVsZGI6OlN0YXR1cyBvcGVuREIobGV2ZWxkYjo6Q29tcGFyYXRvciogY29tcGFy YXRvciwgbGV2ZWxkYjo6RW52KiBlbnYKIGJvb2wgTGV2ZWxEQkRhdGFiYXNlOjpkZXN0cm95KGNv bnN0IFN0cmluZyYgZmlsZU5hbWUpCiB7CiAgICAgbGV2ZWxkYjo6T3B0aW9ucyBvcHRpb25zOwot ICAgIG9wdGlvbnMuZW52ID0gbGV2ZWxkYjo6SURCRW52KCk7CisgICAgb3B0aW9ucy5lbnYgPSBk ZWZhdWx0TGV2ZWxEQkVudmlyb25tZW50KCk7CiAgICAgY29uc3QgbGV2ZWxkYjo6U3RhdHVzIHMg PSBsZXZlbGRiOjpEZXN0cm95REIoZmlsZU5hbWUudXRmOCgpLmRhdGEoKSwgb3B0aW9ucyk7CiAg ICAgcmV0dXJuIHMub2soKTsKIH0KQEAgLTEzNyw3ICsxNTIsNyBAQCBQYXNzT3duUHRyPExldmVs REJEYXRhYmFzZT4gTGV2ZWxEQkRhdGFiYXNlOjpvcGVuKGNvbnN0IFN0cmluZyYgZmlsZU5hbWUs IGNvbnN0CiAgICAgT3duUHRyPENvbXBhcmF0b3JBZGFwdGVyPiBjb21wYXJhdG9yQWRhcHRlciA9 IGFkb3B0UHRyKG5ldyBDb21wYXJhdG9yQWRhcHRlcihjb21wYXJhdG9yKSk7CiAKICAgICBsZXZl bGRiOjpEQiogZGI7Ci0gICAgY29uc3QgbGV2ZWxkYjo6U3RhdHVzIHMgPSBvcGVuREIoY29tcGFy YXRvckFkYXB0ZXIuZ2V0KCksIGxldmVsZGI6OklEQkVudigpLCBmaWxlTmFtZSwgJmRiKTsKKyAg ICBjb25zdCBsZXZlbGRiOjpTdGF0dXMgcyA9IG9wZW5EQihjb21wYXJhdG9yQWRhcHRlci5nZXQo KSwgZGVmYXVsdExldmVsREJFbnZpcm9ubWVudCgpLCBmaWxlTmFtZSwgJmRiKTsKIAogICAgIGlm ICghcy5vaygpKSB7CiAgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIG9wZW4gTGV2ZWxEQiBk YXRhYmFzZSBmcm9tICVzOiAlcyIsIGZpbGVOYW1lLmFzY2lpKCkuZGF0YSgpLCBzLlRvU3RyaW5n KCkuY19zdHIoKSk7CkBAIC0xNTUsNyArMTcwLDcgQEAgUGFzc093blB0cjxMZXZlbERCRGF0YWJh c2U+IExldmVsREJEYXRhYmFzZTo6b3Blbihjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBjb25zdAog UGFzc093blB0cjxMZXZlbERCRGF0YWJhc2U+IExldmVsREJEYXRhYmFzZTo6b3BlbkluTWVtb3J5 KGNvbnN0IExldmVsREJDb21wYXJhdG9yKiBjb21wYXJhdG9yKQogewogICAgIE93blB0cjxDb21w YXJhdG9yQWRhcHRlcj4gY29tcGFyYXRvckFkYXB0ZXIgPSBhZG9wdFB0cihuZXcgQ29tcGFyYXRv ckFkYXB0ZXIoY29tcGFyYXRvcikpOwotICAgIE93blB0cjxsZXZlbGRiOjpFbnY+IGluTWVtb3J5 RW52ID0gYWRvcHRQdHIobGV2ZWxkYjo6TmV3TWVtRW52KGxldmVsZGI6OklEQkVudigpKSk7Cisg ICAgT3duUHRyPGxldmVsZGI6OkVudj4gaW5NZW1vcnlFbnYgPSBhZG9wdFB0cihsZXZlbGRiOjpO ZXdNZW1FbnYoZGVmYXVsdExldmVsREJFbnZpcm9ubWVudCgpKSk7CiAKICAgICBsZXZlbGRiOjpE QiogZGI7CiAgICAgY29uc3QgbGV2ZWxkYjo6U3RhdHVzIHMgPSBvcGVuREIoY29tcGFyYXRvckFk YXB0ZXIuZ2V0KCksIGluTWVtb3J5RW52LmdldCgpLCBTdHJpbmcoKSwgJmRiKTsK 183318 2013-01-17 16:57:24 -0800 2013-01-17 16:57:24 -0800 Patch bug-107182-20130117165424.patch text/plain 1823 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM0YzU0ZmQ5MTkzMDYz YjdjNGFmYzBjMTk5YWZmM2JkYTkzOGQzYS4uNzQxYmU5MGFhMTA3YmQwYjRkMjZjZTFhODkzY2Mw YjkzMjg1OGNjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAxLTE3ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICAyMDEzLTAxLTE3 ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBJbmRl eGVkREI6IENvbmRpdGlvbmFsaXplIHVzYWdlIG9mIGVudl9pZGIuaCB0byBmaXggYnVpbGQgZm9y IG5vbi1DaHJvbWl1bSBwb3J0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTA3MTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIGlzIGEgYnVpbGQgZml4LgorCisgICAgICAg ICogcGxhdGZvcm0vbGV2ZWxkYi9MZXZlbERCRGF0YWJhc2UuY3BwOiBVc2UgdGhlIGRlZmF1bHQg ZW52aXJvbm1lbnQgZm9yIG5vbi1DaHJvbWl1bQorICAgICAgICBwb3J0cyBpbnN0ZWFkIG9mIHRo ZSBDaHJvbWl1bS1zcGVjaWZpYyBvbmUgcHJvdmlkZWQgYnkgZW52X2lkYi5oLgorCiAyMDEzLTAx LTE3ICBNaWNoYWVsIFBydWV0dCAgPG1pY2hhZWxANjhrLm9yZz4KIAogICAgICAgICBbR1RLXSBJ bmRleGVkREI6IEFkZCBMZXZlbERCIGhlYWRlcnMgdG8gaW5jbHVkZSBwYXRoIGlmIEluZGV4ZWRE QiBpcyBlbmFibGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9sZXZlbGRi L0xldmVsREJEYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9sZXZlbGRiL0xl dmVsREJEYXRhYmFzZS5jcHAKaW5kZXggMDgzMTI0YTZjYjQxYmI0NWYwYzZmYjM3MDJjNzdkNjI3 ZDI1YWEzNi4uMGMzODljY2VkNWRkZjAyODNkNzU5ZWI4MjY4ZjcxNWQ0ODNlZGJjNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbGV2ZWxkYi9MZXZlbERCRGF0YWJhc2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2xldmVsZGIvTGV2ZWxEQkRhdGFiYXNlLmNw cApAQCAtMzMsNyArMzMsNiBAQAogI2luY2x1ZGUgIkxldmVsREJTbGljZS5oIgogI2luY2x1ZGUg IkxldmVsREJXcml0ZUJhdGNoLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgotI2luY2x1ZGUgPGVu dl9pZGIuaD4KICNpbmNsdWRlIDxoZWxwZXJzL21lbWVudi9tZW1lbnYuaD4KICNpbmNsdWRlIDxs ZXZlbGRiL2NvbXBhcmF0b3IuaD4KICNpbmNsdWRlIDxsZXZlbGRiL2RiLmg+CkBAIC00NCw2ICs0 MywyMSBAQAogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4 dC9XVEZTdHJpbmcuaD4KIAorI2lmIFBMQVRGT1JNKENIUk9NSVVNKQorI2luY2x1ZGUgPGVudl9p ZGIuaD4KKyNlbmRpZgorCisjaWYgIVBMQVRGT1JNKENIUk9NSVVNKQorbmFtZXNwYWNlIGxldmVs ZGIgeworCitzdGF0aWMgRW52KiBJREJFbnYoKQoreworICAgIHJldHVybiBsZXZlbGRiOjpFbnY6 OkRlZmF1bHQoKTsKK30KKworfQorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3Rh dGljIGxldmVsZGI6OlNsaWNlIG1ha2VTbGljZShjb25zdCBWZWN0b3I8Y2hhcj4mIHZhbHVlKQo=