Changeset 150474 in webkit

Timestamp:

May 21, 2013 1:38:04 PM (11 years ago)

Author:

ap@apple.com

Message:

<rdar://problem/13929704> [WK2] WebKitTestRunner always crashes on exit
​https://bugs.webkit.org/show_bug.cgi?id=116568

Reviewed by Anders Carlsson.

• WebKitTestRunner/WebNotificationProvider.cpp: (WTR::WebNotificationProvider::~WebNotificationProvider):
• WebKitTestRunner/WebNotificationProvider.h: When the provider is destroyed, it should no longer be registered with the manager.

• WebKitTestRunner/GeolocationProviderMock.cpp: (WTR::GeolocationProviderMock::~GeolocationProviderMock):
• WebKitTestRunner/GeolocationProviderMock.h: I wasn't seeing a crash here, but this code has the same issue as notification provider, so applying the same fix.

• WebKitTestRunner/TestController.cpp: (WTR::TestController::~TestController): Close icon database. I started seeing ASSERT(!isOpen()) in WebCore IconDatabase destructor having fixed the above.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/GeolocationProviderMock.cpp (modified) (1 diff)
• WebKitTestRunner/GeolocationProviderMock.h (modified) (1 diff)
• WebKitTestRunner/TestController.cpp (modified) (2 diffs)
• WebKitTestRunner/WebNotificationProvider.cpp (modified) (1 diff)
• WebKitTestRunner/WebNotificationProvider.h (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-05-21  Alexey Proskuryakov  <ap@apple.com>
+
+        <rdar://problem/13929704> [WK2] WebKitTestRunner always crashes on exit
+        https://bugs.webkit.org/show_bug.cgi?id=116568
+
+        Reviewed by Anders Carlsson.
+
+        * WebKitTestRunner/WebNotificationProvider.cpp:
+        (WTR::WebNotificationProvider::~WebNotificationProvider):
+        * WebKitTestRunner/WebNotificationProvider.h:
+        When the provider is destroyed, it should no longer be registered with the manager.
+
+        * WebKitTestRunner/GeolocationProviderMock.cpp:
+        (WTR::GeolocationProviderMock::~GeolocationProviderMock):
+        * WebKitTestRunner/GeolocationProviderMock.h:
+        I wasn't seeing a crash here, but this code has the same issue as notification
+        provider, so applying the same fix.
+
+        * WebKitTestRunner/TestController.cpp: (WTR::TestController::~TestController):
+        Close icon database. I started seeing ASSERT(!isOpen()) in WebCore IconDatabase
+        destructor having fixed the above.
+
 2013-05-21  Commit Queue  <commit-queue@webkit.org>
 

trunk/Tools/WebKitTestRunner/GeolocationProviderMock.cpp

@@ -59 +59 @@
 }
 
+GeolocationProviderMock::~GeolocationProviderMock()
+{
+    WKGeolocationManagerSetProvider(m_geolocationManager, 0);
+}
+
 void GeolocationProviderMock::setPosition(double latitude, double longitude, double accuracy, bool providesAltitude, double altitude, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed)
 {

trunk/Tools/WebKitTestRunner/GeolocationProviderMock.h

@@ -34 +34 @@
 public:
     GeolocationProviderMock(WKContextRef);
+    ~GeolocationProviderMock();
 
     void setPosition(double latitude, double longitude, double accuracy, bool providesAltitude, double altitude, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed);

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -34 +34 @@
 #include <WebKit2/WKContextPrivate.h>
 #include <WebKit2/WKCredential.h>
+#include <WebKit2/WKIconDatabase.h>
 #include <WebKit2/WKNotification.h>
 #include <WebKit2/WKNotificationManager.h>
@@ -121 +122 @@
 TestController::~TestController()
 {
+    WKIconDatabaseClose(WKContextGetIconDatabase(m_context.get()));
+
     platformDestroy();
 }

trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp

@@ -62 +62 @@
 WebNotificationProvider::WebNotificationProvider()
 {
+}
+
+WebNotificationProvider::~WebNotificationProvider()
+{
+    WKNotificationManagerSetProvider(m_notificationManager.get(), 0);
 }
 

trunk/Tools/WebKitTestRunner/WebNotificationProvider.h

@@ -37 +37 @@
 public:
     WebNotificationProvider();
+    ~WebNotificationProvider();
     WKNotificationProvider provider();