[[ libbrowser ]] Add actions to libbrowser API - loadHTMLtext, stop, reload

This patch extends the libbrowser API by adding the 'loadHTMLText', 'stop', and 'reload' actions.

Author: livecodeian

libbrowser/include/libbrowser.h

@@ -185,6 +185,9 @@ class MCBrowser : public MCBrowserRefCounted
 virtual bool GoBack() = 0;
 virtual bool GoForward() = 0;
 virtual bool GoToURL(const char *p_url) = 0;
+virtual bool LoadHTMLText(const char *p_htmltext, const char *p_base_url) = 0;
+virtual bool StopLoading() = 0;
+virtual bool Reload() = 0;
 virtual bool EvaluateJavaScript(const char *p_script, char *&r_result) = 0;
 };
 
@@ -357,6 +360,9 @@ MC_BROWSER_DLLEXPORT bool MCBrowserSetIntegerProperty(MCBrowserRef p_browser, MC
 MC_BROWSER_DLLEXPORT bool MCBrowserGoBack(MCBrowserRef p_browser);
 MC_BROWSER_DLLEXPORT bool MCBrowserGoForward(MCBrowserRef p_browser);
 MC_BROWSER_DLLEXPORT bool MCBrowserGoToURL(MCBrowserRef p_browser, const char *p_url);
+MC_BROWSER_DLLEXPORT bool MCBrowserLoadHTMLText(MCBrowserRef p_browser, const char *p_htmltext, const char *p_baseurl);
+MC_BROWSER_DLLEXPORT bool MCBrowserStopLoading(MCBrowserRef p_browser);
+MC_BROWSER_DLLEXPORT bool MCBrowserReload(MCBrowserRef p_browser);
 MC_BROWSER_DLLEXPORT bool MCBrowserEvaluateJavaScript(MCBrowserRef p_browser, const char *p_script, char *&r_result);
 
 enum MCBrowserNavigationEventType

libbrowser/src/libbrowser.cpp

@@ -574,6 +574,33 @@ bool MCBrowserGoToURL(MCBrowserRef p_browser, const char *p_url)
 return p_browser->GoToURL(p_url);
 }
 
+MC_BROWSER_DLLEXPORT_DEF
+bool MCBrowserLoadHTMLText(MCBrowserRef p_browser, const char *p_htmltext, const char *p_baseurl)
+{
+if (p_browser == nil)
+return false;
+
+return p_browser->LoadHTMLText(p_htmltext, p_baseurl);
+}
+
+MC_BROWSER_DLLEXPORT_DEF
+bool MCBrowserStopLoading(MCBrowserRef p_browser)
+{
+if (p_browser == nil)
+return false;
+
+return p_browser->StopLoading();
+}
+
+MC_BROWSER_DLLEXPORT_DEF
+bool MCBrowserReload(MCBrowserRef p_browser)
+{
+if (p_browser == nil)
+return false;
+
+return p_browser->Reload();
+}
+
 MC_BROWSER_DLLEXPORT_DEF
 bool MCBrowserEvaluateJavaScript(MCBrowserRef p_browser, const char *p_script, char *&r_result)
 {

libbrowser/src/libbrowser_android.cpp

@@ -730,7 +730,25 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 
 virtual bool GoToURL(const char *p_url)
 {
-MCAndroidObjectRemoteCall(m_view, "setUrl", "vs", nil, p_url);
+MCAndroidObjectRemoteCall(m_view, "setUrl", "vt", nil, p_url);
+return true;
+}
+
+virtual bool LoadHTMLText(const char *p_htmltext, const char *p_base_url)
+{
+MCAndroidObjectRemoteCall(m_view, "loadHtml", "vtt", nil, p_base_url, p_htmltext);
+return true;
+}
+
+virtual bool StopLoading(void)
+{
+MCAndroidObjectRemoteCall(m_view, "stopLoading", "v", nil);
+return true;
+}
+
+virtual bool Reload(void)
+{
+MCAndroidObjectRemoteCall(m_view, "reload", "v", nil);
 return true;
 }
 
@@ -739,7 +757,7 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 if (m_js_tag != nil)
 return false;
 
-MCAndroidObjectRemoteCall(m_view, "executeJavaScript", "ss", &m_js_tag, p_script);
+MCAndroidObjectRemoteCall(m_view, "executeJavaScript", "tt", &m_js_tag, p_script);
 
 // wait for result, timeout after 30 seconds 
 double t_current_time = MCBrowserTimeInSeconds();
@@ -809,7 +827,7 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 char *t_url;
 t_url = nil;
 
-MCAndroidObjectRemoteCall(m_view, "getUrl", "s", &t_url);
+MCAndroidObjectRemoteCall(m_view, "getUrl", "t", &t_url);
 if (t_url == nil)
 return MCCStringClone("", r_utf8_string);
 
@@ -824,15 +842,14 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 
 bool SetHTMLText(const char *p_utf8_string)
 {
-MCAndroidObjectRemoteCall(m_view, "loadHtml", "vst", nil, LIBBROWSER_DUMMY_URL, p_utf8_string);
-return true;
+return LoadHTMLText(p_utf8_string, LIBBROWSER_DUMMY_URL);
 }
 
 bool GetUserAgent(char *&r_useragent)
 {
 char *t_useragent;
 t_useragent = nil;
-MCAndroidObjectRemoteCall(m_view, "getUserAgent", "s", &t_useragent);
+MCAndroidObjectRemoteCall(m_view, "getUserAgent", "t", &t_useragent);
 
 if (t_useragent == nil)
 return false;
@@ -843,15 +860,15 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 
 bool SetUserAgent(const char *p_useragent)
 {
-MCAndroidObjectRemoteCall(m_view, "setUserAgent", "vs", nil, p_useragent);
+MCAndroidObjectRemoteCall(m_view, "setUserAgent", "vt", nil, p_useragent);
 return true;
 }
 
 bool GetJavaScriptHandlers(char *&r_js_handlers)
 {
 char *t_handlers;
 t_handlers = nil;
-MCAndroidObjectRemoteCall(m_view, "getJavaScriptHandlers", "s", &t_handlers);
+MCAndroidObjectRemoteCall(m_view, "getJavaScriptHandlers", "t", &t_handlers);
 
 if (t_handlers == nil)
 return false;
@@ -862,7 +879,7 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 
 bool SetJavaScriptHandlers(const char *p_js_handlers)
 {
-MCAndroidObjectRemoteCall(m_view, "setJavaScriptHandlers", "vs", nil, p_js_handlers);
+MCAndroidObjectRemoteCall(m_view, "setJavaScriptHandlers", "vt", nil, p_js_handlers);
 return true;
 }
 

libbrowser/src/libbrowser_cef.cpp

@@ -1572,20 +1572,29 @@ char *MCCefBrowserBase::GetSource(void)
 return t_src_str;
 }
 
-void MCCefBrowserBase::SetSource(const char *p_source)
+bool MCCefBrowserBase::LoadHTMLText(const char *p_htmltext, const char *p_base_url)
 {
 // IM-2014-06-25: [[ Bug 12701 ]] CEF will crash if given an empty source string,
 // so replace here with the source of an empty page :)
-if (p_source == nil || MCCStringLength(p_source) == 0)
-p_source = "<html><head></head><body></body></html>";
+if (p_htmltext == nil || MCCStringLength(p_htmltext) == 0)
+p_htmltext = "<html><head></head><body></body></html>";
 
-CefString t_source;
-/* UNCHECKED */ MCCefStringFromUtf8String(p_source, t_source);
+CefString t_htmltext;
+if (!MCCefStringFromUtf8String(p_htmltext, t_htmltext))
+return false;
 
-// LoadString requires a valid url
-CefString t_url(CEF_DUMMY_URL);
+CefString t_base_url;
+if (!MCCefStringFromUtf8String(p_base_url, t_base_url))
+return false;
+
+m_browser->GetMainFrame()->LoadString(t_htmltext, t_base_url);
 
-m_browser->GetMainFrame()->LoadString(t_source, t_url);
+return true;
+}
+
+void MCCefBrowserBase::SetSource(const char *p_source)
+{
+/* UNCHECKED */ LoadHTMLText(p_source, CEF_DUMMY_URL);
 }
 
 #define MCCEF_VERTICAL_OVERFLOW_PROPERTY "document.body.style.overflowY"
@@ -1784,6 +1793,18 @@ bool MCCefBrowserBase::GoToURL(const char *p_url)
 return true;
 }
 
+bool MCCefBrowserBase::StopLoading(void)
+{
+m_browser->StopLoad();
+return true;
+}
+
+bool MCCefBrowserBase::Reload(void)
+{
+m_browser->Reload();
+return true;
+}
+
 bool MCCefBrowserBase::GoBack(void)
 {
 m_browser->GoBack();

libbrowser/src/libbrowser_cef.h

@@ -59,6 +59,9 @@ class MCCefBrowserBase : public MCBrowserBase
 virtual bool GoBack();
 virtual bool GoForward();
 virtual bool GoToURL(const char *p_url);
+virtual bool LoadHTMLText(const char *p_htmltext, const char *p_base_url);
+virtual bool StopLoading();
+virtual bool Reload();
 virtual bool EvaluateJavaScript(const char *p_script, char *&r_result);
 
 virtual void Destroy();

libbrowser/src/libbrowser_osx_webview.h

@@ -48,6 +48,9 @@ class MCWebViewBrowser : public MCBrowserBase
 virtual bool GoBack();
 virtual bool GoForward();
 virtual bool GoToURL(const char *p_url);
+virtual bool LoadHTMLText(const char *p_htmltext, const char *p_base_url);
+virtual bool StopLoading();
+virtual bool Reload();
 virtual bool EvaluateJavaScript(const char *p_script, char *&r_result);
 
 void SyncJavaScriptHandlers();
@@ -75,10 +78,7 @@ class MCWebViewBrowser : public MCBrowserBase
 bool SetAllowUserInteraction(bool p_value);
 
 // Browser-specific actions
-bool ExecReload();
-bool ExecStop();
 bool ExecExecute(const char * p_script, char *&r_result);
-bool ExecLoad(const char *p_url, const char *p_html);
 
 //UIScrollView *GetScrollView(void);
 

libbrowser/src/libbrowser_osx_webview.mm

@@ -474,7 +474,7 @@ inline void MCBrowserRunBlockOnMainFiber(void (^p_block)(void))
 
 bool MCWebViewBrowser::SetHTMLText(const char *p_htmltext)
 {
-return ExecLoad(LIBBROWSER_DUMMY_URL, p_htmltext);
+return LoadHTMLText(p_htmltext, LIBBROWSER_DUMMY_URL);
 }
 
 bool MCWebViewBrowser::GetUserAgent(char*& r_user_agent)
@@ -812,8 +812,7 @@ + (BOOL)isSelectorExcludedFromWebScript:(SEL)selector
 return true;
 }
 
-// Browser-specific actions
-bool MCWebViewBrowser::ExecStop()
+bool MCWebViewBrowser::StopLoading()
 {
 WebView *t_view;
 if (!GetView(t_view))
@@ -852,7 +851,7 @@ + (BOOL)isSelectorExcludedFromWebScript:(SEL)selector
 return true;
 }
 
-bool MCWebViewBrowser::ExecReload()
+bool MCWebViewBrowser::Reload()
 {
 WebView *t_view;
 if (!GetView(t_view))
@@ -882,7 +881,7 @@ + (BOOL)isSelectorExcludedFromWebScript:(SEL)selector
 return MCCStringClone([t_result cStringUsingEncoding:NSUTF8StringEncoding], r_result);
 }
 
-bool MCWebViewBrowser::ExecLoad(const char *p_url, const char *p_html)
+bool MCWebViewBrowser::LoadHTMLText(const char *p_html, const char *p_url)
 {
 WebView *t_view;
 if (!GetView(t_view))

libbrowser/src/libbrowser_wkwebview.h

@@ -47,6 +47,9 @@ class MCWKWebViewBrowser : public MCBrowserBase
 virtual bool GoBack();
 virtual bool GoForward();
 virtual bool GoToURL(const char *p_url);
+virtual bool LoadHTMLText(const char *p_htmltext, const char *p_base_url);
+virtual bool StopLoading();
+virtual bool Reload();
 virtual bool EvaluateJavaScript(const char *p_script, char *&r_result);
 
 void SyncJavaScriptHandlers();

libbrowser/src/libbrowser_wkwebview.mm

@@ -312,15 +312,15 @@ MCBrowserDataDetectorType MCBrowserDataDetectorTypeFromWKDataDetectorTypes(WKDat
 return EvaluateJavaScript("document.documentElement.outerHTML", r_htmltext);
 }
 
-bool MCWKWebViewBrowser::SetHTMLText(const char *p_htmltext)
+bool MCWKWebViewBrowser::LoadHTMLText(const char *p_htmltext, const char *p_baseurl)
 {
 WKWebView *t_view;
 if (!GetWebView(t_view))
 return false;
 
 MCBrowserRunBlockOnMainFiber(^{
 [m_delegate setPendingRequest: true];
-[t_view loadHTMLString: [NSString stringWithUTF8String: p_htmltext] baseURL: [NSURL URLWithString: [NSString stringWithUTF8String: LIBBROWSER_DUMMY_URL]]];
+[t_view loadHTMLString: [NSString stringWithUTF8String: p_htmltext] baseURL: [NSURL URLWithString: [NSString stringWithUTF8String: p_baseurl]]];
 });
 
 /* UNCHECKED */ MCBrowserCStringAssignCopy(m_htmltext, p_htmltext);
@@ -329,6 +329,11 @@ MCBrowserDataDetectorType MCBrowserDataDetectorTypeFromWKDataDetectorTypes(WKDat
 return true;
 }
 
+bool MCWKWebViewBrowser::SetHTMLText(const char *p_htmltext)
+{
+return LoadHTMLText(p_htmltext, LIBBROWSER_DUMMY_URL);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 bool MCWKWebViewBrowser::GetJavaScriptHandlers(char *&r_handlers)
@@ -879,6 +884,32 @@ - (void)userContentController:(WKUserContentController *)userContentController d
 return true;
 }
 
+bool MCWKWebViewBrowser::StopLoading()
+{
+WKWebView *t_view;
+if (!GetWebView(t_view))
+return false;
+
+MCBrowserRunBlockOnMainFiber(^{
+[t_view stopLoading];
+});
+
+return true;
+}
+
+bool MCWKWebViewBrowser::Reload()
+{
+WKWebView *t_view;
+if (!GetWebView(t_view))
+return false;
+
+MCBrowserRunBlockOnMainFiber(^{
+[t_view reload];
+});
+
+return true;
+}
+
 bool MCWKWebViewBrowser::GoForward()
 {
 WKWebView *t_view;
@@ -1154,7 +1185,7 @@ void _SyncEvaluateJavaScript(WKWebView *p_view, NSString *p_javascript, id &r_re
 m_view.userInteractionEnabled = t_allow_user_interaction;
 
 if (!MCCStringIsEmpty(m_htmltext))
-/* UNCHECKED */ SetHTMLText(m_htmltext);
+/* UNCHECKED */ LoadHTMLText(m_htmltext, m_url);
 else if (!MCCStringIsEmpty(m_url))
 GoToURL(m_url);
 }