228253 2021-07-23 16:14:27 -0700 Make WKContentRuleListStore respond to same selectors as _WKUserContentExtensionStore 2021-07-23 17:39:24 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen bweinstein webkit-bug-importer oldest_to_newest 1779225 0 achristensen 2021-07-23 16:14:27 -0700 Make WKContentRuleListStore respond to same selectors as _WKUserContentExtensionStore 1779227 1 434140 achristensen 2021-07-23 16:16:42 -0700 Created attachment 434140 Patch 1779228 2 achristensen 2021-07-23 16:16:45 -0700 <rdar://problem/81038849> 1779269 3 ews-feeder 2021-07-23 17:39:22 -0700 Committed r280274 (239936@main): <https://commits.webkit.org/239936@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434140. 434140 2021-07-23 16:16:42 -0700 2021-07-23 17:39:23 -0700 Patch bug-228253-20210723161641.patch text/plain 6930 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVkOTE2ZTJjNDk5ZmE5ODg0 OGM4OTMxMTkyYzRkZjllYTRiZjFkYzMuLjgwOTViYjQ3NDJhMzFiNThkN2VkNzExZDFkZTdiNDhk NTNhMDI0ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDctMjMgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBNYWtlIFdLQ29u dGVudFJ1bGVMaXN0U3RvcmUgcmVzcG9uZCB0byBzYW1lIHNlbGVjdG9ycyBhcyBfV0tVc2VyQ29u dGVudEV4dGVuc2lvblN0b3JlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMjgyNTMKKyAgICAgICAgPHJkYXI6Ly84MTAzODg0OT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBoYXZlIGFuIHVuZm9ydHVu YXRlIHNpdHVhdGlvbiB3aGVyZSBhbiBvbGQgZnJhbWV3b3JrIGlzIGNhbGxpbmcgY29kZSBpbiBh IG5ldyBmcmFtZXdvcmsgdGhhdCBpcyBnaXZpbmcgaXQgYSBXS0NvbnRlbnRSdWxlTGlzdFN0b3Jl CisgICAgICAgIHdoZXJlIGl0IGV4cGVjdHMgYSBfV0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3Jl LiAgQXMgb25lIG9mIHNldmVyYWwgbWl0aWdhdGlvbnMgZm9yIHRoaXMgcHJvYmxlbSwgbWFrZSB0 aGUgc2VsZWN0b3JzIGFibGUgdG8gYmUgY2FsbGVkLgorICAgICAgICBMdWNraWx5IGl0IGRvZXNu J3QgZG8gbXVjaCB3aXRoIHRoZSByZXN1bHRzLiAgSXQganVzdCBjaGVja3MgaWYgdGhleSdyZSBu dWxsIG9yIG5vdCwgYW5kIGl0IHBhc3NlcyBhbnkgZXJyb3JzIGFsb25nLiAgSSBhZGRlZCB0ZXN0 cyB0aGF0IGRvIHRoaXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLQ29udGVu dFJ1bGVMaXN0U3RvcmUubW06CisgICAgICAgICgtW1dLQ29udGVudFJ1bGVMaXN0U3RvcmUgY29t cGlsZUNvbnRlbnRFeHRlbnNpb25Gb3JJZGVudGlmaWVyOmVuY29kZWRDb250ZW50RXh0ZW5zaW9u OmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRSdWxlTGlzdFN0b3Jl IGxvb2t1cENvbnRlbnRFeHRlbnNpb25Gb3JJZGVudGlmaWVyOmNvbXBsZXRpb25IYW5kbGVyOl0p OgorICAgICAgICAoLVtXS0NvbnRlbnRSdWxlTGlzdFN0b3JlIHJlbW92ZUNvbnRlbnRFeHRlbnNp b25Gb3JJZGVudGlmaWVyOmNvbXBsZXRpb25IYW5kbGVyOl0pOgorCiAyMDIxLTA3LTIyICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR0xpYl0gRXhw b3NlIEFQSSB0byBhY2Nlc3MvbW9kaWZ5IGNhcHR1cmUgZGV2aWNlcyBzdGF0ZXMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0NvbnRlbnRSdWxlTGlzdFN0 b3JlLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQ29udGVudFJ1bGVM aXN0U3RvcmUubW0KaW5kZXggMjE4ZjFkNzRkMDc5ZTExOTAxMTk1NWZmZjJkYWMwZjU0YTcwZmRm Mi4uZDVhYjk0ZmIxODc1ZGIwN2I3OGZhMDU1MzEwMjIzNGJmZDgzM2U1NCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQ29udGVudFJ1bGVMaXN0U3RvcmUu bW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQ29udGVudFJ1bGVM aXN0U3RvcmUubW0KQEAgLTMwLDYgKzMwLDcgQEAKICNpbXBvcnQgIkFQSUNvbnRlbnRSdWxlTGlz dFN0b3JlLmgiCiAjaW1wb3J0ICJOZXR3b3JrQ2FjaGVGaWxlU3lzdGVtLmgiCiAjaW1wb3J0ICJX S0Vycm9ySW50ZXJuYWwuaCIKKyNpbXBvcnQgIl9XS1VzZXJDb250ZW50RmlsdGVyUHJpdmF0ZS5o IgogI2ltcG9ydCA8V2ViQ29yZS9XZWJDb3JlT2JqQ0V4dHJhcy5oPgogI2ltcG9ydCA8d3RmL0Js b2NrUHRyLmg+CiAjaW1wb3J0IDx3dGYvQ29tcGxldGlvbkhhbmRsZXIuaD4KQEAgLTE3Miw0ICsx NzMsMjMgQEAgc3RhdGljIFdLRXJyb3JDb2RlIHRvV0tFcnJvckNvZGUoY29uc3Qgc3RkOjplcnJv cl9jb2RlJiBlcnJvcikKICAgICByZXR1cm4gd3JhcHBlcihBUEk6OkNvbnRlbnRSdWxlTGlzdFN0 b3JlOjpzdG9yZVdpdGhQYXRoKHVybC5hYnNvbHV0ZVVSTC5maWxlU3lzdGVtUmVwcmVzZW50YXRp b24pKTsKIH0KIAorLSAodm9pZCljb21waWxlQ29udGVudEV4dGVuc2lvbkZvcklkZW50aWZpZXI6 KE5TU3RyaW5nICopaWRlbnRpZmllciBlbmNvZGVkQ29udGVudEV4dGVuc2lvbjooTlNTdHJpbmcg KillbmNvZGVkQ29udGVudEV4dGVuc2lvbiBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoX1dL VXNlckNvbnRlbnRGaWx0ZXIgKiwgTlNFcnJvciAqKSljb21wbGV0aW9uSGFuZGxlcgoreworICAg IFtzZWxmIGNvbXBpbGVDb250ZW50UnVsZUxpc3RGb3JJZGVudGlmaWVyOmlkZW50aWZpZXIgZW5j b2RlZENvbnRlbnRSdWxlTGlzdDplbmNvZGVkQ29udGVudEV4dGVuc2lvbiBjb21wbGV0aW9uSGFu ZGxlcjpbY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIoY29tcGxldGlvbkhhbmRsZXIp XSAoV0tDb250ZW50UnVsZUxpc3QgKmNvbnRlbnRSdWxlTGlzdCwgTlNFcnJvciAqZXJyb3IpIHsK KyAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoY29udGVudFJ1bGVMaXN0ID8gYWRvcHROUyhbW19X S1VzZXJDb250ZW50RmlsdGVyIGFsbG9jXSBfaW5pdFdpdGhXS0NvbnRlbnRSdWxlTGlzdDpjb250 ZW50UnVsZUxpc3RdKS5nZXQoKSA6IG5pbCwgZXJyb3IpOworICAgIH1dOworfQorCistICh2b2lk KWxvb2t1cENvbnRlbnRFeHRlbnNpb25Gb3JJZGVudGlmaWVyOihOU1N0cmluZyAqKWlkZW50aWZp ZXIgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKF9XS1VzZXJDb250ZW50RmlsdGVyICosIE5T RXJyb3IgKikpY29tcGxldGlvbkhhbmRsZXIKK3sKKyAgICBbc2VsZiBsb29rVXBDb250ZW50UnVs ZUxpc3RGb3JJZGVudGlmaWVyOmlkZW50aWZpZXIgY29tcGxldGlvbkhhbmRsZXI6W2NvbXBsZXRp b25IYW5kbGVyID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRpb25IYW5kbGVyKV0gKFdLQ29udGVudFJ1 bGVMaXN0ICpjb250ZW50UnVsZUxpc3QsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIGNvbXBs ZXRpb25IYW5kbGVyKGNvbnRlbnRSdWxlTGlzdCA/IGFkb3B0TlMoW1tfV0tVc2VyQ29udGVudEZp bHRlciBhbGxvY10gX2luaXRXaXRoV0tDb250ZW50UnVsZUxpc3Q6Y29udGVudFJ1bGVMaXN0XSku Z2V0KCkgOiBuaWwsIGVycm9yKTsKKyAgICB9XTsKK30KKworLSAodm9pZClyZW1vdmVDb250ZW50 RXh0ZW5zaW9uRm9ySWRlbnRpZmllcjooTlNTdHJpbmcgKilpZGVudGlmaWVyIGNvbXBsZXRpb25I YW5kbGVyOih2b2lkICheKShOU0Vycm9yICopKWNvbXBsZXRpb25IYW5kbGVyCit7CisgICAgW3Nl bGYgcmVtb3ZlQ29udGVudFJ1bGVMaXN0Rm9ySWRlbnRpZmllcjppZGVudGlmaWVyIGNvbXBsZXRp b25IYW5kbGVyOmNvbXBsZXRpb25IYW5kbGVyXTsKK30KKwogQGVuZApkaWZmIC0tZ2l0IGEvVG9v bHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDhlZmJjMzE5M2E0OTA4NzI5Y2Nj MTI2Y2U5NzFlNDNlN2Q1NTg5YzAuLjNhMmE5M2JiN2MzMTAxMmU0NzgwODRkMTFlYjBhNTIyYjU3 MTgwOWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxMyBAQAorMjAyMS0wNy0yMyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3Rl bnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIE1ha2UgV0tDb250ZW50UnVsZUxpc3RTdG9yZSBy ZXNwb25kIHRvIHNhbWUgc2VsZWN0b3JzIGFzIF9XS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODI1Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0NvbnRlbnRFeHRlbnNpb25TdG9yZS5tbToKKyAg ICAgICAgKFRFU1RfRik6CisKIDIwMjEtMDctMjIgIEZyw6lkw6lyaWMgV2FuZyAgPGZ3YW5nQGln YWxpYS5jb20+CiAKICAgICAgICAgbnVsbHB0ciBjcmFzaCBpbiBBcHBseVN0eWxlQ29tbWFuZDo6 YXBwbHlSZWxhdGl2ZUZvbnRTdHlsZUNoYW5nZQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0NvbnRlbnRFeHRlbnNpb25TdG9yZS5tbSBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tDb250ZW50RXh0ZW5zaW9uU3RvcmUu bW0KaW5kZXggMWI4YzhjODM0NjMxMDcyNTAzYWJlMmQxNzJiMTJhMjhlYzlmYTZhNS4uMTUwYmM3 MDg4MGYwMTgwMDQ1MGQyZjNmNGIwMjM1MTRkZTRiM2IyNCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0NvbnRlbnRFeHRlbnNpb25TdG9yZS5tbQor KysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQ29udGVudEV4dGVu c2lvblN0b3JlLm1tCkBAIC0zMCw2ICszMCw4IEBACiAjaW1wb3J0ICJUZXN0LmgiCiAjaW1wb3J0 IDxXZWJLaXQvV0tDb250ZW50UnVsZUxpc3QuaD4KICNpbXBvcnQgPFdlYktpdC9XS0NvbnRlbnRS dWxlTGlzdFN0b3JlUHJpdmF0ZS5oPgorI2ltcG9ydCA8V2ViS2l0L19XS1VzZXJDb250ZW50RXh0 ZW5zaW9uU3RvcmUuaD4KKyNpbXBvcnQgPFdlYktpdC9fV0tVc2VyQ29udGVudEZpbHRlci5oPgog I2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogCiBjbGFzcyBXS0NvbnRlbnRSdWxlTGlzdFN0b3Jl VGVzdCA6IHB1YmxpYyB0ZXN0aW5nOjpUZXN0IHsKQEAgLTQzNCwzICs0MzYsNDEgQEAgVEVTVF9G KFdLQ29udGVudFJ1bGVMaXN0U3RvcmVUZXN0LCBVbnNhZmVNTWFwKQogICAgIFRlc3RXZWJLaXRB UEk6OlV0aWw6OnJ1bigmZG9uZVJlbW92aW5nKTsKIH0KICNlbmRpZiAvLyBQTEFURk9STShJT1Nf RkFNSUxZKQorCitURVNUX0YoV0tDb250ZW50UnVsZUxpc3RTdG9yZVRlc3QsIF9XS1VzZXJDb250 ZW50RXh0ZW5zaW9uU3RvcmVTZWxlY3RvcnMpCit7CisgICAgW1tXS0NvbnRlbnRSdWxlTGlzdFN0 b3JlIGRlZmF1bHRTdG9yZV0gX3JlbW92ZUFsbENvbnRlbnRSdWxlTGlzdHNdOworICAgIE5TU3Ry aW5nICppZGVudGlmaWVyID0gQCJUZXN0T2xkU1BJTWl4dXAiOworCisgICAgX19ibG9jayBib29s IGRvbmVDb21waWxpbmcgPSBmYWxzZTsKKyAgICBbKF9XS1VzZXJDb250ZW50RXh0ZW5zaW9uU3Rv cmUgKilbV0tDb250ZW50UnVsZUxpc3RTdG9yZSBkZWZhdWx0U3RvcmVdIGNvbXBpbGVDb250ZW50 RXh0ZW5zaW9uRm9ySWRlbnRpZmllcjppZGVudGlmaWVyIGVuY29kZWRDb250ZW50RXh0ZW5zaW9u OmJhc2ljRmlsdGVyIGNvbXBsZXRpb25IYW5kbGVyOl4oX1dLVXNlckNvbnRlbnRGaWx0ZXIgKmZp bHRlciwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAgRVhQRUNUX05VTEwoZXJyb3IpOworICAg ICAgICBFWFBFQ1RfTk9UX05VTEwoZmlsdGVyKTsKKyAgICAgICAgZG9uZUNvbXBpbGluZyA9IHRy dWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lQ29tcGlsaW5n KTsKKworICAgIF9fYmxvY2sgYm9vbCBkb25lTG9va2luZ1VwID0gZmFsc2U7CisgICAgWyhfV0tV c2VyQ29udGVudEV4dGVuc2lvblN0b3JlICopW1dLQ29udGVudFJ1bGVMaXN0U3RvcmUgZGVmYXVs dFN0b3JlXSBsb29rdXBDb250ZW50RXh0ZW5zaW9uRm9ySWRlbnRpZmllcjppZGVudGlmaWVyIGNv bXBsZXRpb25IYW5kbGVyOl4oX1dLVXNlckNvbnRlbnRGaWx0ZXIgKmZpbHRlciwgTlNFcnJvciAq ZXJyb3IpIHsKKyAgICAgICAgRVhQRUNUX05VTEwoZXJyb3IpOworICAgICAgICBFWFBFQ1RfTk9U X05VTEwoZmlsdGVyKTsKKyAgICAgICAgZG9uZUxvb2tpbmdVcCA9IHRydWU7CisgICAgfV07Cisg ICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lTG9va2luZ1VwKTsKKworICAgIF9fYmxv Y2sgYm9vbCBkb21lUmVtb3ZpbmcgPSBmYWxzZTsKKyAgICBbKF9XS1VzZXJDb250ZW50RXh0ZW5z aW9uU3RvcmUgKilbV0tDb250ZW50UnVsZUxpc3RTdG9yZSBkZWZhdWx0U3RvcmVdIHJlbW92ZUNv bnRlbnRFeHRlbnNpb25Gb3JJZGVudGlmaWVyOmlkZW50aWZpZXIgY29tcGxldGlvbkhhbmRsZXI6 XihOU0Vycm9yICplcnJvcikgeworICAgICAgICBFWFBFQ1RfTlVMTChlcnJvcik7CisgICAgICAg IGRvbWVSZW1vdmluZyA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6 cnVuKCZkb21lUmVtb3ZpbmcpOworCisgICAgZG9uZUxvb2tpbmdVcCA9IGZhbHNlOworICAgIFso X1dLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZSAqKVtXS0NvbnRlbnRSdWxlTGlzdFN0b3JlIGRl ZmF1bHRTdG9yZV0gbG9va3VwQ29udGVudEV4dGVuc2lvbkZvcklkZW50aWZpZXI6aWRlbnRpZmll ciBjb21wbGV0aW9uSGFuZGxlcjpeKF9XS1VzZXJDb250ZW50RmlsdGVyICpmaWx0ZXIsIE5TRXJy b3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShlcnJvci5kb21haW4sIFdLRXJy b3JEb21haW4pOworICAgICAgICBFWFBFQ1RfRVEoZXJyb3IuY29kZSwgV0tFcnJvckNvbnRlbnRS dWxlTGlzdFN0b3JlTG9va1VwRmFpbGVkKTsKKyAgICAgICAgRVhQRUNUX05VTEwoZmlsdGVyKTsK KyAgICAgICAgZG9uZUxvb2tpbmdVcCA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQ STo6VXRpbDo6cnVuKCZkb25lTG9va2luZ1VwKTsKK30K