219668 2020-12-08 22:25:57 -0800 Allow App Highlight without turning on Experimental Feature Flag 2020-12-09 10:30:30 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner changseok esprehn+autocc ews-watchlist glenn hi kondapallykalyan mmaxfield pdr thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1713030 0 megan_gardner 2020-12-08 22:25:57 -0800 Allow App Highlight without turning on Experimental Feature Flag 1713031 1 415716 megan_gardner 2020-12-08 22:43:51 -0800 Created attachment 415716 Patch 1713216 2 megan_gardner 2020-12-09 10:29:52 -0800 https://trac.webkit.org/changeset/270585/webkit 1713217 3 webkit-bug-importer 2020-12-09 10:30:30 -0800 <rdar://problem/72142391> 415716 2020-12-08 22:43:51 -0800 2020-12-09 08:59:47 -0800 Patch bug-219668-20201208224350.patch text/plain 6391 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTA0OWNmNDZlOTQwMGYx ZDI2YmFkNTY1NDYzMzNmNDE3NWQwYzVlZC4uMmQxY2YzY2U5ZjI2OTJhNDQ5NWQ3OTUyYjYxZTJl MWIzNjdiMjlmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEyLTA4ICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQWxsb3cgQXBw IEhpZ2hsaWdodCB3aXRob3V0IHR1cm5pbmcgb24gRXhwZXJpbWVudGFsIEZlYXR1cmUgRmxhZwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NjY4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHNhbWUg cGFpbnRpbmcgaW5mcmFzdHJ1Y3R1cmUgaXMgdXNlZCB0byBwYWludCBhcHAgaGlnaGxpZ2h0cyBh cyB3ZWxsIGFzIEphdmFTY3JpcHQgaGlnaGxpZ2h0cywgYnV0IHRoZQorICAgICAgICBib3RoIHdl cmUgZ2F0ZWQgb24gdGhlIGV4cGVyaW1lbnRhbCBmZWF0dXJlIGZsYWcgZm9yIHRoZSBKYXZhU2Ny aXB0IGhpZ2hsaWdodHMgd2hlbiBwYWludGluZyB0ZXh0LiBUaGUgYXBwIAorICAgICAgICBoaWdo bGlnaHRzIHNob3VsZCBub3QgaGF2ZSBzdWNoIGEgYmFycmllci4gQ29udmVyc2VseSwgcGFpbnRp bmcgdGhlIEphdmFTY3JpcHQgaGlnaGxpZ2h0cyB3YXMgbm90IGdhdGVkIHdoZW4gCisgICAgICAg IHBhaW50aW5nIGltYWdlcy4gVGhhdCBzaG91bGQgYmUgYmVoaW5kIHRoZSBmZWF0dXJlIGZsYWcg Y2hlY2suCisKKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94Ojpjb2xsZWN0TWFya2VkVGV4dHNGb3JIaWdobGlnaHRz IGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNhbGN1bGF0ZUhpZ2hsaWdodENvbG9yIGNvbnN0 KToKKwogMjAyMC0xMi0wOCAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNv bT4KIAogICAgICAgICBBZGQgQU5HTEVIZWFkZXJzLmggdG8gaW5jbHVkZSBhbGwgQU5HTEUgaGVh ZGVycyBmb3IgV2ViR0wKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Jbmxp bmVUZXh0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNw cAppbmRleCA3ZmJkMWUxMTBiMzMyNTM2YTNhODcxY2RjZjAxNWM5ZDE5YWI5MTk4Li5iZWU4YzBk YjM2OTFlZjdiN2UzOWNmYTc3NDBlZjNmN2ZhMzA2YzIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0lubGluZVRleHRCb3guY3BwCkBAIC0xMDQ4LDMxICsxMDQ4LDMxIEBAIFZlY3RvcjxN YXJrZWRUZXh0PiBJbmxpbmVUZXh0Qm94Ojpjb2xsZWN0TWFya2VkVGV4dHNGb3JEb2N1bWVudE1h cmtlcnMoVGV4dFBhaW50CiAKIFZlY3RvcjxNYXJrZWRUZXh0PiBJbmxpbmVUZXh0Qm94Ojpjb2xs ZWN0TWFya2VkVGV4dHNGb3JIaWdobGlnaHRzKFRleHRQYWludFBoYXNlIHBoYXNlKSBjb25zdAog ewotICAgIGlmICghUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5oaWdo bGlnaHRBUElFbmFibGVkKCkpCi0gICAgICAgIHJldHVybiB7IH07CiAgICAgQVNTRVJUX0FSRyhw aGFzZSwgcGhhc2UgPT0gVGV4dFBhaW50UGhhc2U6OkJhY2tncm91bmQgfHwgcGhhc2UgPT0gVGV4 dFBhaW50UGhhc2U6OkZvcmVncm91bmQgfHwgcGhhc2UgPT0gVGV4dFBhaW50UGhhc2U6OkRlY29y YXRpb24pOwogICAgIFVOVVNFRF9QQVJBTShwaGFzZSk7CiAgICAgaWYgKCFyZW5kZXJlcigpLnRl eHROb2RlKCkpCiAgICAgICAgIHJldHVybiB7IH07CiAKICAgICBWZWN0b3I8TWFya2VkVGV4dD4g bWFya2VkVGV4dHM7Ci0gICAgYXV0byYgcGFyZW50UmVuZGVyZXIgPSBwYXJlbnQoKS0+cmVuZGVy ZXIoKTsKLSAgICBhdXRvJiBwYXJlbnRTdHlsZSA9IHBhcmVudFJlbmRlcmVyLnN0eWxlKCk7CiAg ICAgSGlnaGxpZ2h0RGF0YSBoaWdobGlnaHREYXRhOwotICAgIGlmIChhdXRvIGhpZ2hsaWdodFJl Z2lzdGVyID0gcmVuZGVyZXIoKS5kb2N1bWVudCgpLmhpZ2hsaWdodFJlZ2lzdGVySWZFeGlzdHMo KSkgewotICAgICAgICBmb3IgKGF1dG8mIGhpZ2hsaWdodCA6IGhpZ2hsaWdodFJlZ2lzdGVyLT5t YXAoKSkgewotICAgICAgICAgICAgYXV0byByZW5kZXJTdHlsZSA9IHBhcmVudFJlbmRlcmVyLmdl dFVuY2FjaGVkUHNldWRvU3R5bGUoeyBQc2V1ZG9JZDo6SGlnaGxpZ2h0LCBoaWdobGlnaHQua2V5 IH0sICZwYXJlbnRTdHlsZSk7Ci0gICAgICAgICAgICBpZiAoIXJlbmRlclN0eWxlKQotICAgICAg ICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgaWYgKHJlbmRlclN0eWxlLT50ZXh0RGVj b3JhdGlvbnNJbkVmZmVjdCgpLmlzRW1wdHkoKSAmJiBwaGFzZSA9PSBUZXh0UGFpbnRQaGFzZTo6 RGVjb3JhdGlvbikKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIGZvciAo YXV0byYgcmFuZ2VEYXRhIDogaGlnaGxpZ2h0LnZhbHVlLT5yYW5nZXNEYXRhKCkpIHsKLSAgICAg ICAgICAgICAgICBpZiAoIWhpZ2hsaWdodERhdGEuc2V0UmVuZGVyUmFuZ2UocmFuZ2VEYXRhKSkK KyAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5oaWdobGln aHRBUElFbmFibGVkKCkpIHsKKyAgICAgICAgYXV0byYgcGFyZW50UmVuZGVyZXIgPSBwYXJlbnQo KS0+cmVuZGVyZXIoKTsKKyAgICAgICAgYXV0byYgcGFyZW50U3R5bGUgPSBwYXJlbnRSZW5kZXJl ci5zdHlsZSgpOworICAgICAgICBpZiAoYXV0byBoaWdobGlnaHRSZWdpc3RlciA9IHJlbmRlcmVy KCkuZG9jdW1lbnQoKS5oaWdobGlnaHRSZWdpc3RlcklmRXhpc3RzKCkpIHsKKyAgICAgICAgICAg IGZvciAoYXV0byYgaGlnaGxpZ2h0IDogaGlnaGxpZ2h0UmVnaXN0ZXItPm1hcCgpKSB7CisgICAg ICAgICAgICAgICAgYXV0byByZW5kZXJTdHlsZSA9IHBhcmVudFJlbmRlcmVyLmdldFVuY2FjaGVk UHNldWRvU3R5bGUoeyBQc2V1ZG9JZDo6SGlnaGxpZ2h0LCBoaWdobGlnaHQua2V5IH0sICZwYXJl bnRTdHlsZSk7CisgICAgICAgICAgICAgICAgaWYgKCFyZW5kZXJTdHlsZSkKICAgICAgICAgICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgaWYgKHJlbmRlclN0eWxlLT50ZXh0 RGVjb3JhdGlvbnNJbkVmZmVjdCgpLmlzRW1wdHkoKSAmJiBwaGFzZSA9PSBUZXh0UGFpbnRQaGFz ZTo6RGVjb3JhdGlvbikKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAg ICAgICAgZm9yIChhdXRvJiByYW5nZURhdGEgOiBoaWdobGlnaHQudmFsdWUtPnJhbmdlc0RhdGEo KSkgeworICAgICAgICAgICAgICAgICAgICBpZiAoIWhpZ2hsaWdodERhdGEuc2V0UmVuZGVyUmFu Z2UocmFuZ2VEYXRhKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAg ICAgICAgICAgICAgYXV0byBbaGlnaGxpZ2h0U3RhcnQsIGhpZ2hsaWdodEVuZF0gPSBoaWdobGln aHRTdGFydEVuZChoaWdobGlnaHREYXRhKTsKLSAgICAgICAgICAgICAgICBpZiAoaGlnaGxpZ2h0 U3RhcnQgPCBoaWdobGlnaHRFbmQpCi0gICAgICAgICAgICAgICAgICAgIG1hcmtlZFRleHRzLmFw cGVuZCh7IGhpZ2hsaWdodFN0YXJ0LCBoaWdobGlnaHRFbmQsIE1hcmtlZFRleHQ6OkhpZ2hsaWdo dCwgbnVsbHB0ciwgaGlnaGxpZ2h0LmtleSB9KTsKKyAgICAgICAgICAgICAgICAgICAgYXV0byBb aGlnaGxpZ2h0U3RhcnQsIGhpZ2hsaWdodEVuZF0gPSBoaWdobGlnaHRTdGFydEVuZChoaWdobGln aHREYXRhKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGhpZ2hsaWdodFN0YXJ0IDwgaGlnaGxp Z2h0RW5kKQorICAgICAgICAgICAgICAgICAgICAgICAgbWFya2VkVGV4dHMuYXBwZW5kKHsgaGln aGxpZ2h0U3RhcnQsIGhpZ2hsaWdodEVuZCwgTWFya2VkVGV4dDo6SGlnaGxpZ2h0LCBudWxscHRy LCBoaWdobGlnaHQua2V5IH0pOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAg ICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJSZXBsYWNlZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQu Y3BwCmluZGV4IGMwMjQ2MzlkYTM4NTY1Y2IzYWNkNjVhNDdlZTEyZGVjOWM3ODRiN2UuLjk1NWM3 ODYxOTE2MTI3OWE1YjNhNDJjZTZlYWJlNjIzMDkxNGEzYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcApAQCAtNDUsNiArNDUsNyBAQAogI2luY2x1ZGUg IlJlbmRlclRoZW1lLmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgogI2luY2x1ZGUgIlJlbmRl cmVkRG9jdW1lbnRNYXJrZXIuaCIKKyNpbmNsdWRlICJSdW50aW1lRW5hYmxlZEZlYXR1cmVzLmgi CiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRlICJWaXNpYmxlUG9zaXRpb24uaCIKICNp bmNsdWRlIDx3dGYvSXNvTWFsbG9jSW5saW5lcy5oPgpAQCAtMTU5LDE4ICsxNjAsMjAgQEAgQ29s b3IgUmVuZGVyUmVwbGFjZWQ6OmNhbGN1bGF0ZUhpZ2hsaWdodENvbG9yKCkgY29uc3QKICAgICAg ICAgfQogICAgIH0KICNlbmRpZgotICAgIGlmIChhdXRvIGhpZ2hsaWdodFJlZ2lzdGVyID0gZG9j dW1lbnQoKS5oaWdobGlnaHRSZWdpc3RlcklmRXhpc3RzKCkpIHsKLSAgICAgICAgZm9yIChhdXRv JiBoaWdobGlnaHQgOiBoaWdobGlnaHRSZWdpc3Rlci0+bWFwKCkpIHsKLSAgICAgICAgICAgIGZv ciAoYXV0byYgcmFuZ2VEYXRhIDogaGlnaGxpZ2h0LnZhbHVlLT5yYW5nZXNEYXRhKCkpIHsKLSAg ICAgICAgICAgICAgICBpZiAoIWhpZ2hsaWdodERhdGEuc2V0UmVuZGVyUmFuZ2UocmFuZ2VEYXRh KSkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgICAgICAgICBhdXRv IHN0YXRlID0gaGlnaGxpZ2h0RGF0YS5oaWdobGlnaHRTdGF0ZUZvclJlbmRlcmVyKCp0aGlzKTsK LSAgICAgICAgICAgICAgICBpZiAoIWlzSGlnaGxpZ2h0ZWQoc3RhdGUsIGhpZ2hsaWdodERhdGEp KQotICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICAgICAgICAgIGlmIChh dXRvIGhpZ2hsaWdodFN0eWxlID0gZ2V0VW5jYWNoZWRQc2V1ZG9TdHlsZSh7IFBzZXVkb0lkOjpI aWdobGlnaHQsIGhpZ2hsaWdodC5rZXkgfSwgJnN0eWxlKCkpKQotICAgICAgICAgICAgICAgICAg ICByZXR1cm4gaGlnaGxpZ2h0U3R5bGUtPmJhY2tncm91bmRDb2xvcigpOworICAgIGlmIChSdW50 aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLmhpZ2hsaWdodEFQSUVuYWJsZWQo KSkgeworICAgICAgICBpZiAoYXV0byBoaWdobGlnaHRSZWdpc3RlciA9IGRvY3VtZW50KCkuaGln aGxpZ2h0UmVnaXN0ZXJJZkV4aXN0cygpKSB7CisgICAgICAgICAgICBmb3IgKGF1dG8mIGhpZ2hs aWdodCA6IGhpZ2hsaWdodFJlZ2lzdGVyLT5tYXAoKSkgeworICAgICAgICAgICAgICAgIGZvciAo YXV0byYgcmFuZ2VEYXRhIDogaGlnaGxpZ2h0LnZhbHVlLT5yYW5nZXNEYXRhKCkpIHsKKyAgICAg ICAgICAgICAgICAgICAgaWYgKCFoaWdobGlnaHREYXRhLnNldFJlbmRlclJhbmdlKHJhbmdlRGF0 YSkpCisgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgICAg ICAgICBhdXRvIHN0YXRlID0gaGlnaGxpZ2h0RGF0YS5oaWdobGlnaHRTdGF0ZUZvclJlbmRlcmVy KCp0aGlzKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFpc0hpZ2hsaWdodGVkKHN0YXRlLCBo aWdobGlnaHREYXRhKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAg ICAgICAgICAgICAgICAgIGlmIChhdXRvIGhpZ2hsaWdodFN0eWxlID0gZ2V0VW5jYWNoZWRQc2V1 ZG9TdHlsZSh7IFBzZXVkb0lkOjpIaWdobGlnaHQsIGhpZ2hsaWdodC5rZXkgfSwgJnN0eWxlKCkp KQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGhpZ2hsaWdodFN0eWxlLT5iYWNrZ3Jv dW5kQ29sb3IoKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0K ICAgICB9Cg==