114992 2013-04-22 14:33:35 -0700 Make it easier to extend NetworkResourceLoadParameters 2013-04-22 14:44:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 879439 0 andersca 2013-04-22 14:33:35 -0700 Make it easier to extend NetworkResourceLoadParameters 879440 1 199110 andersca 2013-04-22 14:35:03 -0700 Created attachment 199110 Patch 879443 2 andersca 2013-04-22 14:44:31 -0700 Committed r148913: <http://trac.webkit.org/changeset/148913> 199110 2013-04-22 14:35:03 -0700 2013-04-22 14:42:48 -0700 Patch bug-114992-20130422143428.patch text/plain 19127 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4OTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmJkNDcwMmVkZDMzMDNm NmFiYmQxMWE4YmQ4NGIyOGE2OWNjMGIzNS4uOWRkYmU5YjQ1Mjc1NWI5NjhkZDcyNGU0NDcyMDU2 NGI1MDA2OWNiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDEzLTA0LTIyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTWFrZSBpdCBlYXNp ZXIgdG8gZXh0ZW5kIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQ5OTIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUdXJuIE5ldHdvcmtSZXNvdXJjZUxv YWRQYXJhbWV0ZXJzIGludG8gYSBzdHJ1Y3Qgd2hpY2ggbWF0Y2hlcyBhbGwgb3VyIG90aGVyIHBh cmFtZXRlciBjbGFzc2VzIGluIFdlYktpdDIuIEZpbGwgaW4gdGhlIHN0cnVjdCBtYW51YWxseQor ICAgICAgICBpbnN0ZWFkIG9mIGhhdmluZyBhIGNvbnN0cnVjdG9yIHdpdGggOSBwYXJhbWV0ZXJz LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6 c2NoZWR1bGVSZXNvdXJjZUxvYWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ29ubmVjdGlv blRvV2ViUHJvY2Vzczo6cGVyZm9ybVN5bmNocm9ub3VzTG9hZCk6CisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvU2NoZWR1bGFibGVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpTY2hlZHVs YWJsZUxvYWRlcjo6U2NoZWR1bGFibGVMb2FkZXIpOgorICAgICAgICAqIFNoYXJlZC9OZXR3b3Jr L05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6Ok5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJz KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmVuY29k ZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzOjpkZWNv ZGUpOgorICAgICAgICAqIFNoYXJlZC9OZXR3b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0 ZXJzLmg6CisgICAgICAgIChOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyk6CisgICAgICAg ICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVMb2FkKToKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYlBsYXRmb3JtU3RyYXRlZ2llcy5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBsYXRmb3JtU3RyYXRlZ2llczo6bG9hZFJlc291cmNl U3luY2hyb25vdXNseSk6CisKKzIwMTMtMDQtMjIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2Nh QGFwcGxlLmNvbT4KKwogICAgICAgICBTbG93L2JlYWNoYmFsbGluZyB3aGVuIHVzaW5nIHRoZSBm aW5kIGJhciBvbiBhIHBhZ2Ugd2l0aCBwbHVnLWlucwogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE0OTkwCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8x MjgzMjMxMz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdv cmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9j ZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAppbmRleCBlMWJhMzE1ODYxMzll ODM5NmFiZjEwOTgwYTcwMTEwM2FhNWE1ZjFjLi5iNzViNjBjMWQ2NTg3N2VhMzRlNmM2YTYxY2U3 YzhiMTk1MDU3MTlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwCkBAIC0xMTgsMTQg KzExOCwxNCBAQCB2b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpkaWRSZWNlaXZl SW52YWxpZE1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbgogdm9pZCBOZXR3b3JrQ29ubmVjdGlv blRvV2ViUHJvY2Vzczo6c2NoZWR1bGVSZXNvdXJjZUxvYWQoY29uc3QgTmV0d29ya1Jlc291cmNl TG9hZFBhcmFtZXRlcnMmIGxvYWRQYXJhbWV0ZXJzKQogewogICAgIFJlZlB0cjxOZXR3b3JrUmVz b3VyY2VMb2FkZXI+IGxvYWRlciA9IE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y3JlYXRlKGxvYWRQ YXJhbWV0ZXJzLCB0aGlzKTsKLSAgICBtX25ldHdvcmtSZXNvdXJjZUxvYWRlcnMuYWRkKGxvYWRQ YXJhbWV0ZXJzLmlkZW50aWZpZXIoKSwgbG9hZGVyKTsKKyAgICBtX25ldHdvcmtSZXNvdXJjZUxv YWRlcnMuYWRkKGxvYWRQYXJhbWV0ZXJzLmlkZW50aWZpZXIsIGxvYWRlcik7CiAgICAgTmV0d29y a1Byb2Nlc3M6OnNoYXJlZCgpLm5ldHdvcmtSZXNvdXJjZUxvYWRTY2hlZHVsZXIoKS5zY2hlZHVs ZUxvYWRlcihsb2FkZXIuZ2V0KCkpOwogfQogCiB2b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQ cm9jZXNzOjpwZXJmb3JtU3luY2hyb25vdXNMb2FkKGNvbnN0IE5ldHdvcmtSZXNvdXJjZUxvYWRQ YXJhbWV0ZXJzJiBsb2FkUGFyYW1ldGVycywgUGFzc1JlZlB0cjxNZXNzYWdlczo6TmV0d29ya0Nv bm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlBlcmZvcm1TeW5jaHJvbm91c0xvYWQ6OkRlbGF5ZWRSZXBs eT4gcmVwbHkpCiB7CiAgICAgUmVmUHRyPFN5bmNOZXR3b3JrUmVzb3VyY2VMb2FkZXI+IGxvYWRl ciA9IFN5bmNOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmNyZWF0ZShsb2FkUGFyYW1ldGVycywgdGhp cywgcmVwbHkpOwotICAgIG1fc3luY05ldHdvcmtSZXNvdXJjZUxvYWRlcnMuYWRkKGxvYWRQYXJh bWV0ZXJzLmlkZW50aWZpZXIoKSwgbG9hZGVyKTsKKyAgICBtX3N5bmNOZXR3b3JrUmVzb3VyY2VM b2FkZXJzLmFkZChsb2FkUGFyYW1ldGVycy5pZGVudGlmaWVyLCBsb2FkZXIpOwogICAgIE5ldHdv cmtQcm9jZXNzOjpzaGFyZWQoKS5uZXR3b3JrUmVzb3VyY2VMb2FkU2NoZWR1bGVyKCkuc2NoZWR1 bGVMb2FkZXIobG9hZGVyLmdldCgpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvU2NoZWR1bGFibGVMb2FkZXIuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvU2NoZWR1bGFibGVMb2FkZXIuY3BwCmluZGV4IGJmY2ViNzk5YmIwNWMzNzIx OTFjYTMwM2E0M2UzMThiZjRmYzc2ZTUuLmJkNjgzM2JhMjFhNDBmOGRmZTEzZTIzODhjYTE0MDZm OTJjNjdlNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL1NjaGVk dWxhYmxlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9TY2hl ZHVsYWJsZUxvYWRlci5jcHAKQEAgLTM4LDE5ICszOCwxOSBAQCB1c2luZyBuYW1lc3BhY2UgV2Vi Q29yZTsKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBTY2hlZHVsYWJsZUxvYWRlcjo6U2NoZWR1bGFi bGVMb2FkZXIoY29uc3QgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMmIHBhcmFtZXRlcnMs IE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzKiBjb25uZWN0aW9uKQotICAgIDogbV9pZGVu dGlmaWVyKHBhcmFtZXRlcnMuaWRlbnRpZmllcigpKQotICAgICwgbV93ZWJQYWdlSUQocGFyYW1l dGVycy53ZWJQYWdlSUQoKSkKLSAgICAsIG1fd2ViRnJhbWVJRChwYXJhbWV0ZXJzLndlYkZyYW1l SUQoKSkKLSAgICAsIG1fcmVxdWVzdChwYXJhbWV0ZXJzLnJlcXVlc3QoKSkKLSAgICAsIG1fcHJp b3JpdHkocGFyYW1ldGVycy5wcmlvcml0eSgpKQotICAgICwgbV9jb250ZW50U25pZmZpbmdQb2xp Y3kocGFyYW1ldGVycy5jb250ZW50U25pZmZpbmdQb2xpY3koKSkKLSAgICAsIG1fYWxsb3dTdG9y ZWRDcmVkZW50aWFscyhwYXJhbWV0ZXJzLmFsbG93U3RvcmVkQ3JlZGVudGlhbHMoKSkKLSAgICAs IG1faW5Qcml2YXRlQnJvd3NpbmdNb2RlKHBhcmFtZXRlcnMuaW5Qcml2YXRlQnJvd3NpbmdNb2Rl KCkpCisgICAgOiBtX2lkZW50aWZpZXIocGFyYW1ldGVycy5pZGVudGlmaWVyKQorICAgICwgbV93 ZWJQYWdlSUQocGFyYW1ldGVycy53ZWJQYWdlSUQpCisgICAgLCBtX3dlYkZyYW1lSUQocGFyYW1l dGVycy53ZWJGcmFtZUlEKQorICAgICwgbV9yZXF1ZXN0KHBhcmFtZXRlcnMucmVxdWVzdCkKKyAg ICAsIG1fcHJpb3JpdHkocGFyYW1ldGVycy5wcmlvcml0eSkKKyAgICAsIG1fY29udGVudFNuaWZm aW5nUG9saWN5KHBhcmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9saWN5KQorICAgICwgbV9hbGxv d1N0b3JlZENyZWRlbnRpYWxzKHBhcmFtZXRlcnMuYWxsb3dTdG9yZWRDcmVkZW50aWFscykKKyAg ICAsIG1faW5Qcml2YXRlQnJvd3NpbmdNb2RlKHBhcmFtZXRlcnMuaW5Qcml2YXRlQnJvd3NpbmdN b2RlKQogICAgICwgbV9jb25uZWN0aW9uKGNvbm5lY3Rpb24pCi0gICAgLCBtX3Nob3VsZENsZWFy UmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QocGFyYW1ldGVycy5zaG91bGRDbGVhclJlZmVy cmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0KCkpCisgICAgLCBtX3Nob3VsZENsZWFyUmVmZXJyZXJP bkhUVFBTVG9IVFRQUmVkaXJlY3QocGFyYW1ldGVycy5zaG91bGRDbGVhclJlZmVycmVyT25IVFRQ U1RvSFRUUFJlZGlyZWN0KQogewotICAgIGZvciAoc2l6ZV90IGkgPSAwLCBjb3VudCA9IHBhcmFt ZXRlcnMucmVxdWVzdEJvZHlTYW5kYm94RXh0ZW5zaW9ucygpLnNpemUoKTsgaSA8IGNvdW50OyAr K2kpIHsKLSAgICAgICAgaWYgKFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPiBleHRlbnNpb24gPSBT YW5kYm94RXh0ZW5zaW9uOjpjcmVhdGUocGFyYW1ldGVycy5yZXF1ZXN0Qm9keVNhbmRib3hFeHRl bnNpb25zKClbaV0pKQorICAgIGZvciAoc2l6ZV90IGkgPSAwLCBjb3VudCA9IHBhcmFtZXRlcnMu cmVxdWVzdEJvZHlTYW5kYm94RXh0ZW5zaW9ucy5zaXplKCk7IGkgPCBjb3VudDsgKytpKSB7Cisg ICAgICAgIGlmIChSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4gZXh0ZW5zaW9uID0gU2FuZGJveEV4 dGVuc2lvbjo6Y3JlYXRlKHBhcmFtZXRlcnMucmVxdWVzdEJvZHlTYW5kYm94RXh0ZW5zaW9uc1tp XSkpCiAgICAgICAgICAgICBtX3JlcXVlc3RCb2R5U2FuZGJveEV4dGVuc2lvbnMuYXBwZW5kKGV4 dGVuc2lvbik7CiAgICAgfQogCkBAIC02NiwxMSArNjYsMTEgQEAgU2NoZWR1bGFibGVMb2FkZXI6 OlNjaGVkdWxhYmxlTG9hZGVyKGNvbnN0IE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzJiBw YXJhbWUKICAgICB9CiAKICAgICBpZiAobV9yZXF1ZXN0LnVybCgpLnByb3RvY29sSXMoImJsb2Ii KSkgewotICAgICAgICBBU1NFUlQoIVNhbmRib3hFeHRlbnNpb246OmNyZWF0ZShwYXJhbWV0ZXJz LnJlc291cmNlU2FuZGJveEV4dGVuc2lvbigpKSk7CisgICAgICAgIEFTU0VSVCghU2FuZGJveEV4 dGVuc2lvbjo6Y3JlYXRlKHBhcmFtZXRlcnMucmVzb3VyY2VTYW5kYm94RXh0ZW5zaW9uKSk7CiAg ICAgICAgIG1fcmVzb3VyY2VTYW5kYm94RXh0ZW5zaW9ucyA9IE5ldHdvcmtCbG9iUmVnaXN0cnk6 OnNoYXJlZCgpLnNhbmRib3hFeHRlbnNpb25zKG1fcmVxdWVzdC51cmwoKSk7CiAgICAgfSBlbHNl CiAjZW5kaWYKLSAgICBpZiAoUmVmUHRyPFNhbmRib3hFeHRlbnNpb24+IHJlc291cmNlU2FuZGJv eEV4dGVuc2lvbiA9IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZShwYXJhbWV0ZXJzLnJlc291cmNl U2FuZGJveEV4dGVuc2lvbigpKSkKKyAgICBpZiAoUmVmUHRyPFNhbmRib3hFeHRlbnNpb24+IHJl c291cmNlU2FuZGJveEV4dGVuc2lvbiA9IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZShwYXJhbWV0 ZXJzLnJlc291cmNlU2FuZGJveEV4dGVuc2lvbikpCiAgICAgICAgIG1fcmVzb3VyY2VTYW5kYm94 RXh0ZW5zaW9ucy5hcHBlbmQocmVzb3VyY2VTYW5kYm94RXh0ZW5zaW9uKTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Jlc291cmNlTG9hZFBh cmFtZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Jlc291 cmNlTG9hZFBhcmFtZXRlcnMuY3BwCmluZGV4IDEzMjAwOTJlN2M1NWRiY2IyYjJiZDEwZmU4MGQ1 MjFjZWFmMWQ5ZDkuLjE5MTMwY2UzMDIzYWI1ZmUzMzI4NmYyMzA1YmMwYzk0Yzc0YTk0NWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdvcmtSZXNvdXJjZUxv YWRQYXJhbWV0ZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9OZXR3 b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5jcHAKQEAgLTM4LDQ0ICszOCwzMSBAQCB1c2luZyBu YW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiBOZXR3b3JrUmVzb3VyY2VM b2FkUGFyYW1ldGVyczo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMoKQotICAgIDogbV9p ZGVudGlmaWVyKDApCi0gICAgLCBtX3dlYlBhZ2VJRCgwKQotICAgICwgbV93ZWJGcmFtZUlEKDAp Ci0gICAgLCBtX3ByaW9yaXR5KFJlc291cmNlTG9hZFByaW9yaXR5VmVyeUxvdykKLSAgICAsIG1f Y29udGVudFNuaWZmaW5nUG9saWN5KFNuaWZmQ29udGVudCkKLSAgICAsIG1fYWxsb3dTdG9yZWRD cmVkZW50aWFscyhEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlhbHMpCi0gICAgLCBtX2luUHJpdmF0 ZUJyb3dzaW5nTW9kZShmYWxzZSkKLSAgICAsIG1fc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNU b0hUVFBSZWRpcmVjdCh0cnVlKQotewotfQotCi1OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVy czo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMoUmVzb3VyY2VMb2FkSWRlbnRpZmllciBp ZGVudGlmaWVyLCB1aW50NjRfdCB3ZWJQYWdlSUQsIHVpbnQ2NF90IHdlYkZyYW1lSUQsIGNvbnN0 IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgUmVzb3VyY2VMb2FkUHJpb3JpdHkgcHJpb3JpdHks IENvbnRlbnRTbmlmZmluZ1BvbGljeSBjb250ZW50U25pZmZpbmdQb2xpY3ksIFN0b3JlZENyZWRl bnRpYWxzIGFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIGJvb2wgaW5Qcml2YXRlQnJvd3NpbmdNb2Rl LCBib29sIHNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QpCi0gICAgOiBt X2lkZW50aWZpZXIoaWRlbnRpZmllcikKLSAgICAsIG1fd2ViUGFnZUlEKHdlYlBhZ2VJRCkKLSAg ICAsIG1fd2ViRnJhbWVJRCh3ZWJGcmFtZUlEKQotICAgICwgbV9yZXF1ZXN0KHJlcXVlc3QpCi0g ICAgLCBtX3ByaW9yaXR5KHByaW9yaXR5KQotICAgICwgbV9jb250ZW50U25pZmZpbmdQb2xpY3ko Y29udGVudFNuaWZmaW5nUG9saWN5KQotICAgICwgbV9hbGxvd1N0b3JlZENyZWRlbnRpYWxzKGFs bG93U3RvcmVkQ3JlZGVudGlhbHMpCi0gICAgLCBtX2luUHJpdmF0ZUJyb3dzaW5nTW9kZShpblBy aXZhdGVCcm93c2luZ01vZGUpCi0gICAgLCBtX3Nob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9I VFRQUmVkaXJlY3Qoc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCkKKyAg ICA6IGlkZW50aWZpZXIoMCkKKyAgICAsIHdlYlBhZ2VJRCgwKQorICAgICwgd2ViRnJhbWVJRCgw KQorICAgICwgcHJpb3JpdHkoUmVzb3VyY2VMb2FkUHJpb3JpdHlWZXJ5TG93KQorICAgICwgY29u dGVudFNuaWZmaW5nUG9saWN5KFNuaWZmQ29udGVudCkKKyAgICAsIGFsbG93U3RvcmVkQ3JlZGVu dGlhbHMoRG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzKQorICAgICwgaW5Qcml2YXRlQnJvd3Np bmdNb2RlKGZhbHNlKQorICAgICwgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRp cmVjdCh0cnVlKQogewogfQogCiB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzOjpl bmNvZGUoQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogewotICAgIGVu Y29kZXIgPDwgbV9pZGVudGlmaWVyOwotICAgIGVuY29kZXIgPDwgbV93ZWJQYWdlSUQ7Ci0gICAg ZW5jb2RlciA8PCBtX3dlYkZyYW1lSUQ7Ci0gICAgZW5jb2RlciA8PCBtX3JlcXVlc3Q7CisgICAg ZW5jb2RlciA8PCBpZGVudGlmaWVyOworICAgIGVuY29kZXIgPDwgd2ViUGFnZUlEOworICAgIGVu Y29kZXIgPDwgd2ViRnJhbWVJRDsKKyAgICBlbmNvZGVyIDw8IHJlcXVlc3Q7CiAKLSAgICBlbmNv ZGVyIDw8IHN0YXRpY19jYXN0PGJvb2w+KG1fcmVxdWVzdC5odHRwQm9keSgpKTsKLSAgICBpZiAo bV9yZXF1ZXN0Lmh0dHBCb2R5KCkpIHsKKyAgICBlbmNvZGVyIDw8IHN0YXRpY19jYXN0PGJvb2w+ KHJlcXVlc3QuaHR0cEJvZHkoKSk7CisgICAgaWYgKHJlcXVlc3QuaHR0cEJvZHkoKSkgewogICAg ICAgICBFbmNvZGVyQWRhcHRlciBodHRwQm9keUVuY29kZXJBZGFwdGVyOwotICAgICAgICBtX3Jl cXVlc3QuaHR0cEJvZHkoKS0+ZW5jb2RlKGh0dHBCb2R5RW5jb2RlckFkYXB0ZXIpOworICAgICAg ICByZXF1ZXN0Lmh0dHBCb2R5KCktPmVuY29kZShodHRwQm9keUVuY29kZXJBZGFwdGVyKTsKICAg ICAgICAgZW5jb2RlciA8PCBodHRwQm9keUVuY29kZXJBZGFwdGVyLmRhdGFSZWZlcmVuY2UoKTsK IAotICAgICAgICBjb25zdCBWZWN0b3I8Rm9ybURhdGFFbGVtZW50PiYgZWxlbWVudHMgPSBtX3Jl cXVlc3QuaHR0cEJvZHkoKS0+ZWxlbWVudHMoKTsKKyAgICAgICAgY29uc3QgVmVjdG9yPEZvcm1E YXRhRWxlbWVudD4mIGVsZW1lbnRzID0gcmVxdWVzdC5odHRwQm9keSgpLT5lbGVtZW50cygpOwog ICAgICAgICBzaXplX3QgZmlsZUNvdW50ID0gMDsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDAs IGNvdW50ID0gZWxlbWVudHMuc2l6ZSgpOyBpIDwgY291bnQ7ICsraSkgewogICAgICAgICAgICAg aWYgKGVsZW1lbnRzW2ldLm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OmVuY29kZWRGaWxlKQpA QCAtOTUsMzEgKzgyLDMxIEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmVu Y29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXImIGVuY29kZXIpIGNvCiAgICAgICAgIGVuY29k ZXIgPDwgcmVxdWVzdEJvZHlTYW5kYm94RXh0ZW5zaW9uczsKICAgICB9CiAKLSAgICBpZiAobV9y ZXF1ZXN0LnVybCgpLmlzTG9jYWxGaWxlKCkpIHsKKyAgICBpZiAocmVxdWVzdC51cmwoKS5pc0xv Y2FsRmlsZSgpKSB7CiAgICAgICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSByZXF1ZXN0U2Fu ZGJveEV4dGVuc2lvbjsKLSAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlKG1f cmVxdWVzdC51cmwoKS5maWxlU3lzdGVtUGF0aCgpLCBTYW5kYm94RXh0ZW5zaW9uOjpSZWFkT25s eSwgcmVxdWVzdFNhbmRib3hFeHRlbnNpb24pOworICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpj cmVhdGVIYW5kbGUocmVxdWVzdC51cmwoKS5maWxlU3lzdGVtUGF0aCgpLCBTYW5kYm94RXh0ZW5z aW9uOjpSZWFkT25seSwgcmVxdWVzdFNhbmRib3hFeHRlbnNpb24pOwogICAgICAgICBlbmNvZGVy IDw8IHJlcXVlc3RTYW5kYm94RXh0ZW5zaW9uOwogICAgIH0KIAotICAgIGVuY29kZXIuZW5jb2Rl RW51bShtX3ByaW9yaXR5KTsKLSAgICBlbmNvZGVyLmVuY29kZUVudW0obV9jb250ZW50U25pZmZp bmdQb2xpY3kpOwotICAgIGVuY29kZXIuZW5jb2RlRW51bShtX2FsbG93U3RvcmVkQ3JlZGVudGlh bHMpOwotICAgIGVuY29kZXIgPDwgbV9pblByaXZhdGVCcm93c2luZ01vZGU7Ci0gICAgZW5jb2Rl ciA8PCBtX3Nob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3Q7CisgICAgZW5j b2Rlci5lbmNvZGVFbnVtKHByaW9yaXR5KTsKKyAgICBlbmNvZGVyLmVuY29kZUVudW0oY29udGVu dFNuaWZmaW5nUG9saWN5KTsKKyAgICBlbmNvZGVyLmVuY29kZUVudW0oYWxsb3dTdG9yZWRDcmVk ZW50aWFscyk7CisgICAgZW5jb2RlciA8PCBpblByaXZhdGVCcm93c2luZ01vZGU7CisgICAgZW5j b2RlciA8PCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0OwogfQogCiBi b29sIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzOjpkZWNvZGUoQ29yZUlQQzo6QXJndW1l bnREZWNvZGVyJiBkZWNvZGVyLCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyYgcmVzdWx0 KQogewotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1faWRlbnRpZmllcikpCisgICAg aWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaWRlbnRpZmllcikpCiAgICAgICAgIHJldHVybiBm YWxzZTsKIAotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1fd2ViUGFnZUlEKSkKKyAg ICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC53ZWJQYWdlSUQpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX3dlYkZyYW1lSUQpKQor ICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LndlYkZyYW1lSUQpKQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX3JlcXVlc3QpKQor ICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnJlcXVlc3QpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKICAgICBib29sIGhhc0hUVFBCb2R5OwpAQCAtMTMxLDI2ICsxMTgsMjYgQEAgYm9v bCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVyczo6ZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50 RGVjb2RlciYgZGVjb2RlciwgTmUKICAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShmb3JtRGF0 YSkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIERlY29kZXJBZGFwdGVyIGh0 dHBCb2R5RGVjb2RlckFkYXB0ZXIoZm9ybURhdGEuZGF0YSgpLCBmb3JtRGF0YS5zaXplKCkpOwot ICAgICAgICByZXN1bHQubV9yZXF1ZXN0LnNldEhUVFBCb2R5KEZvcm1EYXRhOjpkZWNvZGUoaHR0 cEJvZHlEZWNvZGVyQWRhcHRlcikpOworICAgICAgICByZXN1bHQucmVxdWVzdC5zZXRIVFRQQm9k eShGb3JtRGF0YTo6ZGVjb2RlKGh0dHBCb2R5RGVjb2RlckFkYXB0ZXIpKTsKIAotICAgICAgICBp ZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX3JlcXVlc3RCb2R5U2FuZGJveEV4dGVuc2lvbnMp KQorICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5yZXF1ZXN0Qm9keVNhbmRib3hF eHRlbnNpb25zKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAgICBpZiAo cmVzdWx0Lm1fcmVxdWVzdC51cmwoKS5pc0xvY2FsRmlsZSgpKSB7Ci0gICAgICAgIGlmICghZGVj b2Rlci5kZWNvZGUocmVzdWx0Lm1fcmVzb3VyY2VTYW5kYm94RXh0ZW5zaW9uKSkKKyAgICBpZiAo cmVzdWx0LnJlcXVlc3QudXJsKCkuaXNMb2NhbEZpbGUoKSkgeworICAgICAgICBpZiAoIWRlY29k ZXIuZGVjb2RlKHJlc3VsdC5yZXNvdXJjZVNhbmRib3hFeHRlbnNpb24pKQogICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIGlmICghZGVjb2Rlci5kZWNvZGVFbnVtKHJlc3Vs dC5tX3ByaW9yaXR5KSkKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlRW51bShyZXN1bHQucHJpb3Jp dHkpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZUVudW0o cmVzdWx0Lm1fY29udGVudFNuaWZmaW5nUG9saWN5KSkKKyAgICBpZiAoIWRlY29kZXIuZGVjb2Rl RW51bShyZXN1bHQuY29udGVudFNuaWZmaW5nUG9saWN5KSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwotICAgIGlmICghZGVjb2Rlci5kZWNvZGVFbnVtKHJlc3VsdC5tX2FsbG93U3RvcmVkQ3JlZGVu dGlhbHMpKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGVFbnVtKHJlc3VsdC5hbGxvd1N0b3JlZENy ZWRlbnRpYWxzKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghZGVjb2Rlci5kZWNv ZGUocmVzdWx0Lm1faW5Qcml2YXRlQnJvd3NpbmdNb2RlKSkKKyAgICBpZiAoIWRlY29kZXIuZGVj b2RlKHJlc3VsdC5pblByaXZhdGVCcm93c2luZ01vZGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9zaG91bGRDbGVhclJlZmVycmVyT25I VFRQU1RvSFRUUFJlZGlyZWN0KSkKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5zaG91 bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0KSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvTmV0d29yay9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktp dDIvU2hhcmVkL05ldHdvcmsvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaAppbmRleCBk NWJiZjMzYTM1NzY1MzkxODMzZGE2Y2Q2MTRmMTc4Y2IyYjBkYTE5Li4wMDI2N2YxNjY3ZjljODky ODYyNjgwYmEzZjIwYjkzZDFiY2I2MDgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvTmV0d29yay9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9OZXR3b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmgKQEAg LTQ1LDM1ICs0NSwyMSBAQCB0eXBlZGVmIHVpbnQ2NF90IFJlc291cmNlTG9hZElkZW50aWZpZXI7 CiBjbGFzcyBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyB7CiBwdWJsaWM6CiAgICAgTmV0 d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMoKTsKLSAgICBOZXR3b3JrUmVzb3VyY2VMb2FkUGFy YW1ldGVycyhSZXNvdXJjZUxvYWRJZGVudGlmaWVyLCB1aW50NjRfdCB3ZWJQYWdlSUQsIHVpbnQ2 NF90IHdlYkZyYW1lSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIFdlYkNvcmU6 OlJlc291cmNlTG9hZFByaW9yaXR5LCBXZWJDb3JlOjpDb250ZW50U25pZmZpbmdQb2xpY3ksIFdl YkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzLCBib29sIGluUHJpdmF0ZUJyb3dzaW5nTW9kZSwgYm9v bCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0KTsKIAogICAgIHZvaWQg ZW5jb2RlKENvcmVJUEM6OkFyZ3VtZW50RW5jb2RlciYpIGNvbnN0OwogICAgIHN0YXRpYyBib29s IGRlY29kZShDb3JlSVBDOjpBcmd1bWVudERlY29kZXImLCBOZXR3b3JrUmVzb3VyY2VMb2FkUGFy YW1ldGVycyYpOwogCi0gICAgUmVzb3VyY2VMb2FkSWRlbnRpZmllciBpZGVudGlmaWVyKCkgY29u c3QgeyByZXR1cm4gbV9pZGVudGlmaWVyOyB9Ci0gICAgdWludDY0X3Qgd2ViUGFnZUlEKCkgY29u c3QgeyByZXR1cm4gbV93ZWJQYWdlSUQ7IH0KLSAgICB1aW50NjRfdCB3ZWJGcmFtZUlEKCkgY29u c3QgeyByZXR1cm4gbV93ZWJGcmFtZUlEOyB9Ci0gICAgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0KCkgY29uc3QgeyByZXR1cm4gbV9yZXF1ZXN0OyB9Ci0gICAgY29uc3Qg U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlQXJyYXkmIHJlcXVlc3RCb2R5U2FuZGJveEV4dGVuc2lv bnMoKSBjb25zdCB7IHJldHVybiBtX3JlcXVlc3RCb2R5U2FuZGJveEV4dGVuc2lvbnM7IH0KLSAg ICBjb25zdCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmIHJlc291cmNlU2FuZGJveEV4dGVuc2lv bigpIGNvbnN0IHsgcmV0dXJuIG1fcmVzb3VyY2VTYW5kYm94RXh0ZW5zaW9uOyB9Ci0gICAgV2Vi Q29yZTo6UmVzb3VyY2VMb2FkUHJpb3JpdHkgcHJpb3JpdHkoKSBjb25zdCB7IHJldHVybiBtX3By aW9yaXR5OyB9Ci0gICAgV2ViQ29yZTo6Q29udGVudFNuaWZmaW5nUG9saWN5IGNvbnRlbnRTbmlm ZmluZ1BvbGljeSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudFNuaWZmaW5nUG9saWN5OyB9Ci0g ICAgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHMgYWxsb3dTdG9yZWRDcmVkZW50aWFscygpIGNv bnN0IHsgcmV0dXJuIG1fYWxsb3dTdG9yZWRDcmVkZW50aWFsczsgfQotICAgIGJvb2wgaW5Qcml2 YXRlQnJvd3NpbmdNb2RlKCkgY29uc3QgeyByZXR1cm4gbV9pblByaXZhdGVCcm93c2luZ01vZGU7 IH0KLSAgICBib29sIHNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QoKSBj b25zdCB7IHJldHVybiBtX3Nob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3Q7 IH0KLQotcHJpdmF0ZToKLSAgICBSZXNvdXJjZUxvYWRJZGVudGlmaWVyIG1faWRlbnRpZmllcjsK LSAgICB1aW50NjRfdCBtX3dlYlBhZ2VJRDsKLSAgICB1aW50NjRfdCBtX3dlYkZyYW1lSUQ7Ci0g ICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IG1fcmVxdWVzdDsKLSAgICBTYW5kYm94RXh0ZW5z aW9uOjpIYW5kbGVBcnJheSBtX3JlcXVlc3RCb2R5U2FuZGJveEV4dGVuc2lvbnM7IC8vIENyZWF0 ZWQgYXV0b21hdGljYWxseSBmb3IgdGhlIHNlbmRlci4KLSAgICBTYW5kYm94RXh0ZW5zaW9uOjpI YW5kbGUgbV9yZXNvdXJjZVNhbmRib3hFeHRlbnNpb247IC8vIENyZWF0ZWQgYXV0b21hdGljYWxs eSBmb3IgdGhlIHNlbmRlci4KLSAgICBXZWJDb3JlOjpSZXNvdXJjZUxvYWRQcmlvcml0eSBtX3By aW9yaXR5OwotICAgIFdlYkNvcmU6OkNvbnRlbnRTbmlmZmluZ1BvbGljeSBtX2NvbnRlbnRTbmlm ZmluZ1BvbGljeTsKLSAgICBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFscyBtX2FsbG93U3RvcmVk Q3JlZGVudGlhbHM7Ci0gICAgYm9vbCBtX2luUHJpdmF0ZUJyb3dzaW5nTW9kZTsKLSAgICBib29s IG1fc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdDsKKyAgICBSZXNvdXJj ZUxvYWRJZGVudGlmaWVyIGlkZW50aWZpZXI7CisgICAgdWludDY0X3Qgd2ViUGFnZUlEOworICAg IHVpbnQ2NF90IHdlYkZyYW1lSUQ7CisgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IHJlcXVl c3Q7CisgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlQXJyYXkgcmVxdWVzdEJvZHlTYW5kYm94 RXh0ZW5zaW9uczsgLy8gQ3JlYXRlZCBhdXRvbWF0aWNhbGx5IGZvciB0aGUgc2VuZGVyLgorICAg IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSByZXNvdXJjZVNhbmRib3hFeHRlbnNpb247IC8vIENy ZWF0ZWQgYXV0b21hdGljYWxseSBmb3IgdGhlIHNlbmRlci4KKyAgICBXZWJDb3JlOjpSZXNvdXJj ZUxvYWRQcmlvcml0eSBwcmlvcml0eTsKKyAgICBXZWJDb3JlOjpDb250ZW50U25pZmZpbmdQb2xp Y3kgY29udGVudFNuaWZmaW5nUG9saWN5OworICAgIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxz IGFsbG93U3RvcmVkQ3JlZGVudGlhbHM7CisgICAgYm9vbCBpblByaXZhdGVCcm93c2luZ01vZGU7 CisgICAgYm9vbCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0OwogfTsK IAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuY3BwCmluZGV4 IDJiMDIzZDYxYzNkNTJiNDAyZDg0ZjdlZTJmMjcxNTI5MWQ4ODc4NTUuLjNlOWU0MGY4MDBhOGRj ODc3NDA1ZDE0ZDkxY2FhYjRiMmMxMDg0OTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuY3Bw CkBAIC0xMDcsNyArMTA3LDE3IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpzY2hl ZHVsZUxvYWQoUmVzb3VyY2VMb2FkZXIqIHJlc291cmNlTG9hZGVyLCBSZXNvCiAgICAgV2ViRnJh bWUqIHdlYkZyYW1lID0gc3RhdGljX2Nhc3Q8V2ViRnJhbWVMb2FkZXJDbGllbnQqPihyZXNvdXJj ZUxvYWRlci0+ZnJhbWVMb2FkZXIoKS0+Y2xpZW50KCkpLT53ZWJGcmFtZSgpOwogICAgIFdlYlBh Z2UqIHdlYlBhZ2UgPSB3ZWJGcmFtZS0+cGFnZSgpOwogCi0gICAgTmV0d29ya1Jlc291cmNlTG9h ZFBhcmFtZXRlcnMgbG9hZFBhcmFtZXRlcnMoaWRlbnRpZmllciwgd2ViUGFnZS0+cGFnZUlEKCks IHdlYkZyYW1lLT5mcmFtZUlEKCksIHJlc291cmNlTG9hZGVyLT5yZXF1ZXN0KCksIHByaW9yaXR5 LCBjb250ZW50U25pZmZpbmdQb2xpY3ksIGFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIHByaXZhdGVC cm93c2luZ0VuYWJsZWQsIHNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3Qp OworICAgIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzIGxvYWRQYXJhbWV0ZXJzOworICAg IGxvYWRQYXJhbWV0ZXJzLmlkZW50aWZpZXIgPSBpZGVudGlmaWVyOworICAgIGxvYWRQYXJhbWV0 ZXJzLndlYlBhZ2VJRCA9IHdlYlBhZ2UtPnBhZ2VJRCgpOworICAgIGxvYWRQYXJhbWV0ZXJzLndl YkZyYW1lSUQgPSB3ZWJGcmFtZS0+ZnJhbWVJRCgpOworICAgIGxvYWRQYXJhbWV0ZXJzLnJlcXVl c3QgPSByZXNvdXJjZUxvYWRlci0+cmVxdWVzdCgpOworICAgIGxvYWRQYXJhbWV0ZXJzLnByaW9y aXR5ID0gcHJpb3JpdHk7CisgICAgbG9hZFBhcmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9saWN5 ID0gY29udGVudFNuaWZmaW5nUG9saWN5OworICAgIGxvYWRQYXJhbWV0ZXJzLmFsbG93U3RvcmVk Q3JlZGVudGlhbHMgPSBhbGxvd1N0b3JlZENyZWRlbnRpYWxzOworICAgIGxvYWRQYXJhbWV0ZXJz LmluUHJpdmF0ZUJyb3dzaW5nTW9kZSA9IHByaXZhdGVCcm93c2luZ0VuYWJsZWQ7CisgICAgbG9h ZFBhcmFtZXRlcnMuc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCA9IHNo b3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3Q7CisKICAgICBpZiAoIVdlYlBy b2Nlc3M6OnNoYXJlZCgpLm5ldHdvcmtDb25uZWN0aW9uKCktPmNvbm5lY3Rpb24oKS0+c2VuZChN ZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlNjaGVkdWxlUmVzb3VyY2VM b2FkKGxvYWRQYXJhbWV0ZXJzKSwgMCkpIHsKICAgICAgICAgLy8gV2UgcHJvYmFibHkgZmFpbGVk IHRvIHNjaGVkdWxlIHRoaXMgbG9hZCB3aXRoIHRoZSBOZXR3b3JrUHJvY2VzcyBiZWNhdXNlIGl0 IGhhZCBjcmFzaGVkLgogICAgICAgICAvLyBUaGlzIGxvYWQgd2lsbCBuZXZlciBzdWNjZWVkIHNv IHdlIHdpbGwgc2NoZWR1bGUgaXQgdG8gZmFpbCBhc3luY2hyb25vdXNseS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJh dGVnaWVzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi UGxhdGZvcm1TdHJhdGVnaWVzLmNwcAppbmRleCA3ZTBhZmNhYmYyZjhiMzZmOTE1OWMwYzAyNDQy NjgzZmVjMDBjOGI1Li5mYjc1ZmJkNTI3YTVjMmVmNTU2MGEwN2QwNjYwYzMzNmMxNjFlMjllIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYlBs YXRmb3JtU3RyYXRlZ2llcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdpZXMuY3BwCkBAIC0yMzUsNyArMjM1LDE1IEBA IHZvaWQgV2ViUGxhdGZvcm1TdHJhdGVnaWVzOjpsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5KE5l dHdvcmtpbmdDb250ZXh0KiBjb250ZXh0CiAKICAgICBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlIGRh dGFSZWZlcmVuY2U7CiAKLSAgICBOZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycyBsb2FkUGFy YW1ldGVycyhyZXNvdXJjZUxvYWRJZGVudGlmaWVyLCAwLCAwLCByZXF1ZXN0LCBSZXNvdXJjZUxv YWRQcmlvcml0eUhpZ2hlc3QsIFNuaWZmQ29udGVudCwgc3RvcmVkQ3JlZGVudGlhbHMsIGNvbnRl eHQtPnN0b3JhZ2VTZXNzaW9uKCkuaXNQcml2YXRlQnJvd3NpbmdTZXNzaW9uKCksIGNvbnRleHQt PnNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QoKSk7CisgICAgTmV0d29y a1Jlc291cmNlTG9hZFBhcmFtZXRlcnMgbG9hZFBhcmFtZXRlcnM7CisgICAgbG9hZFBhcmFtZXRl cnMuaWRlbnRpZmllciA9IHJlc291cmNlTG9hZElkZW50aWZpZXI7CisgICAgbG9hZFBhcmFtZXRl cnMucmVxdWVzdCA9IHJlcXVlc3Q7CisgICAgbG9hZFBhcmFtZXRlcnMucHJpb3JpdHkgPSBSZXNv dXJjZUxvYWRQcmlvcml0eUhpZ2hlc3Q7CisgICAgbG9hZFBhcmFtZXRlcnMuY29udGVudFNuaWZm aW5nUG9saWN5ID0gU25pZmZDb250ZW50OworICAgIGxvYWRQYXJhbWV0ZXJzLmFsbG93U3RvcmVk Q3JlZGVudGlhbHMgPSBzdG9yZWRDcmVkZW50aWFsczsKKyAgICBsb2FkUGFyYW1ldGVycy5pblBy aXZhdGVCcm93c2luZ01vZGUgPSBjb250ZXh0LT5zdG9yYWdlU2Vzc2lvbigpLmlzUHJpdmF0ZUJy b3dzaW5nU2Vzc2lvbigpOworICAgIGxvYWRQYXJhbWV0ZXJzLnNob3VsZENsZWFyUmVmZXJyZXJP bkhUVFBTVG9IVFRQUmVkaXJlY3QgPSBjb250ZXh0LT5zaG91bGRDbGVhclJlZmVycmVyT25IVFRQ U1RvSFRUUFJlZGlyZWN0KCk7CisKICAgICBpZiAoIVdlYlByb2Nlc3M6OnNoYXJlZCgpLm5ldHdv cmtDb25uZWN0aW9uKCktPmNvbm5lY3Rpb24oKS0+c2VuZFN5bmMoTWVzc2FnZXM6Ok5ldHdvcmtD b25uZWN0aW9uVG9XZWJQcm9jZXNzOjpQZXJmb3JtU3luY2hyb25vdXNMb2FkKGxvYWRQYXJhbWV0 ZXJzKSwgTWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpQZXJmb3JtU3lu Y2hyb25vdXNMb2FkOjpSZXBseShlcnJvciwgcmVzcG9uc2UsIGRhdGFSZWZlcmVuY2UpLCAwKSkg ewogICAgICAgICByZXNwb25zZSA9IFJlc291cmNlUmVzcG9uc2UoKTsKICAgICAgICAgZXJyb3Ig PSBpbnRlcm5hbEVycm9yKHJlcXVlc3QudXJsKCkpOwo=