Title: [171267] branches/safari-537.78-branch/Source/WebKit2
- Revision
- 171267
- Author
- [email protected]
- Date
- 2014-07-19 15:50:59 -0700 (Sat, 19 Jul 2014)
Log Message
Merged r169757. <rdar://problem/17684670>
Modified Paths
Diff
Modified: branches/safari-537.78-branch/Source/WebKit2/ChangeLog (171266 => 171267)
--- branches/safari-537.78-branch/Source/WebKit2/ChangeLog 2014-07-19 22:48:42 UTC (rev 171266)
+++ branches/safari-537.78-branch/Source/WebKit2/ChangeLog 2014-07-19 22:50:59 UTC (rev 171267)
@@ -1,3 +1,18 @@
+2014-07-19 Lucas Forschler <[email protected]>
+
+ Merge r169757
+
+ 2014-06-10 Alexey Proskuryakov <[email protected]>
+
+ Fix crashes on some plug-in tests.
+ https://bugs.webkit.org/show_bug.cgi?id=133691
+ <rdar://problem/17255836>
+
+ Reviewed by Anders Carlsson.
+
+ * PluginProcess/PluginControllerProxy.cpp: (WebKit::PluginControllerProxy::initialize):
+ Cannot use TemporaryChange here, because the object may go away before stack unwinds.
+
2014-05-23 Lucas Forschler <[email protected]>
Rollout r169219
Modified: branches/safari-537.78-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (171266 => 171267)
--- branches/safari-537.78-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-07-19 22:48:42 UTC (rev 171266)
+++ branches/safari-537.78-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-07-19 22:50:59 UTC (rev 171267)
@@ -107,9 +107,10 @@
bool PluginControllerProxy::initialize(const PluginCreationParameters& creationParameters)
{
ASSERT(!m_plugin);
-
- TemporaryChange<bool> initializing(m_isInitializing, true);
+ ASSERT(!m_isInitializing);
+ m_isInitializing = true; // Cannot use TemporaryChange here, because this object can be deleted before the function returns.
+
m_plugin = NetscapePlugin::create(PluginProcess::shared().netscapePluginModule());
if (!m_plugin) {
// This will delete the plug-in controller proxy object.
@@ -136,6 +137,7 @@
platformInitialize(creationParameters);
+ m_isInitializing = false;
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
