Title: [211709] branches/safari-603-branch/Source/WebKit2
- Revision
- 211709
- Author
- matthew_han...@apple.com
- Date
- 2017-02-05 22:17:27 -0800 (Sun, 05 Feb 2017)
Log Message
Merge r211565. rdar://problem/28896113
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (211708 => 211709)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-06 06:17:24 UTC (rev 211708)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-06 06:17:27 UTC (rev 211709)
@@ -1,5 +1,22 @@
2017-02-05 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211565. rdar://problem/28896113
+
+ 2017-02-01 Anders Carlsson <ander...@apple.com>
+
+ Handle m_processLauncher being null in ChildProcessProxy::processIdentifier()
+ https://bugs.webkit.org/show_bug.cgi?id=167713
+ rdar://problem/28896113
+
+ Reviewed by Dan Bernstein.
+
+ This can happen if the process has been explicitly terminated.
+
+ * UIProcess/ChildProcessProxy.h:
+ (WebKit::ChildProcessProxy::processIdentifier):
+
+2017-02-05 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211628. rdar://problem/26685576
2017-02-03 Csaba Osztrogonác <o...@webkit.org>
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/ChildProcessProxy.h (211708 => 211709)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/ChildProcessProxy.h 2017-02-06 06:17:24 UTC (rev 211708)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/ChildProcessProxy.h 2017-02-06 06:17:27 UTC (rev 211709)
@@ -69,7 +69,7 @@
};
State state() const;
- pid_t processIdentifier() const { return m_processLauncher->processIdentifier(); }
+ pid_t processIdentifier() const { return m_processLauncher ? m_processLauncher->processIdentifier() : 0; }
bool canSendMessage() const { return state() != State::Terminated;}
bool sendMessage(std::unique_ptr<IPC::Encoder>, OptionSet<IPC::SendOption>);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
