106348 2013-01-08 10:54:27 -0800 Plug-ins shouldn’t be added to list to autostart if you start a plugin in private browsing 2013-01-14 16:02:26 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX InRadar P2 Normal --- 106367 1 bweinstein bweinstein andersca beidson jonlee ojan.autocc webkit.review.bot oldest_to_newest 802379 0 bweinstein 2013-01-08 10:54:27 -0800 Plug-ins shouldn’t be added to list to autostart if you start a plugin in private browsing <rdar://problem/12968442> 802388 1 181709 bweinstein 2013-01-08 10:58:40 -0800 Created attachment 181709 Fix 802487 2 181709 andersca 2013-01-08 12:17:28 -0800 Comment on attachment 181709 Fix View in context: https://bugs.webkit.org/attachment.cgi?id=181709&action=review > Source/WebCore/html/HTMLPlugInImageElement.cpp:271 > - if (document()->page()) > + if (document()->page() && document()->settings() && !document()->settings()->privateBrowsingEnabled()) > document()->page()->plugInClient()->addAutoStartOrigin(document()->page()->mainFrame()->document()->baseURL().host(), m_plugInOriginHash); I don't think you need to null check document()->settings() here since settings can only be null if page is null. I think this'd read better as if (Page* page = document->page()) { if (!settings->privateBrowsingEnabled()) page->plugInClient()-> etc etc } 802528 3 bweinstein 2013-01-08 12:47:24 -0800 Landed in http://trac.webkit.org/changeset/139096. 802540 4 webkit.review.bot 2013-01-08 12:58:09 -0800 Re-opened since this is blocked by bug 106367 181709 2013-01-08 10:58:40 -0800 2013-01-08 12:17:28 -0800 Fix 0001-Plug-ins-shouldn-t-be-added-to-list-to-autostart-if-.patch text/plain 2433 bweinstein RnJvbSBiODUxZTJjMTIxMGNjYzVhZmFkZGMyNjg3ODc4YmFlYmViZDIwZmJiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcmlhbiBXZWluc3RlaW4gPGJ3ZWluc3RlaW5AYXBwbGUuY29t PgpEYXRlOiBUdWUsIDggSmFuIDIwMTMgMTA6NTQ6MjIgLTA4MDAKU3ViamVjdDogW1BBVENIXSA9 P1VURi04P3E/UGx1Zy1pbnM9MjBzaG91bGRuPUUyPTgwPTk5dD0yMGJlPTIwYWRkZWQ9MjB0bz89 CiA9P1VURi04P3E/PTIwbGlzdD0yMHRvPTIwYXV0b3N0YXJ0PTIwaWY9MjB5b3U9MjBzdGFydD0y MGE9MjBwbHVnaW49MjBpbj89CiA9P1VURi04P3E/PTIwcHJpdmF0ZT0yMGJyb3dzaW5nLj0yMGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3c9NUZidWcuY2dpPz0KID0/VVRGLTg/cT89M0ZpZD0z RDEwNjM0OD0yMDxyZGFyOi8vcHJvYmxlbS8xMjk2ODQ0Mj4/PQpNSU1FLVZlcnNpb246IDEuMApD b250ZW50LVR5cGU6IHRleHQvcGxhaW47IGNoYXJzZXQ9VVRGLTgKQ29udGVudC1UcmFuc2Zlci1F bmNvZGluZzogOGJpdAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoqIGh0bWwvSFRNTFBs dWdJbkltYWdlRWxlbWVudC5jcHA6CihXZWJDb3JlOjpIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Ojp1 c2VyRGlkQ2xpY2tTbmFwc2hvdCk6IERvbid0IGNhbGwgYWRkQXV0b1N0YXJ0T3JpZ2luIGlmIHdl IGFyZQogICAgaW4gcHJpdmF0ZSBicm93c2luZyBtb2RlLgotLS0KIFNvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgfCAxMiArKysrKysrKysrKysKIFNvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHAgfCAgMiArLQogMiBmaWxlcyBj aGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDFh YmZiODMuLmIzMmFlMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMy0wMS0wOCAg QnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVpbkBhcHBsZS5jb20+CisKKyAgICAgICAgUGx1Zy1p bnMgc2hvdWxkbuKAmXQgYmUgYWRkZWQgdG8gbGlzdCB0byBhdXRvc3RhcnQgaWYgeW91IHN0YXJ0 IGEgcGx1Z2luIGluIHByaXZhdGUgYnJvd3NpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDYzNDgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEy OTY4NDQyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnVzZXJEaWRDbGlja1NuYXBzaG90KTogRG9uJ3QgY2FsbCBh ZGRBdXRvU3RhcnRPcmlnaW4gaWYgd2UgYXJlCisgICAgICAgICAgICBpbiBwcml2YXRlIGJyb3dz aW5nIG1vZGUuCisKIDIwMTMtMDEtMDcgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RA Z21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMzc2MzIuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcAppbmRleCBk MGI1Mzk4Li4xNGEwYWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVn SW5JbWFnZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbklt YWdlRWxlbWVudC5jcHAKQEAgLTI2Nyw3ICsyNjcsNyBAQCB2b2lkIEhUTUxQbHVnSW5JbWFnZUVs ZW1lbnQ6OnVwZGF0ZVNuYXBzaG90KFBhc3NSZWZQdHI8SW1hZ2U+IGltYWdlKQogdm9pZCBIVE1M UGx1Z0luSW1hZ2VFbGVtZW50Ojp1c2VyRGlkQ2xpY2tTbmFwc2hvdChQYXNzUmVmUHRyPE1vdXNl RXZlbnQ+IGV2ZW50KQogewogICAgIG1fcGVuZGluZ0NsaWNrRXZlbnRGcm9tU25hcHNob3QgPSBl dmVudDsKLSAgICBpZiAoZG9jdW1lbnQoKS0+cGFnZSgpKQorICAgIGlmIChkb2N1bWVudCgpLT5w YWdlKCkgJiYgZG9jdW1lbnQoKS0+c2V0dGluZ3MoKSAmJiAhZG9jdW1lbnQoKS0+c2V0dGluZ3Mo KS0+cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpKQogICAgICAgICBkb2N1bWVudCgpLT5wYWdlKCkt PnBsdWdJbkNsaWVudCgpLT5hZGRBdXRvU3RhcnRPcmlnaW4oZG9jdW1lbnQoKS0+cGFnZSgpLT5t YWluRnJhbWUoKS0+ZG9jdW1lbnQoKS0+YmFzZVVSTCgpLmhvc3QoKSwgbV9wbHVnSW5PcmlnaW5I YXNoKTsKIH0KIAotLSAKMS44LjAuMSAoQXBwbGUgR2l0LTQwKQoK