198550 2019-06-04 18:40:51 -0700 [LFC][IFC] Move inline item height computation to a dedicated function 2019-06-05 07:47:27 -0700 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 1541820 0 zalan 2019-06-04 18:40:51 -0700 And UncommittedContent should hold the inlineItem size and pass it so the Line. 1541821 1 webkit-bug-importer 2019-06-04 18:41:17 -0700 <rdar://problem/51424223> 1541823 2 371359 zalan 2019-06-04 18:43:32 -0700 Created attachment 371359 Patch 1541969 3 371359 commit-queue 2019-06-05 07:47:25 -0700 Comment on attachment 371359 Patch Clearing flags on attachment: 371359 Committed r246105: <https://trac.webkit.org/changeset/246105> 1541970 4 commit-queue 2019-06-05 07:47:27 -0700 All reviewed patches have been landed. Closing bug. 371359 2019-06-04 18:43:32 -0700 2019-06-05 07:47:25 -0700 Patch bug-198550-20190604184331.patch text/plain 15695 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2U5N2QxZDhkZmI5ZDNk OWMwY2RiOWUwMzFmMmIwNzM5MDVjNjU5NC4uM2IzNTQyZTExOTA1ZGNlNmMzZWU3MDBiODBjZTU5 N2JhOTY0OGIzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA2LTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIGlu bGluZSBpdGVtIGhlaWdodCBjb21wdXRhdGlvbiB0byBhIGRlZGljYXRlZCBmdW5jdGlvbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4NTUwCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS81MTQyNDIyMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgaW5saW5lSXRlbSBoZWlnaHQgdmFsdWUgaXMgbm90 IGF2YWlsYWJsZSBkdXJpbmcgcHJlZmVycmVkIHdpZHRoIGNvbXB1dGF0aW9uIChoZW5jZSBvcHRp b25hbCkuIAorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VW5j b21taXR0ZWRDb250ZW50OjphZGQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjppbmxpbmVJ dGVtV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjppbmxpbmVJdGVtSGVpZ2h0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVM YXlvdXQ6OnBsYWNlSW5saW5lSXRlbXMgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l OjphcHBlbmRJbmxpbmVDb250YWluZXJTdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkxpbmU6OmFwcGVuZElubGluZUNvbnRhaW5lckVuZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmU6OmFwcGVuZFRleHRDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZTo6YXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lOjphcHBlbmRSZXBsYWNlZElubGluZUJveCk6CisgICAgICAgICogbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oOgorCiAyMDE5LTA2LTA0ICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBEZWNvdXBsZSBmbG9hdCBw bGFjZW1lbnQgYW5kIGxpbmUgc2hyaW5raW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQu Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcAppbmRleCA4Yzc4ODRhZDYxNGY0ZmE0MjQ1NTk0MGZl Y2IzNDIyMjNiMzcwNDkxLi4wZTI1MTQ3NThiYWZlYzkwY2E3NzdiNjEzZWFjZWNmYjU0NTdmMWU4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dC5j cHAKQEAgLTQ0LDEwICs0NCwxMCBAQCBuYW1lc3BhY2UgTGF5b3V0IHsKIHN0cnVjdCBVbmNvbW1p dHRlZENvbnRlbnQgewogICAgIHN0cnVjdCBSdW4gewogICAgICAgICBjb25zdCBJbmxpbmVJdGVt JiBpbmxpbmVJdGVtOwotICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aDsKKyAgICAgICAg TGluZTo6SW5saW5lSXRlbVNpemUgc2l6ZTsKICAgICAgICAgLy8gRklYTUU6IGFkZCBvcHRpb25h bCBicmVha2luZyBjb250ZXh0IChzdGFydCBhbmQgZW5kIHBvc2l0aW9uKSBmb3Igc3BsaXQgdGV4 dCBjb250ZW50LgogICAgIH07Ci0gICAgdm9pZCBhZGQoY29uc3QgSW5saW5lSXRlbSYsIExheW91 dFVuaXQgbG9naWNhbFdpZHRoKTsKKyAgICB2b2lkIGFkZChjb25zdCBJbmxpbmVJdGVtJiwgY29u c3QgTGluZTo6SW5saW5lSXRlbVNpemUmKTsKICAgICB2b2lkIHJlc2V0KCk7CiAKICAgICBWZWN0 b3I8UnVuPiBydW5zKCkgeyByZXR1cm4gbV91bmNvbW1pdHRlZFJ1bnM7IH0KQEAgLTYwLDEwICs2 MCwxMCBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQgbV93aWR0aDsKIH07CiAKLXZvaWQgVW5j b21taXR0ZWRDb250ZW50OjphZGQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgTGF5b3V0 VW5pdCBsb2dpY2FsV2lkdGgpCit2b2lkIFVuY29tbWl0dGVkQ29udGVudDo6YWRkKGNvbnN0IElu bGluZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IExpbmU6OklubGluZUl0ZW1TaXplJiBzaXplKQog ewotICAgIG1fdW5jb21taXR0ZWRSdW5zLmFwcGVuZCh7IGlubGluZUl0ZW0sIGxvZ2ljYWxXaWR0 aCB9KTsKLSAgICBtX3dpZHRoICs9IGxvZ2ljYWxXaWR0aDsKKyAgICBtX3VuY29tbWl0dGVkUnVu cy5hcHBlbmQoeyBpbmxpbmVJdGVtLCBzaXplIH0pOworICAgIG1fd2lkdGggKz0gc2l6ZS5sb2dp Y2FsV2lkdGg7CiB9CiAKIHZvaWQgVW5jb21taXR0ZWRDb250ZW50OjpyZXNldCgpCkBAIC0xMDMs MTggKzEwMyw0NCBAQCBzdGF0aWMgTGF5b3V0VW5pdCBpbmxpbmVJdGVtV2lkdGgoY29uc3QgTGF5 b3V0U3RhdGUmIGxheW91dFN0YXRlLCBjb25zdCBJbmxpbmVJdAogICAgIEFTU0VSVChsYXlvdXRT dGF0ZS5oYXNEaXNwbGF5Qm94KGxheW91dEJveCkpOwogICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBs YXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CiAKKyAgICBpZiAo bGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpCisgICAgICAgIHJldHVybiBkaXNwbGF5 Qm94Lm1hcmdpbkJveFdpZHRoKCk7CisKKyAgICBpZiAobGF5b3V0Qm94LmlzUmVwbGFjZWQoKSkK KyAgICAgICAgcmV0dXJuIGRpc3BsYXlCb3gud2lkdGgoKTsKKwogICAgIGlmIChpbmxpbmVJdGVt LmlzQ29udGFpbmVyU3RhcnQoKSkKICAgICAgICAgcmV0dXJuIGRpc3BsYXlCb3gubWFyZ2luU3Rh cnQoKSArIGRpc3BsYXlCb3guYm9yZGVyTGVmdCgpICsgZGlzcGxheUJveC5wYWRkaW5nTGVmdCgp LnZhbHVlT3IoMCk7CiAKICAgICBpZiAoaW5saW5lSXRlbS5pc0NvbnRhaW5lckVuZCgpKQogICAg ICAgICByZXR1cm4gZGlzcGxheUJveC5tYXJnaW5FbmQoKSArIGRpc3BsYXlCb3guYm9yZGVyUmln aHQoKSArIGRpc3BsYXlCb3gucGFkZGluZ1JpZ2h0KCkudmFsdWVPcigwKTsKIAotICAgIGlmIChp bmxpbmVJdGVtLmlzRmxvYXQoKSkKLSAgICAgICAgcmV0dXJuIGRpc3BsYXlCb3gubWFyZ2luQm94 V2lkdGgoKTsKLQorICAgIC8vIE5vbi1yZXBsYWNlZCBpbmxpbmUgYm94IChlLmcuIGlubGluZS1i bG9jaykKICAgICByZXR1cm4gZGlzcGxheUJveC53aWR0aCgpOwogfQogCitzdGF0aWMgTGF5b3V0 VW5pdCBpbmxpbmVJdGVtSGVpZ2h0KGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgY29u c3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSkKK3sKKyAgICBhdXRvJiBmb250TWV0cmljcyA9IGlu bGluZUl0ZW0uc3R5bGUoKS5mb250TWV0cmljcygpOworICAgIGlmIChpbmxpbmVJdGVtLmlzTGlu ZUJyZWFrKCkgfHwgaXM8SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0pKQorICAgICAgICByZXR1 cm4gZm9udE1ldHJpY3MuaGVpZ2h0KCk7CisKKyAgICBhdXRvJiBsYXlvdXRCb3ggPSBpbmxpbmVJ dGVtLmxheW91dEJveCgpOworICAgIEFTU0VSVChsYXlvdXRTdGF0ZS5oYXNEaXNwbGF5Qm94KGxh eW91dEJveCkpOworICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94 Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CisKKyAgICBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQ b3NpdGlvbmVkKCkpCisgICAgICAgIHJldHVybiBkaXNwbGF5Qm94Lm1hcmdpbkJveCgpLmhlaWdo dCgpOworCisgICAgaWYgKGxheW91dEJveC5pc1JlcGxhY2VkKCkpCisgICAgICAgIHJldHVybiBk aXNwbGF5Qm94LmhlaWdodCgpOworCisgICAgaWYgKGlubGluZUl0ZW0uaXNDb250YWluZXJTdGFy dCgpIHx8IGlubGluZUl0ZW0uaXNDb250YWluZXJFbmQoKSkKKyAgICAgICAgcmV0dXJuIGZvbnRN ZXRyaWNzLmhlaWdodCgpICsgZGlzcGxheUJveC52ZXJ0aWNhbEJvcmRlcigpICsgZGlzcGxheUJv eC52ZXJ0aWNhbFBhZGRpbmcoKS52YWx1ZU9yKDApOworCisgICAgLy8gTm9uLXJlcGxhY2VkIGlu bGluZSBib3ggKGUuZy4gaW5saW5lLWJsb2NrKQorICAgIHJldHVybiBkaXNwbGF5Qm94LmhlaWdo dCgpOworfQogCiBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPExpbmU+IGNvbnN0cnVjdExpbmUoY29u c3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBjb25zdCBGbG9hdGluZ1N0YXRlJiBmbG9hdGlu Z1N0YXRlLCBjb25zdCBCb3gmIGZvcm1hdHRpbmdSb290LAogICAgIExheW91dFVuaXQgbGluZUxv Z2ljYWxUb3AsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgpCkBAIC0xNjUsMzggKzE5MSwxOCBA QCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91dDo6TGluZUNvbnRlbnQgSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYQogICAgICAgICBjb21taXR0ZWRJbmxpbmVJdGVtQ291 bnQgKz0gdW5jb21taXR0ZWRDb250ZW50LnNpemUoKTsKICAgICAgICAgZm9yIChhdXRvJiB1bmNv bW1pdHRlZFJ1biA6IHVuY29tbWl0dGVkQ29udGVudC5ydW5zKCkpIHsKICAgICAgICAgICAgIGF1 dG8mIGlubGluZUl0ZW0gPSB1bmNvbW1pdHRlZFJ1bi5pbmxpbmVJdGVtOwotICAgICAgICAgICAg aWYgKGlubGluZUl0ZW0uaXNIYXJkTGluZUJyZWFrKCkpIHsKKyAgICAgICAgICAgIGlmIChpbmxp bmVJdGVtLmlzSGFyZExpbmVCcmVhaygpKQogICAgICAgICAgICAgICAgIGxpbmUtPmFwcGVuZEhh cmRMaW5lQnJlYWsoaW5saW5lSXRlbSk7Ci0gICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAg ICAgICAgICB9Ci0KLSAgICAgICAgICAgIGF1dG8gd2lkdGggPSB1bmNvbW1pdHRlZFJ1bi5sb2dp Y2FsV2lkdGg7Ci0gICAgICAgICAgICBhdXRvJiBmb250TWV0cmljcyA9IGlubGluZUl0ZW0uc3R5 bGUoKS5mb250TWV0cmljcygpOwotICAgICAgICAgICAgaWYgKGlzPElubGluZVRleHRJdGVtPihp bmxpbmVJdGVtKSkgewotICAgICAgICAgICAgICAgIGxpbmUtPmFwcGVuZFRleHRDb250ZW50KGRv d25jYXN0PElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKSwgeyB3aWR0aCwgZm9udE1ldHJpY3Mu aGVpZ2h0KCkgfSk7Ci0gICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICB9Ci0K LSAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUl0ZW0ubGF5b3V0Qm94KCk7Ci0g ICAgICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gbGF5b3V0U3RhdGUoKS5kaXNwbGF5Qm94Rm9y TGF5b3V0Qm94KGxheW91dEJveCk7Ci0KLSAgICAgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzQ29u dGFpbmVyU3RhcnQoKSkgewotICAgICAgICAgICAgICAgIGF1dG8gY29udGFpbmVySGVpZ2h0ID0g Zm9udE1ldHJpY3MuaGVpZ2h0KCkgKyBkaXNwbGF5Qm94LnZlcnRpY2FsQm9yZGVyKCkgKyBkaXNw bGF5Qm94LnZlcnRpY2FsUGFkZGluZygpLnZhbHVlT3IoMCk7Ci0gICAgICAgICAgICAgICAgbGlu ZS0+YXBwZW5kSW5saW5lQ29udGFpbmVyU3RhcnQoaW5saW5lSXRlbSwgeyB3aWR0aCwgY29udGFp bmVySGVpZ2h0IH0pOwotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgfQot Ci0gICAgICAgICAgICBpZiAoaW5saW5lSXRlbS5pc0NvbnRhaW5lckVuZCgpKSB7Ci0gICAgICAg ICAgICAgICAgbGluZS0+YXBwZW5kSW5saW5lQ29udGFpbmVyRW5kKGlubGluZUl0ZW0sIHsgd2lk dGgsIDAgfSk7Ci0gICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICB9Ci0KLSAg ICAgICAgICAgIGlmIChsYXlvdXRCb3guaXNSZXBsYWNlZCgpKSB7Ci0gICAgICAgICAgICAgICAg bGluZS0+YXBwZW5kUmVwbGFjZWRJbmxpbmVCb3goaW5saW5lSXRlbSwgeyB3aWR0aCwgZGlzcGxh eUJveC5oZWlnaHQoKSB9KTsKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAg IH0KLQotICAgICAgICAgICAgbGluZS0+YXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVCb3goaW5saW5l SXRlbSwgeyB3aWR0aCwgZGlzcGxheUJveC5oZWlnaHQoKSB9KTsKKyAgICAgICAgICAgIGVsc2Ug aWYgKGlzPElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKSkKKyAgICAgICAgICAgICAgICBsaW5l LT5hcHBlbmRUZXh0Q29udGVudChkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSks IHVuY29tbWl0dGVkUnVuLnNpemUpOworICAgICAgICAgICAgZWxzZSBpZiAoaW5saW5lSXRlbS5p c0NvbnRhaW5lclN0YXJ0KCkpCisgICAgICAgICAgICAgICAgbGluZS0+YXBwZW5kSW5saW5lQ29u dGFpbmVyU3RhcnQoaW5saW5lSXRlbSwgdW5jb21taXR0ZWRSdW4uc2l6ZSk7CisgICAgICAgICAg ICBlbHNlIGlmIChpbmxpbmVJdGVtLmlzQ29udGFpbmVyRW5kKCkpCisgICAgICAgICAgICAgICAg bGluZS0+YXBwZW5kSW5saW5lQ29udGFpbmVyRW5kKGlubGluZUl0ZW0sIHVuY29tbWl0dGVkUnVu LnNpemUpOworICAgICAgICAgICAgZWxzZSBpZiAoaW5saW5lSXRlbS5sYXlvdXRCb3goKS5pc1Jl cGxhY2VkKCkpCisgICAgICAgICAgICAgICAgbGluZS0+YXBwZW5kUmVwbGFjZWRJbmxpbmVCb3go aW5saW5lSXRlbSwgdW5jb21taXR0ZWRSdW4uc2l6ZSk7CisgICAgICAgICAgICBlbHNlCisgICAg ICAgICAgICAgICAgbGluZS0+YXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVCb3goaW5saW5lSXRlbSwg dW5jb21taXR0ZWRSdW4uc2l6ZSk7CiAgICAgICAgIH0KICAgICAgICAgdW5jb21taXR0ZWRDb250 ZW50LnJlc2V0KCk7CiAgICAgfTsKQEAgLTIxMiwxMCArMjE4LDEwIEBAIElubGluZUZvcm1hdHRp bmdDb250ZXh0OjpMaW5lTGF5b3V0OjpMaW5lQ29udGVudCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDo6TGluZUxhCiAgICAgICAgIGF1dG8gYXZhaWxhYmxlV2lkdGggPSBsaW5lLT5hdmFpbGFibGVX aWR0aCgpIC0gdW5jb21taXR0ZWRDb250ZW50LndpZHRoKCk7CiAgICAgICAgIGF1dG8gY3VycmVu dExvZ2ljYWxSaWdodCA9IGxpbmUtPmNvbnRlbnRMb2dpY2FsUmlnaHQoKSArIHVuY29tbWl0dGVk Q29udGVudC53aWR0aCgpOwogICAgICAgICBhdXRvJiBpbmxpbmVJdGVtID0gbGluZUlucHV0Lmlu bGluZUl0ZW1zW2lubGluZUl0ZW1JbmRleF07Ci0gICAgICAgIGF1dG8gaW5saW5lSXRlbVdpZHRo ID0gV2ViQ29yZTo6TGF5b3V0OjppbmxpbmVJdGVtV2lkdGgobGF5b3V0U3RhdGUoKSwgKmlubGlu ZUl0ZW0sIGN1cnJlbnRMb2dpY2FsUmlnaHQpOworICAgICAgICBhdXRvIGl0ZW1Mb2dpY2FsV2lk dGggPSBpbmxpbmVJdGVtV2lkdGgobGF5b3V0U3RhdGUoKSwgKmlubGluZUl0ZW0sIGN1cnJlbnRM b2dpY2FsUmlnaHQpOwogCiAgICAgICAgIC8vIEZJWE1FOiBFbnN1cmUgTGluZUNvbnRleHQ6OnRy aW1tYWJsZVdpZHRoIGluY2x1ZGVzIHVuY29tbWl0dGVkIGNvbnRlbnQgaWYgbmVlZGVkLgotICAg ICAgICBhdXRvIGJyZWFraW5nQ29udGV4dCA9IGxpbmVCcmVha2VyLmJyZWFraW5nQ29udGV4dCgq aW5saW5lSXRlbSwgaW5saW5lSXRlbVdpZHRoLCB7IGF2YWlsYWJsZVdpZHRoLCBjdXJyZW50TG9n aWNhbFJpZ2h0LCBsaW5lLT50cmFpbGluZ1RyaW1tYWJsZVdpZHRoKCksICFsaW5lLT5oYXNDb250 ZW50KCkgfSk7CisgICAgICAgIGF1dG8gYnJlYWtpbmdDb250ZXh0ID0gbGluZUJyZWFrZXIuYnJl YWtpbmdDb250ZXh0KCppbmxpbmVJdGVtLCBpdGVtTG9naWNhbFdpZHRoLCB7IGF2YWlsYWJsZVdp ZHRoLCBjdXJyZW50TG9naWNhbFJpZ2h0LCBsaW5lLT50cmFpbGluZ1RyaW1tYWJsZVdpZHRoKCks ICFsaW5lLT5oYXNDb250ZW50KCkgfSk7CiAgICAgICAgIGlmIChicmVha2luZ0NvbnRleHQuaXNB dEJyZWFraW5nT3Bwb3J0dW5pdHkpCiAgICAgICAgICAgICBjb21taXRQZW5kaW5nQ29udGVudCgp OwogCkBAIC0yNDMsMTIgKzI0OSwxMiBAQCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxh eW91dDo6TGluZUNvbnRlbnQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYQogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGlubGluZUl0ZW0tPmlzSGFy ZExpbmVCcmVhaygpKSB7Ci0gICAgICAgICAgICB1bmNvbW1pdHRlZENvbnRlbnQuYWRkKCppbmxp bmVJdGVtLCBpbmxpbmVJdGVtV2lkdGgpOworICAgICAgICAgICAgdW5jb21taXR0ZWRDb250ZW50 LmFkZCgqaW5saW5lSXRlbSwgeyBpdGVtTG9naWNhbFdpZHRoLCBpbmxpbmVJdGVtSGVpZ2h0KGxh eW91dFN0YXRlKCksICppbmxpbmVJdGVtKSB9KTsKICAgICAgICAgICAgIGNvbW1pdFBlbmRpbmdD b250ZW50KCk7CiAgICAgICAgICAgICByZXR1cm4gY2xvc2VMaW5lKCk7CiAgICAgICAgIH0KIAot ICAgICAgICB1bmNvbW1pdHRlZENvbnRlbnQuYWRkKCppbmxpbmVJdGVtLCBpbmxpbmVJdGVtV2lk dGgpOworICAgICAgICB1bmNvbW1pdHRlZENvbnRlbnQuYWRkKCppbmxpbmVJdGVtLCB7IGl0ZW1M b2dpY2FsV2lkdGgsIGlubGluZUl0ZW1IZWlnaHQobGF5b3V0U3RhdGUoKSwgKmlubGluZUl0ZW0p IH0pOwogICAgICAgICBpZiAoYnJlYWtpbmdDb250ZXh0LmlzQXRCcmVha2luZ09wcG9ydHVuaXR5 KQogICAgICAgICAgICAgY29tbWl0UGVuZGluZ0NvbnRlbnQoKTsKICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCmlu ZGV4IDJmMGY1ZDVjMDk2YjY5YWQ3YmUwMzRjMjdiZDIxNDQzZGU3ODE1MzcuLjA3NDA1YWU3NDc0 NzFkNTJmYjM1M2FjZTQ5OGEyY2M5Yjg3ZWY2YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCkBAIC0xMTksNyArMTE5 LDcgQEAgdm9pZCBMaW5lOjphcHBlbmROb25CcmVha2FibGVTcGFjZShjb25zdCBJbmxpbmVJdGVt JiBpbmxpbmVJdGVtLCBjb25zdCBEaXNwbGF5OjoKICAgICBtX2NvbnRlbnRMb2dpY2FsV2lkdGgg Kz0gbG9naWNhbFJlY3Qud2lkdGgoKTsKIH0KIAotdm9pZCBMaW5lOjphcHBlbmRJbmxpbmVDb250 YWluZXJTdGFydChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBMYXlvdXRTaXplIHJ1blNp emUpCit2b2lkIExpbmU6OmFwcGVuZElubGluZUNvbnRhaW5lclN0YXJ0KGNvbnN0IElubGluZUl0 ZW0mIGlubGluZUl0ZW0sIElubGluZUl0ZW1TaXplIHJ1blNpemUpCiB7CiAgICAgYXV0byYgbGF5 b3V0Qm94ID0gaW5saW5lSXRlbS5sYXlvdXRCb3goKTsKICAgICBhdXRvJiBzdHlsZSA9IGxheW91 dEJveC5zdHlsZSgpOwpAQCAtMTM4LDE4ICsxMzgsMTggQEAgdm9pZCBMaW5lOjphcHBlbmRJbmxp bmVDb250YWluZXJTdGFydChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBMYXlvdXRTaXpl IHIKICAgICBhbGlnbkFuZEFkanVzdExpbmVIZWlnaHQoKTsKICAgICBhdXRvJiBkaXNwbGF5Qm94 ID0gbV9sYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CiAgICAg YXV0byBsb2dpY2FsVG9wID0gLWZvbnRNZXRyaWNzLmFzY2VudCgpIC0gZGlzcGxheUJveC5ib3Jk ZXJUb3AoKSAtIGRpc3BsYXlCb3gucGFkZGluZ1RvcCgpLnZhbHVlT3IoMCk7Ci0gICAgYXV0byBs b2dpY2FsUmVjdCA9IERpc3BsYXk6OlJlY3QgeyBsb2dpY2FsVG9wLCBjb250ZW50TG9naWNhbFJp Z2h0KCksIHJ1blNpemUud2lkdGgoKSwgcnVuU2l6ZS5oZWlnaHQoKSB9OworICAgIGF1dG8gbG9n aWNhbFJlY3QgPSBEaXNwbGF5OjpSZWN0IHsgbG9naWNhbFRvcCwgY29udGVudExvZ2ljYWxSaWdo dCgpLCBydW5TaXplLmxvZ2ljYWxXaWR0aCwgcnVuU2l6ZS5sb2dpY2FsSGVpZ2h0LnZhbHVlT3Io MCkgfTsKICAgICBhcHBlbmROb25CcmVha2FibGVTcGFjZShpbmxpbmVJdGVtLCBsb2dpY2FsUmVj dCk7CiB9CiAKLXZvaWQgTGluZTo6YXBwZW5kSW5saW5lQ29udGFpbmVyRW5kKGNvbnN0IElubGlu ZUl0ZW0mIGlubGluZUl0ZW0sIExheW91dFNpemUgcnVuU2l6ZSkKK3ZvaWQgTGluZTo6YXBwZW5k SW5saW5lQ29udGFpbmVyRW5kKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGluZUl0 ZW1TaXplIHJ1blNpemUpCiB7CiAgICAgLy8gVGhpcyBpcyByZWFsbHkganVzdCBhIHBsYWNlaG9s ZGVyIHRvIG1hcmsgdGhlIGVuZCBvZiB0aGUgaW5saW5lIGxldmVsIGNvbnRhaW5lci4KLSAgICBh dXRvIGxvZ2ljYWxSZWN0ID0gRGlzcGxheTo6UmVjdCB7IDAsIGNvbnRlbnRMb2dpY2FsUmlnaHQo KSwgcnVuU2l6ZS53aWR0aCgpLCBydW5TaXplLmhlaWdodCgpIH07CisgICAgYXV0byBsb2dpY2Fs UmVjdCA9IERpc3BsYXk6OlJlY3QgeyAwLCBjb250ZW50TG9naWNhbFJpZ2h0KCksIHJ1blNpemUu bG9naWNhbFdpZHRoLCBydW5TaXplLmxvZ2ljYWxIZWlnaHQudmFsdWVPcigwKSB9OwogICAgIGFw cGVuZE5vbkJyZWFrYWJsZVNwYWNlKGlubGluZUl0ZW0sIGxvZ2ljYWxSZWN0KTsKIH0KIAotdm9p ZCBMaW5lOjphcHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lSXRl bSwgTGF5b3V0U2l6ZSBydW5TaXplKQordm9pZCBMaW5lOjphcHBlbmRUZXh0Q29udGVudChjb25z dCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lSXRlbSwgSW5saW5lSXRlbVNpemUgcnVuU2l6ZSkKIHsK ICAgICBhdXRvIGlzVHJpbW1hYmxlID0gVGV4dFV0aWw6OmlzVHJpbW1hYmxlQ29udGVudChpbmxp bmVJdGVtKTsKICAgICBpZiAoIWlzVHJpbW1hYmxlKQpAQCAtMTc3LDcgKzE3Nyw3IEBAIHZvaWQg TGluZTo6YXBwZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZUl0ZW0s IExheW91dFNpemUgcnVuU2l6CiAgICAgLy8gQ29sbGFwc2VkIGxpbmUgaXRlbXMgZG9uJ3QgY29u dHJpYnV0ZSB0byB0aGUgbGluZSB3aWR0aC4KICAgICBhdXRvIGlzQ29tcGxldGVseUNvbGxhcHNl ZCA9IHNob3VsZENvbGxhcHNlQ29tcGxldGVseSgpOwogICAgIGF1dG8gY2FuQmVFeHRlbmRlZCA9 ICFpc0NvbXBsZXRlbHlDb2xsYXBzZWQgJiYgIWlubGluZUl0ZW0uaXNDb2xsYXBzZWQoKTsKLSAg ICBhdXRvIGxvZ2ljYWxSZWN0ID0gRGlzcGxheTo6UmVjdCB7IC1pbmxpbmVJdGVtLnN0eWxlKCku Zm9udE1ldHJpY3MoKS5hc2NlbnQoKSwgY29udGVudExvZ2ljYWxSaWdodCgpLCBydW5TaXplLndp ZHRoKCksIHJ1blNpemUuaGVpZ2h0KCkgfTsKKyAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gRGlzcGxh eTo6UmVjdCB7IC1pbmxpbmVJdGVtLnN0eWxlKCkuZm9udE1ldHJpY3MoKS5hc2NlbnQoKSwgY29u dGVudExvZ2ljYWxSaWdodCgpLCBydW5TaXplLmxvZ2ljYWxXaWR0aCwgcnVuU2l6ZS5sb2dpY2Fs SGVpZ2h0LnZhbHVlT3IoMCkgfTsKICAgICBhdXRvIHRleHRDb250ZXh0ID0gRGlzcGxheTo6UnVu OjpUZXh0Q29udGV4dCB7IGlubGluZUl0ZW0uc3RhcnQoKSwgaW5saW5lSXRlbS5pc0NvbGxhcHNl ZCgpID8gMSA6IGlubGluZUl0ZW0ubGVuZ3RoKCkgfTsKICAgICBhdXRvIGRpc3BsYXlSdW4gPSBE aXNwbGF5OjpSdW4obG9naWNhbFJlY3QsIHRleHRDb250ZXh0KTsKIApAQCAtMTg2LDEzICsxODYs MTMgQEAgdm9pZCBMaW5lOjphcHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYg aW5saW5lSXRlbSwgTGF5b3V0U2l6ZSBydW5TaXoKICAgICAgICAgbV90cmltbWFibGVDb250ZW50 LmFkZChsaW5lSXRlbS5nZXQoKSk7CiAKICAgICBtX2NvbnRlbnQtPnJ1bnMoKS5hcHBlbmQoV1RG TW92ZShsaW5lSXRlbSkpOwotICAgIG1fY29udGVudExvZ2ljYWxXaWR0aCArPSBpc0NvbXBsZXRl bHlDb2xsYXBzZWQgPyBMYXlvdXRVbml0KCkgOiBydW5TaXplLndpZHRoKCk7CisgICAgbV9jb250 ZW50TG9naWNhbFdpZHRoICs9IGlzQ29tcGxldGVseUNvbGxhcHNlZCA/IExheW91dFVuaXQoKSA6 IHJ1blNpemUubG9naWNhbFdpZHRoOwogfQogCi12b2lkIExpbmU6OmFwcGVuZE5vblJlcGxhY2Vk SW5saW5lQm94KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIExheW91dFNpemUgcnVuU2l6 ZSkKK3ZvaWQgTGluZTo6YXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVCb3goY29uc3QgSW5saW5lSXRl bSYgaW5saW5lSXRlbSwgSW5saW5lSXRlbVNpemUgcnVuU2l6ZSkKIHsKKyAgICBhdXRvIGlubGlu ZUJveEhlaWdodCA9IHJ1blNpemUubG9naWNhbEhlaWdodC52YWx1ZU9yKDApOwogICAgIGF1dG8g YWxpZ25BbmRBZGp1c3RMaW5lSGVpZ2h0ID0gWyZdIHsKLSAgICAgICAgYXV0byBpbmxpbmVCb3hI ZWlnaHQgPSBydW5TaXplLmhlaWdodCgpOwogICAgICAgICAvLyBGSVhNRTogV2UgbmVlZCB0byBs b29rIGluc2lkZSB0aGUgaW5saW5lLWJsb2NrJ3MgZm9ybWF0dGluZyBjb250ZXh0IGFuZCBjaGVj ayB0aGUgbGluZWJveGVzIChpZiBhbnkpIHRvIGJlIGFibGUgdG8gYmFzZWxpbmUgYWxpZ24uCiAg ICAgICAgIGlmIChpbmxpbmVJdGVtLmxheW91dEJveCgpLmVzdGFibGlzaGVzSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQoKSkgewogICAgICAgICAgICAgaWYgKGlubGluZUJveEhlaWdodCA9PSBsb2dp Y2FsSGVpZ2h0KCkpCkBAIC0yMDksMTYgKzIwOSwxNiBAQCB2b2lkIExpbmU6OmFwcGVuZE5vblJl cGxhY2VkSW5saW5lQm94KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIExheW91dFNpemUg cgogCiAgICAgYWxpZ25BbmRBZGp1c3RMaW5lSGVpZ2h0KCk7CiAgICAgYXV0byYgZGlzcGxheUJv eCA9IG1fbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJveChpbmxpbmVJdGVtLmxheW91 dEJveCgpKTsKLSAgICBhdXRvIGxvZ2ljYWxUb3AgPSAtcnVuU2l6ZS5oZWlnaHQoKTsKKyAgICBh dXRvIGxvZ2ljYWxUb3AgPSAtaW5saW5lQm94SGVpZ2h0OwogICAgIGF1dG8gaG9yaXpvbnRhbE1h cmdpbiA9IGRpc3BsYXlCb3guaG9yaXpvbnRhbE1hcmdpbigpOwotICAgIGF1dG8gbG9naWNhbFJl Y3QgPSBEaXNwbGF5OjpSZWN0IHsgbG9naWNhbFRvcCwgY29udGVudExvZ2ljYWxSaWdodCgpICsg aG9yaXpvbnRhbE1hcmdpbi5zdGFydCwgcnVuU2l6ZS53aWR0aCgpLCBydW5TaXplLmhlaWdodCgp IH07CisgICAgYXV0byBsb2dpY2FsUmVjdCA9IERpc3BsYXk6OlJlY3QgeyBsb2dpY2FsVG9wLCBj b250ZW50TG9naWNhbFJpZ2h0KCkgKyBob3Jpem9udGFsTWFyZ2luLnN0YXJ0LCBydW5TaXplLmxv Z2ljYWxXaWR0aCwgaW5saW5lQm94SGVpZ2h0IH07CiAKICAgICBtX2NvbnRlbnQtPnJ1bnMoKS5h cHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxDb250ZW50OjpSdW4+KERpc3BsYXk6OlJ1biB7IGxvZ2lj YWxSZWN0IH0sIGlubGluZUl0ZW0sIGZhbHNlLCBmYWxzZSkpOwotICAgIG1fY29udGVudExvZ2lj YWxXaWR0aCArPSAocnVuU2l6ZS53aWR0aCgpICsgaG9yaXpvbnRhbE1hcmdpbi5zdGFydCArIGhv cml6b250YWxNYXJnaW4uZW5kKTsKKyAgICBtX2NvbnRlbnRMb2dpY2FsV2lkdGggKz0gKHJ1blNp emUubG9naWNhbFdpZHRoICsgaG9yaXpvbnRhbE1hcmdpbi5zdGFydCArIGhvcml6b250YWxNYXJn aW4uZW5kKTsKICAgICBtX3RyaW1tYWJsZUNvbnRlbnQuY2xlYXIoKTsKIH0KIAotdm9pZCBMaW5l OjphcHBlbmRSZXBsYWNlZElubGluZUJveChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBM YXlvdXRTaXplIHJ1blNpemUpCit2b2lkIExpbmU6OmFwcGVuZFJlcGxhY2VkSW5saW5lQm94KGNv bnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGluZUl0ZW1TaXplIHJ1blNpemUpCiB7CiAg ICAgLy8gRklYTUUgU3VyZWx5IHJlcGxhY2VkIGJveGVzIGJlaGF2ZSBkaWZmZXJlbnRseS4KICAg ICBhcHBlbmROb25SZXBsYWNlZElubGluZUJveChpbmxpbmVJdGVtLCBydW5TaXplKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaApp bmRleCBiY2ExYmM3MzJlODg4NDNmZGY3ODBjNmMxN2EyMzIzNTc3MTIyZmQyLi41ODU3NDk5ZDY3 OTdjMDYyNzBmYzkxM2E4M2RlNjZlN2I0YWIzNjQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCkBAIC03NSwxMSArNzUsMTUg QEAgcHVibGljOgogICAgIH07CiAgICAgc3RkOjp1bmlxdWVfcHRyPENvbnRlbnQ+IGNsb3NlKCk7 CiAKLSAgICB2b2lkIGFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiwgTGF5 b3V0U2l6ZSk7Ci0gICAgdm9pZCBhcHBlbmROb25SZXBsYWNlZElubGluZUJveChjb25zdCBJbmxp bmVJdGVtJiwgTGF5b3V0U2l6ZSk7Ci0gICAgdm9pZCBhcHBlbmRSZXBsYWNlZElubGluZUJveChj b25zdCBJbmxpbmVJdGVtJiwgTGF5b3V0U2l6ZSk7Ci0gICAgdm9pZCBhcHBlbmRJbmxpbmVDb250 YWluZXJTdGFydChjb25zdCBJbmxpbmVJdGVtJiwgTGF5b3V0U2l6ZSk7Ci0gICAgdm9pZCBhcHBl bmRJbmxpbmVDb250YWluZXJFbmQoY29uc3QgSW5saW5lSXRlbSYsIExheW91dFNpemUpOworICAg IHN0cnVjdCBJbmxpbmVJdGVtU2l6ZSB7CisgICAgICAgIExheW91dFVuaXQgbG9naWNhbFdpZHRo OworICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBsb2dpY2FsSGVpZ2h0OworICAgIH07Cisg ICAgdm9pZCBhcHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYsIElubGluZUl0 ZW1TaXplKTsKKyAgICB2b2lkIGFwcGVuZE5vblJlcGxhY2VkSW5saW5lQm94KGNvbnN0IElubGlu ZUl0ZW0mLCBJbmxpbmVJdGVtU2l6ZSk7CisgICAgdm9pZCBhcHBlbmRSZXBsYWNlZElubGluZUJv eChjb25zdCBJbmxpbmVJdGVtJiwgSW5saW5lSXRlbVNpemUpOworICAgIHZvaWQgYXBwZW5kSW5s aW5lQ29udGFpbmVyU3RhcnQoY29uc3QgSW5saW5lSXRlbSYsIElubGluZUl0ZW1TaXplKTsKKyAg ICB2b2lkIGFwcGVuZElubGluZUNvbnRhaW5lckVuZChjb25zdCBJbmxpbmVJdGVtJiwgSW5saW5l SXRlbVNpemUpOwogICAgIHZvaWQgYXBwZW5kSGFyZExpbmVCcmVhayhjb25zdCBJbmxpbmVJdGVt Jik7CiAKICAgICBib29sIGhhc0NvbnRlbnQoKSBjb25zdCB7IHJldHVybiAhbV9jb250ZW50LT5p c1Zpc3VhbGx5RW1wdHkoKTsgfQo=