236308 2022-02-08 09:28:17 -0800 [LFC][Integration] LineIteratorModernPath::baselineType should consult Display::Line 2022-02-08 13:48:17 -0800 1 1 1 Unclassified WebKit Layout and Rendering Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1838717 0 zalan 2022-02-08 09:28:17 -0800 ssia 1838723 1 451261 zalan 2022-02-08 09:44:18 -0800 Created attachment 451261 Patch 1838736 2 451261 koivisto 2022-02-08 09:55:48 -0800 Comment on attachment 451261 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451261&action=review > Source/WebCore/layout/integration/LayoutIntegrationLine.h:39 > + Line(size_t firstBoxIndex, size_t boxCount, const FloatRect& lineBoxRect, float enclosingContentTop, float enclosingContentBottom, const FloatRect& scrollableOverflow, const FloatRect& inkOverflow, float baseline, FontBaseline baselineType, float contentLeft, float contentLogicalWidth) OMG we still have this 1838737 3 zalan 2022-02-08 09:59:08 -0800 yeah we do :( 1838863 4 ews-feeder 2022-02-08 13:47:12 -0800 Committed r289425 (246985@main): <https://commits.webkit.org/246985@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451261. 1838864 5 webkit-bug-importer 2022-02-08 13:48:17 -0800 <rdar://problem/88650129> 451261 2022-02-08 09:44:18 -0800 2022-02-08 13:47:13 -0800 Patch bug-236308-20220208094417.patch text/plain 11166 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5Mzc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDY4YjE4OWQyZDE4MDFm MzMxMTUyMThjZTMwZGU4YzE5MDliNDViYi4uYTk5MTVmNGUzN2Y3Nzc0MjllODgyNmVhNTI3Mjk1 NmY0MjAyOWU5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIyLTAyLTA4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0g TGluZUl0ZXJhdG9yTW9kZXJuUGF0aDo6YmFzZWxpbmVUeXBlIHNob3VsZCBjb25zdWx0IERpc3Bs YXk6OkxpbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzNjMwOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IExpbmVCb3ggLT4gRGlzcGxheTo6TGluZSAtPiBMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoIChhbmQg dGhlIHNvb24tdG8tYmUtcmVtb3ZlZCBMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZSBtaWRkbGVtYW4p LgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpiYXNlbGluZVR5cGUg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpzZXRCYXNlbGluZVR5 cGUpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkv SW5saW5lRGlzcGxheUxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6Okxp bmU6OmJhc2VsaW5lVHlwZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVEaXNwbGF5 OjpMaW5lOjpMaW5lKToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OklubGluZURpc3BsYXlMaW5lQnVpbGRlcjo6YnVpbGQgY29uc3QpOgorICAgICAg ICAqIGxheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVNb2Rlcm5QYXRoLmg6Cisg ICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUl0ZXJhdG9yTW9kZXJuUGF0aDo6 YmFzZWxpbmVUeXBlIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXRJbnRlZ3JhdGlvbjo6SW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlMaW5l cyBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u TGluZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmU6OkxpbmUp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmU6OmJhc2VsaW5lVHlw ZSBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u UGFnaW5hdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6bWFr ZUFkanVzdGVkQ29udGVudCk6CisKIDIwMjItMDItMDggIEFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9yIGlkZW9ncmFwaGlj IGJhc2VsaW5lIG9uIGF0b21pYyBpbmxpbmUgbGV2ZWwgYm94ZXMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3gu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUxpbmVCb3guaAppbmRleCA0NDY2N2I2ZTZiOTcwMGVmZTI3NDAwMzVhYjYzN2M4NzkwZTY4YTJl Li4yMTE5MjNlYzMxYzc1M2E3OGEwMTI5YmYyOTAwYjQxYzBlODliMTQzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lTGluZUJveC5oCkBAIC04MCw2ICs4MCw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBJ bmxpbmVMZXZlbEJveExpc3QmIG5vblJvb3RJbmxpbmVMZXZlbEJveGVzKCkgY29uc3QgeyByZXR1 cm4gbV9ub25Sb290SW5saW5lTGV2ZWxCb3hMaXN0OyB9CiAKICAgICBJbmxpbmVMYXlvdXRVbml0 IHJvb3RJbmxpbmVCb3hBbGlnbm1lbnRPZmZzZXQoKSBjb25zdCB7IHJldHVybiBtX3Jvb3RJbmxp bmVCb3hBbGlnbm1lbnRPZmZzZXQ7IH0KKyAgICBGb250QmFzZWxpbmUgYmFzZWxpbmVUeXBlKCkg Y29uc3QgeyByZXR1cm4gbV9iYXNlbGluZVR5cGU7IH0KIAogICAgIGNvbnN0IElubGluZVJlY3Qm IGxvZ2ljYWxSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9sb2dpY2FsUmVjdDsgfQogCkBAIC05Nyw2 ICs5OCw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHNldExvZ2ljYWxSZWN0KGNvbnN0IElubGlu ZVJlY3QmIGxvZ2ljYWxSZWN0KSB7IG1fbG9naWNhbFJlY3QgPSBsb2dpY2FsUmVjdDsgfQogICAg IHZvaWQgc2V0SGFzQ29udGVudChib29sIGhhc0NvbnRlbnQpIHsgbV9oYXNDb250ZW50ID0gaGFz Q29udGVudDsgfQorICAgIHZvaWQgc2V0QmFzZWxpbmVUeXBlKEZvbnRCYXNlbGluZSBiYXNlbGlu ZVR5cGUpIHsgbV9iYXNlbGluZVR5cGUgPSBiYXNlbGluZVR5cGU7IH0KIAogcHJpdmF0ZToKICAg ICBib29sIG1faGFzQ29udGVudCB7IGZhbHNlIH07CkBAIC0xMDQsNiArMTA2LDcgQEAgcHJpdmF0 ZToKICAgICBPcHRpb25TZXQ8SW5saW5lTGV2ZWxCb3g6OlR5cGU+IG1fYm94VHlwZXM7CiAKICAg ICBJbmxpbmVMYXlvdXRVbml0IG1fcm9vdElubGluZUJveEFsaWdubWVudE9mZnNldCB7IDAgfTsK KyAgICBGb250QmFzZWxpbmUgbV9iYXNlbGluZVR5cGUgeyBBbHBoYWJldGljQmFzZWxpbmUgfTsK ICAgICBJbmxpbmVMZXZlbEJveCBtX3Jvb3RJbmxpbmVCb3g7CiAgICAgSW5saW5lTGV2ZWxCb3hM aXN0IG1fbm9uUm9vdElubGluZUxldmVsQm94TGlzdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNw bGF5TGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZS5oCmluZGV4IDgxZjc5ZjQxOGEzYTA0YTBiYjNl ODNjMzYxNTI5NjFkMjQ2MDAxNDAuLjU2NTI1Y2RlMzllNzJhYzg0NDE1MzZjOGVhYThmZjAwMjU3 YjQ3MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlM aW5lLmgKQEAgLTQwLDcgKzQwLDcgQEAgcHVibGljOgogICAgICAgICBmbG9hdCB0b3AgeyAwIH07 CiAgICAgICAgIGZsb2F0IGJvdHRvbSB7IDAgfTsKICAgICB9OwotICAgIExpbmUoY29uc3QgRmxv YXRSZWN0JiBsaW5lQm94UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzY3JvbGxhYmxlT3ZlcmZsb3cs IEVuY2xvc2luZ1RvcEFuZEJvdHRvbSwgZmxvYXQgYWxpZ21lbnRCYXNlbGluZSwgZmxvYXQgY29u dGVudExlZnQsIGZsb2F0IGNvbnRlbnRMb2dpY2FsV2lkdGgpOworICAgIExpbmUoY29uc3QgRmxv YXRSZWN0JiBsaW5lQm94UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzY3JvbGxhYmxlT3ZlcmZsb3cs IEVuY2xvc2luZ1RvcEFuZEJvdHRvbSwgZmxvYXQgYWxpZ21lbnRCYXNlbGluZSwgRm9udEJhc2Vs aW5lIGJhc2VsaW5lVHlwZSwgZmxvYXQgY29udGVudExlZnQsIGZsb2F0IGNvbnRlbnRMb2dpY2Fs V2lkdGgpOwogCiAgICAgZmxvYXQgbGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveFJlY3Qu eCgpOyB9CiAgICAgZmxvYXQgcmlnaHQoKSBjb25zdCB7IHJldHVybiBtX2xpbmVCb3hSZWN0Lm1h eFgoKTsgfQpAQCAtNTUsNiArNTUsNyBAQCBwdWJsaWM6CiAgICAgRW5jbG9zaW5nVG9wQW5kQm90 dG9tIGVuY2xvc2luZ1RvcEFuZEJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIG1fZW5jbG9zaW5nVG9w QW5kQm90dG9tOyB9CiAKICAgICBmbG9hdCBiYXNlbGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fYWxp Z21lbnRCYXNlbGluZTsgfQorICAgIEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUoKSBjb25zdCB7 IHJldHVybiBtX2Jhc2VsaW5lVHlwZTsgfQogCiAgICAgZmxvYXQgY29udGVudExlZnQoKSBjb25z dCB7IHJldHVybiBtX2NvbnRlbnRMZWZ0OyB9CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxXaWR0 aCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudExvZ2ljYWxXaWR0aDsgfQpAQCAtNzIsMTUgKzcz LDE3IEBAIHByaXZhdGU6CiAgICAgZmxvYXQgbV9hbGlnbWVudEJhc2VsaW5lIHsgMCB9OwogICAg IGZsb2F0IG1fY29udGVudExlZnQgeyAwIH07CiAgICAgZmxvYXQgbV9jb250ZW50TG9naWNhbFdp ZHRoIHsgMCB9OworICAgIEZvbnRCYXNlbGluZSBtX2Jhc2VsaW5lVHlwZSB7IEFscGhhYmV0aWNC YXNlbGluZSB9OwogfTsKIAotaW5saW5lIExpbmU6OkxpbmUoY29uc3QgRmxvYXRSZWN0JiBsaW5l Qm94UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzY3JvbGxhYmxlT3ZlcmZsb3csIEVuY2xvc2luZ1Rv cEFuZEJvdHRvbSBlbmNsb3NpbmdUb3BBbmRCb3R0b20sIGZsb2F0IGFsaWdtZW50QmFzZWxpbmUs IGZsb2F0IGNvbnRlbnRMZWZ0LCBmbG9hdCBjb250ZW50TG9naWNhbFdpZHRoKQoraW5saW5lIExp bmU6OkxpbmUoY29uc3QgRmxvYXRSZWN0JiBsaW5lQm94UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBz Y3JvbGxhYmxlT3ZlcmZsb3csIEVuY2xvc2luZ1RvcEFuZEJvdHRvbSBlbmNsb3NpbmdUb3BBbmRC b3R0b20sIGZsb2F0IGFsaWdtZW50QmFzZWxpbmUsIEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUs IGZsb2F0IGNvbnRlbnRMZWZ0LCBmbG9hdCBjb250ZW50TG9naWNhbFdpZHRoKQogICAgIDogbV9s aW5lQm94UmVjdChsaW5lQm94UmVjdCkKICAgICAsIG1fc2Nyb2xsYWJsZU92ZXJmbG93KHNjcm9s bGFibGVPdmVyZmxvdykKICAgICAsIG1fZW5jbG9zaW5nVG9wQW5kQm90dG9tKGVuY2xvc2luZ1Rv cEFuZEJvdHRvbSkKICAgICAsIG1fYWxpZ21lbnRCYXNlbGluZShhbGlnbWVudEJhc2VsaW5lKQog ICAgICwgbV9jb250ZW50TGVmdChjb250ZW50TGVmdCkKICAgICAsIG1fY29udGVudExvZ2ljYWxX aWR0aChjb250ZW50TG9naWNhbFdpZHRoKQorICAgICwgbV9iYXNlbGluZVR5cGUoYmFzZWxpbmVU eXBlKQogewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lu bGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAKaW5kZXggMjEwYzk1MjAzMzY2NjAxMDgwOTY5YmVk ODlkNDVlMTlkNTAwZTYwMy4uZGUwNTAzZDNiNWI0ZmM0OWMyYTQ0YTBkYTJkNWFmYmE0YWY4NzY5 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlz cGxheUxpbmVCdWlsZGVyLmNwcApAQCAtMTAwLDYgKzEwMCw3IEBAIElubGluZURpc3BsYXk6Okxp bmUgSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyOjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGlu ZUNvbnRlCiAgICAgICAgICwgZmxpcExvZ2ljYWxMaW5lUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01v ZGUoZW5jbG9zaW5nTGluZUdlb21ldHJ5LnNjcm9sbGFibGVPdmVyZmxvd1JlY3QsIHdyaXRpbmdN b2RlKQogICAgICAgICAsIGVuY2xvc2luZ0xpbmVHZW9tZXRyeS5lbmNsb3NpbmdUb3BBbmRCb3R0 b20KICAgICAgICAgLCByb290SW5saW5lQm94LmxvZ2ljYWxUb3AoKSArIHJvb3RJbmxpbmVCb3gu YXNjZW50KCkKKyAgICAgICAgLCBsaW5lQm94LmJhc2VsaW5lVHlwZSgpCiAgICAgICAgICwgY29u dGVudFZpc3VhbExlZnQKICAgICAgICAgLCByb290SW5saW5lQm94LmxvZ2ljYWxXaWR0aCgpCiAg ICAgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9Jbmxp bmVJdGVyYXRvckxpbmVNb2Rlcm5QYXRoLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vSW5saW5lSXRlcmF0b3JMaW5lTW9kZXJuUGF0aC5oCmluZGV4IDM2NjJlODE2NGMzNGNh MmU0ZWFiYWIyZjY4NGI0YzQ4ZGU5ODllZTcuLjRkNzdkMjc4ZTk2OThhOGY2MTljYmIzZjU4NDVj NWMwZDEwYWU2Y2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlv bi9JbmxpbmVJdGVyYXRvckxpbmVNb2Rlcm5QYXRoLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZU1vZGVyblBhdGguaApAQCAtNjcsNyAr NjcsNyBAQCBwdWJsaWM6CiAgICAgZmxvYXQgeSgpIGNvbnN0IHsgcmV0dXJuIGxpbmVCb3hUb3Ao KTsgfQogICAgIGZsb2F0IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJldHVybiBsaW5lQm94Qm90 dG9tKCkgLSBsaW5lQm94VG9wKCk7IH0KICAgICBib29sIGlzSG9yaXpvbnRhbCgpIGNvbnN0IHsg cmV0dXJuIHRydWU7IH0KLSAgICBGb250QmFzZWxpbmUgYmFzZWxpbmVUeXBlKCkgY29uc3QgeyBy ZXR1cm4gQWxwaGFiZXRpY0Jhc2VsaW5lOyB9CisgICAgRm9udEJhc2VsaW5lIGJhc2VsaW5lVHlw ZSgpIGNvbnN0IHsgcmV0dXJuIGxpbmUoKS5iYXNlbGluZVR5cGUoKTsgfQogCiAgICAgY29uc3Qg UmVuZGVyQmxvY2tGbG93JiBjb250YWluaW5nQmxvY2soKSBjb25zdCB7IHJldHVybiBtX2lubGlu ZUNvbnRlbnQtPmNvbnRhaW5pbmdCbG9jaygpOyB9CiAgICAgY29uc3QgTGVnYWN5Um9vdElubGlu ZUJveCogbGVnYWN5Um9vdElubGluZUJveCgpIGNvbnN0IHsgcmV0dXJuIG51bGxwdHI7IH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCA3 ZDFkYzdjMzI3NGJmMmI4YmExOTIxY2FhOWM3ZWYxNzQwZDliOGJjLi4wNTEyYmNmN2FiNjBhZDBl NGI5NDIxYWZlYWViZWM0OTQzOGY4MWZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u SW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBAIC0xMzcsNyArMTM3LDcgQEAgdm9pZCBJbmxpbmVD b250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzKExheW91dDo6SW5saW5lRm9ybWF0dGlu Z1N0YXRlJiBpbmwKICAgICAgICAgfQogCiAgICAgICAgIGF1dG8gYm94Q291bnQgPSBib3hJbmRl eCAtIGZpcnN0Qm94SW5kZXg7Ci0gICAgICAgIGlubGluZUNvbnRlbnQubGluZXMuYXBwZW5kKHsg Zmlyc3RCb3hJbmRleCwgYm94Q291bnQsIEZsb2F0UmVjdCB7IGxpbmUubGluZUJveFJlY3QoKSB9 LCBsaW5lLmVuY2xvc2luZ1RvcEFuZEJvdHRvbSgpLnRvcCwgbGluZS5lbmNsb3NpbmdUb3BBbmRC b3R0b20oKS5ib3R0b20sIHNjcm9sbGFibGVPdmVyZmxvd1JlY3QsIGxpbmVJbmtPdmVyZmxvd1Jl Y3QsIGxpbmUuYmFzZWxpbmUoKSwgbGluZS5jb250ZW50TGVmdCgpLCBsaW5lLmNvbnRlbnRMb2dp Y2FsV2lkdGgoKSB9KTsKKyAgICAgICAgaW5saW5lQ29udGVudC5saW5lcy5hcHBlbmQoeyBmaXJz dEJveEluZGV4LCBib3hDb3VudCwgRmxvYXRSZWN0IHsgbGluZS5saW5lQm94UmVjdCgpIH0sIGxp bmUuZW5jbG9zaW5nVG9wQW5kQm90dG9tKCkudG9wLCBsaW5lLmVuY2xvc2luZ1RvcEFuZEJvdHRv bSgpLmJvdHRvbSwgc2Nyb2xsYWJsZU92ZXJmbG93UmVjdCwgbGluZUlua092ZXJmbG93UmVjdCwg bGluZS5iYXNlbGluZSgpLCBsaW5lLmJhc2VsaW5lVHlwZSgpLCBsaW5lLmNvbnRlbnRMZWZ0KCks IGxpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpIH0pOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5o IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGlu ZS5oCmluZGV4IDlhMmQ5ODE4NzMyNzIwYTM1NmZiYTRlZjUwYjRjN2I2Y2Y2NzVjMDcuLjI5MGM4 MjVkYTc3MzdkMjRmZTI3ZmFlYmUxMDliZjUzZTFkNDJmZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lLmgK QEAgLTM2LDcgKzM2LDcgQEAgbmFtZXNwYWNlIExheW91dEludGVncmF0aW9uIHsKIGNsYXNzIExp bmUgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgotICAgIExpbmUoc2l6 ZV90IGZpcnN0Qm94SW5kZXgsIHNpemVfdCBib3hDb3VudCwgY29uc3QgRmxvYXRSZWN0JiBsaW5l Qm94UmVjdCwgZmxvYXQgZW5jbG9zaW5nQ29udGVudFRvcCwgZmxvYXQgZW5jbG9zaW5nQ29udGVu dEJvdHRvbSwgY29uc3QgRmxvYXRSZWN0JiBzY3JvbGxhYmxlT3ZlcmZsb3csIGNvbnN0IEZsb2F0 UmVjdCYgaW5rT3ZlcmZsb3csIGZsb2F0IGJhc2VsaW5lLCBmbG9hdCBjb250ZW50TGVmdCwgZmxv YXQgY29udGVudExvZ2ljYWxXaWR0aCkKKyAgICBMaW5lKHNpemVfdCBmaXJzdEJveEluZGV4LCBz aXplX3QgYm94Q291bnQsIGNvbnN0IEZsb2F0UmVjdCYgbGluZUJveFJlY3QsIGZsb2F0IGVuY2xv c2luZ0NvbnRlbnRUb3AsIGZsb2F0IGVuY2xvc2luZ0NvbnRlbnRCb3R0b20sIGNvbnN0IEZsb2F0 UmVjdCYgc2Nyb2xsYWJsZU92ZXJmbG93LCBjb25zdCBGbG9hdFJlY3QmIGlua092ZXJmbG93LCBm bG9hdCBiYXNlbGluZSwgRm9udEJhc2VsaW5lIGJhc2VsaW5lVHlwZSwgZmxvYXQgY29udGVudExl ZnQsIGZsb2F0IGNvbnRlbnRMb2dpY2FsV2lkdGgpCiAgICAgICAgIDogbV9maXJzdEJveEluZGV4 KGZpcnN0Qm94SW5kZXgpCiAgICAgICAgICwgbV9ib3hDb3VudChib3hDb3VudCkKICAgICAgICAg LCBtX2xpbmVCb3hSZWN0KGxpbmVCb3hSZWN0KQpAQCAtNDcsNiArNDcsNyBAQCBwdWJsaWM6CiAg ICAgICAgICwgbV9iYXNlbGluZShiYXNlbGluZSkKICAgICAgICAgLCBtX2NvbnRlbnRMZWZ0KGNv bnRlbnRMZWZ0KQogICAgICAgICAsIG1fY29udGVudExvZ2ljYWxXaWR0aChjb250ZW50TG9naWNh bFdpZHRoKQorICAgICAgICAsIG1fYmFzZWxpbmVUeXBlKGJhc2VsaW5lVHlwZSkKICAgICB7CiAg ICAgfQogCkBAIC02NSw2ICs2Niw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBGbG9hdFJlY3QmIGlu a092ZXJmbG93KCkgY29uc3QgeyByZXR1cm4gbV9pbmtPdmVyZmxvdzsgfQogCiAgICAgZmxvYXQg YmFzZWxpbmUoKSBjb25zdCB7IHJldHVybiBtX2Jhc2VsaW5lOyB9CisgICAgRm9udEJhc2VsaW5l IGJhc2VsaW5lVHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fYmFzZWxpbmVUeXBlOyB9CiAKICAgICBm bG9hdCBjb250ZW50TGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudExlZnQ7IH0KICAgICBm bG9hdCBjb250ZW50TG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TG9naWNh bFdpZHRoOyB9CkBAIC04NCw2ICs4Niw3IEBAIHByaXZhdGU6CiAgICAgZmxvYXQgbV9iYXNlbGlu ZSB7IDAgfTsKICAgICBmbG9hdCBtX2NvbnRlbnRMZWZ0IHsgMCB9OwogICAgIGZsb2F0IG1fY29u dGVudExvZ2ljYWxXaWR0aCB7IDAgfTsKKyAgICBGb250QmFzZWxpbmUgbV9iYXNlbGluZVR5cGUg eyBBbHBoYWJldGljQmFzZWxpbmUgfTsgCiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25QYWdpbmF0aW9uLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2lu YXRpb24uY3BwCmluZGV4IDM2MDE2ODk3NGJjZDFkY2Q2NGJiZGVmNjE0YzQ4NDMzYjk0NmEwN2Qu LjBmMDBkZTUzMzQ3YzBhNjBlZmI4MjM0MjRjZjg4NDE2ODJkNjZkYWUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRp b24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvblBhZ2luYXRpb24uY3BwCkBAIC0xMzUsNiArMTM1LDcgQEAgc3RhdGljIFJlZjxJbmxp bmVDb250ZW50PiBtYWtlQWRqdXN0ZWRDb250ZW50KGNvbnN0IElubGluZUNvbnRlbnQmIGlubGlu ZUNvbnRlbnQKICAgICAgICAgICAgIG1vdmVWZXJ0aWNhbGx5KGxpbmUuc2Nyb2xsYWJsZU92ZXJm bG93KCksIG9mZnNldCksCiAgICAgICAgICAgICBtb3ZlVmVydGljYWxseShsaW5lLmlua092ZXJm bG93KCksIG9mZnNldCksCiAgICAgICAgICAgICBsaW5lLmJhc2VsaW5lKCksCisgICAgICAgICAg ICBsaW5lLmJhc2VsaW5lVHlwZSgpLAogICAgICAgICAgICAgbGluZS5jb250ZW50TGVmdCgpLAog ICAgICAgICAgICAgbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkKICAgICAgICAgfTsK