236835 2022-02-18 05:02:14 -0800 [LFC][Integration] Add missing LineIteratorModernPath::isHorizontal implementation 2022-02-18 08:33:18 -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 1843361 0 zalan 2022-02-18 05:02:14 -0800 ssia 1843363 1 452511 zalan 2022-02-18 05:05:17 -0800 Created attachment 452511 Patch 1843364 2 452511 koivisto 2022-02-18 05:10:21 -0800 Comment on attachment 452511 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452511&action=review > Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLine.h:80 > + bool m_isHorizontal { true }; This might not really need a bit since it is always same for all lines within a block? 1843365 3 zalan 2022-02-18 05:12:37 -0800 (In reply to Antti Koivisto from comment #2) > Comment on attachment 452511 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=452511&action=review > > > Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLine.h:80 > > + bool m_isHorizontal { true }; > > This might not really need a bit since it is always same for all lines > within a block? Yeah, we should definitely come back to it when all the vertical modes are enabled and see if we could just grab it off of the IFC root. 1843421 4 ews-feeder 2022-02-18 08:32:14 -0800 Committed r290127 (247471@main): <https://commits.webkit.org/247471@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452511. 1843422 5 webkit-bug-importer 2022-02-18 08:33:18 -0800 <rdar://problem/89146753> 452511 2022-02-18 05:05:17 -0800 2022-02-18 08:32:15 -0800 Patch bug-236835-20220218050516.patch text/plain 10713 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzA0MmNkODMwNGMwYTRk NmRmYmFhOGU4N2JmNjZjMTU5N2FiYjNlNy4uZTkzY2IyOGE0OTY1MDU0YmIyZjQ4YTAzN2RjMGYy ODg0OWMxNmVmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTAyLTE4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0g QWRkIG1pc3NpbmcgTGluZUl0ZXJhdG9yTW9kZXJuUGF0aDo6aXNIb3Jpem9udGFsIGltcGxlbWVu dGF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzY4MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBp c0hvcml6b250YWwgdmFsdWUgY29tZXMgZnJvbSB0aGUgcm9vdCBpbmxpbmUgYm94J3Mgd3JpdGlu ZyBtb2RlLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lTGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojppc0hvcml6 b250YWwgY29uc3QpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURp c3BsYXk6OkxpbmU6OmlzSG9yaXpvbnRhbCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxp bmVEaXNwbGF5OjpMaW5lOjpMaW5lKToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlMaW5lQnVpbGRlcjo6YnVpbGQgY29uc3Qp OgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVNb2Rlcm5Q YXRoLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUl0ZXJhdG9yTW9k ZXJuUGF0aDo6aXNIb3Jpem9udGFsIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6SW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURp c3BsYXlMaW5lcyBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uTGluZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246Okxp bmU6OkxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmU6Omlz SG9yaXpvbnRhbCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uUGFnaW5hdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3Jh dGlvbjo6bWFrZUFkanVzdGVkQ29udGVudCk6CisKIDIwMjItMDItMTcgIEFsYW4gQnVqdGFzICA8 emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtJRkNdW0ludGVncmF0aW9uXSBFbmFibGUgd3Jp dGluZy1tb2RlOiB2ZXJ0aWNhbC1scgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5oIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveC5oCmluZGV4 IDIxMTkyM2VjMzFjNzUzYTc4YTAxMjliZjI5MDBiNDFjMGU4OWIxNDMuLjk1NzdjZjA3MGFlOGFl NGE4NGM2YmIxZTkyOTNkNzEwYzk5NTM4ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3guaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94 LmgKQEAgLTgxLDYgKzgxLDcgQEAgcHVibGljOgogCiAgICAgSW5saW5lTGF5b3V0VW5pdCByb290 SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0KCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5saW5lQm94 QWxpZ25tZW50T2Zmc2V0OyB9CiAgICAgRm9udEJhc2VsaW5lIGJhc2VsaW5lVHlwZSgpIGNvbnN0 IHsgcmV0dXJuIG1fYmFzZWxpbmVUeXBlOyB9CisgICAgYm9vbCBpc0hvcml6b250YWwoKSBjb25z dCB7IHJldHVybiBtX3Jvb3RJbmxpbmVCb3gubGF5b3V0Qm94KCkuc3R5bGUoKS5pc0hvcml6b250 YWxXcml0aW5nTW9kZSgpOyB9CiAKICAgICBjb25zdCBJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCgp IGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3Q7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNw bGF5TGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZS5oCmluZGV4IGRiZTE5MjMwNjg3YTQ3YjNjNDQ0 MzEyNzRlYjQ4NDVlNGI2YTA0NzIuLjAwMjEzMzNjZmM2MDE2MjY0OWFlM2Y4OTAwZWY2MGExZTA5 YTE3M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlM aW5lLmgKQEAgLTQxLDcgKzQxLDcgQEAgcHVibGljOgogICAgICAgICBmbG9hdCB0b3AgeyAwIH07 CiAgICAgICAgIGZsb2F0IGJvdHRvbSB7IDAgfTsKICAgICB9OwotICAgIExpbmUoY29uc3QgRmxv YXRSZWN0JiBsaW5lQm94UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzY3JvbGxhYmxlT3ZlcmZsb3cs IEVuY2xvc2luZ1RvcEFuZEJvdHRvbSwgZmxvYXQgYWxpZ21lbnRCYXNlbGluZSwgRm9udEJhc2Vs aW5lIGJhc2VsaW5lVHlwZSwgZmxvYXQgY29udGVudExvZ2ljYWxPZmZzZXQsIGZsb2F0IGNvbnRl bnRMb2dpY2FsV2lkdGgpOworICAgIExpbmUoY29uc3QgRmxvYXRSZWN0JiBsaW5lQm94UmVjdCwg Y29uc3QgRmxvYXRSZWN0JiBzY3JvbGxhYmxlT3ZlcmZsb3csIEVuY2xvc2luZ1RvcEFuZEJvdHRv bSwgZmxvYXQgYWxpZ21lbnRCYXNlbGluZSwgRm9udEJhc2VsaW5lIGJhc2VsaW5lVHlwZSwgZmxv YXQgY29udGVudExvZ2ljYWxPZmZzZXQsIGZsb2F0IGNvbnRlbnRMb2dpY2FsV2lkdGgsIGJvb2wg aXNIb3Jpem9udGFsKTsKIAogICAgIGZsb2F0IGxlZnQoKSBjb25zdCB7IHJldHVybiBtX2xpbmVC b3hSZWN0LngoKTsgfQogICAgIGZsb2F0IHJpZ2h0KCkgY29uc3QgeyByZXR1cm4gbV9saW5lQm94 UmVjdC5tYXhYKCk7IH0KQEAgLTU4LDYgKzU4LDggQEAgcHVibGljOgogICAgIGZsb2F0IGJhc2Vs aW5lKCkgY29uc3QgeyByZXR1cm4gbV9hbGlnbWVudEJhc2VsaW5lOyB9CiAgICAgRm9udEJhc2Vs aW5lIGJhc2VsaW5lVHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fYmFzZWxpbmVUeXBlOyB9CiAKKyAg ICBib29sIGlzSG9yaXpvbnRhbCgpIGNvbnN0IHsgcmV0dXJuIG1faXNIb3Jpem9udGFsOyB9CisK ICAgICBmbG9hdCBjb250ZW50TG9naWNhbE9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVu dExvZ2ljYWxPZmZzZXQ7IH0KICAgICBmbG9hdCBjb250ZW50TG9naWNhbFdpZHRoKCkgY29uc3Qg eyByZXR1cm4gbV9jb250ZW50TG9naWNhbFdpZHRoOyB9CiAKQEAgLTc1LDkgKzc3LDEwIEBAIHBy aXZhdGU6CiAgICAgZmxvYXQgbV9jb250ZW50TG9naWNhbE9mZnNldCB7IDAgfTsKICAgICBmbG9h dCBtX2NvbnRlbnRMb2dpY2FsV2lkdGggeyAwIH07CiAgICAgRm9udEJhc2VsaW5lIG1fYmFzZWxp bmVUeXBlIHsgQWxwaGFiZXRpY0Jhc2VsaW5lIH07CisgICAgYm9vbCBtX2lzSG9yaXpvbnRhbCB7 IHRydWUgfTsKIH07CiAKLWlubGluZSBMaW5lOjpMaW5lKGNvbnN0IEZsb2F0UmVjdCYgbGluZUJv eFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgc2Nyb2xsYWJsZU92ZXJmbG93LCBFbmNsb3NpbmdUb3BB bmRCb3R0b20gZW5jbG9zaW5nVG9wQW5kQm90dG9tLCBmbG9hdCBhbGlnbWVudEJhc2VsaW5lLCBG b250QmFzZWxpbmUgYmFzZWxpbmVUeXBlLCBmbG9hdCBjb250ZW50TG9naWNhbE9mZnNldCwgZmxv YXQgY29udGVudExvZ2ljYWxXaWR0aCkKK2lubGluZSBMaW5lOjpMaW5lKGNvbnN0IEZsb2F0UmVj dCYgbGluZUJveFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgc2Nyb2xsYWJsZU92ZXJmbG93LCBFbmNs b3NpbmdUb3BBbmRCb3R0b20gZW5jbG9zaW5nVG9wQW5kQm90dG9tLCBmbG9hdCBhbGlnbWVudEJh c2VsaW5lLCBGb250QmFzZWxpbmUgYmFzZWxpbmVUeXBlLCBmbG9hdCBjb250ZW50TG9naWNhbE9m ZnNldCwgZmxvYXQgY29udGVudExvZ2ljYWxXaWR0aCwgYm9vbCBpc0hvcml6b250YWwpCiAgICAg OiBtX2xpbmVCb3hSZWN0KGxpbmVCb3hSZWN0KQogICAgICwgbV9zY3JvbGxhYmxlT3ZlcmZsb3co c2Nyb2xsYWJsZU92ZXJmbG93KQogICAgICwgbV9lbmNsb3NpbmdUb3BBbmRCb3R0b20oZW5jbG9z aW5nVG9wQW5kQm90dG9tKQpAQCAtODUsNiArODgsNyBAQCBpbmxpbmUgTGluZTo6TGluZShjb25z dCBGbG9hdFJlY3QmIGxpbmVCb3hSZWN0LCBjb25zdCBGbG9hdFJlY3QmIHNjcm9sbGFibGVPdmVy ZgogICAgICwgbV9jb250ZW50TG9naWNhbE9mZnNldChjb250ZW50TG9naWNhbE9mZnNldCkKICAg ICAsIG1fY29udGVudExvZ2ljYWxXaWR0aChjb250ZW50TG9naWNhbFdpZHRoKQogICAgICwgbV9i YXNlbGluZVR5cGUoYmFzZWxpbmVUeXBlKQorICAgICwgbV9pc0hvcml6b250YWwoaXNIb3Jpem9u dGFsKQogewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lu bGluZURpc3BsYXlMaW5lQnVpbGRlci5jcHAKaW5kZXggZGUwNTAzZDNiNWI0ZmM0OWMyYTQ0YTBk YTJkNWFmYmE0YWY4NzY5Mi4uZWM1YWZlZjcxZTZhN2FiMjlmNWI2NTMxYWI4MTQ1NDFkMmQ5ZDMz OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlz cGxheUxpbmVCdWlsZGVyLmNwcApAQCAtMTAzLDYgKzEwMyw3IEBAIElubGluZURpc3BsYXk6Okxp bmUgSW5saW5lRGlzcGxheUxpbmVCdWlsZGVyOjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGlu ZUNvbnRlCiAgICAgICAgICwgbGluZUJveC5iYXNlbGluZVR5cGUoKQogICAgICAgICAsIGNvbnRl bnRWaXN1YWxMZWZ0CiAgICAgICAgICwgcm9vdElubGluZUJveC5sb2dpY2FsV2lkdGgoKQorICAg ICAgICAsIGxpbmVCb3guaXNIb3Jpem9udGFsKCkKICAgICB9OwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lTW9kZXJu UGF0aC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9y TGluZU1vZGVyblBhdGguaAppbmRleCBmYjY5YjA4ZDU5MDEyNjVlN2NlNWNjMWQyMDcwOGI2ODUx MDAyOTJlLi5hOGFkNGM0NGVhYWYwMTI4NDAxMWEzOTRjN2RkYWM1MTk0YzVmMTBkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5l TW9kZXJuUGF0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9Jbmxp bmVJdGVyYXRvckxpbmVNb2Rlcm5QYXRoLmgKQEAgLTY2LDcgKzY2LDcgQEAgcHVibGljOgogICAg IGZsb2F0IGNvbnRlbnRMb2dpY2FsUmlnaHQoKSBjb25zdCB7IHJldHVybiBjb250ZW50TG9naWNh bExlZnQoKSArIGxpbmUoKS5jb250ZW50TG9naWNhbFdpZHRoKCk7IH0KICAgICBmbG9hdCB5KCkg Y29uc3QgeyByZXR1cm4gbGluZUJveFRvcCgpOyB9CiAgICAgZmxvYXQgbG9naWNhbEhlaWdodCgp IGNvbnN0IHsgcmV0dXJuIGxpbmVCb3hCb3R0b20oKSAtIGxpbmVCb3hUb3AoKTsgfQotICAgIGJv b2wgaXNIb3Jpem9udGFsKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQorICAgIGJvb2wgaXNIb3Jp em9udGFsKCkgY29uc3QgeyByZXR1cm4gbGluZSgpLmlzSG9yaXpvbnRhbCgpOyB9CiAgICAgRm9u dEJhc2VsaW5lIGJhc2VsaW5lVHlwZSgpIGNvbnN0IHsgcmV0dXJuIGxpbmUoKS5iYXNlbGluZVR5 cGUoKTsgfQogCiAgICAgY29uc3QgUmVuZGVyQmxvY2tGbG93JiBjb250YWluaW5nQmxvY2soKSBj b25zdCB7IHJldHVybiBtX2lubGluZUNvbnRlbnQtPmNvbnRhaW5pbmdCbG9jaygpOyB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRp b25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKaW5kZXggNDEy Yzc1ZjViNGNkNWMwZWFjMDI0MTQ3NWRiMjg5MjE0OGUzZTQ0MC4uZDc3NzNjZGY5Mzc4MjdmNzk1 OGNlMTgyNWY3N2I5YzUyMDY1NDQyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklu bGluZUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtMTM3LDcgKzEzNyw3IEBAIHZvaWQgSW5saW5lQ29u dGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlMaW5lcyhMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdT dGF0ZSYgaW5sCiAgICAgICAgIH0KIAogICAgICAgICBhdXRvIGJveENvdW50ID0gYm94SW5kZXgg LSBmaXJzdEJveEluZGV4OwotICAgICAgICBpbmxpbmVDb250ZW50LmxpbmVzLmFwcGVuZCh7IGZp cnN0Qm94SW5kZXgsIGJveENvdW50LCBGbG9hdFJlY3QgeyBsaW5lLmxpbmVCb3hSZWN0KCkgfSwg bGluZS5lbmNsb3NpbmdUb3BBbmRCb3R0b20oKS50b3AsIGxpbmUuZW5jbG9zaW5nVG9wQW5kQm90 dG9tKCkuYm90dG9tLCBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0LCBsaW5lSW5rT3ZlcmZsb3dSZWN0 LCBsaW5lLmJhc2VsaW5lKCksIGxpbmUuYmFzZWxpbmVUeXBlKCksIGxpbmUuY29udGVudExvZ2lj YWxPZmZzZXQoKSwgbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkgfSk7CisgICAgICAgIGlubGlu ZUNvbnRlbnQubGluZXMuYXBwZW5kKHsgZmlyc3RCb3hJbmRleCwgYm94Q291bnQsIEZsb2F0UmVj dCB7IGxpbmUubGluZUJveFJlY3QoKSB9LCBsaW5lLmVuY2xvc2luZ1RvcEFuZEJvdHRvbSgpLnRv cCwgbGluZS5lbmNsb3NpbmdUb3BBbmRCb3R0b20oKS5ib3R0b20sIHNjcm9sbGFibGVPdmVyZmxv d1JlY3QsIGxpbmVJbmtPdmVyZmxvd1JlY3QsIGxpbmUuYmFzZWxpbmUoKSwgbGluZS5iYXNlbGlu ZVR5cGUoKSwgbGluZS5jb250ZW50TG9naWNhbE9mZnNldCgpLCBsaW5lLmNvbnRlbnRMb2dpY2Fs V2lkdGgoKSwgbGluZS5pc0hvcml6b250YWwoKSB9KTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxp bmUuaAppbmRleCBmM2MxOGRmZWYyMzJmZmNhMmRiYzViZTZjYmRhNGY4YzU0YWE3YWZhLi4xYzgx YzRhZDQyYzI3MDVjNzg3NTZhMjQzOTMzMDIyZTJhZjRlMWZmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5o CkBAIC0zNiw3ICszNiw3IEBAIG5hbWVzcGFjZSBMYXlvdXRJbnRlZ3JhdGlvbiB7CiBjbGFzcyBM aW5lIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBMaW5lKHNp emVfdCBmaXJzdEJveEluZGV4LCBzaXplX3QgYm94Q291bnQsIGNvbnN0IEZsb2F0UmVjdCYgbGlu ZUJveFJlY3QsIGZsb2F0IGVuY2xvc2luZ0NvbnRlbnRUb3AsIGZsb2F0IGVuY2xvc2luZ0NvbnRl bnRCb3R0b20sIGNvbnN0IEZsb2F0UmVjdCYgc2Nyb2xsYWJsZU92ZXJmbG93LCBjb25zdCBGbG9h dFJlY3QmIGlua092ZXJmbG93LCBmbG9hdCBiYXNlbGluZSwgRm9udEJhc2VsaW5lIGJhc2VsaW5l VHlwZSwgZmxvYXQgY29udGVudExvZ2ljYWxPZmZzZXQsIGZsb2F0IGNvbnRlbnRMb2dpY2FsV2lk dGgpCisgICAgTGluZShzaXplX3QgZmlyc3RCb3hJbmRleCwgc2l6ZV90IGJveENvdW50LCBjb25z dCBGbG9hdFJlY3QmIGxpbmVCb3hSZWN0LCBmbG9hdCBlbmNsb3NpbmdDb250ZW50VG9wLCBmbG9h dCBlbmNsb3NpbmdDb250ZW50Qm90dG9tLCBjb25zdCBGbG9hdFJlY3QmIHNjcm9sbGFibGVPdmVy ZmxvdywgY29uc3QgRmxvYXRSZWN0JiBpbmtPdmVyZmxvdywgZmxvYXQgYmFzZWxpbmUsIEZvbnRC YXNlbGluZSBiYXNlbGluZVR5cGUsIGZsb2F0IGNvbnRlbnRMb2dpY2FsT2Zmc2V0LCBmbG9hdCBj b250ZW50TG9naWNhbFdpZHRoLCBib29sIGlzSG9yaXpvbnRhbCkKICAgICAgICAgOiBtX2ZpcnN0 Qm94SW5kZXgoZmlyc3RCb3hJbmRleCkKICAgICAgICAgLCBtX2JveENvdW50KGJveENvdW50KQog ICAgICAgICAsIG1fbGluZUJveFJlY3QobGluZUJveFJlY3QpCkBAIC00OCw2ICs0OCw3IEBAIHB1 YmxpYzoKICAgICAgICAgLCBtX2NvbnRlbnRMb2dpY2FsT2Zmc2V0KGNvbnRlbnRMb2dpY2FsT2Zm c2V0KQogICAgICAgICAsIG1fY29udGVudExvZ2ljYWxXaWR0aChjb250ZW50TG9naWNhbFdpZHRo KQogICAgICAgICAsIG1fYmFzZWxpbmVUeXBlKGJhc2VsaW5lVHlwZSkKKyAgICAgICAgLCBtX2lz SG9yaXpvbnRhbChpc0hvcml6b250YWwpCiAgICAgewogICAgIH0KIApAQCAtNzAsNiArNzEsOCBA QCBwdWJsaWM6CiAgICAgZmxvYXQgYmFzZWxpbmUoKSBjb25zdCB7IHJldHVybiBtX2Jhc2VsaW5l OyB9CiAgICAgRm9udEJhc2VsaW5lIGJhc2VsaW5lVHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fYmFz ZWxpbmVUeXBlOyB9CiAKKyAgICBib29sIGlzSG9yaXpvbnRhbCgpIGNvbnN0IHsgcmV0dXJuIG1f aXNIb3Jpem9udGFsOyB9CisKICAgICBmbG9hdCBjb250ZW50TG9naWNhbE9mZnNldCgpIGNvbnN0 IHsgcmV0dXJuIG1fY29udGVudExvZ2ljYWxPZmZzZXQ7IH0KICAgICBmbG9hdCBjb250ZW50TG9n aWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TG9naWNhbFdpZHRoOyB9CiAKQEAg LTg4LDcgKzkxLDggQEAgcHJpdmF0ZToKICAgICBmbG9hdCBtX2Jhc2VsaW5lIHsgMCB9OwogICAg IGZsb2F0IG1fY29udGVudExvZ2ljYWxPZmZzZXQgeyAwIH07CiAgICAgZmxvYXQgbV9jb250ZW50 TG9naWNhbFdpZHRoIHsgMCB9OwotICAgIEZvbnRCYXNlbGluZSBtX2Jhc2VsaW5lVHlwZSB7IEFs cGhhYmV0aWNCYXNlbGluZSB9OyAKKyAgICBGb250QmFzZWxpbmUgbV9iYXNlbGluZVR5cGUgeyBB bHBoYWJldGljQmFzZWxpbmUgfTsKKyAgICBib29sIG1faXNIb3Jpem9udGFsIHsgdHJ1ZSB9Owog fTsKIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xh eW91dEludGVncmF0aW9uUGFnaW5hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25QYWdpbmF0aW9uLmNwcAppbmRleCBjNTQwYTEyZTkw ZjA2NDEwZGQ2ODFmNWM0NmY4OGNjYjE1ODFkZWUyLi42NDA1ZjA3MTUwOGQxMjdmZGVlMDkxMTc0 MjA3MmVjZDBmMWQwY2I4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25QYWdpbmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25QYWdpbmF0aW9uLmNwcApAQCAt MTM3LDcgKzEzNyw4IEBAIHN0YXRpYyBSZWY8SW5saW5lQ29udGVudD4gbWFrZUFkanVzdGVkQ29u dGVudChjb25zdCBJbmxpbmVDb250ZW50JiBpbmxpbmVDb250ZW50CiAgICAgICAgICAgICBsaW5l LmJhc2VsaW5lKCksCiAgICAgICAgICAgICBsaW5lLmJhc2VsaW5lVHlwZSgpLAogICAgICAgICAg ICAgbGluZS5jb250ZW50TG9naWNhbE9mZnNldCgpLAotICAgICAgICAgICAgbGluZS5jb250ZW50 TG9naWNhbFdpZHRoKCkKKyAgICAgICAgICAgIGxpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpLAor ICAgICAgICAgICAgbGluZS5pc0hvcml6b250YWwoKQogICAgICAgICB9OwogICAgIH07CiAK