205014 2019-12-09 09:48:45 -0800 [LFC][IFC] fix fast/text/simple-lines-multiple-renderers-break.html 2019-12-09 10:35:05 -0800 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 1596862 0 zalan 2019-12-09 09:48:45 -0800 ssia 1596863 1 webkit-bug-importer 2019-12-09 09:49:16 -0800 <rdar://problem/57756348> 1596878 2 385165 zalan 2019-12-09 10:18:58 -0800 Created attachment 385165 Patch 1596880 3 385165 koivisto 2019-12-09 10:23:40 -0800 Comment on attachment 385165 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385165&action=review > Source/WebCore/ChangeLog:9 > + When dealing with series of runs (<span>text</span><span>content</text>) a partial content does not Closing <span> with </text> > Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp:114 > - partialLeadingContentLength = lineContent.partialContent->overlfowContentLength; > + partialLeadingContentLength = lineContent.partialContent->overflowContentLength; Who reviews this stuff :( 1596881 4 zalan 2019-12-09 10:24:21 -0800 (In reply to Antti Koivisto from comment #3) > Comment on attachment 385165 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=385165&action=review > > > Source/WebCore/ChangeLog:9 > > + When dealing with series of runs (<span>text</span><span>content</text>) a partial content does not > > Closing <span> with </text> lol 1596885 5 zalan 2019-12-09 10:35:05 -0800 Committed r253294: <https://trac.webkit.org/changeset/253294> 385165 2019-12-09 10:18:58 -0800 2019-12-09 10:23:40 -0800 Patch bug-205014-20191209101857.patch text/plain 12357 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzMjg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmVlNjA0OTA0MTdjNjBm ZTFiY2I3NTI3MDAxYWQ2ZjBmNDI5NWQ5Ni4uNDlkYTIxMTc2YjM4Y2E0NmQ2MTZiNDYyYTliZGZh ZGE0ZTk3MWZhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE5LTEyLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBmaXggZmFz dC90ZXh0L3NpbXBsZS1saW5lcy1tdWx0aXBsZS1yZW5kZXJlcnMtYnJlYWsuaHRtbAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1MDE0CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS81Nzc1NjM0OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIGRlYWxpbmcgd2l0aCBzZXJpZXMgb2YgcnVucyAoPHNw YW4+dGV4dDwvc3Bhbj48c3Bhbj5jb250ZW50PC90ZXh0PikgYSBwYXJ0aWFsIGNvbnRlbnQgZG9l cyBub3QKKyAgICAgICAgbmVjZXNzYXJpbHkgbWVhbiBwYXJ0aWFsIHJ1bnMuIFRoZSBjb250ZW50 IGNhbiBhY3R1YWxseSBiZSBzcGxpdCByaWdodCBhdCBhIHJ1biBib3VuZGFyeS4KKyAgICAgICAg SW4gc3VjaCBjYXNlcyB3ZSBoYXZlIGEgcGFydGlhbCB0cmFpbGluZyBjb250ZW50IGJ1dCBub3Qg YSBwYXJ0aWFsIHRyYWlsaW5nIHJ1bi4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gY292ZXJz IHRoZSBjYXNlIHdoZW4gdGhlIG92ZXJmbG93biBydW4gY2FuJ3QgYmUgc3BsaXQgYW5kCisgICAg ICAgIHdlIGF0dGVtcHQgdG8gZmluZCBhIHByZXZpb3VzIGJyZWFrYWJsZSBydW4gKGluIHRoZSBs aXN0IG9mIGNhbmRpZGF0ZSBydW5zKS4KKyAgICAgICAgU2luY2UgaXQncyBndWFyYW50ZWVkICh3 aXRoIHRoZSBGSVhNRSBvZiB0aGUgZXh0cmVtZWx5IGxvbmcgaHlwaGVuKSB0aGF0IGFsbCB0aGUg cHJldmlvdXMgcnVucyBmaXQgdGhlIGxpbmUsCisgICAgICAgIHdlIGp1c3QgcGFzcyBpbiBhbiBp bmZpbml0ZSBhdmFpbGFibGUgd2lkdGggdG8gTGluZUJyZWFrZXI6OnRyeUJyZWFraW5nVGV4dFJ1 biBpbmRpY2F0aW5nIHRoYXQgd2Ugb25seSBsb29rIGZvciB0aGUgbGFzdCBicmVha2FibGUgcG9z aXRpb24uCisKKyAgICAgICAgZS5nLiA8c3BhbiBzdHlsZT0id29yZC1icmVhazogYnJlYWstYWxs Ij5icmVha2FibGU8L3NwYW4+PHNwYW4+YW5kPC9zcGFuPjxzcGFuPmxvbmdhbmR1bmJyZWFrYWJs ZWNvbnRlbnQ8L3NwYW4+CisgICAgICAgIFticmVha2FibGVdW2FuZF1bbG9uZ2FuZHVuYnJlYWth YmxlY29udGVudF0gPC0gd2UgdHJ5IHRvIGNvbW1pdCB0aGlzIGNvbnRpbnVvdXMgbGlzdCBvZiBy dW5zCisgICAgICAgIFtsb25nYW5kdW5icmVha2FibGVjb250ZW50XSA8LSBkb2VzIG5vdCBmaXQg c28gbGV0J3MgZ28gYmFjayB0byB0aGUgcHJldmlvdXMgcnVucyB0byBzZWUgaWYgYW55IG9mIHRo ZW0gY2FuIGJlIHNwbGl0IC0+IFticmVha2FibGVhbmRdLgorICAgICAgICByZXN1bHQ6CisgICAg ICAgIGJyZWFrYWJsZQorICAgICAgICBhbmRsb25nYW5kdW5icmVha2FibGVjb250ZW50CisKKyAg ICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojps aW5lTGF5b3V0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l QnJlYWtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCcmVha2VyOjp3b3Jk QnJlYWtpbmdCZWhhdmlvciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVC cmVha2VyOjp0cnlCcmVha2luZ1RleHRSdW4gY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6TGluZUxheW91dENvbnRleHQ6OnByb2Nlc3NVbmNvbW1pdHRlZENvbnRlbnQpOgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0Lmg6CisKIDIw MTktMTItMDkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtJRkNdIERvIG5vdCBjcmVhdGUgUGFydGlhbENvbnRlbnQgZm9yIGEgc2luZ2xlIGNoYXJhY3Rl ciBydW4gd2hlbiBpdCBkb2VzIG5vdCBmaXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5jcHAKaW5kZXggMjkzNjZmZTBiZmU1NWJjYmUzZTkyYjk0NjE1ODU4OWI1YzhiYThjOC4uNWFh ODhkMzI1NzAwODMzZTFmMGZiYzczZjg1ZGIyZTJmNWQ5NmVmNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMTExLDcgKzExMSw3IEBAIHZvaWQgSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQ6OmxpbmVMYXlvdXQoY29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXMmIHVzZWRI b3Jpem9uCiAgICAgICAgICAgICAgICAgbGVhZGluZ0lubGluZUl0ZW1JbmRleCA9ICpsaW5lQ29u dGVudC50cmFpbGluZ0lubGluZUl0ZW1JbmRleDsKICAgICAgICAgICAgICAgICAvLyBUdXJuIHBy ZXZpb3VzIGxpbmUncyBvdmVyZmxvdyBjb250ZW50IGxlbmd0aCBpbnRvIHRoZSBuZXh0IGxpbmUn cyBsZWFkaW5nIGNvbnRlbnQgcGFydGlhbCBsZW5ndGguCiAgICAgICAgICAgICAgICAgLy8gInNw PC0+bGl0Y29udGVudCIgLT4gb3ZlcmZsb3cgbGVuZ3RoOiAxMCAtPiBsZWFkaW5nIHBhcnRpYWwg Y29udGVudCBsZW5ndGg6IDEwLiAKLSAgICAgICAgICAgICAgICBwYXJ0aWFsTGVhZGluZ0NvbnRl bnRMZW5ndGggPSBsaW5lQ29udGVudC5wYXJ0aWFsQ29udGVudC0+b3Zlcmxmb3dDb250ZW50TGVu Z3RoOworICAgICAgICAgICAgICAgIHBhcnRpYWxMZWFkaW5nQ29udGVudExlbmd0aCA9IGxpbmVD b250ZW50LnBhcnRpYWxDb250ZW50LT5vdmVyZmxvd0NvbnRlbnRMZW5ndGg7CiAgICAgICAgICAg ICB9IGVsc2UKICAgICAgICAgICAgICAgICBsZWFkaW5nSW5saW5lSXRlbUluZGV4ID0gKmxpbmVD b250ZW50LnRyYWlsaW5nSW5saW5lSXRlbUluZGV4ICsgMTsKICAgICAgICAgfSBlbHNlIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCcmVha2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmVCcmVha2VyLmNwcAppbmRleCA0OWQ2YThhYzlhNDcwNThjZjdjY2IyMDdlYWU4MWUx NTc4OTI0YTBiLi45YjMzYzMzZThjYzgxYTE5YjhkOWM4ZjA5Nzg3ZDExZGY2ZGZjYzQ1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l QnJlYWtlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJyZWFrZXIuY3BwCkBAIC0xNDEsNyArMTQxLDEwIEBAIE9wdGlvbmFsPExpbmVC cmVha2VyOjpCcmVha2luZ0NvbnRleHQ6OlBhcnRpYWxUcmFpbGluZ0NvbnRlbnQ+IExpbmVCcmVh a2VyOjp3b3JkCiAgICAgICAgIGF1dG8mIHJ1biA9IHJ1bnNbaW5kZXhdOwogICAgICAgICBpZiAo aXNDb250ZW50V3JhcHBpbmdBbGxvd2VkKHJ1bikpIHsKICAgICAgICAgICAgIEFTU0VSVChydW4u aW5saW5lSXRlbS5pc1RleHQoKSk7Ci0gICAgICAgICAgICByZXR1cm4gQnJlYWtpbmdDb250ZXh0 OjpQYXJ0aWFsVHJhaWxpbmdDb250ZW50IHsgaW5kZXgsIGRvd25jYXN0PElubGluZVRleHRJdGVt PihydW4uaW5saW5lSXRlbSkubGVuZ3RoKCksIHJ1bi5sb2dpY2FsV2lkdGgsIGZhbHNlIH07Cisg ICAgICAgICAgICBpZiAoYXV0byBsZWZ0U2lkZSA9IHRyeUJyZWFraW5nVGV4dFJ1bihydW4sIG1h eElubGluZUxheW91dFVuaXQoKSkpIHsKKyAgICAgICAgICAgICAgICAvLyBUaGlzIHJ1biBpdHNl bGYgbWlnaHQgbm90IGJlIHBhcnRpYWwgYnV0IHRoZSBjb250ZW50IChzZXJpZXMgb2YgcnVucykg ZGVmaW5pdGVseSBpcy4KKyAgICAgICAgICAgICAgICByZXR1cm4gQnJlYWtpbmdDb250ZXh0OjpQ YXJ0aWFsVHJhaWxpbmdDb250ZW50IHsgaW5kZXgsIGxlZnRTaWRlLT5sZW5ndGgsIGxlZnRTaWRl LT5sb2dpY2FsV2lkdGgsIGxlZnRTaWRlLT5uZWVkc0h5cGhlbiB9OworICAgICAgICAgICAgfQog ICAgICAgICB9CiAgICAgfQogICAgIC8vIEdpdmUgdXAsIHRoZXJlJ3Mgbm8gYnJlYWthYmxlIHJ1 biBpbiBoZXJlLgpAQCAtMTUyLDExICsxNTUsMTUgQEAgT3B0aW9uYWw8TGluZUJyZWFrZXI6Okxl ZnRTaWRlPiBMaW5lQnJlYWtlcjo6dHJ5QnJlYWtpbmdUZXh0UnVuKGNvbnN0IENvbnRlbnQ6OlIK IHsKICAgICBBU1NFUlQob3ZlcmZsb3dSdW4uaW5saW5lSXRlbS5pc1RleHQoKSk7CiAgICAgYXV0 byYgc3R5bGUgPSBvdmVyZmxvd1J1bi5pbmxpbmVJdGVtLnN0eWxlKCk7CisgICAgYXV0byBmaW5k TGFzdEJyZWFrYWJsZVBvc2l0aW9uID0gYXZhaWxhYmxlV2lkdGggPT0gbWF4SW5saW5lTGF5b3V0 VW5pdCgpOwogICAgIGF1dG8gYnJlYWtXb3JkcyA9IHN0eWxlLndvcmRCcmVhaygpOwogICAgIGlm IChicmVha1dvcmRzID09IFdvcmRCcmVhazo6S2VlcEFsbCkKICAgICAgICAgcmV0dXJuIHsgfTsK ICAgICBhdXRvJiBpbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihvdmVy Zmxvd1J1bi5pbmxpbmVJdGVtKTsKICAgICBpZiAoYnJlYWtXb3JkcyA9PSBXb3JkQnJlYWs6OkJy ZWFrQWxsKSB7CisgICAgICAgIC8vIFdoZW4gdGhlIHJ1biBjYW4gYmUgc3BsaXQgYXQgYXJiaXRy YXJ5IHBvc2l0aW9ucywgbGV0J3MganVzdCByZXR1cm4gdGhlIGVudGlyZSBydW4gd2hlbiBpdCBp cyBpbnRlbmRlZCB0byBmaXQgb24gdGhlIGxpbmUuCisgICAgICAgIGlmIChmaW5kTGFzdEJyZWFr YWJsZVBvc2l0aW9uKQorICAgICAgICAgICAgcmV0dXJuIExlZnRTaWRlIHsgaW5saW5lVGV4dEl0 ZW0ubGVuZ3RoKCksIG92ZXJmbG93UnVuLmxvZ2ljYWxXaWR0aCwgZmFsc2UgfTsKICAgICAgICAg Ly8gRklYTUU6IFBhc3MgaW4gdGhlIGNvbnRlbnQgbG9naWNhbCBsZWZ0IHRvIGJlIGFibGUgdG8g bWVhc3VyZSB0YWJzLgogICAgICAgICBhdXRvIHNwbGl0RGF0YSA9IFRleHRVdGlsOjpzcGxpdChp bmxpbmVUZXh0SXRlbS5sYXlvdXRCb3goKSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgaW5saW5l VGV4dEl0ZW0ubGVuZ3RoKCksIG92ZXJmbG93UnVuLmxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlV2lk dGgsIHsgfSk7CiAgICAgICAgIHJldHVybiBMZWZ0U2lkZSB7IHNwbGl0RGF0YS5sZW5ndGgsIHNw bGl0RGF0YS5sb2dpY2FsV2lkdGgsIGZhbHNlIH07CkBAIC0xNzQsMjIgKzE4MSwyNSBAQCBPcHRp b25hbDxMaW5lQnJlYWtlcjo6TGVmdFNpZGU+IExpbmVCcmVha2VyOjp0cnlCcmVha2luZ1RleHRS dW4oY29uc3QgQ29udGVudDo6UgogICAgIGlmIChsaW1pdEJlZm9yZSA+PSBydW5MZW5ndGggfHwg bGltaXRBZnRlciA+PSBydW5MZW5ndGggfHwgbGltaXRCZWZvcmUgKyBsaW1pdEFmdGVyID4gcnVu TGVuZ3RoKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAgYXV0byYgZm9udENhc2NhZGUgPSBz dHlsZS5mb250Q2FzY2FkZSgpOwotICAgIC8vIEZJWE1FOiBXZSBtaWdodCB3YW50IHRvIGNhY2hl IHRoZSBoeXBoZW4gd2lkdGguCi0gICAgYXV0byBoeXBoZW5XaWR0aCA9IElubGluZUxheW91dFVu aXQgeyBmb250Q2FzY2FkZS53aWR0aChUZXh0UnVuIHsgU3RyaW5nVmlldyB7IHN0eWxlLmh5cGhl blN0cmluZygpIH0gfSkgfTsKLSAgICBhdXRvIGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVu ID0gYXZhaWxhYmxlV2lkdGggLSBoeXBoZW5XaWR0aDsKKyAgICB1bnNpZ25lZCBsZWZ0U2lkZUxl bmd0aCA9IHJ1bkxlbmd0aDsKKyAgICBpZiAoIWZpbmRMYXN0QnJlYWthYmxlUG9zaXRpb24pIHsK KyAgICAgICAgYXV0byYgZm9udENhc2NhZGUgPSBzdHlsZS5mb250Q2FzY2FkZSgpOworICAgICAg ICAvLyBGSVhNRTogV2UgbWlnaHQgd2FudCB0byBjYWNoZSB0aGUgaHlwaGVuIHdpZHRoLgorICAg ICAgICBhdXRvIGh5cGhlbldpZHRoID0gSW5saW5lTGF5b3V0VW5pdCB7IGZvbnRDYXNjYWRlLndp ZHRoKFRleHRSdW4geyBTdHJpbmdWaWV3IHsgc3R5bGUuaHlwaGVuU3RyaW5nKCkgfSB9KSB9Owor ICAgICAgICBhdXRvIGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuID0gYXZhaWxhYmxlV2lk dGggLSBoeXBoZW5XaWR0aDsKIAotICAgIC8vIEZvciBzcGFjZVdpZHRoKCkgc2VlIHdlYmtpdC5v cmcvYi8xNjk2MTMKLSAgICBpZiAoYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4gPD0gMCB8 fCAhZW5vdWdoV2lkdGhGb3JIeXBoZW5hdGlvbihhdmFpbGFibGVXaWR0aEV4Y2x1ZGluZ0h5cGhl biArIGZvbnRDYXNjYWRlLnNwYWNlV2lkdGgoKSwgZm9udENhc2NhZGUucGl4ZWxTaXplKCkpKQot ICAgICAgICByZXR1cm4geyB9OworICAgICAgICAvLyBGb3Igc3BhY2VXaWR0aCgpIHNlZSB3ZWJr aXQub3JnL2IvMTY5NjEzCisgICAgICAgIGlmIChhdmFpbGFibGVXaWR0aEV4Y2x1ZGluZ0h5cGhl biA8PSAwIHx8ICFlbm91Z2hXaWR0aEZvckh5cGhlbmF0aW9uKGF2YWlsYWJsZVdpZHRoRXhjbHVk aW5nSHlwaGVuICsgZm9udENhc2NhZGUuc3BhY2VXaWR0aCgpLCBmb250Q2FzY2FkZS5waXhlbFNp emUoKSkpCisgICAgICAgICAgICByZXR1cm4geyB9OwogCi0gICAgYXV0byBzcGxpdERhdGEgPSBU ZXh0VXRpbDo6c3BsaXQoaW5saW5lVGV4dEl0ZW0ubGF5b3V0Qm94KCksIGlubGluZVRleHRJdGVt LnN0YXJ0KCksIHJ1bkxlbmd0aCwgb3ZlcmZsb3dSdW4ubG9naWNhbFdpZHRoLCBhdmFpbGFibGVX aWR0aEV4Y2x1ZGluZ0h5cGhlbiwgeyB9KTsKLSAgICBpZiAoc3BsaXREYXRhLmxlbmd0aCA8IGxp bWl0QmVmb3JlKQorICAgICAgICBsZWZ0U2lkZUxlbmd0aCA9IFRleHRVdGlsOjpzcGxpdChpbmxp bmVUZXh0SXRlbS5sYXlvdXRCb3goKSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgcnVuTGVuZ3Ro LCBvdmVyZmxvd1J1bi5sb2dpY2FsV2lkdGgsIGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVu LCB7IH0pLmxlbmd0aDsKKyAgICB9CisgICAgaWYgKGxlZnRTaWRlTGVuZ3RoIDwgbGltaXRCZWZv cmUpCiAgICAgICAgIHJldHVybiB7IH07CiAKICAgICBhdXRvIHRleHRDb250ZW50ID0gaW5saW5l VGV4dEl0ZW0ubGF5b3V0Qm94KCkudGV4dENvbnRleHQoKS0+Y29udGVudDsKICAgICAvLyBBZGp1 c3QgYmVmb3JlIGluZGV4IHRvIGFjY29tbW9kYXRlIHRoZSBsaW1pdC1hZnRlciB2YWx1ZSAoaXQn cyB0aGUgbGFzdCBwb3RlbnRpYWwgaHlwaGVuIGxvY2F0aW9uIGluIHRoaXMgcnVuKS4KLSAgICBh dXRvIGh5cGhlbkJlZm9yZSA9IHN0ZDo6bWluKHNwbGl0RGF0YS5sZW5ndGgsIHJ1bkxlbmd0aCAt IGxpbWl0QWZ0ZXIpICsgMTsKKyAgICBhdXRvIGh5cGhlbkJlZm9yZSA9IHN0ZDo6bWluKGxlZnRT aWRlTGVuZ3RoLCBydW5MZW5ndGggLSBsaW1pdEFmdGVyKSArIDE7CiAgICAgdW5zaWduZWQgaHlw aGVuTG9jYXRpb24gPSBsYXN0SHlwaGVuTG9jYXRpb24oU3RyaW5nVmlldyh0ZXh0Q29udGVudCku c3Vic3RyaW5nKGlubGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLmxlbmd0aCgp KSwgaHlwaGVuQmVmb3JlLCBzdHlsZS5sb2NhbGUoKSk7CiAgICAgaWYgKCFoeXBoZW5Mb2NhdGlv biB8fCBoeXBoZW5Mb2NhdGlvbiA8IGxpbWl0QmVmb3JlKQogICAgICAgICByZXR1cm4geyB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxh eW91dENvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv TGluZUxheW91dENvbnRleHQuY3BwCmluZGV4IGFkNmYxYzdmZjRlNDg0ODA3ZTBjNDRmZTY0ZDIy MDA3NDJkMDQ3MDYuLmRlODM0ODM3MGQyNTAyYTAyMzU4ODBmMTNjMjA5ZDgxZDIxNWFkZDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlv dXRDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9MaW5lTGF5b3V0Q29udGV4dC5jcHAKQEAgLTIxOCwxNyArMjE4LDI2IEBAIExpbmVMYXlvdXRD b250ZXh0OjpJc0VuZE9mTGluZSBMaW5lTGF5b3V0Q29udGV4dDo6cHJvY2Vzc1VuY29tbWl0dGVk Q29udGVudChMaW5lCiAgICAgICAgIEFTU0VSVChicmVha2luZ0NvbnRleHQucGFydGlhbFRyYWls aW5nQ29udGVudCk7CiAgICAgICAgIEFTU0VSVChtX3VuY29tbWl0dGVkQ29udGVudC5ydW5zKClb YnJlYWtpbmdDb250ZXh0LnBhcnRpYWxUcmFpbGluZ0NvbnRlbnQtPnJ1bkluZGV4XS5pbmxpbmVJ dGVtLmlzVGV4dCgpKTsKICAgICAgICAgLy8gVHVybiB0aGUgdW5jb21taXR0ZWQgdHJhaWxpbmcg cnVuIGludG8gYSBwYXJ0aWFsIHRyYWlsaW5nIHJ1bi4KLSAgICAgICAgYXV0byBvdmVyZmxvd0lu bGluZVRleHRJdGVtSW5kZXggPSBicmVha2luZ0NvbnRleHQucGFydGlhbFRyYWlsaW5nQ29udGVu dC0+cnVuSW5kZXg7Ci0gICAgICAgIGF1dG8mIG92ZXJmbG93SW5saW5lVGV4dEl0ZW0gPSBkb3du Y2FzdDxJbmxpbmVUZXh0SXRlbT4obV91bmNvbW1pdHRlZENvbnRlbnQucnVucygpW292ZXJmbG93 SW5saW5lVGV4dEl0ZW1JbmRleF0uaW5saW5lSXRlbSk7CisgICAgICAgIGF1dG8gdHJhaWxpbmdS dW5JbmRleCA9IGJyZWFraW5nQ29udGV4dC5wYXJ0aWFsVHJhaWxpbmdDb250ZW50LT5ydW5JbmRl eDsKKyAgICAgICAgYXV0byYgdHJhaWxpbmdJbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGlu ZVRleHRJdGVtPihtX3VuY29tbWl0dGVkQ29udGVudC5ydW5zKClbdHJhaWxpbmdSdW5JbmRleF0u aW5saW5lSXRlbSk7CiAKLSAgICAgICAgLy8gQ29uc3RydWN0IGEgcGFydGlhbCB0cmFpbGluZyBp bmxpbmUgcnVuLgogICAgICAgICBBU1NFUlQoIW1fcGFydGlhbFRyYWlsaW5nVGV4dEl0ZW0pOwot ICAgICAgICBhdXRvIHRyYWlsaW5nQ29udGVudExlbmd0aCA9IGJyZWFraW5nQ29udGV4dC5wYXJ0 aWFsVHJhaWxpbmdDb250ZW50LT5sZW5ndGg7Ci0gICAgICAgIG1fcGFydGlhbFRyYWlsaW5nVGV4 dEl0ZW0gPSBvdmVyZmxvd0lubGluZVRleHRJdGVtLmxlZnQodHJhaWxpbmdDb250ZW50TGVuZ3Ro KTsKLSAgICAgICAgbV9wYXJ0aWFsQ29udGVudCA9IExpbmVDb250ZW50OjpQYXJ0aWFsQ29udGVu dCB7IGJyZWFraW5nQ29udGV4dC5wYXJ0aWFsVHJhaWxpbmdDb250ZW50LT5uZWVkc0h5cGhlbiwg b3ZlcmZsb3dJbmxpbmVUZXh0SXRlbS5sZW5ndGgoKSAtIHRyYWlsaW5nQ29udGVudExlbmd0aCB9 OwotICAgICAgICAvLyBLZWVwIHRoZSBub24tb3ZlcmZsb3cgcGFydCBvZiB0aGUgdW5jb21taXR0 ZWQgcnVucyBhbmQgYWRkIHRoZSB0cmFpbGluZyBwYXJ0aWFsIGNvbnRlbnQuCi0gICAgICAgIG1f dW5jb21taXR0ZWRDb250ZW50LnRyaW0ob3ZlcmZsb3dJbmxpbmVUZXh0SXRlbUluZGV4KTsKLSAg ICAgICAgbV91bmNvbW1pdHRlZENvbnRlbnQuYXBwZW5kKCptX3BhcnRpYWxUcmFpbGluZ1RleHRJ dGVtLCBicmVha2luZ0NvbnRleHQucGFydGlhbFRyYWlsaW5nQ29udGVudC0+bG9naWNhbFdpZHRo KTsKKyAgICAgICAgLy8gQ29uc3RydWN0IGEgcGFydGlhbCB0cmFpbGluZyBpbmxpbmUgcnVuIG9u bHkgaWYgdGhlcmUncyBhIG5lZWQgZm9yIG9uZS4KKyAgICAgICAgLy8gV2hlbiBzcGxpdHRpbmcg bXVsdGlwbGUgcnVucyA8c3BhbiBzdHlsZT0id29yZC1icmVhazogYnJlYWstYWxsIj50ZXh0PC9z cGFuPjxzcGFuPmNvbnRlbnQ8L3NwYW4+LCB3ZSBtaWdodCBlbmQgdXAgc3BsaXR0aW5nIHRoZW0g YXQgcnVuIGJvdW5kYXJ5LgorICAgICAgICAvLyBJbiBzdWNoIGNhc2Ugd2UgZG9uJ3QgbmVlZCB0 byBjb25zdHJ1Y3QgYSBwYXJ0aWFsIHRyYWlsaW5nIGl0ZW0gc2luY2UgdGhlIHRyYWlsaW5nIHJ1 biBpcyBub3QgcGFydGlhbCBhdCBhbGwuCisgICAgICAgIGlmICh0cmFpbGluZ0lubGluZVRleHRJ dGVtLmxlbmd0aCgpID09IGJyZWFraW5nQ29udGV4dC5wYXJ0aWFsVHJhaWxpbmdDb250ZW50LT5s ZW5ndGgpIHsKKyAgICAgICAgICAgIC8vIFRyaW0gdGhlIG92ZXJmbG93biBydW4gYW5kIGtlZXAg dGhlIHRyYWlsaW5nIChub24tcGFydGlhbCkgcnVuIGluIHRoZSBxdWV1ZS4KKyAgICAgICAgICAg IGF1dG8gb3ZlcmZsb3duUnVuSW5kZXggPSB0cmFpbGluZ1J1bkluZGV4ICsgMTsKKyAgICAgICAg ICAgIEFTU0VSVChvdmVyZmxvd25SdW5JbmRleCA8IG1fdW5jb21taXR0ZWRDb250ZW50LnNpemUo KSk7CisgICAgICAgICAgICBtX3VuY29tbWl0dGVkQ29udGVudC50cmltKG92ZXJmbG93blJ1bklu ZGV4KTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGF1dG8gdHJhaWxpbmdDb250ZW50 TGVuZ3RoID0gYnJlYWtpbmdDb250ZXh0LnBhcnRpYWxUcmFpbGluZ0NvbnRlbnQtPmxlbmd0aDsK KyAgICAgICAgICAgIG1fcGFydGlhbFRyYWlsaW5nVGV4dEl0ZW0gPSB0cmFpbGluZ0lubGluZVRl eHRJdGVtLmxlZnQodHJhaWxpbmdDb250ZW50TGVuZ3RoKTsKKyAgICAgICAgICAgIG1fcGFydGlh bENvbnRlbnQgPSBMaW5lQ29udGVudDo6UGFydGlhbENvbnRlbnQgeyBicmVha2luZ0NvbnRleHQu cGFydGlhbFRyYWlsaW5nQ29udGVudC0+bmVlZHNIeXBoZW4sIHRyYWlsaW5nSW5saW5lVGV4dEl0 ZW0ubGVuZ3RoKCkgLSB0cmFpbGluZ0NvbnRlbnRMZW5ndGggfTsKKyAgICAgICAgICAgIC8vIEtl ZXAgdGhlIG5vbi1vdmVyZmxvdyBwYXJ0IG9mIHRoZSB1bmNvbW1pdHRlZCBydW5zIGFuZCBhZGQg dGhlIHRyYWlsaW5nIHBhcnRpYWwgY29udGVudC4KKyAgICAgICAgICAgIG1fdW5jb21taXR0ZWRD b250ZW50LnRyaW0odHJhaWxpbmdSdW5JbmRleCk7CisgICAgICAgICAgICBtX3VuY29tbWl0dGVk Q29udGVudC5hcHBlbmQoKm1fcGFydGlhbFRyYWlsaW5nVGV4dEl0ZW0sIGJyZWFraW5nQ29udGV4 dC5wYXJ0aWFsVHJhaWxpbmdDb250ZW50LT5sb2dpY2FsV2lkdGgpOworICAgICAgICB9CiAgICAg ICAgIGNvbW1pdFBlbmRpbmdDb250ZW50KGxpbmUpOwogICAgIH0gZWxzZSBpZiAoYnJlYWtpbmdD b250ZXh0LmNvbnRlbnRXcmFwcGluZ1J1bGUgPT0gTGluZUJyZWFrZXI6OkJyZWFraW5nQ29udGV4 dDo6Q29udGVudFdyYXBwaW5nUnVsZTo6UHVzaCkKICAgICAgICAgbV91bmNvbW1pdHRlZENvbnRl bnQucmVzZXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5oCmluZGV4IGU1OWU4MjBlNzgyNWE3MjcyM2U0 MTFlOTA4NDgxOTFiNDU3MDY2ZGQuLjcwODAwY2NiZDU2MWRhYmYyYWYxNGM4Y2UzMGNhYmZiYjdi Y2FhZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0xpbmVMYXlvdXRDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuaApAQCAtNDAsNyArNDAsNyBAQCBwdWJsaWM6CiAg ICAgc3RydWN0IExpbmVDb250ZW50IHsKICAgICAgICAgc3RydWN0IFBhcnRpYWxDb250ZW50IHsK ICAgICAgICAgICAgIGJvb2wgdHJhaWxpbmdDb250ZW50TmVlZHNIeXBoZW4geyBmYWxzZSB9Owot ICAgICAgICAgICAgdW5zaWduZWQgb3Zlcmxmb3dDb250ZW50TGVuZ3RoIHsgMCB9OworICAgICAg ICAgICAgdW5zaWduZWQgb3ZlcmZsb3dDb250ZW50TGVuZ3RoIHsgMCB9OwogICAgICAgICB9Owog ICAgICAgICBPcHRpb25hbDx1bnNpZ25lZD4gdHJhaWxpbmdJbmxpbmVJdGVtSW5kZXg7CiAgICAg ICAgIE9wdGlvbmFsPFBhcnRpYWxDb250ZW50PiBwYXJ0aWFsQ29udGVudDsK