31884 2009-11-25 11:55:50 -0800 [v8] Make accessing entered isolated world faster 2009-11-26 08:00:01 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 antonm webkit-unassigned abarth commit-queue oldest_to_newest 166517 0 antonm 2009-11-25 11:55:50 -0800 Currently to get entered isolated world, we do hidden property lookup which is slow. Let's use internal field instead. 166563 1 43873 antonm 2009-11-25 15:28:31 -0800 Created attachment 43873 First take 166601 2 43873 abarth 2009-11-25 18:22:57 -0800 Comment on attachment 43873 First take This looks great, but we'll need to lose the tabs. 166706 3 43917 antonm 2009-11-26 05:38:13 -0800 Created attachment 43917 Addressing tabs 166707 4 43917 antonm 2009-11-26 05:39:25 -0800 Comment on attachment 43917 Addressing tabs I am attempting to commit-queue+ it as Adam already r+'ed, if it fails, even better---Adam will be able to have another pass. 166730 5 43917 abarth 2009-11-26 07:48:21 -0800 Comment on attachment 43917 Addressing tabs cq patiently waits for an r+ before landing patches. :) 166731 6 antonm 2009-11-26 07:54:13 -0800 (In reply to comment #5) > (From update of attachment 43917 [details]) > cq patiently waits for an r+ before landing patches. :) No easy way in this life, alas :) Thanks a lot, Adam. And happy thanksgiving. 166733 7 43917 commit-queue 2009-11-26 07:59:54 -0800 Comment on attachment 43917 Addressing tabs Clearing flags on attachment: 43917 Committed r51416: <http://trac.webkit.org/changeset/51416> 166734 8 commit-queue 2009-11-26 08:00:01 -0800 All reviewed patches have been landed. Closing bug. 43873 2009-11-25 15:28:31 -0800 2009-11-26 05:38:13 -0800 First take WC.patch text/plain 6506 antonm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTM5NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMDktMTEtMjUgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV c2UgYW4gaW50ZXJuYWwgZmllbGQgaW5zdGVhZCBvZiBoaWRkZW4gcHJvcGVydHkgdG8gc3BlZWR1 cCBsb29rdXAKKwkJCQlvZiBlbnRlcmVkIGlzb2xhdGVkIHdvcmxkLgorCisJCQkJUGx1cyBzb21l IGlubGluaW5ncy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTMxODg0CisKKyAgICAgICAgQ292ZXJlZCBieSBsYXlvdXQgdGVzdHMgKyBtYW51YWwgcnVu bmluZyBvZiBzb21lIGJlbmNobWFya3MgYXMKKwkJCQljb250ZW50IHNjcmlwdHMuCisKKyAgICAg ICAgKiBiaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuY3BwOgorICAgICAgICAqIGJpbmRpbmdzL3Y4 L1Y4RE9NV3JhcHBlci5oOgorICAgICAgICAoV2ViQ29yZTo6VjhET01XcmFwcGVyOjpzZXRET01X cmFwcGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOEhpZGRlblByb3BlcnR5TmFtZS5oOgor ICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4SXNvbGF0ZWRXb3JsZC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpWOElzb2xhdGVkV29ybGQ6OlY4SXNvbGF0ZWRXb3JsZCk6CisgICAgICAgICogYmluZGlu Z3MvdjgvVjhJc29sYXRlZFdvcmxkLmg6CisgICAgICAgIChXZWJDb3JlOjpWOElzb2xhdGVkV29y bGQ6OmdldEVudGVyZWQpOgorICAgICAgICAoV2ViQ29yZTo6VjhJc29sYXRlZFdvcmxkOjpnZXRH bG9iYWxPYmplY3QpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3RvbUJpbmRp bmcuaDoKKwogMjAwOS0xMS0yNSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCkluZGV4OiBXZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5n cy92OC9WOERPTVdyYXBwZXIuY3BwCShyZXZpc2lvbiA1MTM2NykKKysrIFdlYkNvcmUvYmluZGlu Z3MvdjgvVjhET01XcmFwcGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTIwLDEzICs5MjAsNiBA QAogICAgIHJldHVybiBpbnN0YW5jZTsKIH0KIAotdm9pZCBWOERPTVdyYXBwZXI6OnNldERPTVdy YXBwZXIodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBvYmplY3QsIGludCB0eXBlLCB2b2lkKiBjcHRy KQotewotICAgIEFTU0VSVChvYmplY3QtPkludGVybmFsRmllbGRDb3VudCgpID49IDIpOwotICAg IG9iamVjdC0+U2V0UG9pbnRlckluSW50ZXJuYWxGaWVsZChWOEN1c3RvbTo6a0RPTVdyYXBwZXJP YmplY3RJbmRleCwgY3B0cik7Ci0gICAgb2JqZWN0LT5TZXRJbnRlcm5hbEZpZWxkKFY4Q3VzdG9t OjprRE9NV3JhcHBlclR5cGVJbmRleCwgdjg6OkludGVnZXI6Ok5ldyh0eXBlKSk7Ci19Ci0KICNp Zm5kZWYgTkRFQlVHCiBib29sIFY4RE9NV3JhcHBlcjo6bWF5YmVET01XcmFwcGVyKHY4OjpIYW5k bGU8djg6OlZhbHVlPiB2YWx1ZSkKIHsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhJc29s YXRlZFdvcmxkLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOElzb2xhdGVk V29ybGQuaAkocmV2aXNpb24gNTEzNjcpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4SXNvbGF0 ZWRXb3JsZC5oCSh3b3JraW5nIGNvcHkpCkBAIC04NSw3ICs4NSw5IEBACiAgICAgICAgICAgICAv LyB3b3JsZHMgYXQgYWxsLgogICAgICAgICAgICAgaWYgKCFpc29sYXRlZFdvcmxkQ291bnQpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIDA7Ci0gICAgICAgICAgICByZXR1cm4gZ2V0RW50ZXJlZElt cGwoKTsKKyAgICAgICAgICAgIGlmICghdjg6OkNvbnRleHQ6OkluQ29udGV4dCgpKQorICAgICAg ICAgICAgICAgIHJldHVybiAwOworICAgICAgICAgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8 VjhJc29sYXRlZFdvcmxkKj4oZ2V0R2xvYmFsT2JqZWN0KHY4OjpDb250ZXh0OjpHZXRFbnRlcmVk KCkpLT5HZXRQb2ludGVyRnJvbUludGVybmFsRmllbGQoVjhDdXN0b206OmtET01XaW5kb3dFbnRl cmVkSXNvbGF0ZWRXb3JsZEluZGV4KSk7CiAgICAgICAgIH0KIAogICAgICAgICB2ODo6SGFuZGxl PHY4OjpDb250ZXh0PiBjb250ZXh0KCkgeyByZXR1cm4gbV9jb250ZXh0LT5nZXQoKTsgfQpAQCAt OTQsNyArOTYsMTAgQEAKICAgICAgICAgRE9NRGF0YVN0b3JlKiBnZXRET01EYXRhU3RvcmUoKSBj b25zdCB7IHJldHVybiBtX2RvbURhdGFTdG9yZS5nZXRTdG9yZSgpOyB9CiAKICAgICBwcml2YXRl OgotICAgICAgICBzdGF0aWMgVjhJc29sYXRlZFdvcmxkKiBnZXRFbnRlcmVkSW1wbCgpOworICAg ICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBnZXRHbG9iYWxPYmplY3Qodjg6Okhh bmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCkKKyAgICAgICAgeworICAgICAgICAgICAgcmV0dXJu IHY4OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QoY29udGV4dC0+R2xvYmFsKCktPkdldFByb3Rv dHlwZSgpKTsKKyAgICAgICAgfQogCiAgICAgICAgIC8vIENhbGxlZCBieSB0aGUgZ2FyYmFnZSBj b2xsZWN0b3Igd2hlbiBvdXIgSmF2YVNjcmlwdCBjb250ZXh0IGlzIGFib3V0CiAgICAgICAgIC8v IHRvIGJlIGRlc3Ryb3llZC4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVy LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuaAkocmV2 aXNpb24gNTEzNjcpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMDksNyArMTA5LDEyIEBACiAjZW5kaWYKIAogICAgICAgICAvLyBTZXRz IGNvbnRlbnRzIG9mIGEgRE9NIHdyYXBwZXIuCi0gICAgICAgIHN0YXRpYyB2b2lkIHNldERPTVdy YXBwZXIodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiwgaW50IHR5cGUsIHZvaWQqIHB0cik7CisgICAg ICAgIHN0YXRpYyB2b2lkIHNldERPTVdyYXBwZXIodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBvYmpl Y3QsIGludCB0eXBlLCB2b2lkKiBjcHRyKQorICAgICAgICB7CisgICAgICAgICAgICBBU1NFUlQo b2JqZWN0LT5JbnRlcm5hbEZpZWxkQ291bnQoKSA+PSAyKTsKKyAgICAgICAgICAgIG9iamVjdC0+ U2V0UG9pbnRlckluSW50ZXJuYWxGaWVsZChWOEN1c3RvbTo6a0RPTVdyYXBwZXJPYmplY3RJbmRl eCwgY3B0cik7CisgICAgICAgICAgICBvYmplY3QtPlNldEludGVybmFsRmllbGQoVjhDdXN0b206 OmtET01XcmFwcGVyVHlwZUluZGV4LCB2ODo6SW50ZWdlcjo6TmV3KHR5cGUpKTsKKyAgICAgICAg fQogCiAgICAgICAgIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGxvb2t1cERPTVdyYXBw ZXIoVjhDbGFzc0luZGV4OjpWOFdyYXBwZXJUeXBlIHR5cGUsIHY4OjpIYW5kbGU8djg6Ok9iamVj dD4gb2JqZWN0KQogICAgICAgICB7CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4SGlkZGVu UHJvcGVydHlOYW1lLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOEhpZGRl blByb3BlcnR5TmFtZS5oCShyZXZpc2lvbiA1MTM2NykKKysrIFdlYkNvcmUvYmluZGluZ3Mvdjgv VjhIaWRkZW5Qcm9wZXJ0eU5hbWUuaAkod29ya2luZyBjb3B5KQpAQCAtMzcsNyArMzcsNiBAQAog CiAjZGVmaW5lIFY4X0hJRERFTl9QUk9QRVJUSUVTKFYpIFwKICAgICBWKG9iamVjdFByb3RvdHlw ZSkgXAotICAgIFYoaXNvbGF0ZWRXb3JsZCkgXAogICAgIFYobGlzdGVuZXIpIFwKICAgICBWKGF0 dHJpYnV0ZUxpc3RlbmVyKSBcCiAgICAgVihzbGVlcEZ1bmN0aW9uKSBcCkluZGV4OiBXZWJDb3Jl L2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3RvbUJpbmRpbmcuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3RvbUJpbmRpbmcuaAkocmV2aXNpb24gNTEzNjcp CisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3RvbUJpbmRpbmcuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTY5LDcgKzE2OSw4IEBACiAgICAgICAgIHN0YXRpYyBjb25zdCBpbnQga0RP TVdpbmRvd0xvY2F0aW9uSW5kZXggPSBrRGVmYXVsdFdyYXBwZXJJbnRlcm5hbEZpZWxkQ291bnQg KyAxMTsKICAgICAgICAgc3RhdGljIGNvbnN0IGludCBrRE9NV2luZG93RE9NU2VsZWN0aW9uSW5k ZXggPSBrRGVmYXVsdFdyYXBwZXJJbnRlcm5hbEZpZWxkQ291bnQgKyAxMjsKICAgICAgICAgc3Rh dGljIGNvbnN0IGludCBrRE9NV2luZG93RXZlbnRMaXN0ZW5lckNhY2hlSW5kZXggPSBrRGVmYXVs dFdyYXBwZXJJbnRlcm5hbEZpZWxkQ291bnQgKyAxMzsKLSAgICAgICAgc3RhdGljIGNvbnN0IGlu dCBrRE9NV2luZG93SW50ZXJuYWxGaWVsZENvdW50ID0ga0RlZmF1bHRXcmFwcGVySW50ZXJuYWxG aWVsZENvdW50ICsgMTQ7CisgICAgICAgIHN0YXRpYyBjb25zdCBpbnQga0RPTVdpbmRvd0VudGVy ZWRJc29sYXRlZFdvcmxkSW5kZXggPSBrRGVmYXVsdFdyYXBwZXJJbnRlcm5hbEZpZWxkQ291bnQg KyAxNDsKKyAgICAgICAgc3RhdGljIGNvbnN0IGludCBrRE9NV2luZG93SW50ZXJuYWxGaWVsZENv dW50ID0ga0RlZmF1bHRXcmFwcGVySW50ZXJuYWxGaWVsZENvdW50ICsgMTU7CiAKICAgICAgICAg c3RhdGljIGNvbnN0IGludCBrU3R5bGVTaGVldE93bmVyTm9kZUluZGV4ID0ga0RlZmF1bHRXcmFw cGVySW50ZXJuYWxGaWVsZENvdW50ICsgMDsKICAgICAgICAgc3RhdGljIGNvbnN0IGludCBrU3R5 bGVTaGVldEludGVybmFsRmllbGRDb3VudCA9IGtEZWZhdWx0V3JhcHBlckludGVybmFsRmllbGRD b3VudCArIDE7CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4SXNvbGF0ZWRXb3JsZC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOElzb2xhdGVkV29ybGQuY3BwCShy ZXZpc2lvbiA1MTM2NykKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhJc29sYXRlZFdvcmxkLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNjQsNyArNjQsNyBAQAogICAgIC8vIFJ1biBjb2RlIGluIHRo ZSBuZXcgY29udGV4dC4KICAgICB2ODo6Q29udGV4dDo6U2NvcGUgY29udGV4dF9zY29wZShtX2Nv bnRleHQtPmdldCgpKTsKIAotICAgIG1fY29udGV4dC0+Z2V0KCktPkdsb2JhbCgpLT5TZXRIaWRk ZW5WYWx1ZShWOEhpZGRlblByb3BlcnR5TmFtZTo6aXNvbGF0ZWRXb3JsZCgpLCB2ODo6RXh0ZXJu YWw6OldyYXAodGhpcykpOworICAgIGdldEdsb2JhbE9iamVjdChtX2NvbnRleHQtPmdldCgpKS0+ U2V0UG9pbnRlckluSW50ZXJuYWxGaWVsZChWOEN1c3RvbTo6a0RPTVdpbmRvd0VudGVyZWRJc29s YXRlZFdvcmxkSW5kZXgsIHRoaXMpOwogCiAgICAgVjhQcm94eTo6aW5zdGFsbEhpZGRlbk9iamVj dFByb3RvdHlwZShtX2NvbnRleHQtPmdldCgpKTsKICAgICBwcm94eS0+aW5zdGFsbERPTVdpbmRv dyhtX2NvbnRleHQtPmdldCgpLCBwcm94eS0+ZnJhbWUoKS0+ZG9tV2luZG93KCkpOwpAQCAtOTEs MTcgKzkxLDQgQEAKICAgICBtX2NvbnRleHQtPmRpc3Bvc2VIYW5kbGUoKTsKIH0KIAotVjhJc29s YXRlZFdvcmxkKiBWOElzb2xhdGVkV29ybGQ6OmdldEVudGVyZWRJbXBsKCkKLXsKLSAgICBpZiAo IXY4OjpDb250ZXh0OjpJbkNvbnRleHQoKSkKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgdjg6Okhh bmRsZVNjb3BlIHNjb3BlOwotCi0gICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gd29ybGQgPSB2ODo6 Q29udGV4dDo6R2V0RW50ZXJlZCgpLT5HbG9iYWwoKS0+R2V0SGlkZGVuVmFsdWUoVjhIaWRkZW5Q cm9wZXJ0eU5hbWU6Omlzb2xhdGVkV29ybGQoKSk7Ci0gICAgaWYgKHdvcmxkLklzRW1wdHkoKSkK LSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8VjhJc29sYXRlZFdv cmxkKj4odjg6OkV4dGVybmFsOjpVbndyYXAod29ybGQpKTsKLX0KLQogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQo= 43917 2009-11-26 05:38:13 -0800 2009-11-26 07:59:54 -0800 Addressing tabs WC.patch text/plain 6518 antonm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTM5NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMDktMTEtMjUgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV c2UgYW4gaW50ZXJuYWwgZmllbGQgaW5zdGVhZCBvZiBoaWRkZW4gcHJvcGVydHkgdG8gc3BlZWR1 cCBsb29rdXAKKyAgICAgICAgb2YgZW50ZXJlZCBpc29sYXRlZCB3b3JsZC4KKworICAgICAgICBQ bHVzIHNvbWUgaW5saW5pbmdzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzE4ODQKKworICAgICAgICBDb3ZlcmVkIGJ5IGxheW91dCB0ZXN0cyArIG1h bnVhbCBydW5uaW5nIG9mIHNvbWUgYmVuY2htYXJrcyBhcworICAgICAgICBjb250ZW50IHNjcmlw dHMuCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuY3BwOgorICAgICAgICAq IGJpbmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5oOgorICAgICAgICAoV2ViQ29yZTo6VjhET01XcmFw cGVyOjpzZXRET01XcmFwcGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOEhpZGRlblByb3Bl cnR5TmFtZS5oOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4SXNvbGF0ZWRXb3JsZC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpWOElzb2xhdGVkV29ybGQ6OlY4SXNvbGF0ZWRXb3JsZCk6CisgICAg ICAgICogYmluZGluZ3MvdjgvVjhJc29sYXRlZFdvcmxkLmg6CisgICAgICAgIChXZWJDb3JlOjpW OElzb2xhdGVkV29ybGQ6OmdldEVudGVyZWQpOgorICAgICAgICAoV2ViQ29yZTo6VjhJc29sYXRl ZFdvcmxkOjpnZXRHbG9iYWxPYmplY3QpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9W OEN1c3RvbUJpbmRpbmcuaDoKKwogMjAwOS0xMS0yNSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJs c29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCkluZGV4 OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuY3BwCShyZXZpc2lvbiA1MTM2NykKKysrIFdl YkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTIw LDEzICs5MjAsNiBAQAogICAgIHJldHVybiBpbnN0YW5jZTsKIH0KIAotdm9pZCBWOERPTVdyYXBw ZXI6OnNldERPTVdyYXBwZXIodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBvYmplY3QsIGludCB0eXBl LCB2b2lkKiBjcHRyKQotewotICAgIEFTU0VSVChvYmplY3QtPkludGVybmFsRmllbGRDb3VudCgp ID49IDIpOwotICAgIG9iamVjdC0+U2V0UG9pbnRlckluSW50ZXJuYWxGaWVsZChWOEN1c3RvbTo6 a0RPTVdyYXBwZXJPYmplY3RJbmRleCwgY3B0cik7Ci0gICAgb2JqZWN0LT5TZXRJbnRlcm5hbEZp ZWxkKFY4Q3VzdG9tOjprRE9NV3JhcHBlclR5cGVJbmRleCwgdjg6OkludGVnZXI6Ok5ldyh0eXBl KSk7Ci19Ci0KICNpZm5kZWYgTkRFQlVHCiBib29sIFY4RE9NV3JhcHBlcjo6bWF5YmVET01XcmFw cGVyKHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2YWx1ZSkKIHsKSW5kZXg6IFdlYkNvcmUvYmluZGlu Z3MvdjgvVjhJc29sYXRlZFdvcmxkLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92 OC9WOElzb2xhdGVkV29ybGQuaAkocmV2aXNpb24gNTEzNjcpCisrKyBXZWJDb3JlL2JpbmRpbmdz L3Y4L1Y4SXNvbGF0ZWRXb3JsZC5oCSh3b3JraW5nIGNvcHkpCkBAIC04NSw3ICs4NSw5IEBACiAg ICAgICAgICAgICAvLyB3b3JsZHMgYXQgYWxsLgogICAgICAgICAgICAgaWYgKCFpc29sYXRlZFdv cmxkQ291bnQpCiAgICAgICAgICAgICAgICAgcmV0dXJuIDA7Ci0gICAgICAgICAgICByZXR1cm4g Z2V0RW50ZXJlZEltcGwoKTsKKyAgICAgICAgICAgIGlmICghdjg6OkNvbnRleHQ6OkluQ29udGV4 dCgpKQorICAgICAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICAgICAgcmV0dXJuIHJlaW50 ZXJwcmV0X2Nhc3Q8VjhJc29sYXRlZFdvcmxkKj4oZ2V0R2xvYmFsT2JqZWN0KHY4OjpDb250ZXh0 OjpHZXRFbnRlcmVkKCkpLT5HZXRQb2ludGVyRnJvbUludGVybmFsRmllbGQoVjhDdXN0b206OmtE T01XaW5kb3dFbnRlcmVkSXNvbGF0ZWRXb3JsZEluZGV4KSk7CiAgICAgICAgIH0KIAogICAgICAg ICB2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0KCkgeyByZXR1cm4gbV9jb250ZXh0LT5n ZXQoKTsgfQpAQCAtOTQsNyArOTYsMTAgQEAKICAgICAgICAgRE9NRGF0YVN0b3JlKiBnZXRET01E YXRhU3RvcmUoKSBjb25zdCB7IHJldHVybiBtX2RvbURhdGFTdG9yZS5nZXRTdG9yZSgpOyB9CiAK ICAgICBwcml2YXRlOgotICAgICAgICBzdGF0aWMgVjhJc29sYXRlZFdvcmxkKiBnZXRFbnRlcmVk SW1wbCgpOworICAgICAgICBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBnZXRHbG9iYWxP YmplY3Qodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCkKKyAgICAgICAgeworICAgICAg ICAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QoY29udGV4dC0+R2xvYmFs KCktPkdldFByb3RvdHlwZSgpKTsKKyAgICAgICAgfQogCiAgICAgICAgIC8vIENhbGxlZCBieSB0 aGUgZ2FyYmFnZSBjb2xsZWN0b3Igd2hlbiBvdXIgSmF2YVNjcmlwdCBjb250ZXh0IGlzIGFib3V0 CiAgICAgICAgIC8vIHRvIGJlIGRlc3Ryb3llZC4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvdjgv VjhET01XcmFwcGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdy YXBwZXIuaAkocmV2aXNpb24gNTEzNjcpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV3Jh cHBlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDksNyArMTA5LDEyIEBACiAjZW5kaWYKIAogICAg ICAgICAvLyBTZXRzIGNvbnRlbnRzIG9mIGEgRE9NIHdyYXBwZXIuCi0gICAgICAgIHN0YXRpYyB2 b2lkIHNldERPTVdyYXBwZXIodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiwgaW50IHR5cGUsIHZvaWQq IHB0cik7CisgICAgICAgIHN0YXRpYyB2b2lkIHNldERPTVdyYXBwZXIodjg6OkhhbmRsZTx2ODo6 T2JqZWN0PiBvYmplY3QsIGludCB0eXBlLCB2b2lkKiBjcHRyKQorICAgICAgICB7CisgICAgICAg ICAgICBBU1NFUlQob2JqZWN0LT5JbnRlcm5hbEZpZWxkQ291bnQoKSA+PSAyKTsKKyAgICAgICAg ICAgIG9iamVjdC0+U2V0UG9pbnRlckluSW50ZXJuYWxGaWVsZChWOEN1c3RvbTo6a0RPTVdyYXBw ZXJPYmplY3RJbmRleCwgY3B0cik7CisgICAgICAgICAgICBvYmplY3QtPlNldEludGVybmFsRmll bGQoVjhDdXN0b206OmtET01XcmFwcGVyVHlwZUluZGV4LCB2ODo6SW50ZWdlcjo6TmV3KHR5cGUp KTsKKyAgICAgICAgfQogCiAgICAgICAgIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGxv b2t1cERPTVdyYXBwZXIoVjhDbGFzc0luZGV4OjpWOFdyYXBwZXJUeXBlIHR5cGUsIHY4OjpIYW5k bGU8djg6Ok9iamVjdD4gb2JqZWN0KQogICAgICAgICB7CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdz L3Y4L1Y4SGlkZGVuUHJvcGVydHlOYW1lLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5n cy92OC9WOEhpZGRlblByb3BlcnR5TmFtZS5oCShyZXZpc2lvbiA1MTM2NykKKysrIFdlYkNvcmUv YmluZGluZ3MvdjgvVjhIaWRkZW5Qcm9wZXJ0eU5hbWUuaAkod29ya2luZyBjb3B5KQpAQCAtMzcs NyArMzcsNiBAQAogCiAjZGVmaW5lIFY4X0hJRERFTl9QUk9QRVJUSUVTKFYpIFwKICAgICBWKG9i amVjdFByb3RvdHlwZSkgXAotICAgIFYoaXNvbGF0ZWRXb3JsZCkgXAogICAgIFYobGlzdGVuZXIp IFwKICAgICBWKGF0dHJpYnV0ZUxpc3RlbmVyKSBcCiAgICAgVihzbGVlcEZ1bmN0aW9uKSBcCklu ZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3RvbUJpbmRpbmcuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3RvbUJpbmRpbmcuaAkocmV2 aXNpb24gNTEzNjcpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3RvbUJpbmRp bmcuaAkod29ya2luZyBjb3B5KQpAQCAtMTY5LDcgKzE2OSw4IEBACiAgICAgICAgIHN0YXRpYyBj b25zdCBpbnQga0RPTVdpbmRvd0xvY2F0aW9uSW5kZXggPSBrRGVmYXVsdFdyYXBwZXJJbnRlcm5h bEZpZWxkQ291bnQgKyAxMTsKICAgICAgICAgc3RhdGljIGNvbnN0IGludCBrRE9NV2luZG93RE9N U2VsZWN0aW9uSW5kZXggPSBrRGVmYXVsdFdyYXBwZXJJbnRlcm5hbEZpZWxkQ291bnQgKyAxMjsK ICAgICAgICAgc3RhdGljIGNvbnN0IGludCBrRE9NV2luZG93RXZlbnRMaXN0ZW5lckNhY2hlSW5k ZXggPSBrRGVmYXVsdFdyYXBwZXJJbnRlcm5hbEZpZWxkQ291bnQgKyAxMzsKLSAgICAgICAgc3Rh dGljIGNvbnN0IGludCBrRE9NV2luZG93SW50ZXJuYWxGaWVsZENvdW50ID0ga0RlZmF1bHRXcmFw cGVySW50ZXJuYWxGaWVsZENvdW50ICsgMTQ7CisgICAgICAgIHN0YXRpYyBjb25zdCBpbnQga0RP TVdpbmRvd0VudGVyZWRJc29sYXRlZFdvcmxkSW5kZXggPSBrRGVmYXVsdFdyYXBwZXJJbnRlcm5h bEZpZWxkQ291bnQgKyAxNDsKKyAgICAgICAgc3RhdGljIGNvbnN0IGludCBrRE9NV2luZG93SW50 ZXJuYWxGaWVsZENvdW50ID0ga0RlZmF1bHRXcmFwcGVySW50ZXJuYWxGaWVsZENvdW50ICsgMTU7 CiAKICAgICAgICAgc3RhdGljIGNvbnN0IGludCBrU3R5bGVTaGVldE93bmVyTm9kZUluZGV4ID0g a0RlZmF1bHRXcmFwcGVySW50ZXJuYWxGaWVsZENvdW50ICsgMDsKICAgICAgICAgc3RhdGljIGNv bnN0IGludCBrU3R5bGVTaGVldEludGVybmFsRmllbGRDb3VudCA9IGtEZWZhdWx0V3JhcHBlcklu dGVybmFsRmllbGRDb3VudCArIDE7CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4SXNvbGF0 ZWRXb3JsZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOElzb2xhdGVk V29ybGQuY3BwCShyZXZpc2lvbiA1MTM2NykKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhJc29s YXRlZFdvcmxkLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjQsNyArNjQsNyBAQAogICAgIC8vIFJ1 biBjb2RlIGluIHRoZSBuZXcgY29udGV4dC4KICAgICB2ODo6Q29udGV4dDo6U2NvcGUgY29udGV4 dF9zY29wZShtX2NvbnRleHQtPmdldCgpKTsKIAotICAgIG1fY29udGV4dC0+Z2V0KCktPkdsb2Jh bCgpLT5TZXRIaWRkZW5WYWx1ZShWOEhpZGRlblByb3BlcnR5TmFtZTo6aXNvbGF0ZWRXb3JsZCgp LCB2ODo6RXh0ZXJuYWw6OldyYXAodGhpcykpOworICAgIGdldEdsb2JhbE9iamVjdChtX2NvbnRl eHQtPmdldCgpKS0+U2V0UG9pbnRlckluSW50ZXJuYWxGaWVsZChWOEN1c3RvbTo6a0RPTVdpbmRv d0VudGVyZWRJc29sYXRlZFdvcmxkSW5kZXgsIHRoaXMpOwogCiAgICAgVjhQcm94eTo6aW5zdGFs bEhpZGRlbk9iamVjdFByb3RvdHlwZShtX2NvbnRleHQtPmdldCgpKTsKICAgICBwcm94eS0+aW5z dGFsbERPTVdpbmRvdyhtX2NvbnRleHQtPmdldCgpLCBwcm94eS0+ZnJhbWUoKS0+ZG9tV2luZG93 KCkpOwpAQCAtOTEsMTcgKzkxLDQgQEAKICAgICBtX2NvbnRleHQtPmRpc3Bvc2VIYW5kbGUoKTsK IH0KIAotVjhJc29sYXRlZFdvcmxkKiBWOElzb2xhdGVkV29ybGQ6OmdldEVudGVyZWRJbXBsKCkK LXsKLSAgICBpZiAoIXY4OjpDb250ZXh0OjpJbkNvbnRleHQoKSkKLSAgICAgICAgcmV0dXJuIDA7 Ci0gICAgdjg6OkhhbmRsZVNjb3BlIHNjb3BlOwotCi0gICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4g d29ybGQgPSB2ODo6Q29udGV4dDo6R2V0RW50ZXJlZCgpLT5HbG9iYWwoKS0+R2V0SGlkZGVuVmFs dWUoVjhIaWRkZW5Qcm9wZXJ0eU5hbWU6Omlzb2xhdGVkV29ybGQoKSk7Ci0gICAgaWYgKHdvcmxk LklzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8 VjhJc29sYXRlZFdvcmxkKj4odjg6OkV4dGVybmFsOjpVbndyYXAod29ybGQpKTsKLX0KLQogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQo=