143325 2015-04-01 17:06:53 -0700 [Content Extensions] Only add unique universal action locations. 2015-04-02 12:48:54 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 143338 1 achristensen achristensen commit-queue oldest_to_newest 1082145 0 achristensen 2015-04-01 17:06:53 -0700 Right now we have waaaay too many actions on the DFA root. That's slowing things down a lot. 1082147 1 249954 achristensen 2015-04-01 17:08:53 -0700 Created attachment 249954 Patch 1082150 2 249954 benjamin 2015-04-01 17:13:59 -0700 Comment on attachment 249954 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249954&action=review > Source/WebCore/contentextensions/ContentExtensionCompiler.cpp:151 > You could take the opportunity to remove that blank line. 1082154 3 achristensen 2015-04-01 17:18:04 -0700 http://trac.webkit.org/changeset/182265 1082233 4 249954 darin 2015-04-02 09:05:50 -0700 Comment on attachment 249954 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249954&action=review > Source/WebCore/contentextensions/ContentExtensionCompiler.cpp:136 > + HashSet<uint64_t> universalActionLocations; HashSet won’t work with 0 nor will it work with the maximum value. Do we have a guarantee that actionLocationAndFlags will never have either of those values? 1082245 5 ap 2015-04-02 09:37:17 -0700 This patch made a test assert: https://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=http%2Ftests%2Fcontentextensions%2Fwhitelist.html ASSERT(!HashTranslator::equal(KeyTraits::emptyValue(), key)); Looks like Darin's comment is spot on. 1082247 6 commit-queue 2015-04-02 09:40:06 -0700 Re-opened since this is blocked by bug 143338 1082311 7 achristensen 2015-04-02 12:48:54 -0700 I forgot the HashTraits :( The value can be 0, so I used UnsignedWithZeroKeyHashTraits. We only use the lowest 48 bits of the uint64_t, so it will never be the maximum 2 values. http://trac.webkit.org/changeset/182283 249954 2015-04-01 17:08:53 -0700 2015-04-01 17:13:14 -0700 Patch bug-143325-20150401170824.patch text/plain 1901 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjI2NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA0LTAxICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NvbnRlbnQg RXh0ZW5zaW9uc10gT25seSBhZGQgdW5pcXVlIHVuaXZlcnNhbCBhY3Rpb24gbG9jYXRpb25zLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzMzI1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBjb250ZW50 ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uQ29tcGlsZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q29udGVudEV4dGVuc2lvbnM6OmNvbXBpbGVSdWxlTGlzdCk6CisgICAgICAgIFVzZSBhIEhh c2hTZXQgaW5zdGVhZCBvZiBhIFZlY3RvciBmb3IgdGhlIHVuaXZlcnNhbCBhY3Rpb24gbG9jYXRp b25zIHRvIHJlbW92ZSBkdXBsaWNhdGVzLgorCiAyMDE1LTA0LTAxICBSb2dlciBGb25nICA8cm9n ZXJfZm9uZ0BhcHBsZS5jb20+CiAKICAgICAgICAgRml4ZXMgdG8gbWF0ZXJpYWwgb2YgaW5saW5l IG1lZGlhIGNvbnRyb2xzIG9uIE9TWC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRl bnNpb25zL0NvbnRlbnRFeHRlbnNpb25Db21waWxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbkNvbXBpbGVyLmNwcAko cmV2aXNpb24gMTgyMjY0KQorKysgU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29u dGVudEV4dGVuc2lvbkNvbXBpbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMzLDcgKzEzMyw3 IEBAIHN0ZDo6ZXJyb3JfY29kZSBjb21waWxlUnVsZUxpc3QoQ29udGVudEUKIAogICAgIFZlY3Rv cjxTZXJpYWxpemVkQWN0aW9uQnl0ZT4gYWN0aW9uczsKICAgICBWZWN0b3I8dW5zaWduZWQ+IGFj dGlvbkxvY2F0aW9ucyA9IHNlcmlhbGl6ZUFjdGlvbnMocGFyc2VkUnVsZUxpc3QsIGFjdGlvbnMp OwotICAgIFZlY3Rvcjx1aW50NjRfdD4gdW5pdmVyc2FsQWN0aW9uTG9jYXRpb25zOworICAgIEhh c2hTZXQ8dWludDY0X3Q+IHVuaXZlcnNhbEFjdGlvbkxvY2F0aW9uczsKIAogICAgIENvbWJpbmVk VVJMRmlsdGVycyBjb21iaW5lZFVSTEZpbHRlcnM7CiAgICAgVVJMRmlsdGVyUGFyc2VyIHVybEZp bHRlclBhcnNlcihjb21iaW5lZFVSTEZpbHRlcnMpOwpAQCAtMTUxLDcgKzE1MSw3IEBAIHN0ZDo6 ZXJyb3JfY29kZSBjb21waWxlUnVsZUxpc3QoQ29udGVudEUKIAogICAgICAgICAgICAgaWYgKGln bm9yZVByZXZpb3VzUnVsZXNTZWVuKQogICAgICAgICAgICAgICAgIHJldHVybiBDb250ZW50RXh0 ZW5zaW9uRXJyb3I6OlJlZ2V4TWF0Y2hlc0V2ZXJ5dGhpbmdBZnRlcklnbm9yZVByZXZpb3VzUnVs ZXM7Ci0gICAgICAgICAgICB1bml2ZXJzYWxBY3Rpb25Mb2NhdGlvbnMuYXBwZW5kKGFjdGlvbkxv Y2F0aW9uQW5kRmxhZ3MpOworICAgICAgICAgICAgdW5pdmVyc2FsQWN0aW9uTG9jYXRpb25zLmFk ZChhY3Rpb25Mb2NhdGlvbkFuZEZsYWdzKTsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChzdGF0 dXMgIT0gVVJMRmlsdGVyUGFyc2VyOjpPayAmJiBzdGF0dXMgIT0gVVJMRmlsdGVyUGFyc2VyOjpN YXRjaGVzRXZlcnl0aGluZykgewo=