263346 2023-10-18 16:27:30 -0700 [IFC] Fall back to full layout when partial damage offset does not match with freshly updated inline items 2023-10-19 06:42:14 -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 1986002 0 zalan 2023-10-18 16:27:30 -0700 ssia 1986003 1 468270 zalan 2023-10-18 16:30:57 -0700 Created attachment 468270 Patch 1986065 2 468275 zalan 2023-10-18 20:50:30 -0700 Created attachment 468275 [fast-cq]Patch 1986135 3 ews-feeder 2023-10-19 06:41:40 -0700 Committed 269520@main (069825f3ce31): <https://commits.webkit.org/269520@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 468275. 1986136 4 webkit-bug-importer 2023-10-19 06:42:14 -0700 <rdar://problem/117203328> 468270 2023-10-18 16:30:57 -0700 2023-10-18 20:50:28 -0700 Patch bug-263346-20231018163056.patch text/plain 5239 zalan RnJvbSA2NDQ0M2ZiNzk3MzRkN2M2ZGYzMDUwZWUzOTBlZjlkZjZlOGI3MDlmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFdlZCwgMTggT2N0IDIwMjMgMTY6Mjc6MzkgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBG YWxsIGJhY2sgdG8gZnVsbCBsYXlvdXQgd2hlbiBwYXJ0aWFsIGRhbWFnZSBvZmZzZXQKIGRvZXMg bm90IG1hdGNoIHdpdGggZnJlc2hseSB1cGRhdGVkIGlubGluZSBpdGVtcwogaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2MzM0NgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCgpJZiB0aGUgaW5saW5lIGl0ZW0gbGlzdCBtaXNtYXRjaGVzIHRoZSBwcmV2aW91c2x5 IGNvbXB1dGVkIGRhbWFnZSBvZmZzZXQgKGUuZy4gZmlyc3QgaW5saW5lIGl0ZW0gaGFzIHRoZSBs ZW5ndGggb2YgMyB3aGlsZSBkYW1hZ2UgcG9pbnRzIHRvIHBvc2l0aW9uIDQpCmxldCdzIGp1c3Qg ZG8gZnVsbCBsYXlvdXQuCgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKFdlYkNvcmU6OkxheW91dDo6 bGF5b3V0UmFuZ2VGb3JDb250ZW50KToKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OmxheW91dCk6CihXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250 ZXh0Ojpjb21wdXRlZEludHJpbnNpY1NpemVzKToKLS0tCiAuLi4vaW5saW5lL0lubGluZUZvcm1h dHRpbmdDb250ZXh0LmNwcCAgICAgICAgfCAzNiArKysrKysrKysrKysrKy0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggZmVlYzhlOWJlZWJk Li41MDI5MDc1ZDRiZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5jcHAKQEAgLTYwLDYgKzYwLDI0IEBAIG5hbWVzcGFjZSBMYXlvdXQgewogCiBX VEZfTUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQpOwogCitz dGF0aWMgSW5saW5lSXRlbVJhbmdlIGxheW91dFJhbmdlRm9yQ29udGVudChjb25zdCBJbmxpbmVJ dGVtTGlzdCYgaW5saW5lSXRlbUxpc3QsIGNvbnN0IElubGluZURhbWFnZSogbGluZURhbWFnZSkK K3sKKyAgICBhdXRvIGZ1bGxSYW5nZSA9IElubGluZUl0ZW1SYW5nZSB7IHsgfSwgeyBpbmxpbmVJ dGVtTGlzdC5zaXplKCksIDAgfSB9OworICAgIGlmICghbGluZURhbWFnZSB8fCAhbGluZURhbWFn ZS0+c3RhcnQoKSkKKyAgICAgICAgcmV0dXJuIGZ1bGxSYW5nZTsKKyAgICBhdXRvIGRhbWFnZVN0 YXJ0UG9zaXRpb24gPSBsaW5lRGFtYWdlLT5zdGFydCgpLT5pbmxpbmVJdGVtUG9zaXRpb247Cisg ICAgaWYgKGRhbWFnZVN0YXJ0UG9zaXRpb24uaW5kZXggPj0gaW5saW5lSXRlbUxpc3Quc2l6ZSgp KSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm4gZnVsbFJh bmdlOworICAgIH0KKyAgICBhdXRvJiBkYW1hZ2VkSW5saW5lSXRlbSA9IGlubGluZUl0ZW1MaXN0 W2RhbWFnZVN0YXJ0UG9zaXRpb24uaW5kZXhdOworICAgIGlmIChkYW1hZ2VTdGFydFBvc2l0aW9u Lm9mZnNldCAmJiAoIWlzPElubGluZVRleHRJdGVtPihkYW1hZ2VkSW5saW5lSXRlbSkgfHwgZGFt YWdlU3RhcnRQb3NpdGlvbi5vZmZzZXQgPCBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oZGFtYWdl ZElubGluZUl0ZW0pLnN0YXJ0KCkgfHwgZGFtYWdlU3RhcnRQb3NpdGlvbi5vZmZzZXQgPj0gZG93 bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGRhbWFnZWRJbmxpbmVJdGVtKS5lbmQoKSkpIHsKKyAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBmdWxsUmFuZ2U7CisgICAg fQorICAgIHJldHVybiB7IGRhbWFnZVN0YXJ0UG9zaXRpb24sIHsgaW5saW5lSXRlbUxpc3Quc2l6 ZSgpLCAwIH0gfTsKK30KKwogSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OklubGluZUZvcm1hdHRp bmdDb250ZXh0KGNvbnN0IEVsZW1lbnRCb3gmIHJvb3RCbG9ja0NvbnRhaW5lciwgTGF5b3V0U3Rh dGUmIGxheW91dFN0YXRlLCBCbG9ja0xheW91dFN0YXRlJiBwYXJlbnRCbG9ja0xheW91dFN0YXRl KQogICAgIDogbV9yb290QmxvY2tDb250YWluZXIocm9vdEJsb2NrQ29udGFpbmVyKQogICAgICwg bV9sYXlvdXRTdGF0ZShsYXlvdXRTdGF0ZSkKQEAgLTgzLDI2ICsxMDEsMjggQEAgSW5saW5lTGF5 b3V0UmVzdWx0IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXQoY29uc3QgQ29uc3RyYWlu dHNGb3JJbmxpbmVDb24KICAgICB9CiAKICAgICBhdXRvJiBpbmxpbmVDb250ZW50Q2FjaGUgPSB0 aGlzLT5pbmxpbmVDb250ZW50Q2FjaGUoKTsKLSAgICBhdXRvIG5lZWRzTGF5b3V0U3RhcnRQb3Np dGlvbiA9ICFsaW5lRGFtYWdlIHx8ICFsaW5lRGFtYWdlLT5zdGFydCgpID8gSW5saW5lSXRlbVBv c2l0aW9uKCkgOiBsaW5lRGFtYWdlLT5zdGFydCgpLT5pbmxpbmVJdGVtUG9zaXRpb247Ci0gICAg YXV0byBuZWVkc0lubGluZUl0ZW1zVXBkYXRlID0gaW5saW5lQ29udGVudENhY2hlLmlubGluZUl0 ZW1zKCkuaXNFbXB0eSgpIHx8IGxpbmVEYW1hZ2U7Ci0gICAgaWYgKG5lZWRzSW5saW5lSXRlbXNV cGRhdGUpIHsKKyAgICBhdXRvIG5lZWRzSW5saW5lSXRlbUxpc3RVcGRhdGUgPSBpbmxpbmVDb250 ZW50Q2FjaGUuaW5saW5lSXRlbXMoKS5pc0VtcHR5KCkgfHwgbGluZURhbWFnZTsKKyAgICBpZiAo bmVlZHNJbmxpbmVJdGVtTGlzdFVwZGF0ZSkgewogICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91 bGQgZ28gdG8gaW52YWxpZGF0aW9uLgogICAgICAgICBpbmxpbmVDb250ZW50Q2FjaGUuY2xlYXJN YXhpbXVtSW50cmluc2ljV2lkdGhMYXlvdXRSZXN1bHQoKTsKKyAgICAgICAgYXV0byBuZWVkc0xh eW91dFN0YXJ0UG9zaXRpb24gPSAhbGluZURhbWFnZSB8fCAhbGluZURhbWFnZS0+c3RhcnQoKSA/ IElubGluZUl0ZW1Qb3NpdGlvbigpIDogbGluZURhbWFnZS0+c3RhcnQoKS0+aW5saW5lSXRlbVBv c2l0aW9uOwogICAgICAgICBJbmxpbmVJdGVtc0J1aWxkZXIgeyBpbmxpbmVDb250ZW50Q2FjaGUs IHJvb3QoKSB9LmJ1aWxkKG5lZWRzTGF5b3V0U3RhcnRQb3NpdGlvbik7CiAgICAgfQogCiAgICAg YXV0byYgaW5saW5lSXRlbUxpc3QgPSBpbmxpbmVDb250ZW50Q2FjaGUuaW5saW5lSXRlbXMoKS5j b250ZW50KCk7Ci0gICAgYXV0byBuZWVkc0xheW91dFJhbmdlID0gSW5saW5lSXRlbVJhbmdlIHsg bmVlZHNMYXlvdXRTdGFydFBvc2l0aW9uLCB7IGlubGluZUl0ZW1MaXN0LnNpemUoKSwgMCB9IH07 CisgICAgYXV0byBuZWVkc0xheW91dFJhbmdlID0gbGF5b3V0UmFuZ2VGb3JDb250ZW50KGlubGlu ZUl0ZW1MaXN0LCBsaW5lRGFtYWdlKTsKICAgICBpZiAobmVlZHNMYXlvdXRSYW5nZS5pc0VtcHR5 KCkpIHsKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybiB7IH07 CiAgICAgfQogCiAgICAgYXV0byBwcmV2aW91c0xpbmUgPSBbJl0oKSAtPiBzdGQ6Om9wdGlvbmFs PFByZXZpb3VzTGluZT4gewotICAgICAgICBpZiAoIW5lZWRzTGF5b3V0U3RhcnRQb3NpdGlvbikK KyAgICAgICAgaWYgKCFuZWVkc0xheW91dFJhbmdlLnN0YXJ0KQogICAgICAgICAgICAgcmV0dXJu IHsgfTsKLSAgICAgICAgaWYgKCFsaW5lRGFtYWdlIHx8ICFsaW5lRGFtYWdlLT5zdGFydCgpKQor ICAgICAgICBpZiAoIWxpbmVEYW1hZ2UgfHwgIWxpbmVEYW1hZ2UtPnN0YXJ0KCkpIHsKKyAgICAg ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICAgICAgcmV0dXJuIHsgfTsKKyAg ICAgICAgfQogICAgICAgICBhdXRvIGxhc3RMaW5lSW5kZXggPSBsaW5lRGFtYWdlLT5zdGFydCgp LT5saW5lSW5kZXggLSAxOwogICAgICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGJlIGFibGUgdG8g ZXh0cmFjdCB0aGUgbGFzdCBsaW5lIGluZm9ybWF0aW9uIGFuZCBwcm92aWRlIGl0IHRvIGxheW91 dCBhcyAicHJldmlvdXMgbGluZSIgKGVuZHMgaW4gbGluZSBicmVhayBhbmQgaW5saW5lIGRpcmVj dGlvbikuCiAgICAgICAgIHJldHVybiBQcmV2aW91c0xpbmUgeyBsYXN0TGluZUluZGV4LCB7IH0s IHsgfSwgeyB9LCB7IH0gfTsKQEAgLTEzMyw4ICsxNTMsOCBAQCBJbnRyaW5zaWNXaWR0aENvbnN0 cmFpbnRzIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNpY1NpemVzKGNv bnN0CiAgICAgICAgIHJldHVybiAqaW50cmluc2ljU2l6ZXM7CiAKICAgICBhdXRvIG5lZWRzTGF5 b3V0U3RhcnRQb3NpdGlvbiA9ICFsaW5lRGFtYWdlIHx8ICFsaW5lRGFtYWdlLT5zdGFydCgpID8g SW5saW5lSXRlbVBvc2l0aW9uKCkgOiBsaW5lRGFtYWdlLT5zdGFydCgpLT5pbmxpbmVJdGVtUG9z aXRpb247Ci0gICAgYXV0byBuZWVkc0lubGluZUl0ZW1zVXBkYXRlID0gaW5saW5lQ29udGVudENh Y2hlLmlubGluZUl0ZW1zKCkuaXNFbXB0eSgpIHx8IGxpbmVEYW1hZ2U7Ci0gICAgaWYgKG5lZWRz SW5saW5lSXRlbXNVcGRhdGUpCisgICAgYXV0byBuZWVkc0lubGluZUl0ZW1MaXN0VXBkYXRlID0g aW5saW5lQ29udGVudENhY2hlLmlubGluZUl0ZW1zKCkuaXNFbXB0eSgpIHx8IGxpbmVEYW1hZ2U7 CisgICAgaWYgKG5lZWRzSW5saW5lSXRlbUxpc3RVcGRhdGUpCiAgICAgICAgIElubGluZUl0ZW1z QnVpbGRlciB7IGlubGluZUNvbnRlbnRDYWNoZSwgcm9vdCgpIH0uYnVpbGQobmVlZHNMYXlvdXRT dGFydFBvc2l0aW9uKTsKIAogICAgIGF1dG8gbWF5VXNlU2ltcGxpZmllZFRleHRPbmx5SW5saW5l TGF5b3V0ID0gVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlcjo6aXNFbGlnaWJsZUZvclNpbXBsaWZp ZWRUZXh0T25seUlubGluZUxheW91dChyb290KCksIGlubGluZUNvbnRlbnRDYWNoZSk7Cg== 468275 2023-10-18 20:50:30 -0700 2023-10-19 06:41:41 -0700 [fast-cq]Patch bug-263346-20231018205029.patch text/plain 5373 zalan RnJvbSAyNDc0MzExNGFjY2I0YjBjMDkyN2YwMjE0ZjIxM2I1NTQyMTM1NmM0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFdlZCwgMTggT2N0IDIwMjMgMTY6Mjc6MzkgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBG YWxsIGJhY2sgdG8gZnVsbCBsYXlvdXQgd2hlbiBwYXJ0aWFsIGRhbWFnZSBvZmZzZXQKIGRvZXMg bm90IG1hdGNoIHdpdGggZnJlc2hseSB1cGRhdGVkIGlubGluZSBpdGVtcwogaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2MzM0NgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCgpJZiB0aGUgaW5saW5lIGl0ZW0gbGlzdCBtaXNtYXRjaGVzIHRoZSBwcmV2aW91c2x5 IGNvbXB1dGVkIGRhbWFnZSBvZmZzZXQgKGUuZy4gZmlyc3QgaW5saW5lIGl0ZW0gaGFzIHRoZSBs ZW5ndGggb2YgMyB3aGlsZSBkYW1hZ2UgcG9pbnRzIHRvIHBvc2l0aW9uIDQpCmxldCdzIGp1c3Qg ZG8gZnVsbCBsYXlvdXQuCgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKFdlYkNvcmU6OkxheW91dDo6 bGF5b3V0UmFuZ2VGb3JDb250ZW50KToKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OmxheW91dCk6CihXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250 ZXh0Ojpjb21wdXRlZEludHJpbnNpY1NpemVzKToKLS0tCiAuLi4vaW5saW5lL0lubGluZUZvcm1h dHRpbmdDb250ZXh0LmNwcCAgICAgICAgfCA0MyArKysrKysrKysrKysrKystLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggZmVlYzhlOWJlZWJk Li4wOGFkNWVhZDc3OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5jcHAKQEAgLTYwLDYgKzYwLDIxIEBAIG5hbWVzcGFjZSBMYXlvdXQgewogCiBX VEZfTUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQpOwogCitz dGF0aWMgc3RkOjpvcHRpb25hbDxJbmxpbmVJdGVtUmFuZ2U+IHBhcnRpYWxSYW5nZUZvckRhbWFn ZShjb25zdCBJbmxpbmVJdGVtTGlzdCYgaW5saW5lSXRlbUxpc3QsIGNvbnN0IElubGluZURhbWFn ZSYgbGluZURhbWFnZSkKK3sKKyAgICBhdXRvIGRhbWFnZVN0YXJ0UG9zaXRpb24gPSBsaW5lRGFt YWdlLnN0YXJ0KCktPmlubGluZUl0ZW1Qb3NpdGlvbjsKKyAgICBpZiAoZGFtYWdlU3RhcnRQb3Np dGlvbi5pbmRleCA+PSBpbmxpbmVJdGVtTGlzdC5zaXplKCkpIHsKKyAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiB7IH07CisgICAgfQorICAgIGF1dG8mIGRhbWFn ZWRJbmxpbmVJdGVtID0gaW5saW5lSXRlbUxpc3RbZGFtYWdlU3RhcnRQb3NpdGlvbi5pbmRleF07 CisgICAgaWYgKGRhbWFnZVN0YXJ0UG9zaXRpb24ub2Zmc2V0ICYmICghaXM8SW5saW5lVGV4dEl0 ZW0+KGRhbWFnZWRJbmxpbmVJdGVtKSB8fCBkYW1hZ2VTdGFydFBvc2l0aW9uLm9mZnNldCA+PSBk b3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oZGFtYWdlZElubGluZUl0ZW0pLmxlbmd0aCgpKSkgewor ICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuIHsgfTsKKyAgICB9 CisgICAgcmV0dXJuIElubGluZUl0ZW1SYW5nZSB7IGRhbWFnZVN0YXJ0UG9zaXRpb24sIHsgaW5s aW5lSXRlbUxpc3Quc2l6ZSgpLCAwIH0gfTsKK30KKwogSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OklubGluZUZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IEVsZW1lbnRCb3gmIHJvb3RCbG9ja0NvbnRh aW5lciwgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBCbG9ja0xheW91dFN0YXRlJiBwYXJlbnRC bG9ja0xheW91dFN0YXRlKQogICAgIDogbV9yb290QmxvY2tDb250YWluZXIocm9vdEJsb2NrQ29u dGFpbmVyKQogICAgICwgbV9sYXlvdXRTdGF0ZShsYXlvdXRTdGF0ZSkKQEAgLTgzLDI2ICs5OCwz NiBAQCBJbmxpbmVMYXlvdXRSZXN1bHQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dChj b25zdCBDb25zdHJhaW50c0ZvcklubGluZUNvbgogICAgIH0KIAogICAgIGF1dG8mIGlubGluZUNv bnRlbnRDYWNoZSA9IHRoaXMtPmlubGluZUNvbnRlbnRDYWNoZSgpOwotICAgIGF1dG8gbmVlZHNM YXlvdXRTdGFydFBvc2l0aW9uID0gIWxpbmVEYW1hZ2UgfHwgIWxpbmVEYW1hZ2UtPnN0YXJ0KCkg PyBJbmxpbmVJdGVtUG9zaXRpb24oKSA6IGxpbmVEYW1hZ2UtPnN0YXJ0KCktPmlubGluZUl0ZW1Q b3NpdGlvbjsKLSAgICBhdXRvIG5lZWRzSW5saW5lSXRlbXNVcGRhdGUgPSBpbmxpbmVDb250ZW50 Q2FjaGUuaW5saW5lSXRlbXMoKS5pc0VtcHR5KCkgfHwgbGluZURhbWFnZTsKLSAgICBpZiAobmVl ZHNJbmxpbmVJdGVtc1VwZGF0ZSkgeworICAgIGF1dG8gbmVlZHNJbmxpbmVJdGVtTGlzdFVwZGF0 ZSA9IGlubGluZUNvbnRlbnRDYWNoZS5pbmxpbmVJdGVtcygpLmlzRW1wdHkoKSB8fCBsaW5lRGFt YWdlOworICAgIGlmIChuZWVkc0lubGluZUl0ZW1MaXN0VXBkYXRlKSB7CiAgICAgICAgIC8vIEZJ WE1FOiBUaGlzIHNob3VsZCBnbyB0byBpbnZhbGlkYXRpb24uCiAgICAgICAgIGlubGluZUNvbnRl bnRDYWNoZS5jbGVhck1heGltdW1JbnRyaW5zaWNXaWR0aExheW91dFJlc3VsdCgpOwotICAgICAg ICBJbmxpbmVJdGVtc0J1aWxkZXIgeyBpbmxpbmVDb250ZW50Q2FjaGUsIHJvb3QoKSB9LmJ1aWxk KG5lZWRzTGF5b3V0U3RhcnRQb3NpdGlvbik7CisgICAgICAgIGF1dG8gc3RhcnRQb3NpdGlvbiA9 ICFsaW5lRGFtYWdlIHx8ICFsaW5lRGFtYWdlLT5zdGFydCgpID8gSW5saW5lSXRlbVBvc2l0aW9u KCkgOiBsaW5lRGFtYWdlLT5zdGFydCgpLT5pbmxpbmVJdGVtUG9zaXRpb247CisgICAgICAgIElu bGluZUl0ZW1zQnVpbGRlciB7IGlubGluZUNvbnRlbnRDYWNoZSwgcm9vdCgpIH0uYnVpbGQoc3Rh cnRQb3NpdGlvbik7CiAgICAgfQogCiAgICAgYXV0byYgaW5saW5lSXRlbUxpc3QgPSBpbmxpbmVD b250ZW50Q2FjaGUuaW5saW5lSXRlbXMoKS5jb250ZW50KCk7Ci0gICAgYXV0byBuZWVkc0xheW91 dFJhbmdlID0gSW5saW5lSXRlbVJhbmdlIHsgbmVlZHNMYXlvdXRTdGFydFBvc2l0aW9uLCB7IGlu bGluZUl0ZW1MaXN0LnNpemUoKSwgMCB9IH07CisgICAgYXV0byBuZWVkc0xheW91dFJhbmdlID0g SW5saW5lSXRlbVJhbmdlIHsgeyB9LCB7IGlubGluZUl0ZW1MaXN0LnNpemUoKSwgMCB9IH07Cisg ICAgaWYgKGxpbmVEYW1hZ2UpIHsKKyAgICAgICAgaWYgKGF1dG8gcGFydGlhbFJhbmdlID0gcGFy dGlhbFJhbmdlRm9yRGFtYWdlKGlubGluZUl0ZW1MaXN0LCAqbGluZURhbWFnZSkpCisgICAgICAg ICAgICBuZWVkc0xheW91dFJhbmdlID0gKnBhcnRpYWxSYW5nZTsKKyAgICAgICAgZWxzZSB7Cisg ICAgICAgICAgICAvLyBEZW1vdGUgdGhpcyBsYXlvdXQgdG8gZnVsbCByYW5nZS4KKyAgICAgICAg ICAgIGxpbmVEYW1hZ2UgPSBudWxscHRyOworICAgICAgICB9CisgICAgfQogICAgIGlmIChuZWVk c0xheW91dFJhbmdlLmlzRW1wdHkoKSkgewogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK ICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiAKICAgICBhdXRvIHByZXZpb3VzTGluZSA9IFsm XSgpIC0+IHN0ZDo6b3B0aW9uYWw8UHJldmlvdXNMaW5lPiB7Ci0gICAgICAgIGlmICghbmVlZHNM YXlvdXRTdGFydFBvc2l0aW9uKQorICAgICAgICBpZiAoIW5lZWRzTGF5b3V0UmFuZ2Uuc3RhcnQp CiAgICAgICAgICAgICByZXR1cm4geyB9OwotICAgICAgICBpZiAoIWxpbmVEYW1hZ2UgfHwgIWxp bmVEYW1hZ2UtPnN0YXJ0KCkpCisgICAgICAgIGlmICghbGluZURhbWFnZSB8fCAhbGluZURhbWFn ZS0+c3RhcnQoKSkgeworICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAg ICAgICByZXR1cm4geyB9OworICAgICAgICB9CiAgICAgICAgIGF1dG8gbGFzdExpbmVJbmRleCA9 IGxpbmVEYW1hZ2UtPnN0YXJ0KCktPmxpbmVJbmRleCAtIDE7CiAgICAgICAgIC8vIEZJWE1FOiBX ZSBzaG91bGQgYmUgYWJsZSB0byBleHRyYWN0IHRoZSBsYXN0IGxpbmUgaW5mb3JtYXRpb24gYW5k IHByb3ZpZGUgaXQgdG8gbGF5b3V0IGFzICJwcmV2aW91cyBsaW5lIiAoZW5kcyBpbiBsaW5lIGJy ZWFrIGFuZCBpbmxpbmUgZGlyZWN0aW9uKS4KICAgICAgICAgcmV0dXJuIFByZXZpb3VzTGluZSB7 IGxhc3RMaW5lSW5kZXgsIHsgfSwgeyB9LCB7IH0sIHsgfSB9OwpAQCAtMTMzLDggKzE1OCw4IEBA IEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1 dGVkSW50cmluc2ljU2l6ZXMoY29uc3QKICAgICAgICAgcmV0dXJuICppbnRyaW5zaWNTaXplczsK IAogICAgIGF1dG8gbmVlZHNMYXlvdXRTdGFydFBvc2l0aW9uID0gIWxpbmVEYW1hZ2UgfHwgIWxp bmVEYW1hZ2UtPnN0YXJ0KCkgPyBJbmxpbmVJdGVtUG9zaXRpb24oKSA6IGxpbmVEYW1hZ2UtPnN0 YXJ0KCktPmlubGluZUl0ZW1Qb3NpdGlvbjsKLSAgICBhdXRvIG5lZWRzSW5saW5lSXRlbXNVcGRh dGUgPSBpbmxpbmVDb250ZW50Q2FjaGUuaW5saW5lSXRlbXMoKS5pc0VtcHR5KCkgfHwgbGluZURh bWFnZTsKLSAgICBpZiAobmVlZHNJbmxpbmVJdGVtc1VwZGF0ZSkKKyAgICBhdXRvIG5lZWRzSW5s aW5lSXRlbUxpc3RVcGRhdGUgPSBpbmxpbmVDb250ZW50Q2FjaGUuaW5saW5lSXRlbXMoKS5pc0Vt cHR5KCkgfHwgbGluZURhbWFnZTsKKyAgICBpZiAobmVlZHNJbmxpbmVJdGVtTGlzdFVwZGF0ZSkK ICAgICAgICAgSW5saW5lSXRlbXNCdWlsZGVyIHsgaW5saW5lQ29udGVudENhY2hlLCByb290KCkg fS5idWlsZChuZWVkc0xheW91dFN0YXJ0UG9zaXRpb24pOwogCiAgICAgYXV0byBtYXlVc2VTaW1w bGlmaWVkVGV4dE9ubHlJbmxpbmVMYXlvdXQgPSBUZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyOjpp c0VsaWdpYmxlRm9yU2ltcGxpZmllZFRleHRPbmx5SW5saW5lTGF5b3V0KHJvb3QoKSwgaW5saW5l Q29udGVudENhY2hlKTsK