204551 2019-11-23 13:01:17 -0800 [LFC][IFC] Replace redundant Line::isVisuallyEmpty() with LineBox::isConsideredEmpty() 2019-11-23 15:39:34 -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 1593226 0 zalan 2019-11-23 13:01:17 -0800 LineBox::isConsideredEmpty() is much cheaper 1593227 1 webkit-bug-importer 2019-11-23 13:01:38 -0800 <rdar://problem/57454620> 1593228 2 384242 zalan 2019-11-23 13:05:29 -0800 Created attachment 384242 Patch 1593238 3 384245 zalan 2019-11-23 15:11:11 -0800 Created attachment 384245 Patch 1593242 4 384245 commit-queue 2019-11-23 15:39:33 -0800 Comment on attachment 384245 Patch Clearing flags on attachment: 384245 Committed r252837: <https://trac.webkit.org/changeset/252837> 1593243 5 commit-queue 2019-11-23 15:39:34 -0800 All reviewed patches have been landed. Closing bug. 384242 2019-11-23 13:05:29 -0800 2019-11-23 15:11:10 -0800 Patch bug-204551-20191123130504.patch text/plain 8598 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyODE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzg5M2I2M2U3MzdkYjFh YmFiMDRiY2E4NTBjYjdkMjk0OTYzMTJkNC4uOTNlNjYxZjkwNTJmYTI5MWU4MGRhZWZjMzQyY2Zh NjFjNWRhNTU0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTExLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZXBsYWNl IHJlZHVuZGFudCBMaW5lOjppc1Zpc3VhbGx5RW1wdHkoKSB3aXRoIExpbmVCb3g6OmlzQ29uc2lk ZXJlZEVtcHR5KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwNDU1MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTc0NTQ2MjA+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQgdHVybnMgb3V0IHRoZSB3 ZSBhbHJlYWR5IGNhY2hlIHRoZSB2aXN1YWxseSBlbXB0eSBzdGF0dXMgaW4gTGluZUJveC4KKwor ICAgICAgICAqIGxheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94Lmg6CisgICAgICAgIChXZWJD b3JlOjpEaXNwbGF5OjpCb3g6OmlzRW1wdHkgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lOjphcHBlbmROb25SZXBsYWNlZElubGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OmlzSW5saW5lQ29udGFpbmVyQ29uc2lkZXJlZEVtcHR5KTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZTo6aXNWaXN1YWxseUVtcHR5IGNvbnN0KTogRGVsZXRlZC4K KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmg6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmlzVmlzdWFsbHlFbXB0eSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6Omhhc0NvbnRlbnQgY29uc3QpOiBEZWxldGVkLgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVMYXlvdXQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lTGF5b3V0OjpwbGFjZUlubGluZUl0ZW0pOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lTGF5b3V0Ojpwcm9jZXNzVW5jb21taXR0ZWRDb250 ZW50KToKKwogMjAxOS0xMS0yMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtMRkNdW0lGQ10gRGVmZXIgcnVuIGhlaWdodC9iYXNlbGluZSBhZGp1c3RtZW50IGNv bXB1dGF0aW9uIHVudGlsIExpbmU6OmNsb3NlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rp c3BsYXl0cmVlL0Rpc3BsYXlCb3guaAppbmRleCAxZjg5MTI4MGMzNTcwOWEzYTNkNDc5ZjU5MTM5 ZTRmYWRjNzUzMzBkLi5kOWM3NjVmM2Y5MjVkYzI4OGIwNjMwYWVjN2EzYzRjODQ0ODJiMDdiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmgKQEAg LTUyLDYgKzUyLDcgQEAgcHVibGljOgogICAgIExheW91dFNpemUgc2l6ZSgpIGNvbnN0IHsgcmV0 dXJuIHsgd2lkdGgoKSwgaGVpZ2h0KCkgfTsgfQogICAgIExheW91dFVuaXQgd2lkdGgoKSBjb25z dCB7IHJldHVybiBib3JkZXJMZWZ0KCkgKyBwYWRkaW5nQm94V2lkdGgoKSArIGJvcmRlclJpZ2h0 KCk7IH0KICAgICBMYXlvdXRVbml0IGhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIGJvcmRlclRvcCgp ICsgcGFkZGluZ0JveEhlaWdodCgpICsgYm9yZGVyQm90dG9tKCk7IH0KKyAgICBib29sIGlzRW1w dHkoKSBjb25zdCB7IHJldHVybiBzaXplKCkuaXNFbXB0eSgpOyB9CiAgICAgUmVjdCByZWN0KCkg Y29uc3QgeyByZXR1cm4geyB0b3AoKSwgbGVmdCgpLCB3aWR0aCgpLCBoZWlnaHQoKSB9OyB9CiAg ICAgUmVjdCByZWN0V2l0aE1hcmdpbigpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCmluZGV4IGUyM2Q5Yjdm NTlkMWViNGI0ZWEwMDg1ZTA5ZTlmMGM1NDJmOTFkODkuLjQ4OThjNGQ3NzI4M2U0NTNkNWU4Nzgw MjIwMmRhMGM1MWJiM2JlYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCkBAIC0yMjMsMTMgKzIyMyw2IEBAIExpbmU6 On5MaW5lKCkKIHsKIH0KIAotc3RhdGljIGJvb2wgaXNJbmxpbmVDb250YWluZXJDb25zaWRlcmVk RW1wdHkoY29uc3QgRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1hdHRpbmdDb250ZXh0LCBjb25zdCBC b3gmIGxheW91dEJveCkKLXsKLSAgICAvLyBOb3RlIHRoYXQgdGhpcyBkb2VzIG5vdCBjaGVjayB3 aGV0aGVyIHRoZSBpbmxpbmUgY29udGFpbmVyIGhhcyBjb250ZW50LiBJdCBzaW1wbHkgY2hlY2tz IGlmIHRoZSBjb250YWluZXIgaXRzZWxmIGlzIGNvbnNpZGVyZWQgZW1wdHkuCi0gICAgYXV0byYg Ym94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dC5nZW9tZXRyeUZvckJveChsYXlvdXRCb3gp OwotICAgIHJldHVybiAhKGJveEdlb21ldHJ5Lmhvcml6b250YWxCb3JkZXIoKSB8fCAoYm94R2Vv bWV0cnkuaG9yaXpvbnRhbFBhZGRpbmcoKSAmJiBib3hHZW9tZXRyeS5ob3Jpem9udGFsUGFkZGlu ZygpLnZhbHVlKCkpKTsKLX0KLQogc3RhdGljIGJvb2wgc2hvdWxkUHJlc2VydmVUcmFpbGluZ0Nv bnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtKQogewogICAgIGlmICgh aW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkpCkBAIC0yNDYsNDEgKzIzOSw2IEBAIHN0YXRp YyBib29sIHNob3VsZFByZXNlcnZlTGVhZGluZ0NvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0m IGlubGluZVRleHRJdGVtKQogICAgIHJldHVybiB3aGl0ZXNwYWNlID09IFdoaXRlU3BhY2U6OlBy ZSB8fCB3aGl0ZXNwYWNlID09IFdoaXRlU3BhY2U6OlByZVdyYXAgfHwgd2hpdGVzcGFjZSA9PSBX aGl0ZVNwYWNlOjpCcmVha1NwYWNlczsKIH0KIAotYm9vbCBMaW5lOjppc1Zpc3VhbGx5RW1wdHko KSBjb25zdAotewotICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBjYWNoZWQgaW5zdGVhZCAt YXMgdGhlIGlubGluZSBpdGVtcyBhcmUgYmVpbmcgYWRkZWQuCi0gICAgLy8gUmV0dXJuIHRydWUg Zm9yIGVtcHR5IGlubGluZSBjb250YWluZXJzIGxpa2UgPHNwYW4+PC9zcGFuPi4KLSAgICBhdXRv JiBmb3JtYXR0aW5nQ29udGV4dCA9IHRoaXMtPmZvcm1hdHRpbmdDb250ZXh0KCk7Ci0gICAgZm9y IChhdXRvJiBydW4gOiBtX2lubGluZUl0ZW1SdW5zKSB7Ci0gICAgICAgIGlmIChydW4tPmlzVGV4 dCgpKSB7Ci0gICAgICAgICAgICBpZiAoIXJ1bi0+aXNDb2xsYXBzZWRUb1plcm9BZHZhbmNlV2lk dGgoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICBjb250aW51 ZTsKLSAgICAgICAgfQotICAgICAgICBpZiAocnVuLT5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKLSAg ICAgICAgICAgIGlmICghaXNJbmxpbmVDb250YWluZXJDb25zaWRlcmVkRW1wdHkoZm9ybWF0dGlu Z0NvbnRleHQsIHJ1bi0+bGF5b3V0Qm94KCkpKQotICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0gICAgICAgIGlmIChydW4tPmlz Q29udGFpbmVyRW5kKCkpCi0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgaWYgKHJ1bi0+ aXNCb3goKSkgewotICAgICAgICAgICAgaWYgKCFydW4tPmxheW91dEJveCgpLmVzdGFibGlzaGVz Rm9ybWF0dGluZ0NvbnRleHQoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg ICAgICAgICBBU1NFUlQocnVuLT5sYXlvdXRCb3goKS5pc0lubGluZUJsb2NrQm94KCkpOwotICAg ICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dC5nZW9tZXRyeUZv ckJveChydW4tPmxheW91dEJveCgpKTsKLSAgICAgICAgICAgIGlmICghYm94R2VvbWV0cnkud2lk dGgoKSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIGlmIChtX3NraXBB bGlnbm1lbnQgfHwgYm94R2VvbWV0cnkuaGVpZ2h0KCkpCi0gICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKHJ1 bi0+aXNGb3JjZWRMaW5lQnJlYWsoKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9 Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KIExpbmU6OlJ1bkxpc3QgTGluZTo6Y2xvc2UoSXNMYXN0 TGluZVdpdGhJbmxpbmVDb250ZW50IGlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCkKIHsKICAg ICAvLyAxLiBSZW1vdmUgdHJpbW1hYmxlIHRyYWlsaW5nIGNvbnRlbnQuCkBAIC01NzUsMTEgKzUz MywxNSBAQCB2b2lkIExpbmU6OmFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVt JiBpbmxpbmVJdGVtLCBMYXlvdXRVbml0IGxvZ2ljYQogCiB2b2lkIExpbmU6OmFwcGVuZE5vblJl cGxhY2VkSW5saW5lQm94KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIExheW91dFVuaXQg bG9naWNhbFdpZHRoKQogewotICAgIGF1dG8gaG9yaXpvbnRhbE1hcmdpbiA9IGZvcm1hdHRpbmdD b250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goaW5saW5lSXRlbS5sYXlvdXRCb3goKSkuaG9yaXpvbnRh bE1hcmdpbigpOworICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUl0ZW0ubGF5b3V0Qm94KCk7 CisgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9y Qm94KGxheW91dEJveCk7CisgICAgYXV0byBob3Jpem9udGFsTWFyZ2luID0gYm94R2VvbWV0cnku aG9yaXpvbnRhbE1hcmdpbigpOwogICAgIG1faW5saW5lSXRlbVJ1bnMuYXBwZW5kKG1ha2VVbmlx dWU8SW5saW5lSXRlbVJ1bj4oaW5saW5lSXRlbSwgRGlzcGxheTo6UmVjdCB7IDAsIGNvbnRlbnRM b2dpY2FsV2lkdGgoKSArIGhvcml6b250YWxNYXJnaW4uc3RhcnQsIGxvZ2ljYWxXaWR0aCwgeyB9 IH0pKTsKICAgICBtX2xpbmVCb3guZXhwYW5kSG9yaXpvbnRhbGx5KGxvZ2ljYWxXaWR0aCArIGhv cml6b250YWxNYXJnaW4uc3RhcnQgKyBob3Jpem9udGFsTWFyZ2luLmVuZCk7CiAgICAgbV9saW5l Qm94LnNldElzQ29uc2lkZXJlZE5vbkVtcHR5KCk7CiAgICAgbV90cmltbWFibGVDb250ZW50LmNs ZWFyKCk7CisgICAgaWYgKCFsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgp IHx8ICFib3hHZW9tZXRyeS5pc0VtcHR5KCkpCisgICAgICAgIG1fbGluZUJveC5zZXRJc0NvbnNp ZGVyZWROb25FbXB0eSgpOwogfQogCiB2b2lkIExpbmU6OmFwcGVuZFJlcGxhY2VkSW5saW5lQm94 KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIExheW91dFVuaXQgbG9naWNhbFdpZHRoKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZS5oCmluZGV4IDZkOWE0ZDU4M2I1YzNjYzY2MDIzNjA0MGQxNzFkMjQ3NmRlZjY0YWEuLmI0NWQ2 ZjAzYTk2ZjIzYTRjODViMjFkMmYzMDkxMjdjZjVkOTQ1NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKQEAgLTU5LDcgKzU5 LDcgQEAgcHVibGljOgogICAgIH5MaW5lKCk7CiAKICAgICB2b2lkIGFwcGVuZChjb25zdCBJbmxp bmVJdGVtJiwgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwotICAgIGJvb2wgaGFzQ29udGVudCgp IGNvbnN0IHsgcmV0dXJuICFpc1Zpc3VhbGx5RW1wdHkoKTsgfQorICAgIGJvb2wgaXNWaXN1YWxs eUVtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9saW5lQm94LmlzQ29uc2lkZXJlZEVtcHR5KCk7IH0K ICAgICBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKCkgY29uc3QgeyByZXR1cm4gbG9naWNhbFdp ZHRoKCkgLSBjb250ZW50TG9naWNhbFdpZHRoKCk7IH0KIAogICAgIExheW91dFVuaXQgdHJhaWxp bmdUcmltbWFibGVXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fdHJpbW1hYmxlQ29udGVudC53aWR0 aCgpOyB9CkBAIC0xNDAsNyArMTQwLDYgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgYWRqdXN0QmFz ZWxpbmVBbmRMaW5lSGVpZ2h0KGNvbnN0IFJ1biYpOwogICAgIExheW91dFVuaXQgcnVuQ29udGVu dEhlaWdodChjb25zdCBSdW4mKSBjb25zdDsKLSAgICBib29sIGlzVmlzdWFsbHlFbXB0eSgpIGNv bnN0OwogCiAgICAgYm9vbCBpc1RleHRBbGlnbkp1c3RpZnkoKSBjb25zdCB7IHJldHVybiBtX2hv cml6b250YWxBbGlnbm1lbnQgPT0gVGV4dEFsaWduTW9kZTo6SnVzdGlmeTsgfTsKICAgICB2b2lk IGp1c3RpZnlSdW5zKFJ1bkxpc3QmKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUxheW91dC5jcHAKaW5kZXgg NzVlYjU0ODhhM2VlMTkyZjVkMDcyNDBlOTU4ZjM1MzE0NjMwNmFhMC4uNTRlM2YzOWY4MDVjODkz NTA5NzgyY2Q4ZDYzZGUxM2NjMWM4MjQ2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUxheW91dC5jcHAKQEAgLTE3 Nyw3ICsxNzcsNyBAQCBMaW5lTGF5b3V0OjpJc0VuZE9mTGluZSBMaW5lTGF5b3V0OjpwbGFjZUlu bGluZUl0ZW0oY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbQogICAgICAgICAgICAgaWYgKHBy b2Nlc3NVbmNvbW1pdHRlZENvbnRlbnQoKSA9PSBJc0VuZE9mTGluZTo6WWVzKQogICAgICAgICAg ICAgICAgIHJldHVybiBJc0VuZE9mTGluZTo6WWVzOwogICAgICAgICB9Ci0gICAgICAgIGF1dG8g bGluZUlzQ29uc2lkZXJlZEVtcHR5ID0gIW1fbGluZS5oYXNDb250ZW50KCkgJiYgIW1fbGluZUhh c0ludHJ1c2l2ZUZsb2F0OworICAgICAgICBhdXRvIGxpbmVJc0NvbnNpZGVyZWRFbXB0eSA9IG1f bGluZS5pc1Zpc3VhbGx5RW1wdHkoKSAmJiAhbV9saW5lSGFzSW50cnVzaXZlRmxvYXQ7CiAgICAg ICAgIGlmIChMaW5lQnJlYWtlcigpLnNob3VsZFdyYXBGbG9hdEJveChpdGVtTG9naWNhbFdpZHRo LCBtX2xpbmUuYXZhaWxhYmxlV2lkdGgoKSArIG1fbGluZS50cmFpbGluZ1RyaW1tYWJsZVdpZHRo KCksIGxpbmVJc0NvbnNpZGVyZWRFbXB0eSkpCiAgICAgICAgICAgICByZXR1cm4gSXNFbmRPZkxp bmU6OlllczsKIApAQCAtMjEzLDcgKzIxMyw3IEBAIExpbmVMYXlvdXQ6OklzRW5kT2ZMaW5lIExp bmVMYXlvdXQ6OnBsYWNlSW5saW5lSXRlbShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtCiBM aW5lTGF5b3V0OjpJc0VuZE9mTGluZSBMaW5lTGF5b3V0Ojpwcm9jZXNzVW5jb21taXR0ZWRDb250 ZW50KCkKIHsKICAgICAvLyBDaGVjayBpZiB0aGUgcGVuZGluZyBjb250ZW50IGZpdHMuCi0gICAg YXV0byBsaW5lSXNDb25zaWRlcmVkRW1wdHkgPSAhbV9saW5lLmhhc0NvbnRlbnQoKSAmJiAhbV9s aW5lSGFzSW50cnVzaXZlRmxvYXQ7CisgICAgYXV0byBsaW5lSXNDb25zaWRlcmVkRW1wdHkgPSBt X2xpbmUuaXNWaXN1YWxseUVtcHR5KCkgJiYgIW1fbGluZUhhc0ludHJ1c2l2ZUZsb2F0OwogICAg IGF1dG8gYnJlYWtpbmdDb250ZXh0ID0gTGluZUJyZWFrZXIoKS5icmVha2luZ0NvbnRleHRGb3JJ bmxpbmVDb250ZW50KG1fdW5jb21taXR0ZWRDb250ZW50LnJ1bnMoKSwgbV91bmNvbW1pdHRlZENv bnRlbnQud2lkdGgoKSwgbV9saW5lLmF2YWlsYWJsZVdpZHRoKCksIGxpbmVJc0NvbnNpZGVyZWRF bXB0eSk7CiAgICAgLy8gVGhlIHVuY29tbWl0dGVkIGNvbnRlbnQgY2FuIGZ1bGx5LCBwYXJ0aWFs bHkgZml0IHRoZSBjdXJyZW50IGxpbmUgKGNvbW1pdC9wYXJ0aWFsIGNvbW1pdCkgb3Igbm90IGF0 IGFsbCAocmVzZXQpLgogICAgIGlmIChicmVha2luZ0NvbnRleHQuY29udGVudEJyZWFrID09IExp bmVCcmVha2VyOjpCcmVha2luZ0NvbnRleHQ6OkNvbnRlbnRCcmVhazo6S2VlcCkK 384245 2019-11-23 15:11:11 -0800 2019-11-23 15:39:33 -0800 Patch bug-204551-20191123151046.patch text/plain 8598 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyODM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGEwM2VjYTFiNzYyZmU0 Nzg0NTY5MzRjYWFlNjIzZjdmZDg0MWFjMS4uNTcwNDI3MWFkYmI5OWQ1NjQ4ODQ3ZWZiZjhkYTE0 MjI0ZjY5MmYzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTExLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZXBsYWNl IHJlZHVuZGFudCBMaW5lOjppc1Zpc3VhbGx5RW1wdHkoKSB3aXRoIExpbmVCb3g6OmlzQ29uc2lk ZXJlZEVtcHR5KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwNDU1MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTc0NTQ2MjA+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgSXQgdHVybnMgb3V0IHRoZSB3 ZSBhbHJlYWR5IGNhY2hlIHRoZSB2aXN1YWxseSBlbXB0eSBzdGF0dXMgaW4gTGluZUJveC4KKwor ICAgICAgICAqIGxheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94Lmg6CisgICAgICAgIChXZWJD b3JlOjpEaXNwbGF5OjpCb3g6OmlzRW1wdHkgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lOjphcHBlbmROb25SZXBsYWNlZElubGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OmlzSW5saW5lQ29udGFpbmVyQ29uc2lkZXJlZEVtcHR5KTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZTo6aXNWaXN1YWxseUVtcHR5IGNvbnN0KTogRGVsZXRlZC4K KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmg6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmlzVmlzdWFsbHlFbXB0eSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6Omhhc0NvbnRlbnQgY29uc3QpOiBEZWxldGVkLgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVMYXlvdXQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lTGF5b3V0OjpwbGFjZUlubGluZUl0ZW0pOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lTGF5b3V0Ojpwcm9jZXNzVW5jb21taXR0ZWRDb250 ZW50KToKKwogMjAxOS0xMS0yMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtMRkNdW0lGQ10gRGVmZXIgcnVuIGhlaWdodC9iYXNlbGluZSBhZGp1c3RtZW50IGNv bXB1dGF0aW9uIHVudGlsIExpbmU6OmNsb3NlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rp c3BsYXl0cmVlL0Rpc3BsYXlCb3guaAppbmRleCAxZjg5MTI4MGMzNTcwOWEzYTNkNDc5ZjU5MTM5 ZTRmYWRjNzUzMzBkLi5kOWM3NjVmM2Y5MjVkYzI4OGIwNjMwYWVjN2EzYzRjODQ0ODJiMDdiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmgKQEAg LTUyLDYgKzUyLDcgQEAgcHVibGljOgogICAgIExheW91dFNpemUgc2l6ZSgpIGNvbnN0IHsgcmV0 dXJuIHsgd2lkdGgoKSwgaGVpZ2h0KCkgfTsgfQogICAgIExheW91dFVuaXQgd2lkdGgoKSBjb25z dCB7IHJldHVybiBib3JkZXJMZWZ0KCkgKyBwYWRkaW5nQm94V2lkdGgoKSArIGJvcmRlclJpZ2h0 KCk7IH0KICAgICBMYXlvdXRVbml0IGhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIGJvcmRlclRvcCgp ICsgcGFkZGluZ0JveEhlaWdodCgpICsgYm9yZGVyQm90dG9tKCk7IH0KKyAgICBib29sIGlzRW1w dHkoKSBjb25zdCB7IHJldHVybiBzaXplKCkuaXNFbXB0eSgpOyB9CiAgICAgUmVjdCByZWN0KCkg Y29uc3QgeyByZXR1cm4geyB0b3AoKSwgbGVmdCgpLCB3aWR0aCgpLCBoZWlnaHQoKSB9OyB9CiAg ICAgUmVjdCByZWN0V2l0aE1hcmdpbigpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCmluZGV4IGUyM2Q5Yjdm NTlkMWViNGI0ZWEwMDg1ZTA5ZTlmMGM1NDJmOTFkODkuLjQ4OThjNGQ3NzI4M2U0NTNkNWU4Nzgw MjIwMmRhMGM1MWJiM2JlYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCkBAIC0yMjMsMTMgKzIyMyw2IEBAIExpbmU6 On5MaW5lKCkKIHsKIH0KIAotc3RhdGljIGJvb2wgaXNJbmxpbmVDb250YWluZXJDb25zaWRlcmVk RW1wdHkoY29uc3QgRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1hdHRpbmdDb250ZXh0LCBjb25zdCBC b3gmIGxheW91dEJveCkKLXsKLSAgICAvLyBOb3RlIHRoYXQgdGhpcyBkb2VzIG5vdCBjaGVjayB3 aGV0aGVyIHRoZSBpbmxpbmUgY29udGFpbmVyIGhhcyBjb250ZW50LiBJdCBzaW1wbHkgY2hlY2tz IGlmIHRoZSBjb250YWluZXIgaXRzZWxmIGlzIGNvbnNpZGVyZWQgZW1wdHkuCi0gICAgYXV0byYg Ym94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dC5nZW9tZXRyeUZvckJveChsYXlvdXRCb3gp OwotICAgIHJldHVybiAhKGJveEdlb21ldHJ5Lmhvcml6b250YWxCb3JkZXIoKSB8fCAoYm94R2Vv bWV0cnkuaG9yaXpvbnRhbFBhZGRpbmcoKSAmJiBib3hHZW9tZXRyeS5ob3Jpem9udGFsUGFkZGlu ZygpLnZhbHVlKCkpKTsKLX0KLQogc3RhdGljIGJvb2wgc2hvdWxkUHJlc2VydmVUcmFpbGluZ0Nv bnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtKQogewogICAgIGlmICgh aW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkpCkBAIC0yNDYsNDEgKzIzOSw2IEBAIHN0YXRp YyBib29sIHNob3VsZFByZXNlcnZlTGVhZGluZ0NvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0m IGlubGluZVRleHRJdGVtKQogICAgIHJldHVybiB3aGl0ZXNwYWNlID09IFdoaXRlU3BhY2U6OlBy ZSB8fCB3aGl0ZXNwYWNlID09IFdoaXRlU3BhY2U6OlByZVdyYXAgfHwgd2hpdGVzcGFjZSA9PSBX aGl0ZVNwYWNlOjpCcmVha1NwYWNlczsKIH0KIAotYm9vbCBMaW5lOjppc1Zpc3VhbGx5RW1wdHko KSBjb25zdAotewotICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBjYWNoZWQgaW5zdGVhZCAt YXMgdGhlIGlubGluZSBpdGVtcyBhcmUgYmVpbmcgYWRkZWQuCi0gICAgLy8gUmV0dXJuIHRydWUg Zm9yIGVtcHR5IGlubGluZSBjb250YWluZXJzIGxpa2UgPHNwYW4+PC9zcGFuPi4KLSAgICBhdXRv JiBmb3JtYXR0aW5nQ29udGV4dCA9IHRoaXMtPmZvcm1hdHRpbmdDb250ZXh0KCk7Ci0gICAgZm9y IChhdXRvJiBydW4gOiBtX2lubGluZUl0ZW1SdW5zKSB7Ci0gICAgICAgIGlmIChydW4tPmlzVGV4 dCgpKSB7Ci0gICAgICAgICAgICBpZiAoIXJ1bi0+aXNDb2xsYXBzZWRUb1plcm9BZHZhbmNlV2lk dGgoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICBjb250aW51 ZTsKLSAgICAgICAgfQotICAgICAgICBpZiAocnVuLT5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKLSAg ICAgICAgICAgIGlmICghaXNJbmxpbmVDb250YWluZXJDb25zaWRlcmVkRW1wdHkoZm9ybWF0dGlu Z0NvbnRleHQsIHJ1bi0+bGF5b3V0Qm94KCkpKQotICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0gICAgICAgIGlmIChydW4tPmlz Q29udGFpbmVyRW5kKCkpCi0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgaWYgKHJ1bi0+ aXNCb3goKSkgewotICAgICAgICAgICAgaWYgKCFydW4tPmxheW91dEJveCgpLmVzdGFibGlzaGVz Rm9ybWF0dGluZ0NvbnRleHQoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg ICAgICAgICBBU1NFUlQocnVuLT5sYXlvdXRCb3goKS5pc0lubGluZUJsb2NrQm94KCkpOwotICAg ICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dC5nZW9tZXRyeUZv ckJveChydW4tPmxheW91dEJveCgpKTsKLSAgICAgICAgICAgIGlmICghYm94R2VvbWV0cnkud2lk dGgoKSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIGlmIChtX3NraXBB bGlnbm1lbnQgfHwgYm94R2VvbWV0cnkuaGVpZ2h0KCkpCi0gICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKHJ1 bi0+aXNGb3JjZWRMaW5lQnJlYWsoKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9 Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KIExpbmU6OlJ1bkxpc3QgTGluZTo6Y2xvc2UoSXNMYXN0 TGluZVdpdGhJbmxpbmVDb250ZW50IGlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCkKIHsKICAg ICAvLyAxLiBSZW1vdmUgdHJpbW1hYmxlIHRyYWlsaW5nIGNvbnRlbnQuCkBAIC01NzUsMTEgKzUz MywxNSBAQCB2b2lkIExpbmU6OmFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVt JiBpbmxpbmVJdGVtLCBMYXlvdXRVbml0IGxvZ2ljYQogCiB2b2lkIExpbmU6OmFwcGVuZE5vblJl cGxhY2VkSW5saW5lQm94KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIExheW91dFVuaXQg bG9naWNhbFdpZHRoKQogewotICAgIGF1dG8gaG9yaXpvbnRhbE1hcmdpbiA9IGZvcm1hdHRpbmdD b250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goaW5saW5lSXRlbS5sYXlvdXRCb3goKSkuaG9yaXpvbnRh bE1hcmdpbigpOworICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUl0ZW0ubGF5b3V0Qm94KCk7 CisgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9y Qm94KGxheW91dEJveCk7CisgICAgYXV0byBob3Jpem9udGFsTWFyZ2luID0gYm94R2VvbWV0cnku aG9yaXpvbnRhbE1hcmdpbigpOwogICAgIG1faW5saW5lSXRlbVJ1bnMuYXBwZW5kKG1ha2VVbmlx dWU8SW5saW5lSXRlbVJ1bj4oaW5saW5lSXRlbSwgRGlzcGxheTo6UmVjdCB7IDAsIGNvbnRlbnRM b2dpY2FsV2lkdGgoKSArIGhvcml6b250YWxNYXJnaW4uc3RhcnQsIGxvZ2ljYWxXaWR0aCwgeyB9 IH0pKTsKICAgICBtX2xpbmVCb3guZXhwYW5kSG9yaXpvbnRhbGx5KGxvZ2ljYWxXaWR0aCArIGhv cml6b250YWxNYXJnaW4uc3RhcnQgKyBob3Jpem9udGFsTWFyZ2luLmVuZCk7CiAgICAgbV9saW5l Qm94LnNldElzQ29uc2lkZXJlZE5vbkVtcHR5KCk7CiAgICAgbV90cmltbWFibGVDb250ZW50LmNs ZWFyKCk7CisgICAgaWYgKCFsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgp IHx8ICFib3hHZW9tZXRyeS5pc0VtcHR5KCkpCisgICAgICAgIG1fbGluZUJveC5zZXRJc0NvbnNp ZGVyZWROb25FbXB0eSgpOwogfQogCiB2b2lkIExpbmU6OmFwcGVuZFJlcGxhY2VkSW5saW5lQm94 KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIExheW91dFVuaXQgbG9naWNhbFdpZHRoKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZS5oCmluZGV4IDZkOWE0ZDU4M2I1YzNjYzY2MDIzNjA0MGQxNzFkMjQ3NmRlZjY0YWEuLmI0NWQ2 ZjAzYTk2ZjIzYTRjODViMjFkMmYzMDkxMjdjZjVkOTQ1NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKQEAgLTU5LDcgKzU5 LDcgQEAgcHVibGljOgogICAgIH5MaW5lKCk7CiAKICAgICB2b2lkIGFwcGVuZChjb25zdCBJbmxp bmVJdGVtJiwgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwotICAgIGJvb2wgaGFzQ29udGVudCgp IGNvbnN0IHsgcmV0dXJuICFpc1Zpc3VhbGx5RW1wdHkoKTsgfQorICAgIGJvb2wgaXNWaXN1YWxs eUVtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9saW5lQm94LmlzQ29uc2lkZXJlZEVtcHR5KCk7IH0K ICAgICBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKCkgY29uc3QgeyByZXR1cm4gbG9naWNhbFdp ZHRoKCkgLSBjb250ZW50TG9naWNhbFdpZHRoKCk7IH0KIAogICAgIExheW91dFVuaXQgdHJhaWxp bmdUcmltbWFibGVXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fdHJpbW1hYmxlQ29udGVudC53aWR0 aCgpOyB9CkBAIC0xNDAsNyArMTQwLDYgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgYWRqdXN0QmFz ZWxpbmVBbmRMaW5lSGVpZ2h0KGNvbnN0IFJ1biYpOwogICAgIExheW91dFVuaXQgcnVuQ29udGVu dEhlaWdodChjb25zdCBSdW4mKSBjb25zdDsKLSAgICBib29sIGlzVmlzdWFsbHlFbXB0eSgpIGNv bnN0OwogCiAgICAgYm9vbCBpc1RleHRBbGlnbkp1c3RpZnkoKSBjb25zdCB7IHJldHVybiBtX2hv cml6b250YWxBbGlnbm1lbnQgPT0gVGV4dEFsaWduTW9kZTo6SnVzdGlmeTsgfTsKICAgICB2b2lk IGp1c3RpZnlSdW5zKFJ1bkxpc3QmKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUxheW91dC5jcHAKaW5kZXgg NzVlYjU0ODhhM2VlMTkyZjVkMDcyNDBlOTU4ZjM1MzE0NjMwNmFhMC4uNTRlM2YzOWY4MDVjODkz NTA5NzgyY2Q4ZDYzZGUxM2NjMWM4MjQ2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUxheW91dC5jcHAKQEAgLTE3 Nyw3ICsxNzcsNyBAQCBMaW5lTGF5b3V0OjpJc0VuZE9mTGluZSBMaW5lTGF5b3V0OjpwbGFjZUlu bGluZUl0ZW0oY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbQogICAgICAgICAgICAgaWYgKHBy b2Nlc3NVbmNvbW1pdHRlZENvbnRlbnQoKSA9PSBJc0VuZE9mTGluZTo6WWVzKQogICAgICAgICAg ICAgICAgIHJldHVybiBJc0VuZE9mTGluZTo6WWVzOwogICAgICAgICB9Ci0gICAgICAgIGF1dG8g bGluZUlzQ29uc2lkZXJlZEVtcHR5ID0gIW1fbGluZS5oYXNDb250ZW50KCkgJiYgIW1fbGluZUhh c0ludHJ1c2l2ZUZsb2F0OworICAgICAgICBhdXRvIGxpbmVJc0NvbnNpZGVyZWRFbXB0eSA9IG1f bGluZS5pc1Zpc3VhbGx5RW1wdHkoKSAmJiAhbV9saW5lSGFzSW50cnVzaXZlRmxvYXQ7CiAgICAg ICAgIGlmIChMaW5lQnJlYWtlcigpLnNob3VsZFdyYXBGbG9hdEJveChpdGVtTG9naWNhbFdpZHRo LCBtX2xpbmUuYXZhaWxhYmxlV2lkdGgoKSArIG1fbGluZS50cmFpbGluZ1RyaW1tYWJsZVdpZHRo KCksIGxpbmVJc0NvbnNpZGVyZWRFbXB0eSkpCiAgICAgICAgICAgICByZXR1cm4gSXNFbmRPZkxp bmU6OlllczsKIApAQCAtMjEzLDcgKzIxMyw3IEBAIExpbmVMYXlvdXQ6OklzRW5kT2ZMaW5lIExp bmVMYXlvdXQ6OnBsYWNlSW5saW5lSXRlbShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtCiBM aW5lTGF5b3V0OjpJc0VuZE9mTGluZSBMaW5lTGF5b3V0Ojpwcm9jZXNzVW5jb21taXR0ZWRDb250 ZW50KCkKIHsKICAgICAvLyBDaGVjayBpZiB0aGUgcGVuZGluZyBjb250ZW50IGZpdHMuCi0gICAg YXV0byBsaW5lSXNDb25zaWRlcmVkRW1wdHkgPSAhbV9saW5lLmhhc0NvbnRlbnQoKSAmJiAhbV9s aW5lSGFzSW50cnVzaXZlRmxvYXQ7CisgICAgYXV0byBsaW5lSXNDb25zaWRlcmVkRW1wdHkgPSBt X2xpbmUuaXNWaXN1YWxseUVtcHR5KCkgJiYgIW1fbGluZUhhc0ludHJ1c2l2ZUZsb2F0OwogICAg IGF1dG8gYnJlYWtpbmdDb250ZXh0ID0gTGluZUJyZWFrZXIoKS5icmVha2luZ0NvbnRleHRGb3JJ bmxpbmVDb250ZW50KG1fdW5jb21taXR0ZWRDb250ZW50LnJ1bnMoKSwgbV91bmNvbW1pdHRlZENv bnRlbnQud2lkdGgoKSwgbV9saW5lLmF2YWlsYWJsZVdpZHRoKCksIGxpbmVJc0NvbnNpZGVyZWRF bXB0eSk7CiAgICAgLy8gVGhlIHVuY29tbWl0dGVkIGNvbnRlbnQgY2FuIGZ1bGx5LCBwYXJ0aWFs bHkgZml0IHRoZSBjdXJyZW50IGxpbmUgKGNvbW1pdC9wYXJ0aWFsIGNvbW1pdCkgb3Igbm90IGF0 IGFsbCAocmVzZXQpLgogICAgIGlmIChicmVha2luZ0NvbnRleHQuY29udGVudEJyZWFrID09IExp bmVCcmVha2VyOjpCcmVha2luZ0NvbnRleHQ6OkNvbnRlbnRCcmVhazo6S2VlcCkK