218418 2020-10-31 13:44:35 -0700 [LFC][IFC] InlineLevelBox logical rect should only be accessed through LineBox 2020-11-01 05:58: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 1703367 0 zalan 2020-10-31 13:44:35 -0700 InlineLevelBox position is relative to the parent inline box. LineBox converts it to relative to the line box. 1703368 1 412855 zalan 2020-10-31 13:51:40 -0700 Created attachment 412855 Patch 1703372 2 412857 zalan 2020-10-31 15:44:23 -0700 Created attachment 412857 Patch 1703385 3 ews-feeder 2020-11-01 05:58:01 -0800 Committed r269231: <https://trac.webkit.org/changeset/269231> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412857. 1703386 4 webkit-bug-importer 2020-11-01 05:58:18 -0800 <rdar://problem/70926149> 412855 2020-10-31 13:51:40 -0700 2020-10-31 15:44:21 -0700 Patch bug-218418-20201031135139.patch text/plain 4991 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGMxZGVkYzUwZWY5NGFj OTczMDkyZDk4MzI0OThmN2Q0ZTVjODhmNS4uMTJmMDNhN2Y1MzE5NjE4ZDc3MTNiZGNiNzc1Njli ZTMzMjY2ODdhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTEwLTMxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmVM ZXZlbEJveCBsb2dpY2FsIHJlY3Qgc2hvdWxkIG9ubHkgYmUgYWNjZXNzZWQgdGhyb3VnaCBMaW5l Qm94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg0 MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbmxp bmVMZXZlbEJveCBsb2dpY2FsIHJlY3QgaXMgcmVsYXRpdmUgdG8gdGhlIHBhcmVudCBpbmxpbmUg Ym94LiBDYWxsaW5nIElubGluZUxldmVsQm94Ojpsb2dpY2FsUmVjdCAKKyAgICAgICAgYW5kIGV4 cGVjdCBhIGxpbmUgcmVsYXRpdmUgcmVjdCBpcyBhbiBlYXN5IG1pc3Rha2UgdG8gbWFrZSAoYW5k IG9uZSBJIG1hZGUgbXlzZWxmKS4KKyAgICAgICAgT25seSB0aGUgTGluZUJ1aWxkZXIgYW5kIHRo ZSBMaW5lQm94IHNob3VsZCByZWFsbHkgbmVlZCBhY2Nlc3MgdG8gdGhlIHJlbGF0aXZlIHJlY3Qs IG90aGVycyBzaG91bGQKKyAgICAgICAgY29udGludWUgdG8gdXNlIExpbmVCb3g6OmxvZ2ljYWxS ZWN0Rm9ySW5saW5lTGV2ZWxCb3guCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6 bG9naWNhbFJlY3RGb3JJbmxpbmVMZXZlbEJveCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6bG9naWNhbFRvcCBjb25zdCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUxldmVsQm94Ojpsb2dpY2FsQm90dG9tIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lTGV2ZWxCb3g6 OmxvZ2ljYWxMZWZ0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6 SW5saW5lTGV2ZWxCb3g6OmxvZ2ljYWxXaWR0aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxpbmVCb3g6OklubGluZUxldmVsQm94Ojpsb2dpY2FsSGVpZ2h0IGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmxvZ2ljYWxS ZWN0IGNvbnN0KTogRGVsZXRlZC4KKwogMjAyMC0xMC0zMSAgWmFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0ludGVncmF0aW9uXSBMaW5lSXRlcmF0b3JNb2Rl cm5QYXRoOjp0b3AvYm90dG9tIG1hcCB0byBMaW5lOjplbmNsb3NpbmdSZWN0Ojp0b3AvYm90dG9t CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmVCb3guY3BwCmluZGV4IGVkZGNkNDBkN2M3NzIwYzA4OWY2MWZjYTEwOGVkMTAxMmUw NTE5NzkuLjc5MmJlODdjZDA5ZjA4OGRmNmUwMDBhN2JiNjc0Yzg5Njc3MTlmOTQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCb3guY3BwCkBAIC0xMDEsNyArMTAxLDYgQEAgSW5saW5lUmVjdCBMaW5lQm94Ojpsb2dpY2Fs UmVjdEZvclRleHRSdW4oY29uc3QgTGluZTo6UnVuJiBydW4pIGNvbnN0CiBJbmxpbmVSZWN0IExp bmVCb3g6OmxvZ2ljYWxSZWN0Rm9ySW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiBsYXlvdXRCb3gp IGNvbnN0CiB7CiAgICAgYXV0byogaW5saW5lQm94ID0gJmlubGluZUxldmVsQm94Rm9yTGF5b3V0 Qm94KGxheW91dEJveCk7Ci0gICAgYXV0byBpbmxpbmVCb3hMb2dpY2FsUmVjdCA9IGlubGluZUJv eC0+bG9naWNhbFJlY3QoKTsKICAgICBhdXRvIGlubGluZUJveEFic29sdXRlbG9naWNhbFRvcCA9 IGlubGluZUJveC0+bG9naWNhbFRvcCgpOwogICAgIGlmICghaW5saW5lQm94LT5oYXNMaW5lQm94 UmVsYXRpdmVBbGlnbm1lbnQoKSkgewogICAgICAgICB3aGlsZSAoaW5saW5lQm94ICE9IG1fcm9v dElubGluZUJveC5nZXQoKSAmJiAhaW5saW5lQm94LT5oYXNMaW5lQm94UmVsYXRpdmVBbGlnbm1l bnQoKSkgewpAQCAtMTEwLDcgKzEwOSw3IEBAIElubGluZVJlY3QgTGluZUJveDo6bG9naWNhbFJl Y3RGb3JJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QKICAgICAgICAg ICAgIGlubGluZUJveEFic29sdXRlbG9naWNhbFRvcCArPSBpbmxpbmVCb3gtPmxvZ2ljYWxUb3Ao KTsKICAgICAgICAgfQogICAgIH0KLSAgICByZXR1cm4geyBpbmxpbmVCb3hBYnNvbHV0ZWxvZ2lj YWxUb3AsIGlubGluZUJveExvZ2ljYWxSZWN0LmxlZnQoKSwgaW5saW5lQm94TG9naWNhbFJlY3Qu d2lkdGgoKSwgaW5saW5lQm94TG9naWNhbFJlY3QuaGVpZ2h0KCkgfTsKKyAgICByZXR1cm4geyBp bmxpbmVCb3hBYnNvbHV0ZWxvZ2ljYWxUb3AsIGlubGluZUJveC0+bG9naWNhbExlZnQoKSwgaW5s aW5lQm94LT5sb2dpY2FsV2lkdGgoKSwgaW5saW5lQm94LT5sb2dpY2FsSGVpZ2h0KCkgfTsKIH0K IAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJveC5oCmluZGV4IGJjNjRlN2Y5OTZhNTBiNzRiOTJkMTQwZDAyYWUwMDU0YjBl ZWRkMjYuLmU1NTUzYWYwODg2ODMwNGQwYzhhNjYzZGM5NzRlODllNTgwMTRmZDQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3gu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l Qm94LmgKQEAgLTY2LDEzICs2Niw2IEBAIHB1YmxpYzoKICAgICAgICAgc3RhdGljIHN0ZDo6dW5p cXVlX3B0cjxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4gY3JlYXRlTGluZUJyZWFrQm94KGNvbnN0 IEJveCYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQpOwogICAgICAgICBzdGF0aWMgc3Rk Ojp1bmlxdWVfcHRyPExpbmVCb3g6OklubGluZUxldmVsQm94PiBjcmVhdGVHZW5lcmljSW5saW5l TGV2ZWxCb3goY29uc3QgQm94JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCk7CiAKLSAg ICAgICAgY29uc3QgSW5saW5lUmVjdCYgbG9naWNhbFJlY3QoKSBjb25zdCB7IHJldHVybiBtX2xv Z2ljYWxSZWN0OyB9Ci0gICAgICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbFRvcCgpIGNvbnN0 IHsgcmV0dXJuIG1fbG9naWNhbFJlY3QudG9wKCk7IH0KLSAgICAgICAgSW5saW5lTGF5b3V0VW5p dCBsb2dpY2FsQm90dG9tKCkgY29uc3QgeyByZXR1cm4gbV9sb2dpY2FsUmVjdC5ib3R0b20oKTsg fQotICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0KCkgY29uc3QgeyByZXR1cm4g bV9sb2dpY2FsUmVjdC5sZWZ0KCk7IH0KLSAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs V2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0LndpZHRoKCk7IH0KLSAgICAgICAg SW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gbV9sb2dpY2Fs UmVjdC5oZWlnaHQoKTsgfQotCiAgICAgICAgIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUoKSBj b25zdCB7IHJldHVybiBtX2Jhc2VsaW5lOyB9CiAgICAgICAgIE9wdGlvbmFsPElubGluZUxheW91 dFVuaXQ+IGRlc2NlbnQoKSBjb25zdCB7IHJldHVybiBtX2Rlc2NlbnQ7IH0KICAgICAgICAgLy8g U2VlIGh0dHBzOi8vd3d3LnczLm9yZy9UUi9jc3MtaW5saW5lLTMvI2xheW91dC1ib3VuZHMKQEAg LTEwOSw2ICsxMDIsMTMgQEAgcHVibGljOgogCiAgICAgcHJpdmF0ZToKICAgICAgICAgZnJpZW5k IGNsYXNzIExpbmVCb3hCdWlsZGVyOworICAgICAgICBmcmllbmQgY2xhc3MgTGluZUJveDsKKwor ICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxUb3AoKSBjb25zdCB7IHJldHVybiBtX2xv Z2ljYWxSZWN0LnRvcCgpOyB9CisgICAgICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbEJvdHRv bSgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3QuYm90dG9tKCk7IH0KKyAgICAgICAgSW5s aW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3Qu bGVmdCgpOyB9CisgICAgICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKCkgY29uc3Qg eyByZXR1cm4gbV9sb2dpY2FsUmVjdC53aWR0aCgpOyB9CisgICAgICAgIElubGluZUxheW91dFVu aXQgbG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3QuaGVpZ2h0KCk7 IH0KIAogICAgICAgICB2b2lkIHNldExvZ2ljYWxUb3AoSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs VG9wKSB7IG1fbG9naWNhbFJlY3Quc2V0VG9wKGxvZ2ljYWxUb3ApOyB9CiAgICAgICAgIHZvaWQg c2V0TG9naWNhbFdpZHRoKElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKSB7IG1fbG9naWNh bFJlY3Quc2V0V2lkdGgobG9naWNhbFdpZHRoKTsgfQo= 412857 2020-10-31 15:44:23 -0700 2020-11-01 05:58:01 -0800 Patch bug-218418-20201031154422.patch text/plain 5421 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGMxZGVkYzUwZWY5NGFj OTczMDkyZDk4MzI0OThmN2Q0ZTVjODhmNS4uMTJmMDNhN2Y1MzE5NjE4ZDc3MTNiZGNiNzc1Njli ZTMzMjY2ODdhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTEwLTMxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmVM ZXZlbEJveCBsb2dpY2FsIHJlY3Qgc2hvdWxkIG9ubHkgYmUgYWNjZXNzZWQgdGhyb3VnaCBMaW5l Qm94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg0 MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbmxp bmVMZXZlbEJveCBsb2dpY2FsIHJlY3QgaXMgcmVsYXRpdmUgdG8gdGhlIHBhcmVudCBpbmxpbmUg Ym94LiBDYWxsaW5nIElubGluZUxldmVsQm94Ojpsb2dpY2FsUmVjdCAKKyAgICAgICAgYW5kIGV4 cGVjdCBhIGxpbmUgcmVsYXRpdmUgcmVjdCBpcyBhbiBlYXN5IG1pc3Rha2UgdG8gbWFrZSAoYW5k IG9uZSBJIG1hZGUgbXlzZWxmKS4KKyAgICAgICAgT25seSB0aGUgTGluZUJ1aWxkZXIgYW5kIHRo ZSBMaW5lQm94IHNob3VsZCByZWFsbHkgbmVlZCBhY2Nlc3MgdG8gdGhlIHJlbGF0aXZlIHJlY3Qs IG90aGVycyBzaG91bGQKKyAgICAgICAgY29udGludWUgdG8gdXNlIExpbmVCb3g6OmxvZ2ljYWxS ZWN0Rm9ySW5saW5lTGV2ZWxCb3guCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6 bG9naWNhbFJlY3RGb3JJbmxpbmVMZXZlbEJveCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6bG9naWNhbFRvcCBjb25zdCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUxldmVsQm94Ojpsb2dpY2FsQm90dG9tIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lTGV2ZWxCb3g6 OmxvZ2ljYWxMZWZ0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6 SW5saW5lTGV2ZWxCb3g6OmxvZ2ljYWxXaWR0aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxpbmVCb3g6OklubGluZUxldmVsQm94Ojpsb2dpY2FsSGVpZ2h0IGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lTGV2ZWxCb3g6OmxvZ2ljYWxS ZWN0IGNvbnN0KTogRGVsZXRlZC4KKwogMjAyMC0xMC0zMSAgWmFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0ludGVncmF0aW9uXSBMaW5lSXRlcmF0b3JNb2Rl cm5QYXRoOjp0b3AvYm90dG9tIG1hcCB0byBMaW5lOjplbmNsb3NpbmdSZWN0Ojp0b3AvYm90dG9t CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmVCb3guY3BwCmluZGV4IGVkZGNkNDBkN2M3NzIwYzA4OWY2MWZjYTEwOGVkMTAxMmUw NTE5NzkuLjcwNGVmYWQ2NTJkMGI4MjkwODgzZWJlYzdkYWM1OTkzNTE5NzA1MjggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCb3guY3BwCkBAIC0xMDEsMTQgKzEwMSwxNSBAQCBJbmxpbmVSZWN0IExpbmVCb3g6OmxvZ2lj YWxSZWN0Rm9yVGV4dFJ1bihjb25zdCBMaW5lOjpSdW4mIHJ1bikgY29uc3QKIElubGluZVJlY3Qg TGluZUJveDo6bG9naWNhbFJlY3RGb3JJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmIGxheW91dEJv eCkgY29uc3QKIHsKICAgICBhdXRvKiBpbmxpbmVCb3ggPSAmaW5saW5lTGV2ZWxCb3hGb3JMYXlv dXRCb3gobGF5b3V0Qm94KTsKKyAgICBpZiAoaW5saW5lQm94LT5oYXNMaW5lQm94UmVsYXRpdmVB bGlnbm1lbnQoKSkKKyAgICAgICAgcmV0dXJuIGlubGluZUJveC0+bG9naWNhbFJlY3QoKTsKKwog ICAgIGF1dG8gaW5saW5lQm94TG9naWNhbFJlY3QgPSBpbmxpbmVCb3gtPmxvZ2ljYWxSZWN0KCk7 Ci0gICAgYXV0byBpbmxpbmVCb3hBYnNvbHV0ZWxvZ2ljYWxUb3AgPSBpbmxpbmVCb3gtPmxvZ2lj YWxUb3AoKTsKLSAgICBpZiAoIWlubGluZUJveC0+aGFzTGluZUJveFJlbGF0aXZlQWxpZ25tZW50 KCkpIHsKLSAgICAgICAgd2hpbGUgKGlubGluZUJveCAhPSBtX3Jvb3RJbmxpbmVCb3guZ2V0KCkg JiYgIWlubGluZUJveC0+aGFzTGluZUJveFJlbGF0aXZlQWxpZ25tZW50KCkpIHsKLSAgICAgICAg ICAgIGlubGluZUJveCA9ICZpbmxpbmVMZXZlbEJveEZvckxheW91dEJveChpbmxpbmVCb3gtPmxh eW91dEJveCgpLnBhcmVudCgpKTsKLSAgICAgICAgICAgIEFTU0VSVChpbmxpbmVCb3gtPmlzSW5s aW5lQm94KCkpOwotICAgICAgICAgICAgaW5saW5lQm94QWJzb2x1dGVsb2dpY2FsVG9wICs9IGlu bGluZUJveC0+bG9naWNhbFRvcCgpOwotICAgICAgICB9CisgICAgYXV0byBpbmxpbmVCb3hBYnNv bHV0ZWxvZ2ljYWxUb3AgPSBpbmxpbmVCb3hMb2dpY2FsUmVjdC50b3AoKTsKKyAgICB3aGlsZSAo aW5saW5lQm94ICE9IG1fcm9vdElubGluZUJveC5nZXQoKSAmJiAhaW5saW5lQm94LT5oYXNMaW5l Qm94UmVsYXRpdmVBbGlnbm1lbnQoKSkgeworICAgICAgICBpbmxpbmVCb3ggPSAmaW5saW5lTGV2 ZWxCb3hGb3JMYXlvdXRCb3goaW5saW5lQm94LT5sYXlvdXRCb3goKS5wYXJlbnQoKSk7CisgICAg ICAgIEFTU0VSVChpbmxpbmVCb3gtPmlzSW5saW5lQm94KCkpOworICAgICAgICBpbmxpbmVCb3hB YnNvbHV0ZWxvZ2ljYWxUb3AgKz0gaW5saW5lQm94LT5sb2dpY2FsVG9wKCk7CiAgICAgfQogICAg IHJldHVybiB7IGlubGluZUJveEFic29sdXRlbG9naWNhbFRvcCwgaW5saW5lQm94TG9naWNhbFJl Y3QubGVmdCgpLCBpbmxpbmVCb3hMb2dpY2FsUmVjdC53aWR0aCgpLCBpbmxpbmVCb3hMb2dpY2Fs UmVjdC5oZWlnaHQoKSB9OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCmluZGV4IGJjNjRlN2Y5OTZhNTBiNzRiOTJk MTQwZDAyYWUwMDU0YjBlZWRkMjYuLmQzMTUyMDNkMDFhYTMyN2IwYjE5OTUwMTg5YTQwYjg0ZTdj YzcyYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lQm94LmgKQEAgLTY2LDEzICs2Niw2IEBAIHB1YmxpYzoKICAgICAgICAg c3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4gY3JlYXRlTGlu ZUJyZWFrQm94KGNvbnN0IEJveCYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQpOwogICAg ICAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPExpbmVCb3g6OklubGluZUxldmVsQm94PiBjcmVh dGVHZW5lcmljSW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiwgSW5saW5lTGF5b3V0VW5pdCBsb2dp Y2FsTGVmdCk7CiAKLSAgICAgICAgY29uc3QgSW5saW5lUmVjdCYgbG9naWNhbFJlY3QoKSBjb25z dCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0OyB9Ci0gICAgICAgIElubGluZUxheW91dFVuaXQgbG9n aWNhbFRvcCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3QudG9wKCk7IH0KLSAgICAgICAg SW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsQm90dG9tKCkgY29uc3QgeyByZXR1cm4gbV9sb2dpY2Fs UmVjdC5ib3R0b20oKTsgfQotICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0KCkg Y29uc3QgeyByZXR1cm4gbV9sb2dpY2FsUmVjdC5sZWZ0KCk7IH0KLSAgICAgICAgSW5saW5lTGF5 b3V0VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0LndpZHRo KCk7IH0KLSAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KCkgY29uc3QgeyBy ZXR1cm4gbV9sb2dpY2FsUmVjdC5oZWlnaHQoKTsgfQotCiAgICAgICAgIElubGluZUxheW91dFVu aXQgYmFzZWxpbmUoKSBjb25zdCB7IHJldHVybiBtX2Jhc2VsaW5lOyB9CiAgICAgICAgIE9wdGlv bmFsPElubGluZUxheW91dFVuaXQ+IGRlc2NlbnQoKSBjb25zdCB7IHJldHVybiBtX2Rlc2NlbnQ7 IH0KICAgICAgICAgLy8gU2VlIGh0dHBzOi8vd3d3LnczLm9yZy9UUi9jc3MtaW5saW5lLTMvI2xh eW91dC1ib3VuZHMKQEAgLTEwOSw2ICsxMDIsMTQgQEAgcHVibGljOgogCiAgICAgcHJpdmF0ZToK ICAgICAgICAgZnJpZW5kIGNsYXNzIExpbmVCb3hCdWlsZGVyOworICAgICAgICBmcmllbmQgY2xh c3MgTGluZUJveDsKKworICAgICAgICBjb25zdCBJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCgpIGNv bnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3Q7IH0KKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBs b2dpY2FsVG9wKCkgY29uc3QgeyByZXR1cm4gbV9sb2dpY2FsUmVjdC50b3AoKTsgfQorICAgICAg ICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxCb3R0b20oKSBjb25zdCB7IHJldHVybiBtX2xvZ2lj YWxSZWN0LmJvdHRvbSgpOyB9CisgICAgICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQo KSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0LmxlZnQoKTsgfQorICAgICAgICBJbmxpbmVM YXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3Qud2lk dGgoKTsgfQorICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7 IHJldHVybiBtX2xvZ2ljYWxSZWN0LmhlaWdodCgpOyB9CiAKICAgICAgICAgdm9pZCBzZXRMb2dp Y2FsVG9wKElubGluZUxheW91dFVuaXQgbG9naWNhbFRvcCkgeyBtX2xvZ2ljYWxSZWN0LnNldFRv cChsb2dpY2FsVG9wKTsgfQogICAgICAgICB2b2lkIHNldExvZ2ljYWxXaWR0aChJbmxpbmVMYXlv dXRVbml0IGxvZ2ljYWxXaWR0aCkgeyBtX2xvZ2ljYWxSZWN0LnNldFdpZHRoKGxvZ2ljYWxXaWR0 aCk7IH0K