Title: [147964] trunk/Source/WebKit2
- Revision
- 147964
- Author
- [email protected]
- Date
- 2013-04-08 16:59:24 -0700 (Mon, 08 Apr 2013)
Log Message
Don't run primary plugin detection if plugin snapshotting is off
https://bugs.webkit.org/show_bug.cgi?id=114222
<rdar://problem/13603988>
Reviewed by Dean Jackson.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::determinePrimarySnapshottedPlugIn):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (147963 => 147964)
--- trunk/Source/WebKit2/ChangeLog 2013-04-08 23:53:51 UTC (rev 147963)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-08 23:59:24 UTC (rev 147964)
@@ -1,3 +1,14 @@
+2013-04-08 Tim Horton <[email protected]>
+
+ Don't run primary plugin detection if plugin snapshotting is off
+ https://bugs.webkit.org/show_bug.cgi?id=114222
+ <rdar://problem/13603988>
+
+ Reviewed by Dean Jackson.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::determinePrimarySnapshottedPlugIn):
+
2013-04-08 Patrick Gansterer <[email protected]>
[WIN] Remove WebKit2 source code
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (147963 => 147964)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-04-08 23:53:51 UTC (rev 147963)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-04-08 23:59:24 UTC (rev 147964)
@@ -3928,6 +3928,9 @@
void WebPage::determinePrimarySnapshottedPlugIn()
{
+ if (!m_page->settings()->plugInSnapshottingEnabled())
+ return;
+
if (!m_readyToFindPrimarySnapshottedPlugin)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
