140663 2015-01-19 21:12:42 -0800 Add a mechanism to ignore previous content extension rules 2015-01-20 13:30:38 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin kling thorton oldest_to_newest 1062639 0 benjamin 2015-01-19 21:12:42 -0800 Add a mechanism to ignore previous content extension rules 1062641 1 244965 benjamin 2015-01-19 21:14:37 -0800 Created attachment 244965 Patch 1062676 2 244965 kling 2015-01-20 01:25:41 -0800 Comment on attachment 244965 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=244965&action=review r=me > Source/WebCore/contentextensions/ContentExtensionsManager.cpp:100 > WTFLogAlways("Unrocognized action: \"%s\"", actionType.utf8().data()); Typo here, "Unrecognized" 1062851 3 benjamin 2015-01-20 12:46:10 -0800 Committed r178743: <http://trac.webkit.org/changeset/178743> 1062860 4 thorton 2015-01-20 13:30:38 -0800 This change broke the 32-bit build: https://build.webkit.org/builders/Apple%20MountainLion%20Release%20%2832-bit%20Build%29/builds/18802/steps/compile-webkit/logs/errors 244965 2015-01-19 21:14:37 -0800 2015-01-20 01:25:41 -0800 Patch bug-140663-20150119211444.patch text/plain 4419 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NjY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDJiOGJjMDc3Mzk3Njc2 ODY1N2EwYmJiMmY1ZTIyZmQ5MTE4NmY1Mi4uYmZhNTQ4NDg0NTZhOWYyZmY4NDA1MTY5MDk2MDgy Mjg3OGMzNDI5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDE1LTAxLTE5ICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KIAorICAgICAgICBBZGQgYSBtZWNo YW5pc20gdG8gaWdub3JlIHByZXZpb3VzIGNvbnRlbnQgZXh0ZW5zaW9uIHJ1bGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA2NjMKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNvbnRlbnRleHRlbnNp b25zL0NvbnRlbnRFeHRlbnNpb25SdWxlLmg6CisgICAgICAgICogY29udGVudGV4dGVuc2lvbnMv Q29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRF eHRlbnNpb25zOjpDb250ZW50RXh0ZW5zaW9uc0JhY2tlbmQ6OnNob3VsZEJsb2NrVVJMKToKKyAg ICAgICAgKiBjb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc01hbmFnZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OkV4dGVuc2lvbnNNYW5hZ2VyOjps b2FkQWN0aW9uKToKKworMjAxNS0wMS0xOSAgQmVuamFtaW4gUG91bGFpbiAgPGJlbmphbWluQHdl YmtpdC5vcmc+CisKICAgICAgICAgUmVzb2x2ZSB0aGUgZXBzaWxvbiB0cmFuc2l0aW9ucyBmb3Ig ZWFjaCBzdGF0ZSB1cGZyb250IGluc3RlYWQgb2YgZHluYW1pY2FsbHkKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDY1NAogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uUnVsZS5oIGIv U291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvblJ1bGUuaApp bmRleCA4MGI4YzM2NTM2OGRjYTVkNzQxMjVjYmE0MjE0NGQ0ZTlhOTZiN2NhLi5hYTk3ZWYxNDNk ZmRlODA0NjE5YWM3YTdmZGM2ZTI5Y2ZkZGYxMGI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uUnVsZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25SdWxlLmgKQEAgLTM1LDcg KzM1LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIENvbnRlbnRFeHRlbnNpb25z IHsKIAogZW51bSBjbGFzcyBFeHRlbnNpb25BY3Rpb25UeXBlIHsKLSAgICBCbG9ja0xvYWQKKyAg ICBCbG9ja0xvYWQsCisgICAgSWdub3JlUHJldmlvdXNSdWxlcwogfTsKIAogLy8gQSBDb250ZW50 RXh0ZW5zaW9uUnVsZSBpcyB0aGUgc21hbGxlc3QgdW5pdCBpbiBhIENvbnRlbnRFeHRlbnNpb24u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0 ZW5zaW9uc0JhY2tlbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29u dGVudEV4dGVuc2lvbnNCYWNrZW5kLmNwcAppbmRleCA4ZTgwNTI4NTNiNjI0ZDM1ZWQ4ZTJmN2Jl NjM3MTExN2UzMmE1YjMzLi41NzE5YmU5YjczMjk2YzYwNWFhMjhiNGQzYmQzOWU2Zjg3NmI0YjE0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0 ZW5zaW9uc0JhY2tlbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25z L0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5jcHAKQEAgLTEyMCwxNSArMTIwLDI1IEBAIGJvb2wg Q29udGVudEV4dGVuc2lvbnNCYWNrZW5kOjpzaG91bGRCbG9ja1VSTChjb25zdCBVUkwmIHVybCkK ICAgICAgICAgQ29tcGlsZWRDb250ZW50RXh0ZW5zaW9uJiBjb21waWxlZENvbnRlbnRFeHRlbnNp b24gPSBydWxlTGlzdFNsb3QudmFsdWU7CiAgICAgICAgIHVuc2lnbmVkIHN0YXRlID0gY29tcGls ZWRDb250ZW50RXh0ZW5zaW9uLmRmYS5yb290KCk7CiAKKyAgICAgICAgSGFzaFNldDx1aW50NjRf dCwgRGVmYXVsdEhhc2g8dWludDY0X3Q+OjpIYXNoLCBXVEY6OlVuc2lnbmVkV2l0aFplcm9LZXlI YXNoVHJhaXRzPHVpbnQ2NF90Pj4gdHJpZ2dlcmVkQWN0aW9uczsKKwogICAgICAgICBmb3IgKHVu c2lnbmVkIGkgPSAwOyBpIDwgdXJsU3RyaW5nLmxlbmd0aCgpOyArK2kpIHsKICAgICAgICAgICAg IGNoYXIgY2hhcmFjdGVyID0gc3RhdGljX2Nhc3Q8Y2hhcj4odXJsU3RyaW5nW2ldKTsKICAgICAg ICAgICAgIGJvb2wgb2s7CiAgICAgICAgICAgICBzdGF0ZSA9IGNvbXBpbGVkQ29udGVudEV4dGVu c2lvbi5kZmEubmV4dFN0YXRlKHN0YXRlLCBjaGFyYWN0ZXIsIG9rKTsKICAgICAgICAgICAgIGlm ICghb2spCi0gICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgICAgIGJy ZWFrOwogCi0gICAgICAgICAgICAvLyBGSVhNRTogYWNjdW11bGF0ZSB0aGUgYWN0aW9ucy4KLSAg ICAgICAgICAgIGlmICghY29tcGlsZWRDb250ZW50RXh0ZW5zaW9uLmRmYS5hY3Rpb25zKHN0YXRl KS5pc0VtcHR5KCkpCisgICAgICAgICAgICBjb25zdCBWZWN0b3I8dWludDY0X3Q+JiBhY3Rpb25z ID0gY29tcGlsZWRDb250ZW50RXh0ZW5zaW9uLmRmYS5hY3Rpb25zKHN0YXRlKTsKKyAgICAgICAg ICAgIGlmICghYWN0aW9ucy5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAgdHJpZ2dlcmVkQWN0 aW9ucy5hZGQoYWN0aW9ucy5iZWdpbigpLCBhY3Rpb25zLmVuZCgpKTsKKyAgICAgICAgfQorICAg ICAgICBpZiAoIXRyaWdnZXJlZEFjdGlvbnMuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBWZWN0 b3I8dWludDY0X3Q+IHNvcnRlZEFjdGlvbnM7CisgICAgICAgICAgICBjb3B5VG9WZWN0b3IodHJp Z2dlcmVkQWN0aW9ucywgc29ydGVkQWN0aW9ucyk7CisgICAgICAgICAgICBzdGQ6OnNvcnQoc29y dGVkQWN0aW9ucy5iZWdpbigpLCBzb3J0ZWRBY3Rpb25zLmVuZCgpKTsKKyAgICAgICAgICAgIHVp bnQ2NF90IGxhc3RBY3Rpb24gPSBzb3J0ZWRBY3Rpb25zLmxhc3QoKTsKKyAgICAgICAgICAgIGlm IChjb21waWxlZENvbnRlbnRFeHRlbnNpb24ucnVsZUxpc3RbbGFzdEFjdGlvbl0uYWN0aW9uKCku dHlwZSA9PSBFeHRlbnNpb25BY3Rpb25UeXBlOjpCbG9ja0xvYWQpCiAgICAgICAgICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc01hbmFnZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbnNNYW5hZ2VyLmNwcApp bmRleCBlNGJkNGYyMzE2NDkyZjEyZmRhNmYzMWJmMTdlMDRlYTdhOGE2ZjVjLi4wMjQ1NWJjZTVj YmNlNTZiNzU1YTIzYzgzZmRmZDk5ZWRmMjljMTAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc01hbmFnZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zTWFuYWdlci5j cHAKQEAgLTkxLDEzICs5MSwxNiBAQCBzdGF0aWMgYm9vbCBsb2FkQWN0aW9uKEV4ZWNTdGF0ZSYg ZXhlYywgSlNPYmplY3QmIHJ1bGVPYmplY3QsIENvbnRlbnRFeHRlbnNpb25SdQogICAgIH0KIAog ICAgIFN0cmluZyBhY3Rpb25UeXBlID0gdHlwZU9iamVjdC50b1dURlN0cmluZygmZXhlYyk7Ci0g ICAgaWYgKGFjdGlvblR5cGUgIT0gImJsb2NrIikgeworCisgICAgaWYgKGFjdGlvblR5cGUgPT0g ImJsb2NrIikKKyAgICAgICAgYWN0aW9uLnR5cGUgPSBFeHRlbnNpb25BY3Rpb25UeXBlOjpCbG9j a0xvYWQ7CisgICAgZWxzZSBpZiAoYWN0aW9uVHlwZSA9PSAiaWdub3JlLXByZXZpb3VzLXJ1bGVz IikKKyAgICAgICAgYWN0aW9uLnR5cGUgPSBFeHRlbnNpb25BY3Rpb25UeXBlOjpJZ25vcmVQcmV2 aW91c1J1bGVzOworICAgIGVsc2UgaWYgKGFjdGlvblR5cGUgIT0gImJsb2NrIiAmJiBhY3Rpb25U eXBlICE9ICIiKSB7CiAgICAgICAgIFdURkxvZ0Fsd2F5cygiVW5yb2NvZ25pemVkIGFjdGlvbjog XCIlc1wiIiwgYWN0aW9uVHlwZS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIH0KIAotICAgIGFjdGlvbi50eXBlID0gRXh0ZW5zaW9uQWN0aW9uVHlwZTo6QmxvY2tM b2FkOwotCiAgICAgcmV0dXJuIHRydWU7CiB9CiAK