Changeset 177459 in webkit

Timestamp:

Dec 17, 2014 1:19:21 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: [Mac] Occosional Crashes Closing Inspector
​https://bugs.webkit.org/show_bug.cgi?id=139740

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2014-12-17
Reviewed by Timothy Hatcher.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::didReceiveEvent):
The WebPageProxy could have gotten destroyed in handling (e.g. keyboard shortcut
to close the Inspector Window), so protect the object to avoid destruction
during handling.

• UIProcess/WebInspectorProxy.h:
• UIProcess/WebPageProxy.cpp:

Add platformInvalidate opportunity for the platform to do invalidation work.

• UIProcess/efl/WebInspectorProxyEfl.cpp:

(WebKit::WebInspectorProxy::platformInvalidate):

• UIProcess/gtk/WebInspectorProxyGtk.cpp:

(WebKit::WebInspectorProxy::platformInvalidate):
Empty implementations, these ports do not need to do anything.

• UIProcess/WebInspectorProxy.h:
• UIProcess/mac/WebInspectorProxyMac.mm:

(WebKit::WebInspectorProxy::closeTimerFired):
(WebKit::WebInspectorProxy::platformDidClose):
(WebKit::WebInspectorProxy::platformInvalidate):
When closing / invalidating make sure we close the WKView to clear client
for any delayed callbacks.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebInspectorProxy.cpp (modified) (1 diff)
• UIProcess/WebInspectorProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/efl/WebInspectorProxyEfl.cpp (modified) (1 diff)
• UIProcess/gtk/WebInspectorProxyGtk.cpp (modified) (1 diff)
• UIProcess/mac/WebInspectorProxyMac.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-12-17  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: [Mac] Occosional Crashes Closing Inspector
+        https://bugs.webkit.org/show_bug.cgi?id=139740
+
+        Reviewed by Timothy Hatcher.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didReceiveEvent):
+        The WebPageProxy could have gotten destroyed in handling (e.g. keyboard shortcut
+        to close the Inspector Window), so protect the object to avoid destruction
+        during handling.
+
+        * UIProcess/WebInspectorProxy.h:
+        * UIProcess/WebPageProxy.cpp:
+        Add platformInvalidate opportunity for the platform to do invalidation work.
+
+        * UIProcess/efl/WebInspectorProxyEfl.cpp:
+        (WebKit::WebInspectorProxy::platformInvalidate):
+        * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+        (WebKit::WebInspectorProxy::platformInvalidate):
+        Empty implementations, these ports do not need to do anything.
+
+        * UIProcess/WebInspectorProxy.h:
+        * UIProcess/mac/WebInspectorProxyMac.mm:
+        (WebKit::WebInspectorProxy::closeTimerFired):
+        (WebKit::WebInspectorProxy::platformDidClose):
+        (WebKit::WebInspectorProxy::platformInvalidate):
+        When closing / invalidating make sure we close the WKView to clear client
+        for any delayed callbacks.
+
 2014-12-17  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp

@@ -171 +171 @@
 
     didClose();
+    platformInvalidate();
 
     m_page = nullptr;

trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h

@@ -158 +158 @@
     void platformOpen();
     void platformDidClose();
+    void platformInvalidate();
     void platformBringToFront();
     void platformHide();

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -4220 +4220 @@
             m_process->send(Messages::WebPage::KeyEvent(m_keyEventQueue.first()), m_pageID);
 
+        // The call to doneWithKeyEvent may close this WebPage.
+        // Protect against this being destroyed.
+        Ref<WebPageProxy> protect(*this);
+
         m_pageClient.doneWithKeyEvent(event, handled);
         if (handled)

trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp

@@ -143 +143 @@
 }
 
+void WebInspectorProxy::platformInvalidate()
+{
+}
+
 void WebInspectorProxy::platformHide()
 {

trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp

@@ -169 +169 @@
 }
 
+void WebInspectorProxy::platformInvalidate()
+{
+}
+
 void WebInspectorProxy::platformHide()
 {

trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm

@@ -292 +292 @@
         return;
 
-    m_inspectorView = nil;
+    if (m_inspectorView) {
+        WebPageProxy* inspectorPage = toImpl(m_inspectorView.get().pageRef);
+        inspectorPage->close();
+        m_inspectorView = nil;
+    }
 
     [m_inspectorProxyObjCAdapter close];
@@ -545 +549 @@
 }
 
+void WebInspectorProxy::platformInvalidate()
+{
+    m_closeTimer.stop();
+
+    closeTimerFired();
+}
+
 void WebInspectorProxy::platformHide()
 {