203658 2019-10-30 20:31:53 -0700 [LFC][IFC] Do not merge completely collapsed run with the previous run 2019-10-31 08:40:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1585738 0 zalan 2019-10-30 20:31:53 -0700 visually empty runs are ignored and should not be merged. 1585739 1 webkit-bug-importer 2019-10-30 20:32:06 -0700 <rdar://problem/56769334> 1585745 2 382416 zalan 2019-10-30 20:46:45 -0700 Created attachment 382416 Patch 1585762 3 382421 zalan 2019-10-30 21:41:26 -0700 Created attachment 382421 Patch 1585917 4 382461 zalan 2019-10-31 08:21:06 -0700 Created attachment 382461 Patch 1585924 5 382461 commit-queue 2019-10-31 08:40:19 -0700 Comment on attachment 382461 Patch Clearing flags on attachment: 382461 Committed r251848: <https://trac.webkit.org/changeset/251848> 1585925 6 commit-queue 2019-10-31 08:40:20 -0700 All reviewed patches have been landed. Closing bug. 382416 2019-10-30 20:46:45 -0700 2019-10-30 21:41:24 -0700 Patch bug-203658-20191030204637.patch text/plain 4742 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxODE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDdiYzU3ZTY4MzEzMmZm MWU1NWQ1ZDlhMjU2YTI4MjMzNmViZmUwYi4uNWM1ODEzM2RhNzZhYjVmNzg0MjAwNmMxZTgxMjc3 MWYwZTE0MjAxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTEwLTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEbyBub3Qg bWVyZ2UgY29tcGxldGVseSBjb2xsYXBzZWQgcnVuIHdpdGggdGhlIHByZXZpb3VzIHJ1bgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzNjU4CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS81Njc2OTMzND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGEgd2hpdGVzcGFjZSBydW4gaXMgY29tcGxldGVs eSBjb2xsYXBzZWQgKGFuZCB2aXN1YWxseSBlbXB0eSksIHdlIHNob3VsZCBub3QgdHJ5IHRvIG1l cmdlIGl0IHdpdGggcHJldmlvdXMgdGV4dCBydW5zLgorICAgICAgICBFLmcuIFtiZWZvcmUgIFxu YWZ0ZXJdIC0+IFtiZWZvcmVdWyAgXVtcbl1bYWZ0ZXJdIC0+IFtiZWZvcmUgXVtdW2FmdGVyXSAt PiBbYmVmb3JlIF1bYWZ0ZXJdCisgICAgICAgICAgICAgICAgXmNvbnRlbnQgICAgICAgICAgICAg ICBeaW5saW5lIGl0ZW1zICAgICAgICAgICAgIF5saW5lIHJ1bnMgICAgICAgICAgXmRpc3BsYXkg cnVucworCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmNsb3NlKToKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmU6OlJ1bjo6aGFzVHJhaWxpbmdDb2xsYXBzZWRDb250ZW50IGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjpjYW5CZUV4dGVuZGVkIGNvbnN0KTogRGVs ZXRlZC4KKwogMjAxOS0xMC0zMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtMRkNdW0lGQ10gU2V0IHNldElzQ29sbGFwc2VkIG9uIHRoZSBsaW5lIGl0ZW0gd2hl biBpdHMgY29udGVudCBpcyBhY3R1YWxseSBjb2xsYXBzZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKaW5kZXggNjM2MDk1 NjU3NWYwY2MzYzAxMTZhZGJkMzk0Yzk5Y2M3MjFhZTQ2NS4uNjMwZjgzNTg3ZmRkN2QwZTFmNGMz YmJjMjY1NGQ5ZjEwZjNhNDVkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKQEAgLTExNSwyNSArMTE1LDI5IEBAIExp bmU6OlJ1bkxpc3QgTGluZTo6Y2xvc2UoKQogICAgIC8vIEpvaW4gdGV4dCBydW5zIHRvZ2V0aGVy IHdoZW4gcG9zc2libGUuCiAgICAgdW5zaWduZWQgaW5kZXggPSAxOwogICAgIHdoaWxlIChpbmRl eCA8IG1fcnVuTGlzdC5zaXplKCkpIHsKKyAgICAgICAgYXV0byBjYW5NZXJnZVJ1bnMgPSBbXShj b25zdCBhdXRvJiBwcmV2aW91c1J1biwgY29uc3QgYXV0byYgY3VycmVudFJ1bikgeworICAgICAg ICAgICAgLy8gRG8gbm90IG1lcmdlIHJ1bnMgYWNyb3NzIGlubGluZSBib3hlcyBib3hlcyAoPHNw YW4+Zm9vPC9zcGFuPjxzcGFuPmJhcjwvc3Bhbj4pCisgICAgICAgICAgICBpZiAoJnByZXZpb3Vz UnVuLT5sYXlvdXRCb3goKSAhPSAgJmN1cnJlbnRSdW4tPmxheW91dEJveCgpKQorICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIC8vIE9ubHkgdGV4dCBjb250ZW50IGNh biBiZSBleHRlbmRlZC4KKyAgICAgICAgICAgIGlmICghcHJldmlvdXNSdW4tPmlzVGV4dCgpIHx8 ICFjdXJyZW50UnVuLT5pc1RleHQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgICAgICAgICAvLyBNZXJnZWQgY29udGVudCBuZWVkIHRvIGJlIGNvbnRpbnVvdXMuCisgICAg ICAgICAgICBpZiAocHJldmlvdXNSdW4tPmhhc1RyYWlsaW5nQ29sbGFwc2VkQ29udGVudCgpKQor ICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIC8vIFZpc3VhbGx5IGVt cHR5IHJ1bnMgYXJlIGlnbm9yZWQuCisgICAgICAgICAgICBpZiAoY3VycmVudFJ1bi0+aXNDb2xs YXBzZWRUb1plcm9BZHZhbmNlV2lkdGgoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfTsKICAgICAgICAgYXV0byYgcHJl dmlvdXNSdW4gPSBtX3J1bkxpc3RbaW5kZXggLSAxXTsKLSAgICAgICAgaWYgKCFwcmV2aW91c1J1 bi0+Y2FuQmVFeHRlbmRlZCgpKSB7Ci0gICAgICAgICAgICArK2luZGV4OwotICAgICAgICAgICAg Y29udGludWU7Ci0gICAgICAgIH0KICAgICAgICAgYXV0byYgY3VycmVudFJ1biA9IG1fcnVuTGlz dFtpbmRleF07Ci0gICAgICAgIC8vIERvIG5vdCBtZXJnZSBydW5zIGZyb20gZGlmZmVyZW50IGJv eGVzICg8c3Bhbj5mb288L3NwYW4+PHNwYW4+YmFyPC9zcGFuPikKLSAgICAgICAgLy8gb3Igd2l0 aGluIHRoZSBzYW1lIGxheW91dCBib3ggYnV0IHdpdGggcHJlc2VydmVkIFxuCi0gICAgICAgIC8v ICg8c3Bhbj50ZXh0XG48c3BhbiA8LSBib3RoIHRoZSAidGV4dCIgYW5kICJcIiBiZWxvbmcgdG8g dGhlIHNhbWUgbGF5b3V0IGJveCkKLSAgICAgICAgYXV0byBjYW5BcHBlbmRUb1ByZXZpb3VzUnVu ID0gY3VycmVudFJ1bi0+aXNUZXh0KCkgJiYgJmN1cnJlbnRSdW4tPmxheW91dEJveCgpID09ICAm cHJldmlvdXNSdW4tPmxheW91dEJveCgpOwotICAgICAgICBpZiAoIWNhbkFwcGVuZFRvUHJldmlv dXNSdW4pIHsKLSAgICAgICAgICAgICsraW5kZXg7CisgICAgICAgIGlmIChjYW5NZXJnZVJ1bnMo cHJldmlvdXNSdW4sIGN1cnJlbnRSdW4pKSB7CisgICAgICAgICAgICBwcmV2aW91c1J1bi0+ZXhw YW5kKCpjdXJyZW50UnVuKTsKKyAgICAgICAgICAgIG1fcnVuTGlzdC5yZW1vdmUoaW5kZXgpOwog ICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KLSAgICAgICAgLy8gT25seSB0ZXh0IGNv bnRlbnQgY2FuIGJlIGV4dGVuZGVkIGF0bS4KLSAgICAgICAgQVNTRVJUKHByZXZpb3VzUnVuLT5p c1RleHQoKSk7Ci0gICAgICAgIEFTU0VSVChjdXJyZW50UnVuLT5pc1RleHQoKSk7Ci0gICAgICAg IHByZXZpb3VzUnVuLT5leHBhbmQoKmN1cnJlbnRSdW4pOwotICAgICAgICBtX3J1bkxpc3QucmVt b3ZlKGluZGV4KTsKKyAgICAgICAgKytpbmRleDsKICAgICB9CiAKICAgICBpZiAoIW1fc2tpcEFs aWdubWVudCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZS5oCmluZGV4IDVmZmMwNThmZjYxZDA5OTNmOWUwZDIxNTU4ZDIzZDA3ODJl M2Y4YjYuLjYyYzcyNDVhY2M5ODRlZjExMTJiY2MxMTk3Zjg1MDdlNGEyNTA3MDUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgK QEAgLTk0LDggKzk0LDggQEAgcHVibGljOgogICAgICAgICB2b2lkIHNldENvbGxhcHNlc1RvWmVy b0FkdmFuY2VXaWR0aCgpOwogCiAgICAgICAgIGJvb2wgaXNDb2xsYXBzaWJsZSgpIGNvbnN0IHsg cmV0dXJuIG1faW5saW5lSXRlbS5pc1RleHQoKSAmJiBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4o bV9pbmxpbmVJdGVtKS5pc0NvbGxhcHNpYmxlKCk7IH0KKyAgICAgICAgYm9vbCBoYXNUcmFpbGlu Z0NvbGxhcHNlZENvbnRlbnQoKSBjb25zdCB7IHJldHVybiBtX2hhc1RyYWlsaW5nQ29sbGFwc2Vk Q29udGVudDsgfQogICAgICAgICBib29sIGlzV2hpdGVzcGFjZSgpIGNvbnN0OwotICAgICAgICBi b29sIGNhbkJlRXh0ZW5kZWQoKSBjb25zdDsKIAogICAgICAgICBjb25zdCBJbmxpbmVJdGVtJiBt X2lubGluZUl0ZW07CiAgICAgICAgIERpc3BsYXk6OlJ1biBtX2Rpc3BsYXlSdW47CkBAIC0xNzcs MTEgKzE3Nyw2IEBAIGlubGluZSB2b2lkIExpbmU6OlJ1bjo6c2V0SXNDb2xsYXBzZWQoKQogICAg IG1faGFzVHJhaWxpbmdDb2xsYXBzZWRDb250ZW50ID0gdHJ1ZTsKIH0KIAotaW5saW5lIGJvb2wg TGluZTo6UnVuOjpjYW5CZUV4dGVuZGVkKCkgY29uc3QKLXsKLSAgICByZXR1cm4gaXNUZXh0KCkg JiYgIW1faGFzVHJhaWxpbmdDb2xsYXBzZWRDb250ZW50OwotfQotCiBpbmxpbmUgYm9vbCBMaW5l OjpSdW46OmlzQ29sbGFwc2VkVG9aZXJvQWR2YW5jZVdpZHRoKCkgY29uc3QKIHsKICAgICBBU1NF UlQoIW1fY29sbGFwc2VkVG9aZXJvQWR2YW5jZVdpZHRoIHx8ICFtX2Rpc3BsYXlSdW4ubG9naWNh bFdpZHRoKCkpOwo= 382421 2019-10-30 21:41:26 -0700 2019-10-31 08:21:05 -0700 Patch bug-203658-20191030214118.patch text/plain 4735 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxODE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDdiYzU3ZTY4MzEzMmZm MWU1NWQ1ZDlhMjU2YTI4MjMzNmViZmUwYi4uNWM1ODEzM2RhNzZhYjVmNzg0MjAwNmMxZTgxMjc3 MWYwZTE0MjAxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTEwLTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEbyBub3Qg bWVyZ2UgY29tcGxldGVseSBjb2xsYXBzZWQgcnVuIHdpdGggdGhlIHByZXZpb3VzIHJ1bgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzNjU4CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS81Njc2OTMzND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGEgd2hpdGVzcGFjZSBydW4gaXMgY29tcGxldGVs eSBjb2xsYXBzZWQgKGFuZCB2aXN1YWxseSBlbXB0eSksIHdlIHNob3VsZCBub3QgdHJ5IHRvIG1l cmdlIGl0IHdpdGggcHJldmlvdXMgdGV4dCBydW5zLgorICAgICAgICBFLmcuIFtiZWZvcmUgIFxu YWZ0ZXJdIC0+IFtiZWZvcmVdWyAgXVtcbl1bYWZ0ZXJdIC0+IFtiZWZvcmUgXVtdW2FmdGVyXSAt PiBbYmVmb3JlIF1bYWZ0ZXJdCisgICAgICAgICAgICAgICAgXmNvbnRlbnQgICAgICAgICAgICAg ICBeaW5saW5lIGl0ZW1zICAgICAgICAgICAgIF5saW5lIHJ1bnMgICAgICAgICAgXmRpc3BsYXkg cnVucworCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmNsb3NlKToKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmU6OlJ1bjo6aGFzVHJhaWxpbmdDb2xsYXBzZWRDb250ZW50IGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjpjYW5CZUV4dGVuZGVkIGNvbnN0KTogRGVs ZXRlZC4KKwogMjAxOS0xMC0zMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtMRkNdW0lGQ10gU2V0IHNldElzQ29sbGFwc2VkIG9uIHRoZSBsaW5lIGl0ZW0gd2hl biBpdHMgY29udGVudCBpcyBhY3R1YWxseSBjb2xsYXBzZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKaW5kZXggNjM2MDk1 NjU3NWYwY2MzYzAxMTZhZGJkMzk0Yzk5Y2M3MjFhZTQ2NS4uMzJjYzM2ODEyNDQ0ZGMyODljOWFj OGM0YzRiMjBlYTM4YzEwZjM3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKQEAgLTExNSwyNSArMTE1LDI5IEBAIExp bmU6OlJ1bkxpc3QgTGluZTo6Y2xvc2UoKQogICAgIC8vIEpvaW4gdGV4dCBydW5zIHRvZ2V0aGVy IHdoZW4gcG9zc2libGUuCiAgICAgdW5zaWduZWQgaW5kZXggPSAxOwogICAgIHdoaWxlIChpbmRl eCA8IG1fcnVuTGlzdC5zaXplKCkpIHsKKyAgICAgICAgYXV0byBjYW5NZXJnZVJ1bnMgPSBbXShj b25zdCBhdXRvJiBwcmV2aW91c1J1biwgY29uc3QgYXV0byYgY3VycmVudFJ1bikgeworICAgICAg ICAgICAgLy8gRG8gbm90IG1lcmdlIHJ1bnMgYWNyb3NzIGlubGluZSBib3hlcyAoPHNwYW4+Zm9v PC9zcGFuPjxzcGFuPmJhcjwvc3Bhbj4pCisgICAgICAgICAgICBpZiAoJnByZXZpb3VzUnVuLT5s YXlvdXRCb3goKSAhPSAgJmN1cnJlbnRSdW4tPmxheW91dEJveCgpKQorICAgICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIC8vIE9ubHkgdGV4dCBjb250ZW50IGNhbiBiZSBt ZXJnZWQuCisgICAgICAgICAgICBpZiAoIXByZXZpb3VzUnVuLT5pc1RleHQoKSB8fCAhY3VycmVu dFJ1bi0+aXNUZXh0KCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAg ICAgLy8gTWVyZ2VkIGNvbnRlbnQgbmVlZHMgdG8gYmUgY29udGludW91cy4KKyAgICAgICAgICAg IGlmIChwcmV2aW91c1J1bi0+aGFzVHJhaWxpbmdDb2xsYXBzZWRDb250ZW50KCkpCisgICAgICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgLy8gVmlzdWFsbHkgZW1wdHkgcnVu cyBhcmUgaWdub3JlZC4KKyAgICAgICAgICAgIGlmIChjdXJyZW50UnVuLT5pc0NvbGxhcHNlZFRv WmVyb0FkdmFuY2VXaWR0aCgpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAg ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9OwogICAgICAgICBhdXRvJiBwcmV2aW91c1J1 biA9IG1fcnVuTGlzdFtpbmRleCAtIDFdOwotICAgICAgICBpZiAoIXByZXZpb3VzUnVuLT5jYW5C ZUV4dGVuZGVkKCkpIHsKLSAgICAgICAgICAgICsraW5kZXg7Ci0gICAgICAgICAgICBjb250aW51 ZTsKLSAgICAgICAgfQogICAgICAgICBhdXRvJiBjdXJyZW50UnVuID0gbV9ydW5MaXN0W2luZGV4 XTsKLSAgICAgICAgLy8gRG8gbm90IG1lcmdlIHJ1bnMgZnJvbSBkaWZmZXJlbnQgYm94ZXMgKDxz cGFuPmZvbzwvc3Bhbj48c3Bhbj5iYXI8L3NwYW4+KQotICAgICAgICAvLyBvciB3aXRoaW4gdGhl IHNhbWUgbGF5b3V0IGJveCBidXQgd2l0aCBwcmVzZXJ2ZWQgXG4KLSAgICAgICAgLy8gKDxzcGFu PnRleHRcbjxzcGFuIDwtIGJvdGggdGhlICJ0ZXh0IiBhbmQgIlwiIGJlbG9uZyB0byB0aGUgc2Ft ZSBsYXlvdXQgYm94KQotICAgICAgICBhdXRvIGNhbkFwcGVuZFRvUHJldmlvdXNSdW4gPSBjdXJy ZW50UnVuLT5pc1RleHQoKSAmJiAmY3VycmVudFJ1bi0+bGF5b3V0Qm94KCkgPT0gICZwcmV2aW91 c1J1bi0+bGF5b3V0Qm94KCk7Ci0gICAgICAgIGlmICghY2FuQXBwZW5kVG9QcmV2aW91c1J1bikg ewotICAgICAgICAgICAgKytpbmRleDsKKyAgICAgICAgaWYgKGNhbk1lcmdlUnVucyhwcmV2aW91 c1J1biwgY3VycmVudFJ1bikpIHsKKyAgICAgICAgICAgIHByZXZpb3VzUnVuLT5leHBhbmQoKmN1 cnJlbnRSdW4pOworICAgICAgICAgICAgbV9ydW5MaXN0LnJlbW92ZShpbmRleCk7CiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgfQotICAgICAgICAvLyBPbmx5IHRleHQgY29udGVudCBj YW4gYmUgZXh0ZW5kZWQgYXRtLgotICAgICAgICBBU1NFUlQocHJldmlvdXNSdW4tPmlzVGV4dCgp KTsKLSAgICAgICAgQVNTRVJUKGN1cnJlbnRSdW4tPmlzVGV4dCgpKTsKLSAgICAgICAgcHJldmlv dXNSdW4tPmV4cGFuZCgqY3VycmVudFJ1bik7Ci0gICAgICAgIG1fcnVuTGlzdC5yZW1vdmUoaW5k ZXgpOworICAgICAgICArK2luZGV4OwogICAgIH0KIAogICAgIGlmICghbV9za2lwQWxpZ25tZW50 KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lLmgKaW5kZXggNWZmYzA1OGZmNjFkMDk5M2Y5ZTBkMjE1NThkMjNkMDc4MmUzZjhiNi4u NjJjNzI0NWFjYzk4NGVmMTExMmJjYzExOTdmODUwN2U0YTI1MDcwNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaApAQCAtOTQs OCArOTQsOCBAQCBwdWJsaWM6CiAgICAgICAgIHZvaWQgc2V0Q29sbGFwc2VzVG9aZXJvQWR2YW5j ZVdpZHRoKCk7CiAKICAgICAgICAgYm9vbCBpc0NvbGxhcHNpYmxlKCkgY29uc3QgeyByZXR1cm4g bV9pbmxpbmVJdGVtLmlzVGV4dCgpICYmIGRvd25jYXN0PElubGluZVRleHRJdGVtPihtX2lubGlu ZUl0ZW0pLmlzQ29sbGFwc2libGUoKTsgfQorICAgICAgICBib29sIGhhc1RyYWlsaW5nQ29sbGFw c2VkQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuIG1faGFzVHJhaWxpbmdDb2xsYXBzZWRDb250ZW50 OyB9CiAgICAgICAgIGJvb2wgaXNXaGl0ZXNwYWNlKCkgY29uc3Q7Ci0gICAgICAgIGJvb2wgY2Fu QmVFeHRlbmRlZCgpIGNvbnN0OwogCiAgICAgICAgIGNvbnN0IElubGluZUl0ZW0mIG1faW5saW5l SXRlbTsKICAgICAgICAgRGlzcGxheTo6UnVuIG1fZGlzcGxheVJ1bjsKQEAgLTE3NywxMSArMTc3 LDYgQEAgaW5saW5lIHZvaWQgTGluZTo6UnVuOjpzZXRJc0NvbGxhcHNlZCgpCiAgICAgbV9oYXNU cmFpbGluZ0NvbGxhcHNlZENvbnRlbnQgPSB0cnVlOwogfQogCi1pbmxpbmUgYm9vbCBMaW5lOjpS dW46OmNhbkJlRXh0ZW5kZWQoKSBjb25zdAotewotICAgIHJldHVybiBpc1RleHQoKSAmJiAhbV9o YXNUcmFpbGluZ0NvbGxhcHNlZENvbnRlbnQ7Ci19Ci0KIGlubGluZSBib29sIExpbmU6OlJ1bjo6 aXNDb2xsYXBzZWRUb1plcm9BZHZhbmNlV2lkdGgoKSBjb25zdAogewogICAgIEFTU0VSVCghbV9j b2xsYXBzZWRUb1plcm9BZHZhbmNlV2lkdGggfHwgIW1fZGlzcGxheVJ1bi5sb2dpY2FsV2lkdGgo KSk7Cg== 382461 2019-10-31 08:21:06 -0700 2019-10-31 08:40:19 -0700 Patch bug-203658-20191031082058.patch text/plain 4735 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxODQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmRiOTRjNzgzNGNjMDVj ODYzMTY0YTFlNGY3MmViMjY5MzI5NDc5OC4uNzM3MjA4Y2M1NGMzMTU3OTA5NmIzYmVhNjExN2Q4 NWEyMDMwNzBiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTEwLTMxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEbyBub3Qg bWVyZ2UgY29tcGxldGVseSBjb2xsYXBzZWQgcnVuIHdpdGggdGhlIHByZXZpb3VzIHJ1bgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzNjU4CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS81Njc2OTMzND4KKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0 aSBLb2l2aXN0by4KKworICAgICAgICBXaGVuIGEgd2hpdGVzcGFjZSBydW4gaXMgY29tcGxldGVs eSBjb2xsYXBzZWQgKGFuZCB2aXN1YWxseSBlbXB0eSksIHdlIHNob3VsZCBub3QgdHJ5IHRvIG1l cmdlIGl0IHdpdGggcHJldmlvdXMgdGV4dCBydW5zLgorICAgICAgICBFLmcuIFtiZWZvcmUgIFxu YWZ0ZXJdIC0+IFtiZWZvcmVdWyAgXVtcbl1bYWZ0ZXJdIC0+IFtiZWZvcmUgXVtdW2FmdGVyXSAt PiBbYmVmb3JlIF1bYWZ0ZXJdCisgICAgICAgICAgICAgICAgXmNvbnRlbnQgICAgICAgICAgICAg ICBeaW5saW5lIGl0ZW1zICAgICAgICAgICAgIF5saW5lIHJ1bnMgICAgICAgICAgXmRpc3BsYXkg cnVucworCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmNsb3NlKToKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmU6OlJ1bjo6aGFzVHJhaWxpbmdDb2xsYXBzZWRDb250ZW50IGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVuOjpjYW5CZUV4dGVuZGVkIGNvbnN0KTogRGVs ZXRlZC4KKwogMjAxOS0xMC0zMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtMRkNdW0lGQ10gU2V0IHNldElzQ29sbGFwc2VkIG9uIHRoZSBsaW5lIGl0ZW0gd2hl biBpdHMgY29udGVudCBpcyBhY3R1YWxseSBjb2xsYXBzZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKaW5kZXggNjM2MDk1 NjU3NWYwY2MzYzAxMTZhZGJkMzk0Yzk5Y2M3MjFhZTQ2NS4uMzJjYzM2ODEyNDQ0ZGMyODljOWFj OGM0YzRiMjBlYTM4YzEwZjM3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKQEAgLTExNSwyNSArMTE1LDI5IEBAIExp bmU6OlJ1bkxpc3QgTGluZTo6Y2xvc2UoKQogICAgIC8vIEpvaW4gdGV4dCBydW5zIHRvZ2V0aGVy IHdoZW4gcG9zc2libGUuCiAgICAgdW5zaWduZWQgaW5kZXggPSAxOwogICAgIHdoaWxlIChpbmRl eCA8IG1fcnVuTGlzdC5zaXplKCkpIHsKKyAgICAgICAgYXV0byBjYW5NZXJnZVJ1bnMgPSBbXShj b25zdCBhdXRvJiBwcmV2aW91c1J1biwgY29uc3QgYXV0byYgY3VycmVudFJ1bikgeworICAgICAg ICAgICAgLy8gRG8gbm90IG1lcmdlIHJ1bnMgYWNyb3NzIGlubGluZSBib3hlcyAoPHNwYW4+Zm9v PC9zcGFuPjxzcGFuPmJhcjwvc3Bhbj4pCisgICAgICAgICAgICBpZiAoJnByZXZpb3VzUnVuLT5s YXlvdXRCb3goKSAhPSAgJmN1cnJlbnRSdW4tPmxheW91dEJveCgpKQorICAgICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIC8vIE9ubHkgdGV4dCBjb250ZW50IGNhbiBiZSBt ZXJnZWQuCisgICAgICAgICAgICBpZiAoIXByZXZpb3VzUnVuLT5pc1RleHQoKSB8fCAhY3VycmVu dFJ1bi0+aXNUZXh0KCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAg ICAgLy8gTWVyZ2VkIGNvbnRlbnQgbmVlZHMgdG8gYmUgY29udGludW91cy4KKyAgICAgICAgICAg IGlmIChwcmV2aW91c1J1bi0+aGFzVHJhaWxpbmdDb2xsYXBzZWRDb250ZW50KCkpCisgICAgICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgLy8gVmlzdWFsbHkgZW1wdHkgcnVu cyBhcmUgaWdub3JlZC4KKyAgICAgICAgICAgIGlmIChjdXJyZW50UnVuLT5pc0NvbGxhcHNlZFRv WmVyb0FkdmFuY2VXaWR0aCgpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAg ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9OwogICAgICAgICBhdXRvJiBwcmV2aW91c1J1 biA9IG1fcnVuTGlzdFtpbmRleCAtIDFdOwotICAgICAgICBpZiAoIXByZXZpb3VzUnVuLT5jYW5C ZUV4dGVuZGVkKCkpIHsKLSAgICAgICAgICAgICsraW5kZXg7Ci0gICAgICAgICAgICBjb250aW51 ZTsKLSAgICAgICAgfQogICAgICAgICBhdXRvJiBjdXJyZW50UnVuID0gbV9ydW5MaXN0W2luZGV4 XTsKLSAgICAgICAgLy8gRG8gbm90IG1lcmdlIHJ1bnMgZnJvbSBkaWZmZXJlbnQgYm94ZXMgKDxz cGFuPmZvbzwvc3Bhbj48c3Bhbj5iYXI8L3NwYW4+KQotICAgICAgICAvLyBvciB3aXRoaW4gdGhl IHNhbWUgbGF5b3V0IGJveCBidXQgd2l0aCBwcmVzZXJ2ZWQgXG4KLSAgICAgICAgLy8gKDxzcGFu PnRleHRcbjxzcGFuIDwtIGJvdGggdGhlICJ0ZXh0IiBhbmQgIlwiIGJlbG9uZyB0byB0aGUgc2Ft ZSBsYXlvdXQgYm94KQotICAgICAgICBhdXRvIGNhbkFwcGVuZFRvUHJldmlvdXNSdW4gPSBjdXJy ZW50UnVuLT5pc1RleHQoKSAmJiAmY3VycmVudFJ1bi0+bGF5b3V0Qm94KCkgPT0gICZwcmV2aW91 c1J1bi0+bGF5b3V0Qm94KCk7Ci0gICAgICAgIGlmICghY2FuQXBwZW5kVG9QcmV2aW91c1J1bikg ewotICAgICAgICAgICAgKytpbmRleDsKKyAgICAgICAgaWYgKGNhbk1lcmdlUnVucyhwcmV2aW91 c1J1biwgY3VycmVudFJ1bikpIHsKKyAgICAgICAgICAgIHByZXZpb3VzUnVuLT5leHBhbmQoKmN1 cnJlbnRSdW4pOworICAgICAgICAgICAgbV9ydW5MaXN0LnJlbW92ZShpbmRleCk7CiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgfQotICAgICAgICAvLyBPbmx5IHRleHQgY29udGVudCBj YW4gYmUgZXh0ZW5kZWQgYXRtLgotICAgICAgICBBU1NFUlQocHJldmlvdXNSdW4tPmlzVGV4dCgp KTsKLSAgICAgICAgQVNTRVJUKGN1cnJlbnRSdW4tPmlzVGV4dCgpKTsKLSAgICAgICAgcHJldmlv dXNSdW4tPmV4cGFuZCgqY3VycmVudFJ1bik7Ci0gICAgICAgIG1fcnVuTGlzdC5yZW1vdmUoaW5k ZXgpOworICAgICAgICArK2luZGV4OwogICAgIH0KIAogICAgIGlmICghbV9za2lwQWxpZ25tZW50 KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lLmgKaW5kZXggNWZmYzA1OGZmNjFkMDk5M2Y5ZTBkMjE1NThkMjNkMDc4MmUzZjhiNi4u NjJjNzI0NWFjYzk4NGVmMTExMmJjYzExOTdmODUwN2U0YTI1MDcwNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaApAQCAtOTQs OCArOTQsOCBAQCBwdWJsaWM6CiAgICAgICAgIHZvaWQgc2V0Q29sbGFwc2VzVG9aZXJvQWR2YW5j ZVdpZHRoKCk7CiAKICAgICAgICAgYm9vbCBpc0NvbGxhcHNpYmxlKCkgY29uc3QgeyByZXR1cm4g bV9pbmxpbmVJdGVtLmlzVGV4dCgpICYmIGRvd25jYXN0PElubGluZVRleHRJdGVtPihtX2lubGlu ZUl0ZW0pLmlzQ29sbGFwc2libGUoKTsgfQorICAgICAgICBib29sIGhhc1RyYWlsaW5nQ29sbGFw c2VkQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuIG1faGFzVHJhaWxpbmdDb2xsYXBzZWRDb250ZW50 OyB9CiAgICAgICAgIGJvb2wgaXNXaGl0ZXNwYWNlKCkgY29uc3Q7Ci0gICAgICAgIGJvb2wgY2Fu QmVFeHRlbmRlZCgpIGNvbnN0OwogCiAgICAgICAgIGNvbnN0IElubGluZUl0ZW0mIG1faW5saW5l SXRlbTsKICAgICAgICAgRGlzcGxheTo6UnVuIG1fZGlzcGxheVJ1bjsKQEAgLTE3NywxMSArMTc3 LDYgQEAgaW5saW5lIHZvaWQgTGluZTo6UnVuOjpzZXRJc0NvbGxhcHNlZCgpCiAgICAgbV9oYXNU cmFpbGluZ0NvbGxhcHNlZENvbnRlbnQgPSB0cnVlOwogfQogCi1pbmxpbmUgYm9vbCBMaW5lOjpS dW46OmNhbkJlRXh0ZW5kZWQoKSBjb25zdAotewotICAgIHJldHVybiBpc1RleHQoKSAmJiAhbV9o YXNUcmFpbGluZ0NvbGxhcHNlZENvbnRlbnQ7Ci19Ci0KIGlubGluZSBib29sIExpbmU6OlJ1bjo6 aXNDb2xsYXBzZWRUb1plcm9BZHZhbmNlV2lkdGgoKSBjb25zdAogewogICAgIEFTU0VSVCghbV9j b2xsYXBzZWRUb1plcm9BZHZhbmNlV2lkdGggfHwgIW1fZGlzcGxheVJ1bi5sb2dpY2FsV2lkdGgo KSk7Cg==