Skip to content

Commit 3d5c56d

Browse files
andrew-yangyandrew-yangy
committed
rename methods
1 parent b0bf766 commit 3d5c56d

File tree

4 files changed

+66
-66
lines changed

4 files changed

+66
-66
lines changed

‎Plugins/Mac/Sources/ImmutableWebView.mm

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -374,26 +374,26 @@ - (nonnull ASPresentationAnchor)presentationAnchorForWebAuthenticationSession:(n
374374
@end
375375

376376
extern "C" {
377-
void *_CWebViewPlugin_Init(const char *ua);
378-
void _CWebViewPlugin_Destroy(void *instance);
379-
void _CWebViewPlugin_LoadURL(void *instance, const char *url);
380-
void _CWebViewPlugin_EvaluateJS(void *instance, const char *url);
381-
void _CWebViewPlugin_SetDelegate(DelegateCallbackFunction callback);
382-
void _CWebViewPlugin_LaunchAuthURL(void *instance, const char *url, const char *redirectUri);
377+
void *_CImmutableWebViewPlugin_Init(const char *ua);
378+
void _CImmutableWebViewPlugin_Destroy(void *instance);
379+
void _CImmutableWebViewPlugin_LoadURL(void *instance, const char *url);
380+
void _CImmutableWebViewPlugin_EvaluateJS(void *instance, const char *url);
381+
void _CImmutableWebViewPlugin_SetDelegate(DelegateCallbackFunction callback);
382+
void _CImmutableWebViewPlugin_LaunchAuthURL(void *instance, const char *url, const char *redirectUri);
383383
}
384384

385-
void _CWebViewPlugin_SetDelegate(DelegateCallbackFunction callback) {
385+
void _CImmutableWebViewPlugin_SetDelegate(DelegateCallbackFunction callback) {
386386
delegateCallback = callback;
387387
}
388388

389-
void *_CWebViewPlugin_Init(const char *ua)
389+
void *_CImmutableWebViewPlugin_Init(const char *ua)
390390
{
391391
CWebViewPlugin *webViewPlugin = [[CWebViewPlugin alloc] initWithUa:ua];
392392
[_instances addObject:webViewPlugin];
393393
return (__bridge_retained void *)webViewPlugin;
394394
}
395395

396-
void _CWebViewPlugin_Destroy(void *instance)
396+
void _CImmutableWebViewPlugin_Destroy(void *instance)
397397
{
398398
if (instance == NULL)
399399
return;
@@ -403,23 +403,23 @@ void _CWebViewPlugin_Destroy(void *instance)
403403
webViewPlugin = nil;
404404
}
405405

406-
void _CWebViewPlugin_LoadURL(void *instance, const char *url)
406+
void _CImmutableWebViewPlugin_LoadURL(void *instance, const char *url)
407407
{
408408
if (instance == NULL)
409409
return;
410410
CWebViewPlugin *webViewPlugin = (__bridge CWebViewPlugin *)instance;
411411
[webViewPlugin loadURL:url];
412412
}
413413

414-
void _CWebViewPlugin_EvaluateJS(void *instance, const char *js)
414+
void _CImmutableWebViewPlugin_EvaluateJS(void *instance, const char *js)
415415
{
416416
if (instance == NULL)
417417
return;
418418
CWebViewPlugin *webViewPlugin = (__bridge CWebViewPlugin *)instance;
419419
[webViewPlugin evaluateJS:js];
420420
}
421421

422-
void _CWebViewPlugin_LaunchAuthURL(void *instance, const char *url, const char *redirectUri)
422+
void _CImmutableWebViewPlugin_LaunchAuthURL(void *instance, const char *url, const char *redirectUri)
423423
{
424424
if (instance == NULL)
425425
return;

‎src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/ImmutableWebView.bundle/Contents/MacOS/ImmutableWebView

64 Bytes
Binary file not shown.

‎src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/WebViewObject.cs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -94,38 +94,38 @@ public void call(String message) {
9494

9595
#if UNITY_IPHONE && !UNITY_EDITOR
9696
[DllImport("__Internal")]
97-
private static extern IntPtr _CWebViewPlugin_Init(string ua);
97+
private static extern IntPtr _CImmutableWebViewPlugin_Init(string ua);
9898
[DllImport("__Internal")]
99-
private static extern int _CWebViewPlugin_Destroy(IntPtr instance);
99+
private static extern int _CImmutableWebViewPlugin_Destroy(IntPtr instance);
100100
[DllImport("__Internal")]
101-
private static extern void _CWebViewPlugin_LoadURL(
101+
private static extern void _CImmutableWebViewPlugin_LoadURL(
102102
IntPtr instance, string url);
103103
[DllImport("__Internal")]
104-
private static extern void _CWebViewPlugin_EvaluateJS(
104+
private static extern void _CImmutableWebViewPlugin_EvaluateJS(
105105
IntPtr instance, string url);
106106
[DllImport("__Internal")]
107-
private static extern void _CWebViewPlugin_LaunchAuthURL(IntPtr instance, string url);
107+
private static extern void _CImmutableWebViewPlugin_LaunchAuthURL(IntPtr instance, string url);
108108
[DllImport("__Internal")]
109-
private static extern void _CWebViewPlugin_SetDelegate(DelegateMessage callback);
109+
private static extern void _CImmutableWebViewPlugin_SetDelegate(DelegateMessage callback);
110110
[DllImport("__Internal")]
111-
private static extern void _CWebViewPlugin_ClearCache(IntPtr instance, bool includeDiskFiles);
111+
private static extern void _CImmutableWebViewPlugin_ClearCache(IntPtr instance, bool includeDiskFiles);
112112
[DllImport("__Internal")]
113-
private static extern void _CWebViewPlugin_ClearStorage(IntPtr instance);
113+
private static extern void _CImmutableWebViewPlugin_ClearStorage(IntPtr instance);
114114
#elif UNITY_STANDALONE_OSX || (UNITY_ANDROID && UNITY_EDITOR_OSX) || (UNITY_IPHONE && UNITY_EDITOR_OSX)
115115
[DllImport("ImmutableWebView")]
116-
private static extern IntPtr _CWebViewPlugin_Init(string ua);
116+
private static extern IntPtr _CImmutableWebViewPlugin_Init(string ua);
117117
[DllImport("ImmutableWebView")]
118-
private static extern int _CWebViewPlugin_Destroy(IntPtr instance);
118+
private static extern int _CImmutableWebViewPlugin_Destroy(IntPtr instance);
119119
[DllImport("ImmutableWebView")]
120-
private static extern void _CWebViewPlugin_LoadURL(
120+
private static extern void _CImmutableWebViewPlugin_LoadURL(
121121
IntPtr instance, string url);
122122
[DllImport("ImmutableWebView")]
123-
private static extern void _CWebViewPlugin_EvaluateJS(
123+
private static extern void _CImmutableWebViewPlugin_EvaluateJS(
124124
IntPtr instance, string url);
125125
[DllImport("ImmutableWebView")]
126-
private static extern void _CWebViewPlugin_LaunchAuthURL(IntPtr instance, string url, string redirectUri);
126+
private static extern void _CImmutableWebViewPlugin_LaunchAuthURL(IntPtr instance, string url, string redirectUri);
127127
[DllImport("ImmutableWebView")]
128-
private static extern void _CWebViewPlugin_SetDelegate(DelegateMessage callback);
128+
private static extern void _CImmutableWebViewPlugin_SetDelegate(DelegateMessage callback);
129129
#elif UNITY_WEBGL
130130
[DllImport("__Internal")]
131131
private static extern void _gree_unity_webview_init();
@@ -238,13 +238,13 @@ public void Init(
238238
//TODO: UNSUPPORTED
239239
PassportLogger.Error("Webview is not supported on this platform.");
240240
#elif UNITY_IPHONE || UNITY_STANDALONE_OSX || (UNITY_ANDROID && UNITY_EDITOR_OSX)
241-
webView = _CWebViewPlugin_Init(ua);
241+
webView = _CImmutableWebViewPlugin_Init(ua);
242242
Singleton.Instance.onJS = ((message) => CallFromJS(message));
243243
Singleton.Instance.onError = ((id, message) => CallOnError(id, message));
244244
Singleton.Instance.onHttpError = ((id, message) => CallOnHttpError(id, message));
245245
Singleton.Instance.onAuth = ((message) => CallOnAuth(message));
246246
Singleton.Instance.onLog = ((message) => CallOnLog(message));
247-
_CWebViewPlugin_SetDelegate(delegateMessageReceived);
247+
_CImmutableWebViewPlugin_SetDelegate(delegateMessageReceived);
248248
#elif UNITY_ANDROID
249249
webView = new AndroidJavaObject("net.gree.unitywebview.CWebViewPluginNoUi");
250250
webView.Call("Init", ua);
@@ -269,7 +269,7 @@ public void LoadURL(string url)
269269
#elif UNITY_STANDALONE_OSX || UNITY_IPHONE || (UNITY_ANDROID && UNITY_EDITOR_OSX)
270270
if (webView == IntPtr.Zero)
271271
return;
272-
_CWebViewPlugin_LoadURL(webView, url);
272+
_CImmutableWebViewPlugin_LoadURL(webView, url);
273273
#elif UNITY_ANDROID
274274
if (webView == null)
275275
return;
@@ -290,7 +290,7 @@ public void EvaluateJS(string js)
290290
#elif UNITY_STANDALONE_OSX || UNITY_IPHONE || (UNITY_ANDROID && UNITY_EDITOR_OSX)
291291
if (webView == IntPtr.Zero)
292292
return;
293-
_CWebViewPlugin_EvaluateJS(webView, js);
293+
_CImmutableWebViewPlugin_EvaluateJS(webView, js);
294294
#elif UNITY_ANDROID
295295
if (webView == null)
296296
return;
@@ -303,11 +303,11 @@ public void LaunchAuthURL(string url, string redirectUri)
303303
#if UNITY_STANDALONE_OSX || (UNITY_ANDROID && UNITY_EDITOR_OSX) || (UNITY_IPHONE && UNITY_EDITOR_OSX)
304304
if (webView == IntPtr.Zero)
305305
return;
306-
_CWebViewPlugin_LaunchAuthURL(webView, url, redirectUri != null ? redirectUri : "");
306+
_CImmutableWebViewPlugin_LaunchAuthURL(webView, url, redirectUri != null ? redirectUri : "");
307307
#elif UNITY_IPHONE && !UNITY_EDITOR_WIN
308308
if (webView == IntPtr.Zero)
309309
return;
310-
_CWebViewPlugin_LaunchAuthURL(webView, url);
310+
_CImmutableWebViewPlugin_LaunchAuthURL(webView, url);
311311
#else
312312
UnityEngine.Application.OpenURL(url);
313313
#endif
@@ -365,7 +365,7 @@ public void ClearCache(bool includeDiskFiles)
365365
#if UNITY_IPHONE && !UNITY_EDITOR
366366
if (webView == IntPtr.Zero)
367367
return;
368-
_CWebViewPlugin_ClearCache(webView, includeDiskFiles);
368+
_CImmutableWebViewPlugin_ClearCache(webView, includeDiskFiles);
369369
#elif UNITY_ANDROID && !UNITY_EDITOR
370370
if (webView == null)
371371
return;
@@ -380,7 +380,7 @@ public void ClearStorage()
380380
#if UNITY_IPHONE && !UNITY_EDITOR
381381
if (webView == IntPtr.Zero)
382382
return;
383-
_CWebViewPlugin_ClearStorage(webView);
383+
_CImmutableWebViewPlugin_ClearStorage(webView);
384384
#elif UNITY_ANDROID && !UNITY_EDITOR
385385
if (webView == null)
386386
return;

‎src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/iOS/ImmutableWebView.mm

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
DelegateCallbackFunction delegateCallback = NULL;
3232

3333
// cf. https://stackoverflow.com/questions/26383031/wkwebview-causes-my-view-controller-to-leak/33365424#33365424
34-
@interface WeakScriptMessageDelegate : NSObject<WKScriptMessageHandler>
34+
@interface ImmutableWeakScriptMessageDelegate : NSObject<WKScriptMessageHandler>
3535

3636
@property (nonatomic, weak) id<WKScriptMessageHandler> scriptDelegate;
3737

3838
- (instancetype)initWithDelegate:(id<WKScriptMessageHandler>)scriptDelegate;
3939

4040
@end
4141

42-
@implementation WeakScriptMessageDelegate
42+
@implementation ImmutableWeakScriptMessageDelegate
4343

4444
- (instancetype)initWithDelegate:(id<WKScriptMessageHandler>)scriptDelegate
4545
{
@@ -87,17 +87,17 @@ - (void)load:(NSURLRequest *)request
8787
}
8888
@end
8989

90-
@interface CWebViewPlugin : NSObject<WKUIDelegate, WKNavigationDelegate, WKScriptMessageHandler, ASWebAuthenticationPresentationContextProviding>
90+
@interface CImmutableWebViewPlugin : NSObject<WKUIDelegate, WKNavigationDelegate, WKScriptMessageHandler, ASWebAuthenticationPresentationContextProviding>
9191
{
9292
WKWebView *webView;
9393
}
9494
@end
9595

96-
@implementation CWebViewPlugin
96+
@implementation CImmutableWebViewPlugin
9797

9898
static WKProcessPool *_sharedProcessPool;
9999
static NSMutableArray *_instances = [[NSMutableArray alloc] init];
100-
static CWebViewPlugin *__delegate = nil;
100+
static CImmutableWebViewPlugin *__delegate = nil;
101101
static ASWebAuthenticationSession *_authSession;
102102

103103
- (id)initWithUa:(const char *)ua
@@ -110,9 +110,9 @@ - (id)initWithUa:(const char *)ua
110110

111111
WKWebViewConfiguration *configuration = [[WKWebViewConfiguration alloc] init];
112112
WKUserContentController *controller = [[WKUserContentController alloc] init];
113-
[controller addScriptMessageHandler:[[WeakScriptMessageDelegate alloc] initWithDelegate:self] name:@"unityControl"];
114-
[controller addScriptMessageHandler:[[WeakScriptMessageDelegate alloc] initWithDelegate:self] name:@"saveDataURL"];
115-
[controller addScriptMessageHandler:[[WeakScriptMessageDelegate alloc] initWithDelegate:self] name:@"logHandler"];
113+
[controller addScriptMessageHandler:[[ImmutableWeakScriptMessageDelegate alloc] initWithDelegate:self] name:@"unityControl"];
114+
[controller addScriptMessageHandler:[[ImmutableWeakScriptMessageDelegate alloc] initWithDelegate:self] name:@"saveDataURL"];
115+
[controller addScriptMessageHandler:[[ImmutableWeakScriptMessageDelegate alloc] initWithDelegate:self] name:@"logHandler"];
116116
NSString *str = @"\
117117
window.Unity = { \
118118
call: function(msg) { \
@@ -185,7 +185,7 @@ + (void)resetSharedProcessPool
185185
{
186186
// cf. https://stackoverflow.com/questions/33156567/getting-all-cookies-from-wkwebview/49744695#49744695
187187
_sharedProcessPool = [[WKProcessPool alloc] init];
188-
[_instances enumerateObjectsUsingBlock:^(CWebViewPlugin *obj, NSUInteger idx, BOOL *stop) {
188+
[_instances enumerateObjectsUsingBlock:^(CImmutableWebViewPlugin *obj, NSUInteger idx, BOOL *stop) {
189189
if ([obj->webView isKindOfClass:[WKWebView class]]) {
190190
WKWebView *webView = (WKWebView *)obj->webView;
191191
webView.configuration.processPool = _sharedProcessPool;
@@ -401,73 +401,73 @@ - (void)clearStorage
401401
@end
402402

403403
extern "C" {
404-
void *_CWebViewPlugin_Init(const char *ua);
405-
void _CWebViewPlugin_Destroy(void *instance);
406-
void _CWebViewPlugin_LoadURL(void *instance, const char *url);
407-
void _CWebViewPlugin_EvaluateJS(void *instance, const char *url);
408-
void _CWebViewPlugin_SetDelegate(DelegateCallbackFunction callback);
409-
void _CWebViewPlugin_LaunchAuthURL(void *instance, const char *url);
410-
void _CWebViewPlugin_ClearCache(void *instance, BOOL includeDiskFiles);
411-
void _CWebViewPlugin_ClearStorage(void *instance);
404+
void *_CImmutableWebViewPlugin_Init(const char *ua);
405+
void _CImmutableWebViewPlugin_Destroy(void *instance);
406+
void _CImmutableWebViewPlugin_LoadURL(void *instance, const char *url);
407+
void _CImmutableWebViewPlugin_EvaluateJS(void *instance, const char *url);
408+
void _CImmutableWebViewPlugin_SetDelegate(DelegateCallbackFunction callback);
409+
void _CImmutableWebViewPlugin_LaunchAuthURL(void *instance, const char *url);
410+
void _CImmutableWebViewPlugin_ClearCache(void *instance, BOOL includeDiskFiles);
411+
void _CImmutableWebViewPlugin_ClearStorage(void *instance);
412412
}
413413

414-
void _CWebViewPlugin_SetDelegate(DelegateCallbackFunction callback) {
414+
void _CImmutableWebViewPlugin_SetDelegate(DelegateCallbackFunction callback) {
415415
delegateCallback = callback;
416416
}
417417

418-
void *_CWebViewPlugin_Init(const char *ua)
418+
void *_CImmutableWebViewPlugin_Init(const char *ua)
419419
{
420-
CWebViewPlugin *webViewPlugin = [[CWebViewPlugin alloc] initWithUa:ua];
420+
CImmutableWebViewPlugin *webViewPlugin = [[CImmutableWebViewPlugin alloc] initWithUa:ua];
421421
[_instances addObject:webViewPlugin];
422422
return (__bridge_retained void *)webViewPlugin;
423423
}
424424

425-
void _CWebViewPlugin_Destroy(void *instance)
425+
void _CImmutableWebViewPlugin_Destroy(void *instance)
426426
{
427427
if (instance == NULL)
428428
return;
429-
CWebViewPlugin *webViewPlugin = (__bridge_transfer CWebViewPlugin *)instance;
429+
CImmutableWebViewPlugin *webViewPlugin = (__bridge_transfer CImmutableWebViewPlugin *)instance;
430430
[_instances removeObject:webViewPlugin];
431431
[webViewPlugin dispose];
432432
webViewPlugin = nil;
433433
}
434434

435-
void _CWebViewPlugin_LoadURL(void *instance, const char *url)
435+
void _CImmutableWebViewPlugin_LoadURL(void *instance, const char *url)
436436
{
437437
if (instance == NULL)
438438
return;
439-
CWebViewPlugin *webViewPlugin = (__bridge CWebViewPlugin *)instance;
439+
CImmutableWebViewPlugin *webViewPlugin = (__bridge CImmutableWebViewPlugin *)instance;
440440
[webViewPlugin loadURL:url];
441441
}
442442

443-
void _CWebViewPlugin_EvaluateJS(void *instance, const char *js)
443+
void _CImmutableWebViewPlugin_EvaluateJS(void *instance, const char *js)
444444
{
445445
if (instance == NULL)
446446
return;
447-
CWebViewPlugin *webViewPlugin = (__bridge CWebViewPlugin *)instance;
447+
CImmutableWebViewPlugin *webViewPlugin = (__bridge CImmutableWebViewPlugin *)instance;
448448
[webViewPlugin evaluateJS:js];
449449
}
450450

451-
void _CWebViewPlugin_LaunchAuthURL(void *instance, const char *url)
451+
void _CImmutableWebViewPlugin_LaunchAuthURL(void *instance, const char *url)
452452
{
453453
if (instance == NULL)
454454
return;
455-
CWebViewPlugin *webViewPlugin = (__bridge CWebViewPlugin *)instance;
455+
CImmutableWebViewPlugin *webViewPlugin = (__bridge CImmutableWebViewPlugin *)instance;
456456
[webViewPlugin launchAuthURL:url];
457457
}
458458

459-
void _CWebViewPlugin_ClearCache(void *instance, BOOL includeDiskFiles)
459+
void _CImmutableWebViewPlugin_ClearCache(void *instance, BOOL includeDiskFiles)
460460
{
461461
if (instance == NULL)
462462
return;
463-
CWebViewPlugin *webViewPlugin = (__bridge CWebViewPlugin *)instance;
463+
CImmutableWebViewPlugin *webViewPlugin = (__bridge CImmutableWebViewPlugin *)instance;
464464
[webViewPlugin clearCache:includeDiskFiles];
465465
}
466466

467-
void _CWebViewPlugin_ClearStorage(void *instance)
467+
void _CImmutableWebViewPlugin_ClearStorage(void *instance)
468468
{
469469
if (instance == NULL)
470470
return;
471-
CWebViewPlugin *webViewPlugin = (__bridge CWebViewPlugin *)instance;
471+
CImmutableWebViewPlugin *webViewPlugin = (__bridge CImmutableWebViewPlugin *)instance;
472472
[webViewPlugin clearStorage];
473473
}

0 commit comments

Comments
 (0)