238085 2022-03-18 11:18:31 -0700 [IFC][Integration] Rename InlineIterator::Line:top/bottom to contentLogicalTop/contentLogicalBottom 2022-03-19 12:19:19 -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 1852773 0 zalan 2022-03-18 11:18:31 -0700 ssia 1852778 1 455116 zalan 2022-03-18 11:27:56 -0700 Created attachment 455116 [fast-cq]Patch 1852979 2 ews-feeder 2022-03-19 12:18:17 -0700 Committed r291530 (248636@main): <https://commits.webkit.org/248636@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455116. 1852980 3 webkit-bug-importer 2022-03-19 12:19:19 -0700 <rdar://problem/90527306> 455116 2022-03-18 11:27:56 -0700 2022-03-19 12:18:18 -0700 [fast-cq]Patch bug-238085-20220318112755.patch text/plain 14096 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmY4NzMwMmU4N2JjODE3 OGE1YjhmYWI1YjU3NzU4NDc0YWFmMTcyYS4uNDIwODBjYjNlMWJiODM1YmZlMzdiZGU5MGMwMjc4 NjE1MjI3NGM3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIyLTAzLTE4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g UmVuYW1lIElubGluZUl0ZXJhdG9yOjpMaW5lOnRvcC9ib3R0b20gdG8gY29udGVudExvZ2ljYWxU b3AvY29udGVudExvZ2ljYWxCb3R0b20KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzODA4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZS5o OgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmU6OmNvbnRlbnRMb2dpY2Fs VG9wIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpMaW5lOjpjb250 ZW50TG9naWNhbEJvdHRvbSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRv cjo6TGluZTo6dG9wIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0 ZXJhdG9yOjpMaW5lOjpib3R0b20gY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9p bnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVMZWdhY3lQYXRoLmg6CisgICAgICAgIChXZWJD b3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUl0ZXJhdG9yTGVnYWN5UGF0aDo6Y29udGVudExvZ2lj YWxUb3AgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmVJdGVy YXRvckxlZ2FjeVBhdGg6OmNvbnRlbnRMb2dpY2FsQm90dG9tIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OklubGluZUl0ZXJhdG9yOjpMaW5lSXRlcmF0b3JMZWdhY3lQYXRoOjp0b3AgY29uc3Qp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmVJdGVyYXRv ckxlZ2FjeVBhdGg6OmJvdHRvbSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lu dGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZU1vZGVyblBhdGguaDoKKyAgICAgICAgKFdlYkNv cmU6OklubGluZUl0ZXJhdG9yOjpMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoOjpjb250ZW50TG9naWNh bFRvcCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUl0ZXJh dG9yTW9kZXJuUGF0aDo6Y29udGVudExvZ2ljYWxCb3R0b20gY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmVJdGVyYXRvck1vZGVyblBhdGg6OmVuY2xvc2luZ1Rv cEFkanVzdGVkRm9yUHJlY2VkaW5nTGluZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxp bmVJdGVyYXRvcjo6TGluZUl0ZXJhdG9yTW9kZXJuUGF0aDo6ZW5jbG9zaW5nQm90dG9tQWRqdXN0 ZWRGb3JGb2xsb3dpbmdMaW5lIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJh dG9yOjpMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoOjp0b3AgY29uc3QpOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmVJdGVyYXRvck1vZGVyblBhdGg6OmJvdHRv bSBjb25zdCk6IERlbGV0ZWQuCisKIDIwMjItMDMtMTggIEFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtJRkNdW0ludGVncmF0aW9uXSBJbmxpbmVJdGVyYXRvcjo6TGlu ZTo6ZW5jbG9zaW5nQm90dG9tIHNob3VsZCByZWFkIGVuY2xvc2luZ0JvdHRvbUFkanVzdGVkRm9y Rm9sbG93aW5nTGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0lubGluZUl0ZXJhdG9yTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vSW5saW5lSXRlcmF0b3JMaW5lLmNwcAppbmRleCAxYzJjOTVhNDlkMmViYmQzZTQ3ZjAx NzcwYThlYjg3M2Q0ZjYxNGVhLi5kMmE1NGNhYzAwODBmN2EwOWM0ZjU2ODBhZWVlNjFmODRiN2Y2 OGRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5l SXRlcmF0b3JMaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24v SW5saW5lSXRlcmF0b3JMaW5lLmNwcApAQCAtMTU5LDcgKzE1OSw3IEBAIExlYWZCb3hJdGVyYXRv ciBMaW5lOjpjbG9zZXN0Qm94Rm9yTG9naWNhbExlZnRQb3NpdGlvbihpbnQgbGVmdFBvc2l0aW9u LCBib29sIGVkCiAKIGludCBMaW5lOjpibG9ja0RpcmVjdGlvblBvaW50SW5MaW5lKCkgY29uc3QK IHsKLSAgICByZXR1cm4gIWNvbnRhaW5pbmdCbG9jaygpLnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tz V3JpdGluZ01vZGUoKSA/IHN0ZDo6bWF4KHRvcCgpLCBlbmNsb3NpbmdUb3BGb3JIaXRUZXN0aW5n KCkpIDogc3RkOjptaW4oYm90dG9tKCksIGVuY2xvc2luZ0JvdHRvbUFkanVzdGVkRm9yRm9sbG93 aW5nTGluZSgpKTsKKyAgICByZXR1cm4gIWNvbnRhaW5pbmdCbG9jaygpLnN0eWxlKCkuaXNGbGlw cGVkQmxvY2tzV3JpdGluZ01vZGUoKSA/IHN0ZDo6bWF4KGNvbnRlbnRMb2dpY2FsVG9wKCksIGVu Y2xvc2luZ1RvcEZvckhpdFRlc3RpbmcoKSkgOiBzdGQ6Om1pbihjb250ZW50TG9naWNhbEJvdHRv bSgpLCBlbmNsb3NpbmdCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xpbmUoKSk7CiB9CiAKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVy YXRvckxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVy YXRvckxpbmUuaAppbmRleCA4MjZlNmI4Y2U4OTkzNGE1N2IwZDA0OTcxYmRiOGY0Y2U3NDlmMDg1 Li45MDUwMTljYjE1OGEyNmQ4MWU4MDFkNDgzOTBkMDBkMjBjOWI4NmRjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lLmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZS5o CkBAIC01NCwxMyArNTQsMTMgQEAgcHVibGljOgogCiAgICAgTGluZShQYXRoVmFyaWFudCYmKTsK IAotICAgIExheW91dFVuaXQgdG9wKCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBib3R0b20oKSBj b25zdDsKLQogICAgIExheW91dFVuaXQgbGluZUJveFRvcCgpIGNvbnN0OwogICAgIExheW91dFVu aXQgbGluZUJveEJvdHRvbSgpIGNvbnN0OwogICAgIExheW91dFVuaXQgbGluZUJveEhlaWdodCgp IGNvbnN0IHsgcmV0dXJuIGxpbmVCb3hCb3R0b20oKSAtIGxpbmVCb3hUb3AoKTsgfQogCisgICAg Ly8gRklYTUU6IE1ha2Ugc3VyZSB3ZSB1c2UgdGhlIHNhbWUgdHlwZSBmb3IgY29udGVudCBnZW9t ZXRyeS4KKyAgICBMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsVG9wKCkgY29uc3Q7CisgICAgTGF5 b3V0VW5pdCBjb250ZW50TG9naWNhbEJvdHRvbSgpIGNvbnN0OwogICAgIGZsb2F0IGNvbnRlbnRM b2dpY2FsTGVmdCgpIGNvbnN0OwogICAgIGZsb2F0IGNvbnRlbnRMb2dpY2FsUmlnaHQoKSBjb25z dDsKICAgICBmbG9hdCBjb250ZW50TG9naWNhbFdpZHRoKCkgY29uc3Q7CkBAIC0xMzksMTcgKzEz OSwxNyBAQCBpbmxpbmUgTGluZTo6TGluZShQYXRoVmFyaWFudCYmIHBhdGgpCiB7CiB9CiAKLWlu bGluZSBMYXlvdXRVbml0IExpbmU6OnRvcCgpIGNvbnN0CitpbmxpbmUgTGF5b3V0VW5pdCBMaW5l Ojpjb250ZW50TG9naWNhbFRvcCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIFdURjo6c3dpdGNoT24o bV9wYXRoVmFyaWFudCwgW10oY29uc3QgYXV0byYgcGF0aCkgewotICAgICAgICByZXR1cm4gcGF0 aC50b3AoKTsKKyAgICAgICAgcmV0dXJuIHBhdGguY29udGVudExvZ2ljYWxUb3AoKTsKICAgICB9 KTsKIH0KIAotaW5saW5lIExheW91dFVuaXQgTGluZTo6Ym90dG9tKCkgY29uc3QKK2lubGluZSBM YXlvdXRVbml0IExpbmU6OmNvbnRlbnRMb2dpY2FsQm90dG9tKCkgY29uc3QKIHsKICAgICByZXR1 cm4gV1RGOjpzd2l0Y2hPbihtX3BhdGhWYXJpYW50LCBbXShjb25zdCBhdXRvJiBwYXRoKSB7Ci0g ICAgICAgIHJldHVybiBwYXRoLmJvdHRvbSgpOworICAgICAgICByZXR1cm4gcGF0aC5jb250ZW50 TG9naWNhbEJvdHRvbSgpOwogICAgIH0pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lTGVnYWN5UGF0aC5oIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZUxlZ2FjeVBh dGguaAppbmRleCA0MzAzN2FjY2I2YTk4MDVmMTU3Y2Q1Mjc4NTBiNTdlZjAxNWMzYWYwLi44N2Ux ODdhYmY0YTIxNmE5NjZiNGMyYTFiNzFmNjE0YTBhNDM5ZmRiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lTGVnYWN5UGF0aC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxp bmVMZWdhY3lQYXRoLmgKQEAgLTQzLDggKzQzLDggQEAgcHVibGljOgogICAgIExpbmVJdGVyYXRv ckxlZ2FjeVBhdGgmIG9wZXJhdG9yPShjb25zdCBMaW5lSXRlcmF0b3JMZWdhY3lQYXRoJikgPSBk ZWZhdWx0OwogICAgIExpbmVJdGVyYXRvckxlZ2FjeVBhdGgmIG9wZXJhdG9yPShMaW5lSXRlcmF0 b3JMZWdhY3lQYXRoJiYpID0gZGVmYXVsdDsKIAotICAgIExheW91dFVuaXQgdG9wKCkgY29uc3Qg eyByZXR1cm4gbV9yb290SW5saW5lQm94LT5saW5lVG9wKCk7IH0KLSAgICBMYXlvdXRVbml0IGJv dHRvbSgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+bGluZUJvdHRvbSgpOyB9Cisg ICAgTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFRvcCgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElu bGluZUJveC0+bGluZVRvcCgpOyB9CisgICAgTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbEJvdHRv bSgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+bGluZUJvdHRvbSgpOyB9CiAgICAg TGF5b3V0VW5pdCBlbmNsb3NpbmdUb3BBZGp1c3RlZEZvclByZWNlZGluZ0xpbmUoKSBjb25zdCB7 IHJldHVybiBtX3Jvb3RJbmxpbmVCb3gtPnNlbGVjdGlvblRvcCgpOyB9CiAgICAgTGF5b3V0VW5p dCBlbmNsb3NpbmdUb3BGb3JIaXRUZXN0aW5nKCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5saW5l Qm94LT5zZWxlY3Rpb25Ub3AoTGVnYWN5Um9vdElubGluZUJveDo6Rm9ySGl0VGVzdGluZzo6WWVz KTsgfQogICAgIExheW91dFVuaXQgZW5jbG9zaW5nQm90dG9tQWRqdXN0ZWRGb3JGb2xsb3dpbmdM aW5lKCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5saW5lQm94LT5zZWxlY3Rpb25Cb3R0b20oKTsg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0 ZXJhdG9yTGluZU1vZGVyblBhdGguaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlv bi9JbmxpbmVJdGVyYXRvckxpbmVNb2Rlcm5QYXRoLmgKaW5kZXggMzhkOGM0YmUyZTI0N2Q0ZmQy OTZiNDc4MjhkZWYzNmNhMjkwZDRjNy4uZTU1MTczMTllZDliNWNjYTRlZTYxYjA1NDI5MDZhYzUw ZWYzNjFiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lu bGluZUl0ZXJhdG9yTGluZU1vZGVyblBhdGguaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lTW9kZXJuUGF0aC5oCkBAIC00OSwxOCArNDks MTggQEAgcHVibGljOgogICAgIExpbmVJdGVyYXRvck1vZGVyblBhdGgmIG9wZXJhdG9yPShjb25z dCBMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoJikgPSBkZWZhdWx0OwogICAgIExpbmVJdGVyYXRvck1v ZGVyblBhdGgmIG9wZXJhdG9yPShMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoJiYpID0gZGVmYXVsdDsK IAotICAgIExheW91dFVuaXQgdG9wKCkgY29uc3QgeyByZXR1cm4gTGF5b3V0VW5pdDo6ZnJvbUZs b2F0Um91bmQobGluZSgpLmVuY2xvc2luZ0NvbnRlbnRUb3AoKSk7IH0KLSAgICBMYXlvdXRVbml0 IGJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIExheW91dFVuaXQ6OmZyb21GbG9hdFJvdW5kKGxpbmUo KS5lbmNsb3NpbmdDb250ZW50Qm90dG9tKCkpOyB9CisgICAgTGF5b3V0VW5pdCBjb250ZW50TG9n aWNhbFRvcCgpIGNvbnN0IHsgcmV0dXJuIExheW91dFVuaXQ6OmZyb21GbG9hdFJvdW5kKGxpbmUo KS5lbmNsb3NpbmdDb250ZW50VG9wKCkpOyB9CisgICAgTGF5b3V0VW5pdCBjb250ZW50TG9naWNh bEJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIExheW91dFVuaXQ6OmZyb21GbG9hdFJvdW5kKGxpbmUo KS5lbmNsb3NpbmdDb250ZW50Qm90dG9tKCkpOyB9CiAgICAgTGF5b3V0VW5pdCBsaW5lQm94VG9w KCkgY29uc3QgeyByZXR1cm4gTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Um91bmQobGluZSgpLmxpbmVC b3hUb3AoKSk7IH0KICAgICBMYXlvdXRVbml0IGxpbmVCb3hCb3R0b20oKSBjb25zdCB7IHJldHVy biBMYXlvdXRVbml0Ojpmcm9tRmxvYXRSb3VuZChsaW5lKCkubGluZUJveEJvdHRvbSgpKTsgfQog Ci0gICAgTGF5b3V0VW5pdCBlbmNsb3NpbmdUb3BBZGp1c3RlZEZvclByZWNlZGluZ0xpbmUoKSBj b25zdCB7IHJldHVybiAhbV9saW5lSW5kZXggPyB0b3AoKSA6IExpbmVJdGVyYXRvck1vZGVyblBh dGgoKm1faW5saW5lQ29udGVudCwgbV9saW5lSW5kZXggLSAxKS5lbmNsb3NpbmdCb3R0b21BZGp1 c3RlZEZvckZvbGxvd2luZ0xpbmUoKTsgfQorICAgIExheW91dFVuaXQgZW5jbG9zaW5nVG9wQWRq dXN0ZWRGb3JQcmVjZWRpbmdMaW5lKCkgY29uc3QgeyByZXR1cm4gIW1fbGluZUluZGV4ID8gY29u dGVudExvZ2ljYWxUb3AoKSA6IExpbmVJdGVyYXRvck1vZGVyblBhdGgoKm1faW5saW5lQ29udGVu dCwgbV9saW5lSW5kZXggLSAxKS5lbmNsb3NpbmdCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xp bmUoKTsgfQogICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhlIGNvbnRhaW5pbmdCbG9jaygpLmJvcmRl ckFuZFBhZGRpbmdCZWZvcmUoKSBvZmZzZXQgYWZ0ZXIgcmV0aXJpbmcgbGVnYWN5IGxpbmUgbGF5 b3V0LiBJdCBhbHNvIHJlcXVpcmVzIGNoYW5nZXMgaW4gUmVuZGVyVGV4dDo6cG9zaXRpb25Gb3JQ b2ludCB0byBmaW5kIHRoZSBmaXJzdCBsaW5lIHdpdGggb2Zmc2V0LgogICAgIC8vIC0gdGhlICJi ZWZvcmUiIHZhbHVlIGlzIGFscmVhZHkgZmFjdG9yZWQgaW4gdG8gdGhlIGxpbmUgb2Zmc2V0CiAg ICAgLy8gLSB0aGlzIGxvZ2ljIG5lZ2F0ZXMgdGhlIGZpcnN0IGxpbmUncyBuYXR1cmFsIG9mZnNl dCAoZS5nLiBibG9jayBoYXMgbm8gYm9yZGVyL3BhZGRpbmcgYnV0IHRoZSBmaXJzdCBsaW5lIGhh cyBhIGNvbXB1dGVkIG9mZnNldCkuCiAgICAgTGF5b3V0VW5pdCBlbmNsb3NpbmdUb3BGb3JIaXRU ZXN0aW5nKCkgY29uc3QgeyByZXR1cm4gIW1fbGluZUluZGV4ID8gY29udGFpbmluZ0Jsb2NrKCku Ym9yZGVyQW5kUGFkZGluZ0JlZm9yZSgpIDogZW5jbG9zaW5nVG9wQWRqdXN0ZWRGb3JQcmVjZWRp bmdMaW5lKCk7IH07CiAgICAgLy8gRklYTUU6IEltcGxlbWVudC4KLSAgICBMYXlvdXRVbml0IGVu Y2xvc2luZ0JvdHRvbUFkanVzdGVkRm9yRm9sbG93aW5nTGluZSgpIGNvbnN0IHsgcmV0dXJuIGJv dHRvbSgpOyB9CisgICAgTGF5b3V0VW5pdCBlbmNsb3NpbmdCb3R0b21BZGp1c3RlZEZvckZvbGxv d2luZ0xpbmUoKSBjb25zdCB7IHJldHVybiBjb250ZW50TG9naWNhbEJvdHRvbSgpOyB9CiAKICAg ICBmbG9hdCBjb250ZW50TG9naWNhbExlZnQoKSBjb25zdCB7IHJldHVybiBsaW5lKCkubGluZUJv eExlZnQoKSArIGxpbmUoKS5jb250ZW50TG9naWNhbE9mZnNldCgpOyB9CiAgICAgZmxvYXQgY29u dGVudExvZ2ljYWxSaWdodCgpIGNvbnN0IHsgcmV0dXJuIGNvbnRlbnRMb2dpY2FsTGVmdCgpICsg bGluZSgpLmNvbnRlbnRMb2dpY2FsV2lkdGgoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0NhcmV0UmVjdENvbXB1dGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9DYXJldFJlY3RDb21wdXRhdGlvbi5jcHAKaW5kZXggNmJiYjUxMmRiMWE0YWQxMjMz ZDAzZGZkNDE0MjgwMzQ2OWFiNTYzNy4uMjllYzkxNmRlYzdmYzc1ZjJlZWRkNGE0MThmYjRmYjYx NTZlMmY2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0NhcmV0UmVjdENv bXB1dGF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQ2FyZXRSZWN0Q29t cHV0YXRpb24uY3BwCkBAIC0yMjksOSArMjI5LDkgQEAgc3RhdGljIExheW91dFJlY3QgY29tcHV0 ZUNhcmV0UmVjdEZvckJveChjb25zdCBSZW5kZXJCb3gmIHJlbmRlcmVyLCBjb25zdCBJbmxpbmUK IAogICAgIGlmIChib3hBbmRPZmZzZXQuYm94KSB7CiAgICAgICAgIGF1dG8gbGluZSA9IGJveEFu ZE9mZnNldC5ib3gtPmxpbmUoKTsKLSAgICAgICAgTGF5b3V0VW5pdCB0b3AgPSBsaW5lLT50b3Ao KTsKKyAgICAgICAgYXV0byB0b3AgPSBsaW5lLT5jb250ZW50TG9naWNhbFRvcCgpOwogICAgICAg ICByZWN0LnNldFkodG9wKTsKLSAgICAgICAgcmVjdC5zZXRIZWlnaHQobGluZS0+Ym90dG9tKCkg LSB0b3ApOworICAgICAgICByZWN0LnNldEhlaWdodChsaW5lLT5jb250ZW50TG9naWNhbEJvdHRv bSgpIC0gdG9wKTsKICAgICB9CiAKICAgICAvLyBJZiBoZWlnaHQgb2YgYm94IGlzIHNtYWxsZXIg dGhhbiBmb250IGhlaWdodCwgdXNlIHRoZSBsYXR0ZXIgb25lLApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRleCA1OWYyNmFmYjdmOGJkN2JjOWEyN2Yz NmEzMjhmNTMyMWMwNzZhNmI4Li45ZGZhOWZkNzgxMjk0Yzc5MTg0OWZmYmRjMGUzZDM2NDlhYzAw NzhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApA QCAtMzQyMSw3ICszNDIxLDcgQEAgVmlzaWJsZVBvc2l0aW9uIFJlbmRlckJsb2NrRmxvdzo6cG9z aXRpb25Gb3JQb2ludFdpdGhJbmxpbmVDaGlsZHJlbihjb25zdCBMYXlvdXQKIAogICAgIGlmIChj bG9zZXN0Qm94KSB7CiAgICAgICAgIGlmIChtb3ZlQ2FyZXRUb0JvdW5kYXJ5KSB7Ci0gICAgICAg ICAgICBMYXlvdXRVbml0IGZpcnN0TGluZVdpdGhDaGlsZHJlblRvcCA9IHN0ZDo6bWluKGZpcnN0 TGluZVdpdGhDaGlsZHJlbi0+ZW5jbG9zaW5nVG9wRm9ySGl0VGVzdGluZygpLCBMYXlvdXRVbml0 KGZpcnN0TGluZVdpdGhDaGlsZHJlbi0+dG9wKCkpKTsKKyAgICAgICAgICAgIExheW91dFVuaXQg Zmlyc3RMaW5lV2l0aENoaWxkcmVuVG9wID0gc3RkOjptaW4oZmlyc3RMaW5lV2l0aENoaWxkcmVu LT5lbmNsb3NpbmdUb3BGb3JIaXRUZXN0aW5nKCksIExheW91dFVuaXQoZmlyc3RMaW5lV2l0aENo aWxkcmVuLT5jb250ZW50TG9naWNhbFRvcCgpKSk7CiAgICAgICAgICAgICBpZiAocG9pbnRJbkxv Z2ljYWxDb250ZW50cy55KCkgPCBmaXJzdExpbmVXaXRoQ2hpbGRyZW5Ub3AKICAgICAgICAgICAg ICAgICB8fCAoYmxvY2tzQXJlRmxpcHBlZCAmJiBwb2ludEluTG9naWNhbENvbnRlbnRzLnkoKSA9 PSBmaXJzdExpbmVXaXRoQ2hpbGRyZW5Ub3ApKSB7CiAgICAgICAgICAgICAgICAgYXV0byBib3gg PSBmaXJzdExpbmVXaXRoQ2hpbGRyZW4tPmZpcnN0TGVhZkJveCgpOwpAQCAtMzQ3NCw4ICszNDc0 LDggQEAgdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmFkZEZvY3VzUmluZ1JlY3RzRm9ySW5saW5lQ2hp bGRyZW4oVmVjdG9yPExheW91dFJlY3Q+JiByZWMKICAgICAgICAgYXV0byBsaW5lID0gYm94LT5s aW5lKCk7CiAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGlzIG1peGluZyBwaHlzaWNhbCBhbmQgbG9n aWNhbCBjb29yZGluYXRlcy4KICAgICAgICAgYXV0byB1bmZsaXBwZWRWaXN1YWxSZWN0ID0gYm94 LT52aXN1YWxSZWN0SWdub3JpbmdCbG9ja0RpcmVjdGlvbigpOwotICAgICAgICBhdXRvIHRvcCA9 IHN0ZDo6bWF4KGxpbmUtPnRvcCgpLCBMYXlvdXRVbml0IHsgdW5mbGlwcGVkVmlzdWFsUmVjdC55 KCkgfSk7Ci0gICAgICAgIGF1dG8gYm90dG9tID0gc3RkOjptaW4obGluZS0+Ym90dG9tKCksIExh eW91dFVuaXQgeyB1bmZsaXBwZWRWaXN1YWxSZWN0Lm1heFkoKSB9KTsKKyAgICAgICAgYXV0byB0 b3AgPSBzdGQ6Om1heChsaW5lLT5jb250ZW50TG9naWNhbFRvcCgpLCBMYXlvdXRVbml0IHsgdW5m bGlwcGVkVmlzdWFsUmVjdC55KCkgfSk7CisgICAgICAgIGF1dG8gYm90dG9tID0gc3RkOjptaW4o bGluZS0+Y29udGVudExvZ2ljYWxCb3R0b20oKSwgTGF5b3V0VW5pdCB7IHVuZmxpcHBlZFZpc3Vh bFJlY3QubWF4WSgpIH0pOwogICAgICAgICBhdXRvIHJlY3QgPSBMYXlvdXRSZWN0IHsgTGF5b3V0 VW5pdCB7IGFkZGl0aW9uYWxPZmZzZXQueCgpICsgdW5mbGlwcGVkVmlzdWFsUmVjdC54KCkgfQog ICAgICAgICAgICAgLCBhZGRpdGlvbmFsT2Zmc2V0LnkoKSArIHRvcAogICAgICAgICAgICAgLCBM YXlvdXRVbml0IHsgdW5mbGlwcGVkVmlzdWFsUmVjdC53aWR0aCgpIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAppbmRleCA5MDE4YjY1OWY0YmE0M2FmMjRhOWI5 ODM1MmY4ODM3NTJkZmNhMTg1Li4wNTNmODYzYzlhY2I2ZGQ1YjMzYTE3MTVlNDM0ZmY5MGU3ZTI2 MmY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCkBAIC0x NTkxLDcgKzE1OTEsNyBAQCBib29sIFJlbmRlckVsZW1lbnQ6OmdldExlYWRpbmdDb3JuZXIoRmxv YXRQb2ludCYgcG9pbnQsIGJvb2wmIGluc2lkZUZpeGVkKSBjb25zdAogICAgICAgICAgICAgaWYg KGlzPFJlbmRlclRleHQ+KCpvKSkgewogICAgICAgICAgICAgICAgIGF1dG8mIHRleHRSZW5kZXJl ciA9IGRvd25jYXN0PFJlbmRlclRleHQ+KCpvKTsKICAgICAgICAgICAgICAgICBpZiAoYXV0byBy dW4gPSBJbmxpbmVJdGVyYXRvcjo6Zmlyc3RUZXh0Qm94Rm9yKHRleHRSZW5kZXJlcikpCi0gICAg ICAgICAgICAgICAgICAgIHBvaW50Lm1vdmUodGV4dFJlbmRlcmVyLmxpbmVzQm91bmRpbmdCb3go KS54KCksIHJ1bi0+bGluZSgpLT50b3AoKSk7CisgICAgICAgICAgICAgICAgICAgIHBvaW50Lm1v dmUodGV4dFJlbmRlcmVyLmxpbmVzQm91bmRpbmdCb3goKS54KCksIHJ1bi0+bGluZSgpLT5jb250 ZW50TG9naWNhbFRvcCgpKTsKICAgICAgICAgICAgIH0gZWxzZSBpZiAoaXM8UmVuZGVyQm94Pigq bykpCiAgICAgICAgICAgICAgICAgcG9pbnQubW92ZUJ5KGRvd25jYXN0PFJlbmRlckJveD4oKm8p LmxvY2F0aW9uKCkpOwogICAgICAgICAgICAgcG9pbnQgPSBvLT5jb250YWluZXIoKS0+bG9jYWxU b0Fic29sdXRlKHBvaW50LCBVc2VUcmFuc2Zvcm1zLCAmaW5zaWRlRml4ZWQpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAppbmRleCA4Y2JjYjg1ODhlOGU5Y2Q0MzY1 M2VkZTQ2ZjczNjM2OTJhMWNiM2E0Li5jM2Y1NjdhNTljNmM2MzQ1MDE2YTQ4MWY2YzAzYjJiYmIw MzdiMmI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5l LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcApAQCAt OTc0LDggKzk3NCw4IEBAIHZvaWQgUmVuZGVySW5saW5lOjpwYWludE91dGxpbmUoUGFpbnRJbmZv JiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mCiAKICAgICBmb3IgKGF1dG8g Ym94ID0gSW5saW5lSXRlcmF0b3I6OmZpcnN0SW5saW5lQm94Rm9yKCp0aGlzKTsgYm94OyBib3gu dHJhdmVyc2VOZXh0SW5saW5lQm94KCkpIHsKICAgICAgICAgYXV0byBsaW5lID0gYm94LT5saW5l KCk7Ci0gICAgICAgIExheW91dFVuaXQgdG9wID0gc3RkOjptYXgobGluZS0+dG9wKCksIExheW91 dFVuaXQoYm94LT5sb2dpY2FsVG9wKCkpKTsKLSAgICAgICAgTGF5b3V0VW5pdCBib3R0b20gPSBz dGQ6Om1pbihsaW5lLT5ib3R0b20oKSwgTGF5b3V0VW5pdChib3gtPmxvZ2ljYWxCb3R0b20oKSkp OworICAgICAgICBhdXRvIHRvcCA9IHN0ZDo6bWF4KGxpbmUtPmNvbnRlbnRMb2dpY2FsVG9wKCks IExheW91dFVuaXQoYm94LT5sb2dpY2FsVG9wKCkpKTsKKyAgICAgICAgYXV0byBib3R0b20gPSBz dGQ6Om1pbihsaW5lLT5jb250ZW50TG9naWNhbEJvdHRvbSgpLCBMYXlvdXRVbml0KGJveC0+bG9n aWNhbEJvdHRvbSgpKSk7CiAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGlzIG1peGluZyBwaHlzaWNh bCBhbmQgbG9naWNhbCBjb29yZGluYXRlcy4KICAgICAgICAgcmVjdHMuYXBwZW5kKHsgTGF5b3V0 VW5pdChib3gtPnZpc3VhbFJlY3RJZ25vcmluZ0Jsb2NrRGlyZWN0aW9uKCkueCgpKSwgdG9wLCBM YXlvdXRVbml0KGJveC0+bG9naWNhbFdpZHRoKCkpLCBib3R0b20gLSB0b3AgfSk7CiAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCmluZGV4IDc3MGViNzY0YWJlODIx NTI2YTIzMTA3OTA2ZDcwNTFkOGFhYjBlZWYuLjU5YTU2ZDM0ODM3OGM5OWUzYzkxYzU3OWRhOGU0 YTRkZDI3OTM2MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKQEAg LTY3NCwxMSArNjc0LDExIEBAIFZpc2libGVQb3NpdGlvbiBSZW5kZXJUZXh0Ojpwb3NpdGlvbkZv clBvaW50KGNvbnN0IExheW91dFBvaW50JiBwb2ludCwgY29uc3QgUmVuCiAgICAgICAgICAgICBy dW4udHJhdmVyc2VOZXh0VGV4dEJveCgpOwogCiAgICAgICAgIGF1dG8gbGluZSA9IHJ1bi0+bGlu ZSgpOwotICAgICAgICBMYXlvdXRVbml0IHRvcCA9IHN0ZDo6bWluKGxpbmUtPmVuY2xvc2luZ1Rv cEZvckhpdFRlc3RpbmcoKSwgbGluZS0+dG9wKCkpOworICAgICAgICBhdXRvIHRvcCA9IHN0ZDo6 bWluKGxpbmUtPmVuY2xvc2luZ1RvcEZvckhpdFRlc3RpbmcoKSwgbGluZS0+Y29udGVudExvZ2lj YWxUb3AoKSk7CiAgICAgICAgIGlmIChwb2ludEJsb2NrRGlyZWN0aW9uID4gdG9wIHx8ICghYmxv Y2tzQXJlRmxpcHBlZCAmJiBwb2ludEJsb2NrRGlyZWN0aW9uID09IHRvcCkpIHsKICAgICAgICAg ICAgIGF1dG8gYm90dG9tID0gTGluZVNlbGVjdGlvbjo6bG9naWNhbEJvdHRvbSgqbGluZSk7CiAg ICAgICAgICAgICBpZiAoYXV0byBuZXh0TGluZSA9IGxpbmUtPm5leHQoKSkKLSAgICAgICAgICAg ICAgICBib3R0b20gPSBzdGQ6Om1pbihib3R0b20sIG5leHRMaW5lLT50b3AoKSk7CisgICAgICAg ICAgICAgICAgYm90dG9tID0gc3RkOjptaW4oYm90dG9tLCBuZXh0TGluZS0+Y29udGVudExvZ2lj YWxUb3AoKSk7CiAKICAgICAgICAgICAgIGlmIChwb2ludEJsb2NrRGlyZWN0aW9uIDwgYm90dG9t IHx8IChibG9ja3NBcmVGbGlwcGVkICYmIHBvaW50QmxvY2tEaXJlY3Rpb24gPT0gYm90dG9tKSkg ewogICAgICAgICAgICAgICAgIFNob3VsZEFmZmluaXR5QmVEb3duc3RyZWFtIHNob3VsZEFmZmlu aXR5QmVEb3duc3RyZWFtOwo=