Title: [184731] branches/safari-601.1.32.2-branch/Source/WebKit2
- Revision
- 184731
- Author
- bshaf...@apple.com
- Date
- 2015-05-21 12:53:48 -0700 (Thu, 21 May 2015)
Log Message
Merged r184514. rdar://problem/20368630
Modified Paths
Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184730 => 184731)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-21 19:52:44 UTC (rev 184730)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-21 19:53:48 UTC (rev 184731)
@@ -1,5 +1,20 @@
2015-05-21 Babak Shafiei <bshaf...@apple.com>
+ Merge r184514.
+
+ 2015-05-18 Brady Eidson <beid...@apple.com>
+
+ Followup to: Networking process on iOS can be suspended and never exit
+ https://bugs.webkit.org/show_bug.cgi?id=144971.
+
+ Unreviewed. Fixing API tests that revealed the unintentional change in behavior.
+
+ * Shared/ChildProcessProxy.cpp:
+ (WebKit::ChildProcessProxy::shutDownProcess): The on WebProcessProxy code path that this
+ was adopted from had an m_connection null check, and that null check needs to remain.
+
+2015-05-21 Babak Shafiei <bshaf...@apple.com>
+
Merge r184503.
2015-05-18 Brady Eidson <beid...@apple.com>
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/Shared/ChildProcessProxy.cpp (184730 => 184731)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/Shared/ChildProcessProxy.cpp 2015-05-21 19:52:44 UTC (rev 184730)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/Shared/ChildProcessProxy.cpp 2015-05-21 19:53:48 UTC (rev 184731)
@@ -170,6 +170,9 @@
return;
}
+ if (!m_connection)
+ return;
+
processWillShutDown(*m_connection);
if (canSendMessage())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
