Merge pull request #6445 from montegoulding/bugfix-21107

livecodepanos · web-flow · commit d63e4fa40a0a · 2018-03-29T16:16:52.000+01:00
[[ Bug 21107 ]] Further support for blank target links
diff --git a/extensions/widgets/browser/notes/21107.md b/extensions/widgets/browser/notes/21107.md
@@ -0,0 +1 @@
+# [21107] Fix some `target=_blank` links not navigating
diff --git a/libbrowser/src/libbrowser_cef.cpp b/libbrowser/src/libbrowser_cef.cpp
@@ -490,6 +490,7 @@ bool MCCefInitialise(void)
 	CefSettings t_settings;
 	t_settings.multi_threaded_message_loop = MC_CEF_USE_MULTITHREADED_MESSAGELOOP;
 	t_settings.command_line_args_disabled = true;
+	t_settings.windowless_rendering_enabled = true;
 	t_settings.no_sandbox = true;
 	t_settings.log_severity = LOGSEVERITY_DISABLE;
 	
@@ -725,7 +726,8 @@ class MCCefBrowserClient : public CefClient, CefLifeSpanHandler, CefRequestHandl
 {
 private:
 	int m_browser_id;
-	
+	int m_popup_browser_id = 0;
+
 	MCCefBrowserBase *m_owner;
 	
 	MCCefMessageResult m_message_result;
@@ -917,7 +919,11 @@ class MCCefBrowserClient : public CefClient, CefLifeSpanHandler, CefRequestHandl
 			if (m_owner != nil)
 				m_owner->OnCefBrowserCreated(p_browser);
 		}
-		
+		else
+		{
+			m_popup_browser_id = p_browser->GetIdentifier();
+		}
+
 		MCCefIncrementInstanceCount();
 	}
 	
@@ -947,16 +953,11 @@ class MCCefBrowserClient : public CefClient, CefLifeSpanHandler, CefRequestHandl
 		if (nil == m_owner)
 			return true;
 
-		if (!m_owner->GetAllowNewWindow())
-		{
-			char *t_url_str = nullptr;
-			if (MCCefStringToUtf8String(p_target_url, t_url_str))
-			{
-				m_owner->GoToURL(t_url_str);
-			}
-		}
-		
-		return !m_owner->GetAllowNewWindow();
+		CefWindowInfo(t_window_info);
+		t_window_info.SetAsWindowless(p_browser->GetHost()->GetWindowHandle());
+		p_window_info = t_window_info;
+		return false;
+
 	}
 	
 	// CefDragHandler interface
@@ -976,7 +977,18 @@ class MCCefBrowserClient : public CefClient, CefLifeSpanHandler, CefRequestHandl
 		// IM-2014-07-21: [[ Bug 12296 ]] If browser has been closed then exit
 		if (nil == m_owner)
 			return true;
-		
+
+		if (p_browser->GetIdentifier() == m_popup_browser_id)
+		{
+			char * t_url = nullptr;
+			if (MCCefStringToUtf8String(p_request->GetURL(), t_url))
+			{
+				m_owner->GoToURL(t_url);
+			}
+			p_browser->GetHost()->CloseBrowser(true);
+			return false;
+		}
+
 		bool t_cancel;
 		t_cancel = false;
 		
diff --git a/libbrowser/src/libbrowser_osx_webview.mm b/libbrowser/src/libbrowser_osx_webview.mm
@@ -1158,7 +1158,10 @@ - (void)webView:(WebView *)webView decidePolicyForMIMEType:(NSString *)type requ
 	else
 	{
 		[listener ignore];
-		m_instance->OnNavigationRequestUnhandled(![webView.mainFrame isEqual: frame], [request.URL.absoluteString cStringUsingEncoding: NSUTF8StringEncoding]);
+        if (request.URL.absoluteString != nil)
+        {
+            m_instance->OnNavigationRequestUnhandled(![webView.mainFrame isEqual: frame], [request.URL.absoluteString cStringUsingEncoding: NSUTF8StringEncoding]);
+        }
 	}
 }
 
@@ -1169,14 +1172,25 @@ - (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary
 	else
 	{
 		[listener ignore];
-		m_instance->OnNavigationRequestUnhandled(![webView.mainFrame isEqual: frame], [request.URL.absoluteString cStringUsingEncoding: NSUTF8StringEncoding]);
+        if (request.URL.absoluteString != nil)
+        {
+            m_instance->OnNavigationRequestUnhandled(![webView.mainFrame isEqual: frame], [request.URL.absoluteString cStringUsingEncoding: NSUTF8StringEncoding]);
+        }
 	}
 }
 
 @end
 
 @implementation MCWebUIDelegate
 
+- (WebView *)webView:(WebView *)webView
+            createWebViewWithRequest:(NSURLRequest *)request
+{
+    [[webView frameLoadDelegate] setPendingRequest: false];
+    [[webView mainFrame] loadRequest:request];
+    return webView;
+}
+
 - (NSUInteger)webView:(WebView *)webView dragDestinationActionMaskForDraggingInfo:(id<NSDraggingInfo>)draggingInfo
 {
 	return WebDragDestinationActionNone;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+# [21107] Fix some `target=_blank` links not navigating
Original file line number	Diff line number	Diff line change
`@@ -1158,7 +1158,10 @@ - (void)webView:(WebView )webView decidePolicyForMIMEType:(NSString )type requ`
`1158`	`1158`	`else`
`1159`	`1159`	`{`
`1160`	`1160`	`[listener ignore];`
`1161`		`- m_instance->OnNavigationRequestUnhandled(![webView.mainFrame isEqual: frame], [request.URL.absoluteString cStringUsingEncoding: NSUTF8StringEncoding]);`
	`1161`	`+ if (request.URL.absoluteString != nil)`
	`1162`	`+ {`
	`1163`	`+ m_instance->OnNavigationRequestUnhandled(![webView.mainFrame isEqual: frame], [request.URL.absoluteString cStringUsingEncoding: NSUTF8StringEncoding]);`
	`1164`	`+ }`
`1162`	`1165`	`}`
`1163`	`1166`	`}`
`1164`	`1167`
`@@ -1169,14 +1172,25 @@ - (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary`
`1169`	`1172`	`else`
`1170`	`1173`	`{`
`1171`	`1174`	`[listener ignore];`
`1172`		`- m_instance->OnNavigationRequestUnhandled(![webView.mainFrame isEqual: frame], [request.URL.absoluteString cStringUsingEncoding: NSUTF8StringEncoding]);`
	`1175`	`+ if (request.URL.absoluteString != nil)`
	`1176`	`+ {`
	`1177`	`+ m_instance->OnNavigationRequestUnhandled(![webView.mainFrame isEqual: frame], [request.URL.absoluteString cStringUsingEncoding: NSUTF8StringEncoding]);`
	`1178`	`+ }`
`1173`	`1179`	`}`
`1174`	`1180`	`}`
`1175`	`1181`
`1176`	`1182`	`@end`
`1177`	`1183`
`1178`	`1184`	`@implementation MCWebUIDelegate`
`1179`	`1185`
	`1186`	`+- (WebView )webView:(WebView )webView`
	`1187`	`+ createWebViewWithRequest:(NSURLRequest *)request`
	`1188`	`+{`
	`1189`	`+ [[webView frameLoadDelegate] setPendingRequest: false];`
	`1190`	`+ [[webView mainFrame] loadRequest:request];`
	`1191`	`+ return webView;`
	`1192`	`+}`
	`1193`	`+`
`1180`	`1194`	`- (NSUInteger)webView:(WebView *)webView dragDestinationActionMaskForDraggingInfo:(id<NSDraggingInfo>)draggingInfo`
`1181`	`1195`	`{`
`1182`	`1196`	`return WebDragDestinationActionNone;`