From 3b28ae087c958a5746ea3f80862e792c0a27f8d3 Mon Sep 17 00:00:00 2001 From: "jbedard@apple.com" Date: Fri, 3 Nov 2017 16:33:58 +0000 Subject: [PATCH] TestController platformAdjustContext should use provided WKContext for Mac https://bugs.webkit.org/show_bug.cgi?id=179124 Reviewed by Darin Adler. * WebKitTestRunner/cocoa/TestControllerCocoa.mm: (WTR::initializeWebViewConfiguration): Use the provided WKContext, since that is a WebProcessPool, instead of creating a second one. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@224401 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 12 ++++++++++++ Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index c32332f..010fb2b 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,15 @@ +2017-11-03 Jonathan Bedard + + TestController platformAdjustContext should use provided WKContext for Mac + https://bugs.webkit.org/show_bug.cgi?id=179124 + + + Reviewed by Darin Adler. + + * WebKitTestRunner/cocoa/TestControllerCocoa.mm: + (WTR::initializeWebViewConfiguration): Use the provided WKContext, since that is + a WebProcessPool, instead of creating a second one. + 2017-11-02 Christopher Reid Add a FileSystem namespace to FileSystem.cpp diff --git a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm index eb9581a..a0431e8 100644 --- a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm +++ b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm @@ -67,7 +67,7 @@ void initializeWebViewConfiguration(const char* libraryPath, WKStringRef injecte [globalWebViewConfiguration release]; globalWebViewConfiguration = [[WKWebViewConfiguration alloc] init]; - globalWebViewConfiguration.processPool = WTF::adoptNS([[WKProcessPool alloc] _initWithConfiguration:(_WKProcessPoolConfiguration *)contextConfiguration]).get(); + globalWebViewConfiguration.processPool = (WKProcessPool *)context; globalWebViewConfiguration.websiteDataStore = (WKWebsiteDataStore *)WKContextGetWebsiteDataStore(context); globalWebViewConfiguration._allowUniversalAccessFromFileURLs = YES; -- 1.8.3.1