From de31942e6cee32021e7e89aa0d081fd8e2bc9cbb Mon Sep 17 00:00:00 2001 From: Niklas Merz Date: Thu, 7 Jan 2021 19:21:57 +0100 Subject: [PATCH] (ios): rename CDVWKProcessPoolFactory (#825) * (ios): rename CDVWKProcessPoolFactory CDVWKProcessPoolFactory was integrated from the WKWebView plugin with the new name: CDVWebViewProcessPoolFactory * (ios): Allow both processpool imports --- src/ios/CDVWKInAppBrowser.m | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ios/CDVWKInAppBrowser.m b/src/ios/CDVWKInAppBrowser.m index 1935984ad..70d7e8f0d 100644 --- a/src/ios/CDVWKInAppBrowser.m +++ b/src/ios/CDVWKInAppBrowser.m @@ -19,8 +19,10 @@ Licensed to the Apache Software Foundation (ASF) under one #import "CDVWKInAppBrowser.h" -#if __has_include("CDVWKProcessPoolFactory.h") -#import "CDVWKProcessPoolFactory.h" +#if __has_include() // Cordova-iOS >=6 + #import +#elif __has_include("CDVWKProcessPoolFactory.h") // Cordova-iOS <6 with WKWebView plugin + #import "CDVWKProcessPoolFactory.h" #endif #import @@ -739,7 +741,9 @@ - (void)createViews } configuration.applicationNameForUserAgent = userAgent; configuration.userContentController = userContentController; -#if __has_include("CDVWKProcessPoolFactory.h") +#if __has_include() + configuration.processPool = [[CDVWebViewProcessPoolFactory sharedFactory] sharedProcessPool]; +#elif __has_include("CDVWKProcessPoolFactory.h") configuration.processPool = [[CDVWKProcessPoolFactory sharedFactory] sharedProcessPool]; #endif [configuration.userContentController addScriptMessageHandler:self name:IAB_BRIDGE_NAME];