Title: [87224] branches/safari-534-branch/Source/WebKit2
- Revision
- 87224
- Author
- lforsch...@apple.com
- Date
- 2011-05-24 16:01:24 -0700 (Tue, 24 May 2011)
Log Message
Merge r87093.
Modified Paths
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87223 => 87224)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-24 22:58:41 UTC (rev 87223)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-24 23:01:24 UTC (rev 87224)
@@ -1,5 +1,22 @@
2011-05-24 Lucas Forschler <lforsch...@apple.com>
+ Merged r87093.
+
+ 2011-05-23 Sam Weinig <s...@webkit.org>
+
+ Reviewed by Darin Adler.
+
+ Terminating a WebProcess should work even while a page is being closed
+ <rdar://problem/8934632>
+ https://bugs.webkit.org/show_bug.cgi?id=61299
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::terminateProcess):
+ Change validity check to only check for process validity, since terminating the process of a page that
+ is closed or is closing is acceptable behavior.
+
+2011-05-24 Lucas Forschler <lforsch...@apple.com>
+
Merged r87077.
2011-05-23 Jessie Berlin <jber...@apple.com>
Modified: branches/safari-534-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (87223 => 87224)
--- branches/safari-534-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-05-24 22:58:41 UTC (rev 87223)
+++ branches/safari-534-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-05-24 23:01:24 UTC (rev 87224)
@@ -1034,7 +1034,9 @@
void WebPageProxy::terminateProcess()
{
- if (!isValid())
+ // NOTE: This uses a check of m_isValid rather than calling isValid() since
+ // we want this to run even for pages being closed or that already closed.
+ if (!m_isValid)
return;
process()->terminate();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
