220959 2021-01-25 17:02:56 -0800 Add stub in ContentExtensionsBackend for HTTPS upgrade 2021-02-26 09:21:45 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen ggaren simon.fraser webkit-bug-importer oldest_to_newest 1722353 0 achristensen 2021-01-25 17:02:56 -0800 Add stub in ContentExtensionsBackend for HTTPS upgrade 1722354 1 418358 achristensen 2021-01-25 17:05:37 -0800 Created attachment 418358 Patch 1722615 2 418358 achristensen 2021-01-26 11:32:11 -0800 Comment on attachment 418358 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418358&action=review > Source/WebCore/contentextensions/ContentExtensionsBackend.cpp:58 > +#import <WebKitAdditions/ContentRuleListAdditions.mm> Implemented in rdar://problem/73625317 1722765 3 418358 ggaren 2021-01-26 16:10:23 -0800 Comment on attachment 418358 Patch r=me 1724473 4 webkit-bug-importer 2021-02-01 17:03:21 -0800 <rdar://problem/73854237> 1724985 5 ews-feeder 2021-02-02 19:08:33 -0800 Committed r272293: <https://trac.webkit.org/changeset/272293> All reviewed patches have been landed. Closing bug and clearing flags on attachment 418358. 1733342 6 418358 simon.fraser 2021-02-25 08:53:46 -0800 Comment on attachment 418358 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418358&action=review >> Source/WebCore/contentextensions/ContentExtensionsBackend.cpp:58 >> +#import <WebKitAdditions/ContentRuleListAdditions.mm> > > Implemented in rdar://problem/73625317 How is it that we pull a .mm file into a .cpp file? 1733794 7 418358 achristensen 2021-02-26 09:21:45 -0800 Comment on attachment 418358 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418358&action=review >>> Source/WebCore/contentextensions/ContentExtensionsBackend.cpp:58 >>> +#import <WebKitAdditions/ContentRuleListAdditions.mm> >> >> Implemented in rdar://problem/73625317 > > How is it that we pull a .mm file into a .cpp file? That's not great. The c preprocessor can pull anything in. This mm file happens to not have any objc so it works. We should rename it. 418358 2021-01-25 17:05:37 -0800 2021-02-02 19:08:34 -0800 Patch bug-220959-20210125170536.patch text/plain 7172 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI3MTg3MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDIxLTAxLTI1ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIHN0dWIg aW4gQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kIGZvciBIVFRQUyB1cGdyYWRlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA5NTkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBvcmRlciBmb3IgaXQgdG8g YmUgY2FsbGVkLCBJIG5lZWRlZCB0byByZW1vdmUgYSBmZXcgdW5uZWNlc3NhcnkgZWFybHkgcmV0 dXJucyB0aGF0IHByZXZlbnQgdXMgZnJvbSBkb2luZyB0cml2aWFsIHRhc2tzIGxpa2UgZ2V0dGlu ZyBhIERvY3VtZW50IHBvaW50ZXIKKyAgICAgICAgaWYgdGhlcmUgYXJlIG5vIFdLQ29udGVudFJ1 bGVMaXN0cyBpbnN0YWxsZWQuCisgICAgICAgIEkgYWxzbyByZW1vdmVkIHNvbWUgZGVhZCBjb2Rl LgorCisgICAgICAgICogY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5k LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNpb25zOjptYWtlU2VjdXJlSWZO ZWNlc3NhcnkpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OkNvbnRlbnRF eHRlbnNpb25zQmFja2VuZDo6cHJvY2Vzc0NvbnRlbnRSdWxlTGlzdHNGb3JMb2FkKToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNpb25zOjpDb250ZW50RXh0ZW5zaW9uc0JhY2tlbmQ6 OnByb2Nlc3NDb250ZW50UnVsZUxpc3RzRm9yUGluZ0xvYWQpOgorICAgICAgICAqIHBhZ2UvVXNl ckNvbnRlbnRQcm92aWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb250ZW50UnVsZUxpc3Rz RW5hYmxlZCk6CisgICAgICAgIChXZWJDb3JlOjpVc2VyQ29udGVudFByb3ZpZGVyOjpwcm9jZXNz Q29udGVudFJ1bGVMaXN0c0ZvckxvYWQpOgorICAgICAgICAoV2ViQ29yZTo6Y29udGVudEV4dGVu c2lvbnNFbmFibGVkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlVzZXJDb250ZW50UHJv dmlkZXI6OmFjdGlvbnNGb3JSZXNvdXJjZUxvYWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6VXNlckNvbnRlbnRQcm92aWRlcjo6Zm9yRWFjaENvbnRlbnRFeHRlbnNpb24pOiBEZWxldGVk LgorICAgICAgICAqIHBhZ2UvVXNlckNvbnRlbnRQcm92aWRlci5oOgorCiAyMDIxLTAxLTI1ICBQ ZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CiAKICAgICAgICAgVHdpdHRlciBQaVAgdmlk ZW8gcGF1c2VzIHdoZW4gc2Nyb2xsaW5nCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0 ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5jcHAJ KHJldmlzaW9uIDI3MTczNCkKKysrIFNvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0Nv bnRlbnRFeHRlbnNpb25zQmFja2VuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUzLDcgKzUzLDE1 IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIG5hbWVzcGFjZSBDb250ZW50RXh0ZW5zaW9ucyB7 Ci0gICAgCisKKyNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQorI2ltcG9ydCA8V2ViS2l0QWRk aXRpb25zL0NvbnRlbnRSdWxlTGlzdEFkZGl0aW9ucy5tbT4KKyNlbHNlCitzdGF0aWMgdm9pZCBt YWtlU2VjdXJlSWZOZWNlc3NhcnkoQ29udGVudFJ1bGVMaXN0UmVzdWx0cyYsIGNvbnN0IFVSTCYp Cit7Cit9CisjZW5kaWYKKwogdm9pZCBDb250ZW50RXh0ZW5zaW9uc0JhY2tlbmQ6OmFkZENvbnRl bnRFeHRlbnNpb24oY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBSZWY8Q29tcGlsZWRDb250ZW50 RXh0ZW5zaW9uPiBjb21waWxlZENvbnRlbnRFeHRlbnNpb24sIENvbnRlbnRFeHRlbnNpb246OlNo b3VsZENvbXBpbGVDU1Mgc2hvdWxkQ29tcGlsZUNTUykKIHsKICAgICBBU1NFUlQoIWlkZW50aWZp ZXIuaXNFbXB0eSgpKTsKQEAgLTE1NSwyMCArMTYzLDE3IEBAIFN0eWxlU2hlZXRDb250ZW50cyog Q29udGVudEV4dGVuc2lvbnNCYWMKIAogQ29udGVudFJ1bGVMaXN0UmVzdWx0cyBDb250ZW50RXh0 ZW5zaW9uc0JhY2tlbmQ6OnByb2Nlc3NDb250ZW50UnVsZUxpc3RzRm9yTG9hZChjb25zdCBVUkwm IHVybCwgT3B0aW9uU2V0PFJlc291cmNlVHlwZT4gcmVzb3VyY2VUeXBlLCBEb2N1bWVudExvYWRl ciYgaW5pdGlhdGluZ0RvY3VtZW50TG9hZGVyKQogewotICAgIGlmIChtX2NvbnRlbnRFeHRlbnNp b25zLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIHsgfTsKLQogICAgIERvY3VtZW50KiBjdXJy ZW50RG9jdW1lbnQgPSBudWxscHRyOwogICAgIFVSTCBtYWluRG9jdW1lbnRVUkw7CiAKLSAgICBp ZiAoRnJhbWUqIGZyYW1lID0gaW5pdGlhdGluZ0RvY3VtZW50TG9hZGVyLmZyYW1lKCkpIHsKKyAg ICBpZiAoYXV0byogZnJhbWUgPSBpbml0aWF0aW5nRG9jdW1lbnRMb2FkZXIuZnJhbWUoKSkgewog ICAgICAgICBjdXJyZW50RG9jdW1lbnQgPSBmcmFtZS0+ZG9jdW1lbnQoKTsKIAogICAgICAgICBp ZiAoaW5pdGlhdGluZ0RvY3VtZW50TG9hZGVyLmlzTG9hZGluZ01haW5SZXNvdXJjZSgpCiAgICAg ICAgICAgICAmJiBmcmFtZS0+aXNNYWluRnJhbWUoKQogICAgICAgICAgICAgJiYgcmVzb3VyY2VU eXBlID09IFJlc291cmNlVHlwZTo6RG9jdW1lbnQpCiAgICAgICAgICAgICBtYWluRG9jdW1lbnRV UkwgPSB1cmw7Ci0gICAgICAgIGVsc2UgaWYgKERvY3VtZW50KiBtYWluRG9jdW1lbnQgPSBmcmFt ZS0+bWFpbkZyYW1lKCkuZG9jdW1lbnQoKSkKKyAgICAgICAgZWxzZSBpZiAoYXV0byogbWFpbkRv Y3VtZW50ID0gZnJhbWUtPm1haW5GcmFtZSgpLmRvY3VtZW50KCkpCiAgICAgICAgICAgICBtYWlu RG9jdW1lbnRVUkwgPSBtYWluRG9jdW1lbnQtPnVybCgpOwogICAgIH0KIApAQCAtMTc2LDYgKzE4 MSw3IEBAIENvbnRlbnRSdWxlTGlzdFJlc3VsdHMgQ29udGVudEV4dGVuc2lvbnMKICAgICBhdXRv IGFjdGlvbnMgPSBhY3Rpb25zRm9yUmVzb3VyY2VMb2FkKHJlc291cmNlTG9hZEluZm8pOwogCiAg ICAgQ29udGVudFJ1bGVMaXN0UmVzdWx0cyByZXN1bHRzOworICAgIG1ha2VTZWN1cmVJZk5lY2Vz c2FyeShyZXN1bHRzLCB1cmwpOwogICAgIHJlc3VsdHMucmVzdWx0cy5yZXNlcnZlSW5pdGlhbENh cGFjaXR5KGFjdGlvbnMuc2l6ZSgpKTsKICAgICBmb3IgKGNvbnN0IGF1dG8mIGFjdGlvbnNGcm9t Q29udGVudFJ1bGVMaXN0IDogYWN0aW9ucykgewogICAgICAgICBjb25zdCBTdHJpbmcmIGNvbnRl bnRSdWxlTGlzdElkZW50aWZpZXIgPSBhY3Rpb25zRnJvbUNvbnRlbnRSdWxlTGlzdC5jb250ZW50 UnVsZUxpc3RJZGVudGlmaWVyOwpAQCAtMjUwLDEzICsyNTYsMTEgQEAgQ29udGVudFJ1bGVMaXN0 UmVzdWx0cyBDb250ZW50RXh0ZW5zaW9ucwogCiBDb250ZW50UnVsZUxpc3RSZXN1bHRzIENvbnRl bnRFeHRlbnNpb25zQmFja2VuZDo6cHJvY2Vzc0NvbnRlbnRSdWxlTGlzdHNGb3JQaW5nTG9hZChj b25zdCBVUkwmIHVybCwgY29uc3QgVVJMJiBtYWluRG9jdW1lbnRVUkwpCiB7Ci0gICAgaWYgKG1f Y29udGVudEV4dGVuc2lvbnMuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4geyB9OwotCiAgICAg UmVzb3VyY2VMb2FkSW5mbyByZXNvdXJjZUxvYWRJbmZvID0geyB1cmwsIG1haW5Eb2N1bWVudFVS TCwgUmVzb3VyY2VUeXBlOjpSYXcgfTsKICAgICBhdXRvIGFjdGlvbnMgPSBhY3Rpb25zRm9yUmVz b3VyY2VMb2FkKHJlc291cmNlTG9hZEluZm8pOwogCiAgICAgQ29udGVudFJ1bGVMaXN0UmVzdWx0 cyByZXN1bHRzOworICAgIG1ha2VTZWN1cmVJZk5lY2Vzc2FyeShyZXN1bHRzLCB1cmwpOwogICAg IGZvciAoY29uc3QgYXV0byYgYWN0aW9uc0Zyb21Db250ZW50UnVsZUxpc3QgOiBhY3Rpb25zKSB7 CiAgICAgICAgIGZvciAoY29uc3QgYXV0byYgYWN0aW9uIDogYWN0aW9uc0Zyb21Db250ZW50UnVs ZUxpc3QuYWN0aW9ucykgewogICAgICAgICAgICAgc3dpdGNoIChhY3Rpb24udHlwZSgpKSB7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50UHJvdmlkZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRQcm92aWRlci5jcHAJKHJldmlz aW9uIDI3MTczNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRQcm92aWRlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTkwLDcgKzkwLDcgQEAgdm9pZCBVc2VyQ29udGVudFByb3Zp ZGVyOjppbnZhbGlkYXRlSW5qZQogfQogCiAjaWYgRU5BQkxFKENPTlRFTlRfRVhURU5TSU9OUykK LXN0YXRpYyBib29sIGNvbnRlbnRFeHRlbnNpb25zRW5hYmxlZChjb25zdCBEb2N1bWVudExvYWRl ciYgZG9jdW1lbnRMb2FkZXIpCitzdGF0aWMgYm9vbCBjb250ZW50UnVsZUxpc3RzRW5hYmxlZChj b25zdCBEb2N1bWVudExvYWRlciYgZG9jdW1lbnRMb2FkZXIpCiB7CiAgICAgaWYgKGF1dG8gZnJh bWUgPSBkb2N1bWVudExvYWRlci5mcmFtZSgpKSB7CiAgICAgICAgIGlmIChmcmFtZS0+aXNNYWlu RnJhbWUoKSkKQEAgLTEwNCwyOCArMTA0LDExIEBAIHN0YXRpYyBib29sIGNvbnRlbnRFeHRlbnNp b25zRW5hYmxlZChjb24KICAgICAKIENvbnRlbnRSdWxlTGlzdFJlc3VsdHMgVXNlckNvbnRlbnRQ cm92aWRlcjo6cHJvY2Vzc0NvbnRlbnRSdWxlTGlzdHNGb3JMb2FkKGNvbnN0IFVSTCYgdXJsLCBP cHRpb25TZXQ8Q29udGVudEV4dGVuc2lvbnM6OlJlc291cmNlVHlwZT4gcmVzb3VyY2VUeXBlLCBE b2N1bWVudExvYWRlciYgaW5pdGlhdGluZ0RvY3VtZW50TG9hZGVyKQogewotICAgIGlmICghY29u dGVudEV4dGVuc2lvbnNFbmFibGVkKGluaXRpYXRpbmdEb2N1bWVudExvYWRlcikpCisgICAgaWYg KCFjb250ZW50UnVsZUxpc3RzRW5hYmxlZChpbml0aWF0aW5nRG9jdW1lbnRMb2FkZXIpKQogICAg ICAgICByZXR1cm4geyB9OwogCiAgICAgcmV0dXJuIHVzZXJDb250ZW50RXh0ZW5zaW9uQmFja2Vu ZCgpLnByb2Nlc3NDb250ZW50UnVsZUxpc3RzRm9yTG9hZCh1cmwsIHJlc291cmNlVHlwZSwgaW5p dGlhdGluZ0RvY3VtZW50TG9hZGVyKTsKIH0KLQotVmVjdG9yPENvbnRlbnRFeHRlbnNpb25zOjpB Y3Rpb25zRnJvbUNvbnRlbnRSdWxlTGlzdD4gVXNlckNvbnRlbnRQcm92aWRlcjo6YWN0aW9uc0Zv clJlc291cmNlTG9hZChjb25zdCBDb250ZW50RXh0ZW5zaW9uczo6UmVzb3VyY2VMb2FkSW5mbyYg cmVzb3VyY2VMb2FkSW5mbywgRG9jdW1lbnRMb2FkZXImIGluaXRpYXRpbmdEb2N1bWVudExvYWRl cikKLXsKLSAgICBpZiAoIWNvbnRlbnRFeHRlbnNpb25zRW5hYmxlZChpbml0aWF0aW5nRG9jdW1l bnRMb2FkZXIpKQotICAgICAgICByZXR1cm4geyB9OwotCi0gICAgcmV0dXJuIHVzZXJDb250ZW50 RXh0ZW5zaW9uQmFja2VuZCgpLmFjdGlvbnNGb3JSZXNvdXJjZUxvYWQocmVzb3VyY2VMb2FkSW5m byk7Ci19Ci0KLXZvaWQgVXNlckNvbnRlbnRQcm92aWRlcjo6Zm9yRWFjaENvbnRlbnRFeHRlbnNp b24oY29uc3QgV1RGOjpGdW5jdGlvbjx2b2lkKGNvbnN0IFN0cmluZyYsIENvbnRlbnRFeHRlbnNp b25zOjpDb250ZW50RXh0ZW5zaW9uJik+JiBhcHBseSwgRG9jdW1lbnRMb2FkZXImIGluaXRpYXRp bmdEb2N1bWVudExvYWRlcikKLXsKLSAgICBpZiAoIWNvbnRlbnRFeHRlbnNpb25zRW5hYmxlZChp bml0aWF0aW5nRG9jdW1lbnRMb2FkZXIpKQotICAgICAgICByZXR1cm47Ci0KLSAgICB1c2VyQ29u dGVudEV4dGVuc2lvbkJhY2tlbmQoKS5mb3JFYWNoKGFwcGx5KTsKLX0KLQogI2VuZGlmCiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRl bnRQcm92aWRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRl bnRQcm92aWRlci5oCShyZXZpc2lvbiAyNzE3MzQpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1Vz ZXJDb250ZW50UHJvdmlkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtODgsMTEgKzg4LDcgQEAgcHVi bGljOgogICAgIHZvaWQgcmVtb3ZlUGFnZShQYWdlJik7CiAKICNpZiBFTkFCTEUoQ09OVEVOVF9F WFRFTlNJT05TKQotICAgIC8vIEZJWE1FOiBUaGVzZSBkb24ndCByZWFsbHkgYmVsb25nIGhlcmUu IFRoZXkgc2hvdWxkIHByb2JhYmx5IGJ1bmRsZWQgdXAgaW4gdGhlIENvbnRlbnRFeHRlbnNpb25z QmFja2VuZAotICAgIC8vIHdoaWNoIHNob3VsZCBhbHdheXMgZXhpc3QuCiAgICAgQ29udGVudFJ1 bGVMaXN0UmVzdWx0cyBwcm9jZXNzQ29udGVudFJ1bGVMaXN0c0ZvckxvYWQoY29uc3QgVVJMJiwg T3B0aW9uU2V0PENvbnRlbnRFeHRlbnNpb25zOjpSZXNvdXJjZVR5cGU+LCBEb2N1bWVudExvYWRl ciYgaW5pdGlhdGluZ0RvY3VtZW50TG9hZGVyKTsKLSAgICBWZWN0b3I8Q29udGVudEV4dGVuc2lv bnM6OkFjdGlvbnNGcm9tQ29udGVudFJ1bGVMaXN0PiBhY3Rpb25zRm9yUmVzb3VyY2VMb2FkKGNv bnN0IENvbnRlbnRFeHRlbnNpb25zOjpSZXNvdXJjZUxvYWRJbmZvJiwgRG9jdW1lbnRMb2FkZXIm IGluaXRpYXRpbmdEb2N1bWVudExvYWRlcik7Ci0gICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBmb3JF YWNoQ29udGVudEV4dGVuc2lvbihjb25zdCBGdW5jdGlvbjx2b2lkKGNvbnN0IFN0cmluZyYsIENv bnRlbnRFeHRlbnNpb25zOjpDb250ZW50RXh0ZW5zaW9uJik+JiwgRG9jdW1lbnRMb2FkZXImIGlu aXRpYXRpbmdEb2N1bWVudExvYWRlcik7CiAjZW5kaWYKIAogcHJvdGVjdGVkOgo=