212263 2020-05-22 08:06:13 -0700 [LFC][TFC] Non-collapsing row border should not make the table wider/taller 2020-05-23 06:35:16 -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 1655322 0 zalan 2020-05-22 08:06:13 -0700 border eats into the content box. 1655573 1 400106 zalan 2020-05-22 21:36:52 -0700 Created attachment 400106 Patch 1655597 2 400117 zalan 2020-05-23 05:44:58 -0700 Created attachment 400117 Patch 1655600 3 ews-feeder 2020-05-23 06:34:52 -0700 Committed r262097: <https://trac.webkit.org/changeset/262097> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400117. 1655601 4 webkit-bug-importer 2020-05-23 06:35:16 -0700 <rdar://problem/63568746> 400106 2020-05-22 21:36:52 -0700 2020-05-23 05:44:56 -0700 Patch bug-212263-20200522213652.patch text/plain 10223 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxOTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGNhNGJiNmYwNWQ0ZTA3 YTVkNjU5MjM1ZGRjMzEzODdiYTcxNzk3YS4uY2M5OTU0NDZjZDczYjBiYWUxZTVhM2RhOTE5YzBm YWQ3ZjMyYzk2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA1LTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBOb24tY29s bGFwc2luZyByb3cgYm9yZGVyIHNob3VsZCBub3QgbWFrZSB0aGUgdGFibGUgd2lkZXIvdGFsbGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIyNjMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb24tY29s bGFwc2luZyByb3cgYm9yZGVyIGVhdHMgaW50byB0aGUgY29udGVudCBib3ggYnV0IG9kZGx5IGl0 IGRvZXMgbm90CisgICAgICAgIGNvbnN0cmFpbnQgdGhlIGNlbGwgYm94ZXMsIHNvIHdlIGNhbiBl bmQgdXAgd2l0aCBzbWFsbGVyIHJvdyBjb250ZW50IGJveCB0aGFuCisgICAgICAgIHRoZSBjZWxs IGJveCBpdCBjb250YWlucy4KKworICAgICAgICBUZXN0OiBmYXN0L2xheW91dGZvcm1hdHRpbmdj b250ZXh0L3RhYmxlLXNpbXBsZS1yb3ctYm9yZGVyLmh0bWwKKworICAgICAgICAqIGxheW91dC9M YXlvdXRVbml0cy5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpFZGdlczo6d2lkdGggY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpFZGdlczo6aGVpZ2h0IGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6SG9yaXpvbnRhbEVkZ2VzOjp3aWR0aCBjb25zdCk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlZlcnRpY2FsRWRnZXM6OmhlaWdodCBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZv cm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3Jt YXR0aW5nQ29udGV4dDo6c2V0VXNlZEdlb21ldHJ5Rm9yUm93cyk6CisgICAgICAgICogbGF5b3V0 L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 aW50cmluc2ljV2lkdGhDb25zdHJhaW50c0ZvckNlbGwpOgorCiAyMDIwLTA1LTIxICBTZXJnaW8g VmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtZ3JpZF0g W2Nzcy1mbGV4XSBXaWR0aCBvZiB0YWJsZSBhcyBncmlkL2ZsZXggaXRlbSBpcyBpbmZpbml0ZSB3 aGVuIHRoZSBzdW0gb2YgY29sdW1ucycgd2lkdGggZXhjZWVkIDEwMCUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRVbml0cy5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L0xheW91dFVuaXRzLmgKaW5kZXggNThjMDk2ZGYyODEyOWJkZmUyODU1MTUxYTVkMGM3N2M3ZTUz YmVkYS4uZDdjODFiNWVjOTk3MTRjZTUxODhjODhiYjEzNmFjNWFmZTFkZDljMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFVuaXRzLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L0xheW91dFVuaXRzLmgKQEAgLTExNSwyMCArMTE1LDE5IEBAIGlubGluZSB2b2lk IFBvaW50Ojptb3ZlQnkoTGF5b3V0UG9pbnQgb2Zmc2V0KQogc3RydWN0IEhvcml6b250YWxFZGdl cyB7CiAgICAgTGF5b3V0VW5pdCBsZWZ0OwogICAgIExheW91dFVuaXQgcmlnaHQ7Ci0KLSAgICBM YXlvdXRVbml0IHdpZHRoKCkgY29uc3QgeyByZXR1cm4gbGVmdCArIHJpZ2h0OyB9CiB9OwogCiBz dHJ1Y3QgVmVydGljYWxFZGdlcyB7CiAgICAgTGF5b3V0VW5pdCB0b3A7CiAgICAgTGF5b3V0VW5p dCBib3R0b207Ci0KLSAgICBMYXlvdXRVbml0IGhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIHRvcCAr IGJvdHRvbTsgfQogfTsKIAogc3RydWN0IEVkZ2VzIHsKICAgICBIb3Jpem9udGFsRWRnZXMgaG9y aXpvbnRhbDsKICAgICBWZXJ0aWNhbEVkZ2VzIHZlcnRpY2FsOworCisgICAgTGF5b3V0VW5pdCB3 aWR0aCgpIGNvbnN0IHsgcmV0dXJuIGhvcml6b250YWwubGVmdCArIGhvcml6b250YWwucmlnaHQ7 IH0KKyAgICBMYXlvdXRVbml0IGhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIHZlcnRpY2FsLnRvcCAr IHZlcnRpY2FsLmJvdHRvbTsgfQogfTsKIAogaW5saW5lIEVkZ2VzIG9wZXJhdG9yLyhjb25zdCBF ZGdlcyYgZWRnZSwgc2l6ZV90IHZhbHVlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L1ZlcmlmaWNhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVyaWZpY2F0aW9u LmNwcAppbmRleCBkZmQ0NjAyODNhYjAxZWIxNzMyZTM1N2NmNWM3MmVhYjM5YjE2N2U0Li42Y2Uw OWQ0NzcxOTU3ZmFmY2UzOWUzOGZlYmIxYWY3NTAzZjA4NmNmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvVmVyaWZpY2F0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvVmVyaWZpY2F0aW9uLmNwcApAQCAtMjc0LDEyICsyNzQsMTUgQEAgc3RhdGljIGJvb2wgb3V0 cHV0TWlzbWF0Y2hpbmdCbG9ja0JveEluZm9ybWF0aW9uSWZOZWVkZWQoVGV4dFN0cmVhbSYgc3Ry ZWFtLCBjb24KICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCi0gICAgaWYgKCFhcmVFc3Nl bnRpYWxseUVxdWFsKHJlbmRlcmVyLnBhZGRpbmdCb3hSZWN0KCksIGRpc3BsYXlCb3gucGFkZGlu Z0JveCgpKSkgeworICAgIGF1dG8gc2hvdWxkQ2hlY2tQYWRkaW5nQW5kQ29udGVudEJveCA9ICFp czxSZW5kZXJUYWJsZVJvdz4ocmVuZGVyZXIpIHx8IHJlbmRlcmVyLnBhZGRpbmdCb3hSZWN0KCku d2lkdGgoKSA+PSAwOworICAgIGlmIChzaG91bGRDaGVja1BhZGRpbmdBbmRDb250ZW50Qm94ICYm ICFhcmVFc3NlbnRpYWxseUVxdWFsKHJlbmRlcmVyLnBhZGRpbmdCb3hSZWN0KCksIGRpc3BsYXlC b3gucGFkZGluZ0JveCgpKSkgewogICAgICAgICBvdXRwdXRSZWN0KCJwYWRkaW5nQm94IiwgcmVu ZGVyZXIucGFkZGluZ0JveFJlY3QoKSwgZGlzcGxheUJveC5wYWRkaW5nQm94KCkpOwogICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKICAgICBhdXRvIHNob3VsZENoZWNrQ29udGVudEJveCA9 IFsmXSB7CisgICAgICAgIGlmICghc2hvdWxkQ2hlY2tQYWRkaW5nQW5kQ29udGVudEJveCkKKyAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgLy8gRklYTUU6IEZpZ3VyZSBvdXQgd2h5 IHRydW5rL3JlbmRlcmluZyBjb21lcyBiYWNrIHdpdGggb2RkIHZhbHVlcyBmb3IgPHRib2R5PiBh bmQgPHRkPiBjb250ZW50IGJveC4KICAgICAgICAgaWYgKGlzPFJlbmRlclRhYmxlQ2VsbD4ocmVu ZGVyZXIpIHx8IGlzPFJlbmRlclRhYmxlU2VjdGlvbj4ocmVuZGVyZXIpKQogICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9y bWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggZjNiMjg1 NDZmZWYxMmY1NWUxNjQ1NGFhMmU0ZDhiYTc4MjQyN2Q1My4uMmM4NDE4ZWZlY2M5ZWU3MTk0OGRh ZDI5OGQwNGIwYzU4M2ZjZDIyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3Rh YmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBA IC0xMTMsMTMgKzExMywxOSBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OnNldFVzZWRH ZW9tZXRyeUZvclJvd3MoTGF5b3V0VW5pdCBhdmFpbGFibGVIb3Jpem9udAogICAgIGF1dG8mIGdy aWQgPSBmb3JtYXR0aW5nU3RhdGUoKS50YWJsZUdyaWQoKTsKICAgICBhdXRvJiByb3dzID0gZ3Jp ZC5yb3dzKCkubGlzdCgpOwogCi0gICAgYXV0byByb3dXaWR0aCA9IGdyaWQuY29sdW1ucygpLmxv Z2ljYWxXaWR0aCgpICsgMiAqIGdyaWQuaG9yaXpvbnRhbFNwYWNpbmcoKTsKICAgICBhdXRvIHJv d0xvZ2ljYWxUb3AgPSBncmlkLnZlcnRpY2FsU3BhY2luZygpOwogICAgIGZvciAoc2l6ZV90IHJv d0luZGV4ID0gMDsgcm93SW5kZXggPCByb3dzLnNpemUoKTsgKytyb3dJbmRleCkgewogICAgICAg ICBhdXRvJiByb3cgPSByb3dzW3Jvd0luZGV4XTsKICAgICAgICAgYXV0byYgcm93Qm94ID0gcm93 LmJveCgpOwogICAgICAgICBhdXRvJiByb3dEaXNwbGF5Qm94ID0gZm9ybWF0dGluZ1N0YXRlKCku ZGlzcGxheUJveChyb3dCb3gpOwogCisgICAgICAgIHJvd0Rpc3BsYXlCb3guc2V0UGFkZGluZyhn ZW9tZXRyeSgpLmNvbXB1dGVkUGFkZGluZyhyb3dCb3gsIGF2YWlsYWJsZUhvcml6b250YWxTcGFj ZSkpOworICAgICAgICAvLyBJbnRlcm5hbCB0YWJsZSBlbGVtZW50cyBkbyBub3QgaGF2ZSBtYXJn aW5zLgorICAgICAgICByb3dEaXNwbGF5Qm94LnNldEhvcml6b250YWxNYXJnaW4oeyB9KTsKKyAg ICAgICAgcm93RGlzcGxheUJveC5zZXRIb3Jpem9udGFsQ29tcHV0ZWRNYXJnaW4oeyB9KTsKKyAg ICAgICAgcm93RGlzcGxheUJveC5zZXRWZXJ0aWNhbE1hcmdpbih7IHsgfSwgeyB9IH0pOworCisK ICAgICAgICAgYXV0byBjb21wdXRlZFJvd0JvcmRlciA9IFsmXSB7CiAgICAgICAgICAgICBhdXRv IGJvcmRlciA9IGdlb21ldHJ5KCkuY29tcHV0ZWRCb3JkZXIocm93Qm94KTsKICAgICAgICAgICAg IGlmICghZ3JpZC5jb2xsYXBzZWRCb3JkZXIoKSkKQEAgLTEzMiwxNSArMTM4LDI2IEBAIHZvaWQg VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6c2V0VXNlZEdlb21ldHJ5Rm9yUm93cyhMYXlvdXRVbml0 IGF2YWlsYWJsZUhvcml6b250CiAgICAgICAgICAgICAgICAgYm9yZGVyLnZlcnRpY2FsLmJvdHRv bSA9IHsgfTsKICAgICAgICAgICAgIHJldHVybiBib3JkZXI7CiAgICAgICAgIH0oKTsKKyAgICAg ICAgaWYgKGNvbXB1dGVkUm93Qm9yZGVyLmhlaWdodCgpID4gcm93LmxvZ2ljYWxIZWlnaHQoKSkg eworICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMgaXMgYW4gb2RkIHF1aXJrIHdoZW4gdGhlIHJv dyBib3JkZXIgb3ZlcmZsb3dzIHRoZSByb3cuCisgICAgICAgICAgICAvLyBXZSBkb24ndCBwYWlu dCByb3cgYm9yZGVycyBzbyBpdCBkb2VzIG5vdCBtYXR0ZXIgdG9vIG11Y2gsIGJ1dCBpZiB3ZSBk b24ndAorICAgICAgICAgICAgLy8gc2V0IHRoaXMgZmFrZSBib3JkZXIgdmFsdWUsIHRoYW4gd2Ug ZWl0aGVyIGVuZCB1cCB3aXRoIGEgbmVnYXRpdmUgY29udGVudCBib3gKKyAgICAgICAgICAgIC8v IG9yIHdpdGggYSB3aWRlIGZyYW1lIGJveCAob3IgYXMgYSAzcmQgb3B0aW9uLCB3aXRoIGEgdmVy eSBvZGQgc2V0dXAgd2hlcmUgcGFkZGluZyBib3ggKyBib3JkZXIgIT0gZnJhbWUgYm94KQorICAg ICAgICAgICAgY29tcHV0ZWRSb3dCb3JkZXIudmVydGljYWwudG9wID0geyB9OworICAgICAgICAg ICAgY29tcHV0ZWRSb3dCb3JkZXIudmVydGljYWwuYm90dG9tID0geyB9OworICAgICAgICB9Cisg ICAgICAgIHJvd0Rpc3BsYXlCb3guc2V0Q29udGVudEJveEhlaWdodChyb3cubG9naWNhbEhlaWdo dCgpIC0gY29tcHV0ZWRSb3dCb3JkZXIuaGVpZ2h0KCkpOworCisgICAgICAgIGF1dG8gcm93TG9n aWNhbFdpZHRoID0gZ3JpZC5jb2x1bW5zKCkubG9naWNhbFdpZHRoKCkgKyAyICogZ3JpZC5ob3Jp em9udGFsU3BhY2luZygpOworICAgICAgICBpZiAoY29tcHV0ZWRSb3dCb3JkZXIud2lkdGgoKSA+ IHJvd0xvZ2ljYWxXaWR0aCkgeworICAgICAgICAgICAgLy8gU2VlIGNvbW1lbnQgYWJvdmUuCisg ICAgICAgICAgICBjb21wdXRlZFJvd0JvcmRlci5ob3Jpem9udGFsLmxlZnQgPSB7IH07CisgICAg ICAgICAgICBjb21wdXRlZFJvd0JvcmRlci5ob3Jpem9udGFsLnJpZ2h0ID0geyB9OworICAgICAg ICB9CisgICAgICAgIHJvd0Rpc3BsYXlCb3guc2V0Q29udGVudEJveFdpZHRoKHJvd0xvZ2ljYWxX aWR0aCAtIGNvbXB1dGVkUm93Qm9yZGVyLndpZHRoKCkpOworCiAgICAgICAgIHJvd0Rpc3BsYXlC b3guc2V0Qm9yZGVyKGNvbXB1dGVkUm93Qm9yZGVyKTsKLSAgICAgICAgcm93RGlzcGxheUJveC5z ZXRQYWRkaW5nKGdlb21ldHJ5KCkuY29tcHV0ZWRQYWRkaW5nKHJvd0JveCwgYXZhaWxhYmxlSG9y aXpvbnRhbFNwYWNlKSk7Ci0gICAgICAgIC8vIEludGVybmFsIHRhYmxlIGVsZW1lbnRzIGRvIG5v dCBoYXZlIG1hcmdpbnMuCi0gICAgICAgIHJvd0Rpc3BsYXlCb3guc2V0SG9yaXpvbnRhbE1hcmdp bih7IH0pOwotICAgICAgICByb3dEaXNwbGF5Qm94LnNldEhvcml6b250YWxDb21wdXRlZE1hcmdp bih7IH0pOwotICAgICAgICByb3dEaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFyZ2luKHsgeyB9LCB7 IH0gfSk7CiAKLSAgICAgICAgcm93RGlzcGxheUJveC5zZXRDb250ZW50Qm94SGVpZ2h0KHJvdy5s b2dpY2FsSGVpZ2h0KCkpOwotICAgICAgICByb3dEaXNwbGF5Qm94LnNldENvbnRlbnRCb3hXaWR0 aChyb3dXaWR0aCk7CiAgICAgICAgIHJvd0Rpc3BsYXlCb3guc2V0VG9wKHJvd0xvZ2ljYWxUb3Ap OwogICAgICAgICByb3dEaXNwbGF5Qm94LnNldExlZnQoeyB9KTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0 R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJs ZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IGNlZDU3OTJmYzNjYjk2YjIyNDE3 ZjRhMDQyZTE0ZWNiOTQ5YzVhNWMuLmM3NmIxZGIwZDU1NmJiODU4MTRhMjIwOTY0YzQzZDdhOTc3 ZGExNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcv VGFibGVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAK QEAgLTExMCw3ICsxMTAsNyBAQCBGb3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lkdGhDb25z dHJhaW50cyBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aQogICAgIC8vIEZJWE1F IENoZWNrIGZvciBib3gtc2l6aW5nOiBib3JkZXItYm94OwogICAgIGF1dG8gaW50cmluc2ljV2lk dGhDb25zdHJhaW50cyA9IGNvbnN0cmFpbkJ5TWluTWF4V2lkdGgoY2VsbEJveCwgY29tcHV0ZWRJ bnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCkpOwogICAgIC8vIEV4cGFuZCB3aXRoIGJvcmRlcgot ICAgIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMuZXhwYW5kKGNvbXB1dGVkQ2VsbEJvcmRlcihj ZWxsKS5ob3Jpem9udGFsLndpZHRoKCkpOworICAgIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMu ZXhwYW5kKGNvbXB1dGVkQ2VsbEJvcmRlcihjZWxsKS53aWR0aCgpKTsKICAgICAvLyBwYWRkaW5n CiAgICAgaW50cmluc2ljV2lkdGhDb25zdHJhaW50cy5leHBhbmQoZml4ZWRWYWx1ZShzdHlsZS5w YWRkaW5nTGVmdCgpKS52YWx1ZU9yKDApICsgZml4ZWRWYWx1ZShzdHlsZS5wYWRkaW5nUmlnaHQo KSkudmFsdWVPcigwKSk7CiAgICAgLy8gYW5kIG1hcmdpbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGFlYTZmMzZiNTQ2YjFm MmRjMmE3MGM1MmRlMDRlM2U0Y2YwOWQ4NGYuLmMwZjRlODdmYzE4ZmU2NzY4MThhZWFlMGQ0OGJi MjRlNmIzMDVjNzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0wNS0yMiAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtMRkNdW1RGQ10gTm9uLWNvbGxhcHNp bmcgcm93IGJvcmRlciBzaG91bGQgbm90IG1ha2UgdGhlIHRhYmxlIHdpZGVyL3RhbGxlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMjYzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2xheW91 dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXNpbXBsZS1yb3ctYm9yZGVyLWV4cGVjdGVkLmh0bWw6 IEFkZGVkLgorICAgICAgICAqIGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc2lt cGxlLXJvdy1ib3JkZXIuaHRtbDogQWRkZWQuCisKIDIwMjAtMDUtMjEgIFNlcmdpbyBWaWxsYXIg U2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1ncmlkXSB3aWR0aCBv ZiB0YWJsZSBpbiBhIGdyaWQgaXMgaW5jb3JyZWN0IHdoZW4gdGFibGUgY2VsbCBoYXMgd2lkdGg6 MTAwJQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4 dC90YWJsZS1zaW1wbGUtcm93LWJvcmRlci1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFz dC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zaW1wbGUtcm93LWJvcmRlci1leHBlY3Rl ZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjVjNzVjZmQ2ZDViYWVlODViYTUzMTg4ZGI0ZTViZWQyYTc2ODZk OTYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdj b250ZXh0L3RhYmxlLXNpbXBsZS1yb3ctYm9yZGVyLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwx MyBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgaW50ZXJuYWw6 TGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRFbmFibGVkPXRydWUgaW50ZXJuYWw6TGF5b3V0Rm9ybWF0 dGluZ0NvbnRleHRJbnRlZ3JhdGlvbkVuYWJsZWQ9ZmFsc2UgXSAtLT4KKzxzdHlsZT4KK2RpdiB7 CisgICAgaGVpZ2h0OiAxMHB4OworICAgIHdpZHRoOiAxMHB4OworICAgIGJvcmRlcjogMXB4IHNv bGlkIGdyZWVuOworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKK30KKzwvc3R5bGU+Cis8ZGl2IHN0 eWxlPSJ0b3A6IDEwcHg7IGxlZnQ6IDEwcHg7Ij48L2Rpdj4KKzxkaXYgc3R5bGU9InRvcDogMTBw eDsgbGVmdDogMjRweDsiPjwvZGl2PgorPGRpdiBzdHlsZT0idG9wOiAyNHB4OyBsZWZ0OiAxMHB4 OyI+PC9kaXY+Cis8ZGl2IHN0eWxlPSJ0b3A6IDI0cHg7IGxlZnQ6IDI0cHg7Ij48L2Rpdj4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUt c2ltcGxlLXJvdy1ib3JkZXIuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGlu Z2NvbnRleHQvdGFibGUtc2ltcGxlLXJvdy1ib3JkZXIuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xMDg0ZTVm ODU3ZDA5YTU1YzMwOGI5MDBkYTA1YjM4ZTZjN2Q0MjQ2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zaW1wbGUtcm93LWJv cmRlci5odG1sCkBAIC0wLDAgKzEsMTggQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10 ZXN0LXJ1bm5lciBbIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0RW5hYmxlZD10cnVl IGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0SW50ZWdyYXRpb25FbmFibGVkPWZhbHNl IF0gLS0+Cis8c3R5bGU+Cit0ZCB7CisgICAgd2lkdGg6IDEwcHg7CisgICAgaGVpZ2h0OiAxMHB4 OworICAgIHBhZGRpbmc6IDBweDsKKyAgICBib3JkZXI6IDFweCBzb2xpZCBncmVlbjsKK30KKwor dHIgeworICAgIGJvcmRlcjogNTBweCBzb2xpZCByZWQ7Cit9Cis8L3N0eWxlPgorPHRhYmxlPgor PHRyPjx0ZD48L3RkPjx0ZD48L3RkPjwvdHI+Cis8dHI+PHRkPjwvdGQ+PHRkPjwvdGQ+PC90cj4K KzwvdGJvZHk+Cis8L3RhYmxlPgo= 400117 2020-05-23 05:44:58 -0700 2020-05-23 06:34:52 -0700 Patch bug-212263-20200523054457.patch text/plain 10429 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxOTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGNhNGJiNmYwNWQ0ZTA3 YTVkNjU5MjM1ZGRjMzEzODdiYTcxNzk3YS4uY2M5OTU0NDZjZDczYjBiYWUxZTVhM2RhOTE5YzBm YWQ3ZjMyYzk2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA1LTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBOb24tY29s bGFwc2luZyByb3cgYm9yZGVyIHNob3VsZCBub3QgbWFrZSB0aGUgdGFibGUgd2lkZXIvdGFsbGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIyNjMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb24tY29s bGFwc2luZyByb3cgYm9yZGVyIGVhdHMgaW50byB0aGUgY29udGVudCBib3ggYnV0IG9kZGx5IGl0 IGRvZXMgbm90CisgICAgICAgIGNvbnN0cmFpbnQgdGhlIGNlbGwgYm94ZXMsIHNvIHdlIGNhbiBl bmQgdXAgd2l0aCBzbWFsbGVyIHJvdyBjb250ZW50IGJveCB0aGFuCisgICAgICAgIHRoZSBjZWxs IGJveCBpdCBjb250YWlucy4KKworICAgICAgICBUZXN0OiBmYXN0L2xheW91dGZvcm1hdHRpbmdj b250ZXh0L3RhYmxlLXNpbXBsZS1yb3ctYm9yZGVyLmh0bWwKKworICAgICAgICAqIGxheW91dC9M YXlvdXRVbml0cy5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpFZGdlczo6d2lkdGggY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpFZGdlczo6aGVpZ2h0IGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6SG9yaXpvbnRhbEVkZ2VzOjp3aWR0aCBjb25zdCk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlZlcnRpY2FsRWRnZXM6OmhlaWdodCBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZv cm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3Jt YXR0aW5nQ29udGV4dDo6c2V0VXNlZEdlb21ldHJ5Rm9yUm93cyk6CisgICAgICAgICogbGF5b3V0 L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 aW50cmluc2ljV2lkdGhDb25zdHJhaW50c0ZvckNlbGwpOgorCiAyMDIwLTA1LTIxICBTZXJnaW8g VmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtZ3JpZF0g W2Nzcy1mbGV4XSBXaWR0aCBvZiB0YWJsZSBhcyBncmlkL2ZsZXggaXRlbSBpcyBpbmZpbml0ZSB3 aGVuIHRoZSBzdW0gb2YgY29sdW1ucycgd2lkdGggZXhjZWVkIDEwMCUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRVbml0cy5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L0xheW91dFVuaXRzLmgKaW5kZXggNThjMDk2ZGYyODEyOWJkZmUyODU1MTUxYTVkMGM3N2M3ZTUz YmVkYS4uZDdjODFiNWVjOTk3MTRjZTUxODhjODhiYjEzNmFjNWFmZTFkZDljMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFVuaXRzLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L0xheW91dFVuaXRzLmgKQEAgLTExNSwyMCArMTE1LDE5IEBAIGlubGluZSB2b2lk IFBvaW50Ojptb3ZlQnkoTGF5b3V0UG9pbnQgb2Zmc2V0KQogc3RydWN0IEhvcml6b250YWxFZGdl cyB7CiAgICAgTGF5b3V0VW5pdCBsZWZ0OwogICAgIExheW91dFVuaXQgcmlnaHQ7Ci0KLSAgICBM YXlvdXRVbml0IHdpZHRoKCkgY29uc3QgeyByZXR1cm4gbGVmdCArIHJpZ2h0OyB9CiB9OwogCiBz dHJ1Y3QgVmVydGljYWxFZGdlcyB7CiAgICAgTGF5b3V0VW5pdCB0b3A7CiAgICAgTGF5b3V0VW5p dCBib3R0b207Ci0KLSAgICBMYXlvdXRVbml0IGhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIHRvcCAr IGJvdHRvbTsgfQogfTsKIAogc3RydWN0IEVkZ2VzIHsKICAgICBIb3Jpem9udGFsRWRnZXMgaG9y aXpvbnRhbDsKICAgICBWZXJ0aWNhbEVkZ2VzIHZlcnRpY2FsOworCisgICAgTGF5b3V0VW5pdCB3 aWR0aCgpIGNvbnN0IHsgcmV0dXJuIGhvcml6b250YWwubGVmdCArIGhvcml6b250YWwucmlnaHQ7 IH0KKyAgICBMYXlvdXRVbml0IGhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIHZlcnRpY2FsLnRvcCAr IHZlcnRpY2FsLmJvdHRvbTsgfQogfTsKIAogaW5saW5lIEVkZ2VzIG9wZXJhdG9yLyhjb25zdCBF ZGdlcyYgZWRnZSwgc2l6ZV90IHZhbHVlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L1ZlcmlmaWNhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVyaWZpY2F0aW9u LmNwcAppbmRleCBkZmQ0NjAyODNhYjAxZWIxNzMyZTM1N2NmNWM3MmVhYjM5YjE2N2U0Li41ZTM3 MmFjMDViMGQxOTZkM2EzMmFlZWE4ZGRjNGM3MzlkM2FhZTVjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvVmVyaWZpY2F0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvVmVyaWZpY2F0aW9uLmNwcApAQCAtMjc0LDEyICsyNzQsMTYgQEAgc3RhdGljIGJvb2wgb3V0 cHV0TWlzbWF0Y2hpbmdCbG9ja0JveEluZm9ybWF0aW9uSWZOZWVkZWQoVGV4dFN0cmVhbSYgc3Ry ZWFtLCBjb24KICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCi0gICAgaWYgKCFhcmVFc3Nl bnRpYWxseUVxdWFsKHJlbmRlcmVyLnBhZGRpbmdCb3hSZWN0KCksIGRpc3BsYXlCb3gucGFkZGlu Z0JveCgpKSkgeworICAgIC8vIFdoZW4gdGhlIHRhYmxlIHJvdyBib3JkZXIgb3ZlcmZsb3dzIHRo ZSByb3csIHBhZGRpbmcgYm94IGJlY29tZXMgbmVnYXRpdmUgYW5kIGNvbnRlbnQgYm94IGlzIGlu Y29ycmVjdC4KKyAgICBhdXRvIHNob3VsZENoZWNrUGFkZGluZ0FuZENvbnRlbnRCb3ggPSAhaXM8 UmVuZGVyVGFibGVSb3c+KHJlbmRlcmVyKSB8fCByZW5kZXJlci5wYWRkaW5nQm94UmVjdCgpLndp ZHRoKCkgPj0gMDsKKyAgICBpZiAoc2hvdWxkQ2hlY2tQYWRkaW5nQW5kQ29udGVudEJveCAmJiAh YXJlRXNzZW50aWFsbHlFcXVhbChyZW5kZXJlci5wYWRkaW5nQm94UmVjdCgpLCBkaXNwbGF5Qm94 LnBhZGRpbmdCb3goKSkpIHsKICAgICAgICAgb3V0cHV0UmVjdCgicGFkZGluZ0JveCIsIHJlbmRl cmVyLnBhZGRpbmdCb3hSZWN0KCksIGRpc3BsYXlCb3gucGFkZGluZ0JveCgpKTsKICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgfQogCiAgICAgYXV0byBzaG91bGRDaGVja0NvbnRlbnRCb3ggPSBb Jl0geworICAgICAgICBpZiAoIXNob3VsZENoZWNrUGFkZGluZ0FuZENvbnRlbnRCb3gpCisgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIC8vIEZJWE1FOiBGaWd1cmUgb3V0IHdoeSB0 cnVuay9yZW5kZXJpbmcgY29tZXMgYmFjayB3aXRoIG9kZCB2YWx1ZXMgZm9yIDx0Ym9keT4gYW5k IDx0ZD4gY29udGVudCBib3guCiAgICAgICAgIGlmIChpczxSZW5kZXJUYWJsZUNlbGw+KHJlbmRl cmVyKSB8fCBpczxSZW5kZXJUYWJsZVNlY3Rpb24+KHJlbmRlcmVyKSkKICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1h dHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv dGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGYzYjI4NTQ2 ZmVmMTJmNTVlMTY0NTRhYTJlNGQ4YmE3ODI0MjdkNTMuLmY1MWVkMGZlMmRkNzBkYWI3N2E2NmVh MTNhY2VkNWEyY2I3NmNjNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJs ZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAt MTEzLDEzICsxMTMsMTkgQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRVc2VkR2Vv bWV0cnlGb3JSb3dzKExheW91dFVuaXQgYXZhaWxhYmxlSG9yaXpvbnQKICAgICBhdXRvJiBncmlk ID0gZm9ybWF0dGluZ1N0YXRlKCkudGFibGVHcmlkKCk7CiAgICAgYXV0byYgcm93cyA9IGdyaWQu cm93cygpLmxpc3QoKTsKIAotICAgIGF1dG8gcm93V2lkdGggPSBncmlkLmNvbHVtbnMoKS5sb2dp Y2FsV2lkdGgoKSArIDIgKiBncmlkLmhvcml6b250YWxTcGFjaW5nKCk7CiAgICAgYXV0byByb3dM b2dpY2FsVG9wID0gZ3JpZC52ZXJ0aWNhbFNwYWNpbmcoKTsKICAgICBmb3IgKHNpemVfdCByb3dJ bmRleCA9IDA7IHJvd0luZGV4IDwgcm93cy5zaXplKCk7ICsrcm93SW5kZXgpIHsKICAgICAgICAg YXV0byYgcm93ID0gcm93c1tyb3dJbmRleF07CiAgICAgICAgIGF1dG8mIHJvd0JveCA9IHJvdy5i b3goKTsKICAgICAgICAgYXV0byYgcm93RGlzcGxheUJveCA9IGZvcm1hdHRpbmdTdGF0ZSgpLmRp c3BsYXlCb3gocm93Qm94KTsKIAorICAgICAgICByb3dEaXNwbGF5Qm94LnNldFBhZGRpbmcoZ2Vv bWV0cnkoKS5jb21wdXRlZFBhZGRpbmcocm93Qm94LCBhdmFpbGFibGVIb3Jpem9udGFsU3BhY2Up KTsKKyAgICAgICAgLy8gSW50ZXJuYWwgdGFibGUgZWxlbWVudHMgZG8gbm90IGhhdmUgbWFyZ2lu cy4KKyAgICAgICAgcm93RGlzcGxheUJveC5zZXRIb3Jpem9udGFsTWFyZ2luKHsgfSk7CisgICAg ICAgIHJvd0Rpc3BsYXlCb3guc2V0SG9yaXpvbnRhbENvbXB1dGVkTWFyZ2luKHsgfSk7CisgICAg ICAgIHJvd0Rpc3BsYXlCb3guc2V0VmVydGljYWxNYXJnaW4oeyB7IH0sIHsgfSB9KTsKKworCiAg ICAgICAgIGF1dG8gY29tcHV0ZWRSb3dCb3JkZXIgPSBbJl0gewogICAgICAgICAgICAgYXV0byBi b3JkZXIgPSBnZW9tZXRyeSgpLmNvbXB1dGVkQm9yZGVyKHJvd0JveCk7CiAgICAgICAgICAgICBp ZiAoIWdyaWQuY29sbGFwc2VkQm9yZGVyKCkpCkBAIC0xMzIsMTUgKzEzOCwyOCBAQCB2b2lkIFRh YmxlRm9ybWF0dGluZ0NvbnRleHQ6OnNldFVzZWRHZW9tZXRyeUZvclJvd3MoTGF5b3V0VW5pdCBh dmFpbGFibGVIb3Jpem9udAogICAgICAgICAgICAgICAgIGJvcmRlci52ZXJ0aWNhbC5ib3R0b20g PSB7IH07CiAgICAgICAgICAgICByZXR1cm4gYm9yZGVyOwogICAgICAgICB9KCk7CisgICAgICAg IGlmIChjb21wdXRlZFJvd0JvcmRlci5oZWlnaHQoKSA+IHJvdy5sb2dpY2FsSGVpZ2h0KCkpIHsK KyAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGlzIGFuIG9kZCBxdWlyayB3aGVuIHRoZSByb3cg Ym9yZGVyIG92ZXJmbG93cyB0aGUgcm93LgorICAgICAgICAgICAgLy8gV2UgZG9uJ3QgcGFpbnQg cm93IGJvcmRlcnMgc28gaXQgZG9lcyBub3QgbWF0dGVyIHRvbyBtdWNoLCBidXQgaWYgd2UgZG9u J3QKKyAgICAgICAgICAgIC8vIHNldCB0aGlzIGZha2UgYm9yZGVyIHZhbHVlLCB0aGFuIHdlIGVp dGhlciBlbmQgdXAgd2l0aCBhIG5lZ2F0aXZlIGNvbnRlbnQgYm94CisgICAgICAgICAgICAvLyBv ciB3aXRoIGEgd2lkZSBmcmFtZSBib3guCisgICAgICAgICAgICAvLyBJZiBpdCBoYXBwZW5zIHRv IGNhdXNlIGlzc3VlcyBpbiB0aGUgZGlzcGxheSB0cmVlLCB3ZSBjb3VsZCBhbHNvIGNvbnNpZGVy CisgICAgICAgICAgICAvLyBhIHNwZWNpYWwgZnJhbWUgYm94IG92ZXJyaWRlLCB3aGVyZSBwYWRk aW5nIGJveCArIGJvcmRlciAhPSBmcmFtZSBib3guCisgICAgICAgICAgICBjb21wdXRlZFJvd0Jv cmRlci52ZXJ0aWNhbC50b3AgPSB7IH07CisgICAgICAgICAgICBjb21wdXRlZFJvd0JvcmRlci52 ZXJ0aWNhbC5ib3R0b20gPSB7IH07CisgICAgICAgIH0KKyAgICAgICAgcm93RGlzcGxheUJveC5z ZXRDb250ZW50Qm94SGVpZ2h0KHJvdy5sb2dpY2FsSGVpZ2h0KCkgLSBjb21wdXRlZFJvd0JvcmRl ci5oZWlnaHQoKSk7CisKKyAgICAgICAgYXV0byByb3dMb2dpY2FsV2lkdGggPSBncmlkLmNvbHVt bnMoKS5sb2dpY2FsV2lkdGgoKSArIDIgKiBncmlkLmhvcml6b250YWxTcGFjaW5nKCk7CisgICAg ICAgIGlmIChjb21wdXRlZFJvd0JvcmRlci53aWR0aCgpID4gcm93TG9naWNhbFdpZHRoKSB7Cisg ICAgICAgICAgICAvLyBTZWUgY29tbWVudCBhYm92ZS4KKyAgICAgICAgICAgIGNvbXB1dGVkUm93 Qm9yZGVyLmhvcml6b250YWwubGVmdCA9IHsgfTsKKyAgICAgICAgICAgIGNvbXB1dGVkUm93Qm9y ZGVyLmhvcml6b250YWwucmlnaHQgPSB7IH07CisgICAgICAgIH0KKyAgICAgICAgcm93RGlzcGxh eUJveC5zZXRDb250ZW50Qm94V2lkdGgocm93TG9naWNhbFdpZHRoIC0gY29tcHV0ZWRSb3dCb3Jk ZXIud2lkdGgoKSk7CisKICAgICAgICAgcm93RGlzcGxheUJveC5zZXRCb3JkZXIoY29tcHV0ZWRS b3dCb3JkZXIpOwotICAgICAgICByb3dEaXNwbGF5Qm94LnNldFBhZGRpbmcoZ2VvbWV0cnkoKS5j b21wdXRlZFBhZGRpbmcocm93Qm94LCBhdmFpbGFibGVIb3Jpem9udGFsU3BhY2UpKTsKLSAgICAg ICAgLy8gSW50ZXJuYWwgdGFibGUgZWxlbWVudHMgZG8gbm90IGhhdmUgbWFyZ2lucy4KLSAgICAg ICAgcm93RGlzcGxheUJveC5zZXRIb3Jpem9udGFsTWFyZ2luKHsgfSk7Ci0gICAgICAgIHJvd0Rp c3BsYXlCb3guc2V0SG9yaXpvbnRhbENvbXB1dGVkTWFyZ2luKHsgfSk7Ci0gICAgICAgIHJvd0Rp c3BsYXlCb3guc2V0VmVydGljYWxNYXJnaW4oeyB7IH0sIHsgfSB9KTsKIAotICAgICAgICByb3dE aXNwbGF5Qm94LnNldENvbnRlbnRCb3hIZWlnaHQocm93LmxvZ2ljYWxIZWlnaHQoKSk7Ci0gICAg ICAgIHJvd0Rpc3BsYXlCb3guc2V0Q29udGVudEJveFdpZHRoKHJvd1dpZHRoKTsKICAgICAgICAg cm93RGlzcGxheUJveC5zZXRUb3Aocm93TG9naWNhbFRvcCk7CiAgICAgICAgIHJvd0Rpc3BsYXlC b3guc2V0TGVmdCh7IH0pOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFi bGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHRHZW9t ZXRyeS5jcHAKaW5kZXggY2VkNTc5MmZjM2NiOTZiMjI0MTdmNGEwNDJlMTRlY2I5NDljNWE1Yy4u Yzc2YjFkYjBkNTU2YmI4NTgxNGEyMjA5NjRjNDNkN2E5NzdkYTE3MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0 R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcv VGFibGVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMTEwLDcgKzExMCw3IEBAIEZv cm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIFRhYmxlRm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5OjppCiAgICAgLy8gRklYTUUgQ2hlY2sgZm9yIGJveC1zaXppbmc6 IGJvcmRlci1ib3g7CiAgICAgYXV0byBpbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzID0gY29uc3Ry YWluQnlNaW5NYXhXaWR0aChjZWxsQm94LCBjb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWlu dHMoKSk7CiAgICAgLy8gRXhwYW5kIHdpdGggYm9yZGVyCi0gICAgaW50cmluc2ljV2lkdGhDb25z dHJhaW50cy5leHBhbmQoY29tcHV0ZWRDZWxsQm9yZGVyKGNlbGwpLmhvcml6b250YWwud2lkdGgo KSk7CisgICAgaW50cmluc2ljV2lkdGhDb25zdHJhaW50cy5leHBhbmQoY29tcHV0ZWRDZWxsQm9y ZGVyKGNlbGwpLndpZHRoKCkpOwogICAgIC8vIHBhZGRpbmcKICAgICBpbnRyaW5zaWNXaWR0aENv bnN0cmFpbnRzLmV4cGFuZChmaXhlZFZhbHVlKHN0eWxlLnBhZGRpbmdMZWZ0KCkpLnZhbHVlT3Io MCkgKyBmaXhlZFZhbHVlKHN0eWxlLnBhZGRpbmdSaWdodCgpKS52YWx1ZU9yKDApKTsKICAgICAv LyBhbmQgbWFyZ2luCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKaW5kZXggYWVhNmYzNmI1NDZiMWYyZGMyYTcwYzUyZGUwNGUzZTRjZjA5 ZDg0Zi4uYzBmNGU4N2ZjMThmZTY3NjgxOGFlYWUwZDQ4YmIyNGU2YjMwNWM3MiAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEzIEBACisyMDIwLTA1LTIyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CisKKyAgICAgICAgW0xGQ11bVEZDXSBOb24tY29sbGFwc2luZyByb3cgYm9yZGVyIHNob3VsZCBu b3QgbWFrZSB0aGUgdGFibGUgd2lkZXIvdGFsbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIyNjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFi bGUtc2ltcGxlLXJvdy1ib3JkZXItZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFz dC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zaW1wbGUtcm93LWJvcmRlci5odG1sOiBB ZGRlZC4KKwogMjAyMC0wNS0yMSAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlh LmNvbT4KIAogICAgICAgICBbY3NzLWdyaWRdIHdpZHRoIG9mIHRhYmxlIGluIGEgZ3JpZCBpcyBp bmNvcnJlY3Qgd2hlbiB0YWJsZSBjZWxsIGhhcyB3aWR0aDoxMDAlCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXNpbXBsZS1yb3ctYm9y ZGVyLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250 ZXh0L3RhYmxlLXNpbXBsZS1yb3ctYm9yZGVyLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNWM3 NWNmZDZkNWJhZWU4NWJhNTMxODhkYjRlNWJlZDJhNzY4NmQ5NgotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc2ltcGxlLXJv dy1ib3JkZXItZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDEzIEBACis8IURPQ1RZUEUgaHRtbD4g PCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4 dEVuYWJsZWQ9dHJ1ZSBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9u RW5hYmxlZD1mYWxzZSBdIC0tPgorPHN0eWxlPgorZGl2IHsKKyAgICBoZWlnaHQ6IDEwcHg7Cisg ICAgd2lkdGg6IDEwcHg7CisgICAgYm9yZGVyOiAxcHggc29saWQgZ3JlZW47CisgICAgcG9zaXRp b246IGFic29sdXRlOworfQorPC9zdHlsZT4KKzxkaXYgc3R5bGU9InRvcDogMTBweDsgbGVmdDog MTBweDsiPjwvZGl2PgorPGRpdiBzdHlsZT0idG9wOiAxMHB4OyBsZWZ0OiAyNHB4OyI+PC9kaXY+ Cis8ZGl2IHN0eWxlPSJ0b3A6IDI0cHg7IGxlZnQ6IDEwcHg7Ij48L2Rpdj4KKzxkaXYgc3R5bGU9 InRvcDogMjRweDsgbGVmdDogMjRweDsiPjwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zaW1wbGUtcm93LWJvcmRlci5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zaW1wbGUt cm93LWJvcmRlci5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjEwODRlNWY4NTdkMDlhNTVjMzA4YjkwMGRhMDVi MzhlNmM3ZDQyNDYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZv cm1hdHRpbmdjb250ZXh0L3RhYmxlLXNpbXBsZS1yb3ctYm9yZGVyLmh0bWwKQEAgLTAsMCArMSwx OCBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgaW50ZXJuYWw6 TGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRFbmFibGVkPXRydWUgaW50ZXJuYWw6TGF5b3V0Rm9ybWF0 dGluZ0NvbnRleHRJbnRlZ3JhdGlvbkVuYWJsZWQ9ZmFsc2UgXSAtLT4KKzxzdHlsZT4KK3RkIHsK KyAgICB3aWR0aDogMTBweDsKKyAgICBoZWlnaHQ6IDEwcHg7CisgICAgcGFkZGluZzogMHB4Owor ICAgIGJvcmRlcjogMXB4IHNvbGlkIGdyZWVuOworfQorCit0ciB7CisgICAgYm9yZGVyOiA1MHB4 IHNvbGlkIHJlZDsKK30KKzwvc3R5bGU+Cis8dGFibGU+Cis8dHI+PHRkPjwvdGQ+PHRkPjwvdGQ+ PC90cj4KKzx0cj48dGQ+PC90ZD48dGQ+PC90ZD48L3RyPgorPC90Ym9keT4KKzwvdGFibGU+Cg==