150261 2015-10-16 16:10:02 -0700 Disabled content blockers should not block any loads 2015-10-16 16:22:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen oldest_to_newest 1134098 0 achristensen 2015-10-16 16:10:02 -0700 Disabled content blockers should not block any loads 1134100 1 263345 achristensen 2015-10-16 16:12:51 -0700 Created attachment 263345 Patch 1134105 2 achristensen 2015-10-16 16:22:16 -0700 http://trac.webkit.org/changeset/191223 263345 2015-10-16 16:12:51 -0700 2015-10-16 16:17:29 -0700 Patch bug-150261-20151016161218.patch text/plain 3078 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MTIyMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE1LTEwLTE2ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRGlzYWJsZWQg Y29udGVudCBibG9ja2VycyBzaG91bGQgbm90IGJsb2NrIGFueSBsb2FkcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwMjYxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBmaXggd2FzIHRlc3RlZCBt YW51YWxseSBieSByZWxvYWRpbmcgd2l0aG91dCBjb250ZW50IGJsb2NrZXJzCisgICAgICAgIG9u IHdlYnNpdGVzIHdpdGggaWZyYW1lcyBhbmQgY29udGVudCBibG9ja2VycyB0aGF0IGJsb2NrIHRo ZSBjb250ZW50cyBvZiB0aGUgaWZyYW1lcy4KKworICAgICAgICAqIHBhZ2UvVXNlckNvbnRlbnRD b250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlVzZXJDb250ZW50Q29udHJvbGxlcjo6 cmVtb3ZlQWxsVXNlckNvbnRlbnRFeHRlbnNpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OmNvbnRl bnRFeHRlbnNpb25zRW5hYmxlZCk6CisgICAgICAgIChXZWJDb3JlOjpVc2VyQ29udGVudENvbnRy b2xsZXI6OnByb2Nlc3NDb250ZW50RXh0ZW5zaW9uUnVsZXNGb3JMb2FkKToKKyAgICAgICAgKFdl YkNvcmU6OlVzZXJDb250ZW50Q29udHJvbGxlcjo6YWN0aW9uc0ZvclJlc291cmNlTG9hZCk6Cisg ICAgICAgIENoZWNrIHRoZSBEb2N1bWVudExvYWRlciBvZiB0aGUgbWFpbiBmcmFtZSB3aGVuIGNo ZWNraW5nIGlmIGNvbnRlbnQgZXh0ZW5zaW9ucyBhcmUgZGlzYWJsZWQsCisgICAgICAgIGJlY2F1 c2UgdGhhdCBpcyB0aGUgRG9jdW1lbnRMb2FkZXIgdGhhdCBoYXMgdGhlIGZsYWcgZnJvbSByZWxv YWRpbmcgd2l0aG91dCBjb250ZW50IGJsb2NrZXJzLgorCiAyMDE1LTEwLTE2ICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgVGV4dFN0cmVhbSB0 aGUgY2Fub25pY2FsIHdheSB0byBsb2cgY2xhc3NlcyBpbiBXZWJDb3JlCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVudENvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAxOTEw NjIpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTIwOCwxMiArMjA4LDI0IEBAIHZvaWQgVXNlckNvbnRlbnRDb250cm9s bGVyOjpyZW1vdmVBbGxVc2UKICAgICBtX2NvbnRlbnRFeHRlbnNpb25CYWNrZW5kLT5yZW1vdmVB bGxDb250ZW50RXh0ZW5zaW9ucygpOwogfQogCitzdGF0aWMgYm9vbCBjb250ZW50RXh0ZW5zaW9u c0VuYWJsZWQoY29uc3QgRG9jdW1lbnRMb2FkZXImIGRvY3VtZW50TG9hZGVyKQoreworICAgIGlm IChhdXRvIGZyYW1lID0gZG9jdW1lbnRMb2FkZXIuZnJhbWUoKSkgeworICAgICAgICBpZiAoZnJh bWUtPmlzTWFpbkZyYW1lKCkpCisgICAgICAgICAgICByZXR1cm4gZG9jdW1lbnRMb2FkZXIudXNl ckNvbnRlbnRFeHRlbnNpb25zRW5hYmxlZCgpOworICAgICAgICBpZiAoYXV0byBtYWluRG9jdW1l bnRMb2FkZXIgPSBmcmFtZS0+bWFpbkZyYW1lKCkubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKSkK KyAgICAgICAgICAgIHJldHVybiBtYWluRG9jdW1lbnRMb2FkZXItPnVzZXJDb250ZW50RXh0ZW5z aW9uc0VuYWJsZWQoKTsKKyAgICB9CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKyAgICAKIENvbnRl bnRFeHRlbnNpb25zOjpCbG9ja2VkU3RhdHVzIFVzZXJDb250ZW50Q29udHJvbGxlcjo6cHJvY2Vz c0NvbnRlbnRFeHRlbnNpb25SdWxlc0ZvckxvYWQoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBS ZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlLCBEb2N1bWVudExvYWRlciYgaW5pdGlhdGluZ0RvY3Vt ZW50TG9hZGVyKQogewogICAgIGlmICghbV9jb250ZW50RXh0ZW5zaW9uQmFja2VuZCkKICAgICAg ICAgcmV0dXJuIENvbnRlbnRFeHRlbnNpb25zOjpCbG9ja2VkU3RhdHVzOjpOb3RCbG9ja2VkOwog Ci0gICAgaWYgKCFpbml0aWF0aW5nRG9jdW1lbnRMb2FkZXIudXNlckNvbnRlbnRFeHRlbnNpb25z RW5hYmxlZCgpKQorICAgIGlmICghY29udGVudEV4dGVuc2lvbnNFbmFibGVkKGluaXRpYXRpbmdE b2N1bWVudExvYWRlcikpCiAgICAgICAgIHJldHVybiBDb250ZW50RXh0ZW5zaW9uczo6QmxvY2tl ZFN0YXR1czo6Tm90QmxvY2tlZDsKIAogICAgIHJldHVybiBtX2NvbnRlbnRFeHRlbnNpb25CYWNr ZW5kLT5wcm9jZXNzQ29udGVudEV4dGVuc2lvblJ1bGVzRm9yTG9hZChyZXF1ZXN0LCByZXNvdXJj ZVR5cGUsIGluaXRpYXRpbmdEb2N1bWVudExvYWRlcik7CkBAIC0yMjQsNyArMjM2LDcgQEAgVmVj dG9yPENvbnRlbnRFeHRlbnNpb25zOjpBY3Rpb24+IFVzZXJDbwogICAgIGlmICghbV9jb250ZW50 RXh0ZW5zaW9uQmFja2VuZCkKICAgICAgICAgcmV0dXJuIFZlY3RvcjxDb250ZW50RXh0ZW5zaW9u czo6QWN0aW9uPigpOwogICAgIAotICAgIGlmICghaW5pdGlhdGluZ0RvY3VtZW50TG9hZGVyLnVz ZXJDb250ZW50RXh0ZW5zaW9uc0VuYWJsZWQoKSkKKyAgICBpZiAoIWNvbnRlbnRFeHRlbnNpb25z RW5hYmxlZChpbml0aWF0aW5nRG9jdW1lbnRMb2FkZXIpKQogICAgICAgICByZXR1cm4gVmVjdG9y PENvbnRlbnRFeHRlbnNpb25zOjpBY3Rpb24+KCk7CiAKICAgICByZXR1cm4gbV9jb250ZW50RXh0 ZW5zaW9uQmFja2VuZC0+YWN0aW9uc0ZvclJlc291cmNlTG9hZChyZXNvdXJjZUxvYWRJbmZvKTsK