63593 2011-06-28 18:20:52 -0700 IndexedDB: Prepare for running layout tests with LevelDB 2011-06-30 11:33:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hans hans dgrogan tony oldest_to_newest 429346 0 hans 2011-06-28 18:20:52 -0700 IndexedDB: Prepare for running layout tests with LevelDB 429351 1 99021 hans 2011-06-28 18:26:14 -0700 Created attachment 99021 Patch 429928 2 99021 dgrogan 2011-06-29 15:26:27 -0700 Comment on attachment 99021 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=99021&action=review LGTM > Source/WebCore/ChangeLog:8 > + Migration of data from SQLite to LevelDB must be done before the From an IM convo with hans: the problem occurs when we first use leveldb, then sqlite, and then leveldb again.. which happens in the case of layout tests 430551 3 99021 tony 2011-06-30 11:06:14 -0700 Comment on attachment 99021 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=99021&action=review >> Source/WebCore/ChangeLog:8 >> + Migration of data from SQLite to LevelDB must be done before the > > From an IM convo with hans: > the problem occurs when we first use leveldb, then sqlite, and then leveldb again.. which happens in the case of layout tests Would be nice to include this in the ChangeLog description. > Source/WebCore/storage/IDBFactoryBackendImpl.cpp:110 > + (void)migrationSucceeded; // FIXME: When migration is actually implemented, we need error handling here. Nit: UNUSED_PARAM(migrationSucceeded) 430572 4 hans 2011-06-30 11:33:11 -0700 Committed r90137: <http://trac.webkit.org/changeset/90137> 99021 2011-06-28 18:26:14 -0700 2011-06-30 11:06:14 -0700 Patch bug-63593-20110629022612.patch text/plain 11687 hans U3VidmVyc2lvbiBSZXZpc2lvbjogODk5NTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MTkzNTIyNWRmYmRjMTI1 ZmVhZDhjYmUzMGFjODRhNmI3YjlhZDU4Li4xMDNiODcwMDYzZGY1MDY4NDhhNmNlOGFmMjM2Mzcz NDI4ZjUwYjQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDYtMjggIEhhbnMg V2VubmJvcmcgIDxoYW5zQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbmRleGVkREI6IFByZXBhcmUgZm9yIHJ1bm5pbmcgbGF5 b3V0IHRlc3RzIHdpdGggTGV2ZWxEQgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjM1OTMKKworICAgICAgICBNaWdyYXRpb24gb2YgZGF0YSBmcm9tIFNR TGl0ZSB0byBMZXZlbERCIG11c3QgYmUgZG9uZSBiZWZvcmUgdGhlCisgICAgICAgIG1fYmFja2lu Z1N0b3JlIG1hcCBpcyBjaGVja2VkIGZvciBhbiBvcGVuIExldmVsREIsIHNpbmNlIGl0IHdpbGwK KyAgICAgICAgaGF2ZSBiZWVuIG9wZW5lZCBieSBwcmV2aW91cyBsYXlvdXQgdGVzdHMuCisKKyAg ICAgICAgQ292ZXJlZCBieSBleGlzdGluZyBsYXlvdXQgdGVzdHMuCisKKyAgICAgICAgKiBzdG9y YWdlL0lEQkZhY3RvcnlCYWNrZW5kSW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJGYWN0 b3J5QmFja2VuZEltcGw6Om9wZW4pOgorCiAyMDExLTA2LTI4ICBSeW9zdWtlIE5pd2EgIDxybml3 YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJGYWN0b3J5QmFja2VuZEltcGwuY3BwIGIv U291cmNlL1dlYkNvcmUvc3RvcmFnZS9JREJGYWN0b3J5QmFja2VuZEltcGwuY3BwCmluZGV4IGM3 OWY1MzdiN2RkMjUzMTBiN2Q4ZWQwZWY4NTY0MzMyZDRlYWIwMTAuLmE5ODdjYmExZDc5YmM4NjMy YmZkMTM5ZmUyYmYxN2JmN2MyZDBiZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0b3Jh Z2UvSURCRmFjdG9yeUJhY2tlbmRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdl L0lEQkZhY3RvcnlCYWNrZW5kSW1wbC5jcHAKQEAgLTgzLDggKzgzLDcgQEAgdm9pZCBJREJGYWN0 b3J5QmFja2VuZEltcGw6OnJlbW92ZUlEQkJhY2tpbmdTdG9yZShjb25zdCBTdHJpbmcmIGZpbGVJ ZGVudGlmaWVyKQogCiB2b2lkIElEQkZhY3RvcnlCYWNrZW5kSW1wbDo6b3Blbihjb25zdCBTdHJp bmcmIG5hbWUsIFBhc3NSZWZQdHI8SURCQ2FsbGJhY2tzPiBjYWxsYmFja3MsIFBhc3NSZWZQdHI8 U2VjdXJpdHlPcmlnaW4+IHNlY3VyaXR5T3JpZ2luLCBGcmFtZSosIGNvbnN0IFN0cmluZyYgZGF0 YURpciwgaW50NjRfdCBtYXhpbXVtU2l6ZSwgQmFja2luZ1N0b3JlVHlwZSBiYWNraW5nU3RvcmVU eXBlKQogewotICAgIGlmIChiYWNraW5nU3RvcmVUeXBlID09IERlZmF1bHRCYWNraW5nU3RvcmUp Ci0gICAgICAgIGJhY2tpbmdTdG9yZVR5cGUgPSBTUUxpdGVCYWNraW5nU3RvcmU7IC8vIEZJWE1F OiBEZWZhdWx0QmFja2luZ1N0b3JlIGlzIGNvbmZ1c2luZzsgZ2V0IHJpZCBvZiBpdC4KKyAgICBB U1NFUlQoYmFja2luZ1N0b3JlVHlwZSAhPSBEZWZhdWx0QmFja2luZ1N0b3JlKTsKIAogICAgIGNv bnN0IFN0cmluZyBmaWxlSWRlbnRpZmllciA9IGNvbXB1dGVGaWxlSWRlbnRpZmllcihzZWN1cml0 eU9yaWdpbi5nZXQoKSwgYmFja2luZ1N0b3JlVHlwZSk7CiAgICAgY29uc3QgU3RyaW5nIHVuaXF1 ZUlkZW50aWZpZXIgPSBjb21wdXRlVW5pcXVlSWRlbnRpZmllcihuYW1lLCBzZWN1cml0eU9yaWdp bi5nZXQoKSwgYmFja2luZ1N0b3JlVHlwZSk7CkBAIC05NywyOCArOTYsMjcgQEAgdm9pZCBJREJG YWN0b3J5QmFja2VuZEltcGw6Om9wZW4oY29uc3QgU3RyaW5nJiBuYW1lLCBQYXNzUmVmUHRyPElE QkNhbGxiYWNrcz4gY2EKIAogICAgIC8vIEZJWE1FOiBFdmVyeXRoaW5nIGZyb20gbm93IG9uIHNo b3VsZCBiZSBkb25lIG9uIGFub3RoZXIgdGhyZWFkLgogCisjaWYgRU5BQkxFKExFVkVMREIpCisg ICAgaWYgKGJhY2tpbmdTdG9yZVR5cGUgPT0gTGV2ZWxEQkJhY2tpbmdTdG9yZSkgeworICAgICAg ICBib29sIGhhc1NRTEJhY2tpbmdTdG9yZSA9IElEQlNRTGl0ZUJhY2tpbmdTdG9yZTo6YmFja2lu Z1N0b3JlRXhpc3RzKHNlY3VyaXR5T3JpZ2luLmdldCgpLCBuYW1lLCBkYXRhRGlyKTsKKworICAg ICAgICAvLyBMYXlvdXRUZXN0czogU1FMaXRlIGJhY2tpbmcgc3RvcmUgbWF5IG5vdCBleGlzdCBv biBkaXNrIGJ1dCBtYXkgZXhpc3QgaW4gY2FjaGUuCisgICAgICAgIFN0cmluZyBjYWNoZWRTcWxp dGVCYWNraW5nU3RvcmVJZGVudGlmaWVyID0gY29tcHV0ZUZpbGVJZGVudGlmaWVyKHNlY3VyaXR5 T3JpZ2luLmdldCgpLCBTUUxpdGVCYWNraW5nU3RvcmUpOworICAgICAgICBpZiAoIWhhc1NRTEJh Y2tpbmdTdG9yZSAmJiAobV9iYWNraW5nU3RvcmVNYXAuZW5kKCkgIT0gbV9iYWNraW5nU3RvcmVN YXAuZmluZChjYWNoZWRTcWxpdGVCYWNraW5nU3RvcmVJZGVudGlmaWVyKSkpCisgICAgICAgICAg ICBoYXNTUUxCYWNraW5nU3RvcmUgPSB0cnVlOworCisgICAgICAgIGlmIChoYXNTUUxCYWNraW5n U3RvcmUpIHsKKyAgICAgICAgICAgIGJvb2wgbWlncmF0aW9uU3VjY2VlZGVkID0gbWlncmF0ZUZy b21TUUxpdGVUb0xldmVsREIobmFtZSwgc2VjdXJpdHlPcmlnaW4uZ2V0KCksIGRhdGFEaXIsIG1h eGltdW1TaXplKTsKKyAgICAgICAgICAgICh2b2lkKW1pZ3JhdGlvblN1Y2NlZWRlZDsgLy8gRklY TUU6IFdoZW4gbWlncmF0aW9uIGlzIGFjdHVhbGx5IGltcGxlbWVudGVkLCB3ZSBuZWVkIGVycm9y IGhhbmRsaW5nIGhlcmUuCisgICAgICAgIH0KKyAgICB9CisjZW5kaWYKKwogICAgIFJlZlB0cjxJ REJCYWNraW5nU3RvcmU+IGJhY2tpbmdTdG9yZTsKICAgICBJREJCYWNraW5nU3RvcmVNYXA6Oml0 ZXJhdG9yIGl0MiA9IG1fYmFja2luZ1N0b3JlTWFwLmZpbmQoZmlsZUlkZW50aWZpZXIpOwogICAg IGlmIChpdDIgIT0gbV9iYWNraW5nU3RvcmVNYXAuZW5kKCkgJiYgKGJhY2tpbmdTdG9yZVR5cGUg PT0gaXQyLT5zZWNvbmQtPmJhY2tpbmdTdG9yZVR5cGUoKSkpCiAgICAgICAgIGJhY2tpbmdTdG9y ZSA9IGl0Mi0+c2Vjb25kOwogICAgIGVsc2UgewotCi0jaWYgRU5BQkxFKExFVkVMREIpCi0gICAg ICAgIGlmIChiYWNraW5nU3RvcmVUeXBlID09IExldmVsREJCYWNraW5nU3RvcmUpIHsKLSAgICAg ICAgICAgIGJvb2wgaGFzU1FMQmFja2luZ1N0b3JlID0gSURCU1FMaXRlQmFja2luZ1N0b3JlOjpi YWNraW5nU3RvcmVFeGlzdHMoc2VjdXJpdHlPcmlnaW4uZ2V0KCksIG5hbWUsIGRhdGFEaXIpOwot Ci0gICAgICAgICAgICAvLyBMYXlvdXRUZXN0czogU1FMaXRlIGJhY2tpbmcgc3RvcmUgbWF5IG5v dCBleGlzdCBvbiBkaXNrIGJ1dCBtYXkgZXhpc3QgaW4gY2FjaGUuCi0gICAgICAgICAgICBTdHJp bmcgY2FjaGVkU3FsaXRlQmFja2luZ1N0b3JlSWRlbnRpZmllciA9IGNvbXB1dGVGaWxlSWRlbnRp ZmllcihzZWN1cml0eU9yaWdpbi5nZXQoKSwgU1FMaXRlQmFja2luZ1N0b3JlKTsKLSAgICAgICAg ICAgIGlmICghaGFzU1FMQmFja2luZ1N0b3JlICYmIChtX2JhY2tpbmdTdG9yZU1hcC5lbmQoKSAh PSBtX2JhY2tpbmdTdG9yZU1hcC5maW5kKGNhY2hlZFNxbGl0ZUJhY2tpbmdTdG9yZUlkZW50aWZp ZXIpKSkKLSAgICAgICAgICAgICAgICBoYXNTUUxCYWNraW5nU3RvcmUgPSB0cnVlOwotCi0gICAg ICAgICAgICBpZiAoaGFzU1FMQmFja2luZ1N0b3JlKSB7Ci0gICAgICAgICAgICAgICAgYm9vbCBt aWdyYXRpb25TdWNjZWVkZWQgPSBtaWdyYXRlRnJvbVNRTGl0ZVRvTGV2ZWxEQihuYW1lLCBzZWN1 cml0eU9yaWdpbi5nZXQoKSwgZGF0YURpciwgbWF4aW11bVNpemUpOwotICAgICAgICAgICAgICAg ICh2b2lkKW1pZ3JhdGlvblN1Y2NlZWRlZDsgLy8gRklYTUU6IFdoZW4gbWlncmF0aW9uIGlzIGFj dHVhbGx5IGltcGxlbWVudGVkLCB3ZSBuZWVkIGVycm9yIGhhbmRsaW5nIGhlcmUuCi0gICAgICAg ICAgICB9Ci0gICAgICAgIH0KLSNlbmRpZgotCiAgICAgICAgIGlmIChiYWNraW5nU3RvcmVUeXBl ID09IFNRTGl0ZUJhY2tpbmdTdG9yZSkKICAgICAgICAgICAgIGJhY2tpbmdTdG9yZSA9IElEQlNR TGl0ZUJhY2tpbmdTdG9yZTo6b3BlbihzZWN1cml0eU9yaWdpbi5nZXQoKSwgZGF0YURpciwgbWF4 aW11bVNpemUsIGZpbGVJZGVudGlmaWVyLCB0aGlzKTsKICNpZiBFTkFCTEUoTEVWRUxEQikKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggYmNlNzJhYTY0ZDQwYTFkMzY2MDdjNTlhNGE0OTFl NzY2MTBjMjU0OC4uYjRiODYxN2IzZDljMjAyNTFjODQyMDc1ZDg1ZjY3OTdiYzZiZDVhOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0wNi0yOCAgSGFu cyBXZW5uYm9yZyAgPGhhbnNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEluZGV4ZWREQjogUHJlcGFyZSBmb3IgcnVubmluZyBs YXlvdXQgdGVzdHMgd2l0aCBMZXZlbERCCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02MzU5MworCisgICAgICAgIFdlYklEQkZhY3Rvcnkgc2hvdWxkIGRl Y2lkZSB3aGF0IERlZmF1bHRCYWNraW5nU3RvcmUgbWVhbnMuCisgICAgICAgIEFsc28gZml4IGhh bmRsaW5nIG9mIGxheW91dCB0ZXN0IGFuZCBpbmNvZ25pdG8gbW9kZSBwcm9wZXJseS4KKworICAg ICAgICAqIHNyYy9XZWJJREJGYWN0b3J5SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYklE QkZhY3RvcnlJbXBsOjpvcGVuKToKKwogMjAxMS0wNi0yOCAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KIAogICAgICAgICBSb2xsZWQgREVQUy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYklEQkZhY3RvcnlJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYklEQkZhY3RvcnlJbXBsLmNwcAppbmRleCBhYjQ1NzAwNTI1NGM4ODE1 YzA3OTNlZmQyZWU0NGZkY2M3ZTQ1NTI2Li4zYjViNWU1NGIxMmVkZjJjMmVjYjRmMDAzMDQ5NTRi MmJjMGZmZmI3IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJREJG YWN0b3J5SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSURCRmFj dG9yeUltcGwuY3BwCkBAIC03NCwyMCArNzQsMjMgQEAgV2ViSURCRmFjdG9yeUltcGw6On5XZWJJ REJGYWN0b3J5SW1wbCgpCiB2b2lkIFdlYklEQkZhY3RvcnlJbXBsOjpvcGVuKGNvbnN0IFdlYlN0 cmluZyYgbmFtZSwgV2ViSURCQ2FsbGJhY2tzKiBjYWxsYmFja3MsIGNvbnN0IFdlYlNlY3VyaXR5 T3JpZ2luJiBvcmlnaW4sIFdlYkZyYW1lKiwgY29uc3QgV2ViU3RyaW5nJiBkYXRhRGlyLCB1bnNp Z25lZCBsb25nIGxvbmcgbWF4aW11bVNpemUsIEJhY2tpbmdTdG9yZVR5cGUgYmFja2luZ1N0b3Jl VHlwZSkKIHsKICAgICBXZWJTdHJpbmcgcGF0aCA9IGRhdGFEaXI7CisKICAgICBpZiAob3ZlcnJp ZGRlbkJhY2tpbmdTdG9yZVR5cGUgIT0gRGVmYXVsdEJhY2tpbmdTdG9yZSkgewogICAgICAgICAv LyBCYWNraW5nIHN0b3JlIHR5cGUgb3ZlcnJpZGRlbiBieSBMYXlvdXRUZXN0Q29udHJvbGxlci4K ICAgICAgICAgYmFja2luZ1N0b3JlVHlwZSA9IG92ZXJyaWRkZW5CYWNraW5nU3RvcmVUeXBlOwor ICAgIH0KIAotICAgICAgICAvLyBkYXRhRGlyIGlzIGVtcHR5IGZvciBsYXlvdXQgdGVzdHMuCi0g ICAgICAgIEFTU0VSVChkYXRhRGlyLmlzRW1wdHkoKSk7CisgICAgaWYgKGJhY2tpbmdTdG9yZVR5 cGUgPT0gRGVmYXVsdEJhY2tpbmdTdG9yZSkKKyAgICAgICAgYmFja2luZ1N0b3JlVHlwZSA9IFNR TGl0ZUJhY2tpbmdTdG9yZTsKIAotICAgICAgICBpZiAoYmFja2luZ1N0b3JlVHlwZSA9PSBMZXZl bERCQmFja2luZ1N0b3JlKSB7Ci0gICAgICAgICAgICAvLyBMZXZlbERCIGRvZXNuJ3Qgc3VwcG9y dCBpbi1tZW1vcnkgZGF0YWJhc2VzLCBzbyB1c2UgYSB0ZW1wb3JhcnkgZm9sZGVyLgorICAgIGlm IChkYXRhRGlyLmlzRW1wdHkoKSAmJiBiYWNraW5nU3RvcmVUeXBlID09IExldmVsREJCYWNraW5n U3RvcmUpIHsKKyAgICAgICAgaWYgKCF0ZW1wRGF0YWJhc2VGb2xkZXIuaXNFbXB0eSgpKSB7Cisg ICAgICAgICAgICAvLyBMYXlvdXQgdGVzdHMgcHJvdmlkZSBhIHRlbXBvcmFyeSBmb2xkZXIuCiAg ICAgICAgICAgICBwYXRoID0gdGVtcERhdGFiYXNlRm9sZGVyOworICAgICAgICB9IGVsc2Ugewor ICAgICAgICAgICAgLy8gRm9yIGluY29nbml0byBtb2RlLCBmYWxsIGJhY2sgdG8gU1FMaXRlLgor ICAgICAgICAgICAgYmFja2luZ1N0b3JlVHlwZSA9IFNRTGl0ZUJhY2tpbmdTdG9yZTsKICAgICAg ICAgfQotICAgIH0gZWxzZSBpZiAoZGF0YURpci5pc0VtcHR5KCkgJiYgYmFja2luZ1N0b3JlVHlw ZSA9PSBMZXZlbERCQmFja2luZ1N0b3JlKSB7Ci0gICAgICAgIC8vIEZhbGwgYmFjayB0byBTUUxp dGUgZm9yIGluY29nbml0byBtb2RlLgotICAgICAgICBiYWNraW5nU3RvcmVUeXBlID0gU1FMaXRl QmFja2luZ1N0b3JlOwogICAgIH0KIAogICAgIG1faWRiRmFjdG9yeUJhY2tlbmQtPm9wZW4obmFt ZSwgSURCQ2FsbGJhY2tzUHJveHk6OmNyZWF0ZShhZG9wdFB0cihjYWxsYmFja3MpKSwgb3JpZ2lu LCAwLCBwYXRoLCBtYXhpbXVtU2l6ZSwgc3RhdGljX2Nhc3Q8SURCRmFjdG9yeUJhY2tlbmRJbnRl cmZhY2U6OkJhY2tpbmdTdG9yZVR5cGU+KGJhY2tpbmdTdG9yZVR5cGUpKTsKZGlmZiAtLWdpdCBh L1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1N2MxMmNkOTNlODc0OWI3 MWJlMzQzOWM5NTEwNWRiMjgxZGE1MDQ5Li4yYzhiYWM0MWQzY2Q5NTlmNWZjZTM2OWI4ZTM0ZjRm YWY5NmI4OWRiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMjggIEhhbnMgV2VubmJvcmcgIDxoYW5zQGNo cm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJbmRleGVkREI6IFByZXBhcmUgZm9yIHJ1bm5pbmcgbGF5b3V0IHRlc3RzIHdpdGggTGV2 ZWxEQgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM1 OTMKKworICAgICAgICBUaGUgVGVzdFNoZWxsIG11c3QgYWx3YXlzIHByb3ZpZGUgYSB0ZW1wb3Jh cnkgZm9sZGVyIGZvciBMZXZlbERCLAorICAgICAgICBub3QganVzdCB3aGVuIHRoZSBiYWNraW5n IHN0b3JlIHR5cGUgaXMgb3ZlcnJpZGRlbi4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2No cm9taXVtL0xheW91dFRlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKExheW91dFRlc3RDb250 cm9sbGVyOjpzZXRPdmVycmlkZUluZGV4ZWREQkJhY2tpbmdTdG9yZSk6CisgICAgICAgIChMYXlv dXRUZXN0Q29udHJvbGxlcjo6Y2xlYXJBbGxEYXRhYmFzZXMpOgorICAgICAgICAqIER1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RDb250cm9sbGVyLmg6CisgICAgICAgICogRHVtcFJl bmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcDoKKyAgICAgICAgKFRlc3RTaGVsbDo6VGVz dFNoZWxsKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuaDoK KwogMjAxMS0wNi0yOCAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL0xheW91dFRlc3RDb250cm9sbGVyLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL0xheW91dFRlc3RDb250cm9sbGVyLmNwcAppbmRleCBiNThhOTQ0NDg2ODVhOGQy ODQzMzU1NjBjZmZmMGI0YWUzYjFiNjdjLi5iNzE5OWIyMGYyYzZiZTk0ZGE2MTE1MTI1Nzg5YThh YjAwZWY4OTkzIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlv dXRUZXN0Q29udHJvbGxlci5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0v TGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCkBAIC0xMDkwLDE1ICsxMDkwLDggQEAgdm9pZCBMYXlv dXRUZXN0Q29udHJvbGxlcjo6c2V0T3ZlcnJpZGVJbmRleGVkREJCYWNraW5nU3RvcmUoY29uc3Qg Q3BwQXJndW1lbnRMaXMKICAgICAgICAgV2ViSURCRmFjdG9yeTo6c2V0T3ZlcnJpZGVCYWNraW5n U3RvcmVUeXBlKFdlYklEQkZhY3Rvcnk6OkRlZmF1bHRCYWNraW5nU3RvcmUpOwogICAgIGVsc2Ug aWYgKG5hbWUgPT0gInNxbGl0ZSIpCiAgICAgICAgIFdlYklEQkZhY3Rvcnk6OnNldE92ZXJyaWRl QmFja2luZ1N0b3JlVHlwZShXZWJJREJGYWN0b3J5OjpTUUxpdGVCYWNraW5nU3RvcmUpOwotICAg IGVsc2UgaWYgKG5hbWUgPT0gImxldmVsZGIiKSB7CisgICAgZWxzZSBpZiAobmFtZSA9PSAibGV2 ZWxkYiIpCiAgICAgICAgIFdlYklEQkZhY3Rvcnk6OnNldE92ZXJyaWRlQmFja2luZ1N0b3JlVHlw ZShXZWJJREJGYWN0b3J5OjpMZXZlbERCQmFja2luZ1N0b3JlKTsKLQotICAgICAgICBtX3RlbXBG b2xkZXIgPSBhZG9wdFB0cih3ZWJraXRfc3VwcG9ydDo6Q3JlYXRlU2NvcGVkVGVtcERpcmVjdG9y eSgpKTsKLSAgICAgICAgaWYgKG1fdGVtcEZvbGRlcikgewotICAgICAgICAgICAgaWYgKG1fdGVt cEZvbGRlci0+Q3JlYXRlVW5pcXVlVGVtcERpcigpKQotICAgICAgICAgICAgICAgIFdlYklEQkZh Y3Rvcnk6OnNldFRlbXBvcmFyeURhdGFiYXNlRm9sZGVyKFdlYlN0cmluZzo6ZnJvbVVURjgobV90 ZW1wRm9sZGVyLT5wYXRoKCkuY19zdHIoKSkpOwotICAgICAgICB9Ci0gICAgfQogI2VuZGlmCiB9 CiAKQEAgLTE0ODEsNyArMTQ3NCw2IEBAIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OmNsZWFy QWxsRGF0YWJhc2VzKGNvbnN0IENwcEFyZ3VtZW50TGlzdCYgYXJndW1lbnRzLCBDCiB7CiAgICAg cmVzdWx0LT5zZXROdWxsKCk7CiAgICAgd2Via2l0X3N1cHBvcnQ6OkNsZWFyQWxsRGF0YWJhc2Vz KCk7Ci0gICAgbV90ZW1wRm9sZGVyLmNsZWFyKCk7CiB9CiAKIHZvaWQgTGF5b3V0VGVzdENvbnRy b2xsZXI6OnNldERhdGFiYXNlUXVvdGEoY29uc3QgQ3BwQXJndW1lbnRMaXN0JiBhcmd1bWVudHMs IENwcFZhcmlhbnQqIHJlc3VsdCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL0xheW91dFRlc3RDb250cm9sbGVyLmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9MYXlvdXRUZXN0Q29udHJvbGxlci5oCmluZGV4IGIwOWE2ZTU2MjM3MmNlM2VkNjAwMjNi ODJkN2U0OGJlNjUwNDhlMzguLjU1NDI1OTVkYjgxMGJjZWZhYzU1ZjM1YWFmNjUwNjBmNzFiZTBk NWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RD b250cm9sbGVyLmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVz dENvbnRyb2xsZXIuaApAQCAtNjA2LDkgKzYwNiw2IEBAIHByaXZhdGU6CiAKICAgICBDcHBWYXJp YW50IG1fZ2xvYmFsRmxhZzsKIAotICAgIC8vIFVzZWQgdG8gY3JlYXRlIGFuZCBkZXN0cm95IHRl bXBvcmFyeSBmb2xkZXJzLgotICAgIE93blB0cjx3ZWJraXRfc3VwcG9ydDo6U2NvcGVkVGVtcERp cmVjdG9yeT4gbV90ZW1wRm9sZGVyOwotCiAgICAgLy8gQm91bmQgdmFyaWFibGUgY291bnRpbmcg dGhlIG51bWJlciBvZiB0b3AgVVJMcyB2aXNpdGVkLgogICAgIENwcFZhcmlhbnQgbV93ZWJIaXN0 b3J5SXRlbUNvdW50OwogCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9UZXN0U2hlbGwuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxs LmNwcAppbmRleCBkYTVkZjliZGY3ODEyNTBlMmJhMWU3NzhkYTJjZjhmZmY3ZjhiYWI3Li44MDMy MjJjYWJiZTUwYTIwY2QwNGVhZTI3YmQyZWNlZjljMzJmMmYwIDEwMDY0NAotLS0gYS9Ub29scy9E dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbC5jcHAKQEAgLTM5LDYgKzM5LDcgQEAKICNpbmNsdWRl ICJXZWJFbGVtZW50LmgiCiAjaW5jbHVkZSAiV2ViRnJhbWUuaCIKICNpbmNsdWRlICJXZWJIaXN0 b3J5SXRlbS5oIgorI2luY2x1ZGUgIldlYklEQkZhY3RvcnkuaCIKICNpbmNsdWRlICJXZWJUZXN0 aW5nU3VwcG9ydC5oIgogI2luY2x1ZGUgIldlYktpdC5oIgogI2luY2x1ZGUgIldlYlBlcm1pc3Np b25zLmgiCkBAIC0xMzIsNiArMTMzLDEyIEBAIFRlc3RTaGVsbDo6VGVzdFNoZWxsKGJvb2wgdGVz dFNoZWxsTW9kZSkKICAgICAvLyB0aW1lZC1vdXQgRFJUIHByb2Nlc3Mgd2FzIGNyYXNoZWQuCiAg ICAgbV90aW1lb3V0ID0gMzAgKiAxMDAwOwogCisjaWYgRU5BQkxFKElOREVYRURfREFUQUJBU0Up CisgICAgbV90ZW1wSW5kZXhlZERCRGlyZWN0b3J5ID0gYWRvcHRQdHIod2Via2l0X3N1cHBvcnQ6 OkNyZWF0ZVNjb3BlZFRlbXBEaXJlY3RvcnkoKSk7CisgICAgbV90ZW1wSW5kZXhlZERCRGlyZWN0 b3J5LT5DcmVhdGVVbmlxdWVUZW1wRGlyKCk7CisgICAgV2ViSURCRmFjdG9yeTo6c2V0VGVtcG9y YXJ5RGF0YWJhc2VGb2xkZXIoV2ViU3RyaW5nOjpmcm9tVVRGOChtX3RlbXBJbmRleGVkREJEaXJl Y3RvcnktPnBhdGgoKS5jX3N0cigpKSk7CisjZW5kaWYKKwogICAgIGNyZWF0ZU1haW5XaW5kb3co KTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNo ZWxsLmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuaAppbmRleCBk YzRjNmM4ZTA4OWMyNTFlYzM0MGFkMWZhZDRkYjFkNDQ0ZGNlYWU4Li5iMzU0OGNiOWJjZmZjYjA1 NzZiOTE5OTQ0ZTI2MTU5YWFjNjU5MjlhIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJl ZS9jaHJvbWl1bS9UZXN0U2hlbGwuaAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9UZXN0U2hlbGwuaApAQCAtMjMxLDYgKzIzMSw5IEBAIHByaXZhdGU6CiAgICAgLy8gVXNlZCBi eSB0aGUgd2F0Y2hkb2cgdG8ga25vdyB3aGVuIGl0J3MgZmluaXNoZWQuCiAgICAgSEFORExFIG1f ZmluaXNoZWRFdmVudDsKICNlbmRpZgorCisgICAgLy8gVGVtcG9yYXJ5IGRpcmVjdG9yeSBmb3Ig SW5kZXhlZERCIChMZXZlbERCIGRvZXNuJ3Qgc3VwcG9ydCBpbi1tZW1vcnkgZGF0YWJhc2VzLikK KyAgICBPd25QdHI8d2Via2l0X3N1cHBvcnQ6OlNjb3BlZFRlbXBEaXJlY3Rvcnk+IG1fdGVtcElu ZGV4ZWREQkRpcmVjdG9yeTsKIH07CiAKIHZvaWQgcGxhdGZvcm1Jbml0KGludCosIGNoYXIqKiop Owo=