Title: [139096] trunk/Source/WebCore
- Revision
- 139096
- Author
- bweinst...@apple.com
- Date
- 2013-01-08 12:31:37 -0800 (Tue, 08 Jan 2013)
Log Message
Plug-ins shouldn’t be added to list to autostart if you start a plugin in private browsing.
https://bugs.webkit.org/show_bug.cgi?id=106348
<rdar://problem/12968442>
Reviewed by Anders Carlsson.
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::userDidClickSnapshot): Don't call addAutoStartOrigin if we are
in private browsing mode.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (139095 => 139096)
--- trunk/Source/WebCore/ChangeLog 2013-01-08 20:23:47 UTC (rev 139095)
+++ trunk/Source/WebCore/ChangeLog 2013-01-08 20:31:37 UTC (rev 139096)
@@ -1,3 +1,15 @@
+2013-01-08 Brian Weinstein <bweinst...@apple.com>
+
+ Plug-ins shouldn’t be added to list to autostart if you start a plugin in private browsing.
+ https://bugs.webkit.org/show_bug.cgi?id=106348
+ <rdar://problem/12968442>
+
+ Reviewed by Anders Carlsson.
+
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::userDidClickSnapshot): Don't call addAutoStartOrigin if we are
+ in private browsing mode.
+
2013-01-08 Chris Fleizach <cfleiz...@apple.com>
AX: native popup buttons should not use textUnderElement for their title
Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (139095 => 139096)
--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-01-08 20:23:47 UTC (rev 139095)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-01-08 20:31:37 UTC (rev 139096)
@@ -267,8 +267,11 @@
void HTMLPlugInImageElement::userDidClickSnapshot(PassRefPtr<MouseEvent> event)
{
m_pendingClickEventFromSnapshot = event;
- if (document()->page())
- document()->page()->plugInClient()->addAutoStartOrigin(document()->page()->mainFrame()->document()->baseURL().host(), m_plugInOriginHash);
+
+ if (Page* page = document()->page()) {
+ if (!page->settings()->privateBrowsingEnabled())
+ page->plugInClient()->addAutoStartOrigin(document()->page()->mainFrame()->document()->baseURL().host(), m_plugInOriginHash);
+ }
}
void HTMLPlugInImageElement::dispatchPendingMouseClick()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
