19110 2008-05-18 06:57:50 -0700 SquirrelFish: Google Maps - no maps 2008-05-20 14:39:29 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED http://maps.google.com/ P2 Normal --- 1 john oliver oliver oldest_to_newest 80847 0 john 2008-05-18 06:57:50 -0700 The map area of Google Maps shows as a gray rectangle. (r33563) 80985 1 21256 oliver 2008-05-20 07:43:38 -0700 Created attachment 21256 Fixeration, no layout tests yet though Still needs layout tests, but is otherwise complete. 80993 2 21256 ggaren 2008-05-20 10:22:12 -0700 Comment on attachment 21256 Fixeration, no layout tests yet though Love that "added benefit" :). 81038 3 oliver 2008-05-20 14:39:29 -0700 Committing to http://svn.webkit.org/repository/webkit/branches/squirrelfish ... M JavaScriptCore/ChangeLog M JavaScriptCore/VM/CodeBlock.cpp M JavaScriptCore/VM/CodeGenerator.cpp M JavaScriptCore/VM/CodeGenerator.h M JavaScriptCore/VM/Machine.cpp M JavaScriptCore/VM/Opcode.h M JavaScriptCore/kjs/nodes.cpp Committed r33944 21256 2008-05-20 07:43:38 -0700 2008-05-20 10:22:12 -0700 Fixeration, no layout tests yet though mapsfix.patch text/plain 10112 oliver ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA2MDAzZTk5Li42MjYzZGM4IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMDgtMDUtMjAgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCdWcgMTkxMTA6IFNxdWly cmVsRmlzaDogR29vZ2xlIE1hcHMgLSBubyBtYXBzCisgICAgICAgIDxodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMTA+CisKKyAgICAgICAgQ29ycmVjdCBhIGNvbWVk eSBvZiBlcnJvcnMgcHJlc2VudCBpbiBteSBvcmlnaW5hbCBwYXRjaCB0byAiZml4IgorICAgICAg ICBleGNlcHRpb25zIG9jY3VycmluZyBtaWR3YXkgdGhyb3VnaCBwcmUgYW5kIHBvc3QgaW5jcmVt ZW50LiBUaGlzCisgICAgICAgIHNvbHV0aW9uIGlzIGNsZWFuZXIgdGhhbiB0aGUgb3JpZ2luYWws IGRvZXNuJ3QgbmVlZCB0aGUgYWRkaXRpb25hbAorICAgICAgICBvcGNvZGVzLCBhbmQgYXMgYW4g YWRkZWQgYmVuZWZpdCBkb2VzIG5vdCBicmVhayBHb29nbGUgTWFwcy4KKworICAgICAgICBTdW5z cGlkZXIgcmVwb3J0cyBhIDAuNCUgcHJvZ3Jlc3Npb24uCisKKyAgICAgICAgKiBWTS9Db2RlQmxv Y2suY3BwOgorICAgICAgICAoS0pTOjpDb2RlQmxvY2s6OmR1bXApOgorICAgICAgICAqIFZNL0Nv ZGVHZW5lcmF0b3IuY3BwOgorICAgICAgICAqIFZNL0NvZGVHZW5lcmF0b3IuaDoKKyAgICAgICAg KiBWTS9NYWNoaW5lLmNwcDoKKyAgICAgICAgKEtKUzo6TWFjaGluZTo6cHJpdmF0ZUV4ZWN1dGUp OgorICAgICAgICAqIFZNL09wY29kZS5oOgorICAgICAgICAqIGtqcy9ub2Rlcy5jcHA6CisgICAg ICAgIChLSlM6OlByZUluY1Jlc29sdmVOb2RlOjplbWl0Q29kZSk6CisgICAgICAgIChLSlM6OlBy ZURlY1Jlc29sdmVOb2RlOjplbWl0Q29kZSk6CisgICAgICAgIChLSlM6OlByZUluY0JyYWNrZXRO b2RlOjplbWl0Q29kZSk6CisgICAgICAgIChLSlM6OlByZURlY0JyYWNrZXROb2RlOjplbWl0Q29k ZSk6CisgICAgICAgIChLSlM6OlByZUluY0RvdE5vZGU6OmVtaXRDb2RlKToKKyAgICAgICAgKEtK Uzo6UHJlRGVjRG90Tm9kZTo6ZW1pdENvZGUpOgorCiAyMDA4LTA1LTIwICBNYWNpZWogU3RhY2hv d2lhayAgPG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2xpdmVyLgpkaWZm IC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvVk0vQ29kZUJsb2NrLmNwcCBiL0phdmFTY3JpcHRDb3Jl L1ZNL0NvZGVCbG9jay5jcHAKaW5kZXggMmMxMmNlYi4uY2E4YjA4NiAxMDA2NDQKLS0tIGEvSmF2 YVNjcmlwdENvcmUvVk0vQ29kZUJsb2NrLmNwcAorKysgYi9KYXZhU2NyaXB0Q29yZS9WTS9Db2Rl QmxvY2suY3BwCkBAIC0yNTgsMTQgKzI1OCw2IEBAIHZvaWQgQ29kZUJsb2NrOjpkdW1wKEV4ZWNT dGF0ZSogZXhlYywgY29uc3QgVmVjdG9yPEluc3RydWN0aW9uPjo6Y29uc3RfaXRlcmF0b3ImCiAg ICAgICAgICAgICBwcmludGYoIlslNGRdIHByZV9kZWNcdFx0ICVzXG4iLCBsb2NhdGlvbiwgcmVn aXN0ZXJOYW1lKHIwKS5jX3N0cigpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0g ICAgICAgIGNhc2Ugb3BfcHJlX2luY19tb3Y6IHsKLSAgICAgICAgICAgIHByaW50VW5hcnlPcChs b2NhdGlvbiwgaXQsICJwcmVfaW5jX21vdiIpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg IH0KLSAgICAgICAgY2FzZSBvcF9wcmVfZGVjX21vdjogewotICAgICAgICAgICAgcHJpbnRVbmFy eU9wKGxvY2F0aW9uLCBpdCwgInByZV9kZWNfbW92Iik7Ci0gICAgICAgICAgICBicmVhazsKLSAg ICAgICAgfQogICAgICAgICBjYXNlIG9wX3Bvc3RfaW5jOiB7CiAgICAgICAgICAgICBwcmludFVu YXJ5T3AobG9jYXRpb24sIGl0LCAicG9zdF9pbmMiKTsKICAgICAgICAgICAgIGJyZWFrOwpkaWZm IC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvVk0vQ29kZUdlbmVyYXRvci5jcHAgYi9KYXZhU2NyaXB0 Q29yZS9WTS9Db2RlR2VuZXJhdG9yLmNwcAppbmRleCBkZGU4MTc3Li5lODE3NzU4IDEwMDY0NAot LS0gYS9KYXZhU2NyaXB0Q29yZS9WTS9Db2RlR2VuZXJhdG9yLmNwcAorKysgYi9KYXZhU2NyaXB0 Q29yZS9WTS9Db2RlR2VuZXJhdG9yLmNwcApAQCAtNTI3LDI2ICs1MjcsNiBAQCBSZWdpc3RlcklE KiBDb2RlR2VuZXJhdG9yOjplbWl0UHJlRGVjKFJlZ2lzdGVySUQqIHNyY0RzdCkKICAgICByZXR1 cm4gc3JjRHN0OwogfQogCi1SZWdpc3RlcklEKiBDb2RlR2VuZXJhdG9yOjplbWl0UHJlSW5jKFJl Z2lzdGVySUQqIGRzdCwgUmVnaXN0ZXJJRCogc3JjKQotewotICAgIGlmICghZHN0IHx8IGRzdCA9 PSBzcmMpCi0gICAgICAgIHJldHVybiBlbWl0UHJlSW5jKHNyYyk7Ci0gICAgaW5zdHJ1Y3Rpb25z KCkuYXBwZW5kKG1hY2hpbmUoKS5nZXRPcGNvZGUob3BfcHJlX2luY19tb3YpKTsKLSAgICBpbnN0 cnVjdGlvbnMoKS5hcHBlbmQoZHN0LT5pbmRleCgpKTsKLSAgICBpbnN0cnVjdGlvbnMoKS5hcHBl bmQoc3JjLT5pbmRleCgpKTsKLSAgICByZXR1cm4gZHN0OwotfQotCi1SZWdpc3RlcklEKiBDb2Rl R2VuZXJhdG9yOjplbWl0UHJlRGVjKFJlZ2lzdGVySUQqIGRzdCwgUmVnaXN0ZXJJRCogc3JjKQot ewotICAgIGlmICghZHN0IHx8IGRzdCA9PSBzcmMpCi0gICAgICAgIHJldHVybiBlbWl0UHJlRGVj KHNyYyk7Ci0gICAgaW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKG1hY2hpbmUoKS5nZXRPcGNvZGUob3Bf cHJlX2RlY19tb3YpKTsKLSAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQoZHN0LT5pbmRleCgpKTsK LSAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQoc3JjLT5pbmRleCgpKTsKLSAgICByZXR1cm4gZHN0 OwotfQotCiBSZWdpc3RlcklEKiBDb2RlR2VuZXJhdG9yOjplbWl0UG9zdEluYyhSZWdpc3RlcklE KiBkc3QsIFJlZ2lzdGVySUQqIHNyY0RzdCkKIHsKICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQo bWFjaGluZSgpLmdldE9wY29kZShvcF9wb3N0X2luYykpOwpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlw dENvcmUvVk0vQ29kZUdlbmVyYXRvci5oIGIvSmF2YVNjcmlwdENvcmUvVk0vQ29kZUdlbmVyYXRv ci5oCmluZGV4IDg3ZWJjZTAuLjljNDQ4ODAgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL1ZN L0NvZGVHZW5lcmF0b3IuaAorKysgYi9KYXZhU2NyaXB0Q29yZS9WTS9Db2RlR2VuZXJhdG9yLmgK QEAgLTE5OCw4ICsxOTgsNiBAQCBuYW1lc3BhY2UgS0pTIHsKICAgICAgICAgUmVnaXN0ZXJJRCog ZW1pdE5lZ2F0ZShSZWdpc3RlcklEKiBkc3QsIFJlZ2lzdGVySUQqIHNyYyk7CiAgICAgICAgIFJl Z2lzdGVySUQqIGVtaXRQcmVJbmMoUmVnaXN0ZXJJRCogc3JjRHN0KTsKICAgICAgICAgUmVnaXN0 ZXJJRCogZW1pdFByZURlYyhSZWdpc3RlcklEKiBzcmNEc3QpOwotICAgICAgICBSZWdpc3RlcklE KiBlbWl0UHJlSW5jKFJlZ2lzdGVySUQqIGRzdCwgUmVnaXN0ZXJJRCogc3JjKTsKLSAgICAgICAg UmVnaXN0ZXJJRCogZW1pdFByZURlYyhSZWdpc3RlcklEKiBkc3QsIFJlZ2lzdGVySUQqIHNyY0Rz dCk7CiAgICAgICAgIFJlZ2lzdGVySUQqIGVtaXRQb3N0SW5jKFJlZ2lzdGVySUQqIGRzdCwgUmVn aXN0ZXJJRCogc3JjRHN0KTsKICAgICAgICAgUmVnaXN0ZXJJRCogZW1pdFBvc3REZWMoUmVnaXN0 ZXJJRCogZHN0LCBSZWdpc3RlcklEKiBzcmNEc3QpOwogICAgICAgICBSZWdpc3RlcklEKiBlbWl0 QWRkKFJlZ2lzdGVySUQqIGRzdCwgUmVnaXN0ZXJJRCogc3JjMSwgUmVnaXN0ZXJJRCogc3JjMik7 CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9WTS9NYWNoaW5lLmNwcCBiL0phdmFTY3JpcHRD b3JlL1ZNL01hY2hpbmUuY3BwCmluZGV4IGIxOTg2NTMuLjZlZmM2N2QgMTAwNjQ0Ci0tLSBhL0ph dmFTY3JpcHRDb3JlL1ZNL01hY2hpbmUuY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL1ZNL01hY2hp bmUuY3BwCkBAIC0xMDE1LDM2ICsxMDE1LDYgQEAgSlNWYWx1ZSogTWFjaGluZTo6cHJpdmF0ZUV4 ZWN1dGUoRXhlY3V0aW9uRmxhZyBmbGFnLCBFeGVjU3RhdGUqIGV4ZWMsIFJlZ2lzdGVyRmkKICAg ICAgICAgKyt2UEM7CiAgICAgICAgIE5FWFRfT1BDT0RFOwogICAgIH0KLSAgICBCRUdJTl9PUENP REUob3BfcHJlX2luY19tb3YpIHsKLSAgICAgICAgLyogcHJlX2luY19tb3YgZHN0KHIpIHNyYyhy KQotICAgICAgICAgCi0gICAgICAgICBDb252ZXJ0cyByZWdpc3RlciBzcmMgdG8gbnVtYmVyLCBh ZGRzIG9uZSwgYW5kIHB1dHMgdGhlIHJlc3VsdAotICAgICAgICAgaW4gcmVnaXN0ZXIgZHN0Lgot ICAgICAgICAgKi8KLSAgICAgICAgaW50IGRzdCA9ICgrK3ZQQyktPnUub3BlcmFuZDsKLSAgICAg ICAgaW50IHNyYyA9ICgrK3ZQQyktPnUub3BlcmFuZDsKLSAgICAgICAgSlNWYWx1ZSogcmVzdWx0 ID0ganNOdW1iZXIocltzcmNdLnUuanNWYWx1ZS0+dG9OdW1iZXIoZXhlYykgKyAxKTsKLSAgICAg ICAgVk1fQ0hFQ0tfRVhDRVBUSU9OKCk7Ci0gICAgICAgIHJbZHN0XS51LmpzVmFsdWUgPSByZXN1 bHQ7Ci0gICAgICAgIAotICAgICAgICArK3ZQQzsKLSAgICAgICAgTkVYVF9PUENPREU7Ci0gICAg fQotICAgIEJFR0lOX09QQ09ERShvcF9wcmVfZGVjX21vdikgewotICAgICAgICAvKiBwcmVfZGVj X21vdiBkc3Qocikgc3JjKHIpCi0gICAgICAgICAKLSAgICAgICAgIENvbnZlcnRzIHJlZ2lzdGVy IHNyYyB0byBudW1iZXIsIHN1YnRyYWN0cyBvbmUsIGFuZCBwdXRzIHRoZSByZXN1bHQKLSAgICAg ICAgIGluIHJlZ2lzdGVyIGRzdC4KLSAgICAgICAgICovCi0gICAgICAgIGludCBkc3QgPSAoKyt2 UEMpLT51Lm9wZXJhbmQ7Ci0gICAgICAgIGludCBzcmMgPSAoKyt2UEMpLT51Lm9wZXJhbmQ7Ci0g ICAgICAgIEpTVmFsdWUqIHJlc3VsdCA9IGpzTnVtYmVyKHJbc3JjXS51LmpzVmFsdWUtPnRvTnVt YmVyKGV4ZWMpIC0gMSk7Ci0gICAgICAgIFZNX0NIRUNLX0VYQ0VQVElPTigpOwotICAgICAgICBy W2RzdF0udS5qc1ZhbHVlID0gcmVzdWx0OwotICAgICAgICAKLSAgICAgICAgKyt2UEM7Ci0gICAg ICAgIE5FWFRfT1BDT0RFOwotICAgIH0KICAgICBCRUdJTl9PUENPREUob3BfcG9zdF9pbmMpIHsK ICAgICAgICAgLyogcG9zdF9pbmMgZHN0KHIpIHNyY0RzdChyKQogCmRpZmYgLS1naXQgYS9KYXZh U2NyaXB0Q29yZS9WTS9PcGNvZGUuaCBiL0phdmFTY3JpcHRDb3JlL1ZNL09wY29kZS5oCmluZGV4 IGE3NTA5NDQuLjhhZmRjMzkgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL1ZNL09wY29kZS5o CisrKyBiL0phdmFTY3JpcHRDb3JlL1ZNL09wY29kZS5oCkBAIC01MSw4ICs1MSw2IEBAIG5hbWVz cGFjZSBLSlMgewogICAgICAgICBcCiAgICAgICAgIG1hY3JvKG9wX3ByZV9pbmMpIFwKICAgICAg ICAgbWFjcm8ob3BfcHJlX2RlYykgXAotICAgICAgICBtYWNybyhvcF9wcmVfaW5jX21vdikgXAot ICAgICAgICBtYWNybyhvcF9wcmVfZGVjX21vdikgXAogICAgICAgICBtYWNybyhvcF9wb3N0X2lu YykgXAogICAgICAgICBtYWNybyhvcF9wb3N0X2RlYykgXAogICAgICAgICBtYWNybyhvcF90b19q c251bWJlcikgXApkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUva2pzL25vZGVzLmNwcCBiL0ph dmFTY3JpcHRDb3JlL2tqcy9ub2Rlcy5jcHAKaW5kZXggMmE5YjVjZi4uYWJkZWQ4YSAxMDA2NDQK LS0tIGEvSmF2YVNjcmlwdENvcmUva2pzL25vZGVzLmNwcAorKysgYi9KYXZhU2NyaXB0Q29yZS9r anMvbm9kZXMuY3BwCkBAIC0yMzQ1LDggKzIzNDUsOSBAQCBSZWdpc3RlcklEKiBQcmVJbmNSZXNv bHZlTm9kZTo6ZW1pdENvZGUoQ29kZUdlbmVyYXRvciYgZ2VuZXJhdG9yLCBSZWdpc3RlcklEKiBk cwogICAgIAogICAgIFJlZlB0cjxSZWdpc3RlcklEPiBwcm9wRHN0ID0gZ2VuZXJhdG9yLnRlbXBE ZXN0aW5hdGlvbihkc3QpOwogICAgIFJlZlB0cjxSZWdpc3RlcklEPiBiYXNlID0gZ2VuZXJhdG9y LmVtaXRSZXNvbHZlV2l0aEJhc2UoZ2VuZXJhdG9yLm5ld1RlbXBvcmFyeSgpLCBwcm9wRHN0Lmdl dCgpLCBtX2lkZW50KTsKLSAgICBnZW5lcmF0b3IuZW1pdFByZUluYyhkc3QsIHByb3BEc3QuZ2V0 KCkpOwotICAgIHJldHVybiBnZW5lcmF0b3IuZW1pdFB1dEJ5SWQoYmFzZS5nZXQoKSwgbV9pZGVu dCwgcHJvcERzdC5nZXQoKSk7CisgICAgZ2VuZXJhdG9yLmVtaXRQcmVJbmMocHJvcERzdC5nZXQo KSk7CisgICAgZ2VuZXJhdG9yLmVtaXRQdXRCeUlkKGJhc2UuZ2V0KCksIG1faWRlbnQsIHByb3BE c3QuZ2V0KCkpOworICAgIHJldHVybiBnZW5lcmF0b3IubW92ZVRvRGVzdGluYXRpb25JZk5lZWRl ZChkc3QsIHByb3BEc3QuZ2V0KCkpOwogfQogCiB2b2lkIFByZUluY1Jlc29sdmVOb2RlOjpvcHRp bWl6ZVZhcmlhYmxlQWNjZXNzKE9sZEludGVycHJldGVyRXhlY1N0YXRlKiwgY29uc3QgU3ltYm9s VGFibGUmIHN5bWJvbFRhYmxlLCBjb25zdCBMb2NhbFN0b3JhZ2UmIGxvY2FsU3RvcmFnZSwgTm9k ZVN0YWNrJikKQEAgLTI0MTUsOCArMjQxNiw5IEBAIFJlZ2lzdGVySUQqIFByZURlY1Jlc29sdmVO b2RlOjplbWl0Q29kZShDb2RlR2VuZXJhdG9yJiBnZW5lcmF0b3IsIFJlZ2lzdGVySUQqIGRzCiAK ICAgICBSZWZQdHI8UmVnaXN0ZXJJRD4gcHJvcERzdCA9IGdlbmVyYXRvci50ZW1wRGVzdGluYXRp b24oZHN0KTsKICAgICBSZWZQdHI8UmVnaXN0ZXJJRD4gYmFzZSA9IGdlbmVyYXRvci5lbWl0UmVz b2x2ZVdpdGhCYXNlKGdlbmVyYXRvci5uZXdUZW1wb3JhcnkoKSwgcHJvcERzdC5nZXQoKSwgbV9p ZGVudCk7Ci0gICAgZ2VuZXJhdG9yLmVtaXRQcmVEZWMoZHN0LCBwcm9wRHN0LmdldCgpKTsKLSAg ICByZXR1cm4gZ2VuZXJhdG9yLmVtaXRQdXRCeUlkKGJhc2UuZ2V0KCksIG1faWRlbnQsIHByb3BE c3QuZ2V0KCkpOworICAgIGdlbmVyYXRvci5lbWl0UHJlRGVjKHByb3BEc3QuZ2V0KCkpOworICAg IGdlbmVyYXRvci5lbWl0UHV0QnlJZChiYXNlLmdldCgpLCBtX2lkZW50LCBwcm9wRHN0LmdldCgp KTsKKyAgICByZXR1cm4gZ2VuZXJhdG9yLm1vdmVUb0Rlc3RpbmF0aW9uSWZOZWVkZWQoZHN0LCBw cm9wRHN0LmdldCgpKTsKIH0KIAogdm9pZCBQcmVEZWNSZXNvbHZlTm9kZTo6b3B0aW1pemVWYXJp YWJsZUFjY2VzcyhPbGRJbnRlcnByZXRlckV4ZWNTdGF0ZSosIGNvbnN0IFN5bWJvbFRhYmxlJiBz eW1ib2xUYWJsZSwgY29uc3QgTG9jYWxTdG9yYWdlJiBsb2NhbFN0b3JhZ2UsIE5vZGVTdGFjayYp CkBAIC0yNTE3LDggKzI1MTksOSBAQCBSZWdpc3RlcklEKiBQcmVJbmNCcmFja2V0Tm9kZTo6ZW1p dENvZGUoQ29kZUdlbmVyYXRvciYgZ2VuZXJhdG9yLCBSZWdpc3RlcklEKiBkcwogICAgIFJlZlB0 cjxSZWdpc3RlcklEPiBwcm9wZXJ0eSA9IGdlbmVyYXRvci5lbWl0Tm9kZShtX3N1YnNjcmlwdC5n ZXQoKSk7CiAgICAgUmVmUHRyPFJlZ2lzdGVySUQ+IHByb3BEc3QgPSBnZW5lcmF0b3IudGVtcERl c3RpbmF0aW9uKGRzdCk7CiAgICAgUmVnaXN0ZXJJRCogdmFsdWUgPSBnZW5lcmF0b3IuZW1pdEdl dEJ5VmFsKHByb3BEc3QuZ2V0KCksIGJhc2UuZ2V0KCksIHByb3BlcnR5LmdldCgpKTsKLSAgICBn ZW5lcmF0b3IuZW1pdFByZUluYyhkc3QsIHZhbHVlKTsKLSAgICByZXR1cm4gZ2VuZXJhdG9yLmVt aXRQdXRCeVZhbChiYXNlLmdldCgpLCBwcm9wZXJ0eS5nZXQoKSwgdmFsdWUpOworICAgIGdlbmVy YXRvci5lbWl0UHJlSW5jKHZhbHVlKTsKKyAgICBnZW5lcmF0b3IuZW1pdFB1dEJ5VmFsKGJhc2Uu Z2V0KCksIHByb3BlcnR5LmdldCgpLCB2YWx1ZSk7CisgICAgcmV0dXJuIGdlbmVyYXRvci5tb3Zl VG9EZXN0aW5hdGlvbklmTmVlZGVkKGRzdCwgcHJvcERzdC5nZXQoKSk7CiB9CiAKIEpTVmFsdWUq IFByZUluY0JyYWNrZXROb2RlOjpldmFsdWF0ZShPbGRJbnRlcnByZXRlckV4ZWNTdGF0ZSogZXhl YykKQEAgLTI1NTUsMTIgKzI1NTgsMTQgQEAgSlNWYWx1ZSogUHJlSW5jQnJhY2tldE5vZGU6OmV2 YWx1YXRlKE9sZEludGVycHJldGVyRXhlY1N0YXRlKiBleGVjKQogCiBSZWdpc3RlcklEKiBQcmVE ZWNCcmFja2V0Tm9kZTo6ZW1pdENvZGUoQ29kZUdlbmVyYXRvciYgZ2VuZXJhdG9yLCBSZWdpc3Rl cklEKiBkc3QpCiB7CisgICAgCiAgICAgUmVmUHRyPFJlZ2lzdGVySUQ+IGJhc2UgPSBnZW5lcmF0 b3IuZW1pdE5vZGUobV9iYXNlLmdldCgpKTsKICAgICBSZWZQdHI8UmVnaXN0ZXJJRD4gcHJvcGVy dHkgPSBnZW5lcmF0b3IuZW1pdE5vZGUobV9zdWJzY3JpcHQuZ2V0KCkpOwogICAgIFJlZlB0cjxS ZWdpc3RlcklEPiBwcm9wRHN0ID0gZ2VuZXJhdG9yLnRlbXBEZXN0aW5hdGlvbihkc3QpOwogICAg IFJlZ2lzdGVySUQqIHZhbHVlID0gZ2VuZXJhdG9yLmVtaXRHZXRCeVZhbChwcm9wRHN0LmdldCgp LCBiYXNlLmdldCgpLCBwcm9wZXJ0eS5nZXQoKSk7Ci0gICAgZ2VuZXJhdG9yLmVtaXRQcmVEZWMo ZHN0LCB2YWx1ZSk7Ci0gICAgcmV0dXJuIGdlbmVyYXRvci5lbWl0UHV0QnlWYWwoYmFzZS5nZXQo KSwgcHJvcGVydHkuZ2V0KCksIHZhbHVlKTsKKyAgICBnZW5lcmF0b3IuZW1pdFByZURlYyh2YWx1 ZSk7CisgICAgZ2VuZXJhdG9yLmVtaXRQdXRCeVZhbChiYXNlLmdldCgpLCBwcm9wZXJ0eS5nZXQo KSwgdmFsdWUpOworICAgIHJldHVybiBnZW5lcmF0b3IubW92ZVRvRGVzdGluYXRpb25JZk5lZWRl ZChkc3QsIHByb3BEc3QuZ2V0KCkpOwogfQogCiBKU1ZhbHVlKiBQcmVEZWNCcmFja2V0Tm9kZTo6 ZXZhbHVhdGUoT2xkSW50ZXJwcmV0ZXJFeGVjU3RhdGUqIGV4ZWMpCkBAIC0yNjA3LDggKzI2MTIs OSBAQCBSZWdpc3RlcklEKiBQcmVJbmNEb3ROb2RlOjplbWl0Q29kZShDb2RlR2VuZXJhdG9yJiBn ZW5lcmF0b3IsIFJlZ2lzdGVySUQqIGRzdCkKICAgICBSZWZQdHI8UmVnaXN0ZXJJRD4gYmFzZSA9 IGdlbmVyYXRvci5lbWl0Tm9kZShtX2Jhc2UuZ2V0KCkpOwogICAgIFJlZlB0cjxSZWdpc3RlcklE PiBwcm9wRHN0ID0gZ2VuZXJhdG9yLnRlbXBEZXN0aW5hdGlvbihkc3QpOwogICAgIFJlZ2lzdGVy SUQqIHZhbHVlID0gZ2VuZXJhdG9yLmVtaXRHZXRCeUlkKHByb3BEc3QuZ2V0KCksIGJhc2UuZ2V0 KCksIG1faWRlbnQpOwotICAgIGdlbmVyYXRvci5lbWl0UHJlSW5jKGRzdCwgdmFsdWUpOwotICAg IHJldHVybiBnZW5lcmF0b3IuZW1pdFB1dEJ5SWQoYmFzZS5nZXQoKSwgbV9pZGVudCwgdmFsdWUp OworICAgIGdlbmVyYXRvci5lbWl0UHJlSW5jKHZhbHVlKTsKKyAgICBnZW5lcmF0b3IuZW1pdFB1 dEJ5SWQoYmFzZS5nZXQoKSwgbV9pZGVudCwgdmFsdWUpOworICAgIHJldHVybiBnZW5lcmF0b3Iu bW92ZVRvRGVzdGluYXRpb25JZk5lZWRlZChkc3QsIHByb3BEc3QuZ2V0KCkpOwogfQogCiBKU1Zh bHVlKiBQcmVJbmNEb3ROb2RlOjpldmFsdWF0ZShPbGRJbnRlcnByZXRlckV4ZWNTdGF0ZSogZXhl YykKQEAgLTI2MzMsOCArMjYzOSw5IEBAIFJlZ2lzdGVySUQqIFByZURlY0RvdE5vZGU6OmVtaXRD b2RlKENvZGVHZW5lcmF0b3ImIGdlbmVyYXRvciwgUmVnaXN0ZXJJRCogZHN0KQogICAgIFJlZlB0 cjxSZWdpc3RlcklEPiBiYXNlID0gZ2VuZXJhdG9yLmVtaXROb2RlKG1fYmFzZS5nZXQoKSk7CiAg ICAgUmVmUHRyPFJlZ2lzdGVySUQ+IHByb3BEc3QgPSBnZW5lcmF0b3IudGVtcERlc3RpbmF0aW9u KGRzdCk7CiAgICAgUmVnaXN0ZXJJRCogdmFsdWUgPSBnZW5lcmF0b3IuZW1pdEdldEJ5SWQocHJv cERzdC5nZXQoKSwgYmFzZS5nZXQoKSwgbV9pZGVudCk7Ci0gICAgZ2VuZXJhdG9yLmVtaXRQcmVE ZWMoZHN0LCB2YWx1ZSk7Ci0gICAgcmV0dXJuIGdlbmVyYXRvci5lbWl0UHV0QnlJZChiYXNlLmdl dCgpLCBtX2lkZW50LCB2YWx1ZSk7CisgICAgZ2VuZXJhdG9yLmVtaXRQcmVEZWModmFsdWUpOwor ICAgIGdlbmVyYXRvci5lbWl0UHV0QnlJZChiYXNlLmdldCgpLCBtX2lkZW50LCB2YWx1ZSk7Cisg ICAgcmV0dXJuIGdlbmVyYXRvci5tb3ZlVG9EZXN0aW5hdGlvbklmTmVlZGVkKGRzdCwgcHJvcERz dC5nZXQoKSk7CiB9CiAKIEpTVmFsdWUqIFByZURlY0RvdE5vZGU6OmV2YWx1YXRlKE9sZEludGVy cHJldGVyRXhlY1N0YXRlKiBleGVjKQo=