158744 2016-06-14 11:00:48 -0700 Reduce copying of NetworkLoadParameters 2016-06-14 11:35:46 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez achristensen cgarcia commit-queue oldest_to_newest 1202234 0 cdumez 2016-06-14 11:00:48 -0700 Reduce copying of NetworkLoadParameters by moving it around instead. 1202235 1 281265 cdumez 2016-06-14 11:01:34 -0700 Created attachment 281265 Patch 1202250 2 281265 cdumez 2016-06-14 11:35:41 -0700 Comment on attachment 281265 Patch Clearing flags on attachment: 281265 Committed r202054: <http://trac.webkit.org/changeset/202054> 1202251 3 cdumez 2016-06-14 11:35:46 -0700 All reviewed patches have been landed. Closing bug. 281265 2016-06-14 11:01:34 -0700 2016-06-14 11:35:41 -0700 Patch bug-158744-20160614110310.patch text/plain 9342 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyMDUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNGNiYjgzMzgyN2U2NTdj YmQyZDIxNTE2NjFmMmFmNGY1M2RiNDk3My4uM2YxYjEyMjczZTcxNGMwMjU3MGQyNjY0MjU2Yjgx MzFjZTZkYjdjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE2LTA2LTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVkdWNlIGNvcHlpbmcgb2Yg TmV0d29ya0xvYWRQYXJhbWV0ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTg3NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBSZWR1Y2UgY29weWluZyBvZiBOZXR3b3JrTG9hZFBhcmFtZXRlcnMgYnkg bW92aW5nIGl0IGFyb3VuZCBpbnN0ZWFkLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvRG93 bmxvYWRzL0Rvd25sb2FkTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRvd25sb2FkTWFu YWdlcjo6c3RhcnREb3dubG9hZCk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRz L1BlbmRpbmdEb3dubG9hZC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBlbmRpbmdEb3dubG9hZDo6 UGVuZGluZ0Rvd25sb2FkKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvUGVu ZGluZ0Rvd25sb2FkLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuY3Bw OgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrTG9hZDo6TmV0d29ya0xvYWQpOgorICAgICAgICAq IE5ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291 cmNlTG9hZGVyOjpzdGFydE5ldHdvcmtMb2FkKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWQuY3BwOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrQ2FjaGU6OlNwZWN1bGF0aXZlTG9hZDo6U3BlY3VsYXRpdmVMb2FkKToKKwogMjAxNi0w Ni0xNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW1RocmVhZGVkQ29tcG9zaXRvcl0gT3BlbmluZyB0aGUgaW5zcGVjdG9yIGluIGEgd2luZG93 IGNhdXNlcyBhIGNyYXNoLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvRG93bmxvYWRzL0Rvd25sb2FkTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3Jr UHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmNwcAppbmRleCAxY2E2NWJhZTJlZmNi ZjkzYWQzNTI1NzAyNmNlYzZmMDgzODU1OWRkLi40N2RmOWI5ODZmYTcyODdhMWUxYzg3ZjEwMDNi MzYzZDJiZDhiZTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9E b3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3Jr UHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmNwcApAQCAtNTQsNyArNTQsNyBAQCB2 b2lkIERvd25sb2FkTWFuYWdlcjo6c3RhcnREb3dubG9hZChTZXNzaW9uSUQgc2Vzc2lvbklELCBE b3dubG9hZElEIGRvd25sb2FkSUQsCiAgICAgcGFyYW1ldGVycy5zZXNzaW9uSUQgPSBzZXNzaW9u SUQ7CiAgICAgcGFyYW1ldGVycy5yZXF1ZXN0ID0gcmVxdWVzdDsKICAgICBwYXJhbWV0ZXJzLmNs aWVudENyZWRlbnRpYWxQb2xpY3kgPSBBc2tDbGllbnRGb3JBbGxDcmVkZW50aWFsczsKLSAgICBt X3BlbmRpbmdEb3dubG9hZHMuYWRkKGRvd25sb2FkSUQsIHN0ZDo6bWFrZV91bmlxdWU8UGVuZGlu Z0Rvd25sb2FkPihwYXJhbWV0ZXJzLCBkb3dubG9hZElEKSk7CisgICAgbV9wZW5kaW5nRG93bmxv YWRzLmFkZChkb3dubG9hZElELCBzdGQ6Om1ha2VfdW5pcXVlPFBlbmRpbmdEb3dubG9hZD4oV1RG TW92ZShwYXJhbWV0ZXJzKSwgZG93bmxvYWRJRCkpOwogI2Vsc2UKICAgICBhdXRvIGRvd25sb2Fk ID0gc3RkOjptYWtlX3VuaXF1ZTxEb3dubG9hZD4oKnRoaXMsIGRvd25sb2FkSUQsIHJlcXVlc3Qs IHN1Z2dlc3RlZE5hbWUpOwogICAgIGRvd25sb2FkLT5zdGFydCgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL1BlbmRpbmdEb3dubG9hZC5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvUGVuZGluZ0Rvd25sb2Fk LmNwcAppbmRleCA2MGIyNzRlZDE3Nzk4YTM0YjFlYjA2MDAyYjRjZjY1ZGM5NGZjNzdiLi4yOTgy ZTUwNzhkMGEyNzBkNGY5MGU0N2YxMTBmN2E0NzE3Nzk1MTcyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvUGVuZGluZ0Rvd25sb2FkLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvUGVuZGluZ0Rvd25sb2Fk LmNwcApAQCAtMzgsOCArMzgsOCBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNw YWNlIFdlYktpdCB7CiAKLVBlbmRpbmdEb3dubG9hZDo6UGVuZGluZ0Rvd25sb2FkKGNvbnN0IE5l dHdvcmtMb2FkUGFyYW1ldGVycyYgcGFyYW1ldGVycywgRG93bmxvYWRJRCBkb3dubG9hZElEKQot ICAgIDogbV9uZXR3b3JrTG9hZChzdGQ6Om1ha2VfdW5pcXVlPE5ldHdvcmtMb2FkPigqdGhpcywg cGFyYW1ldGVycykpCitQZW5kaW5nRG93bmxvYWQ6OlBlbmRpbmdEb3dubG9hZChOZXR3b3JrTG9h ZFBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzLCBEb3dubG9hZElEIGRvd25sb2FkSUQpCisgICAgOiBt X25ldHdvcmtMb2FkKHN0ZDo6bWFrZV91bmlxdWU8TmV0d29ya0xvYWQ+KCp0aGlzLCBXVEZNb3Zl KHBhcmFtZXRlcnMpKSkKIHsKICAgICBtX25ldHdvcmtMb2FkLT5zZXRQZW5kaW5nRG93bmxvYWRJ RChkb3dubG9hZElEKTsKICAgICBtX25ldHdvcmtMb2FkLT5zZXRQZW5kaW5nRG93bmxvYWQoKnRo aXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRz L1BlbmRpbmdEb3dubG9hZC5oIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvRG93bmxv YWRzL1BlbmRpbmdEb3dubG9hZC5oCmluZGV4IDliNjU5YjgzMGJhZTg5NDMyNWZjMTgzYTVmODJi ZDk3OGEyNmNkNGMuLjc4Njg3ZTZhZGQ4OGEwZjUxN2Q5YjYyODJkYWFkNTRmNjQ1MmU2OGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9QZW5kaW5n RG93bmxvYWQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMv UGVuZGluZ0Rvd25sb2FkLmgKQEAgLTQ0LDcgKzQ0LDcgQEAgY2xhc3MgTmV0d29ya0xvYWRQYXJh bWV0ZXJzOwogY2xhc3MgUGVuZGluZ0Rvd25sb2FkIDogcHVibGljIE5ldHdvcmtMb2FkQ2xpZW50 LCBwdWJsaWMgSVBDOjpNZXNzYWdlU2VuZGVyIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRF RDsKIHB1YmxpYzoKLSAgICBQZW5kaW5nRG93bmxvYWQoY29uc3QgTmV0d29ya0xvYWRQYXJhbWV0 ZXJzJiwgRG93bmxvYWRJRCk7CisgICAgUGVuZGluZ0Rvd25sb2FkKE5ldHdvcmtMb2FkUGFyYW1l dGVycyYmLCBEb3dubG9hZElEKTsKIAogICAgIHZvaWQgY29udGludWVXaWxsU2VuZFJlcXVlc3Qo V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYpOwogICAgIHZvaWQgY29udGludWVDYW5BdXRoZW50 aWNhdGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlKGJvb2wgY2FuQXV0aGVudGljYXRlKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmNwcAppbmRleCBhMTQ3ZTE4 OWYzYjJiMzU4NWRhMDk1NTk3NzNmMTU3OTI2MzM2YWM3Li5iMjAyZjEyYmIwZGY4ZTNjZTkyODE5 MDYzMzMwZTNlZDNlZDhhNjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrTG9hZC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya0xvYWQuY3BwCkBAIC00MSwzMSArNDEsMzEgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAK IHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCi1OZXR3b3JrTG9hZDo6TmV0d29ya0xvYWQoTmV0 d29ya0xvYWRDbGllbnQmIGNsaWVudCwgY29uc3QgTmV0d29ya0xvYWRQYXJhbWV0ZXJzJiBwYXJh bWV0ZXJzKQorTmV0d29ya0xvYWQ6Ok5ldHdvcmtMb2FkKE5ldHdvcmtMb2FkQ2xpZW50JiBjbGll bnQsIE5ldHdvcmtMb2FkUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAgICAgOiBtX2NsaWVudChj bGllbnQpCi0gICAgLCBtX3BhcmFtZXRlcnMocGFyYW1ldGVycykKKyAgICAsIG1fcGFyYW1ldGVy cyhXVEZNb3ZlKHBhcmFtZXRlcnMpKQogI2lmICFVU0UoTkVUV09SS19TRVNTSU9OKQotICAgICwg bV9uZXR3b3JraW5nQ29udGV4dChSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6Y3JlYXRlKHBhcmFt ZXRlcnMuc2Vzc2lvbklELCBwYXJhbWV0ZXJzLnNob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9I VFRQUmVkaXJlY3QpKQorICAgICwgbV9uZXR3b3JraW5nQ29udGV4dChSZW1vdGVOZXR3b3JraW5n Q29udGV4dDo6Y3JlYXRlKG1fcGFyYW1ldGVycy5zZXNzaW9uSUQsIG1fcGFyYW1ldGVycy5zaG91 bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0KSkKICNlbmRpZgotICAgICwgbV9j dXJyZW50UmVxdWVzdChwYXJhbWV0ZXJzLnJlcXVlc3QpCisgICAgLCBtX2N1cnJlbnRSZXF1ZXN0 KG1fcGFyYW1ldGVycy5yZXF1ZXN0KQogewogI2lmIFVTRShORVRXT1JLX1NFU1NJT04pCi0gICAg aWYgKHBhcmFtZXRlcnMucmVxdWVzdC51cmwoKS5wcm90b2NvbElzQmxvYigpKSB7Ci0gICAgICAg IG1faGFuZGxlID0gUmVzb3VyY2VIYW5kbGU6OmNyZWF0ZShudWxscHRyLCBwYXJhbWV0ZXJzLnJl cXVlc3QsIHRoaXMsIHBhcmFtZXRlcnMuZGVmZXJzTG9hZGluZywgcGFyYW1ldGVycy5jb250ZW50 U25pZmZpbmdQb2xpY3kgPT0gU25pZmZDb250ZW50KTsKKyAgICBpZiAobV9wYXJhbWV0ZXJzLnJl cXVlc3QudXJsKCkucHJvdG9jb2xJc0Jsb2IoKSkgeworICAgICAgICBtX2hhbmRsZSA9IFJlc291 cmNlSGFuZGxlOjpjcmVhdGUobnVsbHB0ciwgbV9wYXJhbWV0ZXJzLnJlcXVlc3QsIHRoaXMsIG1f cGFyYW1ldGVycy5kZWZlcnNMb2FkaW5nLCBtX3BhcmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9s aWN5ID09IFNuaWZmQ29udGVudCk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgaWYgKGF1 dG8qIG5ldHdvcmtTZXNzaW9uID0gU2Vzc2lvblRyYWNrZXI6Om5ldHdvcmtTZXNzaW9uKHBhcmFt ZXRlcnMuc2Vzc2lvbklEKSkgewotICAgICAgICBtX3Rhc2sgPSBOZXR3b3JrRGF0YVRhc2s6OmNy ZWF0ZSgqbmV0d29ya1Nlc3Npb24sICp0aGlzLCBwYXJhbWV0ZXJzLnJlcXVlc3QsIHBhcmFtZXRl cnMuYWxsb3dTdG9yZWRDcmVkZW50aWFscywgcGFyYW1ldGVycy5jb250ZW50U25pZmZpbmdQb2xp Y3ksIHBhcmFtZXRlcnMuc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCk7 Ci0gICAgICAgIGlmICghcGFyYW1ldGVycy5kZWZlcnNMb2FkaW5nKQorICAgIGlmIChhdXRvKiBu ZXR3b3JrU2Vzc2lvbiA9IFNlc3Npb25UcmFja2VyOjpuZXR3b3JrU2Vzc2lvbihtX3BhcmFtZXRl cnMuc2Vzc2lvbklEKSkgeworICAgICAgICBtX3Rhc2sgPSBOZXR3b3JrRGF0YVRhc2s6OmNyZWF0 ZSgqbmV0d29ya1Nlc3Npb24sICp0aGlzLCBtX3BhcmFtZXRlcnMucmVxdWVzdCwgbV9wYXJhbWV0 ZXJzLmFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIG1fcGFyYW1ldGVycy5jb250ZW50U25pZmZpbmdQ b2xpY3ksIG1fcGFyYW1ldGVycy5zaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGly ZWN0KTsKKyAgICAgICAgaWYgKCFtX3BhcmFtZXRlcnMuZGVmZXJzTG9hZGluZykKICAgICAgICAg ICAgIG1fdGFzay0+cmVzdW1lKCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgV1RGTG9nQWx3YXlz KCJBdHRlbXB0ZWQgdG8gY3JlYXRlIGEgTmV0d29ya0xvYWQgd2l0aCBhIHNlc3Npb24gKGlkPSUi IFBSSXU2NCAiKSB0aGF0IGRvZXMgbm90IGV4aXN0LiIsIHBhcmFtZXRlcnMuc2Vzc2lvbklELnNl c3Npb25JRCgpKTsKLSAgICAgICAgUnVuTG9vcDo6Y3VycmVudCgpLmRpc3BhdGNoKFt0aGlzLCB1 cmwgPSBwYXJhbWV0ZXJzLnJlcXVlc3QudXJsKCldIHsKKyAgICAgICAgV1RGTG9nQWx3YXlzKCJB dHRlbXB0ZWQgdG8gY3JlYXRlIGEgTmV0d29ya0xvYWQgd2l0aCBhIHNlc3Npb24gKGlkPSUiIFBS SXU2NCAiKSB0aGF0IGRvZXMgbm90IGV4aXN0LiIsIG1fcGFyYW1ldGVycy5zZXNzaW9uSUQuc2Vz c2lvbklEKCkpOworICAgICAgICBSdW5Mb29wOjpjdXJyZW50KCkuZGlzcGF0Y2goW3RoaXMsIHVy bCA9IG1fcGFyYW1ldGVycy5yZXF1ZXN0LnVybCgpXSB7CiAgICAgICAgICAgICBkaWRDb21wbGV0 ZVdpdGhFcnJvcihpbnRlcm5hbEVycm9yKHVybCkpOwogICAgICAgICB9KTsKICAgICB9CiAjZWxz ZQotICAgIG1faGFuZGxlID0gUmVzb3VyY2VIYW5kbGU6OmNyZWF0ZShtX25ldHdvcmtpbmdDb250 ZXh0LmdldCgpLCBwYXJhbWV0ZXJzLnJlcXVlc3QsIHRoaXMsIHBhcmFtZXRlcnMuZGVmZXJzTG9h ZGluZywgcGFyYW1ldGVycy5jb250ZW50U25pZmZpbmdQb2xpY3kgPT0gU25pZmZDb250ZW50KTsK KyAgICBtX2hhbmRsZSA9IFJlc291cmNlSGFuZGxlOjpjcmVhdGUobV9uZXR3b3JraW5nQ29udGV4 dC5nZXQoKSwgbV9wYXJhbWV0ZXJzLnJlcXVlc3QsIHRoaXMsIG1fcGFyYW1ldGVycy5kZWZlcnNM b2FkaW5nLCBtX3BhcmFtZXRlcnMuY29udGVudFNuaWZmaW5nUG9saWN5ID09IFNuaWZmQ29udGVu dCk7CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvTmV0d29ya0xvYWQuaCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtM b2FkLmgKaW5kZXggYzg5MTAwM2ZmY2U3OTM2OWE3MjZiMDkzMjMyYmE2Y2U4OWU0YzMyNi4uNDc1 NmNhOGVjNmY1MDE2MTgyYWQyNzQyMGYxYTIyN2QwMjU0YjEyMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZC5oCkBAIC00Niw3ICs0Niw3IEBAIGNsYXNzIE5l dHdvcmtMb2FkIDogcHVibGljIFdlYkNvcmU6OlJlc291cmNlSGFuZGxlQ2xpZW50CiB7CiAgICAg V1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgTmV0d29ya0xvYWQoTmV0d29y a0xvYWRDbGllbnQmLCBjb25zdCBOZXR3b3JrTG9hZFBhcmFtZXRlcnMmKTsKKyAgICBOZXR3b3Jr TG9hZChOZXR3b3JrTG9hZENsaWVudCYsIE5ldHdvcmtMb2FkUGFyYW1ldGVycyYmKTsKICAgICB+ TmV0d29ya0xvYWQoKTsKIAogICAgIHZvaWQgc2V0RGVmZXJzTG9hZGluZyhib29sKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRl ci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2Fk ZXIuY3BwCmluZGV4IGM2NGY4YTljNTA3OGNiYTBiNWRlOWJmM2E5YzIyNmY2YmE2Yzc4NzMuLmEx ZGVmM2NhMGNlYWIxYjMzZmI1M2I3ZTJhY2EzZmVlZmVkMTAwMTkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApA QCAtMjA4LDcgKzIwOCw3IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpzdGFydE5ldHdv cmtMb2FkKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKICAgICBOZXR3b3JrTG9hZFBh cmFtZXRlcnMgcGFyYW1ldGVycyA9IG1fcGFyYW1ldGVyczsKICAgICBwYXJhbWV0ZXJzLmRlZmVy c0xvYWRpbmcgPSBtX2RlZmVyc0xvYWRpbmc7CiAgICAgcGFyYW1ldGVycy5yZXF1ZXN0ID0gcmVx dWVzdDsKLSAgICBtX25ldHdvcmtMb2FkID0gc3RkOjptYWtlX3VuaXF1ZTxOZXR3b3JrTG9hZD4o KnRoaXMsIHBhcmFtZXRlcnMpOworICAgIG1fbmV0d29ya0xvYWQgPSBzdGQ6Om1ha2VfdW5pcXVl PE5ldHdvcmtMb2FkPigqdGhpcywgV1RGTW92ZShwYXJhbWV0ZXJzKSk7CiB9CiAKIHZvaWQgTmV0 d29ya1Jlc291cmNlTG9hZGVyOjpzZXREZWZlcnNMb2FkaW5nKGJvb2wgZGVmZXJzKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3Bl Y3VsYXRpdmVMb2FkLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05l dHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZC5jcHAKaW5kZXggZTdmZWRkM2VhMmQ0ZTY3MTc0N2Y5 NTIyZTA2OTM2NzIwNzEzNmYyYy4uMTRjMDljOTJiYjRmMjFiNTM5NTdhYzg5MDA4MTY3MDY4MDAx MTg5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0 d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3Jr UHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWQuY3BwCkBAIC01NSw3ICs1 NSw3IEBAIFNwZWN1bGF0aXZlTG9hZDo6U3BlY3VsYXRpdmVMb2FkKGNvbnN0IEdsb2JhbEZyYW1l SUQmIGZyYW1lSUQsIGNvbnN0IFJlc291cmNlUmVxCiAgICAgcGFyYW1ldGVycy5hbGxvd1N0b3Jl ZENyZWRlbnRpYWxzID0gQWxsb3dTdG9yZWRDcmVkZW50aWFsczsKICAgICBwYXJhbWV0ZXJzLmNv bnRlbnRTbmlmZmluZ1BvbGljeSA9IERvTm90U25pZmZDb250ZW50OwogICAgIHBhcmFtZXRlcnMu cmVxdWVzdCA9IG1fb3JpZ2luYWxSZXF1ZXN0OwotICAgIG1fbmV0d29ya0xvYWQgPSBzdGQ6Om1h a2VfdW5pcXVlPE5ldHdvcmtMb2FkPigqdGhpcywgcGFyYW1ldGVycyk7CisgICAgbV9uZXR3b3Jr TG9hZCA9IHN0ZDo6bWFrZV91bmlxdWU8TmV0d29ya0xvYWQ+KCp0aGlzLCBXVEZNb3ZlKHBhcmFt ZXRlcnMpKTsKIH0KIAogU3BlY3VsYXRpdmVMb2FkOjp+U3BlY3VsYXRpdmVMb2FkKCkK