[[ BrowserWidget ]] Fix view -> browser lookup for Android

livecodeian · livecodeian · commit ef2b04aa3a47 · 2015-08-20T16:20:25.000+01:00
diff --git a/libbrowser/src/libbrowser.cpp b/libbrowser/src/libbrowser.cpp
@@ -155,18 +155,15 @@ void MCBrowserBase::BrowserListRemove(MCBrowser *p_browser)
 	MCBrowserMemoryDelete(t_entry);
 }
 
-bool MCBrowserBase::BrowserListFindWithView(void *p_view, MCBrowser *&r_browser)
+bool MCBrowserBase::BrowserListIterate(MCBrowserIterateCallback p_callback, void *p_context)
 {
 	for (MCBrowserListEntry *t_entry = s_browser_list; t_entry != nil; t_entry = t_entry->next)
 	{
-		if (t_entry->browser->GetNativeLayer() == p_view)
-		{
-			r_browser = t_entry->browser;
-			return true;
-		}
+		if (!p_callback(t_entry->browser, p_context))
+			return false;
 	}
 	
-	return false;
+	return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/libbrowser/src/libbrowser_android.cpp b/libbrowser/src/libbrowser_android.cpp
@@ -298,6 +298,43 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 
 //////////
 
+struct __browser_find_with_java_view_context
+{
+	JNIEnv* env;
+	jobject view;
+	MCBrowser *browser;
+};
+
+static bool __browser_find_with_java_view_callback(MCBrowser *p_browser, void *p_context)
+{
+	__browser_find_with_java_view_context *context;
+	context = (__browser_find_with_java_view_context*)p_context;
+	
+	if (context->env->IsSameObject(context->view, (jobject)p_browser->GetNativeLayer()))
+	{
+		context->browser = p_browser;
+		return false; // End iterator once browser found
+	}
+	
+	return true;
+}
+
+bool MCBrowserFindWithJavaView(JNIEnv *env, jobject p_view, MCBrowser *&r_browser)
+{
+	__browser_find_with_java_view_context context;
+	context.env = env;
+	context.view = p_view;
+	context.browser = nil;
+	
+	MCBrowserBase::BrowserListIterate(__browser_find_with_java_view_callback, &context);
+	
+	if (context.browser == nil)
+		return false;
+		
+	r_browser = context.browser;
+	return true;
+}
+
 extern "C" JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doJSExecutionResult(JNIEnv *env, jobject object, jstring tag, jstring result) __attribute__((visibility("default")));
 JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doJSExecutionResult(JNIEnv *env, jobject object, jstring tag, jstring result)
 {
@@ -308,7 +345,7 @@ JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doJSE
 	/* UNCHECKED */ MCBrowserJavaStringToUtf8String(env, result, t_result);
 	
 	MCBrowser *t_browser;
-	if (MCBrowserBase::BrowserListFindWithView(object, t_browser))
+	if (MCBrowserFindWithJavaView(env, object, t_browser))
 		((MCAndroidWebViewBrowser*)t_browser)->SetJavaScriptResult(t_tag, t_result);
     
     MCCStringFree(t_tag);
@@ -323,7 +360,7 @@ JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doSta
     /* UNCHECKED */ MCBrowserJavaStringToUtf8String(env, url, t_url);
     
 	MCBrowser *t_browser;
-	if (MCBrowserBase::BrowserListFindWithView(object, t_browser))
+	if (MCBrowserFindWithJavaView(env, object, t_browser))
 		((MCAndroidWebViewBrowser*)t_browser)->OnDocumentLoadBegin(false, t_url);
 
 	MCCStringFree(t_url);
@@ -337,7 +374,7 @@ JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doFin
     /* UNCHECKED */ MCBrowserJavaStringToUtf8String(env, url, t_url);
     
 	MCBrowser *t_browser;
-	if (MCBrowserBase::BrowserListFindWithView(object, t_browser))
+	if (MCBrowserFindWithJavaView(env, object, t_browser))
 		((MCAndroidWebViewBrowser*)t_browser)->OnDocumentLoadComplete(false, t_url);
 
 	MCCStringFree(t_url);
@@ -355,7 +392,7 @@ JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doLoa
     /* UNCHECKED */ MCBrowserJavaStringToUtf8String(env, error, t_error);
     
 	MCBrowser *t_browser;
-	if (MCBrowserBase::BrowserListFindWithView(object, t_browser))
+	if (MCBrowserFindWithJavaView(env, object, t_browser))
 		((MCAndroidWebViewBrowser*)t_browser)->OnDocumentLoadFailed(false, t_url, t_error);
 
 	MCCStringFree(t_url);
diff --git a/libbrowser/src/libbrowser_internal.h b/libbrowser/src/libbrowser_internal.h
@@ -19,6 +19,10 @@
 
 #include <libbrowser.h>
 
+////////////////////////////////////////////////////////////////////////////////
+
+typedef bool (*MCBrowserIterateCallback)(MCBrowser *p_browser, void *p_context);
+
 ////////////////////////////////////////////////////////////////////////////////
 // C++ Implementation Class
 
@@ -48,7 +52,7 @@ class MCBrowserBase : public MCBrowser
 	
 	static bool BrowserListAdd(MCBrowser *p_browser);
 	static void BrowserListRemove(MCBrowser *p_browser);
-	static bool BrowserListFindWithView(void *p_view, MCBrowser *&r_browser);
+	static bool BrowserListIterate(MCBrowserIterateCallback p_callback, void *p_context);
 
 private:
 	struct MCBrowserListEntry

Original file line number	Diff line number	Diff line change
`@@ -155,18 +155,15 @@ void MCBrowserBase::BrowserListRemove(MCBrowser *p_browser)`
`155`	`155`	`MCBrowserMemoryDelete(t_entry);`
`156`	`156`	`}`
`157`	`157`
`158`		`-bool MCBrowserBase::BrowserListFindWithView(void p_view, MCBrowser &r_browser)`
	`158`	`+bool MCBrowserBase::BrowserListIterate(MCBrowserIterateCallback p_callback, void *p_context)`
`159`	`159`	`{`
`160`	`160`	`for (MCBrowserListEntry *t_entry = s_browser_list; t_entry != nil; t_entry = t_entry->next)`
`161`	`161`	`{`
`162`		`- if (t_entry->browser->GetNativeLayer() == p_view)`
`163`		`- {`
`164`		`- r_browser = t_entry->browser;`
`165`		`- return true;`
`166`		`- }`
	`162`	`+ if (!p_callback(t_entry->browser, p_context))`
	`163`	`+ return false;`
`167`	`164`	`}`
`168`	`165`
`169`		`- return false;`
	`166`	`+ return true;`
`170`	`167`	`}`
`171`	`168`
`172`	`169`	`////////////////////////////////////////////////////////////////////////////////`