bugfix<central>:解决backspace回退前一个页面的问题，更新cef版本

当前版本为12/12/2018 - CEF 3.3578.1860.g36610bd / Chromium 71.0.3578.80 Signed-off-by: liuye <liuye@diligrp.com>

bugfix<central>:解决backspace回退前一个页面的问题，更新cef版本
当前版本为12/12/2018 - CEF 3.3578.1860.g36610bd / Chromium 71.0.3578.80 Signed-off-by: liuye <liuye@diligrp.com>
liuye
1 parent bc458983
Showing 11 changed files with 46 additions and 48 deletions
.gitignore
central_clearing_system/ETradeClient.vcxproj
central_clearing_system/ETradeClient/browser/browser_app.cpp
central_clearing_system/ETradeClient/browser/browser_app.h
central_clearing_system/ETradeClient/browser/main_view_browser_handler.cpp
central_clearing_system/ETradeClient/browser/main_view_browser_handler.h
central_clearing_system/ETradeClient/browser/popup_browser_handler.cpp
central_clearing_system/ETradeClient/browser/popup_browser_handler.h
central_clearing_system/ETradeClient/browser/render_delegate.h
central_clearing_system/ETradeClient/browser/url_request_proxy.h
doc/各市场版本/20181206/综合业务系统.zip
@@ -220,4 +220,6 @@ FakesAssemblies/
 # LightSwitch generated files
 GeneratedArtifacts/
 _Pvt_Extensions/
-ModelManifest.xml
 \ No newline at end of file
+ModelManifest.xml
+/central_clearing_system/.vs/ETradeClient/v15/Browse.VC.db
+/central_clearing_system/.vs/ETradeClient/v15
@@ -46,6 +46,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <TargetName>综合业务系统_beta</TargetName>
+    <IncludePath>$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -52,20 +52,6 @@ void BrowserApp::OnBrowserDestroyed(CefRefPtr&lt;CefBrowser&gt; browser)
 		render->OnBrowserDestroyed(this, browser);
 }
-bool BrowserApp::OnBeforeNavigation(CefRefPtr<CefBrowser> browser,
-									CefRefPtr<CefFrame> frame,
-									CefRefPtr<CefRequest> request,
-									NavigationType navigation_type,
-									bool is_redirect) 
-{
-	for (const auto& render : m_browser_render_delegates)
-	{
-		if (render->OnBeforeNavigation(this, browser, frame, request, navigation_type, is_redirect))
-			return true;
-	}
-	return false;
-}
-
 void BrowserApp::OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context)
 {
 	for (const auto& render : m_browser_render_delegates)
@@ -31,7 +31,6 @@ public:
 	virtual void OnWebKitInitialized() OVERRIDE;
 	virtual void OnBrowserCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
 	virtual void OnBrowserDestroyed(CefRefPtr<CefBrowser> browser) OVERRIDE;
-	virtual bool OnBeforeNavigation(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, NavigationType navigation_type, bool is_redirect) OVERRIDE;
 	virtual void OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) OVERRIDE;
 	virtual void OnContextReleased(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) OVERRIDE;
 	virtual void OnUncaughtException(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context, CefRefPtr<CefV8Exception> exception, CefRefPtr<CefV8StackTrace> stackTrace)OVERRIDE;
@@ -12,7 +12,6 @@
 #include "include/cef_frame.h"
 #include "include/cef_path_util.h"
 #include "include/cef_process_util.h"
-#include "include/cef_runnable.h"
 #include "include/cef_trace.h"
 #include "include/base/cef_lock.h"
 #include "include/wrapper/cef_helpers.h"
@@ -209,7 +208,11 @@ void MainViewBrowserHandler::OnStatusMessage(CefRefPtr&lt;CefBrowser&gt; browser, cons
 	CefDisplayHandler::OnStatusMessage(browser, value); // call parent.
 }
-bool MainViewBrowserHandler::OnConsoleMessage(CefRefPtr<CefBrowser> browser, const CefString& message, const CefString& source, int line)
+bool MainViewBrowserHandler::OnConsoleMessage(CefRefPtr<CefBrowser> browser,
+	cef_log_severity_t level,
+	const CefString& message,
+	const CefString& source,
+	int line)
 {
 	CEF_REQUIRE_UI_THREAD();
 	return TRUE;
@@ -251,7 +254,9 @@ void MainViewBrowserHandler::OnDownloadUpdated(CefRefPtr&lt;CefBrowser&gt; browser, Ce
 //@}
 //@{ CefLoadHandler methods
-void MainViewBrowserHandler::OnLoadStart(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame)
+void MainViewBrowserHandler::OnLoadStart(CefRefPtr<CefBrowser> browser,
+	CefRefPtr<CefFrame> frame,
+	TransitionType transition_type)
 {
 	CEF_REQUIRE_UI_THREAD();
@@ -260,7 +265,7 @@ void MainViewBrowserHandler::OnLoadStart(CefRefPtr&lt;CefBrowser&gt; browser, CefRefPt
 	::SendMessage(hWindow, WM_CEF_LOAD_START, NULL, NULL);
 	SendStatusToMainWnd(browser, L"页面加载中...");
-	CefLoadHandler::OnLoadStart(browser, frame); // call parent
+	CefLoadHandler::OnLoadStart(browser, frame, transition_type); // call parent
 }
 void MainViewBrowserHandler::OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int http_status_code)
@@ -354,7 +359,11 @@ void MainViewBrowserHandler::OnProtocolExecution(CefRefPtr&lt;CefBrowser&gt; browser, 
 	CefRequestHandler::OnProtocolExecution(browser, url, allow_os_execution);
 }
-bool MainViewBrowserHandler::OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, bool is_redirect)
+bool MainViewBrowserHandler::OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
+	CefRefPtr<CefFrame> frame,
+	CefRefPtr<CefRequest> request,
+	bool user_gesture,
+	bool is_redirect)
 {
 	CEF_REQUIRE_UI_THREAD();
 	if (Session::Instance().IsExpired()) // Return true to cancel the navigation if the session is already expired.
@@ -371,7 +380,7 @@ bool MainViewBrowserHandler::OnBeforeBrowse(CefRefPtr&lt;CefBrowser&gt; browser, CefRe
 		return true;
 	}
 	SendStatusToMainWnd(browser, L"开始加载页面...");
-	return CefRequestHandler::OnBeforeBrowse(browser, frame, request, is_redirect); // call parent
+	return CefRequestHandler::OnBeforeBrowse(browser, frame, request, user_gesture, is_redirect); // call parent
 }
 bool MainViewBrowserHandler::OnCertificateError(CefRefPtr<CefBrowser> browser, cef_errorcode_t cert_error, const CefString& request_url, CefRefPtr<CefSSLInfo> ssl_info, CefRefPtr<CefRequestCallback> callback)
@@ -458,13 +467,6 @@ void MainViewBrowserHandler::OnDialogClosed(CefRefPtr&lt;CefBrowser&gt; browser)
 {
 }
-bool MainViewBrowserHandler::OnJSDialog(CefRefPtr<CefBrowser> browser, const CefString& origin_url, const CefString& accept_lang, CefJSDialogHandler::JSDialogType dialog_type, const CefString& message_text, const CefString& default_prompt_text, CefRefPtr<CefJSDialogCallback> callback, bool& suppress_message)
-{
-	// do default
-	suppress_message = FALSE;
-	return FALSE;
-}
-
 void MainViewBrowserHandler::OnResetDialogState(CefRefPtr<CefBrowser> browser)
 {
 }
@@ -82,7 +82,11 @@ public:
 	virtual void OnAddressChange(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, const CefString& url) OVERRIDE;
 	virtual void OnTitleChange(CefRefPtr<CefBrowser> browser, const CefString& title) OVERRIDE;
 	virtual void OnStatusMessage(CefRefPtr<CefBrowser> browser, const CefString& value) OVERRIDE;
-	virtual bool OnConsoleMessage(CefRefPtr<CefBrowser> browser, const CefString& message, const CefString& source, int line) OVERRIDE;
+	virtual bool OnConsoleMessage(CefRefPtr<CefBrowser> browser,
+		cef_log_severity_t level,
+		const CefString& message,
+		const CefString& source,
+		int line) OVERRIDE;
 	//@}
 	//@{ CefDownloadHandler methods
@@ -96,7 +100,9 @@ public:
 	//@}
 	//@{ CefLoadHandler methods
-	virtual void OnLoadStart(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame) OVERRIDE;
+	virtual void OnLoadStart(CefRefPtr<CefBrowser> browser,
+		CefRefPtr<CefFrame> frame,
+		TransitionType transition_type) OVERRIDE;
 	virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int http_status_code) OVERRIDE;
 	virtual void OnLoadError(CefRefPtr<CefBrowser> browser, 
 							 CefRefPtr<CefFrame> frame, 
@@ -124,10 +130,11 @@ public:
 	virtual void OnProtocolExecution(CefRefPtr<CefBrowser> browser, 
 									 const CefString& url, 
 									 bool& allow_os_execution) OVERRIDE;
-	virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser, 
-								CefRefPtr<CefFrame> frame, 
-								CefRefPtr<CefRequest> request, 
-								bool is_redirect) OVERRIDE;
+	virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
+		CefRefPtr<CefFrame> frame,
+		CefRefPtr<CefRequest> request,
+		bool user_gesture,
+		bool is_redirect) OVERRIDE;
 	virtual bool OnCertificateError(CefRefPtr<CefBrowser> browser,
 									cef_errorcode_t cert_error,
 									const CefString& request_url,
@@ -154,14 +161,6 @@ public:
 									  bool is_reload, 
 									  CefRefPtr<CefJSDialogCallback> callback) OVERRIDE;
 	virtual void OnDialogClosed(CefRefPtr<CefBrowser> browser) OVERRIDE;
-	virtual bool OnJSDialog(CefRefPtr<CefBrowser> browser, 
-							const CefString& origin_url, 
-							const CefString& accept_lang, 
-							CefJSDialogHandler::JSDialogType dialog_type, 
-							const CefString& message_text, 
-							const CefString& default_prompt_text, 
-							CefRefPtr<CefJSDialogCallback> callback, 
-							bool& suppress_message) OVERRIDE;
 	virtual void OnResetDialogState(CefRefPtr<CefBrowser> browser) OVERRIDE;
 	//@}
@@ -50,12 +50,16 @@ bool PopupBrowserHandler::DoClose(CefRefPtr&lt;CefBrowser&gt; browser)
 	return CefLifeSpanHandler::DoClose(browser);
 }
-bool PopupBrowserHandler::OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, bool is_redirect)
+bool PopupBrowserHandler::OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
+	CefRefPtr<CefFrame> frame,
+	CefRefPtr<CefRequest> request,
+	bool user_gesture,
+	bool is_redirect)
 {
 	CEF_REQUIRE_UI_THREAD();
 	if (Session::Instance().IsExpired()) // Return true to cancel the navigation if the session is already expired.
 		return true;
-	return CefRequestHandler::OnBeforeBrowse(browser, frame, request, is_redirect);
+	return CefRequestHandler::OnBeforeBrowse(browser, frame, request, user_gesture, is_redirect);
 }
 bool PopupBrowserHandler::OnResourceResponse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, CefRefPtr<CefResponse> response)
@@ -44,7 +44,11 @@ public:
 	virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
 	virtual bool DoClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
-	virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, bool is_redirect) OVERRIDE;
+	virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
+		CefRefPtr<CefFrame> frame,
+		CefRefPtr<CefRequest> request,
+		bool user_gesture,
+		bool is_redirect) OVERRIDE;
 	virtual bool OnResourceResponse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, CefRefPtr<CefResponse> response) OVERRIDE;
 	virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int http_status_code) OVERRIDE;
 	virtual void OnLoadError(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, ErrorCode error_code, const CefString& error_text, const CefString& failed_url) OVERRIDE;
@@ -25,7 +25,7 @@ namespace RenderDelegate
 // Interface for renderer delegates. All RenderDelegates must be returned via
 	// CreateRenderDelegates. Do not perform work in the RenderDelegate
 	// constructor. See CefRenderProcessHandler for documentation.
-	class BrowserRender : public virtual CefBase {
+	class BrowserRender : public virtual CefBaseRefCounted {
 	public:
 		virtual void OnRenderThreadCreated(CefRefPtr<BrowserApp> app, CefRefPtr<CefListValue> extra_info);
 		virtual void OnWebKitInitialized(CefRefPtr<BrowserApp> app);
@@ -4,6 +4,7 @@
 #include <mutex>
 #include <condition_variable>
 #include <string>
+#include <memory>
 #include "include/internal/cef_ptr.h"
 #include "include/cef_urlrequest.h"
@@ -12,7 +13,7 @@ class URLRequest; // Forward declaration.
 class URLRequestProxy
 {
-	class URLRequestProxyImpl : public CefBase
+	class URLRequestProxyImpl : public CefBaseRefCounted
 	{
 	public:
 		URLRequestProxyImpl::URLRequestProxyImpl(std::mutex& mtx, std::condition_variable& cv);