[Cocoa] Fix the tests after r189530
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Sep 2015 05:12:37 +0000 (05:12 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Sep 2015 05:12:37 +0000 (05:12 +0000)
Unreviewed.

* WebKitTestRunner/cocoa/TestControllerCocoa.mm:
(WTR::initializeWebViewConfiguration):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189534 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm

index bda059f..7b39935 100644 (file)
@@ -1,5 +1,14 @@
 2015-09-08  Myles C. Maxfield  <mmaxfield@apple.com>
 
+        [Cocoa] Fix the tests after r189530
+
+        Unreviewed.
+
+        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+        (WTR::initializeWebViewConfiguration):
+
+2015-09-08  Myles C. Maxfield  <mmaxfield@apple.com>
+
         [WKTR] Allow changing the WKContextConfiguration between successive tests
         https://bugs.webkit.org/show_bug.cgi?id=148833
 
index 11acf76..2fbea24 100644 (file)
@@ -50,7 +50,8 @@ static WKWebViewConfiguration *globalWebViewConfiguration;
 void initializeWebViewConfiguration(const char* libraryPath, WKStringRef injectedBundlePath, WKContextRef context, WKContextConfigurationRef contextConfiguration)
 {
 #if WK_API_ENABLED
-    ASSERT(!globalWebViewConfiguration);
+    if (globalWebViewConfiguration)
+        [globalWebViewConfiguration release];
     globalWebViewConfiguration = [[WKWebViewConfiguration alloc] init];
 
     globalWebViewConfiguration.processPool = [[WKProcessPool alloc] _initWithConfiguration:(_WKProcessPoolConfiguration *)contextConfiguration];