143955 2015-04-20 10:41:39 -0700 Disable mixed content blocking for existing WebKit1 clients 2015-04-20 12:40:27 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap commit-queue oliver sam oldest_to_newest 1086818 0 ap 2015-04-20 10:41:39 -0700 Existing WebKit clients are most likely to be affected by mixed content blocking, because they live in a walled garden. rdar://problem/20177186 1086819 1 251166 ap 2015-04-20 10:45:21 -0700 Created attachment 251166 proposed patch 1086820 2 oliver 2015-04-20 10:46:34 -0700 r=me 1086875 3 251166 commit-queue 2015-04-20 12:40:23 -0700 Comment on attachment 251166 proposed patch Clearing flags on attachment: 251166 Committed r183023: <http://trac.webkit.org/changeset/183023> 1086876 4 commit-queue 2015-04-20 12:40:27 -0700 All reviewed patches have been landed. Closing bug. 251166 2015-04-20 10:45:21 -0700 2015-04-20 12:40:23 -0700 proposed patch DisableContentBlocking.txt text/plain 3228 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MzAxNikKKysrIFNvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE1LTA0LTIw ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIERpc2FibGUg bWl4ZWQgY29udGVudCBibG9ja2luZyBmb3IgZXhpc3RpbmcgV2ViS2l0MSBjbGllbnRzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM5NTUKKyAgICAg ICAgcmRhcjovL3Byb2JsZW0vMjAxNzcxODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIE1pc2MvV2ViS2l0VmVyc2lvbkNoZWNrcy5oOgorICAgICAg ICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKHNob3VsZEFsbG93SW5zZWN1cmVDb250 ZW50KToKKyAgICAgICAgKC1bV2ViVmlldyBfcHJlZmVyZW5jZXNDaGFuZ2VkOl0pOgorCiAyMDE1 LTA0LTE3ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdS RVNTSU9OOiBTVkcgZG9lcyBub3Qgc3VwcG9ydCBsaW5rIGRyYWdnaW5nCkluZGV4OiBTb3VyY2Uv V2ViS2l0L21hYy9NaXNjL1dlYktpdFZlcnNpb25DaGVja3MuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L21hYy9NaXNjL1dlYktpdFZlcnNpb25DaGVja3MuaAkocmV2aXNpb24gMTgyOTM5 KQorKysgU291cmNlL1dlYktpdC9tYWMvTWlzYy9XZWJLaXRWZXJzaW9uQ2hlY2tzLmgJKHdvcmtp bmcgY29weSkKQEAgLTU3LDYgKzU3LDcgQEAKICNkZWZpbmUgV0VCS0lUX0ZJUlNUX1ZFUlNJT05f V0lUSF9IVE1MNV9QQVJTRVIgMHgwMjE2MDkwMCAvLyA1MzQuOS4wCiAjZGVmaW5lIFdFQktJVF9G SVJTVF9WRVJTSU9OX1dJVEhfQ1NTX0FUVFJJQlVURV9TRVRURVJTX0lHTk9SSU5HX1BSSU9SSVRZ IDB4MDIxNzBEMDAgLy8gNTM1LjEzLjAKICNkZWZpbmUgV0VCS0lUX0ZJUlNUX1ZFUlNJT05fV0lU SE9VVF9MRUdBQ1lfQkFDS0dST1VORFNJWkVfU0hPUlRIQU5EX0JFSEFWSU9SIDB4MDIxOTAxMDAg Ly8gNTM3LjEuMAorI2RlZmluZSBXRUJLSVRfRklSU1RfVkVSU0lPTl9XSVRIX0lOU0VDVVJFX0NP TlRFTlRfQkxPQ0tJTkcgMHgwMjU5MDExNiAvLyA2MDEuMS4yMgogI2Vsc2UKIC8vIDxyZGFyOi8v cHJvYmxlbS82NjI3NzU4PiBOZWVkIHRvIGltcGxlbWVudCBXZWJLaXRMaW5rZWRPbk9yQWZ0ZXIK IC8vIEFjdHVhbGx5IFVJS2l0IHZlcnNpb24gbnVtYmVycywgc2luY2UgYXBwbGljYXRpb25zIGRv bid0IGxpbmsgYWdhaW5zdCBXZWJLaXQKQEAgLTcxLDYgKzcyLDcgQEAKICNkZWZpbmUgV0VCS0lU X0ZJUlNUX1ZFUlNJT05fV0lUSF9DU1NfQVRUUklCVVRFX1NFVFRFUlNfSUdOT1JJTkdfUFJJT1JJ VFkgMjIzOSAvLyBpT1MgNi4wCiAjZGVmaW5lIFdFQktJVF9GSVJTVF9WRVJTSU9OX1dJVEhfWU9V VFVCRV9FTUJFRF9JRlJBTUVfVFJBTlNGT1JNIDIyMzkgLy8gaU9TIDYuMAogI2RlZmluZSBXRUJL SVRfRklSU1RfVkVSU0lPTl9XSVRIT1VUX0xFR0FDWV9CQUNLR1JPVU5EU0laRV9TSE9SVEhBTkRf QkVIQVZJT1IgMjY2NSAvLyBpT1MgNy4wCisjZGVmaW5lIFdFQktJVF9GSVJTVF9WRVJTSU9OX1dJ VEhfSU5TRUNVUkVfQ09OVEVOVF9CTE9DS0lORyAzNDU0CiAjZW5kaWYgLy8gUExBVEZPUk0oSU9T KQogCiAjaWZkZWYgX19jcGx1c3BsdXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZp ZXcubW0JKHJldmlzaW9uIDE4MjkzOSkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Vmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtODQ2LDYgKzg0NiwxMiBAQCBzdGF0aWMgYm9vbCBz aG91bGRVc2VMZWdhY3lCYWNrZ3JvdW5kU2l6CiAgICAgcmV0dXJuIHNob3VsZFVzZUxlZ2FjeUJh Y2tncm91bmRTaXplU2hvcnRoYW5kQmVoYXZpb3I7CiB9CiAKK3N0YXRpYyBib29sIHNob3VsZEFs bG93RGlzcGxheUFuZFJ1bm5pbmdPZkluc2VjdXJlQ29udGVudCgpCit7CisgICAgc3RhdGljIGJv b2wgc2hvdWxkQWxsb3dEaXNwbGF5QW5kUnVubmluZ09mSW5zZWN1cmVDb250ZW50ID0gIVdlYktp dExpbmtlZE9uT3JBZnRlcihXRUJLSVRfRklSU1RfVkVSU0lPTl9XSVRIX0lOU0VDVVJFX0NPTlRF TlRfQkxPQ0tJTkcpOworICAgIHJldHVybiBzaG91bGRBbGxvd0Rpc3BsYXlBbmRSdW5uaW5nT2ZJ bnNlY3VyZUNvbnRlbnQ7Cit9CisKICNpZiBFTkFCTEUoR0FNRVBBRCkKIHN0YXRpYyB2b2lkIFdl YktpdEluaXRpYWxpemVHYW1lcGFkUHJvdmlkZXJJZk5lY2Vzc2FyeSgpCiB7CkBAIC0yMzA1LDYg KzIzMTEsOSBAQCAtICh2b2lkKV9wcmVmZXJlbmNlc0NoYW5nZWQ6KFdlYlByZWZlcmVuCiAgICAg c2V0dGluZ3Muc2V0U2hvdWxkQ29udmVydFBvc2l0aW9uU3R5bGVPbkNvcHkoW3ByZWZlcmVuY2Vz IHNob3VsZENvbnZlcnRQb3NpdGlvblN0eWxlT25Db3B5XSk7CiAgICAgc2V0dGluZ3Muc2V0RW5h YmxlSW5oZXJpdFVSSVF1ZXJ5Q29tcG9uZW50KFtwcmVmZXJlbmNlcyBpc0luaGVyaXRVUklRdWVy eUNvbXBvbmVudEVuYWJsZWRdKTsKIAorICAgIHNldHRpbmdzLnNldEFsbG93RGlzcGxheU9mSW5z ZWN1cmVDb250ZW50KHNob3VsZEFsbG93RGlzcGxheUFuZFJ1bm5pbmdPZkluc2VjdXJlQ29udGVu dCgpKTsKKyAgICBzZXR0aW5ncy5zZXRBbGxvd1J1bm5pbmdPZkluc2VjdXJlQ29udGVudChzaG91 bGRBbGxvd0Rpc3BsYXlBbmRSdW5uaW5nT2ZJbnNlY3VyZUNvbnRlbnQoKSk7CisKICAgICBzd2l0 Y2ggKFtwcmVmZXJlbmNlcyBzdG9yYWdlQmxvY2tpbmdQb2xpY3ldKSB7CiAgICAgY2FzZSBXZWJB bGxvd0FsbFN0b3JhZ2U6CiAgICAgICAgIHNldHRpbmdzLnNldFN0b3JhZ2VCbG9ja2luZ1BvbGlj eShTZWN1cml0eU9yaWdpbjo6QWxsb3dBbGxTdG9yYWdlKTsK