[[ BrowserWidget ]] Standardize navigate messages.

livecodeian · livecodeian · commit f474fed75ca0 · 2015-08-20T16:25:27.000+01:00
Send navigate messages alongside non-frame documentLoad messages.
diff --git a/libbrowser/src/libbrowser_android.cpp b/libbrowser/src/libbrowser_android.cpp
@@ -361,7 +361,10 @@ JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doSta
     
 	MCBrowser *t_browser;
 	if (MCBrowserFindWithJavaView(env, object, t_browser))
+	{
+		((MCAndroidWebViewBrowser*)t_browser)->OnNavigationBegin(false, t_url);
 		((MCAndroidWebViewBrowser*)t_browser)->OnDocumentLoadBegin(false, t_url);
+	}
 
 	MCCStringFree(t_url);
 }
@@ -375,7 +378,10 @@ JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doFin
     
 	MCBrowser *t_browser;
 	if (MCBrowserFindWithJavaView(env, object, t_browser))
+	{
 		((MCAndroidWebViewBrowser*)t_browser)->OnDocumentLoadComplete(false, t_url);
+		((MCAndroidWebViewBrowser*)t_browser)->OnNavigationComplete(false, t_url);
+	}
 
 	MCCStringFree(t_url);
 }
@@ -393,7 +399,10 @@ JNIEXPORT void JNICALL Java_com_runrev_android_libraries_LibBrowserWebView_doLoa
     
 	MCBrowser *t_browser;
 	if (MCBrowserFindWithJavaView(env, object, t_browser))
+	{
 		((MCAndroidWebViewBrowser*)t_browser)->OnDocumentLoadFailed(false, t_url, t_error);
+		((MCAndroidWebViewBrowser*)t_browser)->OnNavigationFailed(false, t_url, t_error);
+	}
 
 	MCCStringFree(t_url);
 	MCCStringFree(t_error);
diff --git a/libbrowser/src/libbrowser_cef.cpp b/libbrowser/src/libbrowser_cef.cpp
@@ -668,8 +668,6 @@ class MCCefBrowserClient : public CefClient, CefLifeSpanHandler, CefRequestHandl
 		t_url_str = nil;
 		/* UNCHECKED */ MCCefStringToUtf8String(t_url, t_url_str);
 		
-		m_owner->OnNavigationBegin(!p_frame->IsMain(), t_url_str);
-		
 		if (t_url_str != nil)
 			MCCStringFree(t_url_str);
 		
@@ -791,7 +789,13 @@ class MCCefBrowserClient : public CefClient, CefLifeSpanHandler, CefRequestHandl
 		t_url_str = nil;
 		/* UNCHECKED */ MCCefStringToUtf8String(t_url, t_url_str);
 		
-		m_owner->OnNavigationComplete(!p_frame->IsMain(), t_url_str);
+		bool t_frame;
+		t_frame = !p_frame->IsMain();
+		
+		if (!t_frame)
+			m_owner->OnNavigationBegin(t_frame, t_url_str);
+
+		m_owner->OnDocumentLoadBegin(t_frame, t_url_str);
 		
 		if (t_url_str != nil)
 			MCCStringFree(t_url_str);
@@ -808,8 +812,6 @@ class MCCefBrowserClient : public CefClient, CefLifeSpanHandler, CefRequestHandl
 		bool t_is_error;
 		t_is_error = RemoveLoadErrorFrame(p_frame->GetIdentifier(), t_url, t_error);
 		
-		/* TODO - Load error handling */
-		// For now we don't send a browser load error message - instead make sure documentComplete is sent with the correct url
 		if (!t_is_error)
 			t_url = p_frame->GetURL();
 		
@@ -820,29 +822,37 @@ class MCCefBrowserClient : public CefClient, CefLifeSpanHandler, CefRequestHandl
 		t_url_str = nil;
 		/* UNCHECKED */ MCCefStringToUtf8String(t_url, t_url_str);
 		
+		bool t_frame;
+		t_frame = !p_frame->IsMain();
+		
 		if (t_is_error)
 		{
 			char *t_err_str;
 			t_err_str = nil;
 			/* UNCHECKED */ MCCefStringToUtf8String(t_error, t_err_str);
 			
-			m_owner->OnDocumentLoadFailed(!p_frame->IsMain(), t_url_str, t_err_str);
+			m_owner->OnDocumentLoadFailed(t_frame, t_url_str, t_err_str);
+			
+			if (!t_frame)
+				m_owner->OnNavigationFailed(t_frame, t_url_str, t_err_str);
 			
 			if (t_err_str != nil)
 				MCCStringFree(t_err_str);
 		}
 		else
-			m_owner->OnDocumentLoadComplete(!p_frame->IsMain(), t_url_str);
+		{
+			m_owner->OnDocumentLoadComplete(t_frame, t_url_str);
+			
+			if (!t_frame)
+				m_owner->OnNavigationComplete(t_frame, t_url_str);
+		}
 		
 		if (t_url_str != nil)
 			MCCStringFree(t_url_str);
 	}
 	
 	virtual void OnLoadError(CefRefPtr<CefBrowser> p_browser, CefRefPtr<CefFrame> p_frame, CefLoadHandler::ErrorCode p_error_code, const CefString &p_error_text, const CefString &p_failed_url) OVERRIDE
 	{
-		if (IgnoreUrl(p_failed_url))
-			return;
-		
 		AddLoadErrorFrame(p_frame->GetIdentifier(), p_failed_url, p_error_text);
 	}
 	
