230796 2021-09-25 06:30:30 -0700 [LFC][IFC] Text measuring is first-line style dependent 2021-09-25 15:00:50 -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 1797201 0 zalan 2021-09-25 06:30:30 -0700 so let's pass in the FontCascade 1797202 1 439261 zalan 2021-09-25 06:34:26 -0700 Created attachment 439261 Patch 1797210 2 ews-feeder 2021-09-25 08:48:03 -0700 Committed r283080 (242138@main): <https://commits.webkit.org/242138@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439261. 1797211 3 webkit-bug-importer 2021-09-25 08:49:18 -0700 <rdar://problem/83532977> 1797222 4 zalan 2021-09-25 13:10:41 -0700 reopened for the windows build. 1797224 5 439270 zalan 2021-09-25 13:11:03 -0700 Created attachment 439270 [fast-cq]Win build fix 1797230 6 ews-feeder 2021-09-25 13:30:09 -0700 /Volumes/Data/worker/Commit-Queue/build/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). 1797236 7 439272 zalan 2021-09-25 14:58:28 -0700 Created attachment 439272 [fast-cq]Win build fix 1797237 8 ews-feeder 2021-09-25 15:00:47 -0700 Committed r283084 (242142@main): <https://commits.webkit.org/242142@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439272. 439261 2021-09-25 06:34:26 -0700 2021-09-25 08:48:06 -0700 Patch bug-230796-20210925063425.patch text/plain 17493 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzBlMjU5OWExY2Q1MzI5 YjAyZWJmMWJiYWMxMjcwMGNiYTdhODM4Ny4uZTc5MzNlN2FhMzdiZTRkZTg3ZDg4OTdhNTU0OGQ4 YWQ2Y2YzZDcyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTA5LTI1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFRleHQgbWVh c3VyaW5nIGlzIGZpcnN0LWxpbmUgc3R5bGUgZGVwZW5kZW50CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA3OTYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXJzdC1saW5lIHN0eWxlIG1heSBjaGFuZ2Ug dGhlIGZvbnQgdG8gYmUgdXNlZCBmb3IgbWVhc3VyaW5nIHRoZSB0ZXh0IGNvbnRlbnQuCisgICAg ICAgIChUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBzdXBwb3J0aW5nIGZpcnN0LWxpbmUgc3R5 bGUpCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVD b250ZW50QnJlYWtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUNvbnRl bnRCcmVha2VyOjpwcm9jZXNzT3ZlcmZsb3dpbmdDb250ZW50IGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OnRyeUJyZWFraW5nVGV4dFJ1biBj b25zdCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6 aW5saW5lSXRlbVdpZHRoIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVUZXh0SXRlbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OklubGluZVRleHRJdGVtOjpjcmVhdGVBbmRBcHBlbmRUZXh0SXRlbXMpOgorICAgICAgICAqIGxh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpUZXh0VXRpbDo6d2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpUZXh0VXRpbDo6bWlkV29yZEJyZWFrKToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmg6CisKIDIwMjEtMDktMjQgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGEgU2Nyb2xs QW5pbWF0aW9ucyBsb2cgY2hhbm5lbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVu dEJyZWFrZXIuY3BwCmluZGV4IGIxNzk4ZjUyYmU0OTNkYzJjZWI2YWY1M2IwZjExOTJlOGZmMDJi ZGYuLmE4MDBhOGNjMTk0YTY2N2RmZTBjYTc0ZWFjN2MzZDMyNDE3OTEyZGUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNv bnRlbnRCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKQEAgLTIxOCw3ICsyMTgsOCBA QCBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0IElubGluZUNvbnRlbnRCcmVha2VyOjpwcm9j ZXNzT3ZlcmZsb3dpbmdDb250ZW50KGNvbgogICAgICAgICAgICAgICAgICAgICByZXR1cm4gUmVz dWx0IHsgUmVzdWx0OjpBY3Rpb246OldyYXAsIElzRW5kT2ZMaW5lOjpZZXMgfTsKIAogICAgICAg ICAgICAgICAgIGF1dG8gbGVhZGluZ1RleHRSdW5JbmRleCA9ICpmaXJzdFRleHRSdW5JbmRleChj b250aW51b3VzQ29udGVudCk7Ci0gICAgICAgICAgICAgICAgYXV0byYgaW5saW5lVGV4dEl0ZW0g PSBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oY29udGludW91c0NvbnRlbnQucnVucygpW2xlYWRp bmdUZXh0UnVuSW5kZXhdLmlubGluZUl0ZW0pOworICAgICAgICAgICAgICAgIGF1dG8mIGxlYWRp bmdUZXh0UnVuID0gY29udGludW91c0NvbnRlbnQucnVucygpW2xlYWRpbmdUZXh0UnVuSW5kZXhd OworICAgICAgICAgICAgICAgIGF1dG8mIGlubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5l VGV4dEl0ZW0+KGxlYWRpbmdUZXh0UnVuLmlubGluZUl0ZW0pOwogICAgICAgICAgICAgICAgIGF1 dG8gZmlyc3RDb2RlUG9pbnRMZW5ndGggPSBbJl0oKSAtPiBzaXplX3QgewogICAgICAgICAgICAg ICAgICAgICBhdXRvIHRleHRDb250ZW50ID0gaW5saW5lVGV4dEl0ZW0uaW5saW5lVGV4dEJveCgp LmNvbnRlbnQoKTsKICAgICAgICAgICAgICAgICAgICAgaWYgKHRleHRDb250ZW50LmlzOEJpdCgp KQpAQCAtMjMyLDcgKzIzMyw3IEBAIElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgSW5saW5l Q29udGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQoY29uCiAgICAgICAgICAg ICAgICAgaWYgKGlubGluZVRleHRJdGVtLmxlbmd0aCgpIDw9IGZpcnN0Q29kZVBvaW50TGVuZ3Ro KQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gUmVzdWx0IHsgUmVzdWx0OjpBY3Rpb246Oktl ZXAsIElzRW5kT2ZMaW5lOjpZZXMgfTsKIAotICAgICAgICAgICAgICAgIGF1dG8gZmlyc3RDb2Rl UG9pbnRXaWR0aCA9IFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgaW5saW5lVGV4dEl0 ZW0uc3RhcnQoKSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSArIGZpcnN0Q29kZVBvaW50TGVuZ3Ro LCBsaW5lU3RhdHVzLmNvbnRlbnRMb2dpY2FsUmlnaHQpOworICAgICAgICAgICAgICAgIGF1dG8g Zmlyc3RDb2RlUG9pbnRXaWR0aCA9IFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgbGVh ZGluZ1RleHRSdW4uc3R5bGUuZm9udENhc2NhZGUsIGlubGluZVRleHRJdGVtLnN0YXJ0KCksIGlu bGluZVRleHRJdGVtLnN0YXJ0KCkgKyBmaXJzdENvZGVQb2ludExlbmd0aCwgbGluZVN0YXR1cy5j b250ZW50TG9naWNhbFJpZ2h0KTsKICAgICAgICAgICAgICAgICByZXR1cm4gUmVzdWx0IHsgUmVz dWx0OjpBY3Rpb246OkJyZWFrLCBJc0VuZE9mTGluZTo6WWVzLCBSZXN1bHQ6OlBhcnRpYWxUcmFp bGluZ0NvbnRlbnQgeyBsZWFkaW5nVGV4dFJ1bkluZGV4LCBQYXJ0aWFsUnVuIHsgZmlyc3RDb2Rl UG9pbnRMZW5ndGgsIGZpcnN0Q29kZVBvaW50V2lkdGggfSB9IH07CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICBpZiAodHJhaWxpbmdDb250ZW50LT5vdmVyZmxvd3MgJiYgbGluZVN0YXR1cy5o YXNDb250ZW50KSB7CkBAIC00NzMsNyArNDc0LDcgQEAgc3RkOjpvcHRpb25hbDxJbmxpbmVDb250 ZW50QnJlYWtlcjo6UGFydGlhbFJ1bj4gSW5saW5lQ29udGVudEJyZWFrZXI6OnRyeUJyZWFraW4K ICAgICAgICAgICAgICAgICBhdXRvIGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuID0gKmF2 YWlsYWJsZVdpZHRoIC0gaHlwaGVuV2lkdGg7CiAgICAgICAgICAgICAgICAgaWYgKGF2YWlsYWJs ZVdpZHRoRXhjbHVkaW5nSHlwaGVuIDw9IDAgfHwgIWVub3VnaFdpZHRoRm9ySHlwaGVuYXRpb24o YXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4sIHN0eWxlLmZvbnRDYXNjYWRlLnBpeGVsU2l6 ZSgpKSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICAgICAgICAgICAgICBs ZWZ0U2lkZUxlbmd0aCA9IFRleHRVdGlsOjptaWRXb3JkQnJlYWsoaW5saW5lVGV4dEl0ZW0sIG92 ZXJmbG93aW5nUnVuLmxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4s IGxvZ2ljYWxMZWZ0KS5sZW5ndGg7CisgICAgICAgICAgICAgICAgbGVmdFNpZGVMZW5ndGggPSBU ZXh0VXRpbDo6bWlkV29yZEJyZWFrKGlubGluZVRleHRJdGVtLCBvdmVyZmxvd2luZ1J1bi5zdHls ZS5mb250Q2FzY2FkZSwgb3ZlcmZsb3dpbmdSdW4ubG9naWNhbFdpZHRoLCBhdmFpbGFibGVXaWR0 aEV4Y2x1ZGluZ0h5cGhlbiwgbG9naWNhbExlZnQpLmxlbmd0aDsKICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIGlmIChsZWZ0U2lkZUxlbmd0aCA8IGxpbWl0QmVmb3JlKQogICAgICAgICAgICAg ICAgIHJldHVybiB7IH07CkBAIC00ODQsNyArNDg1LDcgQEAgc3RkOjpvcHRpb25hbDxJbmxpbmVD b250ZW50QnJlYWtlcjo6UGFydGlhbFJ1bj4gSW5saW5lQ29udGVudEJyZWFrZXI6OnRyeUJyZWFr aW4KICAgICAgICAgICAgICAgICByZXR1cm4geyB9OwogICAgICAgICAgICAgLy8gaHlwaGVuTG9j YXRpb24gaXMgcmVsYXRpdmUgdG8gdGhlIHN0YXJ0IG9mIHRoaXMgSW5saW5lSXRlbVRleHQuCiAg ICAgICAgICAgICBBU1NFUlQoaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSArIGh5cGhlbkxvY2F0aW9u IDwgaW5saW5lVGV4dEl0ZW0uZW5kKCkpOwotICAgICAgICAgICAgYXV0byB0cmFpbGluZ1BhcnRp YWxSdW5XaWR0aFdpdGhIeXBoZW4gPSBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGlu bGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLnN0YXJ0KCkgKyBoeXBoZW5Mb2Nh dGlvbiwgbG9naWNhbExlZnQpOworICAgICAgICAgICAgYXV0byB0cmFpbGluZ1BhcnRpYWxSdW5X aWR0aFdpdGhIeXBoZW4gPSBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIG92ZXJmbG93 aW5nUnVuLnN0eWxlLmZvbnRDYXNjYWRlLCBpbmxpbmVUZXh0SXRlbS5zdGFydCgpLCBpbmxpbmVU ZXh0SXRlbS5zdGFydCgpICsgaHlwaGVuTG9jYXRpb24sIGxvZ2ljYWxMZWZ0KTsKICAgICAgICAg ICAgIHJldHVybiBQYXJ0aWFsUnVuIHsgaHlwaGVuTG9jYXRpb24sIHRyYWlsaW5nUGFydGlhbFJ1 bldpZHRoV2l0aEh5cGhlbiwgaHlwaGVuV2lkdGggfTsKICAgICAgICAgfTsKICAgICAgICAgaWYg KGF1dG8gcGFydGlhbFJ1biA9IHRyeUJyZWFraW5nQXRIeXBoZW5hdGlvbk9wcG9ydHVuaXR5KCkp CkBAIC01MDAsMTQgKzUwMSwxNCBAQCBzdGQ6Om9wdGlvbmFsPElubGluZUNvbnRlbnRCcmVha2Vy OjpQYXJ0aWFsUnVuPiBJbmxpbmVDb250ZW50QnJlYWtlcjo6dHJ5QnJlYWtpbgogICAgICAgICAg ICAgaWYgKGF2YWlsYWJsZVNwYWNlSXNJbmZpbml0ZSkgewogICAgICAgICAgICAgICAgIC8vIFdo ZW4gdGhlIHJ1biBjYW4gYmUgc3BsaXQgYXQgYXJiaXRyYXJ5IHBvc2l0aW9uIGxldCdzIGp1c3Qg cmV0dXJuIHRoZSBlbnRpcmUgcnVuIHdoZW4gaXQgaXMgaW50ZW5kZWQgdG8gZml0IG9uIHRoZSBs aW5lLgogICAgICAgICAgICAgICAgIEFTU0VSVChpbmxpbmVUZXh0SXRlbS5sZW5ndGgoKSk7Ci0g ICAgICAgICAgICAgICAgYXV0byB0cmFpbGluZ1BhcnRpYWxSdW5XaWR0aCA9IFRleHRVdGlsOjp3 aWR0aChpbmxpbmVUZXh0SXRlbSwgbG9naWNhbExlZnQpOworICAgICAgICAgICAgICAgIGF1dG8g dHJhaWxpbmdQYXJ0aWFsUnVuV2lkdGggPSBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0s IG92ZXJmbG93aW5nUnVuLnN0eWxlLmZvbnRDYXNjYWRlLCBsb2dpY2FsTGVmdCk7CiAgICAgICAg ICAgICAgICAgcmV0dXJuIHsgaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCksIHRyYWlsaW5nUGFydGlh bFJ1bldpZHRoIH07CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoISphdmFpbGFibGVX aWR0aCkgewogICAgICAgICAgICAgICAgIC8vIEZhc3QgcGF0aCBmb3IgY2FzZXMgd2hlbiB0aGVy ZSdzIG5vIHJvb20gYXQgYWxsLiBUaGUgY29udGVudCBpcyBicmVha2FibGUgYnV0IHdlIGRvbid0 IGhhdmUgc3BhY2UgZm9yIGl0LgogICAgICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICBhdXRvIG1pZFdvcmRCcmVhayA9IFRleHRVdGlsOjptaWRXb3Jk QnJlYWsoaW5saW5lVGV4dEl0ZW0sIG92ZXJmbG93aW5nUnVuLmxvZ2ljYWxXaWR0aCwgKmF2YWls YWJsZVdpZHRoLCBsb2dpY2FsTGVmdCk7CisgICAgICAgICAgICBhdXRvIG1pZFdvcmRCcmVhayA9 IFRleHRVdGlsOjptaWRXb3JkQnJlYWsoaW5saW5lVGV4dEl0ZW0sIG92ZXJmbG93aW5nUnVuLnN0 eWxlLmZvbnRDYXNjYWRlLCBvdmVyZmxvd2luZ1J1bi5sb2dpY2FsV2lkdGgsICphdmFpbGFibGVX aWR0aCwgbG9naWNhbExlZnQpOwogICAgICAgICAgICAgcmV0dXJuIHsgbWlkV29yZEJyZWFrLmxl bmd0aCwgbWlkV29yZEJyZWFrLmxvZ2ljYWxXaWR0aCB9OwogICAgICAgICB9OwogICAgICAgICAv LyBXaXRoIGFyYml0cmFyeSBicmVha2luZyB0aGVyZSdzIGFsd2F5cyBhIHZhbGlkIGJyZWFraW5n IHBvc2l0aW9uIChldmVuIGlmIGl0IGlzIGJlZm9yZSB0aGUgZmlyc3QgcG9zaXRpb24pLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDE4ZDFkOGQ2Y2QxMjVj N2Y1ODM5YTIzMDZhYzIwNjA3ZGJmMGViYzYuLmFmMTI5ZmJkNzY3NTVjZTM4OWNmOTA5YTM0YTFl NjAwYjNmNjVhZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAK QEAgLTIxOCwxMSArMjE4LDEyIEBAIElubGluZUxheW91dFVuaXQgTGluZUJ1aWxkZXI6OmlubGlu ZUl0ZW1XaWR0aChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpCiB7CiAgICAgaWYg KGlzPElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKSkgewogICAgICAgICBhdXRvJiBpbmxpbmVU ZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKTsKKyAgICAgICAg YXV0byYgZm9udENhc2NhZGUgPSBpbmxpbmVUZXh0SXRlbS5sYXlvdXRCb3goKS5zdHlsZSgpLmZv bnRDYXNjYWRlKCk7CiAgICAgICAgIGlmIChhdXRvIGNvbnRlbnRXaWR0aCA9IGlubGluZVRleHRJ dGVtLndpZHRoKCkpCiAgICAgICAgICAgICByZXR1cm4gKmNvbnRlbnRXaWR0aDsKICAgICAgICAg aWYgKCFpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSB8fCBJbmxpbmVUZXh0SXRlbTo6c2hv dWxkUHJlc2VydmVTcGFjZXNBbmRUYWJzKGlubGluZVRleHRJdGVtKSkKLSAgICAgICAgICAgIHJl dHVybiBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGNvbnRlbnRMb2dpY2FsTGVmdCk7 Ci0gICAgICAgIHJldHVybiBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGlubGluZVRl eHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLnN0YXJ0KCkgKyAxLCBjb250ZW50TG9naWNh bExlZnQpOworICAgICAgICAgICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRl bSwgZm9udENhc2NhZGUsIGNvbnRlbnRMb2dpY2FsTGVmdCk7CisgICAgICAgIHJldHVybiBUZXh0 VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGZvbnRDYXNjYWRlLCBpbmxpbmVUZXh0SXRlbS5z dGFydCgpLCBpbmxpbmVUZXh0SXRlbS5zdGFydCgpICsgMSwgY29udGVudExvZ2ljYWxMZWZ0KTsK ICAgICB9CiAKICAgICBpZiAoaW5saW5lSXRlbS5pc0xpbmVCcmVhaygpIHx8IGlubGluZUl0ZW0u aXNXb3JkQnJlYWtPcHBvcnR1bml0eSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0ZW0uY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0ZW0u Y3BwCmluZGV4IDRjZmRjMDQ5NTNlMDJjZGIyMzc0OTQyZWZmMzU1NDUxYWI1MjE1YjguLmRlMDdl M2UyODM5ODAzNDIyMTYyMTczYTU0MTQyMmM4ZGUyYTgzZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZVRleHRJdGVtLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVUZXh0SXRlbS5jcHAKQEAgLTc4LDcgKzc4LDcgQEAgdm9pZCBJbmxpbmVUZXh0SXRlbTo6 Y3JlYXRlQW5kQXBwZW5kVGV4dEl0ZW1zKElubGluZUl0ZW1zJiBpbmxpbmVDb250ZW50LCBjb25z dAogICAgICAgICByZXR1cm4gaW5saW5lQ29udGVudC5hcHBlbmQoSW5saW5lVGV4dEl0ZW06OmNy ZWF0ZUVtcHR5SXRlbShpbmxpbmVUZXh0Qm94KSk7CiAKICAgICBhdXRvJiBzdHlsZSA9IGlubGlu ZVRleHRCb3guc3R5bGUoKTsKLSAgICBhdXRvJiBmb250ID0gc3R5bGUuZm9udENhc2NhZGUoKTsK KyAgICBhdXRvJiBmb250Q2FzY2FkZSA9IHN0eWxlLmZvbnRDYXNjYWRlKCk7CiAgICAgYXV0byB3 aGl0ZXNwYWNlQ29udGVudElzVHJlYXRlZEFzU2luZ2xlU3BhY2UgPSAhVGV4dFV0aWw6OnNob3Vs ZFByZXNlcnZlU3BhY2VzQW5kVGFicyhpbmxpbmVUZXh0Qm94KTsKICAgICBhdXRvIHNob3VsZFBy ZXNlcnZlTmV3bGluZSA9IFRleHRVdGlsOjpzaG91bGRQcmVzZXJ2ZU5ld2xpbmUoaW5saW5lVGV4 dEJveCk7CiAgICAgYXV0byBzaG91bGRUcmVhdE5vbkJyZWFraW5nU3BhY2VBc1JlZ3VsYXJTcGFj ZSA9IHN0eWxlLm5ic3BNb2RlKCkgPT0gTkJTUE1vZGU6OlNwYWNlOwpAQCAtODgsNyArODgsNyBA QCB2b2lkIElubGluZVRleHRJdGVtOjpjcmVhdGVBbmRBcHBlbmRUZXh0SXRlbXMoSW5saW5lSXRl bXMmIGlubGluZUNvbnRlbnQsIGNvbnN0CiAgICAgYXV0byBpbmxpbmVJdGVtV2lkdGggPSBbJl0o YXV0byBzdGFydFBvc2l0aW9uLCBhdXRvIGxlbmd0aCkgLT4gc3RkOjpvcHRpb25hbDxJbmxpbmVM YXlvdXRVbml0PiB7CiAgICAgICAgIGlmICghaW5saW5lVGV4dEJveC5jYW5Vc2VTaW1wbGlmaWVk Q29udGVudE1lYXN1cmluZygpKQogICAgICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICAgICAgcmV0 dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0Qm94LCBzdGFydFBvc2l0aW9uLCBzdGFydFBv c2l0aW9uICsgbGVuZ3RoLCB7IH0pOworICAgICAgICByZXR1cm4gVGV4dFV0aWw6OndpZHRoKGlu bGluZVRleHRCb3gsIGZvbnRDYXNjYWRlLCBzdGFydFBvc2l0aW9uLCBzdGFydFBvc2l0aW9uICsg bGVuZ3RoLCB7IH0pOwogICAgIH07CiAKICAgICB3aGlsZSAoY3VycmVudFBvc2l0aW9uIDwgdGV4 dC5sZW5ndGgoKSkgewpAQCAtMTA3LDcgKzEwNyw3IEBAIHZvaWQgSW5saW5lVGV4dEl0ZW06OmNy ZWF0ZUFuZEFwcGVuZFRleHRJdGVtcyhJbmxpbmVJdGVtcyYgaW5saW5lQ29udGVudCwgY29uc3QK ICAgICAgICAgICAgIEFTU0VSVCh3aGl0ZXNwYWNlQ29udGVudC0+bGVuZ3RoKTsKICAgICAgICAg ICAgIGF1dG8gYXBwZW5kV2hpdGVzcGFjZUl0ZW0gPSBbJl0gKGF1dG8gc3RhcnRQb3NpdGlvbiwg YXV0byBpdGVtTGVuZ3RoKSB7CiAgICAgICAgICAgICAgICAgYXV0byBzaW1wbGVTaW5nbGVXaGl0 ZXNwYWNlQ29udGVudCA9IGlubGluZVRleHRCb3guY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFz dXJpbmcoKSAmJiAoaXRlbUxlbmd0aCA9PSAxIHx8IHdoaXRlc3BhY2VDb250ZW50SXNUcmVhdGVk QXNTaW5nbGVTcGFjZSk7Ci0gICAgICAgICAgICAgICAgYXV0byB3aWR0aCA9IHNpbXBsZVNpbmds ZVdoaXRlc3BhY2VDb250ZW50ID8gc3RkOjptYWtlX29wdGlvbmFsKElubGluZUxheW91dFVuaXQg eyBmb250LnNwYWNlV2lkdGgoKSB9KSA6IGlubGluZUl0ZW1XaWR0aChzdGFydFBvc2l0aW9uLCBp dGVtTGVuZ3RoKTsKKyAgICAgICAgICAgICAgICBhdXRvIHdpZHRoID0gc2ltcGxlU2luZ2xlV2hp dGVzcGFjZUNvbnRlbnQgPyBzdGQ6Om1ha2Vfb3B0aW9uYWwoSW5saW5lTGF5b3V0VW5pdCB7IGZv bnRDYXNjYWRlLnNwYWNlV2lkdGgoKSB9KSA6IGlubGluZUl0ZW1XaWR0aChzdGFydFBvc2l0aW9u LCBpdGVtTGVuZ3RoKTsKICAgICAgICAgICAgICAgICBpbmxpbmVDb250ZW50LmFwcGVuZChJbmxp bmVUZXh0SXRlbTo6Y3JlYXRlV2hpdGVzcGFjZUl0ZW0oaW5saW5lVGV4dEJveCwgc3RhcnRQb3Np dGlvbiwgaXRlbUxlbmd0aCwgd2hpdGVzcGFjZUNvbnRlbnQtPmlzV29yZFNlcGFyYXRvciwgd2lk dGgpKTsKICAgICAgICAgICAgIH07CiAgICAgICAgICAgICBpZiAoc3R5bGUud2hpdGVTcGFjZSgp ID09IFdoaXRlU3BhY2U6OkJyZWFrU3BhY2VzKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0 aWwuY3BwCmluZGV4IGM3ODlmYjBhMDY1MWZjZjM2MDU5ZTI1MGE2MGE1OTIwOTFmYjVmMzcuLjQ1 MzgwNDNmODNkOGFiYTIzMmM0ZTYxZTAyZDZkZDQzZTBhYzk2ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L3RleHQvVGV4dFV0aWwuY3BwCkBAIC00MCw0OCArNDAsNDYgQEAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCi1JbmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjp3aWR0 aChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIElubGluZUxheW91dFVuaXQg Y29udGVudExvZ2ljYWxMZWZ0KQorSW5saW5lTGF5b3V0VW5pdCBUZXh0VXRpbDo6d2lkdGgoY29u c3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBjb25zdCBGb250Q2FzY2FkZSYgZm9u dENhc2NhZGUsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KQogewotICAgIHJl dHVybiBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGlubGluZVRleHRJdGVtLnN0YXJ0 KCksIGlubGluZVRleHRJdGVtLmVuZCgpLCBjb250ZW50TG9naWNhbExlZnQpOworICAgIHJldHVy biBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGZvbnRDYXNjYWRlLCBpbmxpbmVUZXh0 SXRlbS5zdGFydCgpLCBpbmxpbmVUZXh0SXRlbS5lbmQoKSwgY29udGVudExvZ2ljYWxMZWZ0KTsK IH0KIAotSW5saW5lTGF5b3V0VW5pdCBUZXh0VXRpbDo6d2lkdGgoY29uc3QgSW5saW5lVGV4dEl0 ZW0mIGlubGluZVRleHRJdGVtLCB1bnNpZ25lZCBmcm9tLCB1bnNpZ25lZCB0bywgSW5saW5lTGF5 b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpCitJbmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjp3 aWR0aChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIGNvbnN0IEZvbnRDYXNj YWRlJiBmb250Q2FzY2FkZSwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIElubGluZUxheW91 dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KQogewogICAgIFJFTEVBU0VfQVNTRVJUKGZyb20gPj0g aW5saW5lVGV4dEl0ZW0uc3RhcnQoKSk7CiAgICAgUkVMRUFTRV9BU1NFUlQodG8gPD0gaW5saW5l VGV4dEl0ZW0uZW5kKCkpOwotICAgIGlmIChpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAm JiAhSW5saW5lVGV4dEl0ZW06OnNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyhpbmxpbmVUZXh0 SXRlbSkpIHsKLSAgICAgICAgYXV0byBzcGFjZVdpZHRoID0gaW5saW5lVGV4dEl0ZW0uc3R5bGUo KS5mb250Q2FzY2FkZSgpLnNwYWNlV2lkdGgoKTsKKyAgICBpZiAoaW5saW5lVGV4dEl0ZW0uaXNX aGl0ZXNwYWNlKCkgJiYgIVRleHRVdGlsOjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMoaW5s aW5lVGV4dEl0ZW0ubGF5b3V0Qm94KCkpKSB7CisgICAgICAgIGF1dG8gc3BhY2VXaWR0aCA9IGZv bnRDYXNjYWRlLnNwYWNlV2lkdGgoKTsKICAgICAgICAgcmV0dXJuIHN0ZDo6aXNuYW4oc3BhY2VX aWR0aCkgPyAwLjBmIDogc3RkOjppc2luZihzcGFjZVdpZHRoKSA/IG1heElubGluZUxheW91dFVu aXQoKSA6IHNwYWNlV2lkdGg7CiAgICAgfQotICAgIHJldHVybiBUZXh0VXRpbDo6d2lkdGgoaW5s aW5lVGV4dEl0ZW0uaW5saW5lVGV4dEJveCgpLCBmcm9tLCB0bywgY29udGVudExvZ2ljYWxMZWZ0 KTsKKyAgICByZXR1cm4gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVtLmlubGluZVRleHRC b3goKSwgZm9udENhc2NhZGUsIGZyb20sIHRvLCBjb250ZW50TG9naWNhbExlZnQpOwogfQogCi1J bmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjp3aWR0aChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxp bmVUZXh0Qm94LCB1bnNpZ25lZCBmcm9tLCB1bnNpZ25lZCB0bywgSW5saW5lTGF5b3V0VW5pdCBj b250ZW50TG9naWNhbExlZnQpCitJbmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjp3aWR0aChjb25z dCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCBjb25zdCBGb250Q2FzY2FkZSYgZm9udENh c2NhZGUsIHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIHRvLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRl bnRMb2dpY2FsTGVmdCkKIHsKICAgICBpZiAoZnJvbSA9PSB0bykKICAgICAgICAgcmV0dXJuIDA7 CiAKLSAgICBhdXRvJiBzdHlsZSA9IGlubGluZVRleHRCb3guc3R5bGUoKTsKLSAgICBhdXRvJiBm b250ID0gc3R5bGUuZm9udENhc2NhZGUoKTsKICAgICBhdXRvIHRleHQgPSBpbmxpbmVUZXh0Qm94 LmNvbnRlbnQoKTsKICAgICBBU1NFUlQodG8gPD0gdGV4dC5sZW5ndGgoKSk7Ci0gICAgYXV0byBo YXNLZXJuaW5nT3JMaWdhdHVyZXMgPSBmb250LmVuYWJsZUtlcm5pbmcoKSB8fCBmb250LnJlcXVp cmVzU2hhcGluZygpOworICAgIGF1dG8gaGFzS2VybmluZ09yTGlnYXR1cmVzID0gZm9udENhc2Nh ZGUuZW5hYmxlS2VybmluZygpIHx8IGZvbnRDYXNjYWRlLnJlcXVpcmVzU2hhcGluZygpOwogICAg IGF1dG8gbWVhc3VyZVdpdGhFbmRTcGFjZSA9IGhhc0tlcm5pbmdPckxpZ2F0dXJlcyAmJiB0byA8 IHRleHQubGVuZ3RoKCkgJiYgdGV4dFt0b10gPT0gJyAnOwogICAgIGlmIChtZWFzdXJlV2l0aEVu ZFNwYWNlKQogICAgICAgICArK3RvOwogICAgIGZsb2F0IHdpZHRoID0gMDsKICAgICBpZiAoaW5s aW5lVGV4dEJveC5jYW5Vc2VTaW1wbGlmaWVkQ29udGVudE1lYXN1cmluZygpKQotICAgICAgICB3 aWR0aCA9IGZvbnQud2lkdGhGb3JTaW1wbGVUZXh0KFN0cmluZ1ZpZXcodGV4dCkuc3Vic3RyaW5n KGZyb20sIHRvIC0gZnJvbSkpOworICAgICAgICB3aWR0aCA9IGZvbnRDYXNjYWRlLndpZHRoRm9y U2ltcGxlVGV4dChTdHJpbmdWaWV3KHRleHQpLnN1YnN0cmluZyhmcm9tLCB0byAtIGZyb20pKTsK ICAgICBlbHNlIHsKLSAgICAgICAgYXV0byB0YWJXaWR0aCA9IHN0eWxlLmNvbGxhcHNlV2hpdGVT cGFjZSgpID8gVGFiU2l6ZSgwKSA6IHN0eWxlLnRhYlNpemUoKTsKICAgICAgICAgV2ViQ29yZTo6 VGV4dFJ1biBydW4oU3RyaW5nVmlldyh0ZXh0KS5zdWJzdHJpbmcoZnJvbSwgdG8gLSBmcm9tKSwg Y29udGVudExvZ2ljYWxMZWZ0KTsKLSAgICAgICAgaWYgKHRhYldpZHRoKQotICAgICAgICAgICAg cnVuLnNldFRhYlNpemUodHJ1ZSwgdGFiV2lkdGgpOwotICAgICAgICB3aWR0aCA9IGZvbnQud2lk dGgocnVuKTsKKyAgICAgICAgYXV0byYgc3R5bGUgPSBpbmxpbmVUZXh0Qm94LnN0eWxlKCk7Cisg ICAgICAgIGlmICghc3R5bGUuY29sbGFwc2VXaGl0ZVNwYWNlKCkgJiYgc3R5bGUudGFiU2l6ZSgp ID4gMCkKKyAgICAgICAgICAgIHJ1bi5zZXRUYWJTaXplKHRydWUsIHN0eWxlLnRhYlNpemUoKSk7 CisgICAgICAgIHdpZHRoID0gZm9udENhc2NhZGUud2lkdGgocnVuKTsKICAgICB9CiAKICAgICBp ZiAobWVhc3VyZVdpdGhFbmRTcGFjZSkKLSAgICAgICAgd2lkdGggLT0gKGZvbnQuc3BhY2VXaWR0 aCgpICsgZm9udC53b3JkU3BhY2luZygpKTsKKyAgICAgICAgd2lkdGggLT0gKGZvbnRDYXNjYWRl LnNwYWNlV2lkdGgoKSArIGZvbnRDYXNjYWRlLndvcmRTcGFjaW5nKCkpOwogCiAgICAgcmV0dXJu IHN0ZDo6aXNuYW4od2lkdGgpID8gMC4wZiA6IHN0ZDo6aXNpbmYod2lkdGgpID8gbWF4SW5saW5l TGF5b3V0VW5pdCgpIDogd2lkdGg7CiB9CkBAIC0xMzgsNyArMTM2LDcgQEAgVGV4dFV0aWw6OkZh bGxiYWNrRm9udExpc3QgVGV4dFV0aWw6OmZhbGxiYWNrRm9udHNGb3JSdW4oY29uc3QgTGluZTo6 UnVuJiBydW4sIGMKICAgICByZXR1cm4gZmFsbGJhY2tGb250czsKIH0KIAotVGV4dFV0aWw6Ok1p ZFdvcmRCcmVhayBUZXh0VXRpbDo6bWlkV29yZEJyZWFrKGNvbnN0IElubGluZVRleHRJdGVtJiBp bmxpbmVUZXh0SXRlbSwgSW5saW5lTGF5b3V0VW5pdCB0ZXh0V2lkdGgsIElubGluZUxheW91dFVu aXQgYXZhaWxhYmxlV2lkdGgsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KQor VGV4dFV0aWw6Ok1pZFdvcmRCcmVhayBUZXh0VXRpbDo6bWlkV29yZEJyZWFrKGNvbnN0IElubGlu ZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSwgY29uc3QgRm9udENhc2NhZGUmIGZvbnRDYXNjYWRl LCBJbmxpbmVMYXlvdXRVbml0IHRleHRXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVX aWR0aCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpCiB7CiAgICAgQVNTRVJU KGF2YWlsYWJsZVdpZHRoID49IDApOwogICAgIGF1dG8gc3RhcnRQb3NpdGlvbiA9IGlubGluZVRl eHRJdGVtLnN0YXJ0KCk7CkBAIC0xNjYsNyArMTY0LDcgQEAgVGV4dFV0aWw6Ok1pZFdvcmRCcmVh ayBUZXh0VXRpbDo6bWlkV29yZEJyZWFrKGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0 SXQKICAgICBhdXRvIGxlZnRTaWRlV2lkdGggPSBJbmxpbmVMYXlvdXRVbml0IHsgMCB9OwogICAg IHdoaWxlIChsZWZ0IDwgcmlnaHQpIHsKICAgICAgICAgYXV0byBtaWRkbGUgPSBzdXJyb2dhdGVQ YWlyQXdhcmVJbmRleCgobGVmdCArIHJpZ2h0KSAvIDIpOwotICAgICAgICBhdXRvIHdpZHRoID0g VGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVtLCBzdGFydFBvc2l0aW9uLCBtaWRkbGUgKyAx LCBjb250ZW50TG9naWNhbExlZnQpOworICAgICAgICBhdXRvIHdpZHRoID0gVGV4dFV0aWw6Ondp ZHRoKGlubGluZVRleHRJdGVtLCBmb250Q2FzY2FkZSwgc3RhcnRQb3NpdGlvbiwgbWlkZGxlICsg MSwgY29udGVudExvZ2ljYWxMZWZ0KTsKICAgICAgICAgaWYgKHdpZHRoIDwgYXZhaWxhYmxlV2lk dGgpIHsKICAgICAgICAgICAgIGxlZnQgPSBtaWRkbGUgKyAxOwogICAgICAgICAgICAgbGVmdFNp ZGVXaWR0aCA9IHdpZHRoOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5oCmluZGV4IDBlZThl ZmU2N2Y0MDUzMjQ1OGFiNDI2ZmEzYjU3ODVmZWFlYjA2NGIuLjExN2MwNWQzZTgzNDAyYWNiZWQ1 ZGQzZmIwODJjYTdjNGI0NDY2YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmgKQEAg LTQ0LDkgKzQ0LDkgQEAgY2xhc3MgSW5saW5lVGV4dEl0ZW07CiAKIGNsYXNzIFRleHRVdGlsIHsK IHB1YmxpYzoKLSAgICBzdGF0aWMgSW5saW5lTGF5b3V0VW5pdCB3aWR0aChjb25zdCBJbmxpbmVU ZXh0SXRlbSYsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KTsKLSAgICBzdGF0 aWMgSW5saW5lTGF5b3V0VW5pdCB3aWR0aChjb25zdCBJbmxpbmVUZXh0SXRlbSYsIHVuc2lnbmVk IGZyb20sIHVuc2lnbmVkIHRvLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCk7 Ci0gICAgc3RhdGljIElubGluZUxheW91dFVuaXQgd2lkdGgoY29uc3QgSW5saW5lVGV4dEJveCYs IHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIHRvLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dp Y2FsTGVmdCk7CisgICAgc3RhdGljIElubGluZUxheW91dFVuaXQgd2lkdGgoY29uc3QgSW5saW5l VGV4dEl0ZW0mLCBjb25zdCBGb250Q2FzY2FkZSYsIElubGluZUxheW91dFVuaXQgY29udGVudExv Z2ljYWxMZWZ0KTsKKyAgICBzdGF0aWMgSW5saW5lTGF5b3V0VW5pdCB3aWR0aChjb25zdCBJbmxp bmVUZXh0SXRlbSYsIGNvbnN0IEZvbnRDYXNjYWRlJiwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQg dG8sIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KTsKKyAgICBzdGF0aWMgSW5s aW5lTGF5b3V0VW5pdCB3aWR0aChjb25zdCBJbmxpbmVUZXh0Qm94JiwgY29uc3QgRm9udENhc2Nh ZGUmLCB1bnNpZ25lZCBmcm9tLCB1bnNpZ25lZCB0bywgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50 TG9naWNhbExlZnQpOwogCiAgICAgdXNpbmcgRmFsbGJhY2tGb250TGlzdCA9IEhhc2hTZXQ8Y29u c3QgRm9udCo+OwogICAgIHN0YXRpYyBGYWxsYmFja0ZvbnRMaXN0IGZhbGxiYWNrRm9udHNGb3JS dW4oY29uc3QgTGluZTo6UnVuJiwgY29uc3QgUmVuZGVyU3R5bGUmKTsKQEAgLTU2LDcgKzU2LDcg QEAgcHVibGljOgogICAgICAgICBzaXplX3QgbGVuZ3RoIHsgMCB9OwogICAgICAgICBJbmxpbmVM YXlvdXRVbml0IGxvZ2ljYWxXaWR0aCB7IDAgfTsKICAgICB9OwotICAgIHN0YXRpYyBNaWRXb3Jk QnJlYWsgbWlkV29yZEJyZWFrKGNvbnN0IElubGluZVRleHRJdGVtJiwgSW5saW5lTGF5b3V0VW5p dCB0ZXh0V2lkdGgsIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIElubGluZUxheW91 dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KTsKKyAgICBzdGF0aWMgTWlkV29yZEJyZWFrIG1pZFdv cmRCcmVhayhjb25zdCBJbmxpbmVUZXh0SXRlbSYsIGNvbnN0IEZvbnRDYXNjYWRlJiwgSW5saW5l TGF5b3V0VW5pdCB0ZXh0V2lkdGgsIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIElu bGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KTsKIAogICAgIHN0YXRpYyB1bnNpZ25l ZCBmaW5kTmV4dEJyZWFrYWJsZVBvc2l0aW9uKExhenlMaW5lQnJlYWtJdGVyYXRvciYsIHVuc2ln bmVkIHN0YXJ0UG9zaXRpb24sIGNvbnN0IFJlbmRlclN0eWxlJik7CiAgICAgc3RhdGljIExpbmVC cmVha0l0ZXJhdG9yTW9kZSBsaW5lQnJlYWtJdGVyYXRvck1vZGUoTGluZUJyZWFrKTsK 439270 2021-09-25 13:11:03 -0700 2021-09-25 14:58:28 -0700 [fast-cq]Win build fix Patch.txt text/plain 1287 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhOTZlOGY3YTE5NGEuLjNiNjY0ZWExYmM1YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEwIEBACisyMDIxLTA5LTI1ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K KworICAgICAgICBGaXggd2luIGJ1aWxkLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OlRleHRVdGlsOjp3aWR0aCk6CisKIDIwMjEtMDktMjUgIEFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gVGV4dCBtZWFzdXJpbmcgaXMgZmlyc3Qt bGluZSBzdHlsZSBkZXBlbmRlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5jcHAKaW5k ZXggNDUzODA0M2Y4M2Q4Li44NGY4MzJmZTc2YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4 dFV0aWwuY3BwCkBAIC03Myw3ICs3Myw3IEBAIElubGluZUxheW91dFVuaXQgVGV4dFV0aWw6Ondp ZHRoKGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIGNvbnN0IEZvbnRDCiAgICAg ZWxzZSB7CiAgICAgICAgIFdlYkNvcmU6OlRleHRSdW4gcnVuKFN0cmluZ1ZpZXcodGV4dCkuc3Vi c3RyaW5nKGZyb20sIHRvIC0gZnJvbSksIGNvbnRlbnRMb2dpY2FsTGVmdCk7CiAgICAgICAgIGF1 dG8mIHN0eWxlID0gaW5saW5lVGV4dEJveC5zdHlsZSgpOwotICAgICAgICBpZiAoIXN0eWxlLmNv bGxhcHNlV2hpdGVTcGFjZSgpICYmIHN0eWxlLnRhYlNpemUoKSA+IDApCisgICAgICAgIGlmICgh c3R5bGUuY29sbGFwc2VXaGl0ZVNwYWNlKCkgJiYgc3R5bGUudGFiU2l6ZSgpKQogICAgICAgICAg ICAgcnVuLnNldFRhYlNpemUodHJ1ZSwgc3R5bGUudGFiU2l6ZSgpKTsKICAgICAgICAgd2lkdGgg PSBmb250Q2FzY2FkZS53aWR0aChydW4pOwogICAgIH0K 439272 2021-09-25 14:58:28 -0700 2021-09-25 15:00:49 -0700 [fast-cq]Win build fix Patch.txt text/plain 1310 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhOTZlOGY3YTE5NGEuLmEzZTdkMTUxYWEwYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEyIEBACisyMDIxLTA5LTI1ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K KworICAgICAgICBGaXggd2luIGJ1aWxkLgorCisgICAgICAgIFVucmV2aWV3ZWQuCisKKyAgICAg ICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0aWw6OndpZHRoKToKKwogMjAyMS0wOS0y NSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBU ZXh0IG1lYXN1cmluZyBpcyBmaXJzdC1saW5lIHN0eWxlIGRlcGVuZGVudApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0 VXRpbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS90ZXh0L1RleHRVdGlsLmNwcAppbmRleCA0NTM4MDQzZjgzZDguLjg0ZjgzMmZlNzZiYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv dGV4dC9UZXh0VXRpbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5jcHAKQEAgLTczLDcgKzczLDcgQEAgSW5saW5l TGF5b3V0VW5pdCBUZXh0VXRpbDo6d2lkdGgoY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGV4 dEJveCwgY29uc3QgRm9udEMKICAgICBlbHNlIHsKICAgICAgICAgV2ViQ29yZTo6VGV4dFJ1biBy dW4oU3RyaW5nVmlldyh0ZXh0KS5zdWJzdHJpbmcoZnJvbSwgdG8gLSBmcm9tKSwgY29udGVudExv Z2ljYWxMZWZ0KTsKICAgICAgICAgYXV0byYgc3R5bGUgPSBpbmxpbmVUZXh0Qm94LnN0eWxlKCk7 Ci0gICAgICAgIGlmICghc3R5bGUuY29sbGFwc2VXaGl0ZVNwYWNlKCkgJiYgc3R5bGUudGFiU2l6 ZSgpID4gMCkKKyAgICAgICAgaWYgKCFzdHlsZS5jb2xsYXBzZVdoaXRlU3BhY2UoKSAmJiBzdHls ZS50YWJTaXplKCkpCiAgICAgICAgICAgICBydW4uc2V0VGFiU2l6ZSh0cnVlLCBzdHlsZS50YWJT aXplKCkpOwogICAgICAgICB3aWR0aCA9IGZvbnRDYXNjYWRlLndpZHRoKHJ1bik7CiAgICAgfQo=