240776 2022-05-22 13:44:00 -0700 [LFC][FFC] Add support for block direction grow 2022-05-23 06:50:16 -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 1871027 0 zalan 2022-05-22 13:44:00 -0700 ssia 1871030 1 459650 zalan 2022-05-22 13:48:32 -0700 Created attachment 459650 Patch 1871040 2 459653 zalan 2022-05-22 15:43:30 -0700 Created attachment 459653 Patch 1871143 3 459653 koivisto 2022-05-23 06:04:31 -0700 Comment on attachment 459653 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=459653&action=review > Source/WebCore/layout/formattingContexts/FormattingConstraints.h:69 > - unsigned m_baseTypeFlags : 2; // OptionSet<BaseTypeFlag> > + unsigned m_baseTypeFlags : 3; // OptionSet<BaseTypeFlag> unrelated? 1871150 4 zalan 2022-05-23 06:19:25 -0700 (In reply to Antti Koivisto from comment #3) > Comment on attachment 459653 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=459653&action=review > > > Source/WebCore/layout/formattingContexts/FormattingConstraints.h:69 > > - unsigned m_baseTypeFlags : 2; // OptionSet<BaseTypeFlag> > > + unsigned m_baseTypeFlags : 3; // OptionSet<BaseTypeFlag> > > unrelated? yea from https://trac.webkit.org/changeset/294623/webkit/trunk/Source/WebCore/layout/formattingContexts/FormattingConstraints.h 1871155 5 ews-feeder 2022-05-23 06:49:13 -0700 Committed r294638 (250862@main): <https://commits.webkit.org/250862@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459653. 1871156 6 webkit-bug-importer 2022-05-23 06:50:16 -0700 <rdar://problem/93756160> 459650 2022-05-22 13:48:32 -0700 2022-05-22 15:43:28 -0700 Patch bug-240776-20220522134831.patch text/plain 5367 zalan RnJvbSBlMTQzOWMxOWRlMThhNGMxY2VmZWIyYTg3NjZkMzU5OGUxYWUzNzkzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBT dW4sIDIyIE1heSAyMDIyIDEzOjQ1OjAyIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bRkZD XSBBZGQgc3VwcG9ydCBmb3IgYmxvY2sgZGlyZWN0aW9uIGdyb3cKIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDA3NzYKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgoKVGhpcyBpcyBhIGJhc2ljIGJsb2NrIGRpcmVjdGlvbiBncm93IHN1cHBvcnQgKGUuZy4gZGVm YXVsdCBibG9jayBkaXJlY3Rpb24gKHRvcC0+Ym90dG9tKSB3aXRoIGZsZXggZGlyZWN0aW9uIG9m IGNvbHVtbikgd2hlbgpmbGV4IGJveCdzIGhlaWdodCBpcyBmaXhlZC4KCiogU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9Gb3JtYXR0aW5nQ29uc3RyYWludHMuaDoKKiBT b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRp bmdDb250ZXh0LmNwcDoKKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0Ojps YXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24pOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9mbGV4L0xheW91dEludGVncmF0aW9uRmxleExheW91dC5jcHA6CihXZWJD b3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6RmxleExheW91dDo6dXBkYXRlUmVuZGVyZXJzIGNvbnN0 KToKLS0tCiAuLi4vZm9ybWF0dGluZ0NvbnRleHRzL0Zvcm1hdHRpbmdDb25zdHJhaW50cy5oIHwg IDIgKy0KIC4uLi9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAgICAgICAgICAgICAgfCAx OCArKysrKysrKysrKy0tLS0tLS0KIC4uLi9mbGV4L0xheW91dEludGVncmF0aW9uRmxleExheW91 dC5jcHAgICAgICAgfCAgMSArCiAzIGZpbGVzIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDgg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9Gb3JtYXR0aW5nQ29uc3RyYWludHMuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvRm9ybWF0dGluZ0NvbnN0cmFpbnRzLmgKaW5kZXggMjE2YTZh NzlmZjAwLi45MTZhYmNjZTIyMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvRm9ybWF0dGluZ0NvbnN0cmFpbnRzLmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9Gb3JtYXR0aW5nQ29uc3RyYWludHMuaApA QCAtNjYsNyArNjYsNyBAQCBwcm90ZWN0ZWQ6CiBwcml2YXRlOgogICAgIE9wdGlvblNldDxCYXNl VHlwZUZsYWc+IGJhc2VUeXBlRmxhZ3MoKSBjb25zdCB7IHJldHVybiBPcHRpb25TZXQ8QmFzZVR5 cGVGbGFnPjo6ZnJvbVJhdyhtX2Jhc2VUeXBlRmxhZ3MpOyB9CiAKLSAgICB1bnNpZ25lZCBtX2Jh c2VUeXBlRmxhZ3MgOiAyOyAvLyBPcHRpb25TZXQ8QmFzZVR5cGVGbGFnPgorICAgIHVuc2lnbmVk IG1fYmFzZVR5cGVGbGFncyA6IDM7IC8vIE9wdGlvblNldDxCYXNlVHlwZUZsYWc+CiAgICAgSG9y aXpvbnRhbENvbnN0cmFpbnRzIG1faG9yaXpvbnRhbDsKICAgICBMYXlvdXRVbml0IG1fbG9naWNh bFRvcDsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmlu ZGV4IDllOWMyNGQ3MTM2Yy4uNTU4ZDBmY2IwNzMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxl eEZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMjA5LDM2ICsyMDksNDAgQEAgdm9pZCBGbGV4Rm9y bWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbihjb25zdCBD b25zdHJhaW50c0YKICAgICBhdXRvIGxvZ2ljYWxGbGV4SXRlbUxpc3QgPSBjb252ZXJ0RmxleEl0 ZW1zVG9Mb2dpY2FsU3BhY2UoKTsKIAogICAgIGF1dG8gdG90YWxHcm93dGggPSAwLmY7Ci0gICAg YXV0byB0b3RhbEZpeGVkV2lkdGggPSBMYXlvdXRVbml0IHsgfTsKKyAgICBhdXRvIHRvdGFsRml4 ZWRTcGFjZSA9IExheW91dFVuaXQgeyB9OwogCiAgICAgZm9yIChhdXRvJiBsb2dpY2FsRmxleEl0 ZW0gOiBsb2dpY2FsRmxleEl0ZW1MaXN0KSB7CiAgICAgICAgIHRvdGFsR3Jvd3RoICs9IGxvZ2lj YWxGbGV4SXRlbS5sYXlvdXRCb3gtPnN0eWxlKCkuZmxleEdyb3coKTsKICAgICAgICAgLy8gRklY TUU6IFVzZSBtaW4vbWF4IGhlcmUuCi0gICAgICAgIHRvdGFsRml4ZWRXaWR0aCArPSBsb2dpY2Fs RmxleEl0ZW0ucmVjdC53aWR0aCgpOworICAgICAgICB0b3RhbEZpeGVkU3BhY2UgKz0gbG9naWNh bEZsZXhJdGVtLnJlY3Qud2lkdGgoKTsKICAgICB9CiAKKyAgICBhdXRvIGZsZXhDb25zdHJhaW50 cyA9IGRvd25jYXN0PENvbnN0cmFpbnRzRm9yRmxleENvbnRlbnQ+KGNvbnN0cmFpbnRzKTsKICAg ICBhdXRvIGxvZ2ljYWxMZWZ0ID0gTGF5b3V0VW5pdCB7IH07CiAgICAgYXV0byBsb2dpY2FsVG9w ID0gTGF5b3V0VW5pdCB7IH07Ci0gICAgYXV0byBhdmFpbGFibGVXaWR0aCA9IGNvbnN0cmFpbnRz Lmhvcml6b250YWwoKS5sb2dpY2FsV2lkdGg7Ci0gICAgYXV0byBmbGV4aWJsZVdpZHRoID0gYXZh aWxhYmxlV2lkdGggLSB0b3RhbEZpeGVkV2lkdGg7CisgICAgYXV0byBmbGV4RGlyZWN0aW9uID0g cm9vdCgpLnN0eWxlKCkuZmxleERpcmVjdGlvbigpOworICAgIGF1dG8gZmxleERpcmVjdGlvbklz SW5saW5lQXhpcyA9IGZsZXhEaXJlY3Rpb24gPT0gRmxleERpcmVjdGlvbjo6Um93IHx8IGZsZXhE aXJlY3Rpb24gPT0gRmxleERpcmVjdGlvbjo6Um93UmV2ZXJzZTsKKyAgICBhdXRvIGF2YWlsYWJs ZVNwYWNlID0gc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiB7IGZsZXhEaXJlY3Rpb25Jc0lubGlu ZUF4aXMgPyBzdGQ6Om1ha2Vfb3B0aW9uYWwoZmxleENvbnN0cmFpbnRzLmhvcml6b250YWwoKS5s b2dpY2FsV2lkdGgpIDogZmxleENvbnN0cmFpbnRzLmF2YWlsYWJsZVZlcnRpY2FsU3BhY2UoKSB9 OworICAgIGF1dG8gZmxleGlibGVTcGFjZSA9IGF2YWlsYWJsZVNwYWNlLnZhbHVlX29yKDBfbHUp IC0gdG90YWxGaXhlZFNwYWNlOwogCiAgICAgZm9yIChhdXRvJiBsb2dpY2FsRmxleEl0ZW0gOiBs b2dpY2FsRmxleEl0ZW1MaXN0KSB7CiAgICAgICAgIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnNldFRv cExlZnQoeyBsb2dpY2FsTGVmdCwgbG9naWNhbFRvcCB9KTsKICAgICAgICAgbG9naWNhbExlZnQg PSBsb2dpY2FsRmxleEl0ZW0ucmVjdC5yaWdodCgpOwogICAgICAgICBhdXRvIGdyb3dGbGV4SXRl bUlmQXBwbGljYWJsZSA9IFsmXSB7Ci0gICAgICAgICAgICBpZiAoZmxleGlibGVXaWR0aCA8PSAw KQorICAgICAgICAgICAgaWYgKGZsZXhpYmxlU3BhY2UgPD0gMCkKICAgICAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgICAgICBhdXRvIGdyb3cgPSBsb2dpY2FsRmxleEl0ZW0ubGF5b3V0Qm94 LT5zdHlsZSgpLmZsZXhHcm93KCk7CiAgICAgICAgICAgICBpZiAoIWdyb3cpCiAgICAgICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICAgICAgLy8gVGhpcyB2YWx1ZSBzcGVjaWZpZXMgdGhlIGZs ZXggZ3JvdyBmYWN0b3IsIHdoaWNoIGRldGVybWluZXMgaG93IG11Y2ggdGhlIGZsZXggaXRlbSB3 aWxsIGdyb3cgcmVsYXRpdmUgdG8gdGhlCiAgICAgICAgICAgICAvLyByZXN0IG9mIHRoZSBmbGV4 IGl0ZW1zIGluIHRoZSBmbGV4IGNvbnRhaW5lciB3aGVuIHBvc2l0aXZlIGZyZWUgc3BhY2UgaXMg ZGlzdHJpYnV0ZWQuCi0gICAgICAgICAgICBsb2dpY2FsRmxleEl0ZW0ucmVjdC5zZXRXaWR0aChM YXlvdXRVbml0IHsgYXZhaWxhYmxlV2lkdGggKiBncm93IC8gdG90YWxHcm93dGggfSk7CisgICAg ICAgICAgICBBU1NFUlQoYXZhaWxhYmxlU3BhY2UuaGFzX3ZhbHVlKCkpOworICAgICAgICAgICAg bG9naWNhbEZsZXhJdGVtLnJlY3Quc2V0V2lkdGgoTGF5b3V0VW5pdCB7ICphdmFpbGFibGVTcGFj ZSAqIGdyb3cgLyB0b3RhbEdyb3d0aCB9KTsKICAgICAgICAgICAgIC8vIEZJWE1FOiBjb25zdHJh aW4gbG9naWNhbCB3aWR0aCBvbiBtaW4gd2lkdGguCiAgICAgICAgIH07CiAgICAgICAgIGdyb3dG bGV4SXRlbUlmQXBwbGljYWJsZSgpOwogICAgIH0KLSAgICBzZXRGbGV4SXRlbXNHZW9tZXRyeShs b2dpY2FsRmxleEl0ZW1MaXN0LCBkb3duY2FzdDxDb25zdHJhaW50c0ZvckZsZXhDb250ZW50Pihj b25zdHJhaW50cykpOworICAgIHNldEZsZXhJdGVtc0dlb21ldHJ5KGxvZ2ljYWxGbGV4SXRlbUxp c3QsIGZsZXhDb25zdHJhaW50cyk7CiB9CiAKIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgRmxl eEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JJ bnRlZ3JhdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vZmxleC9MYXlvdXRJbnRlZ3JhdGlvbkZsZXhMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL2ZsZXgvTGF5b3V0SW50ZWdyYXRpb25GbGV4TGF5b3V0LmNwcApp bmRleCAxY2JjMzQyZDNjMTguLjE4N2NlNzQ3NWM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2ludGVncmF0aW9uL2ZsZXgvTGF5b3V0SW50ZWdyYXRpb25GbGV4TGF5b3V0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vZmxleC9MYXlvdXRJbnRl Z3JhdGlvbkZsZXhMYXlvdXQuY3BwCkBAIC0xMzksNiArMTM5LDcgQEAgdm9pZCBGbGV4TGF5b3V0 Ojp1cGRhdGVSZW5kZXJlcnMoKSBjb25zdAogICAgICAgICBhdXRvIGJvcmRlckJveCA9IExheW91 dDo6Qm94R2VvbWV0cnk6OmJvcmRlckJveFJlY3QoZmxleEl0ZW1HZW9tZXRyeSk7CiAgICAgICAg IHJlbmRlcmVyLnNldExvY2F0aW9uKGJvcmRlckJveC50b3BMZWZ0KCkpOwogICAgICAgICByZW5k ZXJlci5zZXRXaWR0aChib3JkZXJCb3gud2lkdGgoKSk7CisgICAgICAgIHJlbmRlcmVyLnNldEhl aWdodChib3JkZXJCb3guaGVpZ2h0KCkpOwogICAgIH0KIH0KIAotLSAKMi4zMi4wIChBcHBsZSBH aXQtMTMyKQoK 459653 2022-05-22 15:43:30 -0700 2022-05-23 06:49:13 -0700 Patch bug-240776-20220522154329.patch text/plain 5356 zalan RnJvbSBlY2Q2MzQ4YmZhYjI3YzRhMGQ5ZjIxY2VkOWJhZTE4YzMwNTVmZDVlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBT dW4sIDIyIE1heSAyMDIyIDEzOjQ1OjAyIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQWRkIHN1cHBv cnQgZm9yIGJsb2NrIGRpcmVjdGlvbiBncm93CiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjQwNzc2CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRoaXMgaXMg YSBiYXNpYyBibG9jayBkaXJlY3Rpb24gZ3JvdyBzdXBwb3J0IChlLmcuIGRlZmF1bHQgYmxvY2sg ZGlyZWN0aW9uICh0b3AtPmJvdHRvbSkgd2l0aCBmbGV4IGRpcmVjdGlvbiBvZiBjb2x1bW4pIHdo ZW4KZmxleCBib3gncyBoZWlnaHQgaXMgZml4ZWQuCgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvRm9ybWF0dGluZ0NvbnN0cmFpbnRzLmg6CiogU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5j cHA6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93 Q29udGVudEZvckludGVncmF0aW9uKToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vZmxleC9MYXlvdXRJbnRlZ3JhdGlvbkZsZXhMYXlvdXQuY3BwOgooV2ViQ29yZTo6TGF5b3V0 SW50ZWdyYXRpb246OkZsZXhMYXlvdXQ6OnVwZGF0ZVJlbmRlcmVycyBjb25zdCk6Ci0tLQogLi4u L2Zvcm1hdHRpbmdDb250ZXh0cy9Gb3JtYXR0aW5nQ29uc3RyYWludHMuaCB8ICAyICstCiAuLi4v ZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwICAgICAgICAgICAgIHwgMTggKysrKysrKysr KystLS0tLS0tCiAuLi4vZmxleC9MYXlvdXRJbnRlZ3JhdGlvbkZsZXhMYXlvdXQuY3BwICAgICAg IHwgIDEgKwogMyBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv Rm9ybWF0dGluZ0NvbnN0cmFpbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL0Zvcm1hdHRpbmdDb25zdHJhaW50cy5oCmluZGV4IDIxNmE2YTc5ZmYwMC4uOTE2 YWJjY2UyMjA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL0Zvcm1hdHRpbmdDb25zdHJhaW50cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvRm9ybWF0dGluZ0NvbnN0cmFpbnRzLmgKQEAgLTY2LDcgKzY2 LDcgQEAgcHJvdGVjdGVkOgogcHJpdmF0ZToKICAgICBPcHRpb25TZXQ8QmFzZVR5cGVGbGFnPiBi YXNlVHlwZUZsYWdzKCkgY29uc3QgeyByZXR1cm4gT3B0aW9uU2V0PEJhc2VUeXBlRmxhZz46OmZy b21SYXcobV9iYXNlVHlwZUZsYWdzKTsgfQogCi0gICAgdW5zaWduZWQgbV9iYXNlVHlwZUZsYWdz IDogMjsgLy8gT3B0aW9uU2V0PEJhc2VUeXBlRmxhZz4KKyAgICB1bnNpZ25lZCBtX2Jhc2VUeXBl RmxhZ3MgOiAzOyAvLyBPcHRpb25TZXQ8QmFzZVR5cGVGbGFnPgogICAgIEhvcml6b250YWxDb25z dHJhaW50cyBtX2hvcml6b250YWw7CiAgICAgTGF5b3V0VW5pdCBtX2xvZ2ljYWxUb3A7CiB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4 L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA5ZTljMjRk NzEzNmMuLjU1OGQwZmNiMDczMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5n Q29udGV4dC5jcHAKQEAgLTIwOSwzNiArMjA5LDQwIEBAIHZvaWQgRmxleEZvcm1hdHRpbmdDb250 ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50Rm9ySW50ZWdyYXRpb24oY29uc3QgQ29uc3RyYWludHNG CiAgICAgYXV0byBsb2dpY2FsRmxleEl0ZW1MaXN0ID0gY29udmVydEZsZXhJdGVtc1RvTG9naWNh bFNwYWNlKCk7CiAKICAgICBhdXRvIHRvdGFsR3Jvd3RoID0gMC5mOwotICAgIGF1dG8gdG90YWxG aXhlZFdpZHRoID0gTGF5b3V0VW5pdCB7IH07CisgICAgYXV0byB0b3RhbEZpeGVkU3BhY2UgPSBM YXlvdXRVbml0IHsgfTsKIAogICAgIGZvciAoYXV0byYgbG9naWNhbEZsZXhJdGVtIDogbG9naWNh bEZsZXhJdGVtTGlzdCkgewogICAgICAgICB0b3RhbEdyb3d0aCArPSBsb2dpY2FsRmxleEl0ZW0u bGF5b3V0Qm94LT5zdHlsZSgpLmZsZXhHcm93KCk7CiAgICAgICAgIC8vIEZJWE1FOiBVc2UgbWlu L21heCBoZXJlLgotICAgICAgICB0b3RhbEZpeGVkV2lkdGggKz0gbG9naWNhbEZsZXhJdGVtLnJl Y3Qud2lkdGgoKTsKKyAgICAgICAgdG90YWxGaXhlZFNwYWNlICs9IGxvZ2ljYWxGbGV4SXRlbS5y ZWN0LndpZHRoKCk7CiAgICAgfQogCisgICAgYXV0byBmbGV4Q29uc3RyYWludHMgPSBkb3duY2Fz dDxDb25zdHJhaW50c0ZvckZsZXhDb250ZW50Pihjb25zdHJhaW50cyk7CiAgICAgYXV0byBsb2dp Y2FsTGVmdCA9IExheW91dFVuaXQgeyB9OwogICAgIGF1dG8gbG9naWNhbFRvcCA9IExheW91dFVu aXQgeyB9OwotICAgIGF1dG8gYXZhaWxhYmxlV2lkdGggPSBjb25zdHJhaW50cy5ob3Jpem9udGFs KCkubG9naWNhbFdpZHRoOwotICAgIGF1dG8gZmxleGlibGVXaWR0aCA9IGF2YWlsYWJsZVdpZHRo IC0gdG90YWxGaXhlZFdpZHRoOworICAgIGF1dG8gZmxleERpcmVjdGlvbiA9IHJvb3QoKS5zdHls ZSgpLmZsZXhEaXJlY3Rpb24oKTsKKyAgICBhdXRvIGZsZXhEaXJlY3Rpb25Jc0lubGluZUF4aXMg PSBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246OlJvdyB8fCBmbGV4RGlyZWN0aW9uID09 IEZsZXhEaXJlY3Rpb246OlJvd1JldmVyc2U7CisgICAgYXV0byBhdmFpbGFibGVTcGFjZSA9IHN0 ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4geyBmbGV4RGlyZWN0aW9uSXNJbmxpbmVBeGlzID8gc3Rk OjptYWtlX29wdGlvbmFsKGZsZXhDb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbFdpZHRo KSA6IGZsZXhDb25zdHJhaW50cy5hdmFpbGFibGVWZXJ0aWNhbFNwYWNlKCkgfTsKKyAgICBhdXRv IGZsZXhpYmxlU3BhY2UgPSBhdmFpbGFibGVTcGFjZS52YWx1ZV9vcigwX2x1KSAtIHRvdGFsRml4 ZWRTcGFjZTsKIAogICAgIGZvciAoYXV0byYgbG9naWNhbEZsZXhJdGVtIDogbG9naWNhbEZsZXhJ dGVtTGlzdCkgewogICAgICAgICBsb2dpY2FsRmxleEl0ZW0ucmVjdC5zZXRUb3BMZWZ0KHsgbG9n aWNhbExlZnQsIGxvZ2ljYWxUb3AgfSk7CiAgICAgICAgIGxvZ2ljYWxMZWZ0ID0gbG9naWNhbEZs ZXhJdGVtLnJlY3QucmlnaHQoKTsKICAgICAgICAgYXV0byBncm93RmxleEl0ZW1JZkFwcGxpY2Fi bGUgPSBbJl0gewotICAgICAgICAgICAgaWYgKGZsZXhpYmxlV2lkdGggPD0gMCkKKyAgICAgICAg ICAgIGlmIChmbGV4aWJsZVNwYWNlIDw9IDApCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICAgICAgYXV0byBncm93ID0gbG9naWNhbEZsZXhJdGVtLmxheW91dEJveC0+c3R5bGUoKS5m bGV4R3JvdygpOwogICAgICAgICAgICAgaWYgKCFncm93KQogICAgICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgICAgIC8vIFRoaXMgdmFsdWUgc3BlY2lmaWVzIHRoZSBmbGV4IGdyb3cgZmFj dG9yLCB3aGljaCBkZXRlcm1pbmVzIGhvdyBtdWNoIHRoZSBmbGV4IGl0ZW0gd2lsbCBncm93IHJl bGF0aXZlIHRvIHRoZQogICAgICAgICAgICAgLy8gcmVzdCBvZiB0aGUgZmxleCBpdGVtcyBpbiB0 aGUgZmxleCBjb250YWluZXIgd2hlbiBwb3NpdGl2ZSBmcmVlIHNwYWNlIGlzIGRpc3RyaWJ1dGVk LgotICAgICAgICAgICAgbG9naWNhbEZsZXhJdGVtLnJlY3Quc2V0V2lkdGgoTGF5b3V0VW5pdCB7 IGF2YWlsYWJsZVdpZHRoICogZ3JvdyAvIHRvdGFsR3Jvd3RoIH0pOworICAgICAgICAgICAgQVNT RVJUKGF2YWlsYWJsZVNwYWNlLmhhc192YWx1ZSgpKTsKKyAgICAgICAgICAgIGxvZ2ljYWxGbGV4 SXRlbS5yZWN0LnNldFdpZHRoKExheW91dFVuaXQgeyAqYXZhaWxhYmxlU3BhY2UgKiBncm93IC8g dG90YWxHcm93dGggfSk7CiAgICAgICAgICAgICAvLyBGSVhNRTogY29uc3RyYWluIGxvZ2ljYWwg d2lkdGggb24gbWluIHdpZHRoLgogICAgICAgICB9OwogICAgICAgICBncm93RmxleEl0ZW1JZkFw cGxpY2FibGUoKTsKICAgICB9Ci0gICAgc2V0RmxleEl0ZW1zR2VvbWV0cnkobG9naWNhbEZsZXhJ dGVtTGlzdCwgZG93bmNhc3Q8Q29uc3RyYWludHNGb3JGbGV4Q29udGVudD4oY29uc3RyYWludHMp KTsKKyAgICBzZXRGbGV4SXRlbXNHZW9tZXRyeShsb2dpY2FsRmxleEl0ZW1MaXN0LCBmbGV4Q29u c3RyYWludHMpOwogfQogCiBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIEZsZXhGb3JtYXR0aW5n Q29udGV4dDo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9ySW50ZWdyYXRpb24o KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2ZsZXgvTGF5 b3V0SW50ZWdyYXRpb25GbGV4TGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9mbGV4L0xheW91dEludGVncmF0aW9uRmxleExheW91dC5jcHAKaW5kZXggMWNiYzM0 MmQzYzE4Li4xODdjZTc0NzVjODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9mbGV4L0xheW91dEludGVncmF0aW9uRmxleExheW91dC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2ZsZXgvTGF5b3V0SW50ZWdyYXRpb25GbGV4 TGF5b3V0LmNwcApAQCAtMTM5LDYgKzEzOSw3IEBAIHZvaWQgRmxleExheW91dDo6dXBkYXRlUmVu ZGVyZXJzKCkgY29uc3QKICAgICAgICAgYXV0byBib3JkZXJCb3ggPSBMYXlvdXQ6OkJveEdlb21l dHJ5Ojpib3JkZXJCb3hSZWN0KGZsZXhJdGVtR2VvbWV0cnkpOwogICAgICAgICByZW5kZXJlci5z ZXRMb2NhdGlvbihib3JkZXJCb3gudG9wTGVmdCgpKTsKICAgICAgICAgcmVuZGVyZXIuc2V0V2lk dGgoYm9yZGVyQm94LndpZHRoKCkpOworICAgICAgICByZW5kZXJlci5zZXRIZWlnaHQoYm9yZGVy Qm94LmhlaWdodCgpKTsKICAgICB9CiB9CiAKLS0gCjIuMzIuMCAoQXBwbGUgR2l0LTEzMikKCg==