Title: [185030] trunk/Source/WebKit2
Revision
185030
Author
[email protected]
Date
2015-05-29 20:55:15 -0700 (Fri, 29 May 2015)

Log Message

Web Inspector: Crash closing a related tab with Web Inspector open while page is refreshing
https://bugs.webkit.org/show_bug.cgi?id=145488

Reviewed by Alexey Proskuryakov.

* WebProcess/WebPage/WebInspector.h:
* WebProcess/WebPage/WebInspector.cpp:
(WebKit::WebInspector::~WebInspector):
Ensure, no matter how we close, that we have invalidated the
frontend connection of which we are the client.

(WebKit::WebInspector::createInspectorPage):
This member variable will never be null.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (185029 => 185030)


--- trunk/Source/WebKit2/ChangeLog	2015-05-30 03:51:32 UTC (rev 185029)
+++ trunk/Source/WebKit2/ChangeLog	2015-05-30 03:55:15 UTC (rev 185030)
@@ -1,3 +1,19 @@
+2015-05-29  Joseph Pecoraro  <[email protected]>
+
+        Web Inspector: Crash closing a related tab with Web Inspector open while page is refreshing
+        https://bugs.webkit.org/show_bug.cgi?id=145488
+
+        Reviewed by Alexey Proskuryakov.
+
+        * WebProcess/WebPage/WebInspector.h:
+        * WebProcess/WebPage/WebInspector.cpp:
+        (WebKit::WebInspector::~WebInspector):
+        Ensure, no matter how we close, that we have invalidated the
+        frontend connection of which we are the client.
+
+        (WebKit::WebInspector::createInspectorPage):
+        This member variable will never be null.
+
 2015-05-29  Andreas Kling  <[email protected]>
 
         [iOS] When bouncing back from max pinch zoom scale, scaleChangeRate should be 0.

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (185029 => 185030)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp	2015-05-30 03:51:32 UTC (rev 185029)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp	2015-05-30 03:55:15 UTC (rev 185030)
@@ -68,12 +68,15 @@
 {
 }
 
+WebInspector::~WebInspector()
+{
+    if (m_frontendConnection)
+        m_frontendConnection->invalidate();
+}
+
 // Called from WebInspectorClient
 void WebInspector::createInspectorPage(bool underTest)
 {
-    if (!m_page)
-        return;
-
 #if OS(DARWIN)
     mach_port_t listeningPort;
     mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h (185029 => 185030)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h	2015-05-30 03:51:32 UTC (rev 185029)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h	2015-05-30 03:55:15 UTC (rev 185030)
@@ -91,6 +91,7 @@
     friend class WebInspectorClient;
 
     explicit WebInspector(WebPage*);
+    virtual ~WebInspector();
 
     bool canAttachWindow();
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to