134377 2014-06-26 19:56:37 -0700 [iOS WK2] Fix touch-scrollable elements with overflow:scroll on just one axis, and RTL scrolling 2014-07-08 09:42:18 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bdakin rvmouche simon.fraser thorton zalan oldest_to_newest 1018844 0 simon.fraser 2014-06-26 19:56:37 -0700 [iOS WK2] Fix touch-scrollable elements with overflow:scroll on just one axis, and RTL scrolling 1018845 1 233955 simon.fraser 2014-06-26 20:04:18 -0700 Created attachment 233955 Patch 1018846 2 simon.fraser 2014-06-26 20:04:52 -0700 <rdar://problem/16762224> 1018850 3 233955 thorton 2014-06-26 20:16:56 -0700 Comment on attachment 233955 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233955&action=review > Source/WebCore/WebCore.exp.in:2412 > +__ZN7WebCore32shouldRegisterInsertionUndoGroupEP18NSAttributedString our patches are fighting 1018912 4 rvmouche 2014-06-27 01:10:58 -0700 *** Bug 133002 has been marked as a duplicate of this bug. *** 1019032 5 simon.fraser 2014-06-27 11:29:40 -0700 https://trac.webkit.org/r170541 1021102 6 rvmouche 2014-07-08 09:42:18 -0700 I have a question that I probably can't ask here because of the NDA, so can someone from Apple check rdar://17433693 ? Thanks 233955 2014-06-26 20:04:18 -0700 2014-06-26 20:16:55 -0700 Patch bug-134377-20140626200400.patch text/plain 25497 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNDYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzlkMjNiY2U2OTU2Y2M4 ZjczZjBhNWUwMzRlM2ZlZjM5NjcwMTgwMi4uMzNhMjZlODBiOTA3YTljNTY0MzZlNDFmNzYyZGNl NjAxNmI4NWRiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUxIEBACisyMDE0LTA2LTI2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgV0syXSBG aXggdG91Y2gtc2Nyb2xsYWJsZSBlbGVtZW50cyB3aXRoIG92ZXJmbG93OnNjcm9sbCBvbiBqdXN0 IG9uZSBheGlzLCBhbmQgUlRMIHNjcm9sbGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0Mzc3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjc2 MjIyND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisg ICAgICAgIE1ha2UgLXdlYmtpdC1vdmVyZmxvdy1zY3JvbGxpbmc6dG91Y2ggc2Nyb2xsaW5nIHdv cmsgY29ycmVjdGx5IHdoZW4gb25lIGF4aXMKKyAgICAgICAgaGFzIG92ZXJmbG93OnNjcm9sbCBh bmQgdGhlIG90aGVyIG92ZXJmbG93OmhpZGRlbi4gQWxzbyBmaXggc2Nyb2xsaW5nIGluIFJUTAor ICAgICAgICBjb250ZXh0cy4KKyAgICAgICAgCisgICAgICAgIEFuIFJUTCBzY3JvbGxlciB3aXRo IG92ZXJmbG93LXg6aGlkZGVuIHdpbGwgaGF2ZSBhIG5vbi16ZXJvIHNjcm9sbCBvcmlnaW4sCisg ICAgICAgIGFuZCBuZWVkcyB0byB0cnVuY2F0ZSB0aGUgc2Nyb2xsZWQgY29udGVudCBvbiB0aGUg bGVmdCBzaWRlLiBUbyBwYXNzIHRoZQorICAgICAgICBjb3JyZWN0IGdlb21ldHJ5IHRvIHRoZSBV SSBwcm9jZXNzLCB3ZSBuZWVkIHRvIGludHJvZHVjZSB0aGUgY29uY2VwdCBvZgorICAgICAgICAi cmVhY2hhYmxlIiBzaXplIGFzIHdlbGwgYXMgdG90YWwgY29udGVudCBzaXplOyBub3JtYWxseSB0 aGVzZSBhcmUgdGhlIHNhbWUsCisgICAgICAgIGJ1dCB3aWxsIGRpZmZlciB3aGVuIHNjcm9sbGlu ZyBpcyBvbmx5IGFsbG93ZWQgb24gb25lIGF4aXMgYnV0IHRoZXJlIGlzIG92ZXJmbG93CisgICAg ICAgIG9uIGJvdGggYXhlcy4KKyAgICAgICAgCisgICAgICAgIFRvIGdldCB0aGUgcmVhY2hhYmxl IHNpemUsIGFkZCBSZW5kZXJMYXllcjo6c2Nyb2xsYWJsZUNvbnRlbnRzU2l6ZSgpLgorICAgICAg ICAKKyAgICAgICAgUmVuZGVyTGF5ZXI6OnZpc2libGVTaXplKCkgd2FzIHdyb25nOyB0aGUgZnVu Y3Rpb24gc2hvdWxkIHJldHVybiB0aGUgc2l6ZSBvZiB0aGUgCisgICAgICAgIHNjcm9sbGFibGUg cG9ydGlvbiwgYnV0IHVzZWQgbGF5ZXIgc2l6ZSB3aGljaCBpbmNsdWRlcyBib3JkZXJzLiBGaXgg dG8gdXNlIHBpeGVsU25hcHBlZENsaWVudFdpZHRoKCkvSGVpZ2h0KCksCisgICAgICAgIHdoaWNo IGlzIHdoYXQgd2UgdXNlIGZvciBzY3JvbGxiYXIgY29tcHV0YXRpb25zLgorCisgICAgICAgICog V2ViQ29yZS5leHAuaW46CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdD b29yZGluYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBc3luY1Njcm9sbGluZ0Nvb3JkaW5h dG9yOjpmcmFtZVZpZXdMYXlvdXRVcGRhdGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkFzeW5jU2Ny b2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZSk6CisgICAgICAgIChX ZWJDb3JlOjpBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVPdmVyZmxvd1Njcm9sbGlu Z05vZGUpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmg6 CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xs aW5nU3RhdGVTY3JvbGxpbmdOb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRl U2Nyb2xsaW5nTm9kZTo6c2V0UmVhY2hhYmxlQ29udGVudHNTaXplKToKKyAgICAgICAgKiBwYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUuaDoKKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6cmVhY2hhYmxlQ29udGVudHNTaXplKToK KyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZTo6dXBkYXRlQmVm b3JlQ2hpbGRyZW4pOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3Jv bGxpbmdOb2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9k ZTo6cmVhY2hhYmxlQ29udGVudHNTaXplKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnZpc2libGVTaXplKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzY3JvbGxhYmxlQ29udGVudHNTaXplKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnVwZGF0ZVNjcm9sbGlu Z0xheWVyV2l0aENsaWVudCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0 b3I6OnVwZGF0ZVNjcm9sbENvb3JkaW5hdGVkTGF5ZXIpOgorCiAyMDE0LTA2LTI1ICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1MgV0syXSBGaXhl ZCBwb3NpdGlvbiBlbGVtZW50cyBqdW1wIGFyb3VuZCB3aGVuIHpvb21pbmcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRl eCAwZmMxZjUzNzg3ZGU3MjgyZjc0Mzg5MTIwYzE1OWY3YjcxNjYzZTZiLi5jZmEyYzViNGY0YWI0 Y2RmZTQ4YmFlNjY0NGIzMTNjMTVkMGM5Yzc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAK KzIwMTQtMDYtMjYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAg ICAgICAgW2lPUyBXSzJdIEZpeCB0b3VjaC1zY3JvbGxhYmxlIGVsZW1lbnRzIHdpdGggb3ZlcmZs b3c6c2Nyb2xsIG9uIGp1c3Qgb25lIGF4aXMsIGFuZCBSVEwgc2Nyb2xsaW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQzNzcKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzE2NzYyMjI0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE1ha2UgLXdlYmtpdC1vdmVyZmxvdy1zY3JvbGxpbmc6dG91Y2ggc2Ny b2xsaW5nIHdvcmsgY29ycmVjdGx5IHdoZW4gb25lIGF4aXMKKyAgICAgICAgaGFzIG92ZXJmbG93 OnNjcm9sbCBhbmQgdGhlIG90aGVyIG92ZXJmbG93OmhpZGRlbi4gQWxzbyBmaXggc2Nyb2xsaW5n IGluIFJUTAorICAgICAgICBjb250ZXh0cy4KKyAgICAgICAgCisgICAgICAgIEFuIFJUTCBzY3Jv bGxlciB3aXRoIG92ZXJmbG93LXg6aGlkZGVuIHdpbGwgaGF2ZSBhIG5vbi16ZXJvIHNjcm9sbCBv cmlnaW4sCisgICAgICAgIGFuZCBuZWVkcyB0byB0cnVuY2F0ZSB0aGUgc2Nyb2xsZWQgY29udGVu dCBvbiB0aGUgbGVmdCBzaWRlLiBUbyBwYXNzIHRoZQorICAgICAgICBjb3JyZWN0IGdlb21ldHJ5 IHRvIHRoZSBVSSBwcm9jZXNzLCB3ZSBuZWVkIHRvIGludHJvZHVjZSB0aGUgY29uY2VwdCBvZgor ICAgICAgICAicmVhY2hhYmxlIiBzaXplIGFzIHdlbGwgYXMgdG90YWwgY29udGVudCBzaXplOyBu b3JtYWxseSB0aGVzZSBhcmUgdGhlIHNhbWUsCisgICAgICAgIGJ1dCB3aWxsIGRpZmZlciB3aGVu IHNjcm9sbGluZyBpcyBvbmx5IGFsbG93ZWQgb24gb25lIGF4aXMgYnV0IHRoZXJlIGlzIG92ZXJm bG93CisgICAgICAgIG9uIGJvdGggYXhlcy4KKyAgICAgICAgCisgICAgICAgIFNjcm9sbGluZ1Ry ZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJT1M6OnVwZGF0ZUFmdGVyQ2hpbGRyZW4oKSB1c2VzIHRo ZSB0b3RhbCBhbmQKKyAgICAgICAgcmVhY2hhYmxlIGNvbnRlbnQgc2l6ZXMgdG8gc2V0IGEgbmVn YXRpdmUgZWRnZSBpbnNldCBvbiB0aGUgbGVmdCAoZm9yIFJUTCkgb3IgdG9wCisgICAgICAgIChm b3IgYm90dG9tLXRvLXRvcCkgc28gcHJldmVudCBzY3JvbGxpbmcgaW50byB0aGVzZSBhcmVhcy4K KworICAgICAgICAqIFNoYXJlZC9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JU cmFuc2FjdGlvbi5jcHA6CisgICAgICAgIChBcmd1bWVudENvZGVyPFNjcm9sbGluZ1N0YXRlU2Ny b2xsaW5nTm9kZT46OmVuY29kZSk6CisgICAgICAgIChBcmd1bWVudENvZGVyPFNjcm9sbGluZ1N0 YXRlU2Nyb2xsaW5nTm9kZT46OmRlY29kZSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVNjcm9s bGluZ1RyZWVUZXh0U3RyZWFtOjpkdW1wKToKKyAgICAgICAgKiBVSVByb2Nlc3MvU2Nyb2xsaW5n L2lvcy9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TLm1tOgorICAgICAgICAo V2ViS2l0OjpTY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TOjp1cGRhdGVBZnRl ckNoaWxkcmVuKTogCisKIDIwMTQtMDYtMjUgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBh cHBsZS5jb20+CiAKICAgICAgICAgW2lPUyBXSzJdIFBhZ2UganVtcHMgd2hlbiBydWJiZXItYmFu ZGluZyBvbiBhenVyZW1hZ2F6aW5lLmNvbSAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggZmRlZTI5 MWMwMWFiOWMwZjExZWMwZjk4ZDZhYjZkOTQyZTNkNzEyNS4uNDRiNjQ3MzNhNmM3YjUyMzExN2Fm OGVjNTE3ODViZjVhNjYzYTU4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5l eHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTI0MDgsNiArMjQw OCwxMSBAQCBfX1pON1dlYkNvcmU3SW50U2l6ZUMxRVJLN19OU1NpemUKIF9fWk5LN1dlYkNvcmU3 SW50U2l6ZWN2N19OU1NpemVFdgogI2VuZGlmCiAKKyNpZiBQTEFURk9STShNQUMpICYmIF9fTUFD X09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxMDAKK19fWk43V2ViQ29yZTMyc2hvdWxk UmVnaXN0ZXJJbnNlcnRpb25VbmRvR3JvdXBFUDE4TlNBdHRyaWJ1dGVkU3RyaW5nCitfX1pON1dl YkNvcmU0NHJlZ2lzdGVySW5zZXJ0aW9uVW5kb0dyb3VwaW5nV2l0aFVuZG9NYW5hZ2VyRVAxM05T VW5kb01hbmFnZXIKKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZF UlNJT05fTUlOX1JFUVVJUkVEID49IDEwODAKIF9fWk43V2ViQ29yZTI0VGV4dEFsdGVybmF0aXZl V2l0aFJhbmdlQzFFUDE4TlNUZXh0QWx0ZXJuYXRpdmVzOF9OU1JhbmdlCiBfX1pON1dlYkNvcmUy N0FsdGVybmF0aXZlVGV4dFVJQ29udHJvbGxlcjE1YWRkQWx0ZXJuYXRpdmVzRVJLTjNXVEY5UmV0 YWluUHRySTE4TlNUZXh0QWx0ZXJuYXRpdmVzRUUKQEAgLTI0MjcsMTEgKzI0MzIsNiBAQCBfd2tO U1JlYm91bmREZWx0YUZvckVsYXN0aWNEZWx0YQogX3drQ3JlYXRlTWVtb3J5U3RhdHVzUHJlc3N1 cmVDcml0aWNhbERpc3BhdGNoT25NYWluUXVldWUKICNlbmRpZgogCi0jaWYgUExBVEZPUk0oTUFD KSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwCi1fX1pON1dlYkNv cmUzMnNob3VsZFJlZ2lzdGVySW5zZXJ0aW9uVW5kb0dyb3VwRVAxOE5TQXR0cmlidXRlZFN0cmlu ZwotX19aTjdXZWJDb3JlNDRyZWdpc3Rlckluc2VydGlvblVuZG9Hcm91cGluZ1dpdGhVbmRvTWFu YWdlckVQMTNOU1VuZG9NYW5hZ2VyCi0jZW5kaWYKLQogI2lmIFBMQVRGT1JNKE1BQykgfHwgUExB VEZPUk0oSU9TX1NJTVVMQVRPUikKIF93a1NldENyYXNoUmVwb3J0QXBwbGljYXRpb25TcGVjaWZp Y0luZm9ybWF0aW9uCiAjZW5kaWYKQEAgLTI4ODEsNiArMjg4MSw3IEBAIF9fWk43V2ViQ29yZTI3 U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlMTVzZXRTY3JvbGxPcmlnaW5FUktOU184SW50UG9p bnRFCiBfX1pON1dlYkNvcmUyN1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTE3c2V0U2Nyb2xs UG9zaXRpb25FUktOU18xMEZsb2F0UG9pbnRFCiBfX1pON1dlYkNvcmUyN1Njcm9sbGluZ1N0YXRl U2Nyb2xsaW5nTm9kZTIwc2V0VG90YWxDb250ZW50c1NpemVFUktOU185RmxvYXRTaXplRQogX19a TjdXZWJDb3JlMjdTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUyMXNldFNjcm9sbGFibGVBcmVh U2l6ZUVSS05TXzlGbG9hdFNpemVFCitfX1pON1dlYkNvcmUyN1Njcm9sbGluZ1N0YXRlU2Nyb2xs aW5nTm9kZTI0c2V0UmVhY2hhYmxlQ29udGVudHNTaXplRVJLTlNfOUZsb2F0U2l6ZUUKIF9fWk43 V2ViQ29yZTI3U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlMjZzZXRSZXF1ZXN0ZWRTY3JvbGxQ b3NpdGlvbkVSS05TXzEwRmxvYXRQb2ludEViCiBfX1pON1dlYkNvcmUyN1Njcm9sbGluZ1N0YXRl U2Nyb2xsaW5nTm9kZTI3c2V0U2Nyb2xsYWJsZUFyZWFQYXJhbWV0ZXJzRVJLTlNfMjRTY3JvbGxh YmxlQXJlYVBhcmFtZXRlcnNFCiBfX1pON1dlYkNvcmUzMlNjcm9sbGluZ1N0YXRlRnJhbWVTY3Jv bGxpbmdOb2RlMTRzZXRGb290ZXJMYXllckVSS05TXzE5TGF5ZXJSZXByZXNlbnRhdGlvbkUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29v cmRpbmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxp bmdDb29yZGluYXRvci5jcHAKaW5kZXggODA4NzkwMmZhYzgzODUyYmEzYWM2MzQyMDZmNjliNTAx MTdiZGMxZS4uNjQ4MDkzYTRkZjNlMTFjZjJjNjIwZWE5MjU2YWI4OTljYjA4OTM2OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGlu YXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxp bmdDb29yZGluYXRvci5jcHAKQEAgLTk0LDYgKzk0LDcgQEAgdm9pZCBBc3luY1Njcm9sbGluZ0Nv b3JkaW5hdG9yOjpmcmFtZVZpZXdMYXlvdXRVcGRhdGVkKEZyYW1lVmlldyogZnJhbWVWaWV3KQog ICAgIG5vZGUtPnNldFNjcm9sbE9yaWdpbihmcmFtZVZpZXctPnNjcm9sbE9yaWdpbigpKTsKICAg ICBub2RlLT5zZXRTY3JvbGxhYmxlQXJlYVNpemUoZnJhbWVWaWV3LT52aXNpYmxlQ29udGVudFJl Y3QoKS5zaXplKCkpOwogICAgIG5vZGUtPnNldFRvdGFsQ29udGVudHNTaXplKGZyYW1lVmlldy0+ dG90YWxDb250ZW50c1NpemUoKSk7CisgICAgbm9kZS0+c2V0UmVhY2hhYmxlQ29udGVudHNTaXpl KGZyYW1lVmlldy0+dG90YWxDb250ZW50c1NpemUoKSk7CiAKICAgICBTY3JvbGxhYmxlQXJlYVBh cmFtZXRlcnMgc2Nyb2xsUGFyYW1ldGVyczsKICAgICBzY3JvbGxQYXJhbWV0ZXJzLmhvcml6b250 YWxTY3JvbGxFbGFzdGljaXR5ID0gZnJhbWVWaWV3LT5ob3Jpem9udGFsU2Nyb2xsRWxhc3RpY2l0 eSgpOwpAQCAtMzc1LDYgKzM3Niw3IEBAIHZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6 dXBkYXRlRnJhbWVTY3JvbGxpbmdOb2RlKFNjcm9sbGluZ05vZGVJRCBub2RlSUQsCiAgICAgICAg IG5vZGUtPnNldFNjcm9sbE9yaWdpbihzY3JvbGxpbmdHZW9tZXRyeS0+c2Nyb2xsT3JpZ2luKTsK ICAgICAgICAgbm9kZS0+c2V0U2Nyb2xsUG9zaXRpb24oc2Nyb2xsaW5nR2VvbWV0cnktPnNjcm9s bFBvc2l0aW9uKTsKICAgICAgICAgbm9kZS0+c2V0VG90YWxDb250ZW50c1NpemUoc2Nyb2xsaW5n R2VvbWV0cnktPmNvbnRlbnRTaXplKTsKKyAgICAgICAgbm9kZS0+c2V0UmVhY2hhYmxlQ29udGVu dHNTaXplKHNjcm9sbGluZ0dlb21ldHJ5LT5yZWFjaGFibGVDb250ZW50U2l6ZSk7CiAgICAgICAg IG5vZGUtPnNldFNjcm9sbGFibGVBcmVhU2l6ZShzY3JvbGxpbmdHZW9tZXRyeS0+c2Nyb2xsYWJs ZUFyZWFTaXplKTsKICAgICB9CiB9CkBAIC0zOTMsNiArMzk1LDcgQEAgdm9pZCBBc3luY1Njcm9s bGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGUoU2Nyb2xsaW5nTm9k ZUlEIG5vZGUKICAgICAgICAgbm9kZS0+c2V0U2Nyb2xsT3JpZ2luKHNjcm9sbGluZ0dlb21ldHJ5 LT5zY3JvbGxPcmlnaW4pOwogICAgICAgICBub2RlLT5zZXRTY3JvbGxQb3NpdGlvbihzY3JvbGxp bmdHZW9tZXRyeS0+c2Nyb2xsUG9zaXRpb24pOwogICAgICAgICBub2RlLT5zZXRUb3RhbENvbnRl bnRzU2l6ZShzY3JvbGxpbmdHZW9tZXRyeS0+Y29udGVudFNpemUpOworICAgICAgICBub2RlLT5z ZXRSZWFjaGFibGVDb250ZW50c1NpemUoc2Nyb2xsaW5nR2VvbWV0cnktPnJlYWNoYWJsZUNvbnRl bnRTaXplKTsKICAgICAgICAgbm9kZS0+c2V0U2Nyb2xsYWJsZUFyZWFTaXplKHNjcm9sbGluZ0dl b21ldHJ5LT5zY3JvbGxhYmxlQXJlYVNpemUpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmggYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oCmluZGV4IGZlZTI5 YTg3MjQ2NmMwYTUxYWU5N2Q1MmQzNzY0N2I1ZTYzNzc3YzIuLmU1NWIxZWI3Y2Q2NGVmN2Y0M2E0 NWRjZjcxZDdiNTczZGYzZjkxZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaApAQCAtMTYxLDYgKzE2MSw3IEBAIHB1Ymxp YzoKICAgICBzdHJ1Y3QgU2Nyb2xsaW5nR2VvbWV0cnkgewogICAgICAgICBGbG9hdFNpemUgc2Ny b2xsYWJsZUFyZWFTaXplOwogICAgICAgICBGbG9hdFNpemUgY29udGVudFNpemU7CisgICAgICAg IEZsb2F0U2l6ZSByZWFjaGFibGVDb250ZW50U2l6ZTsgLy8gU21hbGxlciB0aGFuIGNvbnRlbnRT aXplIHdoZW4gb3ZlcmZsb3cgaXMgaGlkZGVuIG9uIG9uZSBheGlzLgogICAgICAgICBGbG9hdFBv aW50IHNjcm9sbFBvc2l0aW9uOwogICAgICAgICBJbnRQb2ludCBzY3JvbGxPcmlnaW47CiAgICAg fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0 YXRlU2Nyb2xsaW5nTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUuY3BwCmluZGV4IGFmM2YzNzIzYmY5MzYyZmU0OWQxYzRk ZGI5MDk2MmIyZDM4NzllOTguLmQ5MzM3NGU4YzczODJlYjFhMDI0NGRhYTJkZTRkM2FlMDlhMTgw NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0 YXRlU2Nyb2xsaW5nTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlLmNwcApAQCAtNDQsNiArNDQsNyBAQCBTY3JvbGxp bmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZShjb25zdCBT Y3JvbGxpbmdTdGF0ZVNjcgogICAgIDogU2Nyb2xsaW5nU3RhdGVOb2RlKHN0YXRlTm9kZSwgYWRv cHRpdmVUcmVlKQogICAgICwgbV9zY3JvbGxhYmxlQXJlYVNpemUoc3RhdGVOb2RlLnNjcm9sbGFi bGVBcmVhU2l6ZSgpKQogICAgICwgbV90b3RhbENvbnRlbnRzU2l6ZShzdGF0ZU5vZGUudG90YWxD b250ZW50c1NpemUoKSkKKyAgICAsIG1fcmVhY2hhYmxlQ29udGVudHNTaXplKHN0YXRlTm9kZS5y ZWFjaGFibGVDb250ZW50c1NpemUoKSkKICAgICAsIG1fc2Nyb2xsUG9zaXRpb24oc3RhdGVOb2Rl LnNjcm9sbFBvc2l0aW9uKCkpCiAgICAgLCBtX3JlcXVlc3RlZFNjcm9sbFBvc2l0aW9uKHN0YXRl Tm9kZS5yZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbigpKQogICAgICwgbV9zY3JvbGxPcmlnaW4oc3Rh dGVOb2RlLnNjcm9sbE9yaWdpbigpKQpAQCAtNzQsNiArNzUsMTUgQEAgdm9pZCBTY3JvbGxpbmdT dGF0ZVNjcm9sbGluZ05vZGU6OnNldFRvdGFsQ29udGVudHNTaXplKGNvbnN0IEZsb2F0U2l6ZSYg dG90YWxDb24KICAgICBzZXRQcm9wZXJ0eUNoYW5nZWQoVG90YWxDb250ZW50c1NpemUpOwogfQog Cit2b2lkIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6c2V0UmVhY2hhYmxlQ29udGVudHNT aXplKGNvbnN0IEZsb2F0U2l6ZSYgcmVhY2hhYmxlQ29udGVudHNTaXplKQoreworICAgIGlmICht X3JlYWNoYWJsZUNvbnRlbnRzU2l6ZSA9PSByZWFjaGFibGVDb250ZW50c1NpemUpCisgICAgICAg IHJldHVybjsKKworICAgIG1fcmVhY2hhYmxlQ29udGVudHNTaXplID0gcmVhY2hhYmxlQ29udGVu dHNTaXplOworICAgIHNldFByb3BlcnR5Q2hhbmdlZChSZWFjaGFibGVDb250ZW50c1NpemUpOwor fQorCiB2b2lkIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6c2V0U2Nyb2xsUG9zaXRpb24o Y29uc3QgRmxvYXRQb2ludCYgc2Nyb2xsUG9zaXRpb24pCiB7CiAgICAgaWYgKG1fc2Nyb2xsUG9z aXRpb24gPT0gc2Nyb2xsUG9zaXRpb24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUuaCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5oCmluZGV4IDM1ZGRm ZmViMTQ1ODQyYzIxMGY3OGU5MWEwNTQ2ZThjOTJlMjI4YzAuLjlmMmQwYTljZjk5YzFlZjliZmYx MDcwMDJlM2VhNzNjMDhlZjA3MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5oCkBAIC00Miw2ICs0 Miw3IEBAIHB1YmxpYzoKICAgICBlbnVtIENoYW5nZWRQcm9wZXJ0eSB7CiAgICAgICAgIFNjcm9s bGFibGVBcmVhU2l6ZSA9IE51bVN0YXRlTm9kZUJpdHMsCiAgICAgICAgIFRvdGFsQ29udGVudHNT aXplLAorICAgICAgICBSZWFjaGFibGVDb250ZW50c1NpemUsCiAgICAgICAgIFNjcm9sbFBvc2l0 aW9uLAogICAgICAgICBTY3JvbGxPcmlnaW4sCiAgICAgICAgIFNjcm9sbGFibGVBcmVhUGFyYW1z LApAQCAtNTUsNiArNTYsOSBAQCBwdWJsaWM6CiAgICAgY29uc3QgRmxvYXRTaXplJiB0b3RhbENv bnRlbnRzU2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdG90YWxDb250ZW50c1NpemU7IH0KICAgICB2 b2lkIHNldFRvdGFsQ29udGVudHNTaXplKGNvbnN0IEZsb2F0U2l6ZSYpOwogCisgICAgY29uc3Qg RmxvYXRTaXplJiByZWFjaGFibGVDb250ZW50c1NpemUoKSBjb25zdCB7IHJldHVybiBtX3JlYWNo YWJsZUNvbnRlbnRzU2l6ZTsgfQorICAgIHZvaWQgc2V0UmVhY2hhYmxlQ29udGVudHNTaXplKGNv bnN0IEZsb2F0U2l6ZSYpOworCiAgICAgY29uc3QgRmxvYXRQb2ludCYgc2Nyb2xsUG9zaXRpb24o KSBjb25zdCB7IHJldHVybiBtX3Njcm9sbFBvc2l0aW9uOyB9CiAgICAgdm9pZCBzZXRTY3JvbGxQ b3NpdGlvbihjb25zdCBGbG9hdFBvaW50Jik7CiAKQEAgLTc3LDYgKzgxLDcgQEAgcHJvdGVjdGVk OgogcHJpdmF0ZToKICAgICBGbG9hdFNpemUgbV9zY3JvbGxhYmxlQXJlYVNpemU7CiAgICAgRmxv YXRTaXplIG1fdG90YWxDb250ZW50c1NpemU7CisgICAgRmxvYXRTaXplIG1fcmVhY2hhYmxlQ29u dGVudHNTaXplOwogICAgIEZsb2F0UG9pbnQgbV9zY3JvbGxQb3NpdGlvbjsKICAgICBGbG9hdFBv aW50IG1fcmVxdWVzdGVkU2Nyb2xsUG9zaXRpb247CiAgICAgSW50UG9pbnQgbV9zY3JvbGxPcmln aW47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdU cmVlU2Nyb2xsaW5nTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5jcHAKaW5kZXggMmY2NmI2ZDk5ZWE5MmZmMDlmNTVhMmI5 NWU1MTUyZDM5NGZjNWRlNC4uNzc2ZjUyZTRjNjQ3MjAwMWU3OWYzNjM2MDM0OGRlYTdmY2ZhNmQ0 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJl ZVNjcm9sbGluZ05vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcApAQCAtNTgsNiArNTgsOSBAQCB2b2lkIFNjcm9s bGluZ1RyZWVTY3JvbGxpbmdOb2RlOjp1cGRhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBTY3JvbGxp bmdTdGF0ZU5vZGUmCiAgICAgICAgIG1fdG90YWxDb250ZW50c1NpemUgPSBzdGF0ZS50b3RhbENv bnRlbnRzU2l6ZSgpOwogICAgIH0KIAorICAgIGlmIChzdGF0ZS5oYXNDaGFuZ2VkUHJvcGVydHko U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpSZWFjaGFibGVDb250ZW50c1NpemUpKQorICAg ICAgICBtX3JlYWNoYWJsZUNvbnRlbnRzU2l6ZSA9IHN0YXRlLnJlYWNoYWJsZUNvbnRlbnRzU2l6 ZSgpOworCiAgICAgaWYgKHN0YXRlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNj cm9sbGluZ05vZGU6OlNjcm9sbFBvc2l0aW9uKSkKICAgICAgICAgbV9sYXN0Q29tbWl0dGVkU2Ny b2xsUG9zaXRpb24gPSBzdGF0ZS5zY3JvbGxQb3NpdGlvbigpOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5oIGIv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUu aAppbmRleCBhMzZiNzc5NTNlYjVkNWQxMmUwMmU4NDIxNzkyMjkxNmMyNWU3MDI0Li5mYzljNGU5 YThiMzY3ZDQ2ODRmNDRiNWNkMjEyY2E1ZDIwNmM1Y2NlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmgK QEAgLTY5LDYgKzY5LDcgQEAgcHJvdGVjdGVkOgogICAgIEZsb2F0UG9pbnQgbGFzdENvbW1pdHRl ZFNjcm9sbFBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9sYXN0Q29tbWl0dGVkU2Nyb2xsUG9z aXRpb247IH0KICAgICBjb25zdCBGbG9hdFNpemUmIHNjcm9sbGFibGVBcmVhU2l6ZSgpIGNvbnN0 IHsgcmV0dXJuIG1fc2Nyb2xsYWJsZUFyZWFTaXplOyB9CiAgICAgY29uc3QgRmxvYXRTaXplJiB0 b3RhbENvbnRlbnRzU2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdG90YWxDb250ZW50c1NpemU7IH0K KyAgICBjb25zdCBGbG9hdFNpemUmIHJlYWNoYWJsZUNvbnRlbnRzU2l6ZSgpIGNvbnN0IHsgcmV0 dXJuIG1fcmVhY2hhYmxlQ29udGVudHNTaXplOyB9CiAgICAgY29uc3QgSW50UG9pbnQmIHNjcm9s bE9yaWdpbigpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsT3JpZ2luOyB9CiAKICAgICAvLyBJZiB0 aGUgdG90YWxDb250ZW50c1NpemUgY2hhbmdlcyBpbiB0aGUgbWlkZGxlIG9mIGEgcnViYmVyLWJh bmQsIHdlIHN0aWxsIHdhbnQgdG8gdXNlIHRoZSBvbGQgdG90YWxDb250ZW50c1NpemUgZm9yIHRo ZSBzYWtlIG9mCkBAIC04OSw2ICs5MCw3IEBAIHByaXZhdGU6CiAgICAgRmxvYXRTaXplIG1fc2Ny b2xsYWJsZUFyZWFTaXplOwogICAgIEZsb2F0U2l6ZSBtX3RvdGFsQ29udGVudHNTaXplOwogICAg IEZsb2F0U2l6ZSBtX3RvdGFsQ29udGVudHNTaXplRm9yUnViYmVyQmFuZDsKKyAgICBGbG9hdFNp emUgbV9yZWFjaGFibGVDb250ZW50c1NpemU7CiAgICAgRmxvYXRQb2ludCBtX2xhc3RDb21taXR0 ZWRTY3JvbGxQb3NpdGlvbjsKICAgICBJbnRQb2ludCBtX3Njcm9sbE9yaWdpbjsKICAgICAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IGM2MWMwNmYyZWQwNjMw ODVkYzM3YjJhYzcwZTE0NDJlMGNlZmFjZjIuLmNmMWM4NmI0NzcyYjFmMzFlYWE0OWEwNGZhYjM4 ZGQxNjUwMGQwODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApA QCAtMjczNCwxMSArMjczNCwzMiBAQCBJbnRQb2ludCBSZW5kZXJMYXllcjo6Y29udmVydEZyb21D b250YWluaW5nVmlld1RvU2Nyb2xsYmFyKGNvbnN0IFNjcm9sbGJhciogc2NybwogICAgIHJldHVy biBwb2ludDsKIH0KIAorSW50U2l6ZSBSZW5kZXJMYXllcjo6dmlzaWJsZVNpemUoKSBjb25zdAor eworICAgIGlmICghcmVuZGVyZXIoKS5pc0JveCgpKQorICAgICAgICByZXR1cm4gSW50U2l6ZSgp OworCisgICAgcmV0dXJuIEludFNpemUocmVuZGVyQm94KCktPnBpeGVsU25hcHBlZENsaWVudFdp ZHRoKCksIHJlbmRlckJveCgpLT5waXhlbFNuYXBwZWRDbGllbnRIZWlnaHQoKSk7Cit9CisKIElu dFNpemUgUmVuZGVyTGF5ZXI6OmNvbnRlbnRzU2l6ZSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIElu dFNpemUoc2Nyb2xsV2lkdGgoKSwgc2Nyb2xsSGVpZ2h0KCkpOwogfQogCitJbnRTaXplIFJlbmRl ckxheWVyOjpzY3JvbGxhYmxlQ29udGVudHNTaXplKCkgY29uc3QKK3sKKyAgICBJbnRTaXplIGNv bnRlbnRzU2l6ZSA9IHRoaXMtPmNvbnRlbnRzU2l6ZSgpOworCisgICAgaWYgKCFoYXNTY3JvbGxh YmxlSG9yaXpvbnRhbE92ZXJmbG93KCkpCisgICAgICAgIGNvbnRlbnRzU2l6ZS5zZXRXaWR0aChz dGQ6Om1pbihjb250ZW50c1NpemUud2lkdGgoKSwgdmlzaWJsZVNpemUoKS53aWR0aCgpKSk7CisK KyAgICBpZiAoIWhhc1Njcm9sbGFibGVWZXJ0aWNhbE92ZXJmbG93KCkpCisgICAgICAgIGNvbnRl bnRzU2l6ZS5zZXRIZWlnaHQoc3RkOjptaW4oY29udGVudHNTaXplLmhlaWdodCgpLCB2aXNpYmxl U2l6ZSgpLmhlaWdodCgpKSk7CisKKyAgICByZXR1cm4gY29udGVudHNTaXplOworfQorCiBib29s IFJlbmRlckxheWVyOjpzaG91bGRTdXNwZW5kU2Nyb2xsQW5pbWF0aW9ucygpIGNvbnN0CiB7CiAg ICAgcmV0dXJuIHJlbmRlcmVyKCkudmlldygpLmZyYW1lVmlldygpLnNob3VsZFN1c3BlbmRTY3Jv bGxBbmltYXRpb25zKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4 IDc0ZjhjMmUwMzUxODZmNmQzMzZkZmQ2ZWQ2OTZkZTY2ZjgzYTZjMmYuLmZlYmM2Y2YxZDYwMzE5 MTUwN2QxZTdjZGZlNTQzN2I0OTU0NmJmOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5oCkBAIC0zNDQsNyArMzQ0LDcgQEAgcHVibGljOgogICAgIFN0cmluZyBuYW1lKCkg Y29uc3Q7CiAKICAgICBSZW5kZXJMYXllck1vZGVsT2JqZWN0JiByZW5kZXJlcigpIGNvbnN0IHsg cmV0dXJuIG1fcmVuZGVyZXI7IH0KLSAgICBSZW5kZXJCb3gqIHJlbmRlckJveCgpIGNvbnN0IHsg cmV0dXJuIHJlbmRlcmVyKCkuaXNCb3goKSA/ICZ0b1JlbmRlckJveChyZW5kZXJlcigpKSA6IDA7 IH0KKyAgICBSZW5kZXJCb3gqIHJlbmRlckJveCgpIGNvbnN0IHsgcmV0dXJuIHJlbmRlcmVyKCku aXNCb3goKSA/ICZ0b1JlbmRlckJveChyZW5kZXJlcigpKSA6IG51bGxwdHI7IH0KICAgICBSZW5k ZXJMYXllciogcGFyZW50KCkgY29uc3QgeyByZXR1cm4gbV9wYXJlbnQ7IH0KICAgICBSZW5kZXJM YXllciogcHJldmlvdXNTaWJsaW5nKCkgY29uc3QgeyByZXR1cm4gbV9wcmV2aW91czsgfQogICAg IFJlbmRlckxheWVyKiBuZXh0U2libGluZygpIGNvbnN0IHsgcmV0dXJuIG1fbmV4dDsgfQpAQCAt NDIwLDYgKzQyMCw3IEBAIHB1YmxpYzoKICAgICBpbnQgc2Nyb2xsWE9mZnNldCgpIGNvbnN0IHsg cmV0dXJuIG1fc2Nyb2xsT2Zmc2V0LndpZHRoKCkgKyBzY3JvbGxPcmlnaW4oKS54KCk7IH0KICAg ICBpbnQgc2Nyb2xsWU9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsT2Zmc2V0LmhlaWdo dCgpICsgc2Nyb2xsT3JpZ2luKCkueSgpOyB9CiAgICAgSW50U2l6ZSBzY3JvbGxPZmZzZXQoKSBj b25zdCB7IHJldHVybiBJbnRTaXplKHNjcm9sbFhPZmZzZXQoKSwgc2Nyb2xsWU9mZnNldCgpKTsg fQorICAgIEludFNpemUgc2Nyb2xsYWJsZUNvbnRlbnRzU2l6ZSgpIGNvbnN0OwogCiAgICAgdm9p ZCBzY3JvbGxSZWN0VG9WaXNpYmxlKGNvbnN0IExheW91dFJlY3QmLCBjb25zdCBTY3JvbGxBbGln bm1lbnQmIGFsaWduWCwgY29uc3QgU2Nyb2xsQWxpZ25tZW50JiBhbGlnblkpOwogCkBAIC0xMDc3 LDcgKzEwNzgsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgSW50UG9pbnQgbWluaW11bVNjcm9s bFBvc2l0aW9uKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBJbnRQb2ludCBtYXhpbXVt U2Nyb2xsUG9zaXRpb24oKSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIEludFJlY3Qgdmlz aWJsZUNvbnRlbnRSZWN0SW50ZXJuYWwoVmlzaWJsZUNvbnRlbnRSZWN0SW5jbHVkZXNTY3JvbGxi YXJzLCBWaXNpYmxlQ29udGVudFJlY3RCZWhhdmlvcikgY29uc3Qgb3ZlcnJpZGU7Ci0gICAgdmly dHVhbCBJbnRTaXplIHZpc2libGVTaXplKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gbV9sYXll clNpemU7IH0KKyAgICB2aXJ0dWFsIEludFNpemUgdmlzaWJsZVNpemUoKSBjb25zdCBvdmVycmlk ZTsKICAgICB2aXJ0dWFsIEludFNpemUgY29udGVudHNTaXplKCkgY29uc3Qgb3ZlcnJpZGU7CiAg ICAgdmlydHVhbCBJbnRTaXplIG92ZXJoYW5nQW1vdW50KCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAg dmlydHVhbCBJbnRQb2ludCBsYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkgY29uc3Qgb3ZlcnJpZGU7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3Iu Y3BwCmluZGV4IGY5MGM3NDkyNDk3MzY3ZjYzNmYyN2JiYWQ4YTk1NjVkNmI4M2IzNDMuLjhlYzE0 NDc0MjBmNjVkNDkwMjM3MGI5MDhiZjZkY2IxODA0NWU5MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC01MDgsNyArNTA4 LDcgQEAgc3RhdGljIHZvaWQgdXBkYXRlU2Nyb2xsaW5nTGF5ZXJXaXRoQ2xpZW50KFJlbmRlckxh eWVyJiBsYXllciwgQ2hyb21lQ2xpZW50KiBjbGkKICAgICBib29sIGFsbG93SG9yaXpvbnRhbFNj cm9sbGJhciA9ICFzY3JvbGxiYXJIYXNEaXNwbGF5Tm9uZShsYXllci5ob3Jpem9udGFsU2Nyb2xs YmFyKCkpOwogICAgIGJvb2wgYWxsb3dWZXJ0aWNhbFNjcm9sbGJhciA9ICFzY3JvbGxiYXJIYXNE aXNwbGF5Tm9uZShsYXllci52ZXJ0aWNhbFNjcm9sbGJhcigpKTsKICAgICBjbGllbnQtPmFkZE9y VXBkYXRlU2Nyb2xsaW5nTGF5ZXIobGF5ZXIucmVuZGVyZXIoKS5lbGVtZW50KCksIGJhY2tpbmct PnNjcm9sbGluZ0xheWVyKCktPnBsYXRmb3JtTGF5ZXIoKSwgYmFja2luZy0+c2Nyb2xsaW5nQ29u dGVudHNMYXllcigpLT5wbGF0Zm9ybUxheWVyKCksCi0gICAgICAgIEludFNpemUobGF5ZXIuc2Ny b2xsV2lkdGgoKSwgbGF5ZXIuc2Nyb2xsSGVpZ2h0KCkpLCBhbGxvd0hvcml6b250YWxTY3JvbGxi YXIsIGFsbG93VmVydGljYWxTY3JvbGxiYXIpOworICAgICAgICBsYXllci5zY3JvbGxhYmxlQ29u dGVudHNTaXplKCksIGFsbG93SG9yaXpvbnRhbFNjcm9sbGJhciwgYWxsb3dWZXJ0aWNhbFNjcm9s bGJhcik7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDdXN0b21MYXll cnNBZnRlckZsdXNoKCkKQEAgLTM3MzksNyArMzczOSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21w b3NpdG9yOjp1cGRhdGVTY3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiBsYXllciwg U2NyCiAgICAgICAgIGlmIChpc1Jvb3RMYXllcikKICAgICAgICAgICAgIHVwZGF0ZVNjcm9sbENv b3JkaW5hdGlvbkZvclRoaXNGcmFtZShwYXJlbnROb2RlSUQpOwogICAgICAgICBlbHNlIHsKLSAg ICAgICAgICAgIFNjcm9sbGluZ05vZGVUeXBlIG5vZGVUeXBlID0gaXNSb290TGF5ZXIgPyBGcmFt ZVNjcm9sbGluZ05vZGUgOiBPdmVyZmxvd1Njcm9sbGluZ05vZGU7CisgICAgICAgICAgICBTY3Jv bGxpbmdOb2RlVHlwZSBub2RlVHlwZSA9IE92ZXJmbG93U2Nyb2xsaW5nTm9kZTsKICAgICAgICAg ICAgIFNjcm9sbGluZ05vZGVJRCBub2RlSUQgPSBhdHRhY2hTY3JvbGxpbmdOb2RlKGxheWVyLCBu b2RlVHlwZSwgcGFyZW50Tm9kZUlEKTsKICAgICAgICAgICAgIGlmICghbm9kZUlEKQogICAgICAg ICAgICAgICAgIHJldHVybjsKQEAgLTM3NDksNiArMzc0OSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJD b21wb3NpdG9yOjp1cGRhdGVTY3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiBsYXll ciwgU2NyCiAgICAgICAgICAgICBzY3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxQb3NpdGlvbiA9IGxh eWVyLnNjcm9sbFBvc2l0aW9uKCk7CiAgICAgICAgICAgICBzY3JvbGxpbmdHZW9tZXRyeS5zY3Jv bGxhYmxlQXJlYVNpemUgPSBsYXllci52aXNpYmxlU2l6ZSgpOwogICAgICAgICAgICAgc2Nyb2xs aW5nR2VvbWV0cnkuY29udGVudFNpemUgPSBsYXllci5jb250ZW50c1NpemUoKTsKKyAgICAgICAg ICAgIHNjcm9sbGluZ0dlb21ldHJ5LnJlYWNoYWJsZUNvbnRlbnRTaXplID0gbGF5ZXIuc2Nyb2xs YWJsZUNvbnRlbnRzU2l6ZSgpOwogICAgICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnVw ZGF0ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZShub2RlSUQsIGJhY2tpbmctPnNjcm9sbGluZ0xheWVy KCksIGJhY2tpbmctPnNjcm9sbGluZ0NvbnRlbnRzTGF5ZXIoKSwgJnNjcm9sbGluZ0dlb21ldHJ5 KTsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9T Y3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JUcmFuc2FjdGlvbi5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yVHJh bnNhY3Rpb24uY3BwCmluZGV4IGY5ZDI4YjI1OTFmMGEzZjEwZDI0ZTBlZTQ2OGRiOWNhY2NjMjUy ZjUuLjk2ODdmZjQyNTc4YWJlZmZjNDhkNTQxN2U2MTFiYjBkOGVjNzUxZTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0 b3JUcmFuc2FjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1Njcm9sbGluZy9S ZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclRyYW5zYWN0aW9uLmNwcApAQCAtMTI1LDYgKzEyNSw3 IEBAIHZvaWQgQXJndW1lbnRDb2RlcjxTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU+OjplbmNv ZGUoQXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyCiAgICAgCiAgICAgU0NST0xMSU5HX05PREVfRU5D T0RFKFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsYWJsZUFyZWFTaXplLCBzY3Jv bGxhYmxlQXJlYVNpemUpCiAgICAgU0NST0xMSU5HX05PREVfRU5DT0RFKFNjcm9sbGluZ1N0YXRl U2Nyb2xsaW5nTm9kZTo6VG90YWxDb250ZW50c1NpemUsIHRvdGFsQ29udGVudHNTaXplKQorICAg IFNDUk9MTElOR19OT0RFX0VOQ09ERShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlJlYWNo YWJsZUNvbnRlbnRzU2l6ZSwgcmVhY2hhYmxlQ29udGVudHNTaXplKQogICAgIFNDUk9MTElOR19O T0RFX0VOQ09ERShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbFBvc2l0aW9uLCBz Y3JvbGxQb3NpdGlvbikKICAgICBTQ1JPTExJTkdfTk9ERV9FTkNPREUoU2Nyb2xsaW5nU3RhdGVT Y3JvbGxpbmdOb2RlOjpTY3JvbGxPcmlnaW4sIHNjcm9sbE9yaWdpbikKICAgICBTQ1JPTExJTkdf Tk9ERV9FTkNPREUoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpTY3JvbGxhYmxlQXJlYVBh cmFtcywgc2Nyb2xsYWJsZUFyZWFQYXJhbWV0ZXJzKQpAQCAtMTg5LDYgKzE5MCw3IEBAIGJvb2wg QXJndW1lbnRDb2RlcjxTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU+OjpkZWNvZGUoQXJndW1l bnREZWNvZGVyJiBkZWNvZGVyCiAKICAgICBTQ1JPTExJTkdfTk9ERV9ERUNPREUoU2Nyb2xsaW5n U3RhdGVTY3JvbGxpbmdOb2RlOjpTY3JvbGxhYmxlQXJlYVNpemUsIEZsb2F0U2l6ZSwgc2V0U2Ny b2xsYWJsZUFyZWFTaXplKTsKICAgICBTQ1JPTExJTkdfTk9ERV9ERUNPREUoU2Nyb2xsaW5nU3Rh dGVTY3JvbGxpbmdOb2RlOjpUb3RhbENvbnRlbnRzU2l6ZSwgRmxvYXRTaXplLCBzZXRUb3RhbENv bnRlbnRzU2l6ZSk7CisgICAgU0NST0xMSU5HX05PREVfREVDT0RFKFNjcm9sbGluZ1N0YXRlU2Ny b2xsaW5nTm9kZTo6UmVhY2hhYmxlQ29udGVudHNTaXplLCBGbG9hdFNpemUsIHNldFJlYWNoYWJs ZUNvbnRlbnRzU2l6ZSk7CiAgICAgU0NST0xMSU5HX05PREVfREVDT0RFKFNjcm9sbGluZ1N0YXRl U2Nyb2xsaW5nTm9kZTo6U2Nyb2xsUG9zaXRpb24sIEZsb2F0UG9pbnQsIHNldFNjcm9sbFBvc2l0 aW9uKTsKICAgICBTQ1JPTExJTkdfTk9ERV9ERUNPREUoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdO b2RlOjpTY3JvbGxPcmlnaW4sIEludFBvaW50LCBzZXRTY3JvbGxPcmlnaW4pOwogICAgIFNDUk9M TElOR19OT0RFX0RFQ09ERShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbGFibGVB cmVhUGFyYW1zLCBTY3JvbGxhYmxlQXJlYVBhcmFtZXRlcnMsIHNldFNjcm9sbGFibGVBcmVhUGFy YW1ldGVycyk7CkBAIC01NjUsMTEgKzU2NywxNCBAQCB2b2lkIFJlbW90ZVNjcm9sbGluZ1RyZWVU ZXh0U3RyZWFtOjpkdW1wKGNvbnN0IFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZSYgbm9kZQog ICAgIFJlbW90ZVNjcm9sbGluZ1RyZWVUZXh0U3RyZWFtJiB0cyA9ICp0aGlzOwogICAgIAogICAg IGlmICghY2hhbmdlZFByb3BlcnRpZXNPbmx5IHx8IG5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNj cm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsYWJsZUFyZWFTaXplKSkKLSAgICAgICAg ZHVtcFByb3BlcnR5KHRzLCAic2Nyb2xsYWJsZS1hcmVhLXNpemUiLCBub2RlLnRvdGFsQ29udGVu dHNTaXplKCkpOworICAgICAgICBkdW1wUHJvcGVydHkodHMsICJzY3JvbGxhYmxlLWFyZWEtc2l6 ZSIsIG5vZGUuc2Nyb2xsYWJsZUFyZWFTaXplKCkpOwogCiAgICAgaWYgKCFjaGFuZ2VkUHJvcGVy dGllc09ubHkgfHwgbm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxp bmdOb2RlOjpUb3RhbENvbnRlbnRzU2l6ZSkpCiAgICAgICAgIGR1bXBQcm9wZXJ0eSh0cywgInRv dGFsLWNvbnRlbnRzLXNpemUiLCBub2RlLnRvdGFsQ29udGVudHNTaXplKCkpOwogCisgICAgaWYg KCFjaGFuZ2VkUHJvcGVydGllc09ubHkgfHwgbm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xs aW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpSZWFjaGFibGVDb250ZW50c1NpemUpKQorICAgICAgICBk dW1wUHJvcGVydHkodHMsICJyZWFjaGFibGUtY29udGVudHMtc2l6ZSIsIG5vZGUucmVhY2hhYmxl Q29udGVudHNTaXplKCkpOworCiAgICAgaWYgKCFjaGFuZ2VkUHJvcGVydGllc09ubHkgfHwgbm9k ZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpTY3JvbGxQ b3NpdGlvbikpCiAgICAgICAgIGR1bXBQcm9wZXJ0eSh0cywgInNjcm9sbC1wb3NpdGlvbiIsIG5v ZGUuc2Nyb2xsUG9zaXRpb24oKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9TY3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJT1Mu bW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL2lvcy9TY3JvbGxpbmdUcmVl T3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TLm1tCmluZGV4IGZkYTIxZmZmYmJjMjAwN2NhNDM3MWQ5 MTJmM2Y5YWMwNmQ0NDFiYTUuLjdlNmU4NzExOGZmMjllZGIxYjk4MmNiNmE2ZDMxM2ZmOTA3NjYw YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvaW9zL1Nj cm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJT1MubW0KKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1Njcm9sbGluZy9pb3MvU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5n Tm9kZUlPUy5tbQpAQCAtMTQwLDcgKzE0MCw5IEBAIHZvaWQgU2Nyb2xsaW5nVHJlZU92ZXJmbG93 U2Nyb2xsaW5nTm9kZUlPUzo6dXBkYXRlQWZ0ZXJDaGlsZHJlbihjb25zdCBTY3JvbGxpbmdTCiAK ICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdT dGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbExheWVyKQogICAgICAgICB8fCBzY3JvbGxpbmdTdGF0 ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6VG90 YWxDb250ZW50c1NpemUpCi0gICAgICAgIHx8IHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2Vk UHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpTY3JvbGxQb3NpdGlvbikpIHsK KyAgICAgICAgfHwgc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxp bmdTdGF0ZVNjcm9sbGluZ05vZGU6OlJlYWNoYWJsZUNvbnRlbnRzU2l6ZSkKKyAgICAgICAgfHwg c2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9s bGluZ05vZGU6OlNjcm9sbFBvc2l0aW9uKQorICAgICAgICB8fCBzY3JvbGxpbmdTdGF0ZU5vZGUu aGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsT3Jp Z2luKSkgewogICAgICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlMKICAgICAgICAgVUlT Y3JvbGxWaWV3ICpzY3JvbGxWaWV3ID0gKFVJU2Nyb2xsVmlldyAqKVtzY3JvbGxMYXllcigpIGRl bGVnYXRlXTsKICAgICAgICAgQVNTRVJUKFtzY3JvbGxWaWV3IGlzS2luZE9mQ2xhc3M6W1VJU2Ny b2xsVmlldyBzZWxmXV0pOwpAQCAtMTUyLDEyICsxNTQsMzEgQEAgdm9pZCBTY3JvbGxpbmdUcmVl T3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TOjp1cGRhdGVBZnRlckNoaWxkcmVuKGNvbnN0IFNjcm9s bGluZ1MKICAgICAgICAgICAgIHNjcm9sbFZpZXcuZGVsZWdhdGUgPSBtX3Njcm9sbFZpZXdEZWxl Z2F0ZS5nZXQoKTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUu aGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6VG90YWxDb250 ZW50c1NpemUpKQotICAgICAgICAgICAgc2Nyb2xsVmlldy5jb250ZW50U2l6ZSA9IHNjcm9sbGlu Z1N0YXRlTm9kZS50b3RhbENvbnRlbnRzU2l6ZSgpOworICAgICAgICBib29sIHJlY29tcHV0ZUlu c2V0cyA9IHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3Rh dGVTY3JvbGxpbmdOb2RlOjpUb3RhbENvbnRlbnRzU2l6ZSk7CisgICAgICAgIGlmIChzY3JvbGxp bmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9k ZTo6UmVhY2hhYmxlQ29udGVudHNTaXplKSkgeworICAgICAgICAgICAgc2Nyb2xsVmlldy5jb250 ZW50U2l6ZSA9IHNjcm9sbGluZ1N0YXRlTm9kZS5yZWFjaGFibGVDb250ZW50c1NpemUoKTsKKyAg ICAgICAgICAgIHJlY29tcHV0ZUluc2V0cyA9IHRydWU7CisgICAgICAgIH0KKworICAgICAgICBp ZiAoKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVT Y3JvbGxpbmdOb2RlOjpTY3JvbGxQb3NpdGlvbikKKyAgICAgICAgICAgIHx8IHNjcm9sbGluZ1N0 YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpT Y3JvbGxPcmlnaW4pKQorICAgICAgICAgICAgJiYgIVttX3Njcm9sbFZpZXdEZWxlZ2F0ZSBfaXNJ blVzZXJJbnRlcmFjdGlvbl0pIHsKKyAgICAgICAgICAgIHNjcm9sbFZpZXcuY29udGVudE9mZnNl dCA9IHNjcm9sbGluZ1N0YXRlTm9kZS5zY3JvbGxQb3NpdGlvbigpICsgc2Nyb2xsT3JpZ2luKCk7 CisgICAgICAgICAgICByZWNvbXB1dGVJbnNldHMgPSB0cnVlOworICAgICAgICB9CisgICAgICAg IAorICAgICAgICBpZiAocmVjb21wdXRlSW5zZXRzKSB7CisgICAgICAgICAgICBVSUVkZ2VJbnNl dHMgaW5zZXRzID0gVUlFZGdlSW5zZXRzTWFrZSgwLCAwLCAwLCAwKTsKKyAgICAgICAgICAgIC8v IFdpdGggUlRMIG9yIGJvdHRvbS10by10b3Agc2Nyb2xsaW5nIChub24temVybyBvcmlnaW4pLCB3 ZSBuZWVkIGV4dHJhIHNwYWNlIG9uIHRoZSBsZWZ0IG9yIHRvcC4KKyAgICAgICAgICAgIGlmIChz Y3JvbGxPcmlnaW4oKS54KCkpCisgICAgICAgICAgICAgICAgaW5zZXRzLmxlZnQgPSByZWFjaGFi bGVDb250ZW50c1NpemUoKS53aWR0aCgpIC0gdG90YWxDb250ZW50c1NpemUoKS53aWR0aCgpOwog Ci0gICAgICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9s bGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsUG9zaXRpb24pICYmICFbbV9zY3JvbGxWaWV3 RGVsZWdhdGUgX2lzSW5Vc2VySW50ZXJhY3Rpb25dKQotICAgICAgICAgICAgc2Nyb2xsVmlldy5j b250ZW50T2Zmc2V0ID0gc2Nyb2xsaW5nU3RhdGVOb2RlLnNjcm9sbFBvc2l0aW9uKCk7CisgICAg ICAgICAgICBpZiAoc2Nyb2xsT3JpZ2luKCkueSgpKQorICAgICAgICAgICAgICAgIGluc2V0cy50 b3AgPSByZWFjaGFibGVDb250ZW50c1NpemUoKS5oZWlnaHQoKSAtIHRvdGFsQ29udGVudHNTaXpl KCkuaGVpZ2h0KCk7CiAKKyAgICAgICAgICAgIHNjcm9sbFZpZXcuY29udGVudEluc2V0ID0gaW5z ZXRzOworICAgICAgICB9CisgICAgICAgICAgICAKICAgICAgICAgRU5EX0JMT0NLX09CSkNfRVhD RVBUSU9OUwogICAgIH0KIH0K