231089 2021-10-01 11:22:10 -0700 REGRESSION(r283047): PerformanceTests/Layout/line-layout-simple.html regressed by ~10% 2021-10-01 13:22:20 -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 1799415 0 zalan 2021-10-01 11:22:10 -0700 due to the enlarged size of ContinuousContent::Run 1799418 1 439881 zalan 2021-10-01 11:25:37 -0700 Created attachment 439881 Patch 1799494 2 ews-feeder 2021-10-01 13:21:06 -0700 Committed r283392 (242396@main): <https://commits.webkit.org/242396@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439881. 1799495 3 webkit-bug-importer 2021-10-01 13:22:20 -0700 <rdar://problem/83779390> 439881 2021-10-01 11:25:37 -0700 2021-10-01 13:21:07 -0700 Patch bug-231089-20211001112536.patch text/plain 15556 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjk3ZDQzMzYwNDlhYzc5 YWYyMDE0NGY4NDhhZmU3ZmI0NDU0OGU2NS4uZDY5OGFmZjMxMzJhMjU0OGM2ODZkMmM1NDlmYjhk MDdlM2MwNjlkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTEwLTAxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyODMwNDcp OiBQZXJmb3JtYW5jZVRlc3RzL0xheW91dC9saW5lLWxheW91dC1zaW1wbGUuaHRtbCByZWdyZXNz ZWQgYnkgfjEwJQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjMxMDg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTGV0J3MganVzdCBob2xkIG9uIHRvIHRoZSBhcHBsaWNhYmxlIFJlbmRlclN0eWxlIGluc3Rl YWQgb2YgY29uc3RydWN0aW5nIGEgZGVkaWNhdGVkIFN0eWxlIHN0cnVjdHVyZS4KKyAgICAgICAg Tm90ZSB0aGF0IHRoZSBleHBlY3RlZCBzdHlsZSBmb3IgbGluZSBicmVha2luZyBpcyBub3QgbmVj ZXNzYXJpbHkgdGhlIHN0eWxlIG9mIHRoZSBpbmxpbmUgaXRlbSAoZS5nLiBpbiBjYXNlIG9mIGFu IGF0b21pYyBpbmxpbmUgYm94LCBpdCdzIHRoZSBwYXJlbnQgaW5saW5lIGJveCdzIHN0eWxlKS4K KworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRl bnRCcmVha2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJy ZWFrZXI6OmlzV3JhcHBpbmdBbGxvd2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lQ29udGVudEJyZWFrZXI6OnNob3VsZEtlZXBFbmRPZkxpbmVXaGl0ZXNwYWNlIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NP dmVyZmxvd2luZ0NvbnRlbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVDb250ZW50QnJlYWtlcjo6d29yZEJyZWFrQmVoYXZpb3IgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVDb250ZW50QnJlYWtlcjo6dHJ5QnJlYWtpbmdUZXh0UnVuIGNv bnN0KToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVD b250ZW50QnJlYWtlci5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVDb250ZW50 QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OlJ1bjo6UnVuKToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6bG9naWNhbFdpZHRoKTogRGVsZXRlZC4KKwogMjAyMS0xMC0wMSAgQW50dGkgS29p dmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBJbmxpbmVXYWxrZXIgdG8g YSBmaWxlIG9mIGl0cyBvd24gYW5kIG1ha2UgaXQgdXNlIFJlbmRlckl0ZXJhdG9yCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVDb250ZW50QnJlYWtlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKaW5kZXggYTgwMGE4Y2MxOTRh NjY3ZGZlMGNhNzRlYWM3YzNkMzI0MTc5MTJkZS4uNGY1N2U2Y2I0ZjJhMzc4OTQ4MzkxMzA4Yzk5 OTg0ZjdlMWI0N2Y1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVh a2VyLmNwcApAQCAtMTE1LDcgKzExNSw3IEBAIHN0YXRpYyBpbmxpbmUgc3RkOjpvcHRpb25hbDxz aXplX3Q+IGZpcnN0VGV4dFJ1bkluZGV4KGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyCiBib29s IElubGluZUNvbnRlbnRCcmVha2VyOjppc1dyYXBwaW5nQWxsb3dlZChjb25zdCBDb250aW51b3Vz Q29udGVudDo6UnVuJiBydW4pCiB7CiAgICAgLy8gRG8gbm90IHRyeSB0byB3cmFwIG92ZXJmbG93 biAncHJlJyBhbmQgJ25vLXdyYXAnIGNvbnRlbnQgdG8gbmV4dCBsaW5lLgotICAgIHJldHVybiBy dW4uc3R5bGUud2hpdGVTcGFjZSAhPSBXaGl0ZVNwYWNlOjpQcmUgJiYgcnVuLnN0eWxlLndoaXRl U3BhY2UgIT0gV2hpdGVTcGFjZTo6Tm9XcmFwOworICAgIHJldHVybiBydW4uc3R5bGUud2hpdGVT cGFjZSgpICE9IFdoaXRlU3BhY2U6OlByZSAmJiBydW4uc3R5bGUud2hpdGVTcGFjZSgpICE9IFdo aXRlU3BhY2U6Ok5vV3JhcDsKIH0KIAogYm9vbCBJbmxpbmVDb250ZW50QnJlYWtlcjo6c2hvdWxk S2VlcEVuZE9mTGluZVdoaXRlc3BhY2UoY29uc3QgQ29udGludW91c0NvbnRlbnQmIGNvbnRpbnVv dXNDb250ZW50KSBjb25zdApAQCAtMTI0LDcgKzEyNCw3IEBAIGJvb2wgSW5saW5lQ29udGVudEJy ZWFrZXI6OnNob3VsZEtlZXBFbmRPZkxpbmVXaGl0ZXNwYWNlKGNvbnN0IENvbnRpbnVvdXNDb250 ZW50CiAgICAgLy8gTm90ZSB0aGF0IHRoZSAia2VlcCIgaW4gdGhpcyBjb250ZXh0IG1lYW5zIHdl IGxldCB0aGUgd2hpdGVzcGFjZSBjb250ZW50IHNpdCBvbiB0aGUgY3VycmVudCBsaW5lLgogICAg IC8vIEl0IG1pZ2h0IHZlcnkgd2VsbCBnZXQgY29sbGFwc2VkIHdoZW4gd2UgY2xvc2UgdGhlIGxp bmUgKG5vcm1hbC9ub3dyYXAvcHJlLWxpbmUpLgogICAgIC8vIFNlZSBodHRwczovL3d3dy53My5v cmcvVFIvY3NzLXRleHQtMy8jd2hpdGUtc3BhY2UtcHJvcGVydHkKLSAgICBhdXRvIHdoaXRlc3Bh Y2UgPSBjb250aW51b3VzQ29udGVudC5ydW5zKClbKmZpcnN0VGV4dFJ1bkluZGV4KGNvbnRpbnVv dXNDb250ZW50KV0uc3R5bGUud2hpdGVTcGFjZTsKKyAgICBhdXRvIHdoaXRlc3BhY2UgPSBjb250 aW51b3VzQ29udGVudC5ydW5zKClbKmZpcnN0VGV4dFJ1bkluZGV4KGNvbnRpbnVvdXNDb250ZW50 KV0uc3R5bGUud2hpdGVTcGFjZSgpOwogICAgIHJldHVybiB3aGl0ZXNwYWNlID09IFdoaXRlU3Bh Y2U6Ok5vcm1hbCB8fCB3aGl0ZXNwYWNlID09IFdoaXRlU3BhY2U6Ok5vV3JhcCB8fCB3aGl0ZXNw YWNlID09IFdoaXRlU3BhY2U6OlByZVdyYXAgfHwgd2hpdGVzcGFjZSA9PSBXaGl0ZVNwYWNlOjpQ cmVMaW5lOwogfQogCkBAIC0yMzMsNyArMjMzLDcgQEAgSW5saW5lQ29udGVudEJyZWFrZXI6OlJl c3VsdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vzc092ZXJmbG93aW5nQ29udGVudChjb24K ICAgICAgICAgICAgICAgICBpZiAoaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCkgPD0gZmlyc3RDb2Rl UG9pbnRMZW5ndGgpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBSZXN1bHQgeyBSZXN1bHQ6 OkFjdGlvbjo6S2VlcCwgSXNFbmRPZkxpbmU6OlllcyB9OwogCi0gICAgICAgICAgICAgICAgYXV0 byBmaXJzdENvZGVQb2ludFdpZHRoID0gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVtLCBs ZWFkaW5nVGV4dFJ1bi5zdHlsZS5mb250Q2FzY2FkZSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwg aW5saW5lVGV4dEl0ZW0uc3RhcnQoKSArIGZpcnN0Q29kZVBvaW50TGVuZ3RoLCBsaW5lU3RhdHVz LmNvbnRlbnRMb2dpY2FsUmlnaHQpOworICAgICAgICAgICAgICAgIGF1dG8gZmlyc3RDb2RlUG9p bnRXaWR0aCA9IFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgbGVhZGluZ1RleHRSdW4u c3R5bGUuZm9udENhc2NhZGUoKSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgaW5saW5lVGV4dEl0 ZW0uc3RhcnQoKSArIGZpcnN0Q29kZVBvaW50TGVuZ3RoLCBsaW5lU3RhdHVzLmNvbnRlbnRMb2dp Y2FsUmlnaHQpOwogICAgICAgICAgICAgICAgIHJldHVybiBSZXN1bHQgeyBSZXN1bHQ6OkFjdGlv bjo6QnJlYWssIElzRW5kT2ZMaW5lOjpZZXMsIFJlc3VsdDo6UGFydGlhbFRyYWlsaW5nQ29udGVu dCB7IGxlYWRpbmdUZXh0UnVuSW5kZXgsIFBhcnRpYWxSdW4geyBmaXJzdENvZGVQb2ludExlbmd0 aCwgZmlyc3RDb2RlUG9pbnRXaWR0aCB9IH0gfTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAg IGlmICh0cmFpbGluZ0NvbnRlbnQtPm92ZXJmbG93cyAmJiBsaW5lU3RhdHVzLmhhc0NvbnRlbnQp IHsKQEAgLTQwNSwxNiArNDA1LDE2IEBAIE92ZXJmbG93aW5nVGV4dENvbnRlbnQgSW5saW5lQ29u dGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnRXaXRoVGV4dChjCiAgICAgcmV0 dXJuIHsgb3ZlcmZsb3dpbmdSdW5JbmRleCB9OwogfQogCi1PcHRpb25TZXQ8SW5saW5lQ29udGVu dEJyZWFrZXI6OldvcmRCcmVha1J1bGU+IElubGluZUNvbnRlbnRCcmVha2VyOjp3b3JkQnJlYWtC ZWhhdmlvcihjb25zdCBDb250aW51b3VzQ29udGVudDo6UnVuOjpTdHlsZSYgc3R5bGUsIGJvb2wg aGFzV3JhcE9wcG9ydHVuaXR5QXRQcmV2aW91c1Bvc2l0aW9uKSBjb25zdAorT3B0aW9uU2V0PElu bGluZUNvbnRlbnRCcmVha2VyOjpXb3JkQnJlYWtSdWxlPiBJbmxpbmVDb250ZW50QnJlYWtlcjo6 d29yZEJyZWFrQmVoYXZpb3IoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBib29sIGhhc1dyYXBP cHBvcnR1bml0eUF0UHJldmlvdXNQb3NpdGlvbikgY29uc3QKIHsKICAgICAvLyBEaXNyZWdhcmQg YW55IHByb2hpYml0aW9uIGFnYWluc3QgbGluZSBicmVha3MgbWFuZGF0ZWQgYnkgdGhlIHdvcmQt YnJlYWsgcHJvcGVydHkuCiAgICAgLy8gVGhlIGRpZmZlcmVudCB3cmFwcGluZyBvcHBvcnR1bml0 aWVzIG11c3Qgbm90IGJlIHByaW9yaXRpemVkLgogICAgIC8vIE5vdGUgaHlwaGVuYXRpb24gaXMg bm90IGFwcGxpZWQuCi0gICAgaWYgKHN0eWxlLmxpbmVCcmVhayA9PSBMaW5lQnJlYWs6OkFueXdo ZXJlKQorICAgIGlmIChzdHlsZS5saW5lQnJlYWsoKSA9PSBMaW5lQnJlYWs6OkFueXdoZXJlKQog ICAgICAgICByZXR1cm4geyBXb3JkQnJlYWtSdWxlOjpBdEFyYml0cmFyeVBvc2l0aW9uIH07CiAK ICAgICBhdXRvIGluY2x1ZGVIeXBoZW5hdGlvbklmQWxsb3dlZCA9IFsmXShzdGQ6Om9wdGlvbmFs PElubGluZUNvbnRlbnRCcmVha2VyOjpXb3JkQnJlYWtSdWxlPiB3b3JkQnJlYWtSdWxlKSAtPiBP cHRpb25TZXQ8SW5saW5lQ29udGVudEJyZWFrZXI6OldvcmRCcmVha1J1bGU+IHsKLSAgICAgICAg YXV0byBoeXBoZW5hdGlvbklzQWxsb3dlZCA9ICFuX2h5cGhlbmF0aW9uSXNEaXNhYmxlZCAmJiBz dHlsZS5oeXBoZW5zID09IEh5cGhlbnM6OkF1dG8gJiYgY2FuSHlwaGVuYXRlKHN0eWxlLmxvY2Fs ZSk7CisgICAgICAgIGF1dG8gaHlwaGVuYXRpb25Jc0FsbG93ZWQgPSAhbl9oeXBoZW5hdGlvbklz RGlzYWJsZWQgJiYgc3R5bGUuaHlwaGVucygpID09IEh5cGhlbnM6OkF1dG8gJiYgY2FuSHlwaGVu YXRlKHN0eWxlLmNvbXB1dGVkTG9jYWxlKCkpOwogICAgICAgICBpZiAoaHlwaGVuYXRpb25Jc0Fs bG93ZWQpIHsKICAgICAgICAgICAgIGlmICh3b3JkQnJlYWtSdWxlKQogICAgICAgICAgICAgICAg IHJldHVybiB7ICp3b3JkQnJlYWtSdWxlLCBXb3JkQnJlYWtSdWxlOjpBdEh5cGhlbmF0aW9uT3Bw b3J0dW5pdGllcyB9OwpAQCAtNDI1LDE4ICs0MjUsMTggQEAgT3B0aW9uU2V0PElubGluZUNvbnRl bnRCcmVha2VyOjpXb3JkQnJlYWtSdWxlPiBJbmxpbmVDb250ZW50QnJlYWtlcjo6d29yZEJyZWFr QmUKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9OwogICAgIC8vIEJyZWFraW5nIGlzIGFsbG93 ZWQgd2l0aGluIOKAnHdvcmRz4oCdLgotICAgIGlmIChzdHlsZS53b3JkQnJlYWsgPT0gV29yZEJy ZWFrOjpCcmVha0FsbCkKKyAgICBpZiAoc3R5bGUud29yZEJyZWFrKCkgPT0gV29yZEJyZWFrOjpC cmVha0FsbCkKICAgICAgICAgcmV0dXJuIGluY2x1ZGVIeXBoZW5hdGlvbklmQWxsb3dlZChXb3Jk QnJlYWtSdWxlOjpBdEFyYml0cmFyeVBvc2l0aW9uKTsKICAgICAvLyBGb3IgY29tcGF0aWJpbGl0 eSB3aXRoIGxlZ2FjeSBjb250ZW50LCB0aGUgd29yZC1icmVhayBwcm9wZXJ0eSBhbHNvIHN1cHBv cnRzIGEgZGVwcmVjYXRlZCBicmVhay13b3JkIGtleXdvcmQuCiAgICAgLy8gV2hlbiBzcGVjaWZp ZWQsIHRoaXMgaGFzIHRoZSBzYW1lIGVmZmVjdCBhcyB3b3JkLWJyZWFrOiBub3JtYWwgYW5kIG92 ZXJmbG93LXdyYXA6IGFueXdoZXJlLCByZWdhcmRsZXNzIG9mIHRoZSBhY3R1YWwgdmFsdWUgb2Yg dGhlIG92ZXJmbG93LXdyYXAgcHJvcGVydHkuCi0gICAgaWYgKHN0eWxlLndvcmRCcmVhayA9PSBX b3JkQnJlYWs6OkJyZWFrV29yZCAmJiAhaGFzV3JhcE9wcG9ydHVuaXR5QXRQcmV2aW91c1Bvc2l0 aW9uKQorICAgIGlmIChzdHlsZS53b3JkQnJlYWsoKSA9PSBXb3JkQnJlYWs6OkJyZWFrV29yZCAm JiAhaGFzV3JhcE9wcG9ydHVuaXR5QXRQcmV2aW91c1Bvc2l0aW9uKQogICAgICAgICByZXR1cm4g aW5jbHVkZUh5cGhlbmF0aW9uSWZBbGxvd2VkKFdvcmRCcmVha1J1bGU6OkF0QXJiaXRyYXJ5UG9z aXRpb24pOwogICAgIC8vIE92ZXJmbG93V3JhcDo6QnJlYWtXb3JkL0FueXdoZXJlIEFuIG90aGVy d2lzZSB1bmJyZWFrYWJsZSBzZXF1ZW5jZSBvZiBjaGFyYWN0ZXJzIG1heSBiZSBicm9rZW4gYXQg YW4gYXJiaXRyYXJ5IHBvaW50IGlmIHRoZXJlIGFyZSBubyBvdGhlcndpc2UtYWNjZXB0YWJsZSBi cmVhayBwb2ludHMgaW4gdGhlIGxpbmUuCiAgICAgLy8gTm90ZSB0aGF0IHRoaXMgYXBwbGllcyB0 byBjb250ZW50IHdoZXJlIENTUyBwcm9wZXJ0aWVzIChlLmcuIFdvcmRCcmVhazo6S2VlcEFsbCkg bWFrZSBpdCB1bmJyZWFrYWJsZS4gCi0gICAgaWYgKChzdHlsZS5vdmVyZmxvd1dyYXAgPT0gT3Zl cmZsb3dXcmFwOjpCcmVha1dvcmQgfHwgc3R5bGUub3ZlcmZsb3dXcmFwID09IE92ZXJmbG93V3Jh cDo6QW55d2hlcmUpICYmICFoYXNXcmFwT3Bwb3J0dW5pdHlBdFByZXZpb3VzUG9zaXRpb24pCisg ICAgaWYgKChzdHlsZS5vdmVyZmxvd1dyYXAoKSA9PSBPdmVyZmxvd1dyYXA6OkJyZWFrV29yZCB8 fCBzdHlsZS5vdmVyZmxvd1dyYXAoKSA9PSBPdmVyZmxvd1dyYXA6OkFueXdoZXJlKSAmJiAhaGFz V3JhcE9wcG9ydHVuaXR5QXRQcmV2aW91c1Bvc2l0aW9uKQogICAgICAgICByZXR1cm4gaW5jbHVk ZUh5cGhlbmF0aW9uSWZBbGxvd2VkKFdvcmRCcmVha1J1bGU6OkF0QXJiaXRyYXJ5UG9zaXRpb24p OwogICAgIC8vIEJyZWFraW5nIGlzIGZvcmJpZGRlbiB3aXRoaW4g4oCcd29yZHPigJ0uCi0gICAg aWYgKHN0eWxlLndvcmRCcmVhayA9PSBXb3JkQnJlYWs6OktlZXBBbGwpCisgICAgaWYgKHN0eWxl LndvcmRCcmVhaygpID09IFdvcmRCcmVhazo6S2VlcEFsbCkKICAgICAgICAgcmV0dXJuIHsgfTsK ICAgICByZXR1cm4gaW5jbHVkZUh5cGhlbmF0aW9uSWZBbGxvd2VkKHsgfSk7CiB9CkBAIC00NTIs NiArNDUyLDcgQEAgc3RkOjpvcHRpb25hbDxJbmxpbmVDb250ZW50QnJlYWtlcjo6UGFydGlhbFJ1 bj4gSW5saW5lQ29udGVudEJyZWFrZXI6OnRyeUJyZWFraW4KICAgICBpZiAoYnJlYWtSdWxlcy5p c0VtcHR5KCkpCiAgICAgICAgIHJldHVybiB7IH07CiAKKyAgICBhdXRvJiBmb250Q2FzY2FkZSA9 IHN0eWxlLmZvbnRDYXNjYWRlKCk7CiAgICAgaWYgKGJyZWFrUnVsZXMuY29udGFpbnMoV29yZEJy ZWFrUnVsZTo6QXRIeXBoZW5hdGlvbk9wcG9ydHVuaXRpZXMpKSB7CiAgICAgICAgIGF1dG8gdHJ5 QnJlYWtpbmdBdEh5cGhlbmF0aW9uT3Bwb3J0dW5pdHkgPSBbJl0oKSAtPiBzdGQ6Om9wdGlvbmFs PFBhcnRpYWxSdW4+IHsKICAgICAgICAgICAgIC8vIEZpbmQgdGhlIGh5cGhlbiBwb3NpdGlvbiBh cyBmb2xsb3dzOgpAQCAtNDYyLDMwICs0NjMsMzAgQEAgc3RkOjpvcHRpb25hbDxJbmxpbmVDb250 ZW50QnJlYWtlcjo6UGFydGlhbFJ1bj4gSW5saW5lQ29udGVudEJyZWFrZXI6OnRyeUJyZWFraW4K ICAgICAgICAgICAgICAgICByZXR1cm4geyB9OwogICAgICAgICAgICAgfQogICAgICAgICAgICAg YXV0byBydW5MZW5ndGggPSBpbmxpbmVUZXh0SXRlbS5sZW5ndGgoKTsKLSAgICAgICAgICAgIGF1 dG8gbGltaXRCZWZvcmUgPSBzdHlsZS5oeXBoZW5hdGlvbkxpbWl0QmVmb3JlLnZhbHVlX29yKDAp OwotICAgICAgICAgICAgYXV0byBsaW1pdEFmdGVyID0gc3R5bGUuaHlwaGVuYXRpb25MaW1pdEFm dGVyLnZhbHVlX29yKDApOworICAgICAgICAgICAgdW5zaWduZWQgbGltaXRCZWZvcmUgPSBzdHls ZS5oeXBoZW5hdGlvbkxpbWl0QmVmb3JlKCkgPT0gUmVuZGVyU3R5bGU6OmluaXRpYWxIeXBoZW5h dGlvbkxpbWl0QmVmb3JlKCkgPyAwIDogc3R5bGUuaHlwaGVuYXRpb25MaW1pdEJlZm9yZSgpOwor ICAgICAgICAgICAgdW5zaWduZWQgbGltaXRBZnRlciA9IHN0eWxlLmh5cGhlbmF0aW9uTGltaXRB ZnRlcigpID09IFJlbmRlclN0eWxlOjppbml0aWFsSHlwaGVuYXRpb25MaW1pdEFmdGVyKCkgPyAw IDogc3R5bGUuaHlwaGVuYXRpb25MaW1pdEFmdGVyKCk7CiAgICAgICAgICAgICAvLyBDaGVjayBp ZiB0aGlzIHJ1biBjYW4gYWNjb21tb2RhdGUgdGhlIGJlZm9yZS9hZnRlciBsaW1pdHMgYXQgYWxs IGJlZm9yZSBzdGFydCBtZWFzdXJpbmcgdGV4dC4KICAgICAgICAgICAgIGlmIChsaW1pdEJlZm9y ZSA+PSBydW5MZW5ndGggfHwgbGltaXRBZnRlciA+PSBydW5MZW5ndGggfHwgbGltaXRCZWZvcmUg KyBsaW1pdEFmdGVyID4gcnVuTGVuZ3RoKQogICAgICAgICAgICAgICAgIHJldHVybiB7IH07CiAK ICAgICAgICAgICAgIHVuc2lnbmVkIGxlZnRTaWRlTGVuZ3RoID0gcnVuTGVuZ3RoOwotICAgICAg ICAgICAgYXV0byBoeXBoZW5XaWR0aCA9IElubGluZUxheW91dFVuaXQgeyBzdHlsZS5mb250Q2Fz Y2FkZS53aWR0aChUZXh0UnVuIHsgU3RyaW5nVmlldyB7IHN0eWxlLmh5cGhlblN0cmluZyB9IH0p IH07CisgICAgICAgICAgICBhdXRvIGh5cGhlbldpZHRoID0gSW5saW5lTGF5b3V0VW5pdCB7IGZv bnRDYXNjYWRlLndpZHRoKFRleHRSdW4geyBTdHJpbmdWaWV3IHsgc3R5bGUuaHlwaGVuU3RyaW5n KCkgfSB9KSB9OwogICAgICAgICAgICAgaWYgKCFhdmFpbGFibGVTcGFjZUlzSW5maW5pdGUpIHsK ICAgICAgICAgICAgICAgICBhdXRvIGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuID0gKmF2 YWlsYWJsZVdpZHRoIC0gaHlwaGVuV2lkdGg7Ci0gICAgICAgICAgICAgICAgaWYgKGF2YWlsYWJs ZVdpZHRoRXhjbHVkaW5nSHlwaGVuIDw9IDAgfHwgIWVub3VnaFdpZHRoRm9ySHlwaGVuYXRpb24o YXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4sIHN0eWxlLmZvbnRDYXNjYWRlLnBpeGVsU2l6 ZSgpKSkKKyAgICAgICAgICAgICAgICBpZiAoYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4g PD0gMCB8fCAhZW5vdWdoV2lkdGhGb3JIeXBoZW5hdGlvbihhdmFpbGFibGVXaWR0aEV4Y2x1ZGlu Z0h5cGhlbiwgZm9udENhc2NhZGUucGl4ZWxTaXplKCkpKQogICAgICAgICAgICAgICAgICAgICBy ZXR1cm4geyB9OwotICAgICAgICAgICAgICAgIGxlZnRTaWRlTGVuZ3RoID0gVGV4dFV0aWw6Om1p ZFdvcmRCcmVhayhpbmxpbmVUZXh0SXRlbSwgb3ZlcmZsb3dpbmdSdW4uc3R5bGUuZm9udENhc2Nh ZGUsIG92ZXJmbG93aW5nUnVuLmxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdI eXBoZW4sIGxvZ2ljYWxMZWZ0KS5sZW5ndGg7CisgICAgICAgICAgICAgICAgbGVmdFNpZGVMZW5n dGggPSBUZXh0VXRpbDo6bWlkV29yZEJyZWFrKGlubGluZVRleHRJdGVtLCBmb250Q2FzY2FkZSwg b3ZlcmZsb3dpbmdSdW4ubG9naWNhbFdpZHRoLCBhdmFpbGFibGVXaWR0aEV4Y2x1ZGluZ0h5cGhl biwgbG9naWNhbExlZnQpLmxlbmd0aDsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChs ZWZ0U2lkZUxlbmd0aCA8IGxpbWl0QmVmb3JlKQogICAgICAgICAgICAgICAgIHJldHVybiB7IH07 CiAgICAgICAgICAgICAvLyBBZGp1c3QgYmVmb3JlIGluZGV4IHRvIGFjY29tbW9kYXRlIHRoZSBs aW1pdC1hZnRlciB2YWx1ZSAoaXQncyB0aGUgbGFzdCBwb3RlbnRpYWwgaHlwaGVuIGxvY2F0aW9u IGluIHRoaXMgcnVuKS4KICAgICAgICAgICAgIGF1dG8gaHlwaGVuQmVmb3JlID0gc3RkOjptaW4o bGVmdFNpZGVMZW5ndGgsIHJ1bkxlbmd0aCAtIGxpbWl0QWZ0ZXIpICsgMTsKLSAgICAgICAgICAg IHVuc2lnbmVkIGh5cGhlbkxvY2F0aW9uID0gbGFzdEh5cGhlbkxvY2F0aW9uKFN0cmluZ1ZpZXco aW5saW5lVGV4dEl0ZW0uaW5saW5lVGV4dEJveCgpLmNvbnRlbnQoKSkuc3Vic3RyaW5nKGlubGlu ZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLmxlbmd0aCgpKSwgaHlwaGVuQmVmb3Jl LCBzdHlsZS5sb2NhbGUpOworICAgICAgICAgICAgdW5zaWduZWQgaHlwaGVuTG9jYXRpb24gPSBs YXN0SHlwaGVuTG9jYXRpb24oU3RyaW5nVmlldyhpbmxpbmVUZXh0SXRlbS5pbmxpbmVUZXh0Qm94 KCkuY29udGVudCgpKS5zdWJzdHJpbmcoaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgaW5saW5lVGV4 dEl0ZW0ubGVuZ3RoKCkpLCBoeXBoZW5CZWZvcmUsIHN0eWxlLmNvbXB1dGVkTG9jYWxlKCkpOwog ICAgICAgICAgICAgaWYgKCFoeXBoZW5Mb2NhdGlvbiB8fCBoeXBoZW5Mb2NhdGlvbiA8IGxpbWl0 QmVmb3JlKQogICAgICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAgICAgICAgICAvLyBoeXBo ZW5Mb2NhdGlvbiBpcyByZWxhdGl2ZSB0byB0aGUgc3RhcnQgb2YgdGhpcyBJbmxpbmVJdGVtVGV4 dC4KICAgICAgICAgICAgIEFTU0VSVChpbmxpbmVUZXh0SXRlbS5zdGFydCgpICsgaHlwaGVuTG9j YXRpb24gPCBpbmxpbmVUZXh0SXRlbS5lbmQoKSk7Ci0gICAgICAgICAgICBhdXRvIHRyYWlsaW5n UGFydGlhbFJ1bldpZHRoV2l0aEh5cGhlbiA9IFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRl bSwgb3ZlcmZsb3dpbmdSdW4uc3R5bGUuZm9udENhc2NhZGUsIGlubGluZVRleHRJdGVtLnN0YXJ0 KCksIGlubGluZVRleHRJdGVtLnN0YXJ0KCkgKyBoeXBoZW5Mb2NhdGlvbiwgbG9naWNhbExlZnQp OworICAgICAgICAgICAgYXV0byB0cmFpbGluZ1BhcnRpYWxSdW5XaWR0aFdpdGhIeXBoZW4gPSBU ZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGZvbnRDYXNjYWRlLCBpbmxpbmVUZXh0SXRl bS5zdGFydCgpLCBpbmxpbmVUZXh0SXRlbS5zdGFydCgpICsgaHlwaGVuTG9jYXRpb24sIGxvZ2lj YWxMZWZ0KTsKICAgICAgICAgICAgIHJldHVybiBQYXJ0aWFsUnVuIHsgaHlwaGVuTG9jYXRpb24s IHRyYWlsaW5nUGFydGlhbFJ1bldpZHRoV2l0aEh5cGhlbiwgaHlwaGVuV2lkdGggfTsKICAgICAg ICAgfTsKICAgICAgICAgaWYgKGF1dG8gcGFydGlhbFJ1biA9IHRyeUJyZWFraW5nQXRIeXBoZW5h dGlvbk9wcG9ydHVuaXR5KCkpCkBAIC01MDEsMTQgKzUwMiwxNCBAQCBzdGQ6Om9wdGlvbmFsPElu bGluZUNvbnRlbnRCcmVha2VyOjpQYXJ0aWFsUnVuPiBJbmxpbmVDb250ZW50QnJlYWtlcjo6dHJ5 QnJlYWtpbgogICAgICAgICAgICAgaWYgKGF2YWlsYWJsZVNwYWNlSXNJbmZpbml0ZSkgewogICAg ICAgICAgICAgICAgIC8vIFdoZW4gdGhlIHJ1biBjYW4gYmUgc3BsaXQgYXQgYXJiaXRyYXJ5IHBv c2l0aW9uIGxldCdzIGp1c3QgcmV0dXJuIHRoZSBlbnRpcmUgcnVuIHdoZW4gaXQgaXMgaW50ZW5k ZWQgdG8gZml0IG9uIHRoZSBsaW5lLgogICAgICAgICAgICAgICAgIEFTU0VSVChpbmxpbmVUZXh0 SXRlbS5sZW5ndGgoKSk7Ci0gICAgICAgICAgICAgICAgYXV0byB0cmFpbGluZ1BhcnRpYWxSdW5X aWR0aCA9IFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgb3ZlcmZsb3dpbmdSdW4uc3R5 bGUuZm9udENhc2NhZGUsIGxvZ2ljYWxMZWZ0KTsKKyAgICAgICAgICAgICAgICBhdXRvIHRyYWls aW5nUGFydGlhbFJ1bldpZHRoID0gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVtLCBmb250 Q2FzY2FkZSwgbG9naWNhbExlZnQpOwogICAgICAgICAgICAgICAgIHJldHVybiB7IGlubGluZVRl eHRJdGVtLmxlbmd0aCgpLCB0cmFpbGluZ1BhcnRpYWxSdW5XaWR0aCB9OwogICAgICAgICAgICAg fQogICAgICAgICAgICAgaWYgKCEqYXZhaWxhYmxlV2lkdGgpIHsKICAgICAgICAgICAgICAgICAv LyBGYXN0IHBhdGggZm9yIGNhc2VzIHdoZW4gdGhlcmUncyBubyByb29tIGF0IGFsbC4gVGhlIGNv bnRlbnQgaXMgYnJlYWthYmxlIGJ1dCB3ZSBkb24ndCBoYXZlIHNwYWNlIGZvciBpdC4KICAgICAg ICAgICAgICAgICByZXR1cm4geyB9OwogICAgICAgICAgICAgfQotICAgICAgICAgICAgYXV0byBt aWRXb3JkQnJlYWsgPSBUZXh0VXRpbDo6bWlkV29yZEJyZWFrKGlubGluZVRleHRJdGVtLCBvdmVy Zmxvd2luZ1J1bi5zdHlsZS5mb250Q2FzY2FkZSwgb3ZlcmZsb3dpbmdSdW4ubG9naWNhbFdpZHRo LCAqYXZhaWxhYmxlV2lkdGgsIGxvZ2ljYWxMZWZ0KTsKKyAgICAgICAgICAgIGF1dG8gbWlkV29y ZEJyZWFrID0gVGV4dFV0aWw6Om1pZFdvcmRCcmVhayhpbmxpbmVUZXh0SXRlbSwgZm9udENhc2Nh ZGUsIG92ZXJmbG93aW5nUnVuLmxvZ2ljYWxXaWR0aCwgKmF2YWlsYWJsZVdpZHRoLCBsb2dpY2Fs TGVmdCk7CiAgICAgICAgICAgICByZXR1cm4geyBtaWRXb3JkQnJlYWsubGVuZ3RoLCBtaWRXb3Jk QnJlYWsubG9naWNhbFdpZHRoIH07CiAgICAgICAgIH07CiAgICAgICAgIC8vIFdpdGggYXJiaXRy YXJ5IGJyZWFraW5nIHRoZXJlJ3MgYWx3YXlzIGEgdmFsaWQgYnJlYWtpbmcgcG9zaXRpb24gKGV2 ZW4gaWYgaXQgaXMgYmVmb3JlIHRoZSBmaXJzdCBwb3NpdGlvbikuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50 QnJlYWtlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lQ29udGVudEJyZWFrZXIuaAppbmRleCAzNGQzMTc0YmEyZjMxMDgyODRhNjA4YzZh NWE0ODNiZjdmODdiOWUzLi4zNTdjODA1YmY1YjJhODYwYmU0MGUxOGVkNTg3MDY4NTgxOWRlNThh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmgKQEAgLTkxLDE5 ICs5MSw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIFJ1biYgb3BlcmF0b3I9KGNvbnN0IFJ1biYp OwogCiAgICAgICAgICAgICBjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtOwotICAgICAgICAg ICAgc3RydWN0IFN0eWxlIHsKLSAgICAgICAgICAgICAgICBXaGl0ZVNwYWNlIHdoaXRlU3BhY2Ug eyBXaGl0ZVNwYWNlOjpOb3JtYWwgfTsKLSAgICAgICAgICAgICAgICBMaW5lQnJlYWsgbGluZUJy ZWFrIHsgTGluZUJyZWFrOjpBdXRvIH07Ci0gICAgICAgICAgICAgICAgV29yZEJyZWFrIHdvcmRC cmVhayB7IFdvcmRCcmVhazo6Tm9ybWFsIH07Ci0gICAgICAgICAgICAgICAgT3ZlcmZsb3dXcmFw IG92ZXJmbG93V3JhcCB7IE92ZXJmbG93V3JhcDo6Tm9ybWFsIH07Ci0gICAgICAgICAgICAgICAg SHlwaGVucyBoeXBoZW5zIHsgSHlwaGVuczo6Tm9uZSB9OwotICAgICAgICAgICAgICAgIHN0ZDo6 b3B0aW9uYWw8dW5zaWduZWQ+IGh5cGhlbmF0aW9uTGltaXRCZWZvcmU7Ci0gICAgICAgICAgICAg ICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZD4gaHlwaGVuYXRpb25MaW1pdEFmdGVyOwotICAgICAg ICAgICAgICAgIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250Q2FzY2FkZTsKLSAgICAgICAgICAgICAg ICBjb25zdCBBdG9tU3RyaW5nJiBoeXBoZW5TdHJpbmc7Ci0gICAgICAgICAgICAgICAgY29uc3Qg QXRvbVN0cmluZyYgbG9jYWxlOwotICAgICAgICAgICAgfTsKLSAgICAgICAgICAgIFN0eWxlIHN0 eWxlOworICAgICAgICAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlOwogICAgICAgICAgICAg SW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGggeyAwIH07CiAgICAgICAgIH07CiAgICAgICAg IHVzaW5nIFJ1bkxpc3QgPSBWZWN0b3I8UnVuLCAzPjsKQEAgLTEzOCw3ICsxMjYsNyBAQCBwcml2 YXRlOgogICAgICAgICBBdEFyYml0cmFyeVBvc2l0aW9uICAgICAgICA9IDEgPDwgMCwKICAgICAg ICAgQXRIeXBoZW5hdGlvbk9wcG9ydHVuaXRpZXMgPSAxIDw8IDEKICAgICB9OwotICAgIE9wdGlv blNldDxXb3JkQnJlYWtSdWxlPiB3b3JkQnJlYWtCZWhhdmlvcihjb25zdCBDb250aW51b3VzQ29u dGVudDo6UnVuOjpTdHlsZSYsIGJvb2wgaGFzV3JhcE9wcG9ydHVuaXR5QXRQcmV2aW91c1Bvc2l0 aW9uKSBjb25zdDsKKyAgICBPcHRpb25TZXQ8V29yZEJyZWFrUnVsZT4gd29yZEJyZWFrQmVoYXZp b3IoY29uc3QgUmVuZGVyU3R5bGUmLCBib29sIGhhc1dyYXBPcHBvcnR1bml0eUF0UHJldmlvdXNQ b3NpdGlvbikgY29uc3Q7CiAgICAgYm9vbCBzaG91bGRLZWVwRW5kT2ZMaW5lV2hpdGVzcGFjZShj b25zdCBDb250aW51b3VzQ29udGVudCYpIGNvbnN0OwogCiAgICAgYm9vbCBuX2h5cGhlbmF0aW9u SXNEaXNhYmxlZCB7IGZhbHNlIH07CkBAIC0xNDYsMTYgKzEzNCw3IEBAIHByaXZhdGU6CiAKIGlu bGluZSBJbmxpbmVDb250ZW50QnJlYWtlcjo6Q29udGludW91c0NvbnRlbnQ6OlJ1bjo6UnVuKGNv bnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgSW5s aW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCiAgICAgOiBpbmxpbmVJdGVtKGlubGluZUl0ZW0p Ci0gICAgLCBzdHlsZSh7IHN0eWxlLndoaXRlU3BhY2UoKQotICAgICAgICAsIHN0eWxlLmxpbmVC cmVhaygpCi0gICAgICAgICwgc3R5bGUud29yZEJyZWFrKCkKLSAgICAgICAgLCBzdHlsZS5vdmVy Zmxvd1dyYXAoKQotICAgICAgICAsIHN0eWxlLmh5cGhlbnMoKQotICAgICAgICAsIHN0eWxlLmh5 cGhlbmF0aW9uTGltaXRCZWZvcmUoKSAhPSBzdHlsZS5pbml0aWFsSHlwaGVuYXRpb25MaW1pdEJl Zm9yZSgpID8gc3RkOjptYWtlX29wdGlvbmFsKHN0eWxlLmh5cGhlbmF0aW9uTGltaXRCZWZvcmUo KSkgOiBzdGQ6Om51bGxvcHQKLSAgICAgICAgLCBzdHlsZS5oeXBoZW5hdGlvbkxpbWl0QWZ0ZXIo KSAhPSBzdHlsZS5pbml0aWFsSHlwaGVuYXRpb25MaW1pdEFmdGVyKCkgPyBzdGQ6Om1ha2Vfb3B0 aW9uYWwoc3R5bGUuaHlwaGVuYXRpb25MaW1pdEFmdGVyKCkpIDogc3RkOjpudWxsb3B0Ci0gICAg ICAgICwgc3R5bGUuZm9udENhc2NhZGUoKQotICAgICAgICAsIChzdHlsZS5oeXBoZW5zKCkgPT0g SHlwaGVuczo6Tm9uZSA/IG51bGxBdG9tKCkgOiBzdHlsZS5oeXBoZW5TdHJpbmcoKSkKLSAgICAg ICAgLCBzdHlsZS5mb250RGVzY3JpcHRpb24oKS5jb21wdXRlZExvY2FsZSgpIH0pCisgICAgLCBz dHlsZShzdHlsZSkKICAgICAsIGxvZ2ljYWxXaWR0aChsb2dpY2FsV2lkdGgpCiB7CiB9Cg==