github/apache-cordova-plugin-inappbrowser
github/apache-cordova-plugin-inappbrowser
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(ios): rename CDVWKProcessPoolFactory (#825)

Browse Source 
* (ios): rename CDVWKProcessPoolFactory

CDVWKProcessPoolFactory was integrated from the WKWebView plugin with
the new name: CDVWebViewProcessPoolFactory

* (ios): Allow both processpool imports
This commit is contained in:
Niklas Merz 2021-01-07 19:21:57 +01:00 committed by GitHub
parent 8bdbd18d16
commit de31942e6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ios/CDVWKInAppBrowser.m
View File

@ -19,8 +19,10 @@
#import "CDVWKInAppBrowser.h" #import "CDVWKInAppBrowser.h"
#if __has_include("CDVWKProcessPoolFactory.h") #if __has_include(<Cordova/CDVWebViewProcessPoolFactory.h>) // Cordova-iOS >=6
#import "CDVWKProcessPoolFactory.h" #import <Cordova/CDVWebViewProcessPoolFactory.h>
#elif __has_include("CDVWKProcessPoolFactory.h") // Cordova-iOS <6 with WKWebView plugin
#import "CDVWKProcessPoolFactory.h"
#endif #endif
#import <Cordova/CDVPluginResult.h> #import <Cordova/CDVPluginResult.h>
@ -739,7 +741,9 @@ BOOL isExiting = FALSE;
} }
configuration.applicationNameForUserAgent = userAgent; configuration.applicationNameForUserAgent = userAgent;
configuration.userContentController = userContentController; configuration.userContentController = userContentController;
#if __has_include("CDVWKProcessPoolFactory.h") #if __has_include(<Cordova/CDVWebViewProcessPoolFactory.h>)
configuration.processPool = [[CDVWebViewProcessPoolFactory sharedFactory] sharedProcessPool];
#elif __has_include("CDVWKProcessPoolFactory.h")
configuration.processPool = [[CDVWKProcessPoolFactory sharedFactory] sharedProcessPool]; configuration.processPool = [[CDVWKProcessPoolFactory sharedFactory] sharedProcessPool];
#endif #endif
[configuration.userContentController addScriptMessageHandler:self name:IAB_BRIDGE_NAME]; [configuration.userContentController addScriptMessageHandler:self name:IAB_BRIDGE_NAME];