213955 2020-07-04 08:25:47 -0700 [LFC] Used dedicated paint margin structures 2020-07-04 09:34:13 -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 1668781 0 zalan 2020-07-04 08:25:47 -0700 ssia 1668782 1 403522 zalan 2020-07-04 08:30:35 -0700 Created attachment 403522 Patch 1668796 2 ews-feeder 2020-07-04 09:33:42 -0700 Committed r263934: <https://trac.webkit.org/changeset/263934> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403522. 1668797 3 webkit-bug-importer 2020-07-04 09:34:13 -0700 <rdar://problem/65096638> 403522 2020-07-04 08:30:35 -0700 2020-07-04 09:33:42 -0700 Patch bug-213955-20200704083034.patch text/plain 14908 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjE2MTRmYTJmZjlkOTE2 NmM2YTFhZDc0NzcxYWQ4ODMzMjQwZjM5NS4uOTk5MzkxNDNjMDY4YThjYzcxYjcwYjY0NDkyNmE3 YjgxN2FmM2U5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDIwLTA3LTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gVXNlZCBkZWRpY2F0 ZWQgcGFpbnQgbWFyZ2luIHN0cnVjdHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMzk1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGhhdmluZyBvbmx5 IGZpbmFsIG1hcmdpbiB2YWx1ZXMgaW4gRGlzcGxheTo6Qm94LgorCisgICAgICAgICogbGF5b3V0 L0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0 dGluZ0NvbnRleHQ6OmNvbXB1dGVPdXRPZkZsb3dIb3Jpem9udGFsR2VvbWV0cnkpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1Zl cnRpY2FsR2VvbWV0cnkpOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9y bWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVXaWR0aEFuZE1hcmdpbik6CisgICAgICAgICogbGF5b3V0 L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJv eDo6VmVydGljYWxNYXJnaW46OmJlZm9yZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpEaXNw bGF5OjpCb3g6OlZlcnRpY2FsTWFyZ2luOjphZnRlciBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpEaXNwbGF5OjpCb3g6OlZlcnRpY2FsTWFyZ2luOjppc0NvbGxhcHNlZFRocm91Z2ggY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94OjpWZXJ0aWNhbE1hcmdpbjo6bm9uQ29s bGFwc2VkVmFsdWVzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6VmVy dGljYWxNYXJnaW46OmNvbGxhcHNlZFZhbHVlcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpE aXNwbGF5OjpCb3g6OlZlcnRpY2FsTWFyZ2luOjpoYXNDb2xsYXBzZWRWYWx1ZXMgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94OjpWZXJ0aWNhbE1hcmdpbjo6c2V0Q29sbGFw c2VkVmFsdWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6VmVydGljYWxNYXJn aW46OlZlcnRpY2FsTWFyZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6VmVy dGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVlczo6Tm9uQ29sbGFwc2VkVmFsdWVzKToKKyAg ICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6VmVydGljYWxNYXJnaW46OkNvbGxhcHNlZFZh bHVlczo6Q29sbGFwc2VkVmFsdWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6 Q29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luOjpDb21wdXRlZEhvcml6b250YWxNYXJnaW4pOgorICAg ICAgICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94OjpIb3Jpem9udGFsTWFyZ2luOjpIb3Jpem9udGFs TWFyZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6c2V0SG9yaXpvbnRhbE1h cmdpbik6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3g6OnNldFZlcnRpY2FsTWFyZ2lu KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6c2V0SG9yaXpvbnRhbENvbXB1dGVk TWFyZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6dmVydGljYWxNYXJnaW4g Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94Ojpob3Jpem9udGFsTWFyZ2lu IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvZmxvYXRzL0Zsb2F0aW5nU3RhdGUuaDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6RmxvYXRpbmdTdGF0ZTo6RmxvYXRJdGVtOjpob3Jpem9udGFs TWFyZ2luIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZv cm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlV2lkdGhBbmRNYXJnaW4pOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUhlaWdodEFuZE1hcmdp bik6CisKIDIwMjAtMDctMDMgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXVtURkNdW1F1aXJrXSBJbmZsb3cgY2hpbGQgYm94IHF1aXJrIHZlcnRpY2FsIG1h cmdpbnMgc2hvdWxkIGNvbGxhcHNlIHdpdGggdGFibGUgY2VsbC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGZlNjQ5NmIzZGUxMmFiNDUyNmE2ODMy NzA4NjhlMGU1NWE0MWQ5M2MuLjNiMzEyOTNhY2I4ZjMwM2JhMTliNjAxYjg1NDY1ZGI4YjdmODI1 OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAt OTMsOCArOTMsOCBAQCB2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93SG9y aXpvbnRhbEdlb21ldHJ5KGNvbnN0IEJveCYgbGF5b3V0Qm94LAogICAgIGF1dG8mIGRpc3BsYXlC b3ggPSBmb3JtYXR0aW5nU3RhdGUoKS5kaXNwbGF5Qm94KGxheW91dEJveCk7CiAgICAgZGlzcGxh eUJveC5zZXRMZWZ0KGhvcml6b250YWxHZW9tZXRyeS5sZWZ0ICsgaG9yaXpvbnRhbEdlb21ldHJ5 LmNvbnRlbnRXaWR0aEFuZE1hcmdpbi51c2VkTWFyZ2luLnN0YXJ0KTsKICAgICBkaXNwbGF5Qm94 LnNldENvbnRlbnRCb3hXaWR0aChob3Jpem9udGFsR2VvbWV0cnkuY29udGVudFdpZHRoQW5kTWFy Z2luLmNvbnRlbnRXaWR0aCk7Ci0gICAgZGlzcGxheUJveC5zZXRIb3Jpem9udGFsTWFyZ2luKGhv cml6b250YWxHZW9tZXRyeS5jb250ZW50V2lkdGhBbmRNYXJnaW4udXNlZE1hcmdpbik7Ci0gICAg ZGlzcGxheUJveC5zZXRIb3Jpem9udGFsQ29tcHV0ZWRNYXJnaW4oaG9yaXpvbnRhbEdlb21ldHJ5 LmNvbnRlbnRXaWR0aEFuZE1hcmdpbi5jb21wdXRlZE1hcmdpbik7CisgICAgZGlzcGxheUJveC5z ZXRIb3Jpem9udGFsTWFyZ2luKHsgaG9yaXpvbnRhbEdlb21ldHJ5LmNvbnRlbnRXaWR0aEFuZE1h cmdpbi51c2VkTWFyZ2luIH0pOworICAgIGRpc3BsYXlCb3guc2V0SG9yaXpvbnRhbENvbXB1dGVk TWFyZ2luKHsgaG9yaXpvbnRhbEdlb21ldHJ5LmNvbnRlbnRXaWR0aEFuZE1hcmdpbi5jb21wdXRl ZE1hcmdpbiB9KTsKIH0KIAogdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxv d1ZlcnRpY2FsR2VvbWV0cnkoY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IENvbnN0cmFpbnRz Rm9yT3V0T2ZGbG93Q29udGVudCYgY29uc3RyYWludHMpCkBAIC0xMjMsNyArMTIzLDcgQEAgdm9p ZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0cnkoY29u c3QgQm94JiBsYXlvdXRCb3gsIGMKICAgICBkaXNwbGF5Qm94LnNldFRvcCh2ZXJ0aWNhbEdlb21l dHJ5LnRvcCArIG5vbkNvbGxhcHNlZFZlcnRpY2FsTWFyZ2luLmJlZm9yZSk7CiAgICAgZGlzcGxh eUJveC5zZXRDb250ZW50Qm94SGVpZ2h0KHZlcnRpY2FsR2VvbWV0cnkuY29udGVudEhlaWdodEFu ZE1hcmdpbi5jb250ZW50SGVpZ2h0KTsKICAgICAvLyBNYXJnaW5zIG9mIGFic29sdXRlbHkgcG9z aXRpb25lZCBib3hlcyBkbyBub3QgY29sbGFwc2UKLSAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2Fs TWFyZ2luKHsgbm9uQ29sbGFwc2VkVmVydGljYWxNYXJnaW4sIHsgfSB9KTsKKyAgICBkaXNwbGF5 Qm94LnNldFZlcnRpY2FsTWFyZ2luKG5vbkNvbGxhcHNlZFZlcnRpY2FsTWFyZ2luKTsKIH0KIAog dm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUJvcmRlckFuZFBhZGRpbmcoY29uc3QgQm94 JiBsYXlvdXRCb3gsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYgaG9yaXpvbnRhbENvbnN0 cmFpbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5n L0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCAxYWUwYjM1ZTJmMjUy YjUyZTFiYWI1MGFjMWEyOTk5MDM5NDI3MjcyLi5mN2QyNjU2NDgzNjhmODQ5ZjAxMTdkOTdlN2Ux MGViOWFlOGEzMjNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTMyNiw3 ICszMjYsNyBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVXaWR0aEFuZE1h cmdpbihjb25zdCBGbG9hdGluZ0NvbnRleHQmIGZsb2F0aQogICAgIGF1dG8gY29udGVudFdpZHRo QW5kTWFyZ2luID0gZ2VvbWV0cnkoKS5jb21wdXRlZFdpZHRoQW5kTWFyZ2luKGxheW91dEJveCwg Y29uc3RyYWludHNQYWlyLmNvbnRhaW5pbmdCbG9jay5ob3Jpem9udGFsLCBhdmFpbGFibGVXaWR0 aEZsb2F0QXZvaWRlcik7CiAgICAgYXV0byYgZGlzcGxheUJveCA9IGZvcm1hdHRpbmdTdGF0ZSgp LmRpc3BsYXlCb3gobGF5b3V0Qm94KTsKICAgICBkaXNwbGF5Qm94LnNldENvbnRlbnRCb3hXaWR0 aChjb250ZW50V2lkdGhBbmRNYXJnaW4uY29udGVudFdpZHRoKTsKLSAgICBkaXNwbGF5Qm94LnNl dEhvcml6b250YWxNYXJnaW4oY29udGVudFdpZHRoQW5kTWFyZ2luLnVzZWRNYXJnaW4pOworICAg IGRpc3BsYXlCb3guc2V0SG9yaXpvbnRhbE1hcmdpbih7IGNvbnRlbnRXaWR0aEFuZE1hcmdpbi51 c2VkTWFyZ2luIH0pOwogICAgIGRpc3BsYXlCb3guc2V0SG9yaXpvbnRhbENvbXB1dGVkTWFyZ2lu KGNvbnRlbnRXaWR0aEFuZE1hcmdpbi5jb21wdXRlZE1hcmdpbik7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmggYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5oCmluZGV4IGEzOTk1MjNhNTUw MjM3Mzc5OGNlNjk5MDA0YjkzZmM1NmQ5OGY0MmUuLmNjYWJhZTNmMDAzM2Q2MmFmY2UyMTFjNTQw YzRlNmEzYWEzYTA2OTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5 dHJlZS9EaXNwbGF5Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVl L0Rpc3BsYXlCb3guaApAQCAtNTYsOCArNTYsNjAgQEAgcHVibGljOgogICAgIFJlY3QgcmVjdCgp IGNvbnN0IHsgcmV0dXJuIHsgdG9wKCksIGxlZnQoKSwgd2lkdGgoKSwgaGVpZ2h0KCkgfTsgfQog ICAgIFJlY3QgcmVjdFdpdGhNYXJnaW4oKSBjb25zdDsKIAotICAgIExheW91dDo6VXNlZFZlcnRp Y2FsTWFyZ2luIHZlcnRpY2FsTWFyZ2luKCkgY29uc3Q7Ci0gICAgTGF5b3V0OjpVc2VkSG9yaXpv bnRhbE1hcmdpbiBob3Jpem9udGFsTWFyZ2luKCkgY29uc3Q7CisgICAgc3RydWN0IFZlcnRpY2Fs TWFyZ2luIHsKKyAgICAgICAgTGF5b3V0VW5pdCBiZWZvcmUoKSBjb25zdCB7IHJldHVybiBtX2Nv bGxhcHNlZFZhbHVlcy5iZWZvcmUudmFsdWVPcihtX25vbkNvbGxhcHNlZFZhbHVlcy5iZWZvcmUp OyB9CisgICAgICAgIExheW91dFVuaXQgYWZ0ZXIoKSBjb25zdCB7IHJldHVybiBtX2NvbGxhcHNl ZFZhbHVlcy5hZnRlci52YWx1ZU9yKG1fbm9uQ29sbGFwc2VkVmFsdWVzLmFmdGVyKTsgfQorICAg ICAgICBib29sIGlzQ29sbGFwc2VkVGhyb3VnaCgpIGNvbnN0IHsgcmV0dXJuIG1fY29sbGFwc2Vk VmFsdWVzLmlzQ29sbGFwc2VkVGhyb3VnaDsgfQorCisgICAgICAgIHN0cnVjdCBOb25Db2xsYXBz ZWRWYWx1ZXMgeworICAgICAgICAgICAgTm9uQ29sbGFwc2VkVmFsdWVzKExheW91dDo6VXNlZFZl cnRpY2FsTWFyZ2luOjpOb25Db2xsYXBzZWRWYWx1ZXMpOworICAgICAgICAgICAgTm9uQ29sbGFw c2VkVmFsdWVzKCkgPSBkZWZhdWx0OworCisgICAgICAgICAgICBMYXlvdXRVbml0IGJlZm9yZTsK KyAgICAgICAgICAgIExheW91dFVuaXQgYWZ0ZXI7CisgICAgICAgIH07CisgICAgICAgIE5vbkNv bGxhcHNlZFZhbHVlcyBub25Db2xsYXBzZWRWYWx1ZXMoKSBjb25zdCB7IHJldHVybiBtX25vbkNv bGxhcHNlZFZhbHVlczsgfQorCisgICAgICAgIHN0cnVjdCBDb2xsYXBzZWRWYWx1ZXMgeworICAg ICAgICAgICAgQ29sbGFwc2VkVmFsdWVzKExheW91dDo6VXNlZFZlcnRpY2FsTWFyZ2luOjpDb2xs YXBzZWRWYWx1ZXMpOworICAgICAgICAgICAgQ29sbGFwc2VkVmFsdWVzKCkgPSBkZWZhdWx0Owor CisgICAgICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBiZWZvcmU7CisgICAgICAgICAgICBP cHRpb25hbDxMYXlvdXRVbml0PiBhZnRlcjsKKyAgICAgICAgICAgIGJvb2wgaXNDb2xsYXBzZWRU aHJvdWdoIHsgZmFsc2UgfTsKKyAgICAgICAgfTsKKyAgICAgICAgQ29sbGFwc2VkVmFsdWVzIGNv bGxhcHNlZFZhbHVlcygpIGNvbnN0IHsgcmV0dXJuIG1fY29sbGFwc2VkVmFsdWVzOyB9CisgICAg ICAgIGJvb2wgaGFzQ29sbGFwc2VkVmFsdWVzKCkgY29uc3QgeyByZXR1cm4gbV9jb2xsYXBzZWRW YWx1ZXMuYmVmb3JlIHx8IG1fY29sbGFwc2VkVmFsdWVzLmFmdGVyOyB9CisgICAgICAgIHZvaWQg c2V0Q29sbGFwc2VkVmFsdWVzKENvbGxhcHNlZFZhbHVlcyBjb2xsYXBzZWRWYWx1ZXMpIHsgbV9j b2xsYXBzZWRWYWx1ZXMgPSBjb2xsYXBzZWRWYWx1ZXM7IH0KKworICAgICAgICBWZXJ0aWNhbE1h cmdpbihOb25Db2xsYXBzZWRWYWx1ZXMsIENvbGxhcHNlZFZhbHVlcyk7CisgICAgICAgIFZlcnRp Y2FsTWFyZ2luKExheW91dDo6VXNlZFZlcnRpY2FsTWFyZ2luKTsKKyAgICAgICAgVmVydGljYWxN YXJnaW4oTGF5b3V0OjpVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVlcyk7Cisg ICAgICAgIFZlcnRpY2FsTWFyZ2luKCkgPSBkZWZhdWx0OworCisgICAgcHJpdmF0ZToKKyAgICAg ICAgTm9uQ29sbGFwc2VkVmFsdWVzIG1fbm9uQ29sbGFwc2VkVmFsdWVzOworICAgICAgICBDb2xs YXBzZWRWYWx1ZXMgbV9jb2xsYXBzZWRWYWx1ZXM7CisgICAgfTsKKworICAgIHN0cnVjdCBDb21w dXRlZEhvcml6b250YWxNYXJnaW4geworICAgICAgICBDb21wdXRlZEhvcml6b250YWxNYXJnaW4o KSA9IGRlZmF1bHQ7CisgICAgICAgIENvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbihMYXlvdXQ6OkNv bXB1dGVkSG9yaXpvbnRhbE1hcmdpbik7CisKKyAgICAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4g c3RhcnQ7CisgICAgICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IGVuZDsKKyAgICB9OworCisgICAg c3RydWN0IEhvcml6b250YWxNYXJnaW4geworICAgICAgICBIb3Jpem9udGFsTWFyZ2luKCkgPSBk ZWZhdWx0OworICAgICAgICBIb3Jpem9udGFsTWFyZ2luKExheW91dDo6VXNlZEhvcml6b250YWxN YXJnaW4pOworICAgICAgICBIb3Jpem9udGFsTWFyZ2luKExheW91dFVuaXQsIExheW91dFVuaXQp OworCisgICAgICAgIExheW91dFVuaXQgc3RhcnQ7CisgICAgICAgIExheW91dFVuaXQgZW5kOwor ICAgIH07CisgICAgVmVydGljYWxNYXJnaW4gdmVydGljYWxNYXJnaW4oKSBjb25zdDsKKyAgICBI b3Jpem9udGFsTWFyZ2luIGhvcml6b250YWxNYXJnaW4oKSBjb25zdDsKICAgICBMYXlvdXRVbml0 IG1hcmdpbkJlZm9yZSgpIGNvbnN0OwogICAgIExheW91dFVuaXQgbWFyZ2luU3RhcnQoKSBjb25z dDsKICAgICBMYXlvdXRVbml0IG1hcmdpbkFmdGVyKCkgY29uc3Q7CkBAIC0xMjgsOSArMTgwLDkg QEAgcHVibGljOgogICAgIHZvaWQgc2V0Q29udGVudEJveEhlaWdodChMYXlvdXRVbml0KTsKICAg ICB2b2lkIHNldENvbnRlbnRCb3hXaWR0aChMYXlvdXRVbml0KTsKIAotICAgIHZvaWQgc2V0SG9y aXpvbnRhbE1hcmdpbihMYXlvdXQ6OlVzZWRIb3Jpem9udGFsTWFyZ2luKTsKLSAgICB2b2lkIHNl dFZlcnRpY2FsTWFyZ2luKExheW91dDo6VXNlZFZlcnRpY2FsTWFyZ2luKTsKLSAgICB2b2lkIHNl dEhvcml6b250YWxDb21wdXRlZE1hcmdpbihMYXlvdXQ6OkNvbXB1dGVkSG9yaXpvbnRhbE1hcmdp bik7CisgICAgdm9pZCBzZXRIb3Jpem9udGFsTWFyZ2luKEhvcml6b250YWxNYXJnaW4pOworICAg IHZvaWQgc2V0VmVydGljYWxNYXJnaW4oVmVydGljYWxNYXJnaW4pOworICAgIHZvaWQgc2V0SG9y aXpvbnRhbENvbXB1dGVkTWFyZ2luKENvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbik7CiAgICAgdm9p ZCBzZXRIYXNDbGVhcmFuY2UoKSB7IG1faGFzQ2xlYXJhbmNlID0gdHJ1ZTsgfQogCiAgICAgdm9p ZCBzZXRCb3JkZXIoTGF5b3V0OjpFZGdlcyk7CkBAIC0xNjMsOSArMjE1LDkgQEAgcHJpdmF0ZToK ICAgICBMYXlvdXRVbml0IG1fY29udGVudFdpZHRoOwogICAgIExheW91dFVuaXQgbV9jb250ZW50 SGVpZ2h0OwogCi0gICAgTGF5b3V0OjpVc2VkSG9yaXpvbnRhbE1hcmdpbiBtX2hvcml6b250YWxN YXJnaW47Ci0gICAgTGF5b3V0OjpVc2VkVmVydGljYWxNYXJnaW4gbV92ZXJ0aWNhbE1hcmdpbjsK LSAgICBMYXlvdXQ6OkNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbiBtX2hvcml6b250YWxDb21wdXRl ZE1hcmdpbjsKKyAgICBIb3Jpem9udGFsTWFyZ2luIG1faG9yaXpvbnRhbE1hcmdpbjsKKyAgICBW ZXJ0aWNhbE1hcmdpbiBtX3ZlcnRpY2FsTWFyZ2luOworICAgIENvbXB1dGVkSG9yaXpvbnRhbE1h cmdpbiBtX2hvcml6b250YWxDb21wdXRlZE1hcmdpbjsKICAgICBib29sIG1faGFzQ2xlYXJhbmNl IHsgZmFsc2UgfTsKIAogICAgIExheW91dDo6RWRnZXMgbV9ib3JkZXI7CkBAIC0xODYsNiArMjM4 LDU0IEBAIHByaXZhdGU6CiAjZW5kaWYgLy8gQVNTRVJUX0VOQUJMRUQKIH07CiAKK2lubGluZSBC b3g6OlZlcnRpY2FsTWFyZ2luOjpWZXJ0aWNhbE1hcmdpbihMYXlvdXQ6OlVzZWRWZXJ0aWNhbE1h cmdpbiB1c2VkVmVydGljYWxNYXJnaW4pCisgICAgOiBtX25vbkNvbGxhcHNlZFZhbHVlcyh1c2Vk VmVydGljYWxNYXJnaW4ubm9uQ29sbGFwc2VkVmFsdWVzKCkpCisgICAgLCBtX2NvbGxhcHNlZFZh bHVlcyh1c2VkVmVydGljYWxNYXJnaW4uY29sbGFwc2VkVmFsdWVzKCkpCit7Cit9CisKK2lubGlu ZSBCb3g6OlZlcnRpY2FsTWFyZ2luOjpWZXJ0aWNhbE1hcmdpbihWZXJ0aWNhbE1hcmdpbjo6Tm9u Q29sbGFwc2VkVmFsdWVzIG5vbkNvbGxhcHNlZFZhbHVlcywgVmVydGljYWxNYXJnaW46OkNvbGxh cHNlZFZhbHVlcyBjb2xsYXBzZWRWYWx1ZXMpCisgICAgOiBtX25vbkNvbGxhcHNlZFZhbHVlcyhu b25Db2xsYXBzZWRWYWx1ZXMpCisgICAgLCBtX2NvbGxhcHNlZFZhbHVlcyhjb2xsYXBzZWRWYWx1 ZXMpCit7Cit9CisKK2lubGluZSBCb3g6OlZlcnRpY2FsTWFyZ2luOjpWZXJ0aWNhbE1hcmdpbihM YXlvdXQ6OlVzZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzIG5vbkNvbGxhcHNl ZFZhbHVlcykKKyAgICA6IG1fbm9uQ29sbGFwc2VkVmFsdWVzKG5vbkNvbGxhcHNlZFZhbHVlcykK K3sKK30KKworaW5saW5lIEJveDo6VmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVlczo6 Tm9uQ29sbGFwc2VkVmFsdWVzKExheW91dDo6VXNlZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xsYXBz ZWRWYWx1ZXMgbm9uQ29sbGFwc2VkVmFsdWVzKQorICAgIDogYmVmb3JlKG5vbkNvbGxhcHNlZFZh bHVlcy5iZWZvcmUpCisgICAgLCBhZnRlcihub25Db2xsYXBzZWRWYWx1ZXMuYWZ0ZXIpCit7Cit9 CisKK2lubGluZSBCb3g6OlZlcnRpY2FsTWFyZ2luOjpDb2xsYXBzZWRWYWx1ZXM6OkNvbGxhcHNl ZFZhbHVlcyhMYXlvdXQ6OlVzZWRWZXJ0aWNhbE1hcmdpbjo6Q29sbGFwc2VkVmFsdWVzIGNvbGxh cHNlZFZhbHVlcykKKyAgICA6IGJlZm9yZShjb2xsYXBzZWRWYWx1ZXMuYmVmb3JlKQorICAgICwg YWZ0ZXIoY29sbGFwc2VkVmFsdWVzLmFmdGVyKQorICAgICwgaXNDb2xsYXBzZWRUaHJvdWdoKGNv bGxhcHNlZFZhbHVlcy5pc0NvbGxhcHNlZFRocm91Z2gpCit7Cit9CisKK2lubGluZSBCb3g6OkNv bXB1dGVkSG9yaXpvbnRhbE1hcmdpbjo6Q29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luKExheW91dDo6 Q29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luIGNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbikKKyAgICA6 IHN0YXJ0KGNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbi5zdGFydCkKKyAgICAsIGVuZChjb21wdXRl ZEhvcml6b250YWxNYXJnaW4uZW5kKQoreworfQorCitpbmxpbmUgQm94OjpIb3Jpem9udGFsTWFy Z2luOjpIb3Jpem9udGFsTWFyZ2luKExheW91dDo6VXNlZEhvcml6b250YWxNYXJnaW4gaG9yaXpv bnRhbE1hcmdpbikKKyAgICA6IHN0YXJ0KGhvcml6b250YWxNYXJnaW4uc3RhcnQpCisgICAgLCBl bmQoaG9yaXpvbnRhbE1hcmdpbi5lbmQpCit7Cit9CisKK2lubGluZSBCb3g6Okhvcml6b250YWxN YXJnaW46Okhvcml6b250YWxNYXJnaW4oTGF5b3V0VW5pdCBzdGFydCwgTGF5b3V0VW5pdCBlbmQp CisgICAgOiBzdGFydChzdGFydCkKKyAgICAsIGVuZChlbmQpCit7Cit9CisKICNpZiBBU1NFUlRf RU5BQkxFRAogaW5saW5lIHZvaWQgQm94OjppbnZhbGlkYXRlTWFyZ2luKCkKIHsKQEAgLTI2Niw3 ICszNjYsNyBAQCBpbmxpbmUgTGF5b3V0VW5pdCBCb3g6OmNvbnRlbnRCb3hXaWR0aCgpIGNvbnN0 CiAgICAgcmV0dXJuIG1fY29udGVudFdpZHRoOwogfQogCi1pbmxpbmUgdm9pZCBCb3g6OnNldEhv cml6b250YWxNYXJnaW4oTGF5b3V0OjpVc2VkSG9yaXpvbnRhbE1hcmdpbiBtYXJnaW4pCitpbmxp bmUgdm9pZCBCb3g6OnNldEhvcml6b250YWxNYXJnaW4oSG9yaXpvbnRhbE1hcmdpbiBtYXJnaW4p CiB7CiAjaWYgQVNTRVJUX0VOQUJMRUQKICAgICBzZXRIYXNWYWxpZEhvcml6b250YWxNYXJnaW4o KTsKQEAgLTI3NCw3ICszNzQsNyBAQCBpbmxpbmUgdm9pZCBCb3g6OnNldEhvcml6b250YWxNYXJn aW4oTGF5b3V0OjpVc2VkSG9yaXpvbnRhbE1hcmdpbiBtYXJnaW4pCiAgICAgbV9ob3Jpem9udGFs TWFyZ2luID0gbWFyZ2luOwogfQogCi1pbmxpbmUgdm9pZCBCb3g6OnNldFZlcnRpY2FsTWFyZ2lu KExheW91dDo6VXNlZFZlcnRpY2FsTWFyZ2luIG1hcmdpbikKK2lubGluZSB2b2lkIEJveDo6c2V0 VmVydGljYWxNYXJnaW4oVmVydGljYWxNYXJnaW4gbWFyZ2luKQogewogI2lmIEFTU0VSVF9FTkFC TEVECiAgICAgc2V0SGFzVmFsaWRWZXJ0aWNhbE1hcmdpbigpOwpAQCAtMjg0LDcgKzM4NCw3IEBA IGlubGluZSB2b2lkIEJveDo6c2V0VmVydGljYWxNYXJnaW4oTGF5b3V0OjpVc2VkVmVydGljYWxN YXJnaW4gbWFyZ2luKQogICAgIG1fdmVydGljYWxNYXJnaW4gPSBtYXJnaW47CiB9CiAKLWlubGlu ZSB2b2lkIEJveDo6c2V0SG9yaXpvbnRhbENvbXB1dGVkTWFyZ2luKExheW91dDo6Q29tcHV0ZWRI b3Jpem9udGFsTWFyZ2luIG1hcmdpbikKK2lubGluZSB2b2lkIEJveDo6c2V0SG9yaXpvbnRhbENv bXB1dGVkTWFyZ2luKENvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbiBtYXJnaW4pCiB7CiAjaWYgQVNT RVJUX0VOQUJMRUQKICAgICBzZXRIYXNWYWxpZEhvcml6b250YWxDb21wdXRlZE1hcmdpbigpOwpA QCAtMzI0LDEzICs0MjQsMTMgQEAgaW5saW5lIFJlY3QgQm94OjpyZWN0V2l0aE1hcmdpbigpIGNv bnN0CiAgICAgcmV0dXJuIHsgdG9wKCkgLSBtYXJnaW5CZWZvcmUoKSwgbGVmdCgpIC0gbWFyZ2lu U3RhcnQoKSwgbWFyZ2luU3RhcnQoKSArIHdpZHRoKCkgKyBtYXJnaW5FbmQoKSwgbWFyZ2luQmVm b3JlKCkgKyBoZWlnaHQoKSArIG1hcmdpbkFmdGVyIH07CiB9CiAKLWlubGluZSBMYXlvdXQ6OlVz ZWRWZXJ0aWNhbE1hcmdpbiBCb3g6OnZlcnRpY2FsTWFyZ2luKCkgY29uc3QKK2lubGluZSBCb3g6 OlZlcnRpY2FsTWFyZ2luIEJveDo6dmVydGljYWxNYXJnaW4oKSBjb25zdAogewogICAgIEFTU0VS VChtX2hhc1ZhbGlkVmVydGljYWxNYXJnaW4pOwogICAgIHJldHVybiBtX3ZlcnRpY2FsTWFyZ2lu OwogfQogCi1pbmxpbmUgTGF5b3V0OjpVc2VkSG9yaXpvbnRhbE1hcmdpbiBCb3g6Omhvcml6b250 YWxNYXJnaW4oKSBjb25zdAoraW5saW5lIEJveDo6SG9yaXpvbnRhbE1hcmdpbiBCb3g6Omhvcml6 b250YWxNYXJnaW4oKSBjb25zdAogewogICAgIEFTU0VSVChtX2hhc1ZhbGlkSG9yaXpvbnRhbE1h cmdpbik7CiAgICAgcmV0dXJuIG1faG9yaXpvbnRhbE1hcmdpbjsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmgKaW5kZXggYjNjZDJjOGMwMGQzYzFhNTM2M2U1 ZGRhOGNjMDEwNGU0ZjQ0ODliOS4uN2JhMWZkZTQ4NTE0MTZkZDdmYzFhZmMzMTMwOTk0NTExNjkx NGI4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0 YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmgK QEAgLTcwLDcgKzcwLDcgQEAgcHVibGljOgogICAgICAgICBib29sIGlzSW5Gb3JtYXR0aW5nQ29u dGV4dE9mKGNvbnN0IENvbnRhaW5lckJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290KSBjb25zdCB7 IHJldHVybiBtX2xheW91dEJveC0+aXNJbkZvcm1hdHRpbmdDb250ZXh0T2YoZm9ybWF0dGluZ0Nv bnRleHRSb290KTsgfQogCiAgICAgICAgIERpc3BsYXk6OlJlY3QgcmVjdFdpdGhNYXJnaW4oKSBj b25zdCB7IHJldHVybiBtX2Fic29sdXRlRGlzcGxheUJveC5yZWN0V2l0aE1hcmdpbigpOyB9Ci0g ICAgICAgIFVzZWRIb3Jpem9udGFsTWFyZ2luIGhvcml6b250YWxNYXJnaW4oKSBjb25zdCB7IHJl dHVybiBtX2Fic29sdXRlRGlzcGxheUJveC5ob3Jpem9udGFsTWFyZ2luKCk7IH0KKyAgICAgICAg RGlzcGxheTo6Qm94OjpIb3Jpem9udGFsTWFyZ2luIGhvcml6b250YWxNYXJnaW4oKSBjb25zdCB7 IHJldHVybiBtX2Fic29sdXRlRGlzcGxheUJveC5ob3Jpem9udGFsTWFyZ2luKCk7IH0KICAgICAg ICAgUG9zaXRpb25JbkNvbnRleHRSb290IGJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIHsgbV9hYnNv bHV0ZURpc3BsYXlCb3guYm90dG9tKCkgfTsgfQogCiAjaWYgQVNTRVJUX0VOQUJMRUQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA4OWJiMDc2NzZhY2QxN2ZiMmRmNjgw MTQ0ZDgxNzFkZmEzYTUzNTRkLi41NjA5ZmMwYmY1ZjUzZjA4ZTgxMjdlOTdlNThiNmEwMDU2ZDg4 YTBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0zMTUsNyArMzE1 LDcgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVdpZHRoQW5kTWFyZ2lu KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdAogCiAgICAgYXV0byYgZGlzcGxheUJveCA9IGZv cm1hdHRpbmdTdGF0ZSgpLmRpc3BsYXlCb3gobGF5b3V0Qm94KTsKICAgICBkaXNwbGF5Qm94LnNl dENvbnRlbnRCb3hXaWR0aChjb250ZW50V2lkdGhBbmRNYXJnaW4uY29udGVudFdpZHRoKTsKLSAg ICBkaXNwbGF5Qm94LnNldEhvcml6b250YWxNYXJnaW4oY29udGVudFdpZHRoQW5kTWFyZ2luLnVz ZWRNYXJnaW4pOworICAgIGRpc3BsYXlCb3guc2V0SG9yaXpvbnRhbE1hcmdpbih7IGNvbnRlbnRX aWR0aEFuZE1hcmdpbi51c2VkTWFyZ2luIH0pOwogICAgIGRpc3BsYXlCb3guc2V0SG9yaXpvbnRh bENvbXB1dGVkTWFyZ2luKGNvbnRlbnRXaWR0aEFuZE1hcmdpbi5jb21wdXRlZE1hcmdpbik7CiB9 CiAKQEAgLTM0Niw3ICszNDYsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21w dXRlSGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdAogICAgIH0KICAg ICBhdXRvJiBkaXNwbGF5Qm94ID0gZm9ybWF0dGluZ1N0YXRlKCkuZGlzcGxheUJveChsYXlvdXRC b3gpOwogICAgIGRpc3BsYXlCb3guc2V0Q29udGVudEJveEhlaWdodChjb250ZW50SGVpZ2h0QW5k TWFyZ2luLmNvbnRlbnRIZWlnaHQpOwotICAgIGRpc3BsYXlCb3guc2V0VmVydGljYWxNYXJnaW4o eyBjb250ZW50SGVpZ2h0QW5kTWFyZ2luLm5vbkNvbGxhcHNlZE1hcmdpbiwgeyB9IH0pOworICAg IGRpc3BsYXlCb3guc2V0VmVydGljYWxNYXJnaW4oeyBjb250ZW50SGVpZ2h0QW5kTWFyZ2luLm5v bkNvbGxhcHNlZE1hcmdpbiB9KTsKIH0KIAogdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 Y29sbGVjdElubGluZUNvbnRlbnRJZk5lZWRlZCgpCg==