205674 2020-01-01 09:51:13 -0800 [LFC][IFC] Add support for ink overflow 2020-01-01 13:15:27 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1602079 0 zalan 2020-01-01 09:51:13 -0800 ssia 1602080 1 webkit-bug-importer 2020-01-01 09:51:29 -0800 <rdar://problem/58262376> 1602082 2 386581 zalan 2020-01-01 10:01:18 -0800 Created attachment 386581 Patch 1602105 3 386581 commit-queue 2020-01-01 13:15:25 -0800 Comment on attachment 386581 Patch Clearing flags on attachment: 386581 Committed r253970: <https://trac.webkit.org/changeset/253970> 1602106 4 commit-queue 2020-01-01 13:15:27 -0800 All reviewed patches have been landed. Closing bug. 386581 2020-01-01 10:01:18 -0800 2020-01-01 13:15:25 -0800 Patch bug-205674-20200101100117.patch text/plain 14723 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzOTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODhiOTc4ZGY2OGFkZTYz YTAyZDMwZDhkOWU2OWMwNDY2ODliNmZiYy4uY2MyYmQ3Njg0YTAzNjEyODJiOGY1NzYxN2FjYTRk OTllMmU4MzY0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIwLTAxLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3IgaW5rIG92ZXJmbG93CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDU2NzQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4MjYyMzc2Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBpbmsg b3ZlcmZsb3cgaW5mb3JtYXRpb24gdG8gRGlzcGxheTo6UnVuIGFuZCB0byBlYWNoIERpc3BsYXk6 OkxpbmVCb3ggd2hpbGUKKyAgICAgICAgdGhlIGRpc3BsYXkgYm94ZXMgYXJlIGJlaW5nIGNyZWF0 ZWQuCisgICAgICAgIChFdmVudHVhbGx5IHdlIHNob3VsZCBhZGQgYm90aCBzY3JvbGxhYmxlIGFu ZCBpbmsgb3ZlcmZsb3cgdG8gRGlzcGxheTo6Qm94KQorCisgICAgICAgICogbGF5b3V0L2Rpc3Bs YXl0cmVlL0Rpc3BsYXlJbmxpbmVSZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpJ bmxpbmVSZWN0OjpleHBhbmRUb0NvbnRhaW4pOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6 SW5saW5lUmVjdDo6aW5mbGF0ZSk6CisgICAgICAgICogbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3Bs YXlMaW5lQm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpMaW5lQm94OjpzY3JvbGxh YmxlT3ZlcmZsb3cgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6TGluZUJveDo6 aW5rT3ZlcmZsb3cgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6TGluZUJveDo6 c2V0U2Nyb2xsYWJsZU92ZXJmbG93KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkxpbmVC b3g6OnNldElua092ZXJmbG93KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkxpbmVCb3g6 OnNjcm9sbGFibGVPdmVyZmxvd1JlY3QgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6RGlzcGxheTo6TGluZUJveDo6c2V0U2Nyb2xsYWJsZU92ZXJmbG93UmVjdCk6IERlbGV0ZWQu CisgICAgICAgICogbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlSdW4uaDoKKyAgICAgICAgKFdl YkNvcmU6OkRpc3BsYXk6OlJ1bjo6aW5rT3ZlcmZsb3cgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6RGlzcGxheTo6UnVuOjpSdW4pOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OnNldERpc3BsYXlCb3hlc0ZvckxpbmUpOgorICAgICAg ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmFsaWduQ29udGVudFZlcnRpY2FsbHkp OgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlv dXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6 OmNvbGxlY3RPdmVyZmxvdyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6 TGluZUxheW91dDo6cGFpbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246 OmNvbXB1dGVWaXN1YWxPdmVyZmxvdyk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvTGF5b3V0U2l6ZS5oOgorICAgICAgICAoV2ViQ29yZTo6Y2VpbGVkSW50U2l6ZSk6CisK IDIwMTktMTItMjAgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFRp ZHkgYSBiaXQgb2YgU3RyaW5nQnVpbGRlciB1c2FnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlJbmxpbmVSZWN0LmggYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUlubGluZVJlY3QuaAppbmRleCA2ZDUzYzZlMTBk NDc0ZGQ4MTM3NjhkZDY0OTdkZDBmMWJjY2U5Mzg3Li4zNDI4YTAxNTg1MDA3ODM3NThkYWFjNDcz NDhhMzQ4YTg2OGM1ODY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxh eXRyZWUvRGlzcGxheUlubGluZVJlY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlz cGxheXRyZWUvRGlzcGxheUlubGluZVJlY3QuaApAQCAtNjAsOSArNjAsMTEgQEAgcHVibGljOgog ICAgIHZvaWQgbW92ZVZlcnRpY2FsbHkoSW5saW5lTGF5b3V0VW5pdCk7CiAKICAgICB2b2lkIGV4 cGFuZChPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiwgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5p dD4pOworICAgIHZvaWQgZXhwYW5kVG9Db250YWluKGNvbnN0IElubGluZVJlY3QmKTsKICAgICB2 b2lkIGV4cGFuZEhvcml6b250YWxseShJbmxpbmVMYXlvdXRVbml0IGRlbHRhKSB7IGV4cGFuZChk ZWx0YSwgeyB9KTsgfQogICAgIHZvaWQgZXhwYW5kVmVydGljYWxseShJbmxpbmVMYXlvdXRVbml0 IGRlbHRhKSB7IGV4cGFuZCh7IH0sIGRlbHRhKTsgfQogICAgIHZvaWQgZXhwYW5kVmVydGljYWxs eVRvQ29udGFpbihjb25zdCBJbmxpbmVSZWN0Jik7CisgICAgdm9pZCBpbmZsYXRlKElubGluZUxh eW91dFVuaXQpOwogCiAgICAgb3BlcmF0b3IgSW5saW5lTGF5b3V0UmVjdCgpIGNvbnN0OwogCkBA IC0yNDEsNiArMjQzLDExIEBAIGlubGluZSB2b2lkIElubGluZVJlY3Q6OmV4cGFuZChPcHRpb25h bDxJbmxpbmVMYXlvdXRVbml0PiB3aWR0aCwgT3B0aW9uYWw8SW5saW5lCiAgICAgbV9yZWN0LmV4 cGFuZCh3aWR0aC52YWx1ZU9yKDApLCBoZWlnaHQudmFsdWVPcigwKSk7CiB9CiAKK2lubGluZSB2 b2lkIElubGluZVJlY3Q6OmV4cGFuZFRvQ29udGFpbihjb25zdCBJbmxpbmVSZWN0JiBvdGhlcikK K3sKKyAgICBtX3JlY3QgPSB1bmlvblJlY3Qob3RoZXIsIG1fcmVjdCk7Cit9CisKIGlubGluZSB2 b2lkIElubGluZVJlY3Q6OmV4cGFuZFZlcnRpY2FsbHlUb0NvbnRhaW4oY29uc3QgSW5saW5lUmVj dCYgb3RoZXIpCiB7CiAgICAgYXV0byBjb250YWluVG9wID0gc3RkOjptaW4odG9wKCksIG90aGVy LnRvcCgpKTsKQEAgLTI0OSw2ICsyNTYsMTIgQEAgaW5saW5lIHZvaWQgSW5saW5lUmVjdDo6ZXhw YW5kVmVydGljYWxseVRvQ29udGFpbihjb25zdCBJbmxpbmVSZWN0JiBvdGhlcikKICAgICBzZXRC b3R0b20oY29udGFpbkJvdHRvbSk7CiB9CiAKK2lubGluZSB2b2lkIElubGluZVJlY3Q6OmluZmxh dGUoSW5saW5lTGF5b3V0VW5pdCBpbmZsYXRlKQoreworICAgIEFTU0VSVChoYXNWYWxpZEdlb21l dHJ5KCkpOworICAgIG1fcmVjdC5pbmZsYXRlKGluZmxhdGUpOworfQorCiBpbmxpbmUgSW5saW5l UmVjdDo6b3BlcmF0b3IgSW5saW5lTGF5b3V0UmVjdCgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGhh c1ZhbGlkR2VvbWV0cnkoKSk7IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rp c3BsYXl0cmVlL0Rpc3BsYXlMaW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxh eXRyZWUvRGlzcGxheUxpbmVCb3guaAppbmRleCBkM2VjNTNhNjhmYmFmYTliOGU4MTZlMmQ2ZTk2 OWJjM2NjNmQ0NTVkLi45ZWZhNTdhYTk5ZGUxMGZiODg5MDhlY2MxNDdmNjA2ZmU4OGU2NGQxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUxpbmVC b3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUxpbmVC b3guaApAQCAtNjIsNyArNjIsOCBAQCBwdWJsaWM6CiAgICAgTGluZUJveCgpID0gZGVmYXVsdDsK IAogICAgIGNvbnN0IElubGluZVJlY3QmIGxvZ2ljYWxSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9y ZWN0OyB9Ci0gICAgY29uc3QgSW5saW5lUmVjdCYgc2Nyb2xsYWJsZU92ZXJmbG93UmVjdCgpIGNv bnN0IHsgcmV0dXJuIG1fc2Nyb2xsYWJsZU92ZXJmbG93UmVjdDsgfQorICAgIGNvbnN0IElubGlu ZVJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdygpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsYWJsZU92 ZXJmbG93OyB9CisgICAgY29uc3QgSW5saW5lUmVjdCYgaW5rT3ZlcmZsb3coKSBjb25zdCB7IHJl dHVybiBtX2lua092ZXJmbG93OyB9CiAKICAgICBJbmxpbmVMYXlvdXRQb2ludCBsb2dpY2FsVG9w TGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVjdC50b3BMZWZ0KCk7IH0KICAgICBJbmxpbmVMYXlv dXRVbml0IGxvZ2ljYWxMZWZ0KCkgY29uc3QgeyByZXR1cm4gbV9yZWN0LmxlZnQoKTsgfQpAQCAt MTAzLDcgKzEwNCw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldExvZ2ljYWxIZWlnaHRJZkdyZWF0 ZXIoSW5saW5lTGF5b3V0VW5pdCk7CiAgICAgdm9pZCBzZXRMb2dpY2FsV2lkdGgoSW5saW5lTGF5 b3V0VW5pdCBsb2dpY2FsV2lkdGgpIHsgbV9yZWN0LnNldFdpZHRoKGxvZ2ljYWxXaWR0aCk7IH0K IAotICAgIHZvaWQgc2V0U2Nyb2xsYWJsZU92ZXJmbG93UmVjdChjb25zdCBJbmxpbmVSZWN0JiBy ZWN0KSB7IG1fc2Nyb2xsYWJsZU92ZXJmbG93UmVjdCA9IHJlY3Q7IH0KKyAgICB2b2lkIHNldFNj cm9sbGFibGVPdmVyZmxvdyhjb25zdCBJbmxpbmVSZWN0JiByZWN0KSB7IG1fc2Nyb2xsYWJsZU92 ZXJmbG93ID0gcmVjdDsgfQorICAgIHZvaWQgc2V0SW5rT3ZlcmZsb3coY29uc3QgSW5saW5lUmVj dCYgcmVjdCkgeyBtX2lua092ZXJmbG93ID0gcmVjdDsgfQogCiAgICAgdm9pZCBtb3ZlSG9yaXpv bnRhbGx5KElubGluZUxheW91dFVuaXQgZGVsdGEpIHsgbV9yZWN0Lm1vdmVIb3Jpem9udGFsbHko ZGVsdGEpOyB9CiAKQEAgLTEyOSw3ICsxMzEsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9oYXNW YWxpZEJhc2VsaW5lT2Zmc2V0IHsgZmFsc2UgfTsKICNlbmRpZgogICAgIElubGluZVJlY3QgbV9y ZWN0OwotICAgIElubGluZVJlY3QgbV9zY3JvbGxhYmxlT3ZlcmZsb3dSZWN0OworICAgIElubGlu ZVJlY3QgbV9zY3JvbGxhYmxlT3ZlcmZsb3c7CisgICAgSW5saW5lUmVjdCBtX2lua092ZXJmbG93 OwogICAgIEJhc2VsaW5lIG1fYmFzZWxpbmU7CiAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2Jhc2Vs aW5lT2Zmc2V0OwogICAgIGJvb2wgbV9pc0NvbnNpZGVyZWRFbXB0eSB7IHRydWUgfTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5UnVuLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheVJ1bi5oCmluZGV4IDQ2MzJj NjZhODAzOWQ4NWE4MWFmOWZmNTM1MThkN2QzYzA0ZGNlY2MuLmI3NTViMDljZTRlNWU1NTQyZmY4 MWQwZDYwZmYyOTg2MTZhZGJmY2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9k aXNwbGF5dHJlZS9EaXNwbGF5UnVuLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3Bs YXl0cmVlL0Rpc3BsYXlSdW4uaApAQCAtNzEsMTEgKzcxLDEyIEBAIHN0cnVjdCBSdW4gewogICAg ICAgICBPcHRpb25hbDxFeHBhbnNpb25Db250ZXh0PiBtX2V4cGFuc2lvbkNvbnRleHQ7CiAgICAg fTsKIAotICAgIFJ1bihzaXplX3QgbGluZUluZGV4LCBjb25zdCBMYXlvdXQ6OkJveCYsIGNvbnN0 IElubGluZVJlY3QmIGxvZ2ljYWxSZWN0LCBPcHRpb25hbDxUZXh0Q29udGV4dD4gPSBXVEY6Om51 bGxvcHQpOworICAgIFJ1bihzaXplX3QgbGluZUluZGV4LCBjb25zdCBMYXlvdXQ6OkJveCYsIGNv bnN0IElubGluZVJlY3QmIGxvZ2ljYWxSZWN0LCBjb25zdCBJbmxpbmVSZWN0JiBpbmtPdmVyZmxv dywgT3B0aW9uYWw8VGV4dENvbnRleHQ+ID0gV1RGOjpudWxsb3B0KTsKIAogICAgIHNpemVfdCBs aW5lSW5kZXgoKSBjb25zdCB7IHJldHVybiBtX2xpbmVJbmRleDsgfQogCiAgICAgY29uc3QgSW5s aW5lUmVjdCYgbG9naWNhbFJlY3QoKSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0OyB9Cisg ICAgY29uc3QgSW5saW5lUmVjdCYgaW5rT3ZlcmZsb3coKSBjb25zdCB7IHJldHVybiBtX2lua092 ZXJmbG93OyB9CiAKICAgICBJbmxpbmVMYXlvdXRQb2ludCBsb2dpY2FsVG9wTGVmdCgpIGNvbnN0 IHsgcmV0dXJuIG1fbG9naWNhbFJlY3QudG9wTGVmdCgpOyB9CiAgICAgSW5saW5lTGF5b3V0VW5p dCBsb2dpY2FsTGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3QubGVmdCgpOyB9CkBA IC0xMTIsMTMgKzExMywxNSBAQCBwcml2YXRlOgogICAgIFdlYWtQdHI8Y29uc3QgTGF5b3V0OjpC b3g+IG1fbGF5b3V0Qm94OwogICAgIENhY2hlZEltYWdlKiBtX2NhY2hlZEltYWdlIHsgbnVsbHB0 ciB9OwogICAgIElubGluZVJlY3QgbV9sb2dpY2FsUmVjdDsKKyAgICBJbmxpbmVSZWN0IG1faW5r T3ZlcmZsb3c7CiAgICAgT3B0aW9uYWw8VGV4dENvbnRleHQ+IG1fdGV4dENvbnRleHQ7CiB9Owog Ci1pbmxpbmUgUnVuOjpSdW4oc2l6ZV90IGxpbmVJbmRleCwgY29uc3QgTGF5b3V0OjpCb3gmIGxh eW91dEJveCwgY29uc3QgSW5saW5lUmVjdCYgbG9naWNhbFJlY3QsIE9wdGlvbmFsPFRleHRDb250 ZXh0PiB0ZXh0Q29udGV4dCkKK2lubGluZSBSdW46OlJ1bihzaXplX3QgbGluZUluZGV4LCBjb25z dCBMYXlvdXQ6OkJveCYgbGF5b3V0Qm94LCBjb25zdCBJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCwg Y29uc3QgSW5saW5lUmVjdCYgaW5rT3ZlcmZsb3csIE9wdGlvbmFsPFRleHRDb250ZXh0PiB0ZXh0 Q29udGV4dCkKICAgICA6IG1fbGluZUluZGV4KGxpbmVJbmRleCkKICAgICAsIG1fbGF5b3V0Qm94 KG1ha2VXZWFrUHRyKGxheW91dEJveCkpCiAgICAgLCBtX2xvZ2ljYWxSZWN0KGxvZ2ljYWxSZWN0 KQorICAgICwgbV9pbmtPdmVyZmxvdyhpbmtPdmVyZmxvdykKICAgICAsIG1fdGV4dENvbnRleHQo dGV4dENvbnRleHQpCiB7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5k ZXggYzY3ZTA5NWUxZDEyNmZjNjhmOTY0NzA2NzJmNjhhNjhjZTQ5MGY2NC4uNTU4NDg5YzE0MWZl OGUwY2I2ZDUzZjhmZjlkYzJhNTBmMjI3MjMzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0LmNwcApAQCAtNDUyLDkgKzQ1MiwxMiBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250 ZXh0OjpzZXREaXNwbGF5Qm94ZXNGb3JMaW5lKGNvbnN0IExpbmVMYXlvdXRDb250ZXh0OjpMaQog ICAgICAgICB9CiAgICAgfQogCisgICAgLy8gRklYTUU6IElDQiBpcyBub3QgdGhlIHJlYWwgSUNC IHdoZW4gbHlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9uRW5hYmxlZCBpcyBvbi4gCisg ICAgYXV0byBpbml0aWFsQ29udGFpbmdCbG9ja1NpemUgPSBnZW9tZXRyeUZvckJveChyb290KCku aW5pdGlhbENvbnRhaW5pbmdCbG9jaygpKS5jb250ZW50Qm94KCkuc2l6ZSgpOwogICAgIGF1dG8m IGlubGluZUNvbnRlbnQgPSBmb3JtYXR0aW5nU3RhdGUuZW5zdXJlRGlzcGxheUlubGluZUNvbnRl bnQoKTsKICAgICBhdXRvIGxpbmVJbmRleCA9IGlubGluZUNvbnRlbnQubGluZUJveGVzLnNpemUo KTsKLSAgICBpbmxpbmVDb250ZW50LmxpbmVCb3hlcy5hcHBlbmQoRGlzcGxheTo6TGluZUJveCB7 IGxpbmVDb250ZW50LmxpbmVCb3ggfSk7CisgICAgaW5saW5lQ29udGVudC5saW5lQm94ZXMuYXBw ZW5kKGxpbmVDb250ZW50LmxpbmVCb3gpOworICAgIGF1dG8gbGluZUlua092ZXJmbG93ID0gbGlu ZUNvbnRlbnQubGluZUJveC5zY3JvbGxhYmxlT3ZlcmZsb3coKTsKICAgICBPcHRpb25hbDx1bnNp Z25lZD4gbGFzdFRleHRJdGVtSW5kZXg7CiAgICAgLy8gQ29tcHV0ZSBib3ggZmluYWwgZ2VvbWV0 cnkuCiAgICAgYXV0byYgbGluZVJ1bnMgPSBsaW5lQ29udGVudC5ydW5MaXN0OwpAQCAtNDY3LDgg KzQ3MCwyNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpzZXREaXNwbGF5Qm94ZXNG b3JMaW5lKGNvbnN0IExpbmVMYXlvdXRDb250ZXh0OjpMaQogICAgICAgICAvLyBBZGQgZmluYWwg ZGlzcGxheSBydW5zIHRvIHN0YXRlIGZpcnN0LgogICAgICAgICAvLyBJbmxpbmUgbGV2ZWwgY29u dGFpbmVycyAoPHNwYW4+KSBkb24ndCBnZW5lcmF0ZSBkaXNwbGF5IHJ1bnMgYW5kIG5laXRoZXIg ZG8gY29tcGxldGVseSBjb2xsYXBzZWQgcnVucy4KICAgICAgICAgYXV0byBpbml0aWF0ZXNJbmxp bmVSdW4gPSAhbGluZVJ1bi5pc0NvbnRhaW5lclN0YXJ0KCkgJiYgIWxpbmVSdW4uaXNDb250YWlu ZXJFbmQoKSAmJiAhbGluZVJ1bi5pc0NvbGxhcHNlZFRvVmlzdWFsbHlFbXB0eSgpOwotICAgICAg ICBpZiAoaW5pdGlhdGVzSW5saW5lUnVuKQotICAgICAgICAgICAgaW5saW5lQ29udGVudC5ydW5z LmFwcGVuZCh7IGxpbmVJbmRleCwgbGluZVJ1bi5sYXlvdXRCb3goKSwgbGluZVJ1bi5sb2dpY2Fs UmVjdCgpLCBsaW5lUnVuLnRleHRDb250ZXh0KCkgfSk7CisgICAgICAgIGlmIChpbml0aWF0ZXNJ bmxpbmVSdW4pIHsKKyAgICAgICAgICAgIGF1dG8gY29tcHV0ZWRJbmtPdmVyZmxvdyA9IFsmXSB7 CisgICAgICAgICAgICAgICAgLy8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciBub24tdGV4dCBpbmsg b3ZlcmZsb3cuCisgICAgICAgICAgICAgICAgaWYgKCFsaW5lUnVuLmlzVGV4dCgpKQorICAgICAg ICAgICAgICAgICAgICByZXR1cm4gbG9naWNhbFJlY3Q7CisgICAgICAgICAgICAgICAgYXV0byYg c3R5bGUgPSBsaW5lUnVuLnN0eWxlKCk7CisgICAgICAgICAgICAgICAgYXV0byBpbmtPdmVyZmxv dyA9IGxvZ2ljYWxSZWN0OworICAgICAgICAgICAgICAgIGF1dG8gc3Ryb2tlT3ZlcmZsb3cgPSBz dGQ6OmNlaWwoc3R5bGUuY29tcHV0ZWRTdHJva2VXaWR0aChjZWlsZWRJbnRTaXplKGluaXRpYWxD b250YWluZ0Jsb2NrU2l6ZSkpKTsKKyAgICAgICAgICAgICAgICBpbmtPdmVyZmxvdy5pbmZsYXRl KHN0cm9rZU92ZXJmbG93KTsKKworICAgICAgICAgICAgICAgIGF1dG8gbGV0dGVyU3BhY2luZyA9 IHN0eWxlLmZvbnRDYXNjYWRlKCkubGV0dGVyU3BhY2luZygpOworICAgICAgICAgICAgICAgIGlm IChsZXR0ZXJTcGFjaW5nIDwgMCkgeworICAgICAgICAgICAgICAgICAgICAvLyBMYXN0IGxldHRl cidzIG5lZ2F0aXZlIHNwYWNpbmcgc2hyaW5rcyBsb2dpY2FsIHJlY3QuIFB1c2ggaXQgdG8gaW5r IG92ZXJmbG93LgorICAgICAgICAgICAgICAgICAgICBpbmtPdmVyZmxvdy5leHBhbmRIb3Jpem9u dGFsbHkoLWxldHRlclNwYWNpbmcpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAg ICByZXR1cm4gaW5rT3ZlcmZsb3c7CisgICAgICAgICAgICB9OworICAgICAgICAgICAgYXV0byBp bmtPdmVyZmxvdyA9IGNvbXB1dGVkSW5rT3ZlcmZsb3coKTsKKyAgICAgICAgICAgIGxpbmVJbmtP dmVyZmxvdy5leHBhbmRUb0NvbnRhaW4oaW5rT3ZlcmZsb3cpOworICAgICAgICAgICAgaW5saW5l Q29udGVudC5ydW5zLmFwcGVuZCh7IGxpbmVJbmRleCwgbGluZVJ1bi5sYXlvdXRCb3goKSwgbG9n aWNhbFJlY3QsIGlua092ZXJmbG93LCBsaW5lUnVuLnRleHRDb250ZXh0KCkgfSk7CisgICAgICAg IH0KIAogICAgICAgICBpZiAobGluZVJ1bi5pc0xpbmVCcmVhaygpKSB7CiAgICAgICAgICAgICBk aXNwbGF5Qm94LnNldFRvcExlZnQodG9MYXlvdXRQb2ludChsb2dpY2FsUmVjdC50b3BMZWZ0KCkp KTsKQEAgLTUyNiw2ICs1NDgsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRE aXNwbGF5Qm94ZXNGb3JMaW5lKGNvbnN0IExpbmVMYXlvdXRDb250ZXh0OjpMaQogICAgIC8vIE1h a2Ugc3VyZSB0aGUgdHJhaWxpbmcgdGV4dCBydW4gZ2V0cyBhIGh5cGhlbiB3aGVuIGl0IG5lZWRz IG9uZS4KICAgICBpZiAobGluZUNvbnRlbnQucGFydGlhbENvbnRlbnQgJiYgbGluZUNvbnRlbnQu cGFydGlhbENvbnRlbnQtPnRyYWlsaW5nQ29udGVudE5lZWRzSHlwaGVuKQogICAgICAgICBpbmxp bmVDb250ZW50LnJ1bnNbKmxhc3RUZXh0SXRlbUluZGV4XS50ZXh0Q29udGV4dCgpLT5zZXROZWVk c0h5cGhlbigpOworICAgIGlubGluZUNvbnRlbnQubGluZUJveGVzLmxhc3QoKS5zZXRJbmtPdmVy ZmxvdyhsaW5lSW5rT3ZlcmZsb3cpOwogfQogCiB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0 OjppbnZhbGlkYXRlRm9ybWF0dGluZ1N0YXRlKGNvbnN0IEludmFsaWRhdGlvblN0YXRlJikKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCA4M2UwZjNkNjY4NTkzMjJiZTJiMjA4NzU3OTQ4NDc3 YjA3NmNhOTJmLi5iMDliMGU3OTUwNDYyMTg0MDFmMDMwY2IyMTc4NzgxMTk2NzU1YmU1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0zNzUsNyArMzc1LDcgQEAgdm9pZCBMaW5lQnVpbGRl cjo6YWxpZ25Db250ZW50VmVydGljYWxseShSdW5MaXN0JiBydW5MaXN0KQogICAgICAgICBydW4u bW92ZVZlcnRpY2FsbHkodGhpcy0+bG9naWNhbFRvcCgpKTsKICAgICAgICAgcnVuLm1vdmVIb3Jp em9udGFsbHkodGhpcy0+bG9naWNhbExlZnQoKSk7CiAgICAgfQotICAgIG1fbGluZUJveC5zZXRT Y3JvbGxhYmxlT3ZlcmZsb3dSZWN0KHNjcm9sbGFibGVPdmVyZmxvd1JlY3QpOworICAgIG1fbGlu ZUJveC5zZXRTY3JvbGxhYmxlT3ZlcmZsb3coc2Nyb2xsYWJsZU92ZXJmbG93UmVjdCk7CiB9CiAK IHZvaWQgTGluZUJ1aWxkZXI6Omp1c3RpZnlSdW5zKFJ1bkxpc3QmIHJ1bkxpc3QsIElubGluZUxh eW91dFVuaXQgYXZhaWxhYmxlV2lkdGgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlv dXQuY3BwCmluZGV4IGYyZTQ5ODRjOGY2Mjg5MWI0YTgzYWQxNzdkYmQ3OGQwNDQ1MjUzM2EuLmM3 YWEyMjg2M2Y0MDQzMmJkZjUyMzhkNmFlNDcyM2NkNzQ2ZTdhNTYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbkxpbmVMYXlvdXQuY3BwCkBAIC0xMzUsMzMgKzEzNSwxNCBAQCBMYXlvdXRVbml0IExpbmVM YXlvdXQ6Omxhc3RMaW5lQmFzZWxpbmUoKSBjb25zdAogICAgIHJldHVybiBMYXlvdXQ6OnRvTGF5 b3V0VW5pdChsYXN0TGluZUJveC5sb2dpY2FsVG9wKCkgKyBsYXN0TGluZUJveC5iYXNlbGluZU9m ZnNldCgpKTsKIH0KIAotLy8gRklYTUU6IExGQyBzaG91bGQgaGFuZGxlIG92ZXJmbG93IGNvbXB1 dGF0aW9ucy4KLXN0YXRpYyBGbG9hdFJlY3QgY29tcHV0ZVZpc3VhbE92ZXJmbG93KGNvbnN0IFJl bmRlclN0eWxlJiBzdHlsZSwgY29uc3QgRmxvYXRSZWN0JiBib3hSZWN0LCBJbnRTaXplJiB2aWV3 cG9ydFNpemUpCi17Ci0gICAgYXV0byBvdmVyZmxvd1JlY3QgPSBib3hSZWN0OwotICAgIGF1dG8g c3Ryb2tlT3ZlcmZsb3cgPSBzdGQ6OmNlaWwoc3R5bGUuY29tcHV0ZWRTdHJva2VXaWR0aCh2aWV3 cG9ydFNpemUpKTsKLSAgICBvdmVyZmxvd1JlY3QuaW5mbGF0ZShzdHJva2VPdmVyZmxvdyk7Ci0K LSAgICBhdXRvIGxldHRlclNwYWNpbmcgPSBzdHlsZS5mb250Q2FzY2FkZSgpLmxldHRlclNwYWNp bmcoKTsKLSAgICBpZiAobGV0dGVyU3BhY2luZyA+PSAwKQotICAgICAgICByZXR1cm4gb3ZlcmZs b3dSZWN0OwotICAgIC8vIExhc3QgbGV0dGVyJ3MgbmVnYXRpdmUgc3BhY2luZyBzaHJpbmtzIGxh eW91dCByZWN0LiBQdXNoIGl0IHRvIHZpc3VhbCBvdmVyZmxvdy4KLSAgICBvdmVyZmxvd1JlY3Qu ZXhwYW5kKC1sZXR0ZXJTcGFjaW5nLCAwKTsKLSAgICByZXR1cm4gb3ZlcmZsb3dSZWN0OwotfQot CiB2b2lkIExpbmVMYXlvdXQ6OmNvbGxlY3RPdmVyZmxvdyhSZW5kZXJCbG9ja0Zsb3cmIGZsb3cp CiB7CiAgICAgQVNTRVJUKCZmbG93ID09ICZtX2Zsb3cpOwogICAgIEFTU0VSVCghZmxvdy5oYXNP dmVyZmxvd0NsaXAoKSk7CiAKLSAgICBhdXRvIHZpZXdwb3J0U2l6ZSA9IG1fZmxvdy5mcmFtZSgp LnZpZXcoKS0+c2l6ZSgpOwotCiAgICAgZm9yIChhdXRvJiBsaW5lQm94IDogZGlzcGxheUlubGlu ZUNvbnRlbnQoKS0+bGluZUJveGVzKSB7Ci0gICAgICAgIGF1dG8gbGluZVJlY3QgPSBMYXlvdXQ6 OnRvTGF5b3V0UmVjdChsaW5lQm94LnNjcm9sbGFibGVPdmVyZmxvd1JlY3QoKSk7Ci0gICAgICAg IGF1dG8gdmlzdWFsT3ZlcmZsb3dSZWN0ID0gTGF5b3V0UmVjdCB7IGNvbXB1dGVWaXN1YWxPdmVy ZmxvdyhmbG93LnN0eWxlKCksIGxpbmVSZWN0LCB2aWV3cG9ydFNpemUpIH07Ci0gICAgICAgIGZs b3cuYWRkTGF5b3V0T3ZlcmZsb3cobGluZVJlY3QpOwotICAgICAgICBmbG93LmFkZFZpc3VhbE92 ZXJmbG93KHZpc3VhbE92ZXJmbG93UmVjdCk7CisgICAgICAgIGZsb3cuYWRkTGF5b3V0T3ZlcmZs b3coTGF5b3V0Ojp0b0xheW91dFJlY3QobGluZUJveC5zY3JvbGxhYmxlT3ZlcmZsb3coKSkpOwor ICAgICAgICBmbG93LmFkZFZpc3VhbE92ZXJmbG93KExheW91dDo6dG9MYXlvdXRSZWN0KGxpbmVC b3guaW5rT3ZlcmZsb3coKSkpOwogICAgIH0KIH0KIApAQCAtMjI2LDggKzIwNyw2IEBAIHZvaWQg TGluZUxheW91dDo6cGFpbnQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50 JiBwYWludE9mZnNldCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byYgaW5saW5lQ29udGVu dCA9ICpkaXNwbGF5SW5saW5lQ29udGVudCgpOwotCi0gICAgYXV0byB2aWV3cG9ydFNpemUgPSBt X2Zsb3cuZnJhbWUoKS52aWV3KCktPnNpemUoKTsKICAgICBmbG9hdCBkZXZpY2VTY2FsZUZhY3Rv ciA9IG1fZmxvdy5kb2N1bWVudCgpLmRldmljZVNjYWxlRmFjdG9yKCk7CiAKICAgICBhdXRvIHBh aW50UmVjdCA9IHBhaW50SW5mby5yZWN0OwpAQCAtMjQ2LDcgKzIyNSw3IEBAIHZvaWQgTGluZUxh eW91dDo6cGFpbnQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWlu dE9mZnNldCkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgIGF1dG8gcmVjdCA9IEZs b2F0UmVjdCB7IHJ1bi5sb2dpY2FsUmVjdCgpIH07Ci0gICAgICAgIGF1dG8gdmlzdWFsT3ZlcmZs b3dSZWN0ID0gY29tcHV0ZVZpc3VhbE92ZXJmbG93KHN0eWxlLCByZWN0LCB2aWV3cG9ydFNpemUp OworICAgICAgICBhdXRvIHZpc3VhbE92ZXJmbG93UmVjdCA9IEZsb2F0UmVjdCB7IHJ1bi5pbmtP dmVyZmxvdygpIH07CiAgICAgICAgIGlmIChwYWludFJlY3QueSgpID4gdmlzdWFsT3ZlcmZsb3dS ZWN0Lm1heFkoKSB8fCBwYWludFJlY3QubWF4WSgpIDwgdmlzdWFsT3ZlcmZsb3dSZWN0LnkoKSkK ICAgICAgICAgICAgIGNvbnRpbnVlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9MYXlvdXRTaXplLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9MYXlvdXRTaXplLmgKaW5kZXggNTgyOGZkN2VmYzE2NTg4NzU3ZDQxMDZmYWFkMmI3YWRl YWM2MWZhMS4uNmE5N2ZiNGZhMzc2NTJiNGY5MTFhZWEyNzg4YTYzNmEyMjIyMzcwZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0U2l6ZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0xheW91dFNpemUuaApAQCAtMTg1LDYg KzE4NSwxMSBAQCBpbmxpbmUgSW50U2l6ZSBmbG9vcmVkSW50U2l6ZShjb25zdCBMYXlvdXRTaXpl JiBzKQogICAgIHJldHVybiBJbnRTaXplKHMud2lkdGgoKS5mbG9vcigpLCBzLmhlaWdodCgpLmZs b29yKCkpOwogfQogCitpbmxpbmUgSW50U2l6ZSBjZWlsZWRJbnRTaXplKGNvbnN0IExheW91dFNp emUmIHMpCit7CisgICAgcmV0dXJuIEludFNpemUocy53aWR0aCgpLmNlaWwoKSwgcy5oZWlnaHQo KS5jZWlsKCkpOworfQorCiBpbmxpbmUgSW50U2l6ZSByb3VuZGVkSW50U2l6ZShjb25zdCBMYXlv dXRTaXplJiBzKQogewogICAgIHJldHVybiBJbnRTaXplKHMud2lkdGgoKS5yb3VuZCgpLCBzLmhl aWdodCgpLnJvdW5kKCkpOwo=