Title: [186452] releases/WebKitGTK/webkit-2.8/Source/WebKit2
- Revision
- 186452
- Author
- [email protected]
- Date
- 2015-07-07 05:18:16 -0700 (Tue, 07 Jul 2015)
Log Message
Merge r186296 - Crash when closing the web inspector
https://bugs.webkit.org/show_bug.cgi?id=146620
Reviewed by Darin Adler.
* WebProcess/WebPage/WebInspectorUI.cpp:
(WebKit::WebInspectorUI::closeWindow): Null check the connection, like it is
in other places where it is used.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (186451 => 186452)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-07-07 12:17:28 UTC (rev 186451)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-07-07 12:18:16 UTC (rev 186452)
@@ -1,3 +1,14 @@
+2015-07-05 Timothy Hatcher <[email protected]>
+
+ Crash when closing the web inspector
+ https://bugs.webkit.org/show_bug.cgi?id=146620
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/WebPage/WebInspectorUI.cpp:
+ (WebKit::WebInspectorUI::closeWindow): Null check the connection, like it is
+ in other places where it is used.
+
2015-07-02 Carlos Garcia Campos <[email protected]>
[GTK] WebSQL doesn't work because openDatabase always fails with DOM Exception 18
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp (186451 => 186452)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp 2015-07-07 12:17:28 UTC (rev 186451)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp 2015-07-07 12:18:16 UTC (rev 186452)
@@ -118,7 +118,8 @@
{
WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::DidClose(), m_inspectedPageIdentifier);
- m_backendConnection->invalidate();
+ if (m_backendConnection)
+ m_backendConnection->invalidate();
m_backendConnection = nullptr;
m_inspectedPageIdentifier = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
