From 387b24e3829fee9104063c9e8bbb0d5df98c6189 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 25 May 2011 13:20:20 +0000 Subject: [PATCH] Remove the url check from life_span_handler_on_before_popup because the URL will be NULL when clicking a link with target="_blank" (issue #247). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@244 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef_dll/cpptoc/life_span_handler_cpptoc.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libcef_dll/cpptoc/life_span_handler_cpptoc.cc b/libcef_dll/cpptoc/life_span_handler_cpptoc.cc index 1331ec640..dadd4f3d3 100644 --- a/libcef_dll/cpptoc/life_span_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/life_span_handler_cpptoc.cc @@ -27,33 +27,32 @@ int CEF_CALLBACK life_span_handler_on_before_popup( DCHECK(parentBrowser); DCHECK(popupFeatures); DCHECK(windowInfo); - DCHECK(url); DCHECK(client); DCHECK(settings); - if (!self || !parentBrowser || !popupFeatures || !windowInfo || !url || - !client || !settings) + if (!self || !parentBrowser || !popupFeatures || !windowInfo || !client || + !settings) return 0; CefWindowInfo wndInfo; CefBrowserSettings browserSettings; CefPopupFeatures features; - + // Take ownership of the values. wndInfo.AttachTo(*windowInfo); browserSettings.AttachTo(*settings); - + // Reference the existing values instead of copying. features.Set(*popupFeatures, false); - + // |newHandler| will start off pointing to the current handler. CefRefPtr clientPtr; if (*client) clientPtr = CefClientCppToC::Unwrap(*client); CefClient* origClient = clientPtr.get(); - + // |parentBrowser| will be NULL if this is a top-level browser window. CefRefPtr browserPtr(CefBrowserCToCpp::Wrap(parentBrowser)); - + bool rv = CefLifeSpanHandlerCppToC::Get(self)->OnBeforePopup( browserPtr, features, wndInfo, CefString(url), clientPtr, browserSettings);