Title: [148513] branches/safari-536.30-branch
- Revision
- 148513
- Author
- [email protected]
- Date
- 2013-04-16 08:33:59 -0700 (Tue, 16 Apr 2013)
Log Message
Merged r148483. <rdar://problem/13659541>
Modified Paths
Diff
Modified: branches/safari-536.30-branch/LayoutTests/ChangeLog (148512 => 148513)
--- branches/safari-536.30-branch/LayoutTests/ChangeLog 2013-04-16 15:07:18 UTC (rev 148512)
+++ branches/safari-536.30-branch/LayoutTests/ChangeLog 2013-04-16 15:33:59 UTC (rev 148513)
@@ -1,3 +1,20 @@
+2013-04-16 Lucas Forschler <[email protected]>
+
+ Merge r148483
+
+ 2013-04-15 Anders Carlsson <[email protected]>
+
+ plugins/get-url-beforeunload-destroys-plugin.html crashes in WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=114653
+
+ Reviewed by Sam Weinig.
+
+ Move this test back now that it passes in WK1.
+
+ * http/tests/plugins/get-url-beforeunload-destroys-plugin-expected.txt: Renamed from LayoutTests/platform/mac-wk2/http/tests/plugins/get-url-beforeunload-destroys-plugin-expected.txt.
+ * http/tests/plugins/get-url-beforeunload-destroys-plugin.html: Renamed from LayoutTests/platform/mac-wk2/http/tests/plugins/get-url-beforeunload-destroys-plugin.html.
+ * http/tests/plugins/resources/notify-done.html: Renamed from LayoutTests/platform/mac-wk2/http/tests/plugins/resources/notify-done.html.
+
2013-04-16 Andy Estes <[email protected]>
Merged r142631.
Modified: branches/safari-536.30-branch/Source/WebKit/mac/ChangeLog (148512 => 148513)
--- branches/safari-536.30-branch/Source/WebKit/mac/ChangeLog 2013-04-16 15:07:18 UTC (rev 148512)
+++ branches/safari-536.30-branch/Source/WebKit/mac/ChangeLog 2013-04-16 15:33:59 UTC (rev 148513)
@@ -1,3 +1,20 @@
+2013-04-16 Lucas Forschler <[email protected]>
+
+ Merge r148483
+
+ 2013-04-15 Anders Carlsson <[email protected]>
+
+ plugins/get-url-beforeunload-destroys-plugin.html crashes in WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=114653
+ <rdar://problem/13659541>
+
+ Reviewed by Sam Weinig.
+
+ Protect the NetscapePluginInstanceProxy since it can otherwise go away.
+
+ * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+ (WebKit::NetscapePluginInstanceProxy::performRequest):
+
2013-01-30 Lucas Forschler <[email protected]>
Merge r138606
Modified: branches/safari-536.30-branch/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (148512 => 148513)
--- branches/safari-536.30-branch/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2013-04-16 15:07:18 UTC (rev 148512)
+++ branches/safari-536.30-branch/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2013-04-16 15:33:59 UTC (rev 148513)
@@ -621,6 +621,9 @@
void NetscapePluginInstanceProxy::performRequest(PluginRequest* pluginRequest)
{
+ // Loading the request can cause the instance proxy to go away, so protect it.
+ RefPtr<NetscapePluginInstanceProxy> protect(this);
+
ASSERT(m_pluginView);
NSURLRequest *request = pluginRequest->request();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
