Title: [188362] trunk/Source/WebKit2
- Revision
- 188362
- Author
- [email protected]
- Date
- 2015-08-12 16:02:40 -0700 (Wed, 12 Aug 2015)
Log Message
Web Inspector: CRASH under WebInspector::closeFrontend for some protocol tests
https://bugs.webkit.org/show_bug.cgi?id=147948
Reviewed by Joseph Pecoraro.
* WebProcess/WebPage/WebInspector.cpp:
(WebKit::WebInspector::closeFrontend): Don't invalidate the channel if it's null.
* WebProcess/WebPage/WebInspector.h: Add default member variable values.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (188361 => 188362)
--- trunk/Source/WebKit2/ChangeLog 2015-08-12 22:59:05 UTC (rev 188361)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-12 23:02:40 UTC (rev 188362)
@@ -1,3 +1,14 @@
+2015-08-12 Brian Burg <[email protected]>
+
+ Web Inspector: CRASH under WebInspector::closeFrontend for some protocol tests
+ https://bugs.webkit.org/show_bug.cgi?id=147948
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::closeFrontend): Don't invalidate the channel if it's null.
+ * WebProcess/WebPage/WebInspector.h: Add default member variable values.
+
2015-08-12 Joseph Pecoraro <[email protected]>
Web Inspector: Not receiving responses for async request IndexedDB.requestDatabaseNames
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (188361 => 188362)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2015-08-12 22:59:05 UTC (rev 188361)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2015-08-12 23:02:40 UTC (rev 188362)
@@ -60,11 +60,6 @@
WebInspector::WebInspector(WebPage* page)
: m_page(page)
- , m_attached(false)
- , m_previousCanAttach(false)
-#if ENABLE(INSPECTOR_SERVER)
- , m_remoteFrontendConnected(false)
-#endif
{
}
@@ -102,8 +97,11 @@
{
WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::DidClose(), m_page->pageID());
- m_frontendConnection->invalidate();
- m_frontendConnection = nullptr;
+ // If we tried to close the frontend before it was created, then no connection exists yet.
+ if (m_frontendConnection) {
+ m_frontendConnection->invalidate();
+ m_frontendConnection = nullptr;
+ }
m_attached = false;
m_previousCanAttach = false;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h (188361 => 188362)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2015-08-12 22:59:05 UTC (rev 188361)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2015-08-12 23:02:40 UTC (rev 188362)
@@ -105,10 +105,10 @@
RefPtr<IPC::Connection> m_frontendConnection;
- bool m_attached;
- bool m_previousCanAttach;
+ bool m_attached { false };
+ bool m_previousCanAttach { false };
#if ENABLE(INSPECTOR_SERVER)
- bool m_remoteFrontendConnected;
+ bool m_remoteFrontendConnected { false };
#endif
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
