163507 2016-10-16 12:05:13 -0700 Eleminate code duplication between ResourceRequest encoding/decoding implementations 2016-10-17 05:02:43 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 annulen annulen berto cgarcia commit-queue danw gustavo mcatanzaro mrobinson oldest_to_newest 1240761 0 annulen 2016-10-16 12:05:13 -0700 ResourceRequestBase::encodeWithoutPlatformData() and Soup implementation of ArgumentCoder<ResourceRequest>::encodePlatformData() share most of the code, ditto for decoding implementations. 1240766 1 291765 annulen 2016-10-16 12:07:33 -0700 Created attachment 291765 Patch 1240924 2 291765 cgarcia 2016-10-17 04:11:17 -0700 Comment on attachment 291765 Patch Great cleanup! Thanks 1240930 3 291765 commit-queue 2016-10-17 05:02:39 -0700 Comment on attachment 291765 Patch Clearing flags on attachment: 291765 Committed r207407: <http://trac.webkit.org/changeset/207407> 1240931 4 commit-queue 2016-10-17 05:02:43 -0700 All reviewed patches have been landed. Closing bug. 291765 2016-10-16 12:07:33 -0700 2016-10-17 05:02:39 -0700 Patch bug-163507-20161016220402.patch text/plain 10605 annulen U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3MzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTBlZDdjMmE2MWRlNDc4 N2MyMTI2NmViYWJjMTkxOWMxMjQxODNkMi4uODJlMTRhZWE1M2U4ZDUxZmEyNGY5MmQxYzlkMWE4 NTFjZDYwYzBiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE2LTEwLTE2ICBLb25z dGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4KKworICAgICAgICBFbGVtaW5hdGUg Y29kZSBkdXBsaWNhdGlvbiBiZXR3ZWVuIFJlc291cmNlUmVxdWVzdCBlbmNvZGluZy9kZWNvZGlu ZyBpbXBsZW1lbnRhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE2MzUwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlc291cmNlUmVxdWVzdEJhc2U6OmVuY29kZVdpdGhvdXRQbGF0Zm9ybURhdGEo KSBhbmQgU291cCBpbXBsZW1lbnRhdGlvbiBvZgorICAgICAgICBBcmd1bWVudENvZGVyPFJlc291 cmNlUmVxdWVzdD46OmVuY29kZVBsYXRmb3JtRGF0YSgpIHNoYXJlIG1vc3Qgb2YgdGhlIGNvZGUs CisgICAgICAgIGRpdHRvIGZvciBkZWNvZGluZyBpbXBsZW1lbnRhdGlvbnMuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzIG5lZWRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3Vy Y2VSZXF1ZXN0QmFzZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0QmFzZTo6 ZW5jb2RlQmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3RCYXNlOjpkZWNv ZGVCYXNlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdEJhc2U6OmVuY29kZVdp dGhvdXRQbGF0Zm9ybURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0QmFz ZTo6ZGVjb2RlV2l0aG91dFBsYXRmb3JtRGF0YSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9zb3VwL1Jlc291cmNlUmVxdWVzdC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0OjplbmNvZGVXaXRoUGxhdGZvcm1EYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNl UmVxdWVzdDo6ZGVjb2RlV2l0aFBsYXRmb3JtRGF0YSk6CisKIDIwMTYtMTAtMTQgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBBbGxvdyB0aHJvdHRsaW5n IG9mIGJhY2tncm91bmQgdGFicyB0aGF0IGhhdmUgbWVkaWEgZWxlbWVudHMgd2l0aCBubyBhdWRp YmxlIGF1ZGlvCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2QxMjIzOGM5ZjA4OTBlNjA5Y2U5OTRmMTEyYWNlZTM5 YmJlOGQ2MS4uYmQ4ZGUxZmFlOTlhMmY1YTU1ZDI5ODlmNzJkNzZkMzVmNTNmNTRmNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTEwLTE2ICBLb25zdGFudGluIFRva2FyZXYgIDxh bm51bGVuQHlhbmRleC5ydT4KKworICAgICAgICBFbGVtaW5hdGUgY29kZSBkdXBsaWNhdGlvbiBi ZXR3ZWVuIFJlc291cmNlUmVxdWVzdCBlbmNvZGluZy9kZWNvZGluZyBpbXBsZW1lbnRhdGlvbnMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MzUwNwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlc291cmNl UmVxdWVzdEJhc2U6OmVuY29kZVdpdGhvdXRQbGF0Zm9ybURhdGEoKSBhbmQgU291cCBpbXBsZW1l bnRhdGlvbiBvZgorICAgICAgICBBcmd1bWVudENvZGVyPFJlc291cmNlUmVxdWVzdD46OmVuY29k ZVBsYXRmb3JtRGF0YSgpIHNoYXJlIG1vc3Qgb2YgdGhlIGNvZGUsCisgICAgICAgIGRpdHRvIGZv ciBkZWNvZGluZyBpbXBsZW1lbnRhdGlvbnMuCisKKyAgICAgICAgKiBTaGFyZWQvc291cC9XZWJD b3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxS ZXNvdXJjZVJlcXVlc3Q+OjplbmNvZGVQbGF0Zm9ybURhdGEpOgorICAgICAgICAoSVBDOjpBcmd1 bWVudENvZGVyPFJlc291cmNlUmVxdWVzdD46OmRlY29kZVBsYXRmb3JtRGF0YSk6CisKIDIwMTYt MTAtMTQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2Ug TmV0d29ya0NhY2hlIGF3YXJlIG9mIGZldGNoIGNhY2hlIG1vZGUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFzZS5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmgKaW5kZXggOTZj NWZiZGJiZWEwZDAzNWY0NzUxN2QyYTRlMGYzZjVkODYyNjcyYy4uNjJjYjJjNjIyNjNjZDI3YWMw NTY2MTgzZjJmMDUyNmFhYzdjYzM4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmgKQEAgLTIwNiw2ICsyMDYsOSBAQCBw cm90ZWN0ZWQ6CiAgICAgdm9pZCB1cGRhdGVQbGF0Zm9ybVJlcXVlc3QoSFRUUEJvZHlVcGRhdGVQ b2xpY3kgPSBEb05vdFVwZGF0ZUhUVFBCb2R5KSBjb25zdDsKICAgICB2b2lkIHVwZGF0ZVJlc291 cmNlUmVxdWVzdChIVFRQQm9keVVwZGF0ZVBvbGljeSA9IERvTm90VXBkYXRlSFRUUEJvZHkpIGNv bnN0OwogCisgICAgdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4gdm9pZCBlbmNvZGVCYXNlKEVuY29k ZXImKSBjb25zdDsKKyAgICB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBib29sIGRlY29kZUJhc2Uo RGVjb2RlciYpOworCiAgICAgLy8gVGhlIFJlc291cmNlUmVxdWVzdCBzdWJjbGFzcyBtYXkgInNo YWRvdyIgdGhpcyBtZXRob2QgdG8gY29tcGFyZSBwbGF0Zm9ybSBzcGVjaWZpYyBmaWVsZHMKICAg ICBzdGF0aWMgYm9vbCBwbGF0Zm9ybUNvbXBhcmUoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgY29u c3QgUmVzb3VyY2VSZXF1ZXN0JikgeyByZXR1cm4gdHJ1ZTsgfQogCkBAIC0yNTAsMTAgKzI1Myw4 IEBAIFdFQkNPUkVfRVhQT1JUIHZvaWQgaW5pdGlhbGl6ZUhUVFBDb25uZWN0aW9uU2V0dGluZ3NP blN0YXJ0dXAoKTsKICNlbmRpZgogCiB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPgotdm9pZCBSZXNv dXJjZVJlcXVlc3RCYXNlOjplbmNvZGVXaXRob3V0UGxhdGZvcm1EYXRhKEVuY29kZXImIGVuY29k ZXIpIGNvbnN0CitBTFdBWVNfSU5MSU5FIHZvaWQgUmVzb3VyY2VSZXF1ZXN0QmFzZTo6ZW5jb2Rl QmFzZShFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogewotICAgIEFTU0VSVCghbV9odHRwQm9keSk7 Ci0gICAgQVNTRVJUKCFtX3BsYXRmb3JtUmVxdWVzdFVwZGF0ZWQpOwogICAgIGVuY29kZXIgPDwg bV91cmw7CiAgICAgZW5jb2RlciA8PCBtX3RpbWVvdXRJbnRlcnZhbDsKICAgICBlbmNvZGVyIDw8 IG1fZmlyc3RQYXJ0eUZvckNvb2tpZXMuc3RyaW5nKCk7CkBAIC0yNjcsNyArMjY4LDcgQEAgdm9p ZCBSZXNvdXJjZVJlcXVlc3RCYXNlOjplbmNvZGVXaXRob3V0UGxhdGZvcm1EYXRhKEVuY29kZXIm IGVuY29kZXIpIGNvbnN0CiB9CiAKIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+Ci1ib29sIFJlc291 cmNlUmVxdWVzdEJhc2U6OmRlY29kZVdpdGhvdXRQbGF0Zm9ybURhdGEoRGVjb2RlciYgZGVjb2Rl cikKK0FMV0FZU19JTkxJTkUgYm9vbCBSZXNvdXJjZVJlcXVlc3RCYXNlOjpkZWNvZGVCYXNlKERl Y29kZXImIGRlY29kZXIpCiB7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShtX3VybCkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKQEAgLTMxMCw2ICszMTEsMjAgQEAgYm9vbCBSZXNvdXJjZVJlcXVl c3RCYXNlOjpkZWNvZGVXaXRob3V0UGxhdGZvcm1EYXRhKERlY29kZXImIGRlY29kZXIpCiAgICAg cmV0dXJuIHRydWU7CiB9CiAKK3RlbXBsYXRlPGNsYXNzIEVuY29kZXI+Cit2b2lkIFJlc291cmNl UmVxdWVzdEJhc2U6OmVuY29kZVdpdGhvdXRQbGF0Zm9ybURhdGEoRW5jb2RlciYgZW5jb2Rlcikg Y29uc3QKK3sKKyAgICBBU1NFUlQoIW1faHR0cEJvZHkpOworICAgIEFTU0VSVCghbV9wbGF0Zm9y bVJlcXVlc3RVcGRhdGVkKTsKKyAgICBlbmNvZGVCYXNlKGVuY29kZXIpOworfQorCit0ZW1wbGF0 ZTxjbGFzcyBEZWNvZGVyPgorYm9vbCBSZXNvdXJjZVJlcXVlc3RCYXNlOjpkZWNvZGVXaXRob3V0 UGxhdGZvcm1EYXRhKERlY29kZXImIGRlY29kZXIpCit7CisgICAgcmV0dXJuIGRlY29kZUJhc2Uo ZGVjb2Rlcik7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIFJlc291 cmNlUmVxdWVzdEJhc2VfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9zb3VwL1Jlc291cmNlUmVxdWVzdC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9zb3VwL1Jlc291cmNlUmVxdWVzdC5oCmluZGV4IGE3ZTJiYWFiMmQ3NjViZWQxMzNjMGMx NzA2YjNhZDI4ZDJhNjgwM2QuLjA0ZDVkNDg0MWJiNTIyOGE1YmVkNTEwN2NhNGNkM2FkM2NhMTY5 ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNv dXJjZVJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAv UmVzb3VyY2VSZXF1ZXN0LmgKQEAgLTEwNiw2ICsxMDYsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKICAgICAgICAgR1VuaXF1ZVB0cjxTb3VwVVJJPiBjcmVhdGVTb3VwVVJJKCkgY29uc3Q7CiAK KyAgICAgICAgdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4gdm9pZCBlbmNvZGVXaXRoUGxhdGZvcm1E YXRhKEVuY29kZXImKSBjb25zdDsKKyAgICAgICAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gYm9v bCBkZWNvZGVXaXRoUGxhdGZvcm1EYXRhKERlY29kZXImKTsKKwogICAgIHByaXZhdGU6CiAgICAg ICAgIGZyaWVuZCBjbGFzcyBSZXNvdXJjZVJlcXVlc3RCYXNlOwogCkBAIC0xMjMsNiArMTI2LDUy IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBkb1BsYXRmb3JtU2V0QXNJc29s YXRlZENvcHkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JikgeyB9CiAgICAgfTsKIAordGVtcGxhdGU8 Y2xhc3MgRW5jb2Rlcj4KK3ZvaWQgUmVzb3VyY2VSZXF1ZXN0OjplbmNvZGVXaXRoUGxhdGZvcm1E YXRhKEVuY29kZXImIGVuY29kZXIpIGNvbnN0Cit7CisgICAgZW5jb2RlQmFzZShlbmNvZGVyKTsK KworICAgIC8vIEZJWE1FOiBEbyBub3QgZW5jb2RlIEhUVFAgbWVzc2FnZSBib2R5LgorICAgIC8v IDEuIEl0IGNhbiBiZSBsYXJnZSBhbmQgdGh1cyBjb3N0bHkgdG8gc2VuZCBhY3Jvc3MuCisgICAg Ly8gMi4gSXQgaXMgbWlzbGVhZGluZyB0byBwcm92aWRlIGEgYm9keSB3aXRoIHNvbWUgcmVxdWVz dHMsIHdoaWxlIG90aGVycyB1c2UgYm9keSBzdHJlYW1zLCB3aGljaCBjYW5ub3QgYmUgc2VyaWFs aXplZCBhdCBhbGwuCisgICAgZW5jb2RlciA8PCBzdGF0aWNfY2FzdDxib29sPihtX2h0dHBCb2R5 KTsKKyAgICBpZiAobV9odHRwQm9keSkKKyAgICAgICAgZW5jb2RlciA8PCBtX2h0dHBCb2R5LT5m bGF0dGVuVG9TdHJpbmcoKTsKKworICAgIGVuY29kZXIgPDwgc3RhdGljX2Nhc3Q8dWludDMyX3Q+ KG1fc291cEZsYWdzKTsKKyAgICBlbmNvZGVyIDw8IG1faW5pdGlhdGluZ1BhZ2VJRDsKK30KKwor dGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4KK2Jvb2wgUmVzb3VyY2VSZXF1ZXN0OjpkZWNvZGVXaXRo UGxhdGZvcm1EYXRhKERlY29kZXImIGRlY29kZXIpCit7CisgICAgaWYgKCFkZWNvZGVCYXNlKGRl Y29kZXIpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBib29sIGhhc0hUVFBCb2R5Owor ICAgIGlmICghZGVjb2Rlci5kZWNvZGUoaGFzSFRUUEJvZHkpKQorICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgaWYgKGhhc0hUVFBCb2R5KSB7CisgICAgICAgIFN0cmluZyBodHRwQm9keTsKKyAg ICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShodHRwQm9keSkpCisgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgIHNldEhUVFBCb2R5KEZvcm1EYXRhOjpjcmVhdGUoaHR0cEJvZHkudXRm OCgpKSk7CisgICAgfQorCisgICAgdWludDMyX3Qgc291cE1lc3NhZ2VGbGFnczsKKyAgICBpZiAo IWRlY29kZXIuZGVjb2RlKHNvdXBNZXNzYWdlRmxhZ3MpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgbV9zb3VwRmxhZ3MgPSBzdGF0aWNfY2FzdDxTb3VwTWVzc2FnZUZsYWdzPihzb3VwTWVz c2FnZUZsYWdzKTsKKworICAgIHVpbnQ2NF90IGluaXRpYXRpbmdQYWdlSUQ7CisgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShpbml0aWF0aW5nUGFnZUlEKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIG1faW5pdGlhdGluZ1BhZ2VJRCA9IGluaXRpYXRpbmdQYWdlSUQ7CisKKyAgICByZXR1cm4g dHJ1ZTsKK30KKworCiAjaWYgU09VUF9DSEVDS19WRVJTSU9OKDIsIDQzLCAxKQogaW5saW5lIFNv dXBNZXNzYWdlUHJpb3JpdHkgdG9Tb3VwTWVzc2FnZVByaW9yaXR5KFJlc291cmNlTG9hZFByaW9y aXR5IHByaW9yaXR5KQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL3NvdXAv V2ViQ29yZUFyZ3VtZW50Q29kZXJzU291cC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvc291 cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcAppbmRleCAwZjk3MmMwMDM2NDk5NzE0ZGU3 NGYzZDYxMjI1ZGUzOGM5YjBjZTJmLi45MmRhMWU5YzA2YzY5YzUzNDczZWY2MzJkZjc5NmUxZmMz ZjA2YjFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvc291cC9XZWJDb3JlQXJn dW1lbnRDb2RlcnNTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvc291cC9XZWJD b3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcApAQCAtNDEsOTcgKzQxLDEyIEBAIG5hbWVzcGFjZSBJ UEMgewogCiB2b2lkIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VSZXF1ZXN0Pjo6ZW5jb2RlUGxhdGZv cm1EYXRhKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VS ZXF1ZXN0KQogewotICAgIGVuY29kZXIgPDwgcmVzb3VyY2VSZXF1ZXN0LnVybCgpLnN0cmluZygp OwotICAgIGVuY29kZXIgPDwgcmVzb3VyY2VSZXF1ZXN0Lmh0dHBNZXRob2QoKTsKLSAgICBlbmNv ZGVyIDw8IHJlc291cmNlUmVxdWVzdC5odHRwSGVhZGVyRmllbGRzKCk7Ci0gICAgZW5jb2RlciA8 PCByZXNvdXJjZVJlcXVlc3QudGltZW91dEludGVydmFsKCk7Ci0KLSAgICAvLyBGSVhNRTogRG8g bm90IGVuY29kZSBIVFRQIG1lc3NhZ2UgYm9keS4KLSAgICAvLyAxLiBJdCBjYW4gYmUgbGFyZ2Ug YW5kIHRodXMgY29zdGx5IHRvIHNlbmQgYWNyb3NzLgotICAgIC8vIDIuIEl0IGlzIG1pc2xlYWRp bmcgdG8gcHJvdmlkZSBhIGJvZHkgd2l0aCBzb21lIHJlcXVlc3RzLCB3aGlsZSBvdGhlcnMgdXNl IGJvZHkgc3RyZWFtcywgd2hpY2ggY2Fubm90IGJlIHNlcmlhbGl6ZWQgYXQgYWxsLgotICAgIEZv cm1EYXRhKiBodHRwQm9keSA9IHJlc291cmNlUmVxdWVzdC5odHRwQm9keSgpOwotICAgIGVuY29k ZXIgPDwgc3RhdGljX2Nhc3Q8Ym9vbD4oaHR0cEJvZHkpOwotICAgIGlmIChodHRwQm9keSkKLSAg ICAgICAgZW5jb2RlciA8PCBodHRwQm9keS0+ZmxhdHRlblRvU3RyaW5nKCk7Ci0KLSAgICBlbmNv ZGVyIDw8IHJlc291cmNlUmVxdWVzdC5maXJzdFBhcnR5Rm9yQ29va2llcygpLnN0cmluZygpOwot ICAgIGVuY29kZXIgPDwgcmVzb3VyY2VSZXF1ZXN0LmFsbG93Q29va2llcygpOwotICAgIGVuY29k ZXIuZW5jb2RlRW51bShyZXNvdXJjZVJlcXVlc3QucHJpb3JpdHkoKSk7Ci0gICAgZW5jb2Rlci5l bmNvZGVFbnVtKHJlc291cmNlUmVxdWVzdC5jYWNoZVBvbGljeSgpKTsKLSAgICBlbmNvZGVyLmVu Y29kZUVudW0ocmVzb3VyY2VSZXF1ZXN0LnJlcXVlc3RlcigpKTsKLQotICAgIGVuY29kZXIgPDwg c3RhdGljX2Nhc3Q8dWludDMyX3Q+KHJlc291cmNlUmVxdWVzdC5zb3VwTWVzc2FnZUZsYWdzKCkp OwotICAgIGVuY29kZXIgPDwgcmVzb3VyY2VSZXF1ZXN0LmluaXRpYXRpbmdQYWdlSUQoKTsKKyAg ICByZXNvdXJjZVJlcXVlc3QuZW5jb2RlV2l0aFBsYXRmb3JtRGF0YShlbmNvZGVyKTsKIH0KIAog Ym9vbCBBcmd1bWVudENvZGVyPFJlc291cmNlUmVxdWVzdD46OmRlY29kZVBsYXRmb3JtRGF0YShE ZWNvZGVyJiBkZWNvZGVyLCBSZXNvdXJjZVJlcXVlc3QmIHJlc291cmNlUmVxdWVzdCkKIHsKLSAg ICBTdHJpbmcgdXJsOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUodXJsKSkKLSAgICAgICAgcmV0 dXJuIGZhbHNlOwotICAgIHJlc291cmNlUmVxdWVzdC5zZXRVUkwoVVJMKFVSTCgpLCB1cmwpKTsK LQotICAgIFN0cmluZyBodHRwTWV0aG9kOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUoaHR0cE1l dGhvZCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICByZXNvdXJjZVJlcXVlc3Quc2V0SFRU UE1ldGhvZChodHRwTWV0aG9kKTsKLQotICAgIEhUVFBIZWFkZXJNYXAgaGVhZGVyczsKLSAgICBp ZiAoIWRlY29kZXIuZGVjb2RlKGhlYWRlcnMpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg cmVzb3VyY2VSZXF1ZXN0LnNldEhUVFBIZWFkZXJGaWVsZHMoV1RGTW92ZShoZWFkZXJzKSk7Ci0K LSAgICBkb3VibGUgdGltZW91dEludGVydmFsOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUodGlt ZW91dEludGVydmFsKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHJlc291cmNlUmVxdWVz dC5zZXRUaW1lb3V0SW50ZXJ2YWwodGltZW91dEludGVydmFsKTsKLQotICAgIGJvb2wgaGFzSFRU UEJvZHk7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShoYXNIVFRQQm9keSkpCi0gICAgICAgIHJl dHVybiBmYWxzZTsKLSAgICBpZiAoaGFzSFRUUEJvZHkpIHsKLSAgICAgICAgU3RyaW5nIGh0dHBC b2R5OwotICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGh0dHBCb2R5KSkKLSAgICAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICAgICAgcmVzb3VyY2VSZXF1ZXN0LnNldEhUVFBCb2R5KEZvcm1E YXRhOjpjcmVhdGUoaHR0cEJvZHkudXRmOCgpKSk7Ci0gICAgfQotCi0gICAgU3RyaW5nIGZpcnN0 UGFydHlGb3JDb29raWVzOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUoZmlyc3RQYXJ0eUZvckNv b2tpZXMpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgcmVzb3VyY2VSZXF1ZXN0LnNldEZp cnN0UGFydHlGb3JDb29raWVzKFVSTChVUkwoKSwgZmlyc3RQYXJ0eUZvckNvb2tpZXMpKTsKLQot ICAgIGJvb2wgYWxsb3dDb29raWVzOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUoYWxsb3dDb29r aWVzKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHJlc291cmNlUmVxdWVzdC5zZXRBbGxv d0Nvb2tpZXMoYWxsb3dDb29raWVzKTsKLQotICAgIFJlc291cmNlTG9hZFByaW9yaXR5IHByaW9y aXR5OwotICAgIGlmICghZGVjb2Rlci5kZWNvZGVFbnVtKHByaW9yaXR5KSkKLSAgICAgICAgcmV0 dXJuIGZhbHNlOwotICAgIHJlc291cmNlUmVxdWVzdC5zZXRQcmlvcml0eShwcmlvcml0eSk7Ci0K LSAgICBSZXNvdXJjZVJlcXVlc3RDYWNoZVBvbGljeSBjYWNoZVBvbGljeTsKLSAgICBpZiAoIWRl Y29kZXIuZGVjb2RlRW51bShjYWNoZVBvbGljeSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAg ICByZXNvdXJjZVJlcXVlc3Quc2V0Q2FjaGVQb2xpY3koY2FjaGVQb2xpY3kpOwotCi0gICAgUmVz b3VyY2VSZXF1ZXN0OjpSZXF1ZXN0ZXIgcmVxdWVzdGVyOwotICAgIGlmICghZGVjb2Rlci5kZWNv ZGVFbnVtKHJlcXVlc3RlcikpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICByZXNvdXJjZVJl cXVlc3Quc2V0UmVxdWVzdGVyKHJlcXVlc3Rlcik7Ci0KLSAgICB1aW50MzJfdCBzb3VwTWVzc2Fn ZUZsYWdzOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUoc291cE1lc3NhZ2VGbGFncykpCi0gICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICByZXNvdXJjZVJlcXVlc3Quc2V0U291cE1lc3NhZ2VGbGFn cyhzdGF0aWNfY2FzdDxTb3VwTWVzc2FnZUZsYWdzPihzb3VwTWVzc2FnZUZsYWdzKSk7Ci0KLSAg ICB1aW50NjRfdCBpbml0aWF0aW5nUGFnZUlEOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUoaW5p dGlhdGluZ1BhZ2VJRCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICByZXNvdXJjZVJlcXVl c3Quc2V0SW5pdGlhdGluZ1BhZ2VJRChpbml0aWF0aW5nUGFnZUlEKTsKLQotICAgIHJldHVybiB0 cnVlOworICAgIHJldHVybiByZXNvdXJjZVJlcXVlc3QuZGVjb2RlV2l0aFBsYXRmb3JtRGF0YShk ZWNvZGVyKTsKIH0KIAogdm9pZCBBcmd1bWVudENvZGVyPENlcnRpZmljYXRlSW5mbz46OmVuY29k ZShFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBDZXJ0aWZpY2F0ZUluZm8mIGNlcnRpZmljYXRlSW5m bykK