128349 2014-02-06 17:43:38 -0800 Begin work on making preferences per page instead of per page group 2014-02-06 18:07:25 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 977653 0 andersca 2014-02-06 17:43:38 -0800 Begin work on making preferences per page instead of per page group 977654 1 223410 andersca 2014-02-06 17:44:42 -0800 Created attachment 223410 Patch 977666 2 223410 kling 2014-02-06 17:57:37 -0800 Comment on attachment 223410 Patch igp,r=me 977674 3 andersca 2014-02-06 18:07:25 -0800 Committed r163597: <http://trac.webkit.org/changeset/163597> 223410 2014-02-06 17:44:42 -0800 2014-02-06 17:57:37 -0800 Patch bug-128349-20140206174442.patch text/plain 22515 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTJkZThjMmZiYTAxMTAz YjBmMTUzYTZkYzliZWNkMTI3OTg3NzgxYy4uZTI4NGEwZTQ5ZmI1NTdhNjJhNDk5NzA2YTliNmY5 NzNkZTYxZGFjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUyIEBACiAyMDE0LTAyLTA2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQmVnaW4gd29yayBv biBtYWtpbmcgcHJlZmVyZW5jZXMgcGVyIHBhZ2UgaW5zdGVhZCBvZiBwZXIgcGFnZSBncm91cAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MzQ5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL0MvV0tQYWdlR3JvdXAuY3BwOgorICAgICAgICAoV0tQYWdlR3JvdXBHZXRQcmVmZXJl bmNlcyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL21hYy9XS1BhZ2VQcml2YXRlTWFjLmNw cDoKKyAgICAgICAgKFdLUGFnZUlzVVJMS25vd25IU1RTSG9zdCk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcgX3ByZWZlcmVuY2VzRGlk Q2hhbmdlXSk6CisgICAgICAgICgtW1dLVmlldyBpbml0V2l0aEZyYW1lOmNvbnRleHRSZWY6cGFn ZUdyb3VwUmVmOnJlbGF0ZWRUb1BhZ2U6XSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRl eHQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpjcmVhdGVXZWJQYWdlKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJJbnNwZWN0b3JQYWdlR3JvdXBzOjpjcmVhdGVJbnNwZWN0b3JQYWdlR3JvdXApOgorICAg ICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6YXR0YWNoKToKKyAgICAgICAgKFdlYktp dDo6V2ViSW5zcGVjdG9yUHJveHk6OmRldGFjaCk6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3Bl Y3RvclByb3h5OjpzZXRBdHRhY2hlZFdpbmRvd0hlaWdodCk6CisgICAgICAgIChXZWJLaXQ6Oldl Ykluc3BlY3RvclByb3h5OjpzZXRBdHRhY2hlZFdpbmRvd1dpZHRoKToKKyAgICAgICAgKFdlYktp dDo6V2ViSW5zcGVjdG9yUHJveHk6OmNyZWF0ZUluc3BlY3RvclBhZ2UpOgorICAgICAgICAoV2Vi S2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6c2hvdWxkT3BlbkF0dGFjaGVkKToKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUGFnZUdyb3VwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUdyb3Vw OjpwcmVmZXJlbmNlcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6V2ViUGFn ZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojppc1Byb2Nlc3NTdXBwcmVz c2libGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNhblNob3dNSU1FVHlwZSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cHJlZmVyZW5jZXNEaWRDaGFuZ2UpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycyk6CisgICAg ICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OnByZWZlcmVuY2VzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZXRQ cmVmZXJlbmNlcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6Y3JlYXRlV2ViUGFnZSk6CisgICAgICAg ICogVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIubW06CisgICAgICAgIChXZWJL aXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6YmVnaW5Td2lwZUdlc3R1cmUpOgorICAgICAgICAq IFVJUHJvY2Vzcy9tYWMvV2ViSW5zcGVjdG9yUHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6 OldlYkluc3BlY3RvclByb3h5OjpjcmVhdGVJbnNwZWN0b3JXaW5kb3cpOgorICAgICAgICAoV2Vi S2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQYWdlKToKKyAg ICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yUHJveHk6OndpbmRvd0ZyYW1lRGlkQ2hhbmdlKToK KyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtQXR0YWNoKToKKwor MjAxNC0wMi0wNiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAg ICAgIEZpeCBidWlsZC4KIAogICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZUdy b3VwLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2VHcm91cC5jcHAK aW5kZXggNTEyOThjZDE0OTgwMTljMGVhMDg0ZDYxN2NjN2YyOWQ1NDQ0MDZlYS4uNjc3NzU3ZGRi OWNjMjk1ZjgyZmY1ODgxN2U3YmRjZjA3MjM5YzlmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZUdyb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQYWdlR3JvdXAuY3BwCkBAIC01NSw3ICs1NSw3IEBAIHZvaWQgV0tQ YWdlR3JvdXBTZXRQcmVmZXJlbmNlcyhXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBSZWYsIFdLUHJl ZmVyZW5jZXNSZWYgcHJlCiAKIFdLUHJlZmVyZW5jZXNSZWYgV0tQYWdlR3JvdXBHZXRQcmVmZXJl bmNlcyhXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBSZWYpCiB7Ci0gICAgcmV0dXJuIHRvQVBJKHRv SW1wbChwYWdlR3JvdXBSZWYpLT5wcmVmZXJlbmNlcygpKTsKKyAgICByZXR1cm4gdG9BUEkoJnRv SW1wbChwYWdlR3JvdXBSZWYpLT5wcmVmZXJlbmNlcygpKTsKIH0KIAogdm9pZCBXS1BhZ2VHcm91 cEFkZFVzZXJTdHlsZVNoZWV0KFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91cFJlZiwgV0tTdHJpbmdS ZWYgc291cmNlUmVmLCBXS1VSTFJlZiBiYXNlVVJMLCBXS0FycmF5UmVmIHdoaXRlbGlzdGVkVVJM UGF0dGVybnMsIFdLQXJyYXlSZWYgYmxhY2tsaXN0ZWRVUkxQYXR0ZXJucywgV0tVc2VyQ29udGVu dEluamVjdGVkRnJhbWVzIGluamVjdGVkRnJhbWVzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL21hYy9XS1BhZ2VQcml2YXRlTWFjLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9tYWMvV0tQYWdlUHJpdmF0ZU1hYy5jcHAKaW5kZXggOWI3MGM1 YTViNzg4YjUzOGVlNDdhMTkxZDMxMGRkZGY2YzFhYzYxNy4uNmE5ZGNhNGE1OTg3ODNiYmRmNjkw OWEzNTI2MmNkM2Y5YjU5YWNkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL21hYy9XS1BhZ2VQcml2YXRlTWFjLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvbWFjL1dLUGFnZVByaXZhdGVNYWMuY3BwCkBAIC00Miw3ICs0Miw3IEBAIHBp ZF90IFdLUGFnZUdldFByb2Nlc3NJZGVudGlmaWVyKFdLUGFnZVJlZiBwYWdlUmVmKQogYm9vbCBX S1BhZ2VJc1VSTEtub3duSFNUU0hvc3QoV0tQYWdlUmVmIHBhZ2UsIFdLVVJMUmVmIHVybCkKIHsK ICAgICBXZWJQYWdlUHJveHkqIHdlYlBhZ2VQcm94eSA9IHRvSW1wbChwYWdlKTsKLSAgICBib29s IHByaXZhdGVCcm93c2luZ0VuYWJsZWQgPSB3ZWJQYWdlUHJveHktPnBhZ2VHcm91cCgpLnByZWZl cmVuY2VzKCktPnByaXZhdGVCcm93c2luZ0VuYWJsZWQoKTsKKyAgICBib29sIHByaXZhdGVCcm93 c2luZ0VuYWJsZWQgPSB3ZWJQYWdlUHJveHktPnBhZ2VHcm91cCgpLnByZWZlcmVuY2VzKCkucHJp dmF0ZUJyb3dzaW5nRW5hYmxlZCgpOwogCiAgICAgcmV0dXJuIHdlYlBhZ2VQcm94eS0+cHJvY2Vz cygpLmNvbnRleHQoKS5pc1VSTEtub3duSFNUU0hvc3QodG9JbXBsKHVybCktPnN0cmluZygpLCBw cml2YXRlQnJvd3NpbmdFbmFibGVkKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv bWFjL1dLVmlldy5tbQppbmRleCA4YTcyYjViOGJlYzMxYWRhNDM1N2RjYzE1ZWEwMzIyNDNlNmNi ZmQwLi4yZmJmYTExNjQ1NTk2ZWY1MjU4OTZkZWJmMTUwNjZmYzFiNjFkZGJhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCkBAIC0yMjQxLDcgKzIyNDEsNyBA QCBzdGF0aWMgdm9pZCBjcmVhdGVTYW5kYm94RXh0ZW5zaW9uc0ZvckZpbGVVcGxvYWQoTlNQYXN0 ZWJvYXJkICpwYXN0ZWJvYXJkLCBTYW5kYgogCiAtICh2b2lkKV9wcmVmZXJlbmNlc0RpZENoYW5n ZQogewotICAgIEJPT0wgbmVlZHNWaWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzID0gX2RhdGEt Pl9wYWdlLT5wYWdlR3JvdXAoKS5wcmVmZXJlbmNlcygpLT5wbHVnaW5zRW5hYmxlZCgpOworICAg IEJPT0wgbmVlZHNWaWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzID0gX2RhdGEtPl9wYWdlLT5w cmVmZXJlbmNlcygpLnBsdWdpbnNFbmFibGVkKCk7CiAKICAgICBpZiAoISFuZWVkc1ZpZXdGcmFt ZUluV2luZG93Q29vcmRpbmF0ZXMgPT0gISFfZGF0YS0+X25lZWRzVmlld0ZyYW1lSW5XaW5kb3dD b29yZGluYXRlcykKICAgICAgICAgcmV0dXJuOwpAQCAtMjk0Nyw3ICsyOTQ3LDcgQEAgc3RhdGlj IE5TU3RyaW5nICpwYXRoV2l0aFVuaXF1ZUZpbGVuYW1lRm9yUGF0aChOU1N0cmluZyAqcGF0aCkK IAogICAgIF9kYXRhLT5faW50cmluc2ljQ29udGVudFNpemUgPSBOU01ha2VTaXplKE5TVmlld05v SW5zdHJpbnNpY01ldHJpYywgTlNWaWV3Tm9JbnN0cmluc2ljTWV0cmljKTsKIAotICAgIF9kYXRh LT5fbmVlZHNWaWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzID0gX2RhdGEtPl9wYWdlLT5wYWdl R3JvdXAoKS5wcmVmZXJlbmNlcygpLT5wbHVnaW5zRW5hYmxlZCgpOworICAgIF9kYXRhLT5fbmVl ZHNWaWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzID0gX2RhdGEtPl9wYWdlLT5wcmVmZXJlbmNl cygpLnBsdWdpbnNFbmFibGVkKCk7CiAgICAgCiAgICAgW3NlbGYgX3JlZ2lzdGVyRHJhZ2dlZFR5 cGVzXTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCmluZGV4IDE3NTI4 MTY5YmY1YzY0MGEzNDViMzUzNTQ2YzczZDIwNGZhNzhhNTUuLmYxZTcwZWQ5ODFiZDYxZjZlMTRj ZmIzOGFmYzEwMDI3ZjIxZGFlOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4 dC5jcHAKQEAgLTc4NSw3ICs3ODUsNyBAQCBQYXNzUmVmUHRyPFdlYlBhZ2VQcm94eT4gV2ViQ29u dGV4dDo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBXZWJQYQogUGFzc1Jl ZlB0cjxXZWJQYWdlUHJveHk+IFdlYkNvbnRleHQ6OmNyZWF0ZVdlYlBhZ2UoUGFnZUNsaWVudCYg cGFnZUNsaWVudCwgV2ViUGFnZUdyb3VwKiBwYWdlR3JvdXAsIFdlYlBhZ2VQcm94eSogcmVsYXRl ZFBhZ2UpCiB7CiAgICAgV2ViUGFnZUdyb3VwKiBncm91cCA9IHBhZ2VHcm91cCA/IHBhZ2VHcm91 cCA6ICZtX2RlZmF1bHRQYWdlR3JvdXAuZ2V0KCk7Ci0gICAgcmV0dXJuIGNyZWF0ZVdlYlBhZ2Uo cGFnZUNsaWVudCwgZ3JvdXAsIGdyb3VwLT5wcmVmZXJlbmNlcygpLT5wcml2YXRlQnJvd3NpbmdF bmFibGVkKCkgPyBBUEk6OlNlc3Npb246OmxlZ2FjeVByaXZhdGVTZXNzaW9uKCkgOiBBUEk6OlNl c3Npb246OmRlZmF1bHRTZXNzaW9uKCksIHJlbGF0ZWRQYWdlKTsKKyAgICByZXR1cm4gY3JlYXRl V2ViUGFnZShwYWdlQ2xpZW50LCBncm91cCwgZ3JvdXAtPnByZWZlcmVuY2VzKCkucHJpdmF0ZUJy b3dzaW5nRW5hYmxlZCgpID8gQVBJOjpTZXNzaW9uOjpsZWdhY3lQcml2YXRlU2Vzc2lvbigpIDog QVBJOjpTZXNzaW9uOjpkZWZhdWx0U2Vzc2lvbigpLCByZWxhdGVkUGFnZSk7CiB9CiAKIERvd25s b2FkUHJveHkqIFdlYkNvbnRleHQ6OmRvd25sb2FkKFdlYlBhZ2VQcm94eSogaW5pdGlhdGluZ1Bh Z2UsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCmluZGV4IDJkMjI5N2Y4Y2VkYmJmM2VkNzJl NTc0ODc5YTAzM2JkZjFmNjBlNGUuLjA4ZmU4MzUyNTIxMDIwNjEyMjkyMjE5MzNjYmQzYzk5NTBm MjFlN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQ cm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5 LmNwcApAQCAtMTA1LDExICsxMDUsMTEgQEAgcHJpdmF0ZToKIAogI2lmbmRlZiBOREVCVUcKICAg ICAgICAgLy8gQWxsb3cgZGV2ZWxvcGVycyB0byBpbnNwZWN0IHRoZSBXZWIgSW5zcGVjdG9yIGlu IGRlYnVnIGJ1aWxkcy4KLSAgICAgICAgcGFnZUdyb3VwLT5wcmVmZXJlbmNlcygpLT5zZXREZXZl bG9wZXJFeHRyYXNFbmFibGVkKHRydWUpOwotICAgICAgICBwYWdlR3JvdXAtPnByZWZlcmVuY2Vz KCktPnNldExvZ3NQYWdlTWVzc2FnZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkKHRydWUpOworICAg ICAgICBwYWdlR3JvdXAtPnByZWZlcmVuY2VzKCkuc2V0RGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCh0 cnVlKTsKKyAgICAgICAgcGFnZUdyb3VwLT5wcmVmZXJlbmNlcygpLnNldExvZ3NQYWdlTWVzc2Fn ZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkKHRydWUpOwogI2VuZGlmCiAKLSAgICAgICAgcGFnZUdy b3VwLT5wcmVmZXJlbmNlcygpLT5zZXRBcHBsaWNhdGlvbkNocm9tZU1vZGVFbmFibGVkKHRydWUp OworICAgICAgICBwYWdlR3JvdXAtPnByZWZlcmVuY2VzKCkuc2V0QXBwbGljYXRpb25DaHJvbWVN b2RlRW5hYmxlZCh0cnVlKTsKIAogICAgICAgICByZXR1cm4gcGFnZUdyb3VwLnJlbGVhc2UoKTsK ICAgICB9CkBAIC0yNzAsMTAgKzI3MCwxMCBAQCB2b2lkIFdlYkluc3BlY3RvclByb3h5OjphdHRh Y2goQXR0YWNobWVudFNpZGUgc2lkZSkKICAgICBtX2lzQXR0YWNoZWQgPSB0cnVlOwogICAgIG1f YXR0YWNobWVudFNpZGUgPSBzaWRlOwogCi0gICAgaW5zcGVjdG9yUGFnZUdyb3VwKCktPnByZWZl cmVuY2VzKCktPnNldEluc3BlY3RvckF0dGFjaG1lbnRTaWRlKHNpZGUpOworICAgIGluc3BlY3Rv clBhZ2VHcm91cCgpLT5wcmVmZXJlbmNlcygpLnNldEluc3BlY3RvckF0dGFjaG1lbnRTaWRlKHNp ZGUpOwogCiAgICAgaWYgKG1faXNWaXNpYmxlKQotICAgICAgICBpbnNwZWN0b3JQYWdlR3JvdXAo KS0+cHJlZmVyZW5jZXMoKS0+c2V0SW5zcGVjdG9yU3RhcnRzQXR0YWNoZWQodHJ1ZSk7CisgICAg ICAgIGluc3BlY3RvclBhZ2VHcm91cCgpLT5wcmVmZXJlbmNlcygpLnNldEluc3BlY3RvclN0YXJ0 c0F0dGFjaGVkKHRydWUpOwogCiAgICAgc3dpdGNoIChtX2F0dGFjaG1lbnRTaWRlKSB7CiAgICAg Y2FzZSBBdHRhY2htZW50U2lkZUJvdHRvbToKQEAgLTI5Niw3ICsyOTYsNyBAQCB2b2lkIFdlYklu c3BlY3RvclByb3h5OjpkZXRhY2goKQogICAgIG1faXNBdHRhY2hlZCA9IGZhbHNlOwogCiAgICAg aWYgKG1faXNWaXNpYmxlKQotICAgICAgICBpbnNwZWN0b3JQYWdlR3JvdXAoKS0+cHJlZmVyZW5j ZXMoKS0+c2V0SW5zcGVjdG9yU3RhcnRzQXR0YWNoZWQoZmFsc2UpOworICAgICAgICBpbnNwZWN0 b3JQYWdlR3JvdXAoKS0+cHJlZmVyZW5jZXMoKS5zZXRJbnNwZWN0b3JTdGFydHNBdHRhY2hlZChm YWxzZSk7CiAKICAgICBtX3BhZ2UtPnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJJbnNwZWN0 b3I6OkRldGFjaGVkKCksIG1fcGFnZS0+cGFnZUlEKCkpOwogCkBAIC0zMDUsMTMgKzMwNSwxMyBA QCB2b2lkIFdlYkluc3BlY3RvclByb3h5OjpkZXRhY2goKQogCiB2b2lkIFdlYkluc3BlY3RvclBy b3h5OjpzZXRBdHRhY2hlZFdpbmRvd0hlaWdodCh1bnNpZ25lZCBoZWlnaHQpCiB7Ci0gICAgaW5z cGVjdG9yUGFnZUdyb3VwKCktPnByZWZlcmVuY2VzKCktPnNldEluc3BlY3RvckF0dGFjaGVkSGVp Z2h0KGhlaWdodCk7CisgICAgaW5zcGVjdG9yUGFnZUdyb3VwKCktPnByZWZlcmVuY2VzKCkuc2V0 SW5zcGVjdG9yQXR0YWNoZWRIZWlnaHQoaGVpZ2h0KTsKICAgICBwbGF0Zm9ybVNldEF0dGFjaGVk V2luZG93SGVpZ2h0KGhlaWdodCk7CiB9CiAKIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OnNldEF0 dGFjaGVkV2luZG93V2lkdGgodW5zaWduZWQgd2lkdGgpCiB7Ci0gICAgaW5zcGVjdG9yUGFnZUdy b3VwKCktPnByZWZlcmVuY2VzKCktPnNldEluc3BlY3RvckF0dGFjaGVkV2lkdGgod2lkdGgpOwor ICAgIGluc3BlY3RvclBhZ2VHcm91cCgpLT5wcmVmZXJlbmNlcygpLnNldEluc3BlY3RvckF0dGFj aGVkV2lkdGgod2lkdGgpOwogICAgIHBsYXRmb3JtU2V0QXR0YWNoZWRXaW5kb3dXaWR0aCh3aWR0 aCk7CiB9CiAKQEAgLTQyOSw3ICs0MjksNyBAQCB2b2lkIFdlYkluc3BlY3RvclByb3h5OjpjcmVh dGVJbnNwZWN0b3JQYWdlKHVpbnQ2NF90JiBpbnNwZWN0b3JQYWdlSUQsIFdlYlBhZ2VDcgogICAg ICAgICByZXR1cm47CiAKICAgICBtX2lzQXR0YWNoZWQgPSBzaG91bGRPcGVuQXR0YWNoZWQoKTsK LSAgICBtX2F0dGFjaG1lbnRTaWRlID0gc3RhdGljX2Nhc3Q8QXR0YWNobWVudFNpZGU+KGluc3Bl Y3RvclBhZ2VHcm91cCgpLT5wcmVmZXJlbmNlcygpLT5pbnNwZWN0b3JBdHRhY2htZW50U2lkZSgp KTsKKyAgICBtX2F0dGFjaG1lbnRTaWRlID0gc3RhdGljX2Nhc3Q8QXR0YWNobWVudFNpZGU+KGlu c3BlY3RvclBhZ2VHcm91cCgpLT5wcmVmZXJlbmNlcygpLmluc3BlY3RvckF0dGFjaG1lbnRTaWRl KCkpOwogCiAgICAgV2ViUGFnZVByb3h5KiBpbnNwZWN0b3JQYWdlID0gcGxhdGZvcm1DcmVhdGVJ bnNwZWN0b3JQYWdlKCk7CiAgICAgQVNTRVJUKGluc3BlY3RvclBhZ2UpOwpAQCAtNTYzLDcgKzU2 Myw3IEBAIGJvb2wgV2ViSW5zcGVjdG9yUHJveHk6OmNhbkF0dGFjaCgpCiAKIGJvb2wgV2ViSW5z cGVjdG9yUHJveHk6OnNob3VsZE9wZW5BdHRhY2hlZCgpCiB7Ci0gICAgcmV0dXJuIGluc3BlY3Rv clBhZ2VHcm91cCgpLT5wcmVmZXJlbmNlcygpLT5pbnNwZWN0b3JTdGFydHNBdHRhY2hlZCgpICYm IGNhbkF0dGFjaCgpOworICAgIHJldHVybiBpbnNwZWN0b3JQYWdlR3JvdXAoKS0+cHJlZmVyZW5j ZXMoKS5pbnNwZWN0b3JTdGFydHNBdHRhY2hlZCgpICYmIGNhbkF0dGFjaCgpOwogfQogCiAjaWYg RU5BQkxFKElOU1BFQ1RPUl9TRVJWRVIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZUdyb3VwLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl R3JvdXAuY3BwCmluZGV4IDU5Y2MxZmY1ZGVjYmQwNzEyZTk5MzRlOGZhNmUzMDg0ZDE4ZDYwYmUu LmQzYjkyMjI3Mjc3MjJlODRlOGE3ZmY5ZjNlYjYzNzgxYWVlZDY2OTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlR3JvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlR3JvdXAuY3BwCkBAIC0xMTQsNyArMTE0LDcgQEAgdm9pZCBX ZWJQYWdlR3JvdXA6OnNldFByZWZlcmVuY2VzKFdlYlByZWZlcmVuY2VzKiBwcmVmZXJlbmNlcykK ICAgICB9CiB9CiAKLVdlYlByZWZlcmVuY2VzKiBXZWJQYWdlR3JvdXA6OnByZWZlcmVuY2VzKCkg Y29uc3QKK1dlYlByZWZlcmVuY2VzJiBXZWJQYWdlR3JvdXA6OnByZWZlcmVuY2VzKCkgY29uc3QK IHsKICAgICBpZiAoIW1fcHJlZmVyZW5jZXMpIHsKICAgICAgICAgaWYgKCFtX2RhdGEuaWRlbnRp ZmVyLmlzTnVsbCgpKQpAQCAtMTIzLDcgKzEyMyw4IEBAIFdlYlByZWZlcmVuY2VzKiBXZWJQYWdl R3JvdXA6OnByZWZlcmVuY2VzKCkgY29uc3QKICAgICAgICAgICAgIG1fcHJlZmVyZW5jZXMgPSBX ZWJQcmVmZXJlbmNlczo6Y3JlYXRlKCk7CiAgICAgICAgIG1fcHJlZmVyZW5jZXMtPmFkZFBhZ2VH cm91cChjb25zdF9jYXN0PFdlYlBhZ2VHcm91cCo+KHRoaXMpKTsKICAgICB9Ci0gICAgcmV0dXJu IG1fcHJlZmVyZW5jZXMuZ2V0KCk7CisKKyAgICByZXR1cm4gKm1fcHJlZmVyZW5jZXM7CiB9CiAK IHZvaWQgV2ViUGFnZUdyb3VwOjpwcmVmZXJlbmNlc0RpZENoYW5nZSgpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZUdyb3VwLmgKaW5kZXggNDYwMjdjNWFmNWFiNDE5MzNkNzkyMTU5ZTM2 ZGRjYjA4OTNmNWZhYy4uZmU3NDExOGJjZDMyN2M2Y2VlYjg5YmE0ZTEzMTFlYjY0YmQ0NGI2MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlR3JvdXAuaApAQCAtNTYsNyArNTYsNyBA QCBwdWJsaWM6CiAgICAgY29uc3QgV2ViUGFnZUdyb3VwRGF0YSYgZGF0YSgpIHsgcmV0dXJuIG1f ZGF0YTsgfQogCiAgICAgdm9pZCBzZXRQcmVmZXJlbmNlcyhXZWJQcmVmZXJlbmNlcyopOwotICAg IFdlYlByZWZlcmVuY2VzKiBwcmVmZXJlbmNlcygpIGNvbnN0OworICAgIFdlYlByZWZlcmVuY2Vz JiBwcmVmZXJlbmNlcygpIGNvbnN0OwogICAgIHZvaWQgcHJlZmVyZW5jZXNEaWRDaGFuZ2UoKTsK ICAgICAKICAgICB2b2lkIGFkZFVzZXJTdHlsZVNoZWV0KGNvbnN0IFN0cmluZyYgc291cmNlLCBj b25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6QXJyYXkqIHdoaXRlbGlzdCwgQVBJOjpBcnJheSog YmxhY2tsaXN0LCBXZWJDb3JlOjpVc2VyQ29udGVudEluamVjdGVkRnJhbWVzLCBXZWJDb3JlOjpV c2VyU3R5bGVMZXZlbCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw CmluZGV4IDBhMjg1ZGQ3N2RhMzYzZmMxMWIyNDczZGE3ZDRmNTUzOWRhM2NkOTUuLmMxYTQzNTZi MTAxN2Y0MDcyM2ZiZDdkNmZmMzU3YThmZDFmZDUwODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0yNDEsMTggKzI0MSwxOSBAQCBzdGF0aWMgY29uc3Qg Y2hhciogd2ViS2V5Ym9hcmRFdmVudFR5cGVTdHJpbmcoV2ViRXZlbnQ6OlR5cGUgdHlwZSkKIH0K ICNlbmRpZiAvLyAhTE9HX0RJU0FCTEVECiAKLVBhc3NSZWZQdHI8V2ViUGFnZVByb3h5PiBXZWJQ YWdlUHJveHk6OmNyZWF0ZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBXZWJQcm9jZXNzUHJveHkm IHByb2Nlc3MsIFdlYlBhZ2VHcm91cCYgcGFnZUdyb3VwLCBBUEk6OlNlc3Npb24mIHNlc3Npb24s IHVpbnQ2NF90IHBhZ2VJRCkKK1Bhc3NSZWZQdHI8V2ViUGFnZVByb3h5PiBXZWJQYWdlUHJveHk6 OmNyZWF0ZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3Ms IFdlYlBhZ2VHcm91cCYgcGFnZUdyb3VwLCBXZWJQcmVmZXJlbmNlcyYgcHJlZmVyZW5jZXMsIEFQ STo6U2Vzc2lvbiYgc2Vzc2lvbiwgdWludDY0X3QgcGFnZUlEKQogewotICAgIHJldHVybiBhZG9w dFJlZihuZXcgV2ViUGFnZVByb3h5KHBhZ2VDbGllbnQsIHByb2Nlc3MsIHBhZ2VHcm91cCwgc2Vz c2lvbiwgcGFnZUlEKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJQYWdlUHJveHkocGFn ZUNsaWVudCwgcHJvY2VzcywgcGFnZUdyb3VwLCBwcmVmZXJlbmNlcywgc2Vzc2lvbiwgcGFnZUlE KSk7CiB9CiAKLVdlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5KFBhZ2VDbGllbnQmIHBhZ2VDbGll bnQsIFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcywgV2ViUGFnZUdyb3VwJiBwYWdlR3JvdXAsIEFQ STo6U2Vzc2lvbiYgc2Vzc2lvbiwgdWludDY0X3QgcGFnZUlEKQorV2ViUGFnZVByb3h5OjpXZWJQ YWdlUHJveHkoUGFnZUNsaWVudCYgcGFnZUNsaWVudCwgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNz LCBXZWJQYWdlR3JvdXAmIHBhZ2VHcm91cCwgV2ViUHJlZmVyZW5jZXMmIHByZWZlcmVuY2VzLCBB UEk6OlNlc3Npb24mIHNlc3Npb24sIHVpbnQ2NF90IHBhZ2VJRCkKICAgICA6IG1fcGFnZUNsaWVu dChwYWdlQ2xpZW50KQogICAgICwgbV9sb2FkZXJDbGllbnQoc3RkOjptYWtlX3VuaXF1ZTxBUEk6 OkxvYWRlckNsaWVudD4oKSkKICAgICAsIG1fcG9saWN5Q2xpZW50KHN0ZDo6bWFrZV91bmlxdWU8 QVBJOjpQb2xpY3lDbGllbnQ+KCkpCiAgICAgLCBtX3VpQ2xpZW50KHN0ZDo6bWFrZV91bmlxdWU8 QVBJOjpVSUNsaWVudD4oKSkKICAgICAsIG1fcHJvY2Vzcyhwcm9jZXNzKQogICAgICwgbV9wYWdl R3JvdXAocGFnZUdyb3VwKQorICAgICwgbV9wcmVmZXJlbmNlcyhwcmVmZXJlbmNlcykKICAgICAs IG1fbWFpbkZyYW1lKG51bGxwdHIpCiAgICAgLCBtX3VzZXJBZ2VudChzdGFuZGFyZFVzZXJBZ2Vu dCgpKQogICAgICwgbV9nZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlcigqdGhpcykK QEAgLTU1Miw3ICs1NTMsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2Uo KQogCiBib29sIFdlYlBhZ2VQcm94eTo6aXNQcm9jZXNzU3VwcHJlc3NpYmxlKCkgY29uc3QKIHsK LSAgICByZXR1cm4gKG1fdmlld1N0YXRlICYgVmlld1N0YXRlOjpJc1Zpc3VhbGx5SWRsZSkgJiYg bV9wYWdlR3JvdXAtPnByZWZlcmVuY2VzKCktPnBhZ2VWaXNpYmlsaXR5QmFzZWRQcm9jZXNzU3Vw cHJlc3Npb25FbmFibGVkKCk7CisgICAgcmV0dXJuIChtX3ZpZXdTdGF0ZSAmIFZpZXdTdGF0ZTo6 SXNWaXN1YWxseUlkbGUpICYmIG1fcHJlZmVyZW5jZXMtPnBhZ2VWaXNpYmlsaXR5QmFzZWRQcm9j ZXNzU3VwcHJlc3Npb25FbmFibGVkKCk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpjbG9zZSgp CkBAIC04NTUsNyArODU2LDcgQEAgYm9vbCBXZWJQYWdlUHJveHk6OmNhblNob3dNSU1FVHlwZShj b25zdCBTdHJpbmcmIG1pbWVUeXBlKQogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQog ICAgIFN0cmluZyBuZXdNaW1lVHlwZSA9IG1pbWVUeXBlOwogICAgIFBsdWdpbk1vZHVsZUluZm8g cGx1Z2luID0gbV9wcm9jZXNzLT5jb250ZXh0KCkucGx1Z2luSW5mb1N0b3JlKCkuZmluZFBsdWdp bihuZXdNaW1lVHlwZSwgVVJMKCkpOwotICAgIGlmICghcGx1Z2luLnBhdGguaXNOdWxsKCkgJiYg bV9wYWdlR3JvdXAtPnByZWZlcmVuY2VzKCktPnBsdWdpbnNFbmFibGVkKCkpCisgICAgaWYgKCFw bHVnaW4ucGF0aC5pc051bGwoKSAmJiBtX3ByZWZlcmVuY2VzLT5wbHVnaW5zRW5hYmxlZCgpKQog ICAgICAgICByZXR1cm4gdHJ1ZTsKICNlbmRpZiAvLyBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQ SSkKIApAQCAtMjA2NCw3ICsyMDY1LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnByZWZlcmVuY2Vz RGlkQ2hhbmdlKCkKICAgICAvLyBldmVuIGlmIG5vdGhpbmcgY2hhbmdlZCBpbiBVSSBwcm9jZXNz LCBzbyB0aGF0IG92ZXJyaWRlcyBnZXQgcmVtb3ZlZC4KIAogICAgIC8vIFByZWZlcmVuY2VzIG5l ZWQgdG8gYmUgdXBkYXRlZCBkdXJpbmcgc3luY2hyb25vdXMgcHJpbnRpbmcgdG8gbWFrZSAicHJp bnQgYmFja2dyb3VuZHMiIHByZWZlcmVuY2Ugd29yayB3aGVuIHRvZ2dsZWQgZnJvbSBhIHByaW50 IGRpYWxvZyBjaGVja2JveC4KLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6 OlByZWZlcmVuY2VzRGlkQ2hhbmdlKHBhZ2VHcm91cCgpLnByZWZlcmVuY2VzKCktPnN0b3JlKCkp LCBtX3BhZ2VJRCwgbV9pc1BlcmZvcm1pbmdET01QcmludE9wZXJhdGlvbiA/IElQQzo6RGlzcGF0 Y2hNZXNzYWdlRXZlbldoZW5XYWl0aW5nRm9yU3luY1JlcGx5IDogMCk7CisgICAgbV9wcm9jZXNz LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpQcmVmZXJlbmNlc0RpZENoYW5nZShtX3ByZWZlcmVu Y2VzLT5zdG9yZSgpKSwgbV9wYWdlSUQsIG1faXNQZXJmb3JtaW5nRE9NUHJpbnRPcGVyYXRpb24g PyBJUEM6OkRpc3BhdGNoTWVzc2FnZUV2ZW5XaGVuV2FpdGluZ0ZvclN5bmNSZXBseSA6IDApOwog fQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ3JlYXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1l SUQpCkBAIC0zOTA4LDcgKzM5MDksNyBAQCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBh Z2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKCkKICAgICBwYXJhbWV0ZXJzLnZpZXdTaXplID0g bV9wYWdlQ2xpZW50LnZpZXdTaXplKCk7CiAgICAgcGFyYW1ldGVycy52aWV3U3RhdGUgPSBtX3Zp ZXdTdGF0ZTsKICAgICBwYXJhbWV0ZXJzLmRyYXdpbmdBcmVhVHlwZSA9IG1fZHJhd2luZ0FyZWEt PnR5cGUoKTsKLSAgICBwYXJhbWV0ZXJzLnN0b3JlID0gbV9wYWdlR3JvdXAtPnByZWZlcmVuY2Vz KCktPnN0b3JlKCk7CisgICAgcGFyYW1ldGVycy5zdG9yZSA9IG1fcHJlZmVyZW5jZXMtPnN0b3Jl KCk7CiAgICAgcGFyYW1ldGVycy5wYWdlR3JvdXBEYXRhID0gbV9wYWdlR3JvdXAtPmRhdGEoKTsK ICAgICBwYXJhbWV0ZXJzLmRyYXdzQmFja2dyb3VuZCA9IG1fZHJhd3NCYWNrZ3JvdW5kOwogICAg IHBhcmFtZXRlcnMuZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQgPSBtX2RyYXdzVHJhbnNwYXJl bnRCYWNrZ3JvdW5kOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4 IDY4M2VhNzRiMzQwYWM2YzU3NDg3ODIwZjgyNjlkM2NiMTliMjI5YjAuLmYyMTYyZmZhMTliNTc2 MjI0MGE0MDMwMmNmNDIyNzVjOGMwMzIxMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgKQEAgLTU0LDYgKzU0LDcgQEAKICNpbmNsdWRlICJXZWJIaXRUZXN0UmVzdWx0 LmgiCiAjaW5jbHVkZSAiV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50LmgiCiAjaW5jbHVkZSAiV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oIgorI2luY2x1ZGUgIldlYlByZWZlcmVuY2VzLmgiCiAj aW5jbHVkZSA8V2ViQ29yZS9BbHRlcm5hdGl2ZVRleHRDbGllbnQuaD4gLy8gRklYTUU6IE5lZWRl ZCBieSBXZWJQYWdlUHJveHlNZXNzYWdlcy5oIGZvciBESUNUQVRJT05fQUxURVJOQVRJVkVTLgog I2luY2x1ZGUgIldlYlBhZ2VQcm94eU1lc3NhZ2VzLmgiCiAjaW5jbHVkZSAiV2ViUG9wdXBNZW51 UHJveHkuaCIKQEAgLTMzMCw3ICszMzEsNyBAQCBjbGFzcyBXZWJQYWdlUHJveHkgOiBwdWJsaWMg QVBJOjpPYmplY3RJbXBsPEFQSTo6T2JqZWN0OjpUeXBlOjpQYWdlPgogICAgICwgcHVibGljIElQ Qzo6TWVzc2FnZVNlbmRlciB7CiBwdWJsaWM6CiAKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJQ YWdlUHJveHk+IGNyZWF0ZShQYWdlQ2xpZW50JiwgV2ViUHJvY2Vzc1Byb3h5JiwgV2ViUGFnZUdy b3VwJiwgQVBJOjpTZXNzaW9uJiwgdWludDY0X3QgcGFnZUlEKTsKKyAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxXZWJQYWdlUHJveHk+IGNyZWF0ZShQYWdlQ2xpZW50JiwgV2ViUHJvY2Vzc1Byb3h5Jiwg V2ViUGFnZUdyb3VwJiwgV2ViUHJlZmVyZW5jZXMmLCBBUEk6OlNlc3Npb24mLCB1aW50NjRfdCBw YWdlSUQpOwogICAgIHZpcnR1YWwgfldlYlBhZ2VQcm94eSgpOwogCiAgICAgdm9pZCBzZXRTZXNz aW9uKEFQSTo6U2Vzc2lvbiYpOwpAQCAtNzIzLDYgKzcyNCw5IEBAIHB1YmxpYzoKICAgICBXZWJQ cm9jZXNzUHJveHkmIHByb2Nlc3MoKSB7IHJldHVybiBtX3Byb2Nlc3MuZ2V0KCk7IH0KICAgICBQ bGF0Zm9ybVByb2Nlc3NJZGVudGlmaWVyIHByb2Nlc3NJZGVudGlmaWVyKCkgY29uc3Q7CiAKKyAg ICBXZWJQcmVmZXJlbmNlcyYgcHJlZmVyZW5jZXMoKSB7IHJldHVybiBtX3ByZWZlcmVuY2VzLmdl dCgpOyB9CisgICAgdm9pZCBzZXRQcmVmZXJlbmNlcyhXZWJQcmVmZXJlbmNlcyYgcHJlZmVyZW5j ZXMpIHsgbV9wcmVmZXJlbmNlcyA9IHByZWZlcmVuY2VzOyB9CisKICAgICBXZWJQYWdlR3JvdXAm IHBhZ2VHcm91cCgpIHsgcmV0dXJuIG1fcGFnZUdyb3VwLmdldCgpOyB9CiAKICAgICBib29sIGlz VmFsaWQoKSBjb25zdDsKQEAgLTg3Miw3ICs4NzYsNyBAQCBwdWJsaWM6CiAjZW5kaWYKIAogcHJp dmF0ZToKLSAgICBXZWJQYWdlUHJveHkoUGFnZUNsaWVudCYsIFdlYlByb2Nlc3NQcm94eSYsIFdl YlBhZ2VHcm91cCYsIEFQSTo6U2Vzc2lvbiYsIHVpbnQ2NF90IHBhZ2VJRCk7CisgICAgV2ViUGFn ZVByb3h5KFBhZ2VDbGllbnQmLCBXZWJQcm9jZXNzUHJveHkmLCBXZWJQYWdlR3JvdXAmLCBXZWJQ cmVmZXJlbmNlcyYsIEFQSTo6U2Vzc2lvbiYsIHVpbnQ2NF90IHBhZ2VJRCk7CiAgICAgdm9pZCBw bGF0Zm9ybUluaXRpYWxpemUoKTsKIAogICAgIHZvaWQgdXBkYXRlVmlld1N0YXRlKFdlYkNvcmU6 OlZpZXdTdGF0ZTo6RmxhZ3MgZmxhZ3NUb1VwZGF0ZSA9IFdlYkNvcmU6OlZpZXdTdGF0ZTo6QWxs RmxhZ3MpOwpAQCAtMTE5Myw2ICsxMTk3LDggQEAgcHJpdmF0ZToKIAogICAgIFJlZjxXZWJQcm9j ZXNzUHJveHk+IG1fcHJvY2VzczsKICAgICBSZWY8V2ViUGFnZUdyb3VwPiBtX3BhZ2VHcm91cDsK KyAgICBSZWY8V2ViUHJlZmVyZW5jZXM+IG1fcHJlZmVyZW5jZXM7CisKICAgICBSZWZQdHI8V2Vi RnJhbWVQcm94eT4gbV9tYWluRnJhbWU7CiAgICAgUmVmUHRyPFdlYkZyYW1lUHJveHk+IG1fZm9j dXNlZEZyYW1lOwogICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX2ZyYW1lU2V0TGFyZ2VzdEZy YW1lOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRl eCA1ZWRjYjNmNDc2M2U3YzhkY2VlMjlmM2MzNzEwYTMzNDNlODRlZGUwLi4zZjBmYTk3NWYzM2Zm YzM1YWFiMDExOGU1MjI2NWM4YTgxM2ZjZmM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAtMzksNiArMzksNyBAQAogI2luY2x1ZGUgIldlYkNv bnRleHQuaCIKICNpbmNsdWRlICJXZWJOYXZpZ2F0aW9uRGF0YVN0b3JlLmgiCiAjaW5jbHVkZSAi V2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5LmgiCisjaW5jbHVkZSAiV2ViUGFnZUdyb3VwLmgi CiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCiAjaW5jbHVkZSAiV2ViUGx1Z2luU2l0ZURhdGFN YW5hZ2VyLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc01lc3NhZ2VzLmgiCkBAIC0xNzAsNyArMTcx LDcgQEAgV2ViUGFnZVByb3h5KiBXZWJQcm9jZXNzUHJveHk6OndlYlBhZ2UodWludDY0X3QgcGFn ZUlEKQogUGFzc1JlZlB0cjxXZWJQYWdlUHJveHk+IFdlYlByb2Nlc3NQcm94eTo6Y3JlYXRlV2Vi UGFnZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBXZWJQYWdlR3JvdXAmIHBhZ2VHcm91cCwgQVBJ OjpTZXNzaW9uJiBzZXNzaW9uKQogewogICAgIHVpbnQ2NF90IHBhZ2VJRCA9IGdlbmVyYXRlUGFn ZUlEKCk7Ci0gICAgUmVmUHRyPFdlYlBhZ2VQcm94eT4gd2ViUGFnZSA9IFdlYlBhZ2VQcm94eTo6 Y3JlYXRlKHBhZ2VDbGllbnQsICp0aGlzLCBwYWdlR3JvdXAsIHNlc3Npb24sIHBhZ2VJRCk7Cisg ICAgUmVmUHRyPFdlYlBhZ2VQcm94eT4gd2ViUGFnZSA9IFdlYlBhZ2VQcm94eTo6Y3JlYXRlKHBh Z2VDbGllbnQsICp0aGlzLCBwYWdlR3JvdXAsIHBhZ2VHcm91cC5wcmVmZXJlbmNlcygpLCBzZXNz aW9uLCBwYWdlSUQpOwogICAgIG1fcGFnZU1hcC5zZXQocGFnZUlELCB3ZWJQYWdlLmdldCgpKTsK ICAgICBnbG9iYWxQYWdlTWFwKCkuc2V0KHBhZ2VJRCwgd2ViUGFnZS5nZXQoKSk7CiAjaWYgUExB VEZPUk0oTUFDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3 R2VzdHVyZUNvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdH ZXN0dXJlQ29udHJvbGxlci5tbQppbmRleCA0MTBkNjU4MzViOWM1NGE0MjUzMjJhZThkOGVlOTBi MTJjZWY5ZjNkLi5jNzE2YTVlODYzZjkzYTAzYjk0MjljNWVjMDNkMjU3MGI2MzBlYTc1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxl ci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJv bGxlci5tbQpAQCAtNDAyLDcgKzQwMiw3IEBAIHZvaWQgVmlld0dlc3R1cmVDb250cm9sbGVyOjpi ZWdpblN3aXBlR2VzdHVyZShXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiB0YXJnZXRJdGVtCiAgICAg W21fc3dpcGVTbmFwc2hvdExheWVyIHNldE5hbWU6QCJHZXN0dXJlIFN3aXBlIFNuYXBzaG90IExh eWVyIl07CiAgICAgW21fc3dpcGVTbmFwc2hvdExheWVyIHdlYl9kaXNhYmxlQWxsQWN0aW9uc107 CiAKLSAgICBpZiAobV93ZWJQYWdlUHJveHkucGFnZUdyb3VwKCkucHJlZmVyZW5jZXMoKS0+dmll d0dlc3R1cmVEZWJ1Z2dpbmdFbmFibGVkKCkpIHsKKyAgICBpZiAobV93ZWJQYWdlUHJveHkucHJl ZmVyZW5jZXMoKS52aWV3R2VzdHVyZURlYnVnZ2luZ0VuYWJsZWQoKSkgewogICAgICAgICBDQUZp bHRlciogZmlsdGVyID0gW0NBRmlsdGVyIGZpbHRlcldpdGhUeXBlOmtDQUZpbHRlckdhdXNzaWFu Qmx1cl07CiAgICAgICAgIFtmaWx0ZXIgc2V0VmFsdWU6W05TTnVtYmVyIG51bWJlcldpdGhGbG9h dDozXSBmb3JLZXk6QCJpbnB1dFJhZGl1cyJdOwogICAgICAgICBbbV9zd2lwZVNuYXBzaG90TGF5 ZXIgc2V0RmlsdGVyczpAW2ZpbHRlcl1dOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvV2ViSW5zcGVjdG9yUHJveHlNYWMubW0KaW5kZXggYTYzM2ExYjEyYjljY2RjZDhi NGEwYjlmZmRmNGFiZjc2YjJkZDBmMi4uOTdmNDc2Nzc1NjdiMDVhNmY3ZmIxYjk1ZTViNGRkYjA5 YzQ3YjJkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJJbnNw ZWN0b3JQcm94eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYklu c3BlY3RvclByb3h5TWFjLm1tCkBAIC0yODUsNyArMjg1LDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JQ cm94eTo6Y3JlYXRlSW5zcGVjdG9yV2luZG93KCkKICAgICBOU1JlY3Qgd2luZG93RnJhbWUgPSBO U01ha2VSZWN0KDAsIDAsIGluaXRpYWxXaW5kb3dXaWR0aCwgaW5pdGlhbFdpbmRvd0hlaWdodCk7 CiAKICAgICAvLyBSZXN0b3JlIHRoZSBzYXZlZCB3aW5kb3cgZnJhbWUsIGlmIHRoZXJlIHdhcyBv bmUuCi0gICAgTlNTdHJpbmcgKnNhdmVkV2luZG93RnJhbWVTdHJpbmcgPSBwYWdlKCktPnBhZ2VH cm91cCgpLnByZWZlcmVuY2VzKCktPmluc3BlY3RvcldpbmRvd0ZyYW1lKCk7CisgICAgTlNTdHJp bmcgKnNhdmVkV2luZG93RnJhbWVTdHJpbmcgPSBwYWdlKCktPnBhZ2VHcm91cCgpLnByZWZlcmVu Y2VzKCkuaW5zcGVjdG9yV2luZG93RnJhbWUoKTsKICAgICBOU1JlY3Qgc2F2ZWRXaW5kb3dGcmFt ZSA9IE5TUmVjdEZyb21TdHJpbmcoc2F2ZWRXaW5kb3dGcmFtZVN0cmluZyk7CiAgICAgaWYgKCFO U0lzRW1wdHlSZWN0KHNhdmVkV2luZG93RnJhbWUpKQogICAgICAgICB3aW5kb3dGcmFtZSA9IHNh dmVkV2luZG93RnJhbWU7CkBAIC0zNzUsMTYgKzM3NSwxNiBAQCBXZWJQYWdlUHJveHkqIFdlYklu c3BlY3RvclByb3h5OjpwbGF0Zm9ybUNyZWF0ZUluc3BlY3RvclBhZ2UoKQogCiAgICAgICAgIHN3 aXRjaCAobV9hdHRhY2htZW50U2lkZSkgewogICAgICAgICBjYXNlIEF0dGFjaG1lbnRTaWRlQm90 dG9tOgotICAgICAgICAgICAgaW5pdGlhbFJlY3QgPSBOU01ha2VSZWN0KDAsIDAsIE5TV2lkdGgo aW5zcGVjdGVkVmlld0ZyYW1lKSwgaW5zcGVjdG9yUGFnZUdyb3VwKCktPnByZWZlcmVuY2VzKCkt Pmluc3BlY3RvckF0dGFjaGVkSGVpZ2h0KCkpOworICAgICAgICAgICAgaW5pdGlhbFJlY3QgPSBO U01ha2VSZWN0KDAsIDAsIE5TV2lkdGgoaW5zcGVjdGVkVmlld0ZyYW1lKSwgaW5zcGVjdG9yUGFn ZUdyb3VwKCktPnByZWZlcmVuY2VzKCkuaW5zcGVjdG9yQXR0YWNoZWRIZWlnaHQoKSk7CiAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBBdHRhY2htZW50U2lkZVJpZ2h0OgotICAgICAg ICAgICAgaW5pdGlhbFJlY3QgPSBOU01ha2VSZWN0KDAsIDAsIGluc3BlY3RvclBhZ2VHcm91cCgp LT5wcmVmZXJlbmNlcygpLT5pbnNwZWN0b3JBdHRhY2hlZFdpZHRoKCksIE5TSGVpZ2h0KGluc3Bl Y3RlZFZpZXdGcmFtZSkpOworICAgICAgICAgICAgaW5pdGlhbFJlY3QgPSBOU01ha2VSZWN0KDAs IDAsIGluc3BlY3RvclBhZ2VHcm91cCgpLT5wcmVmZXJlbmNlcygpLmluc3BlY3RvckF0dGFjaGVk V2lkdGgoKSwgTlNIZWlnaHQoaW5zcGVjdGVkVmlld0ZyYW1lKSk7CiAgICAgICAgICAgICBicmVh azsKICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIGluaXRpYWxSZWN0ID0gTlNNYWtl UmVjdCgwLCAwLCBpbml0aWFsV2luZG93V2lkdGgsIGluaXRpYWxXaW5kb3dIZWlnaHQpOwogCi0g ICAgICAgIE5TU3RyaW5nICp3aW5kb3dGcmFtZVN0cmluZyA9IHBhZ2UoKS0+cGFnZUdyb3VwKCku cHJlZmVyZW5jZXMoKS0+aW5zcGVjdG9yV2luZG93RnJhbWUoKTsKKyAgICAgICAgTlNTdHJpbmcg KndpbmRvd0ZyYW1lU3RyaW5nID0gcGFnZSgpLT5wYWdlR3JvdXAoKS5wcmVmZXJlbmNlcygpLmlu c3BlY3RvcldpbmRvd0ZyYW1lKCk7CiAgICAgICAgIE5TUmVjdCB3aW5kb3dGcmFtZSA9IE5TUmVj dEZyb21TdHJpbmcod2luZG93RnJhbWVTdHJpbmcpOwogICAgICAgICBpZiAoIU5TSXNFbXB0eVJl Y3Qod2luZG93RnJhbWUpKQogICAgICAgICAgICAgaW5pdGlhbFJlY3QgPSBbTlNXaW5kb3cgY29u dGVudFJlY3RGb3JGcmFtZVJlY3Q6d2luZG93RnJhbWUgc3R5bGVNYXNrOndpbmRvd1N0eWxlTWFz a107CkBAIC02MDYsNyArNjA2LDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6d2luZG93RnJh bWVEaWRDaGFuZ2UoKQogICAgICAgICByZXR1cm47CiAKICAgICBOU1N0cmluZyAqZnJhbWVTdHJp bmcgPSBOU1N0cmluZ0Zyb21SZWN0KFttX2luc3BlY3RvcldpbmRvdyBmcmFtZV0pOwotICAgIHBh Z2UoKS0+cGFnZUdyb3VwKCkucHJlZmVyZW5jZXMoKS0+c2V0SW5zcGVjdG9yV2luZG93RnJhbWUo ZnJhbWVTdHJpbmcpOworICAgIHBhZ2UoKS0+cGFnZUdyb3VwKCkucHJlZmVyZW5jZXMoKS5zZXRJ bnNwZWN0b3JXaW5kb3dGcmFtZShmcmFtZVN0cmluZyk7CiB9CiAKIHZvaWQgV2ViSW5zcGVjdG9y UHJveHk6Omluc3BlY3RlZFZpZXdGcmFtZURpZENoYW5nZShDR0Zsb2F0IGN1cnJlbnREaW1lbnNp b24pCkBAIC02ODksMTAgKzY4OSwxMCBAQCB2b2lkIFdlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9y bUF0dGFjaCgpCiAKICAgICBzd2l0Y2ggKG1fYXR0YWNobWVudFNpZGUpIHsKICAgICBjYXNlIEF0 dGFjaG1lbnRTaWRlQm90dG9tOgotICAgICAgICBjdXJyZW50RGltZW5zaW9uID0gaW5zcGVjdG9y UGFnZUdyb3VwKCktPnByZWZlcmVuY2VzKCktPmluc3BlY3RvckF0dGFjaGVkSGVpZ2h0KCk7Cisg ICAgICAgIGN1cnJlbnREaW1lbnNpb24gPSBpbnNwZWN0b3JQYWdlR3JvdXAoKS0+cHJlZmVyZW5j ZXMoKS5pbnNwZWN0b3JBdHRhY2hlZEhlaWdodCgpOwogICAgICAgICBicmVhazsKICAgICBjYXNl IEF0dGFjaG1lbnRTaWRlUmlnaHQ6Ci0gICAgICAgIGN1cnJlbnREaW1lbnNpb24gPSBpbnNwZWN0 b3JQYWdlR3JvdXAoKS0+cHJlZmVyZW5jZXMoKS0+aW5zcGVjdG9yQXR0YWNoZWRXaWR0aCgpOwor ICAgICAgICBjdXJyZW50RGltZW5zaW9uID0gaW5zcGVjdG9yUGFnZUdyb3VwKCktPnByZWZlcmVu Y2VzKCkuaW5zcGVjdG9yQXR0YWNoZWRXaWR0aCgpOwogICAgICAgICBicmVhazsKICAgICB9CiAK