145528 2015-06-01 15:08:48 -0700 [Content Extensions] resource-type and load-type should be independent 2015-06-01 15:41:22 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen commit-queue japhet oldest_to_newest 1098598 0 achristensen 2015-06-01 15:08:48 -0700 Right now we use the same uint16_t to store all the load-type and resource-type flags, then we just do a bitwise and to check both at the same time. This results in a trigger with load-type and resource-type firing if either condition is met, not both conditions. A trigger with both resource-type and load-type conditions should only fire if both conditions are met. 1098599 1 254015 achristensen 2015-06-01 15:12:02 -0700 Created attachment 254015 Patch 1098611 2 254015 benjamin 2015-06-01 15:32:58 -0700 Comment on attachment 254015 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254015&action=review > Source/WebCore/ChangeLog:8 > + Covered by existing tests and a new API test. IMHO, you should explain the bug here. Having the explanation in bugzilla is not enough. > Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp:81 > + bool shouldAppendAction = false; > + if (shouldCheckLoadType && shouldCheckResourceType) > + shouldAppendAction = (flagsToCheck & LoadTypeMask & flags) && (flagsToCheck & ResourceTypeMask & flags); > + else if (shouldCheckLoadType) > + shouldAppendAction = flagsToCheck & LoadTypeMask & flags; > + else { > + ASSERT(shouldCheckResourceType); > + shouldAppendAction = flagsToCheck & ResourceTypeMask & flags; > + } What about: uint16_t loadTypeFlags = flagsToCheck & LoadTypeMask; uint16_t ressourceTypeFlags = flagsToCheck & ResourceTypeMask; bool loadTypeMatches = loadTypeFlags ? (loadTypeFlags & flags) : true; bool ressourceTypeMatches = ressourceTypeFlags ? (ressourceTypeFlags & flags) : true; if (loadTypeMatches && ressourceTypeMatches) ... 1098612 3 achristensen 2015-06-01 15:34:31 -0700 rdar://problem/21190765 1098614 4 achristensen 2015-06-01 15:41:22 -0700 http://trac.webkit.org/changeset/185079 254015 2015-06-01 15:12:02 -0700 2015-06-01 15:32:58 -0700 Patch bug-145528-20150601151144.patch text/plain 5631 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NTA3NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA2LTAxICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NvbnRlbnQg RXh0ZW5zaW9uc10gcmVzb3VyY2UtdHlwZSBhbmQgbG9hZC10eXBlIHNob3VsZCBiZSBpbmRlcGVu ZGVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 NTUyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENv dmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMgYW5kIGEgbmV3IEFQSSB0ZXN0LgorCisgICAgICAgICog Y29udGVudGV4dGVuc2lvbnMvREZBQnl0ZWNvZGVJbnRlcnByZXRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6REZBQnl0ZWNvZGVJbnRlcnByZXRlcjo6aW50ZXJw cmV0VGVzdEZsYWdzQW5kQXBwZW5kQWN0aW9uKToKKyAgICAgICAgQ2hlY2sgYW5kIGNvcnJlY3Rs eSBoYW5kbGUgcnVsZXMgd2l0aCBib3RoIHJlc291cmNlLXR5cGUgYW5kIGxvYWQtdHlwZSBmbGFn cy4KKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkSW5mby5oOgorICAgICAgICBBZGQgbWFz a3MgdG8gc2VwYXJhdGUgZmxhZ3MgZnJvbSByZXNvdXJjZS10eXBlIGFuZCBsb2FkLXR5cGUuCisK IDIwMTUtMDYtMDEgIEJlbmphbWluIFBvdWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+CiAKICAg ICAgICAgW0NTUyBKSVRdIEZhaWwgdG8gY29tcGlsZSB3aGVuIHdlIGFyZSBvdXQgb2YgZXhlY3V0 YWJsZSBtZW1vcnkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0RGQUJ5 dGVjb2RlSW50ZXJwcmV0ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2NvbnRl bnRleHRlbnNpb25zL0RGQUJ5dGVjb2RlSW50ZXJwcmV0ZXIuY3BwCShyZXZpc2lvbiAxODQ5ODYp CisrKyBTb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9ERkFCeXRlY29kZUludGVycHJl dGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjUsNyArNjUsMjIgQEAgdm9pZCBERkFCeXRlY29k ZUludGVycHJldGVyOjppbnRlcnByZXRUZQogewogICAgIEFTU0VSVChnZXRCaXRzPERGQUJ5dGVj b2RlSW5zdHJ1Y3Rpb24+KG1fYnl0ZWNvZGUsIG1fYnl0ZWNvZGVMZW5ndGgsIHByb2dyYW1Db3Vu dGVyLCBtX3BhZ2VzVXNlZCkgPT0gREZBQnl0ZWNvZGVJbnN0cnVjdGlvbjo6VGVzdEZsYWdzQW5k QXBwZW5kQWN0aW9uCiAgICAgICAgIHx8IGdldEJpdHM8REZBQnl0ZWNvZGVJbnN0cnVjdGlvbj4o bV9ieXRlY29kZSwgbV9ieXRlY29kZUxlbmd0aCwgcHJvZ3JhbUNvdW50ZXIsIG1fcGFnZXNVc2Vk KSA9PSBERkFCeXRlY29kZUluc3RydWN0aW9uOjpUZXN0RmxhZ3NBbmRBcHBlbmRBY3Rpb25XaXRo SWZEb21haW4pOwotICAgIGlmIChmbGFncyAmIGdldEJpdHM8dWludDE2X3Q+KG1fYnl0ZWNvZGUs IG1fYnl0ZWNvZGVMZW5ndGgsIHByb2dyYW1Db3VudGVyICsgc2l6ZW9mKERGQUJ5dGVjb2RlKSwg bV9wYWdlc1VzZWQpKQorICAgIHVpbnQxNl90IGZsYWdzVG9DaGVjayA9IGdldEJpdHM8dWludDE2 X3Q+KG1fYnl0ZWNvZGUsIG1fYnl0ZWNvZGVMZW5ndGgsIHByb2dyYW1Db3VudGVyICsgc2l6ZW9m KERGQUJ5dGVjb2RlKSwgbV9wYWdlc1VzZWQpOworCisgICAgYm9vbCBzaG91bGRDaGVja0xvYWRU eXBlID0gZmxhZ3NUb0NoZWNrICYgTG9hZFR5cGVNYXNrOworICAgIGJvb2wgc2hvdWxkQ2hlY2tS ZXNvdXJjZVR5cGUgPSBmbGFnc1RvQ2hlY2sgJiBSZXNvdXJjZVR5cGVNYXNrOworCisgICAgYm9v bCBzaG91bGRBcHBlbmRBY3Rpb24gPSBmYWxzZTsKKyAgICBpZiAoc2hvdWxkQ2hlY2tMb2FkVHlw ZSAmJiBzaG91bGRDaGVja1Jlc291cmNlVHlwZSkKKyAgICAgICAgc2hvdWxkQXBwZW5kQWN0aW9u ID0gKGZsYWdzVG9DaGVjayAmIExvYWRUeXBlTWFzayAmIGZsYWdzKSAmJiAoZmxhZ3NUb0NoZWNr ICYgUmVzb3VyY2VUeXBlTWFzayAmIGZsYWdzKTsKKyAgICBlbHNlIGlmIChzaG91bGRDaGVja0xv YWRUeXBlKQorICAgICAgICBzaG91bGRBcHBlbmRBY3Rpb24gPSBmbGFnc1RvQ2hlY2sgJiBMb2Fk VHlwZU1hc2sgJiBmbGFnczsKKyAgICBlbHNlIHsKKyAgICAgICAgQVNTRVJUKHNob3VsZENoZWNr UmVzb3VyY2VUeXBlKTsKKyAgICAgICAgc2hvdWxkQXBwZW5kQWN0aW9uID0gZmxhZ3NUb0NoZWNr ICYgUmVzb3VyY2VUeXBlTWFzayAmIGZsYWdzOworICAgIH0KKyAgICAKKyAgICBpZiAoc2hvdWxk QXBwZW5kQWN0aW9uKQogICAgICAgICBhY3Rpb25zLmFkZCgoaWZEb21haW4gPyBJZkRvbWFpbkZs YWcgOiAwKSB8IHN0YXRpY19jYXN0PHVpbnQ2NF90PihnZXRCaXRzPHVuc2lnbmVkPihtX2J5dGVj b2RlLCBtX2J5dGVjb2RlTGVuZ3RoLCBwcm9ncmFtQ291bnRlciArIHNpemVvZihERkFCeXRlY29k ZSkgKyBzaXplb2YodWludDE2X3QpLCBtX3BhZ2VzVXNlZCkpKTsKICAgICBwcm9ncmFtQ291bnRl ciArPSBpbnN0cnVjdGlvblNpemVXaXRoQXJndW1lbnRzKERGQUJ5dGVjb2RlSW5zdHJ1Y3Rpb246 OlRlc3RGbGFnc0FuZEFwcGVuZEFjdGlvbik7CiAgICAgQVNTRVJUKGluc3RydWN0aW9uU2l6ZVdp dGhBcmd1bWVudHMoREZBQnl0ZWNvZGVJbnN0cnVjdGlvbjo6VGVzdEZsYWdzQW5kQXBwZW5kQWN0 aW9uKSA9PSBpbnN0cnVjdGlvblNpemVXaXRoQXJndW1lbnRzKERGQUJ5dGVjb2RlSW5zdHJ1Y3Rp b246OlRlc3RGbGFnc0FuZEFwcGVuZEFjdGlvbldpdGhJZkRvbWFpbikpOwpJbmRleDogU291cmNl L1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZEluZm8uaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkSW5mby5oCShyZXZpc2lvbiAxODQ5ODYpCisrKyBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkSW5mby5oCSh3b3JraW5nIGNvcHkpCkBA IC00NCwxMiArNDQsMTQgQEAgZW51bSBjbGFzcyBSZXNvdXJjZVR5cGUgOiB1aW50MTZfdCB7CiAg ICAgUGx1Z0luU3RyZWFtID0gMHgwMTAwLAogICAgIFBvcHVwID0gMHgwMjAwLAogfTsKK2NvbnN0 IHVpbnQxNl90IFJlc291cmNlVHlwZU1hc2sgPSAweDAzRkY7CiAKIGVudW0gY2xhc3MgTG9hZFR5 cGUgOiB1aW50MTZfdCB7CiAgICAgSW52YWxpZCA9IDB4MDAwMCwKICAgICBGaXJzdFBhcnR5ID0g MHgwNDAwLAogICAgIFRoaXJkUGFydHkgPSAweDA4MDAsCiB9OworY29uc3QgdWludDE2X3QgTG9h ZFR5cGVNYXNrID0gMHgwQzAwOwogCiB0eXBlZGVmIHVpbnQxNl90IFJlc291cmNlRmxhZ3M7CiAK SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4NTA3NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE1LTA2LTAxICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgW0NvbnRlbnQgRXh0ZW5zaW9uc10gcmVzb3VyY2UtdHlwZSBh bmQgbG9hZC10eXBlIHNob3VsZCBiZSBpbmRlcGVuZGVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTUyOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3Jl L0NvbnRlbnRFeHRlbnNpb25zLmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1RfRik6 CisKIDIwMTUtMDYtMDEgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAg ICAgIEFkZCBBVFMga2V5cyB0byBXZWJLaXRUZXN0UnVubmVyQXBwCkluZGV4OiBUb29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvQ29udGVudEV4dGVuc2lvbnMuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Db250ZW50RXh0ZW5zaW9ucy5j cHAJKHJldmlzaW9uIDE4NDk4NikKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29y ZS9Db250ZW50RXh0ZW5zaW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY1NCw2ICs2NTQsMTUg QEAgVEVTVF9GKENvbnRlbnRFeHRlbnNpb25UZXN0LCBSZXNvdXJjZVR5cAogICAgIHRlc3RSZXF1 ZXN0KGJhY2tlbmQsIG1haW5Eb2N1bWVudFJlcXVlc3QoImh0dHA6Ly9ibG9ja19vbmx5X2ltYWdl cy5vcmciLCBSZXNvdXJjZVR5cGU6OkRvY3VtZW50KSwgeyB9KTsKIH0KIAorVEVTVF9GKENvbnRl bnRFeHRlbnNpb25UZXN0LCBSZXNvdXJjZUFuZExvYWRUeXBlKQoreworICAgIGF1dG8gYmFja2Vu ZCA9IG1ha2VCYWNrZW5kKCJbe1wiYWN0aW9uXCI6e1widHlwZVwiOlwiYmxvY2tcIn0sXCJ0cmln Z2VyXCI6e1widXJsLWZpbHRlclwiOlwiQmxvY2tPbmx5SWZUaGlyZFBhcnR5QW5kU2NyaXB0XCIs XCJyZXNvdXJjZS10eXBlXCI6W1wic2NyaXB0XCJdLFwibG9hZC10eXBlXCI6W1widGhpcmQtcGFy dHlcIl19fV0iKTsKKyAgICAKKyAgICB0ZXN0UmVxdWVzdChiYWNrZW5kLCBzdWJSZXNvdXJjZVJl cXVlc3QoImh0dHA6Ly93ZWJraXQub3JnL0Jsb2NrT25seUlmVGhpcmRQYXJ0eUFuZFNjcmlwdC5q cyIsICJodHRwOi8vd2Via2l0Lm9yZyIsIFJlc291cmNlVHlwZTo6U2NyaXB0KSwgeyB9KTsKKyAg ICB0ZXN0UmVxdWVzdChiYWNrZW5kLCBzdWJSZXNvdXJjZVJlcXVlc3QoImh0dHA6Ly93ZWJraXQu b3JnL0Jsb2NrT25seUlmVGhpcmRQYXJ0eUFuZFNjcmlwdC5wbmciLCAiaHR0cDovL25vdF93ZWJr aXQub3JnIiwgUmVzb3VyY2VUeXBlOjpJbWFnZSksIHsgfSk7CisgICAgdGVzdFJlcXVlc3QoYmFj a2VuZCwgc3ViUmVzb3VyY2VSZXF1ZXN0KCJodHRwOi8vd2Via2l0Lm9yZy9CbG9ja09ubHlJZlRo aXJkUGFydHlBbmRTY3JpcHQuanMiLCAiaHR0cDovL25vdF93ZWJraXQub3JnIiwgUmVzb3VyY2VU eXBlOjpTY3JpcHQpLCB7IENvbnRlbnRFeHRlbnNpb25zOjpBY3Rpb25UeXBlOjpCbG9ja0xvYWQg fSk7Cit9CisKIFRFU1RfRihDb250ZW50RXh0ZW5zaW9uVGVzdCwgUmVzb3VyY2VPckxvYWRUeXBl TWF0Y2hpbmdFdmVyeXRoaW5nKQogewogICAgIGF1dG8gYmFja2VuZCA9IG1ha2VCYWNrZW5kKCJb e1wiYWN0aW9uXCI6e1widHlwZVwiOlwiYmxvY2tcIn0sXCJ0cmlnZ2VyXCI6e1widXJsLWZpbHRl clwiOlwiLipcIixcInJlc291cmNlLXR5cGVcIjpbXCJpbWFnZVwiXX19LCIK