140882 2015-01-26 02:19:44 -0800 [GTK] Add construct property to WebKitWebContext to set the IndexedDB database directory 2015-05-25 08:16:02 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 98932 1 cgarcia webkit-unassigned berto commit-queue gustavo mcatanzaro mrobinson svillar zan oldest_to_newest 1064118 0 cgarcia 2015-01-26 02:19:44 -0800 Similar to the local-storage-directory, it should be set on construction. 1064119 1 245335 cgarcia 2015-01-26 02:23:37 -0800 Created attachment 245335 Patch We need to enable IndexedDB again first, see bug #98932 1064120 2 commit-queue 2015-01-26 02:24:49 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1064864 3 245335 gustavo 2015-01-28 03:23:19 -0800 Comment on attachment 245335 Patch I feel like we should drop the -database part from the name since 'db' already means that and it is not easy to confuse this with something that is not a database. Otherwise looks good. 1064865 4 cgarcia 2015-01-28 03:27:53 -0800 (In reply to comment #3) > Comment on attachment 245335 [details] > Patch > > I feel like we should drop the -database part from the name since 'db' > already means that and it is not easy to confuse this with something that is > not a database. Otherwise looks good. Yes, I thought about that, and added the -directory because db is part of the IndexedDB, but what other thing could be the directory for? I'll update the patch, thanks for the review! 1097228 5 253677 cgarcia 2015-05-25 02:39:49 -0700 Created attachment 253677 Updated patch 1097237 6 253677 gustavo 2015-05-25 04:29:44 -0700 Comment on attachment 253677 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=253677&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:345 > + * WebKitWebContext:indexed-db-database-directory: Still has the -database bit. 1097238 7 cgarcia 2015-05-25 04:30:36 -0700 (In reply to comment #6) > Comment on attachment 253677 [details] > Updated patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=253677&action=review > > > Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:345 > > + * WebKitWebContext:indexed-db-database-directory: > > Still has the -database bit. Oops, good catch! 1097241 8 cgarcia 2015-05-25 08:16:02 -0700 Committed r184851: <http://trac.webkit.org/changeset/184851> 245335 2015-01-26 02:23:37 -0800 2015-05-25 02:39:49 -0700 Patch wk2-indexed-db-dir.diff text/plain 7853 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiOGIyZTgyLi5lM2RhYTFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTUtMDEtMjYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEFkZCBjb25zdHJ1Y3QgcHJvcGVydHkgdG8gV2ViS2l0V2ViQ29u dGV4dCB0byBzZXQgdGhlIEluZGV4ZWREQiBkYXRhYmFzZSBkaXJlY3RvcnkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDg4MgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBXZWJLaXRXZWJDb250ZXh0 OmluZGV4ZWQtZGItZGF0YWJhc2UtZGlyZWN0b3J5IGNvbnN0cnVjdCBvbmx5IHByb3BlcnR5Lgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHA6CisgICAg ICAgICh3ZWJraXRXZWJDb250ZXh0R2V0UHJvcGVydHkpOgorICAgICAgICAod2Via2l0V2ViQ29u dGV4dFNldFByb3BlcnR5KToKKyAgICAgICAgKHdlYmtpdFdlYkNvbnRleHRDb25zdHJ1Y3RlZCk6 CisgICAgICAgICh3ZWJraXRfd2ViX2NvbnRleHRfY2xhc3NfaW5pdCk6CisKIDIwMTUtMDEtMjUg IFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFVu cmVzcG9uc2l2ZSBXZWIgcHJvY2Vzc2VzIHNvbWV0aW1lcyB0aHJvdyBPYmpDIGV4Y2VwdGlvbnMg dW5kZXIgZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcAppbmRleCA3NjNiNjNl Li5mYTczZTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJDb250ZXh0LmNwcApAQCAtMTAxLDcgKzEwMSw4IEBAIHVzaW5nIG5hbWVzcGFj ZSBXZWJLaXQ7CiBlbnVtIHsKICAgICBQUk9QXzAsCiAKLSAgICBQUk9QX0xPQ0FMX1NUT1JBR0Vf RElSRUNUT1JZCisgICAgUFJPUF9MT0NBTF9TVE9SQUdFX0RJUkVDVE9SWSwKKyAgICBQUk9QX0lO REVYRURfREJfREFUQUJBU0VfRElSRUNUT1JZCiB9OwogCiBlbnVtIHsKQEAgLTE4NCw2ICsxODUs NyBAQCBzdHJ1Y3QgX1dlYktpdFdlYkNvbnRleHRQcml2YXRlIHsKICAgICBHUmVmUHRyPEdWYXJp YW50PiB3ZWJFeHRlbnNpb25zSW5pdGlhbGl6YXRpb25Vc2VyRGF0YTsKIAogICAgIENTdHJpbmcg bG9jYWxTdG9yYWdlRGlyZWN0b3J5OworICAgIENTdHJpbmcgaW5kZXhlZERCRGF0YWJhc2VEaXJl Y3Rvcnk7CiB9OwogCiBzdGF0aWMgZ3VpbnQgc2lnbmFsc1tMQVNUX1NJR05BTF0gPSB7IDAsIH07 CkBAIC0yMzUsNiArMjM3LDkgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViQ29udGV4dEdldFByb3Bl cnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcElELCBHVmFsdWUqIHYKICAgICBjYXNlIFBS T1BfTE9DQUxfU1RPUkFHRV9ESVJFQ1RPUlk6CiAgICAgICAgIGdfdmFsdWVfc2V0X3N0cmluZyh2 YWx1ZSwgY29udGV4dC0+cHJpdi0+bG9jYWxTdG9yYWdlRGlyZWN0b3J5LmRhdGEoKSk7CiAgICAg ICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9JTkRFWEVEX0RCX0RBVEFCQVNFX0RJUkVDVE9SWToK KyAgICAgICAgZ192YWx1ZV9zZXRfc3RyaW5nKHZhbHVlLCBjb250ZXh0LT5wcml2LT5pbmRleGVk REJEYXRhYmFzZURpcmVjdG9yeS5kYXRhKCkpOworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0 OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFMSURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9w SUQsIHBhcmFtU3BlYyk7CiAgICAgfQpAQCAtMjQ4LDYgKzI1Myw5IEBAIHN0YXRpYyB2b2lkIHdl YmtpdFdlYkNvbnRleHRTZXRQcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BJRCwg Y29uc3QgR1ZhCiAgICAgY2FzZSBQUk9QX0xPQ0FMX1NUT1JBR0VfRElSRUNUT1JZOgogICAgICAg ICBjb250ZXh0LT5wcml2LT5sb2NhbFN0b3JhZ2VEaXJlY3RvcnkgPSBnX3ZhbHVlX2dldF9zdHJp bmcodmFsdWUpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfSU5ERVhFRF9EQl9EQVRB QkFTRV9ESVJFQ1RPUlk6CisgICAgICAgIGNvbnRleHQtPnByaXYtPmluZGV4ZWREQkRhdGFiYXNl RGlyZWN0b3J5ID0gZ192YWx1ZV9nZXRfc3RyaW5nKHZhbHVlKTsKKyAgICAgICAgYnJlYWs7CiAg ICAgZGVmYXVsdDoKICAgICAgICAgR19PQkpFQ1RfV0FSTl9JTlZBTElEX1BST1BFUlRZX0lEKG9i amVjdCwgcHJvcElELCBwYXJhbVNwZWMpOwogICAgIH0KQEAgLTI2Niw2ICsyNzQsOCBAQCBzdGF0 aWMgdm9pZCB3ZWJraXRXZWJDb250ZXh0Q29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQogICAg IFdlYktpdFdlYkNvbnRleHRQcml2YXRlKiBwcml2ID0gd2ViQ29udGV4dC0+cHJpdjsKICAgICBp ZiAoIXByaXYtPmxvY2FsU3RvcmFnZURpcmVjdG9yeS5pc051bGwoKSkKICAgICAgICAgY29uZmln dXJhdGlvbi0+c2V0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJp bmcocHJpdi0+bG9jYWxTdG9yYWdlRGlyZWN0b3J5LmRhdGEoKSkpOworICAgIGlmICghcHJpdi0+ aW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkuaXNOdWxsKCkpCisgICAgICAgIGNvbmZpZ3VyYXRp b24tPnNldEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJp bmcocHJpdi0+aW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkuZGF0YSgpKSk7CiAKICAgICBwcml2 LT5jb250ZXh0ID0gV2ViUHJvY2Vzc1Bvb2w6OmNyZWF0ZShjb25maWd1cmF0aW9uLmdldCgpKTsK IApAQCAtMzM1LDYgKzM0NSwyMyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX2NvbnRleHRfY2xh c3NfaW5pdChXZWJLaXRXZWJDb250ZXh0Q2xhc3MqIHdlYkNvbnRleHRDbGFzcwogICAgICAgICAg ICAgc3RhdGljX2Nhc3Q8R1BhcmFtRmxhZ3M+KFdFQktJVF9QQVJBTV9SRUFEV1JJVEUgfCBHX1BB UkFNX0NPTlNUUlVDVF9PTkxZKSkpOwogCiAgICAgLyoqCisgICAgICogV2ViS2l0V2ViQ29udGV4 dDppbmRleGVkLWRiLWRhdGFiYXNlLWRpcmVjdG9yeToKKyAgICAgKgorICAgICAqIFRoZSBkaXJl Y3Rvcnkgd2hlcmUgSW5kZXhlZERCIGRhdGFiYXNlcyB3aWxsIGJlIHNhdmVkCisgICAgICoKKyAg ICAgKiBTaW5jZTogMi44CisgICAgICovCisgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9w ZXJ0eSgKKyAgICAgICAgZ09iamVjdENsYXNzLAorICAgICAgICBQUk9QX0lOREVYRURfREJfREFU QUJBU0VfRElSRUNUT1JZLAorICAgICAgICBnX3BhcmFtX3NwZWNfc3RyaW5nKAorICAgICAgICAg ICAgImluZGV4ZWQtZGItZGF0YWJhc2UtZGlyZWN0b3J5IiwKKyAgICAgICAgICAgIF8oIkluZGV4 ZWREQiBEYXRhYmFzZSBEaXJlY3RvcnkiKSwKKyAgICAgICAgICAgIF8oIlRoZSBkaXJlY3Rvcnkg d2hlcmUgSW5kZXhlZERCIGRhdGFiYXNlcyB3aWxsIGJlIHNhdmVkIiksCisgICAgICAgICAgICBu dWxscHRyLAorICAgICAgICAgICAgc3RhdGljX2Nhc3Q8R1BhcmFtRmxhZ3M+KFdFQktJVF9QQVJB TV9SRUFEV1JJVEUgfCBHX1BBUkFNX0NPTlNUUlVDVF9PTkxZKSkpOworCisgICAgLyoqCiAgICAg ICogV2ViS2l0V2ViQ29udGV4dDo6ZG93bmxvYWQtc3RhcnRlZDoKICAgICAgKiBAY29udGV4dDog dGhlICNXZWJLaXRXZWJDb250ZXh0CiAgICAgICogQGRvd25sb2FkOiB0aGUgI1dlYktpdERvd25s b2FkIGFzc29jaWF0ZWQgd2l0aCB0aGlzIGV2ZW50CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzcwYzQ4YS4uMjUxMzMyNCAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisy MDE1LTAxLTI2ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwor ICAgICAgICBbR1RLXSBBZGQgY29uc3RydWN0IHByb3BlcnR5IHRvIFdlYktpdFdlYkNvbnRleHQg dG8gc2V0IHRoZSBJbmRleGVkREIgZGF0YWJhc2UgZGlyZWN0b3J5CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA4ODIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHN1cmUgdW5pdCB0ZXN0cyB3cml0 ZSBJbmRleGVkREIgZGF0YWJhc2VzIHRvIHRoZSB0ZW1wb3JhcnkKKyAgICAgICAgZGlyZWN0b3J5 LCBhbmQgYWRkIGEgdGVzdCBjYXNlIHRvIGNoZWNrIHRoYXQgdGhlIGRpcmVjdG9yeSBpcworICAg ICAgICBjb3JyZWN0bHkgY3JlYXRlZCBhdCB0aGUgZXhwZWN0ZWQgcGF0aC4KKworICAgICAgICAq IFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0V2ViQ29udGV4dC5jcHA6 CisgICAgICAgICh0ZXN0V2ViQ29udGV4dENvbmZpZ3VyYXRpb24pOgorICAgICAgICAoc2VydmVy Q2FsbGJhY2spOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvZ3RrL1dlYktpdDJHdGsvVGVzdE1h aW4uaDoKKyAgICAgICAgKFRlc3Q6OlRlc3QpOgorCiAyMDE1LTAxLTI1ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBFbmFibGUgSW5k ZXhlZERCCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsv VGVzdFdlYktpdFdlYkNvbnRleHQuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXQyR3RrL1Rlc3RXZWJLaXRXZWJDb250ZXh0LmNwcAppbmRleCAzMWI1NWY5Li43NjRkYmE0IDEw MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktp dFdlYkNvbnRleHQuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0 ay9UZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTQxLDYgKzQxLDEyIEBAIHN0YXRpYyB2b2lk IHRlc3RXZWJDb250ZXh0Q29uZmlndXJhdGlvbihXZWJWaWV3VGVzdCogdGVzdCwgZ2NvbnN0cG9p bnRlcikKIHsKICAgICBHVW5pcXVlUHRyPGNoYXI+IGxvY2FsU3RvcmFnZURpcmVjdG9yeShnX2J1 aWxkX2ZpbGVuYW1lKFRlc3Q6OmRhdGFEaXJlY3RvcnkoKSwgImxvY2FsLXN0b3JhZ2UiLCBudWxs cHRyKSk7CiAgICAgZ19hc3NlcnQoZ19maWxlX3Rlc3QobG9jYWxTdG9yYWdlRGlyZWN0b3J5Lmdl dCgpLCBHX0ZJTEVfVEVTVF9JU19ESVIpKTsKKworICAgIHRlc3QtPmxvYWRVUkkoa1NlcnZlci0+ Z2V0VVJJRm9yUGF0aCgiL2VtcHR5IikuZGF0YSgpKTsKKyAgICB0ZXN0LT53YWl0VW50aWxMb2Fk RmluaXNoZWQoKTsKKyAgICB0ZXN0LT5ydW5KYXZhU2NyaXB0QW5kV2FpdFVudGlsRmluaXNoZWQo IndpbmRvdy5pbmRleGVkREIub3BlbignVGVzdERhdGFiYXNlJyk7IiwgbnVsbHB0cik7CisgICAg R1VuaXF1ZVB0cjxjaGFyPiBpbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeShnX2J1aWxkX2ZpbGVu YW1lKFRlc3Q6OmRhdGFEaXJlY3RvcnkoKSwgImluZGV4ZWRkYiIsIG51bGxwdHIpKTsKKyAgICBn X2Fzc2VydChnX2ZpbGVfdGVzdChpbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeS5nZXQoKSwgR19G SUxFX1RFU1RfSVNfRElSKSk7CiB9CiAKIGNsYXNzIFBsdWdpbnNUZXN0OiBwdWJsaWMgVGVzdCB7 CkBAIC0zMzAsNiArMzM2LDExIEBAIHN0YXRpYyB2b2lkIHNlcnZlckNhbGxiYWNrKFNvdXBTZXJ2 ZXIqIHNlcnZlciwgU291cE1lc3NhZ2UqIG1lc3NhZ2UsIGNvbnN0IGNoYXIqCiAgICAgICAgIHNv dXBfbWVzc2FnZV9zZXRfc3RhdHVzKG1lc3NhZ2UsIFNPVVBfU1RBVFVTX09LKTsKICAgICAgICAg c291cF9tZXNzYWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHksIFNPVVBfTUVN T1JZX0NPUFksIGFjY2VwdExhbmd1YWdlLCBzdHJsZW4oYWNjZXB0TGFuZ3VhZ2UpKTsKICAgICAg ICAgc291cF9tZXNzYWdlX2JvZHlfY29tcGxldGUobWVzc2FnZS0+cmVzcG9uc2VfYm9keSk7Cisg ICAgfSBlbHNlIGlmIChnX3N0cl9lcXVhbChwYXRoLCAiL2VtcHR5IikpIHsKKyAgICAgICAgY29u c3QgY2hhciogZW1wdHlIVE1MID0gIjxodG1sPjxib2R5PjwvYm9keT48L2h0bWw+IjsKKyAgICAg ICAgc291cF9tZXNzYWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHksIFNPVVBf TUVNT1JZX1NUQVRJQywgZW1wdHlIVE1MLCBzdHJsZW4oZW1wdHlIVE1MKSk7CisgICAgICAgIHNv dXBfbWVzc2FnZV9ib2R5X2NvbXBsZXRlKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHkpOworICAgICAg ICBzb3VwX21lc3NhZ2Vfc2V0X3N0YXR1cyhtZXNzYWdlLCBTT1VQX1NUQVRVU19PSyk7CiAgICAg fSBlbHNlCiAgICAgICAgIHNvdXBfbWVzc2FnZV9zZXRfc3RhdHVzKG1lc3NhZ2UsIFNPVVBfU1RB VFVTX05PVF9GT1VORCk7CiB9CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9X ZWJLaXQyR3RrL1Rlc3RNYWluLmggYi9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9XZWJLaXQyR3Rr L1Rlc3RNYWluLmgKaW5kZXggZDdkZmFkNC4uMmQzZGNhOCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVz dFdlYktpdEFQSS9ndGsvV2ViS2l0Mkd0ay9UZXN0TWFpbi5oCisrKyBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvZ3RrL1dlYktpdDJHdGsvVGVzdE1haW4uaApAQCAtNjgsNyArNjgsMTEgQEAgcHVibGlj OgogICAgIFRlc3QoKQogICAgIHsKICAgICAgICAgR1VuaXF1ZVB0cjxjaGFyPiBsb2NhbFN0b3Jh Z2VEaXJlY3RvcnkoZ19idWlsZF9maWxlbmFtZShkYXRhRGlyZWN0b3J5KCksICJsb2NhbC1zdG9y YWdlIiwgbnVsbHB0cikpOwotICAgICAgICBtX3dlYkNvbnRleHQgPSBhZG9wdEdSZWYoV0VCS0lU X1dFQl9DT05URVhUKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfQ09OVEVYVCwgImxvY2Fs LXN0b3JhZ2UtZGlyZWN0b3J5IiwgbG9jYWxTdG9yYWdlRGlyZWN0b3J5LmdldCgpLCBudWxscHRy KSkpOworICAgICAgICBHVW5pcXVlUHRyPGNoYXI+IGluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5 KGdfYnVpbGRfZmlsZW5hbWUoZGF0YURpcmVjdG9yeSgpLCAiaW5kZXhlZGRiIiwgbnVsbHB0cikp OworICAgICAgICBtX3dlYkNvbnRleHQgPSBhZG9wdEdSZWYoV0VCS0lUX1dFQl9DT05URVhUKGdf b2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfQ09OVEVYVCwKKyAgICAgICAgICAgICJsb2NhbC1z dG9yYWdlLWRpcmVjdG9yeSIsIGxvY2FsU3RvcmFnZURpcmVjdG9yeS5nZXQoKSwKKyAgICAgICAg ICAgICJpbmRleGVkLWRiLWRhdGFiYXNlLWRpcmVjdG9yeSIsIGluZGV4ZWREQkRhdGFiYXNlRGly ZWN0b3J5LmdldCgpLAorICAgICAgICAgICAgbnVsbHB0cikpKTsKIAogICAgICAgICBnX3NpZ25h bF9jb25uZWN0KG1fd2ViQ29udGV4dC5nZXQoKSwgImluaXRpYWxpemUtd2ViLWV4dGVuc2lvbnMi LCBHX0NBTExCQUNLKGluaXRpYWxpemVXZWJFeHRlbnNpb25zQ2FsbGJhY2spLCB0aGlzKTsKICAg ICAgICAgR1VuaXF1ZVB0cjxjaGFyPiBkaXNrQ2FjaGVEaXJlY3RvcnkoZ19idWlsZF9maWxlbmFt ZShkYXRhRGlyZWN0b3J5KCksICJkaXNrLWNhY2hlIiwgbnVsbHB0cikpOwo= 253677 2015-05-25 02:39:49 -0700 2015-05-25 04:29:44 -0700 Updated patch wk2-indexed-db-dir.diff text/plain 7660 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlODcwNThmLi4xYmUxYjU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTUtMDEtMjYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEFkZCBjb25zdHJ1Y3QgcHJvcGVydHkgdG8gV2ViS2l0V2ViQ29u dGV4dCB0byBzZXQgdGhlIEluZGV4ZWREQiBkYXRhYmFzZSBkaXJlY3RvcnkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDg4MgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBXZWJLaXRXZWJDb250ZXh0 OmluZGV4ZWQtZGItZGF0YWJhc2UtZGlyZWN0b3J5IGNvbnN0cnVjdCBvbmx5IHByb3BlcnR5Lgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHA6CisgICAg ICAgICh3ZWJraXRXZWJDb250ZXh0R2V0UHJvcGVydHkpOgorICAgICAgICAod2Via2l0V2ViQ29u dGV4dFNldFByb3BlcnR5KToKKyAgICAgICAgKHdlYmtpdFdlYkNvbnRleHRDb25zdHJ1Y3RlZCk6 CisgICAgICAgICh3ZWJraXRfd2ViX2NvbnRleHRfY2xhc3NfaW5pdCk6CisKIDIwMTUtMDUtMjQg IFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBDcmFzaCB3aGVuIHVzaW5n IGEgcmVtb3ZlZCBTY3JpcHRNZXNzYWdlSGFuZGxlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcAppbmRleCBjNzRjY2U1Li5i NmZhNmVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJDb250ZXh0LmNwcApAQCAtMTAyLDcgKzEwMiw4IEBAIHVzaW5nIG5hbWVzcGFjZSBX ZWJLaXQ7CiBlbnVtIHsKICAgICBQUk9QXzAsCiAKLSAgICBQUk9QX0xPQ0FMX1NUT1JBR0VfRElS RUNUT1JZCisgICAgUFJPUF9MT0NBTF9TVE9SQUdFX0RJUkVDVE9SWSwKKyAgICBQUk9QX0lOREVY RURfREJfRElSRUNUT1JZCiB9OwogCiBlbnVtIHsKQEAgLTE4Miw2ICsxODMsNyBAQCBzdHJ1Y3Qg X1dlYktpdFdlYkNvbnRleHRQcml2YXRlIHsKICAgICBHUmVmUHRyPEdWYXJpYW50PiB3ZWJFeHRl bnNpb25zSW5pdGlhbGl6YXRpb25Vc2VyRGF0YTsKIAogICAgIENTdHJpbmcgbG9jYWxTdG9yYWdl RGlyZWN0b3J5OworICAgIENTdHJpbmcgaW5kZXhlZERCRGlyZWN0b3J5OwogfTsKIAogc3RhdGlj IGd1aW50IHNpZ25hbHNbTEFTVF9TSUdOQUxdID0geyAwLCB9OwpAQCAtMjM1LDYgKzIzNyw5IEBA IHN0YXRpYyB2b2lkIHdlYmtpdFdlYkNvbnRleHRHZXRQcm9wZXJ0eShHT2JqZWN0KiBvYmplY3Qs IGd1aW50IHByb3BJRCwgR1ZhbHVlKiB2CiAgICAgY2FzZSBQUk9QX0xPQ0FMX1NUT1JBR0VfRElS RUNUT1JZOgogICAgICAgICBnX3ZhbHVlX3NldF9zdHJpbmcodmFsdWUsIGNvbnRleHQtPnByaXYt PmxvY2FsU3RvcmFnZURpcmVjdG9yeS5kYXRhKCkpOwogICAgICAgICBicmVhazsKKyAgICBjYXNl IFBST1BfSU5ERVhFRF9EQl9ESVJFQ1RPUlk6CisgICAgICAgIGdfdmFsdWVfc2V0X3N0cmluZyh2 YWx1ZSwgY29udGV4dC0+cHJpdi0+aW5kZXhlZERCRGlyZWN0b3J5LmRhdGEoKSk7CisgICAgICAg IGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9Q RVJUWV9JRChvYmplY3QsIHByb3BJRCwgcGFyYW1TcGVjKTsKICAgICB9CkBAIC0yNDgsNiArMjUz LDkgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViQ29udGV4dFNldFByb3BlcnR5KEdPYmplY3QqIG9i amVjdCwgZ3VpbnQgcHJvcElELCBjb25zdCBHVmEKICAgICBjYXNlIFBST1BfTE9DQUxfU1RPUkFH RV9ESVJFQ1RPUlk6CiAgICAgICAgIGNvbnRleHQtPnByaXYtPmxvY2FsU3RvcmFnZURpcmVjdG9y eSA9IGdfdmFsdWVfZ2V0X3N0cmluZyh2YWx1ZSk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2Ug UFJPUF9JTkRFWEVEX0RCX0RJUkVDVE9SWToKKyAgICAgICAgY29udGV4dC0+cHJpdi0+aW5kZXhl ZERCRGlyZWN0b3J5ID0gZ192YWx1ZV9nZXRfc3RyaW5nKHZhbHVlKTsKKyAgICAgICAgYnJlYWs7 CiAgICAgZGVmYXVsdDoKICAgICAgICAgR19PQkpFQ1RfV0FSTl9JTlZBTElEX1BST1BFUlRZX0lE KG9iamVjdCwgcHJvcElELCBwYXJhbVNwZWMpOwogICAgIH0KQEAgLTI2Niw2ICsyNzQsOCBAQCBz dGF0aWMgdm9pZCB3ZWJraXRXZWJDb250ZXh0Q29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQog ICAgIFdlYktpdFdlYkNvbnRleHRQcml2YXRlKiBwcml2ID0gd2ViQ29udGV4dC0+cHJpdjsKICAg ICBpZiAoIXByaXYtPmxvY2FsU3RvcmFnZURpcmVjdG9yeS5pc051bGwoKSkKICAgICAgICAgY29u ZmlndXJhdGlvbi0+c2V0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KFdlYkNvcmU6OmZpbGVuYW1lVG9T dHJpbmcocHJpdi0+bG9jYWxTdG9yYWdlRGlyZWN0b3J5LmRhdGEoKSkpOworICAgIGlmICghcHJp di0+aW5kZXhlZERCRGlyZWN0b3J5LmlzTnVsbCgpKQorICAgICAgICBjb25maWd1cmF0aW9uLT5z ZXRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeShXZWJDb3JlOjpmaWxlbmFtZVRvU3RyaW5nKHBy aXYtPmluZGV4ZWREQkRpcmVjdG9yeS5kYXRhKCkpKTsKIAogICAgIHByaXYtPmNvbnRleHQgPSBX ZWJQcm9jZXNzUG9vbDo6Y3JlYXRlKGNvbmZpZ3VyYXRpb24uZ2V0KCkpOwogCkBAIC0zMzIsNiAr MzQyLDIzIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfY29udGV4dF9jbGFzc19pbml0KFdlYktp dFdlYkNvbnRleHRDbGFzcyogd2ViQ29udGV4dENsYXNzCiAgICAgICAgICAgICBzdGF0aWNfY2Fz dDxHUGFyYW1GbGFncz4oV0VCS0lUX1BBUkFNX1JFQURXUklURSB8IEdfUEFSQU1fQ09OU1RSVUNU X09OTFkpKSk7CiAKICAgICAvKioKKyAgICAgKiBXZWJLaXRXZWJDb250ZXh0OmluZGV4ZWQtZGIt ZGF0YWJhc2UtZGlyZWN0b3J5OgorICAgICAqCisgICAgICogVGhlIGRpcmVjdG9yeSB3aGVyZSBJ bmRleGVkREIgZGF0YWJhc2VzIHdpbGwgYmUgc2F2ZWQuCisgICAgICoKKyAgICAgKiBTaW5jZTog Mi4xMAorICAgICAqLworICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkoCisgICAg ICAgIGdPYmplY3RDbGFzcywKKyAgICAgICAgUFJPUF9JTkRFWEVEX0RCX0RJUkVDVE9SWSwKKyAg ICAgICAgZ19wYXJhbV9zcGVjX3N0cmluZygKKyAgICAgICAgICAgICJpbmRleGVkLWRiLWRpcmVj dG9yeSIsCisgICAgICAgICAgICBfKCJJbmRleGVkREIgRGlyZWN0b3J5IiksCisgICAgICAgICAg ICBfKCJUaGUgZGlyZWN0b3J5IHdoZXJlIEluZGV4ZWREQiBkYXRhYmFzZXMgd2lsbCBiZSBzYXZl ZCIpLAorICAgICAgICAgICAgbnVsbHB0ciwKKyAgICAgICAgICAgIHN0YXRpY19jYXN0PEdQYXJh bUZsYWdzPihXRUJLSVRfUEFSQU1fUkVBRFdSSVRFIHwgR19QQVJBTV9DT05TVFJVQ1RfT05MWSkp KTsKKworICAgIC8qKgogICAgICAqIFdlYktpdFdlYkNvbnRleHQ6OmRvd25sb2FkLXN0YXJ0ZWQ6 CiAgICAgICogQGNvbnRleHQ6IHRoZSAjV2ViS2l0V2ViQ29udGV4dAogICAgICAqIEBkb3dubG9h ZDogdGhlICNXZWJLaXREb3dubG9hZCBhc3NvY2lhdGVkIHdpdGggdGhpcyBldmVudApkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGM5M2E1MjIuLjUy OTExOTcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyMCBAQAorMjAxNS0wMS0yNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQWRkIGNvbnN0cnVjdCBwcm9wZXJ0eSB0 byBXZWJLaXRXZWJDb250ZXh0IHRvIHNldCB0aGUgSW5kZXhlZERCIGRhdGFiYXNlIGRpcmVjdG9y eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQwODgy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBz dXJlIHVuaXQgdGVzdHMgd3JpdGUgSW5kZXhlZERCIGRhdGFiYXNlcyB0byB0aGUgdGVtcG9yYXJ5 CisgICAgICAgIGRpcmVjdG9yeSwgYW5kIGFkZCBhIHRlc3QgY2FzZSB0byBjaGVjayB0aGF0IHRo ZSBkaXJlY3RvcnkgaXMKKyAgICAgICAgY29ycmVjdGx5IGNyZWF0ZWQgYXQgdGhlIGV4cGVjdGVk IHBhdGguCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdl YktpdFdlYkNvbnRleHQuY3BwOgorICAgICAgICAodGVzdFdlYkNvbnRleHRDb25maWd1cmF0aW9u KToKKyAgICAgICAgKHNlcnZlckNhbGxiYWNrKToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2d0 ay9XZWJLaXQyR3RrL1Rlc3RNYWluLmg6CisgICAgICAgIChUZXN0OjpUZXN0KToKKwogMjAxNS0w NS0yNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS10gRW5hYmxlIEluZGV4ZWREQgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RXZWJLaXRXZWJDb250ZXh0LmNwcCBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAKaW5kZXgg ZjhhM2FlMS4uZjVlM2IzOSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQyR3RrL1Rlc3RXZWJLaXRXZWJDb250ZXh0LmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwCkBAIC00MSw2ICs0 MSwxMiBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViQ29udGV4dENvbmZpZ3VyYXRpb24oV2ViVmlld1Rl c3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiB7CiAgICAgR1VuaXF1ZVB0cjxjaGFyPiBsb2NhbFN0 b3JhZ2VEaXJlY3RvcnkoZ19idWlsZF9maWxlbmFtZShUZXN0OjpkYXRhRGlyZWN0b3J5KCksICJs b2NhbC1zdG9yYWdlIiwgbnVsbHB0cikpOwogICAgIGdfYXNzZXJ0KGdfZmlsZV90ZXN0KGxvY2Fs U3RvcmFnZURpcmVjdG9yeS5nZXQoKSwgR19GSUxFX1RFU1RfSVNfRElSKSk7CisKKyAgICB0ZXN0 LT5sb2FkVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9lbXB0eSIpLmRhdGEoKSk7CisgICAg dGVzdC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CisgICAgdGVzdC0+cnVuSmF2YVNjcmlwdEFu ZFdhaXRVbnRpbEZpbmlzaGVkKCJ3aW5kb3cuaW5kZXhlZERCLm9wZW4oJ1Rlc3REYXRhYmFzZScp OyIsIG51bGxwdHIpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4gaW5kZXhlZERCRGlyZWN0b3J5KGdf YnVpbGRfZmlsZW5hbWUoVGVzdDo6ZGF0YURpcmVjdG9yeSgpLCAiaW5kZXhlZGRiIiwgbnVsbHB0 cikpOworICAgIGdfYXNzZXJ0KGdfZmlsZV90ZXN0KGluZGV4ZWREQkRpcmVjdG9yeS5nZXQoKSwg R19GSUxFX1RFU1RfSVNfRElSKSk7CiB9CiAKIGNsYXNzIFBsdWdpbnNUZXN0OiBwdWJsaWMgVGVz dCB7CkBAIC0zMzAsNiArMzM2LDExIEBAIHN0YXRpYyB2b2lkIHNlcnZlckNhbGxiYWNrKFNvdXBT ZXJ2ZXIqIHNlcnZlciwgU291cE1lc3NhZ2UqIG1lc3NhZ2UsIGNvbnN0IGNoYXIqCiAgICAgICAg IHNvdXBfbWVzc2FnZV9zZXRfc3RhdHVzKG1lc3NhZ2UsIFNPVVBfU1RBVFVTX09LKTsKICAgICAg ICAgc291cF9tZXNzYWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHksIFNPVVBf TUVNT1JZX0NPUFksIGFjY2VwdExhbmd1YWdlLCBzdHJsZW4oYWNjZXB0TGFuZ3VhZ2UpKTsKICAg ICAgICAgc291cF9tZXNzYWdlX2JvZHlfY29tcGxldGUobWVzc2FnZS0+cmVzcG9uc2VfYm9keSk7 CisgICAgfSBlbHNlIGlmIChnX3N0cl9lcXVhbChwYXRoLCAiL2VtcHR5IikpIHsKKyAgICAgICAg Y29uc3QgY2hhciogZW1wdHlIVE1MID0gIjxodG1sPjxib2R5PjwvYm9keT48L2h0bWw+IjsKKyAg ICAgICAgc291cF9tZXNzYWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHksIFNP VVBfTUVNT1JZX1NUQVRJQywgZW1wdHlIVE1MLCBzdHJsZW4oZW1wdHlIVE1MKSk7CisgICAgICAg IHNvdXBfbWVzc2FnZV9ib2R5X2NvbXBsZXRlKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHkpOworICAg ICAgICBzb3VwX21lc3NhZ2Vfc2V0X3N0YXR1cyhtZXNzYWdlLCBTT1VQX1NUQVRVU19PSyk7CiAg ICAgfSBlbHNlCiAgICAgICAgIHNvdXBfbWVzc2FnZV9zZXRfc3RhdHVzKG1lc3NhZ2UsIFNPVVBf U1RBVFVTX05PVF9GT1VORCk7CiB9CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2d0 ay9XZWJLaXQyR3RrL1Rlc3RNYWluLmggYi9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9XZWJLaXQy R3RrL1Rlc3RNYWluLmgKaW5kZXggZDdkZmFkNC4uYzc3YzE5YSAxMDA2NDQKLS0tIGEvVG9vbHMv VGVzdFdlYktpdEFQSS9ndGsvV2ViS2l0Mkd0ay9UZXN0TWFpbi5oCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvZ3RrL1dlYktpdDJHdGsvVGVzdE1haW4uaApAQCAtNjgsNyArNjgsMTEgQEAgcHVi bGljOgogICAgIFRlc3QoKQogICAgIHsKICAgICAgICAgR1VuaXF1ZVB0cjxjaGFyPiBsb2NhbFN0 b3JhZ2VEaXJlY3RvcnkoZ19idWlsZF9maWxlbmFtZShkYXRhRGlyZWN0b3J5KCksICJsb2NhbC1z dG9yYWdlIiwgbnVsbHB0cikpOwotICAgICAgICBtX3dlYkNvbnRleHQgPSBhZG9wdEdSZWYoV0VC S0lUX1dFQl9DT05URVhUKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfQ09OVEVYVCwgImxv Y2FsLXN0b3JhZ2UtZGlyZWN0b3J5IiwgbG9jYWxTdG9yYWdlRGlyZWN0b3J5LmdldCgpLCBudWxs cHRyKSkpOworICAgICAgICBHVW5pcXVlUHRyPGNoYXI+IGluZGV4ZWREQkRpcmVjdG9yeShnX2J1 aWxkX2ZpbGVuYW1lKGRhdGFEaXJlY3RvcnkoKSwgImluZGV4ZWRkYiIsIG51bGxwdHIpKTsKKyAg ICAgICAgbV93ZWJDb250ZXh0ID0gYWRvcHRHUmVmKFdFQktJVF9XRUJfQ09OVEVYVChnX29iamVj dF9uZXcoV0VCS0lUX1RZUEVfV0VCX0NPTlRFWFQsCisgICAgICAgICAgICAibG9jYWwtc3RvcmFn ZS1kaXJlY3RvcnkiLCBsb2NhbFN0b3JhZ2VEaXJlY3RvcnkuZ2V0KCksCisgICAgICAgICAgICAi aW5kZXhlZC1kYi1kaXJlY3RvcnkiLCBpbmRleGVkREJEaXJlY3RvcnkuZ2V0KCksCisgICAgICAg ICAgICBudWxscHRyKSkpOwogCiAgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3QobV93ZWJDb250ZXh0 LmdldCgpLCAiaW5pdGlhbGl6ZS13ZWItZXh0ZW5zaW9ucyIsIEdfQ0FMTEJBQ0soaW5pdGlhbGl6 ZVdlYkV4dGVuc2lvbnNDYWxsYmFjayksIHRoaXMpOwogICAgICAgICBHVW5pcXVlUHRyPGNoYXI+ IGRpc2tDYWNoZURpcmVjdG9yeShnX2J1aWxkX2ZpbGVuYW1lKGRhdGFEaXJlY3RvcnkoKSwgImRp c2stY2FjaGUiLCBudWxscHRyKSk7Cg==