189133 2018-08-29 17:41:09 -0700 Revert some of r235398 2018-08-29 18:23:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen commit-queue thorton webkit-bug-importer oldest_to_newest 1455073 0 achristensen 2018-08-29 17:41:09 -0700 Revert some of r235398 1455074 1 348455 achristensen 2018-08-29 17:42:35 -0700 Created attachment 348455 Patch 1455090 2 348455 commit-queue 2018-08-29 18:22:49 -0700 Comment on attachment 348455 Patch Clearing flags on attachment: 348455 Committed r235492: <https://trac.webkit.org/changeset/235492> 1455091 3 commit-queue 2018-08-29 18:22:50 -0700 All reviewed patches have been landed. Closing bug. 1455092 4 webkit-bug-importer 2018-08-29 18:23:18 -0700 <rdar://problem/43867713> 348455 2018-08-29 17:42:35 -0700 2018-08-29 18:22:49 -0700 Patch bug-189133-20180829174234.patch text/plain 7453 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzU0OTApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA4LTI5ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2ZXJ0IHNvbWUg b2YgcjIzNTM5OAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTg5MTMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0FQSUxvYWRlckNsaWVudC5oOgorICAgICAgICAoQVBJOjpMb2Fk ZXJDbGllbnQ6OnByb2Nlc3NEaWRDcmFzaCk6CisgICAgICAgIChBUEk6OkxvYWRlckNsaWVudDo6 ZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KToKKyAgICAgICAgKEFQSTo6TG9hZGVyQ2xpZW50Ojpk aWRDb21taXRMb2FkRm9yRnJhbWUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2Uu Y3BwOgorICAgICAgICAoV0tQYWdlU2V0UGFnZUxvYWRlckNsaWVudCk6CisgICAgICAgICogVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 ZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjpkaWRDb21taXRMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmRpc3BhdGNoUHJvY2Vzc0RpZFRlcm1pbmF0ZSk6CisKIDIwMTgtMDgtMjkgIE9saXZpYSBCYXJu ZXR0ICA8b2Jhcm5ldHRAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCB0aGUgV2ViIFNo YXJlIEFQSQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShy ZXZpc2lvbiAyMzU0MDkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjcwLDggKzEyNzAsOCBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6ZGlkQ2hhbmdlQmFja0ZvcndhcmRMCiB7CiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90 ZWN0b3IobV9wYWdlQ2xpZW50KTsKIAotICAgIGlmIChtX25hdmlnYXRpb25DbGllbnQpCi0gICAg ICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KCp0aGlzLCBh ZGRlZCwgcmVtb3ZlZCk7CisgICAgaWYgKCFtX25hdmlnYXRpb25DbGllbnQgfHwgIW1fbmF2aWdh dGlvbkNsaWVudC0+ZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KCp0aGlzLCBhZGRlZCwgcmVtb3Zl ZCkpCisgICAgICAgIG1fbG9hZGVyQ2xpZW50LT5kaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QoKnRo aXMsIGFkZGVkLCBXVEZNb3ZlKHJlbW92ZWQpKTsKIAogICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBt X3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKIApAQCAtMzY3Miw5ICszNjcyLDExIEBAIHZv aWQgV2ViUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUKICNlbmRpZgogCiAgICAgbV9w YWdlTG9hZFN0YXRlLmNvbW1pdENoYW5nZXMoKTsKLSAgICBpZiAobV9uYXZpZ2F0aW9uQ2xpZW50 ICYmIGZyYW1lLT5pc01haW5GcmFtZSgpKQotICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRp ZENvbW1pdE5hdmlnYXRpb24oKnRoaXMsIG5hdmlnYXRpb24uZ2V0KCksIG1fcHJvY2Vzcy0+dHJh bnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOwotCisgICAg aWYgKG1fbmF2aWdhdGlvbkNsaWVudCkgeworICAgICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1l KCkpCisgICAgICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZENvbW1pdE5hdmlnYXRpb24o KnRoaXMsIG5hdmlnYXRpb24uZ2V0KCksIG1fcHJvY2Vzcy0+dHJhbnNmb3JtSGFuZGxlc1RvT2Jq ZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOworICAgIH0gZWxzZQorICAgICAgICBtX2xv YWRlckNsaWVudC0+ZGlkQ29tbWl0TG9hZEZvckZyYW1lKCp0aGlzLCAqZnJhbWUsIG5hdmlnYXRp b24uZ2V0KCksIG1fcHJvY2Vzcy0+dHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5v YmplY3QoKSkuZ2V0KCkpOwogI2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VMRU1FTlQpCiAgICAgaWYg KGZyYW1lLT5pc01haW5GcmFtZSgpKQogICAgICAgICBpbnZhbGlkYXRlQWxsQXR0YWNobWVudHMo KTsKQEAgLTU5MTIsNiArNTkxNCw4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaXNwYXRjaFByb2Nl c3NEaWRUZXIKICAgICBib29sIGhhbmRsZWRCeUNsaWVudCA9IGZhbHNlOwogICAgIGlmIChtX25h dmlnYXRpb25DbGllbnQpCiAgICAgICAgIGhhbmRsZWRCeUNsaWVudCA9IG1fbmF2aWdhdGlvbkNs aWVudC0+cHJvY2Vzc0RpZFRlcm1pbmF0ZSgqdGhpcywgcmVhc29uKTsKKyAgICBlbHNlIGlmIChy ZWFzb24gIT0gUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0ZWRCeUNsaWVudCkKKyAg ICAgICAgaGFuZGxlZEJ5Q2xpZW50ID0gbV9sb2FkZXJDbGllbnQtPnByb2Nlc3NEaWRDcmFzaCgq dGhpcyk7CiAKICAgICBpZiAoIWhhbmRsZWRCeUNsaWVudCAmJiBzaG91bGRSZWxvYWRBZnRlclBy b2Nlc3NUZXJtaW5hdGlvbihyZWFzb24pKQogICAgICAgICB0cnlSZWxvYWRBZnRlclByb2Nlc3NU ZXJtaW5hdGlvbigpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUxvYWRl ckNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElM b2FkZXJDbGllbnQuaAkocmV2aXNpb24gMjM1NDA5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0FQSUxvYWRlckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC02Myw2ICs2Myw5IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0 Rm9yRnJhbWUoV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBXZWJLaXQ6OldlYkZyYW1lUHJveHkmLCBB UEk6Ok9iamVjdCopIHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWFjaExheW91dE1pbGVzdG9u ZShXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFdlYkNvcmU6OkxheW91dE1pbGVzdG9uZXMpIHsgfQog ICAgIHZpcnR1YWwgYm9vbCBzaG91bGRLZWVwQ3VycmVudEJhY2tGb3J3YXJkTGlzdEl0ZW1Jbkxp c3QoV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0m KSB7IHJldHVybiB0cnVlOyB9CisgICAgdmlydHVhbCBib29sIHByb2Nlc3NEaWRDcmFzaChXZWJL aXQ6OldlYlBhZ2VQcm94eSYpIHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCB2b2lkIGRp ZENoYW5nZUJhY2tGb3J3YXJkTGlzdChXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFdlYktpdDo6V2Vi QmFja0ZvcndhcmRMaXN0SXRlbSosIFZlY3RvcjxSZWY8V2ViS2l0OjpXZWJCYWNrRm9yd2FyZExp c3RJdGVtPj4mJikgeyB9CisgICAgdmlydHVhbCB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFtZShX ZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFdlYktpdDo6V2ViRnJhbWVQcm94eSYsIEFQSTo6TmF2aWdh dGlvbiosIEFQSTo6T2JqZWN0KikgeyB9CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBBUEkKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAkocmV2aXNpb24gMjM1NDA5 KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTA0NCw3ICsxMDQ0LDYgQEAgdm9pZCBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50 KFdLUGFnZVJlZgogICAgICAgICAgICAgaW5pdGlhbGl6ZShjbGllbnQpOwogICAgICAgICAgICAg CiAgICAgICAgICAgICAvLyBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50IGlzIGRlcHJlY2F0ZWQu IFVzZSBXS1BhZ2VTZXRQYWdlTmF2aWdhdGlvbkNsaWVudCBpbnN0ZWFkLgotICAgICAgICAgICAg UkVMRUFTRV9BU1NFUlQoIW1fY2xpZW50LmRpZENvbW1pdExvYWRGb3JGcmFtZSk7CiAgICAgICAg ICAgICBSRUxFQVNFX0FTU0VSVCghbV9jbGllbnQuZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJh bWUpOwogICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoIW1fY2xpZW50LmRpZFNhbWVEb2N1bWVu dE5hdmlnYXRpb25Gb3JGcmFtZSk7CiAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCghbV9jbGll bnQuZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWUpOwpAQCAtMTA1OSw4ICsxMDU4LDYgQEAgdm9pZCBX S1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50KFdLUGFnZVJlZgogICAgICAgICAgICAgUkVMRUFTRV9B U1NFUlQoIW1fY2xpZW50LmRpZEZpbmlzaFByb2dyZXNzKTsKICAgICAgICAgICAgIFJFTEVBU0Vf QVNTRVJUKCFtX2NsaWVudC5wcm9jZXNzRGlkQmVjb21lVW5yZXNwb25zaXZlKTsKICAgICAgICAg ICAgIFJFTEVBU0VfQVNTRVJUKCFtX2NsaWVudC5wcm9jZXNzRGlkQmVjb21lUmVzcG9uc2l2ZSk7 Ci0gICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCghbV9jbGllbnQucHJvY2Vzc0RpZENyYXNoKTsK LSAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFtX2NsaWVudC5kaWRDaGFuZ2VCYWNrRm9yd2Fy ZExpc3QpOwogICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoIW1fY2xpZW50LnNob3VsZEdvVG9C YWNrRm9yd2FyZExpc3RJdGVtKTsKICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCFtX2NsaWVu dC5kaWRGYWlsVG9Jbml0aWFsaXplUGx1Z2luX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjApOwogICAg ICAgICAgICAgUkVMRUFTRV9BU1NFUlQoIW1fY2xpZW50LmRpZERldGVjdFhTU0ZvckZyYW1lKTsK QEAgLTEwODEsNiArMTA3OCwxNSBAQCB2b2lkIFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQoV0tQ YWdlUmVmCiAgICAgICAgIH0KIAogICAgIHByaXZhdGU6CisgICAgICAgIAorICAgICAgICB2b2lk IGRpZENvbW1pdExvYWRGb3JGcmFtZShXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYkZyYW1lUHJveHkm IGZyYW1lLCBBUEk6Ok5hdmlnYXRpb24qLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpIG92ZXJyaWRl CisgICAgICAgIHsKKyAgICAgICAgICAgIGlmICghbV9jbGllbnQuZGlkQ29tbWl0TG9hZEZvckZy YW1lKQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgbV9jbGllbnQuZGlk Q29tbWl0TG9hZEZvckZyYW1lKHRvQVBJKCZwYWdlKSwgdG9BUEkoJmZyYW1lKSwgdG9BUEkodXNl ckRhdGEpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOworICAgICAgICB9CisgICAgICAgIAog ICAgICAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoV2ViUGFnZVByb3h5 JiBwYWdlLCBXZWJGcmFtZVByb3h5JiBmcmFtZSwgQVBJOjpOYXZpZ2F0aW9uKiwgQVBJOjpPYmpl Y3QqIHVzZXJEYXRhKSBvdmVycmlkZQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoIW1fY2xp ZW50LmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpCkBAIC0xMTM3LDYgKzExNDMsMzMg QEAgdm9pZCBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50KFdLUGFnZVJlZgogICAgICAgICAgICAg bV9jbGllbnQuZGlkTGF5b3V0KHRvQVBJKCZwYWdlKSwgdG9XS0xheW91dE1pbGVzdG9uZXMobWls ZXN0b25lcyksIG51bGxwdHIsIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiAgICAgICAgIH0K IAorICAgICAgICBib29sIHByb2Nlc3NEaWRDcmFzaChXZWJQYWdlUHJveHkmIHBhZ2UpIG92ZXJy aWRlCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmICghbV9jbGllbnQucHJvY2Vzc0RpZENyYXNo KQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICAgICAgbV9jbGllbnQu cHJvY2Vzc0RpZENyYXNoKHRvQVBJKCZwYWdlKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsK KyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisKKyAgICAgICAgdm9pZCBkaWRD aGFuZ2VCYWNrRm9yd2FyZExpc3QoV2ViUGFnZVByb3h5JiBwYWdlLCBXZWJCYWNrRm9yd2FyZExp c3RJdGVtKiBhZGRlZEl0ZW0sIFZlY3RvcjxSZWY8V2ViQmFja0ZvcndhcmRMaXN0SXRlbT4+JiYg cmVtb3ZlZEl0ZW1zKSBvdmVycmlkZQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIW1fY2xp ZW50LmRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdCkKKyAgICAgICAgICAgICAgICByZXR1cm47CisK KyAgICAgICAgICAgIFJlZlB0cjxBUEk6OkFycmF5PiByZW1vdmVkSXRlbXNBcnJheTsKKyAgICAg ICAgICAgIGlmICghcmVtb3ZlZEl0ZW1zLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgICAgIFZl Y3RvcjxSZWZQdHI8QVBJOjpPYmplY3Q+PiByZW1vdmVkSXRlbXNWZWN0b3I7CisgICAgICAgICAg ICAgICAgcmVtb3ZlZEl0ZW1zVmVjdG9yLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkocmVtb3ZlZEl0 ZW1zLnNpemUoKSk7CisgICAgICAgICAgICAgICAgZm9yIChhdXRvJiByZW1vdmVkSXRlbSA6IHJl bW92ZWRJdGVtcykKKyAgICAgICAgICAgICAgICByZW1vdmVkSXRlbXNWZWN0b3IuYXBwZW5kKFdU Rk1vdmUocmVtb3ZlZEl0ZW0pKTsKKworICAgICAgICAgICAgICAgIHJlbW92ZWRJdGVtc0FycmF5 ID0gQVBJOjpBcnJheTo6Y3JlYXRlKFdURk1vdmUocmVtb3ZlZEl0ZW1zVmVjdG9yKSk7CisgICAg ICAgICAgICB9CisKKyAgICAgICAgICAgIG1fY2xpZW50LmRpZENoYW5nZUJhY2tGb3J3YXJkTGlz dCh0b0FQSSgmcGFnZSksIHRvQVBJKGFkZGVkSXRlbSksIHRvQVBJKHJlbW92ZWRJdGVtc0FycmF5 LmdldCgpKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKKyAgICAgICAgfQorICAgICAgICAK ICAgICAgICAgYm9vbCBzaG91bGRLZWVwQ3VycmVudEJhY2tGb3J3YXJkTGlzdEl0ZW1Jbkxpc3Qo V2ViS2l0OjpXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0SXRl bSYgaXRlbSkgb3ZlcnJpZGUKICAgICAgICAgewogICAgICAgICAgICAgaWYgKCFtX2NsaWVudC5z aG91bGRLZWVwQ3VycmVudEJhY2tGb3J3YXJkTGlzdEl0ZW1Jbkxpc3QpCg==