203183 2019-10-19 13:07:51 -0700 [LFC][IFC] Move the collapsed bit from InlineItems to runs 2019-10-20 08:00:40 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1581727 0 zalan 2019-10-19 13:07:51 -0700 This way when collapsing style change, we don't have to re-traverse the IFC tree to collect the InlineItems. 1581728 1 webkit-bug-importer 2019-10-19 13:08:55 -0700 <rdar://problem/56437181> 1581731 2 381375 zalan 2019-10-19 13:30:34 -0700 Created attachment 381375 Patch 1581767 3 381375 koivisto 2019-10-20 00:34:33 -0700 Comment on attachment 381375 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381375&action=review > Source/WebCore/ChangeLog:3 > + [LFC][IFC] Move the collapsed bit from InlineItems to runs LayoutTests/imported/w3c/web-platform-tests/css/css-text/white-space has good test coverage for this stuff. Would be good to get them running. > Source/WebCore/ChangeLog:12 > + This patch also fixes leading/training content preservation. typo 'trailing' 1581771 4 zalan 2019-10-20 07:56:38 -0700 Committed r251329: <https://trac.webkit.org/changeset/251329> 1581772 5 zalan 2019-10-20 08:00:40 -0700 (In reply to Antti Koivisto from comment #3) > Comment on attachment 381375 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=381375&action=review > > > Source/WebCore/ChangeLog:3 > > + [LFC][IFC] Move the collapsed bit from InlineItems to runs > > LayoutTests/imported/w3c/web-platform-tests/css/css-text/white-space has > good test coverage for this stuff. Would be good to get them running. > I am going to land a few more changes and test-run WPT to see what passes. 381375 2019-10-19 13:30:34 -0700 2019-10-20 00:34:33 -0700 Patch bug-203183-20191019133031.patch text/plain 15080 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxMzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGEwNmU3Y2NlZTM4ZGJl MjhiM2EyZjBlNjc5MjBiMmJiNDliNDgwMS4uM2QzMzBjNmNkYjk3YjkzM2JlYzNlNDZjNGVhZDBh ODc0ZjY2YjM1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE5LTEwLTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIHRo ZSBjb2xsYXBzZWQgYml0IGZyb20gSW5saW5lSXRlbXMgdG8gcnVucworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzMTgzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NjQzNzE4MT4K KworICAgICAgICBMZXQncyBub3Qgc3RvcmUgdGhlIGNvbGxhcHNlZCBiaXQgb24gdGhlIElubGlu ZVRleHRJdGVtLiBBbGwgd2UgbmVlZCB0byBrbm93IGlzIHdoZXRoZXIgdGhlIElubGluZVRleHRJ dGVtIGNvbnRlbnQgaXMgY29sbGFwc2libGUgb3Igbm90LgorICAgICAgICBBbHNvIHdoZW4gb25s eSB0aGUgd2hpdGUtc3BhY2UgcHJvcGVydHkgY2hhbmdlcyAoZ29pbmcgZnJvbSBwcmVzZXJ2ZSB3 aGl0ZXNwYWNlIHRvIG5vdCBhbmQgdmljZSB2ZXJzYSkgd2UgZG9uJ3QgYWN0dWFsbHkgbmVlZCB0 byByZWJ1aWxkIHRoZQorICAgICAgICBJbmxpbkl0ZW0gbGlzdCBzaW5jZSB0aGV5IGRvbid0IGNh cnJ5IGFueSBsYXlvdXQgZGVwZW5kZW50IGluZm9ybWF0aW9uLgorICAgICAgICBUaGlzIHBhdGNo IGFsc28gZml4ZXMgbGVhZGluZy90cmFpbmluZyBjb250ZW50IHByZXNlcnZhdGlvbi4gCisKKyAg ICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjpjYW5CZUV4dGVuZGVkIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6c2hvdWxkUHJlc2VydmVUcmFpbGluZ0NvbnRlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpzaG91bGRQcmVzZXJ2ZUxlYWRpbmdDb250ZW50KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kVGV4dENvbnRlbnQpOgorICAgICAg ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZTo6UnVuOjppc0NvbGxhcHNlZCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxpbmU6OlJ1bjo6c2V0SXNDb2xsYXBzZWQpOgorICAgICAgICAqIGxheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjppbmxpbmVJdGVtV2lkdGgpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZVRleHRJdGVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lVGV4dEl0ZW06OmNyZWF0ZUFuZEFwcGVuZFRleHRJdGVtcyk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OklubGluZVRleHRJdGVtOjpJbmxpbmVUZXh0SXRlbSk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZVRleHRJdGVtOjpzcGxpdCBjb25zdCk6CisgICAgICAgICogbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uaDoKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OmlzQ29sbGFwc2libGUgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVUZXh0SXRlbTo6aXNDb2xsYXBzZWQgY29uc3QpOiBEZWxl dGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUZXh0VXRpbDo6aXNUcmltbWFibGVDb250ZW50 KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0L1RleHRV dGlsLmg6CisKIDIwMTktMTAtMTkgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgSW50ZWdyYXRlIG1lZGlhIHF1ZXJ5IGV2YWx1YXRpb24gaW50byBIVE1MNSBldmVu dCBsb29wCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmUuY3BwCmluZGV4IGFkODliZTliNWIzYjQ5MGY3YzY3MWUyYjM2OGNhN2MzMmFh ZDU1YmIuLjA1OTYzMmNhMGZkYTZjMzNhYzE5MDk2NTE3ZDEyMWRjYjFmMDA2NzYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUu Y3BwCkBAIC01NCw3ICs1NCwxMCBAQCBib29sIExpbmU6OlJ1bjo6Y2FuQmVFeHRlbmRlZCgpIGNv bnN0CiB7CiAgICAgaWYgKCFpc1RleHQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHJl dHVybiAhZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KG1faW5saW5lSXRlbSkuaXNDb2xsYXBzZWQo KSAmJiAhaXNWaXN1YWxseUVtcHR5KCk7CisgICAgLy8gTm9uLWNvbGxhcHNlZCB0ZXh0IHJ1bnMg Y2FuIGJlIG1lcmdlZCBpbnRvIG9uZSBjb250aW51b3VzIHJ1bi4KKyAgICBpZiAoaXNWaXN1YWxs eUVtcHR5KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gIWlzQ29sbGFwc2Vk KCk7CiB9CiAKIExpbmU6OkxpbmUoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGlu ZUZvcm1hdHRpbmdDb250ZXh0LCBjb25zdCBJbml0aWFsQ29uc3RyYWludHMmIGluaXRpYWxDb25z dHJhaW50cywgT3B0aW9uYWw8VGV4dEFsaWduTW9kZT4gaG9yaXpvbnRhbEFsaWdubWVudCwgU2tp cEFsaWdubWVudCBza2lwQWxpZ25tZW50KQpAQCAtNzksNiArODIsMjIgQEAgc3RhdGljIGJvb2wg aXNJbmxpbmVDb250YWluZXJDb25zaWRlcmVkRW1wdHkoY29uc3QgRm9ybWF0dGluZ0NvbnRleHQm IGZvcm1hdHRpbmcKICAgICByZXR1cm4gIShib3hHZW9tZXRyeS5ob3Jpem9udGFsQm9yZGVyKCkg fHwgKGJveEdlb21ldHJ5Lmhvcml6b250YWxQYWRkaW5nKCkgJiYgYm94R2VvbWV0cnkuaG9yaXpv bnRhbFBhZGRpbmcoKS52YWx1ZSgpKSk7CiB9CiAKK3N0YXRpYyBib29sIHNob3VsZFByZXNlcnZl VHJhaWxpbmdDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSkKK3sK KyAgICBpZiAoIWlubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpKQorICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICBhdXRvIHdoaXRlc3BhY2UgPSBpbmxpbmVUZXh0SXRlbS5zdHlsZSgpLndoaXRl U3BhY2UoKTsKKyAgICByZXR1cm4gd2hpdGVzcGFjZSA9PSBXaGl0ZVNwYWNlOjpQcmUgfHwgd2hp dGVzcGFjZSA9PSBXaGl0ZVNwYWNlOjpQcmVXcmFwOworfQorCitzdGF0aWMgYm9vbCBzaG91bGRQ cmVzZXJ2ZUxlYWRpbmdDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRl bSkKK3sKKyAgICBpZiAoIWlubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpKQorICAgICAgICBy ZXR1cm4gdHJ1ZTsKKyAgICBhdXRvIHdoaXRlc3BhY2UgPSBpbmxpbmVUZXh0SXRlbS5zdHlsZSgp LndoaXRlU3BhY2UoKTsKKyAgICByZXR1cm4gd2hpdGVzcGFjZSA9PSBXaGl0ZVNwYWNlOjpQcmUg fHwgd2hpdGVzcGFjZSA9PSBXaGl0ZVNwYWNlOjpQcmVXcmFwIHx8IHdoaXRlc3BhY2UgPT0gV2hp dGVTcGFjZTo6QnJlYWtTcGFjZXM7Cit9CisKIGJvb2wgTGluZTo6aXNWaXN1YWxseUVtcHR5KCkg Y29uc3QKIHsKICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUgY2FjaGVkIGluc3RlYWQgLWFz IHRoZSBpbmxpbmUgaXRlbXMgYXJlIGJlaW5nIGFkZGVkLgpAQCAtMzI0LDcgKzM0Myw3IEBAIHZv aWQgTGluZTo6YXBwZW5kSW5saW5lQ29udGFpbmVyRW5kKGNvbnN0IElubGluZUl0ZW0mIGlubGlu ZUl0ZW0sIExheW91dFVuaXQgbG9nCiAKIHZvaWQgTGluZTo6YXBwZW5kVGV4dENvbnRlbnQoY29u c3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZUl0ZW0sIExheW91dFVuaXQgbG9naWNhbFdpZHRoKQog ewotICAgIGF1dG8gaXNUcmltbWFibGUgPSBUZXh0VXRpbDo6aXNUcmltbWFibGVDb250ZW50KGlu bGluZUl0ZW0pOworICAgIGF1dG8gaXNUcmltbWFibGUgPSAhc2hvdWxkUHJlc2VydmVUcmFpbGlu Z0NvbnRlbnQoaW5saW5lSXRlbSk7CiAgICAgaWYgKCFpc1RyaW1tYWJsZSkKICAgICAgICAgbV90 cmltbWFibGVDb250ZW50LmNsZWFyKCk7CiAKQEAgLTMzNCwxOCArMzUzLDIyIEBAIHZvaWQgTGlu ZTo6YXBwZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZUl0ZW0sIExh eW91dFVuaXQgbG9naWNhCiAgICAgICAgICAgICBBU1NFUlQoIWxvZ2ljYWxXaWR0aCk7CiAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQotICAgICAgICBpZiAoIWlzVHJpbW1hYmxl KQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAvLyBMZWFkaW5nIHdoaXRlc3Bh Y2UuCiAgICAgICAgIGlmIChtX3J1bkxpc3QuaXNFbXB0eSgpKQotICAgICAgICAgICAgcmV0dXJu IHRydWU7Ci0gICAgICAgIC8vIENoZWNrIGlmIHRoZSBsYXN0IGl0ZW0gaXMgdHJpbW1hYmxlIGFz IHdlbGwuCi0gICAgICAgIGZvciAoaW50IGluZGV4ID0gbV9ydW5MaXN0LnNpemUoKSAtIDE7IGlu ZGV4ID49IDA7IC0taW5kZXgpIHsKLSAgICAgICAgICAgIGF1dG8mIHJ1biA9IG1fcnVuTGlzdFtp bmRleF07CisgICAgICAgICAgICByZXR1cm4gIXNob3VsZFByZXNlcnZlTGVhZGluZ0NvbnRlbnQo aW5saW5lSXRlbSk7CisKKyAgICAgICAgaWYgKCFpbmxpbmVJdGVtLmlzQ29sbGFwc2libGUoKSkK KyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgLy8gQ2hlY2sgaWYgdGhlIGxhc3Qg aXRlbSBpcyBjb2xsYXBzZWQgYXMgd2VsbC4KKyAgICAgICAgZm9yIChhdXRvIGkgPSBtX3J1bkxp c3Quc2l6ZSgpOyBpLS07KSB7CisgICAgICAgICAgICBhdXRvJiBydW4gPSBtX3J1bkxpc3RbaV07 CiAgICAgICAgICAgICBpZiAocnVuLT5pc0JveCgpKQogICAgICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICAgICAgICAgIC8vIFdoZW4gdGhlIHByZXZpb3VzIHRleHQgcnVuIGlzIGNvbGxh cHNlZCwgdGhpcyBjb2xsYXBzaWJsZSBydW4gY29sbGFwc2VzIGNvbXBsZXRlbHkuCiAgICAgICAg ICAgICBpZiAocnVuLT5pc1RleHQoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gcnVuLT5pc1do aXRlc3BhY2UoKSAmJiBydW4tPmxheW91dEJveCgpLnN0eWxlKCkuY29sbGFwc2VXaGl0ZVNwYWNl KCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIHJ1bi0+aXNDb2xsYXBzZWQoKTsKKyAgICAgICAg ICAgIC8vIENvbGxhcHNpbmcgd29ya3MgYWNyb3NzIGlubGluZSBjb250YWluZXJzOiAiPHNwYW4+ ICA8L3NwYW4+ICIgPC0gdGhlIHRyYWlsaW5nIHdoaXRlc3BhY2UgY29sbGFwc2VzIGNvbXBsZXRl bHkuCisgICAgICAgICAgICAvLyBOb3QgdGhhdCB3aGVuIHRoZSBpbmxpbmUgY29udGFpbmVyIGhh cyBwcmVzZXJ2ZSB3aGl0ZXNwYWNlIHN0eWxlLCAiPHNwYW4gc3R5bGU9IndoaXRlLXNwYWNlOiBw cmUiPiAgPC9zcGFuPiAiIDwtIHRoaXMgd2hpdGVzcGFjZSBzdGF5cyBhcm91bmQuIAogICAgICAg ICAgICAgQVNTRVJUKHJ1bi0+aXNDb250YWluZXJTdGFydCgpIHx8IHJ1bi0+aXNDb250YWluZXJF bmQoKSk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0zNTksMTEgKzM4Miwx NSBAQCB2b2lkIExpbmU6OmFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiBp bmxpbmVJdGVtLCBMYXlvdXRVbml0IGxvZ2ljYQogICAgICAgICBsb2dpY2FsUmVjdC5zZXRIZWln aHQoaW5saW5lSXRlbUNvbnRlbnRIZWlnaHQoaW5saW5lSXRlbSkpOwogICAgIH0KIAorICAgIGF1 dG8gY29sbGFwc2VSdW4gPSBpbmxpbmVJdGVtLmlzQ29sbGFwc2libGUoKTsKICAgICBhdXRvIGNv bnRlbnRTdGFydCA9IGlubGluZUl0ZW0uc3RhcnQoKTsKLSAgICBhdXRvIGNvbnRlbnRMZW5ndGgg PSBpbmxpbmVJdGVtLmlzQ29sbGFwc2VkKCkgPyAxIDogaW5saW5lSXRlbS5sZW5ndGgoKTsKKyAg ICBhdXRvIGNvbnRlbnRMZW5ndGggPSAgY29sbGFwc2VSdW4gPyAxIDogaW5saW5lSXRlbS5sZW5n dGgoKTsKICAgICBhdXRvIHRleHRDb250ZW50ID0gaW5saW5lSXRlbS5sYXlvdXRCb3goKS50ZXh0 Q29udGVudCgpLnN1YnN0cmluZyhjb250ZW50U3RhcnQsIGNvbnRlbnRMZW5ndGgpOwogICAgIGF1 dG8gbGluZUl0ZW0gPSBtYWtlVW5pcXVlPFJ1bj4oaW5saW5lSXRlbSwgRGlzcGxheTo6UnVuIHsg aW5saW5lSXRlbS5zdHlsZSgpLCBsb2dpY2FsUmVjdCwgRGlzcGxheTo6UnVuOjpUZXh0Q29udGV4 dCB7IGNvbnRlbnRTdGFydCwgY29udGVudExlbmd0aCwgdGV4dENvbnRlbnQgfSB9KTsKKwogICAg IGF1dG8gaXNWaXN1YWxseUVtcHR5ID0gd2lsbENvbGxhcHNlQ29tcGxldGVseSgpOworICAgIGlm IChjb2xsYXBzZVJ1bikKKyAgICAgICAgbGluZUl0ZW0tPnNldElzQ29sbGFwc2VkKCk7CiAgICAg aWYgKGlzVmlzdWFsbHlFbXB0eSkKICAgICAgICAgbGluZUl0ZW0tPnNldFZpc3VhbGx5SXNFbXB0 eSgpOwogICAgIGVsc2UgaWYgKGlzVHJpbW1hYmxlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCmluZGV4IDA5MDUzMmMzOTYxMjY1 OWRhNGFjYWY2ZmRlYzg0YTgwMzQ4Y2I2YTYuLjFiMWY2YzdjNzEwZjJlNzJlNTZmYmY3MTk4MzI1 Yzc1OTFkYmQxYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lLmgKQEAgLTc0LDYgKzc0LDcgQEAgcHVibGljOgogCiAgICAgICAg IGNvbnN0IERpc3BsYXk6OlJlY3QmIGxvZ2ljYWxSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9kaXNw bGF5UnVuLmxvZ2ljYWxSZWN0KCk7IH0KICAgICAgICAgYm9vbCBpc1Zpc3VhbGx5RW1wdHkoKSBj b25zdCB7IHJldHVybiBtX2lzVmlzdWFsbHlFbXB0eTsgfQorICAgICAgICBib29sIGlzQ29sbGFw c2VkKCkgY29uc3QgeyByZXR1cm4gbV9pc0NvbGxhcHNlZDsgfQogCiAgICAgICAgIGJvb2wgaXNU ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVJdGVtLmlzVGV4dCgpOyB9CiAgICAgICAgIGJv b2wgaXNCb3goKSBjb25zdCB7IHJldHVybiBtX2lubGluZUl0ZW0uaXNCb3goKTsgfQpAQCAtOTAs MTIgKzkxLDE0IEBAIHB1YmxpYzoKICAgICAgICAgdm9pZCBleHBhbmQoY29uc3QgUnVuJik7CiAK ICAgICAgICAgdm9pZCBzZXRWaXN1YWxseUlzRW1wdHkoKSB7IG1faXNWaXN1YWxseUVtcHR5ID0g dHJ1ZTsgfQorICAgICAgICB2b2lkIHNldElzQ29sbGFwc2VkKCkgeyBtX2lzQ29sbGFwc2VkID0g dHJ1ZTsgfQogCiAgICAgICAgIGJvb2wgaXNXaGl0ZXNwYWNlKCkgY29uc3Q7CiAgICAgICAgIGJv b2wgY2FuQmVFeHRlbmRlZCgpIGNvbnN0OwogCiAgICAgICAgIGNvbnN0IElubGluZUl0ZW0mIG1f aW5saW5lSXRlbTsKICAgICAgICAgRGlzcGxheTo6UnVuIG1fZGlzcGxheVJ1bjsKKyAgICAgICAg Ym9vbCBtX2lzQ29sbGFwc2VkIHsgZmFsc2UgfTsKICAgICAgICAgYm9vbCBtX2lzVmlzdWFsbHlF bXB0eSB7IGZhbHNlIH07CiAgICAgfTsKICAgICB1c2luZyBSdW5MaXN0ID0gVmVjdG9yPHN0ZDo6 dW5pcXVlX3B0cjxSdW4+PjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUxheW91dC5jcHAKaW5kZXggMTZjODU2YWNhNGVh NGNjOGVlNjk5NGVhOTgyMWI5YmY5MWZiZWY1MS4uNGJlODYzMmFjY2ZhMThmNzc1MWJhMzhkMWNk MDNmODcxNjNkNjdiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lTGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUxheW91dC5jcHAKQEAgLTQxLDcgKzQxLDcgQEAg c3RhdGljIExheW91dFVuaXQgaW5saW5lSXRlbVdpZHRoKGNvbnN0IEZvcm1hdHRpbmdDb250ZXh0 JiBmb3JtYXR0aW5nQ29udGV4dCwgY28KIAogICAgIGlmIChpczxJbmxpbmVUZXh0SXRlbT4oaW5s aW5lSXRlbSkpIHsKICAgICAgICAgYXV0byYgaW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJbmxp bmVUZXh0SXRlbT4oaW5saW5lSXRlbSk7Ci0gICAgICAgIGF1dG8gZW5kID0gaW5saW5lVGV4dEl0 ZW0uaXNDb2xsYXBzZWQoKSA/IGlubGluZVRleHRJdGVtLnN0YXJ0KCkgKyAxIDogaW5saW5lVGV4 dEl0ZW0uZW5kKCk7CisgICAgICAgIGF1dG8gZW5kID0gaW5saW5lVGV4dEl0ZW0uaXNDb2xsYXBz aWJsZSgpID8gaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSArIDEgOiBpbmxpbmVUZXh0SXRlbS5lbmQo KTsKICAgICAgICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbS5sYXlvdXRC b3goKSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgZW5kLCBjb250ZW50TG9naWNhbExlZnQpOwog ICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lVGV4dEl0ZW0uY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwCmluZGV4IDVlNmMyNTZkYjBiMzA5YWFmMWUyNTgyMWYw ZTFlMThlNTY0NTJmMTguLjJjOTRlZmI0OTY5ZTg2NTI0MWE0MjI1ZDNmZTUzZTlmZmZjMDY2NTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZVRleHRJdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVUZXh0SXRlbS5jcHAKQEAgLTg5LDQwICs4OSwzNyBAQCB2b2lkIElubGluZVRleHRJ dGVtOjpjcmVhdGVBbmRBcHBlbmRUZXh0SXRlbXMoSW5saW5lSXRlbXMmIGlubGluZUNvbnRlbnQs IGNvbnN0CiB7CiAgICAgYXV0byB0ZXh0ID0gaW5saW5lQm94LnRleHRDb250ZW50KCk7CiAgICAg aWYgKCF0ZXh0Lmxlbmd0aCgpKQotICAgICAgICByZXR1cm4gaW5saW5lQ29udGVudC5hcHBlbmQo bWFrZVVuaXF1ZTxJbmxpbmVUZXh0SXRlbT4oaW5saW5lQm94LCAwLCAwLCBmYWxzZSwgZmFsc2Up KTsKKyAgICAgICAgcmV0dXJuIGlubGluZUNvbnRlbnQuYXBwZW5kKG1ha2VVbmlxdWU8SW5saW5l VGV4dEl0ZW0+KGlubGluZUJveCwgMCwgMCwgZmFsc2UpKTsKIAogICAgIGF1dG8mIHN0eWxlID0g aW5saW5lQm94LnN0eWxlKCk7CiAgICAgYXV0byBwcmVzZXJ2ZU5ld2xpbmUgPSBzdHlsZS5wcmVz ZXJ2ZU5ld2xpbmUoKTsKLSAgICBhdXRvIGNvbGxhcHNlV2hpdGVTcGFjZSA9IHN0eWxlLmNvbGxh cHNlV2hpdGVTcGFjZSgpOwogICAgIExhenlMaW5lQnJlYWtJdGVyYXRvciBsaW5lQnJlYWtJdGVy YXRvcih0ZXh0KTsKICAgICB1bnNpZ25lZCBjdXJyZW50UG9zaXRpb24gPSAwOwogICAgIHdoaWxl IChjdXJyZW50UG9zaXRpb24gPCB0ZXh0Lmxlbmd0aCgpKSB7CiAgICAgICAgIC8vIFNvZnQgbGlu ZWJyZWFrPwogICAgICAgICBpZiAoaXNTb2Z0TGluZUJyZWFrKHRleHRbY3VycmVudFBvc2l0aW9u XSwgcHJlc2VydmVOZXdsaW5lKSkgewotICAgICAgICAgICAgaW5saW5lQ29udGVudC5hcHBlbmQo bWFrZVVuaXF1ZTxJbmxpbmVUZXh0SXRlbT4oaW5saW5lQm94LCBjdXJyZW50UG9zaXRpb24sIDEs IHRydWUsIGZhbHNlKSk7CisgICAgICAgICAgICBpbmxpbmVDb250ZW50LmFwcGVuZChtYWtlVW5p cXVlPElubGluZVRleHRJdGVtPihpbmxpbmVCb3gsIGN1cnJlbnRQb3NpdGlvbiwgMSwgdHJ1ZSkp OwogICAgICAgICAgICAgKytjdXJyZW50UG9zaXRpb247CiAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgfQogICAgICAgICBpZiAoaXNXaGl0ZXNwYWNlQ2hhcmFjdGVyKHRleHRbY3VycmVu dFBvc2l0aW9uXSwgcHJlc2VydmVOZXdsaW5lKSkgewogICAgICAgICAgICAgYXV0byBsZW5ndGgg PSBtb3ZlVG9OZXh0Tm9uV2hpdGVzcGFjZVBvc2l0aW9uKHRleHQsIGN1cnJlbnRQb3NpdGlvbiwg cHJlc2VydmVOZXdsaW5lKTsKLSAgICAgICAgICAgIGF1dG8gaXNDb2xsYXBzZWQgPSBjb2xsYXBz ZVdoaXRlU3BhY2UgJiYgbGVuZ3RoID4gMTsKLSAgICAgICAgICAgIGlubGluZUNvbnRlbnQuYXBw ZW5kKG1ha2VVbmlxdWU8SW5saW5lVGV4dEl0ZW0+KGlubGluZUJveCwgY3VycmVudFBvc2l0aW9u LCBsZW5ndGgsIHRydWUsIGlzQ29sbGFwc2VkKSk7CisgICAgICAgICAgICBpbmxpbmVDb250ZW50 LmFwcGVuZChtYWtlVW5pcXVlPElubGluZVRleHRJdGVtPihpbmxpbmVCb3gsIGN1cnJlbnRQb3Np dGlvbiwgbGVuZ3RoLCB0cnVlKSk7CiAgICAgICAgICAgICBjdXJyZW50UG9zaXRpb24gKz0gbGVu Z3RoOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAogICAgICAgICBhdXRvIGxl bmd0aCA9IG1vdmVUb05leHRCcmVha2FibGVQb3NpdGlvbihjdXJyZW50UG9zaXRpb24sIGxpbmVC cmVha0l0ZXJhdG9yLCBzdHlsZSk7Ci0gICAgICAgIGlubGluZUNvbnRlbnQuYXBwZW5kKG1ha2VV bmlxdWU8SW5saW5lVGV4dEl0ZW0+KGlubGluZUJveCwgY3VycmVudFBvc2l0aW9uLCBsZW5ndGgs IGZhbHNlLCBmYWxzZSkpOworICAgICAgICBpbmxpbmVDb250ZW50LmFwcGVuZChtYWtlVW5pcXVl PElubGluZVRleHRJdGVtPihpbmxpbmVCb3gsIGN1cnJlbnRQb3NpdGlvbiwgbGVuZ3RoLCBmYWxz ZSkpOwogICAgICAgICBjdXJyZW50UG9zaXRpb24gKz0gbGVuZ3RoOwogICAgIH0KIH0KIAotSW5s aW5lVGV4dEl0ZW06OklubGluZVRleHRJdGVtKGNvbnN0IEJveCYgaW5saW5lQm94LCB1bnNpZ25l ZCBzdGFydCwgdW5zaWduZWQgbGVuZ3RoLCBib29sIGlzV2hpdGVzcGFjZSwgYm9vbCBpc0NvbGxh cHNlZCkKK0lubGluZVRleHRJdGVtOjpJbmxpbmVUZXh0SXRlbShjb25zdCBCb3gmIGlubGluZUJv eCwgdW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGxlbmd0aCwgYm9vbCBpc1doaXRlc3BhY2UpCiAg ICAgOiBJbmxpbmVJdGVtKGlubGluZUJveCwgVHlwZTo6VGV4dCkKICAgICAsIG1fc3RhcnQoc3Rh cnQpCiAgICAgLCBtX2xlbmd0aChsZW5ndGgpCiAgICAgLCBtX2lzV2hpdGVzcGFjZShpc1doaXRl c3BhY2UpCi0gICAgLCBtX2lzQ29sbGFwc2VkKGlzQ29sbGFwc2VkKQogewogfQogCkBAIC0xMzAs NyArMTI3LDcgQEAgc3RkOjp1bmlxdWVfcHRyPElubGluZVRleHRJdGVtPiBJbmxpbmVUZXh0SXRl bTo6c3BsaXQodW5zaWduZWQgc3BsaXRQb3NpdGlvbiwgdW4KIHsKICAgICBSRUxFQVNFX0FTU0VS VChzcGxpdFBvc2l0aW9uID49IHRoaXMtPnN0YXJ0KCkpOwogICAgIFJFTEVBU0VfQVNTRVJUKHNw bGl0UG9zaXRpb24gKyBsZW5ndGggPD0gZW5kKCkpOwotICAgIHJldHVybiBtYWtlVW5pcXVlPElu bGluZVRleHRJdGVtPihsYXlvdXRCb3goKSwgc3BsaXRQb3NpdGlvbiwgbGVuZ3RoLCBpc1doaXRl c3BhY2UoKSwgaXNDb2xsYXBzZWQoKSk7CisgICAgcmV0dXJuIG1ha2VVbmlxdWU8SW5saW5lVGV4 dEl0ZW0+KGxheW91dEJveCgpLCBzcGxpdFBvc2l0aW9uLCBsZW5ndGgsIGlzV2hpdGVzcGFjZSgp KTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lVGV4dEl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZVRleHRJdGVtLmgKaW5kZXggOWE5YzdjODgwYjFkNWE5YTcxYTJkMjY2OWU5 ODc1ZWViZTYwOTc2OS4uNDVmYTZlMTQ4ZDdhOTBhOGM1NDg2NDk0NmE5ZGFkYjBmNDJhMGY3NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l VGV4dEl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVUZXh0SXRlbS5oCkBAIC0zNywxNCArMzcsMTQgQEAgY2xhc3MgSW5saW5lVGV4dEl0ZW0g OiBwdWJsaWMgSW5saW5lSXRlbSB7CiBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgY3JlYXRlQW5k QXBwZW5kVGV4dEl0ZW1zKElubGluZUl0ZW1zJiwgY29uc3QgQm94Jik7CiAKLSAgICBJbmxpbmVU ZXh0SXRlbShjb25zdCBCb3gmLCB1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgbGVuZ3RoLCBib29s IGlzV2hpdGVzcGFjZSwgYm9vbCBpc0NvbGxhcHNlZCk7CisgICAgSW5saW5lVGV4dEl0ZW0oY29u c3QgQm94JiwgdW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGxlbmd0aCwgYm9vbCBpc1doaXRlc3Bh Y2UpOwogCiAgICAgdW5zaWduZWQgc3RhcnQoKSBjb25zdCB7IHJldHVybiBtX3N0YXJ0OyB9CiAg ICAgdW5zaWduZWQgZW5kKCkgY29uc3QgeyByZXR1cm4gc3RhcnQoKSArIGxlbmd0aCgpOyB9CiAg ICAgdW5zaWduZWQgbGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gbV9sZW5ndGg7IH0KIAogICAgIGJv b2wgaXNXaGl0ZXNwYWNlKCkgY29uc3QgeyByZXR1cm4gbV9pc1doaXRlc3BhY2U7IH0KLSAgICBi b29sIGlzQ29sbGFwc2VkKCkgY29uc3QgeyByZXR1cm4gbV9pc0NvbGxhcHNlZDsgfQorICAgIGJv b2wgaXNDb2xsYXBzaWJsZSgpIGNvbnN0IHsgcmV0dXJuIGlzV2hpdGVzcGFjZSgpICYmIHN0eWxl KCkuY29sbGFwc2VXaGl0ZVNwYWNlKCk7IH0KIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxJbmxpbmVU ZXh0SXRlbT4gc3BsaXQodW5zaWduZWQgc3BsaXRQb3NpdGlvbiwgdW5zaWduZWQgbGVuZ3RoKSBj b25zdDsKIApAQCAtNTIsNyArNTIsNiBAQCBwcml2YXRlOgogICAgIHVuc2lnbmVkIG1fc3RhcnQg eyAwIH07CiAgICAgdW5zaWduZWQgbV9sZW5ndGggeyAwIH07CiAgICAgYm9vbCBtX2lzV2hpdGVz cGFjZSB7IGZhbHNlIH07Ci0gICAgYm9vbCBtX2lzQ29sbGFwc2VkIHsgZmFsc2UgfTsKIH07CiAK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3Rl eHQvVGV4dFV0aWwuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv dGV4dC9UZXh0VXRpbC5jcHAKaW5kZXggMTMxYmE2MjA2Y2ZiZjQ4NDljZDJmYWI4MWI3YzJlZmRm NjhhNDljZC4uZDMxMmU3MGRmOTQyMTk0OWMzMGEyMGIwZTFlOGExZjMwZGUwZTNlNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dC9UZXh0VXRp bC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dC9U ZXh0VXRpbC5jcHAKQEAgLTg5LDE0ICs4OSw2IEBAIExheW91dFVuaXQgVGV4dFV0aWw6OmZpeGVk UGl0Y2hXaWR0aChTdHJpbmcgdGV4dCwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCB1bnNpCiAg ICAgcmV0dXJuIHdpZHRoOwogfQogCi1ib29sIFRleHRVdGlsOjppc1RyaW1tYWJsZUNvbnRlbnQo Y29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSkKLXsKLSAgICBpZiAoIWlzPElubGluZVRleHRJ dGVtPihpbmxpbmVJdGVtKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGF1dG8mIGlubGlu ZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0pOwotICAgIHJl dHVybiBpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiBpbmxpbmVUZXh0SXRlbS5zdHls ZSgpLmNvbGxhcHNlV2hpdGVTcGFjZSgpOwotfQotCiBUZXh0VXRpbDo6U3BsaXREYXRhIFRleHRV dGlsOjpzcGxpdChjb25zdCBCb3gmIGlubGluZUJveCwgdW5zaWduZWQgc3RhcnRQb3NpdGlvbiwg dW5zaWduZWQgbGVuZ3RoLCBMYXlvdXRVbml0IHRleHRXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFi bGVXaWR0aCwgTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpCiB7CiAgICAgLy8gRklYTUUg VGhpcyBzaG91bGQgdGFrZSBoeXBlbnMgaW50byBhY2NvdW50LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dC9UZXh0VXRpbC5oIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dC9UZXh0VXRpbC5oCmluZGV4IGYx NTI2NTBiMzE1NGY5ZWJjNDVlMDQxOTBjNzBmZmRlNjMyM2NiM2UuLjczMTI4ZTI1YjVhNTdmODQ0 YTQ1YTZlMjg3ZGFhMDNiNTQyNWM1YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0L1RleHRVdGlsLmgKQEAgLTM2LDcgKzM2LDYgQEAg Y2xhc3MgVGV4dFV0aWwgewogcHVibGljOgogICAgIHN0YXRpYyBMYXlvdXRVbml0IHdpZHRoKGNv bnN0IEJveCYsIHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIHRvLCBMYXlvdXRVbml0IGNvbnRlbnRM b2dpY2FsTGVmdCk7CiAgICAgc3RhdGljIE9wdGlvbmFsPHVuc2lnbmVkPiBoeXBoZW5Qb3NpdGlv bkJlZm9yZShjb25zdCBJbmxpbmVJdGVtJiwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgbGVuZ3Ro KTsKLSAgICBzdGF0aWMgYm9vbCBpc1RyaW1tYWJsZUNvbnRlbnQoY29uc3QgSW5saW5lSXRlbSYp OwogICAgIHN0cnVjdCBTcGxpdERhdGEgewogICAgICAgICB1bnNpZ25lZCBzdGFydCB7IDAgfTsK ICAgICAgICAgdW5zaWduZWQgbGVuZ3RoIHsgMCB9Owo=