139302 2014-12-05 09:30:18 -0800 Make WebPageProxy hold on to a SessionID instead of an API:Session 2014-12-05 09:32:57 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1052740 0 andersca 2014-12-05 09:30:18 -0800 Make WebPageProxy hold on to a SessionID instead of an API:Session 1052742 1 242635 andersca 2014-12-05 09:31:28 -0800 Created attachment 242635 Patch 1052743 2 andersca 2014-12-05 09:32:57 -0800 Committed r176845: <http://trac.webkit.org/changeset/176845> 242635 2014-12-05 09:31:28 -0800 2014-12-05 09:32:43 -0800 Patch bug-139302-20141205093205.patch text/plain 12648 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2ODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMmY5ZmJhZTZlNzM0NDc5 NzdkNGZiYzVlNmE3Zjk4MmI5YmI4M2YyMi4uZjBhZTA0NWM1OWMwY2VkYzFlYTM3MTQzOWM2NTJk ZDUxNjg5YmNjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE0LTEyLTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBXZWJQYWdl UHJveHkgaG9sZCBvbiB0byBhIFNlc3Npb25JRCBpbnN0ZWFkIG9mIGFuIEFQSTpTZXNzaW9uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkzMDIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGlu IHByZXBhcmF0aW9uIGZvciBhZGRpbmcgQVBJOjpXZWJzaXRlRGF0YVN0b3JlLiBDdXJyZW50bHkg d2UgaGF2ZSB0byBrZWVwIHRoZQorICAgICAgICBTZXNzaW9uIElEIGFuZCB0aGUgV2Vic2l0ZURh dGFTdG9yZSBzZXBhcmF0ZSBiZWNhdXNlIHdlIHN0aWxsIG5lZWQgdG8gc3VwcG9ydCB0b2dnbGlu ZyBwcml2YXRlIGJyb3dzaW5nLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5j cHA6CisgICAgICAgIChXS1BhZ2VTZXRTZXNzaW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0MvV0tTZXNzaW9uUmVmLmNwcDoKKyAgICAgICAgKFdLU2Vzc2lvbkNyZWF0ZSk6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmll dyBpbml0V2l0aEZyYW1lOmNvbmZpZ3VyYXRpb246XSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLm1tOgorICAgICAgICAoK1tfV0tXZWJzaXRlRGF0 YVN0b3JlIG5vblBlcnNpc3RlbnREYXRhU3RvcmVdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ U2Vzc2lvbi5jcHA6CisgICAgICAgIChBUEk6OmdlbmVyYXRlSUQpOgorICAgICAgICAoQVBJOjpT ZXNzaW9uOjpTZXNzaW9uKToKKyAgICAgICAgKEFQSTo6U2Vzc2lvbjo6Y3JlYXRlRXBoZW1lcmFs KToKKyAgICAgICAgKEFQSTo6U2Vzc2lvbjo6bGVnYWN5UHJpdmF0ZVNlc3Npb24pOiBEZWxldGVk LgorICAgICAgICAoQVBJOjpTZXNzaW9uOjpjcmVhdGUpOiBEZWxldGVkLgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUElTZXNzaW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHQuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpjcmVhdGVXZWJQYWdlKToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpXZWJQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldFNl c3Npb25JRCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0 ZXJzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZXRTZXNzaW9uKTogRGVsZXRl ZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6c2Vzc2lvbklEKToKKwogMjAxNC0xMi0wNSAgRXJpYyBDYXJsc29uICA8 ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBhbGxvdyBob3N0IGFwcGxp Y2F0aW9uIHRvIG9wdC1vdXQgb2YgYWx0ZXJuYXRlIGZ1bGxzY3JlZW4gcHQuIDIKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKaW5kZXggNDhjYjA1OGIzZTMzOTI1ODE1 MWQ0NmFiMWYzZTg2ZmZlYTUxOTQ3NC4uOWJiOWIwMTY4NjQzZWI0Mjk0ZDYwOTcyOGY3Mjg3NTZk YTFiMjUxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKQEAg LTE2NDAsNyArMTY0MCw3IEBAIHZvaWQgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KFdLUGFnZVJlZiBw YWdlUmVmLCBjb25zdCBXS1BhZ2VVSUNsaWVudEJhc2UqIHdrQ2xpZW50CiAKIHZvaWQgV0tQYWdl U2V0U2Vzc2lvbihXS1BhZ2VSZWYgcGFnZVJlZiwgV0tTZXNzaW9uUmVmIHNlc3Npb24pCiB7Ci0g ICAgdG9JbXBsKHBhZ2VSZWYpLT5zZXRTZXNzaW9uKCp0b0ltcGwoc2Vzc2lvbikpOworICAgIHRv SW1wbChwYWdlUmVmKS0+c2V0U2Vzc2lvbklEKHRvSW1wbChzZXNzaW9uKS0+Z2V0SUQoKSk7CiB9 CiAKIHZvaWQgV0tQYWdlUnVuSmF2YVNjcmlwdEluTWFpbkZyYW1lKFdLUGFnZVJlZiBwYWdlUmVm LCBXS1N0cmluZ1JlZiBzY3JpcHRSZWYsIHZvaWQqIGNvbnRleHQsIFdLUGFnZVJ1bkphdmFTY3Jp cHRGdW5jdGlvbiBjYWxsYmFjaykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQy9XS1Nlc3Npb25SZWYuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D L1dLU2Vzc2lvblJlZi5jcHAKaW5kZXggNGFmMmY3YmI1ZWM0MTQ3MGViZDFiMmE3NGMyY2FlNzAz ZGU4NjVjNy4uYTkzNTc5MDg3MjU0NmUxNzdlOTBjMTNlNmUzNThkNzE2ZmRjNWEwYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLU2Vzc2lvblJlZi5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLU2Vzc2lvblJlZi5jcHAKQEAgLTMz LDcgKzMzLDExIEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIFdLU2Vzc2lvblJlZiBXS1Nl c3Npb25DcmVhdGUoYm9vbCBpc0VwaGVtZXJhbCkKIHsKLSAgICBSZWZQdHI8QVBJOjpTZXNzaW9u PiBzZXNzaW9uID0gQVBJOjpTZXNzaW9uOjpjcmVhdGUoaXNFcGhlbWVyYWwpOworICAgIC8vIFRo ZSBpbXBsZW1lbnRhdGlvbiBkb2Vzbid0IHN1cHBvcnQgbm9uLWVwaGVtZXJhbAorICAgIGlmICgh aXNFcGhlbWVyYWwpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgUmVmUHRyPEFQSTo6 U2Vzc2lvbj4gc2Vzc2lvbiA9IEFQSTo6U2Vzc2lvbjo6Y3JlYXRlRXBoZW1lcmFsKCk7CiAgICAg cmV0dXJuIHRvQVBJKHNlc3Npb24ucmVsZWFzZSgpLmxlYWtSZWYoKSk7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggYWI0YzU1 MDg4NWQ4MDhiYTAzNzg0MTcwOGY5Yzg3MTFhNjM3YWZjYi4uNWRlMmI1NGUyZDVmNjQ0NjZhZjQw NjUzMjY1YWM3YmEyZGNkODhlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTI3MSw3ICsyNzEsNyBAQCBzdGF0aWMgaW50MzJfdCBk ZXZpY2VPcmllbnRhdGlvbigpCiAKICAgICB3ZWJQYWdlQ29uZmlndXJhdGlvbi51c2VyQ29udGVu dENvbnRyb2xsZXIgPSBbX2NvbmZpZ3VyYXRpb24gdXNlckNvbnRlbnRDb250cm9sbGVyXS0+X3Vz ZXJDb250ZW50Q29udHJvbGxlclByb3h5LmdldCgpOwogICAgIHdlYlBhZ2VDb25maWd1cmF0aW9u LnZpc2l0ZWRMaW5rUHJvdmlkZXIgPSBbX2NvbmZpZ3VyYXRpb24gX3Zpc2l0ZWRMaW5rUHJvdmlk ZXJdLT5fdmlzaXRlZExpbmtQcm92aWRlci5nZXQoKTsKLSAgICB3ZWJQYWdlQ29uZmlndXJhdGlv bi5zZXNzaW9uID0gW19jb25maWd1cmF0aW9uIF93ZWJzaXRlRGF0YVN0b3JlXS0+X3Nlc3Npb24u Z2V0KCk7CisgICAgd2ViUGFnZUNvbmZpZ3VyYXRpb24uc2Vzc2lvbklEID0gW19jb25maWd1cmF0 aW9uIF93ZWJzaXRlRGF0YVN0b3JlXS0+X3Nlc3Npb24tPmdldElEKCk7CiAgICAgCiAgICAgUmVm UHRyPFdlYktpdDo6V2ViUGFnZUdyb3VwPiBwYWdlR3JvdXA7CiAgICAgTlNTdHJpbmcgKmdyb3Vw SWRlbnRpZmllciA9IGNvbmZpZ3VyYXRpb24uX2dyb3VwSWRlbnRpZmllcjsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZS5t bSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9y ZS5tbQppbmRleCAzYThjMTBhN2VmYTBhOTZhM2VhYmVmMzc0OTFhOTdkYmNlNGUxNmI3Li42ZGQ3 YjRhZmYwMWRmZDIxZWE3MjgyYjlkYTUwMjQwODM1YjIzOGQ4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmUubW0KKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLm1t CkBAIC0zOSw3ICszOSw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKICsgKGluc3RhbmNl dHlwZSlub25QZXJzaXN0ZW50RGF0YVN0b3JlCiB7Ci0gICAgUmVmUHRyPEFQSTo6U2Vzc2lvbj4g c2Vzc2lvbiA9IEFQSTo6U2Vzc2lvbjo6Y3JlYXRlKHRydWUpOworICAgIFJlZlB0cjxBUEk6OlNl c3Npb24+IHNlc3Npb24gPSBBUEk6OlNlc3Npb246OmNyZWF0ZUVwaGVtZXJhbCgpOwogICAgIHJl dHVybiBbd3JhcHBlcigqc2Vzc2lvbi5yZWxlYXNlKCkubGVha1JlZigpKSBhdXRvcmVsZWFzZV07 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUElTZXNzaW9uLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUElTZXNzaW9uLmNwcAppbmRleCA1NTg2MWI0 NjdiZWQ4MjExZjM5NTZkOTU1ZjAzYmI5YjkyMjBhMDI0Li42NDFhOWVmZmYwZTE1MDRmMjA4N2Rm NTY0OWZhNmMzMWExYjZkYjljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJU2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSVNlc3Npb24u Y3BwCkBAIC0zMCwxMiArMzAsMTIgQEAKIAogbmFtZXNwYWNlIEFQSSB7CiAKLXN0YXRpYyB1aW50 NjRfdCBnZW5lcmF0ZUlEKGJvb2wgaXNFcGhlbWVyYWwpCitzdGF0aWMgdWludDY0X3QgZ2VuZXJh dGVJRCgpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKIAogICAgIHN0YXRpYyB1 aW50NjRfdCB1bmlxdWVTZXNzaW9uSUQgPSBXZWJDb3JlOjpTZXNzaW9uSUQ6OmxlZ2FjeVByaXZh dGVTZXNzaW9uSUQoKS5zZXNzaW9uSUQoKTsKLSAgICBBU1NFUlRfVU5VU0VEKGlzRXBoZW1lcmFs LCBpc0VwaGVtZXJhbCk7CisKICAgICByZXR1cm4gKyt1bmlxdWVTZXNzaW9uSUQ7CiB9CiAKQEAg LTQ3LDE2ICs0Nyw4IEBAIFNlc3Npb24mIFNlc3Npb246OmRlZmF1bHRTZXNzaW9uKCkKICAgICBy ZXR1cm4gKmRlZmF1bHRTZXNzaW9uOwogfQogCi1TZXNzaW9uJiBTZXNzaW9uOjpsZWdhY3lQcml2 YXRlU2Vzc2lvbigpCi17Ci0gICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKLQotICAgIHN0 YXRpYyBTZXNzaW9uKiBsZWdhY3lQcml2YXRlU2Vzc2lvbiA9IG5ldyBTZXNzaW9uKFdlYkNvcmU6 OlNlc3Npb25JRDo6bGVnYWN5UHJpdmF0ZVNlc3Npb25JRCgpKTsKLSAgICByZXR1cm4gKmxlZ2Fj eVByaXZhdGVTZXNzaW9uOwotfQotCi1TZXNzaW9uOjpTZXNzaW9uKGJvb2wgaXNFcGhlbWVyYWwp Ci0gICAgOiBtX3Nlc3Npb25JRChnZW5lcmF0ZUlEKGlzRXBoZW1lcmFsKSkKK1Nlc3Npb246OlNl c3Npb24oKQorICAgIDogbV9zZXNzaW9uSUQoZ2VuZXJhdGVJRCgpKQogewogfQogCkBAIC02NSwx MCArNTcsMTAgQEAgU2Vzc2lvbjo6U2Vzc2lvbihXZWJDb3JlOjpTZXNzaW9uSUQgc2Vzc2lvbklE KQogewogfQogCi1QYXNzUmVmUHRyPFNlc3Npb24+IFNlc3Npb246OmNyZWF0ZShib29sIGlzRXBo ZW1lcmFsKQorUGFzc1JlZlB0cjxTZXNzaW9uPiBTZXNzaW9uOjpjcmVhdGVFcGhlbWVyYWwoKQog ewogICAgIC8vIEZJWE1FOiBzdXBwb3J0IGNyZWF0aW9uIG9mIG5vbi1kZWZhdWx0LCBub24tZXBo ZW1lcmFsIHNlc3Npb25zCi0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTZXNzaW9uKGlzRXBoZW1l cmFsKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTZXNzaW9uKCkpOwogfQogCiBib29sIFNl c3Npb246OmlzRXBoZW1lcmFsKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUElTZXNzaW9uLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJU2Vzc2lv bi5oCmluZGV4IGZmYzViMmI5MTQ1ZGE2YjNmYTc4NGYyZmRkMTA0NzlhNmQzZWMxZTYuLjhmY2Rj MjQwOWY4YjcyOGQ2ZWQzM2UyYjYxMDM5ODJmNmMxYzE1OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUElTZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSVNlc3Npb24uaApAQCAtMzQsMTcgKzM0LDE3IEBAIG5hbWVzcGFjZSBBUEkgewogCiBj bGFzcyBTZXNzaW9uIDogcHVibGljIEFQSTo6T2JqZWN0SW1wbDxBUEk6Ok9iamVjdDo6VHlwZTo6 U2Vzc2lvbj4gewogcHVibGljOgotICAgIC8vIEZJWE1FOiBXZSBjYW4gY3JlYXRlIHNlc3Npb25z IG9uIGRlbWFuZCwgYmVjYXVzZSB3ZSBoYXJkY29kZSB0aGUgZmFjdCB0aGF0IGFsbCBzZXNzaW9u cyBidXQgdGhlIGRlZmF1bHQgb25lIGFyZSBlcGhlbWVyYWwuIFdlJ2xsIG5lZWQgdG8gY3JlYXRl IHRoZW0gZXhwbGljaXRseSBvbmNlIHNlc3Npb25zIGhhdmUgbW9yZSBjb25maWd1cmF0aW9uIG9w dGlvbnMuCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8U2Vzc2lvbj4gY3JlYXRlKGJvb2wgaXNFcGhl bWVyYWwpOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNlc3Npb24+IGNyZWF0ZUVwaGVtZXJhbCgp OworICAgIHZpcnR1YWwgflNlc3Npb24oKTsKKwogICAgIHN0YXRpYyBTZXNzaW9uJiBkZWZhdWx0 U2Vzc2lvbigpOwotICAgIHN0YXRpYyBTZXNzaW9uJiBsZWdhY3lQcml2YXRlU2Vzc2lvbigpOwog ICAgIGJvb2wgaXNFcGhlbWVyYWwoKSBjb25zdDsKICAgICBXZWJDb3JlOjpTZXNzaW9uSUQgZ2V0 SUQoKSBjb25zdDsKLSAgICB2aXJ0dWFsIH5TZXNzaW9uKCk7CiAKIHByaXZhdGU6Ci0gICAgZXhw bGljaXQgU2Vzc2lvbihib29sIGlzRXBoZW1lcmFsKTsKKyAgICBTZXNzaW9uKCk7CiAgICAgZXhw bGljaXQgU2Vzc2lvbihXZWJDb3JlOjpTZXNzaW9uSUQpOworCiAgICAgV2ViQ29yZTo6U2Vzc2lv bklEIG1fc2Vzc2lvbklEOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYkNvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQu Y3BwCmluZGV4IGQ1ZThhZWExMGUyZGUzMWQxZGE0OWRlNmQ2YzQxZWJiYzZhYjVmZDcuLjI0Yzll OWI2NDI1ZjI3NDA2Y2UxMGYxOThlNWVjMTRmNzMyZDNjMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViQ29udGV4dC5jcHAKQEAgLTg2MCw4ICs4NjAsOCBAQCBQYXNzUmVmUHRyPFdlYlBh Z2VQcm94eT4gV2ViQ29udGV4dDo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50 LCBXZWJQYQogICAgICAgICBjb25maWd1cmF0aW9uLnByZWZlcmVuY2VzID0gJmNvbmZpZ3VyYXRp b24ucGFnZUdyb3VwLT5wcmVmZXJlbmNlcygpOwogICAgIGlmICghY29uZmlndXJhdGlvbi52aXNp dGVkTGlua1Byb3ZpZGVyKQogICAgICAgICBjb25maWd1cmF0aW9uLnZpc2l0ZWRMaW5rUHJvdmlk ZXIgPSBtX3Zpc2l0ZWRMaW5rUHJvdmlkZXIuZ2V0KCk7Ci0gICAgaWYgKCFjb25maWd1cmF0aW9u LnNlc3Npb24pCi0gICAgICAgIGNvbmZpZ3VyYXRpb24uc2Vzc2lvbiA9IGNvbmZpZ3VyYXRpb24u cHJlZmVyZW5jZXMtPnByaXZhdGVCcm93c2luZ0VuYWJsZWQoKSA/ICZBUEk6OlNlc3Npb246Omxl Z2FjeVByaXZhdGVTZXNzaW9uKCkgOiAmQVBJOjpTZXNzaW9uOjpkZWZhdWx0U2Vzc2lvbigpOwor ICAgIGlmICghY29uZmlndXJhdGlvbi5zZXNzaW9uSUQuaXNWYWxpZCgpKQorICAgICAgICBjb25m aWd1cmF0aW9uLnNlc3Npb25JRCA9IGNvbmZpZ3VyYXRpb24ucHJlZmVyZW5jZXMtPnByaXZhdGVC cm93c2luZ0VuYWJsZWQoKSA/IFNlc3Npb25JRDo6bGVnYWN5UHJpdmF0ZVNlc3Npb25JRCgpIDog U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCk7CiAKICAgICBSZWZQdHI8V2ViUHJvY2Vzc1By b3h5PiBwcm9jZXNzOwogICAgIGlmIChtX3Byb2Nlc3NNb2RlbCA9PSBQcm9jZXNzTW9kZWxTaGFy ZWRTZWNvbmRhcnlQcm9jZXNzKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCmluZGV4IDIwMjk2MGFkY2IzYWQyMmUyNTI1ZmU5ZDkwZWVhYzFhY2QzN2YwNzEuLjcx MmE2ZTZkM2Q3MDFiNjcyMjFjZGU1YjIwMWNjYmJhNTZmYzhjM2YgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0zMjEsNyArMzIxLDcgQEAgV2ViUGFnZVBy b3h5OjpXZWJQYWdlUHJveHkoUGFnZUNsaWVudCYgcGFnZUNsaWVudCwgV2ViUHJvY2Vzc1Byb3h5 JiBwcm9jZXNzLCB1aW4KICAgICAsIG1faXNUcmFja2luZ1RvdWNoRXZlbnRzKGZhbHNlKQogI2Vu ZGlmCiAgICAgLCBtX3BhZ2VJRChwYWdlSUQpCi0gICAgLCBtX3Nlc3Npb24oKmNvbmZpZ3VyYXRp b24uc2Vzc2lvbikKKyAgICAsIG1fc2Vzc2lvbklEKGNvbmZpZ3VyYXRpb24uc2Vzc2lvbklEKQog ICAgICwgbV9pc1BhZ2VTdXNwZW5kZWQoZmFsc2UpCiAgICAgLCBtX2FkZHNWaXNpdGVkTGlua3Mo dHJ1ZSkKICNpZiBFTkFCTEUoUkVNT1RFX0lOU1BFQ1RPUikKQEAgLTQxOCw3ICs0MTgsNyBAQCBX ZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBXZWJQcm9j ZXNzUHJveHkmIHByb2Nlc3MsIHVpbgogICAgIC8vIEZJWE1FOiBJZiB3ZSBldmVyIGV4cG9zZSB0 aGUgc2Vzc2lvbiBzdG9yYWdlIHNpemUgYXMgYSBwcmVmZXJlbmNlLCB3ZSBuZWVkIHRvIHBhc3Mg aXQgaGVyZS4KICAgICBJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24gPSBtX3Byb2Nlc3MtPnN0 YXRlKCkgPT0gV2ViUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6UnVubmluZyA/IG1fcHJvY2Vzcy0+Y29u bmVjdGlvbigpIDogbnVsbHB0cjsKICAgICBtX3Byb2Nlc3MtPmNvbnRleHQoKS5zdG9yYWdlTWFu YWdlcigpLmNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKG1fcGFnZUlELCBjb25uZWN0aW9u LCBzdGQ6Om51bWVyaWNfbGltaXRzPHVuc2lnbmVkPjo6bWF4KCkpOwotICAgIHNldFNlc3Npb24o KmNvbmZpZ3VyYXRpb24uc2Vzc2lvbik7CisgICAgc2V0U2Vzc2lvbklEKGNvbmZpZ3VyYXRpb24u c2Vzc2lvbklEKTsKIAogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIGNvbnN0IENGSW5kZXggdmll d1N0YXRlQ2hhbmdlUnVuTG9vcE9yZGVyID0gKENGSW5kZXgpUnVuTG9vcE9ic2VydmVyOjpXZWxs S25vd25SdW5Mb29wT3JkZXJzOjpDb3JlQW5pbWF0aW9uQ29tbWl0IC0gMTsKQEAgLTYxMSwxNCAr NjExLDE0IEBAIHVpbnQ2NF90IFdlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRo SXRlbShXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBpdGVtCiAgICAgcmV0dXJuIG5hdmlnYXRpb25J RDsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OnNldFNlc3Npb24oQVBJOjpTZXNzaW9uJiBzZXNz aW9uKQordm9pZCBXZWJQYWdlUHJveHk6OnNldFNlc3Npb25JRChTZXNzaW9uSUQgc2Vzc2lvbklE KQogewotICAgIG1fc2Vzc2lvbiA9IHNlc3Npb247Ci0gICAgbV9wcm9jZXNzLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpTZXRTZXNzaW9uSUQoc2Vzc2lvbi5nZXRJRCgpKSwgbV9wYWdlSUQpOwor ICAgIG1fc2Vzc2lvbklEID0gc2Vzc2lvbklEOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdl czo6V2ViUGFnZTo6U2V0U2Vzc2lvbklEKHNlc3Npb25JRCksIG1fcGFnZUlEKTsKIAogI2lmIEVO QUJMRShORVRXT1JLX1BST0NFU1MpCi0gICAgaWYgKHNlc3Npb24uaXNFcGhlbWVyYWwoKSkKLSAg ICAgICAgbV9wcm9jZXNzLT5jb250ZXh0KCkuc2VuZFRvTmV0d29ya2luZ1Byb2Nlc3MoTWVzc2Fn ZXM6Ok5ldHdvcmtQcm9jZXNzOjpFbnN1cmVQcml2YXRlQnJvd3NpbmdTZXNzaW9uKHNlc3Npb24u Z2V0SUQoKSkpOworICAgIGlmIChzZXNzaW9uSUQuaXNFcGhlbWVyYWwoKSkKKyAgICAgICAgbV9w cm9jZXNzLT5jb250ZXh0KCkuc2VuZFRvTmV0d29ya2luZ1Byb2Nlc3MoTWVzc2FnZXM6Ok5ldHdv cmtQcm9jZXNzOjpFbnN1cmVQcml2YXRlQnJvd3NpbmdTZXNzaW9uKHNlc3Npb25JRCkpOwogI2Vu ZGlmCiB9CiAKQEAgLTQ2MDIsNyArNDYwMiw3IEBAIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMg V2ViUGFnZVByb3h5OjpjcmVhdGlvblBhcmFtZXRlcnMoKQogICAgIHBhcmFtZXRlcnMuZ2FwQmV0 d2VlblBhZ2VzID0gbV9nYXBCZXR3ZWVuUGFnZXM7CiAgICAgcGFyYW1ldGVycy51c2VyQWdlbnQg PSB1c2VyQWdlbnQoKTsKICAgICBwYXJhbWV0ZXJzLml0ZW1TdGF0ZXMgPSBtX2JhY2tGb3J3YXJk TGlzdC0+aXRlbVN0YXRlcygpOwotICAgIHBhcmFtZXRlcnMuc2Vzc2lvbklEID0gbV9zZXNzaW9u LT5nZXRJRCgpOworICAgIHBhcmFtZXRlcnMuc2Vzc2lvbklEID0gbV9zZXNzaW9uSUQ7CiAgICAg cGFyYW1ldGVycy5oaWdoZXN0VXNlZEJhY2tGb3J3YXJkSXRlbUlEID0gV2ViQmFja0ZvcndhcmRM aXN0SXRlbTo6aGlnaGVkVXNlZEl0ZW1JRCgpOwogICAgIHBhcmFtZXRlcnMudXNlckNvbnRlbnRD b250cm9sbGVySUQgPSBtX3VzZXJDb250ZW50Q29udHJvbGxlciA/IG1fdXNlckNvbnRlbnRDb250 cm9sbGVyLT5pZGVudGlmaWVyKCkgOiAwOwogICAgIHBhcmFtZXRlcnMudmlzaXRlZExpbmtUYWJs ZUlEID0gbV92aXNpdGVkTGlua1Byb3ZpZGVyLT5pZGVudGlmaWVyKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggM2M4ZGEwMmIxMjYyY2ExMzk1MmViY2I0YTUy M2U4NzM4YTFjZjZmZS4uYWY1Yzc3NGUyMDdmOTliYWFlYzI2NjQxZGNkODU4YWU3N2IwODU4ZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMjI3LDcgKzIyNyw3 IEBAIHN0cnVjdCBXZWJQYWdlQ29uZmlndXJhdGlvbiB7CiAgICAgV2ViVXNlckNvbnRlbnRDb250 cm9sbGVyUHJveHkqIHVzZXJDb250ZW50Q29udHJvbGxlciA9IG51bGxwdHI7CiAgICAgVmlzaXRl ZExpbmtQcm92aWRlciogdmlzaXRlZExpbmtQcm92aWRlciA9IG51bGxwdHI7CiAKLSAgICBBUEk6 OlNlc3Npb24qIHNlc3Npb24gPSBudWxscHRyOworICAgIFdlYkNvcmU6OlNlc3Npb25JRCBzZXNz aW9uSUQ7CiAgICAgV2ViUGFnZVByb3h5KiByZWxhdGVkUGFnZSA9IG51bGxwdHI7CiAKICAgICBX ZWJQcmVmZXJlbmNlc1N0b3JlOjpWYWx1ZU1hcCBwcmVmZXJlbmNlVmFsdWVzOwpAQCAtMjQ0LDEw ICsyNDQsOSBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViUGFnZVByb3h5PiBj cmVhdGUoUGFnZUNsaWVudCYsIFdlYlByb2Nlc3NQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwgY29u c3QgV2ViUGFnZUNvbmZpZ3VyYXRpb24mKTsKICAgICB2aXJ0dWFsIH5XZWJQYWdlUHJveHkoKTsK IAotICAgIHZvaWQgc2V0U2Vzc2lvbihBUEk6OlNlc3Npb24mKTsKLQogICAgIHVpbnQ2NF90IHBh Z2VJRCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZUlEOyB9Ci0gICAgV2ViQ29yZTo6U2Vzc2lvbklE IHNlc3Npb25JRCgpIGNvbnN0IHsgcmV0dXJuIG1fc2Vzc2lvbi0+Z2V0SUQoKTsgfQorICAgIFdl YkNvcmU6OlNlc3Npb25JRCBzZXNzaW9uSUQoKSBjb25zdCB7IHJldHVybiBtX3Nlc3Npb25JRDsg fQorICAgIHZvaWQgc2V0U2Vzc2lvbklEKFdlYkNvcmU6OlNlc3Npb25JRCk7CiAKICAgICBXZWJG cmFtZVByb3h5KiBtYWluRnJhbWUoKSBjb25zdCB7IHJldHVybiBtX21haW5GcmFtZS5nZXQoKTsg fQogICAgIFdlYkZyYW1lUHJveHkqIGZvY3VzZWRGcmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fZm9j dXNlZEZyYW1lLmdldCgpOyB9CkBAIC0xNDkyLDcgKzE0OTEsNyBAQCBwcml2YXRlOgogI2VuZGlm CiAKICAgICBjb25zdCB1aW50NjRfdCBtX3BhZ2VJRDsKLSAgICBSZWY8QVBJOjpTZXNzaW9uPiBt X3Nlc3Npb247CisgICAgV2ViQ29yZTo6U2Vzc2lvbklEIG1fc2Vzc2lvbklEOwogCiAgICAgYm9v bCBtX2lzUGFnZVN1c3BlbmRlZDsKICAgICBib29sIG1fYWRkc1Zpc2l0ZWRMaW5rczsK