From da11c5988e59bc55849732c434c7235684a18c43 Mon Sep 17 00:00:00 2001 From: Marek Kulik Date: Sat, 14 Dec 2024 17:35:39 +0100 Subject: [PATCH] Revert "Fix CEF compilation error" This reverts commit 5322b2db417d7d549eaa695ba08e45e215c65e54. --- Client/cefweb/CWebView.cpp | 8 ++++---- Client/cefweb/CWebView.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Client/cefweb/CWebView.cpp b/Client/cefweb/CWebView.cpp index 7040d7df88..e4e4e3ba20 100644 --- a/Client/cefweb/CWebView.cpp +++ b/Client/cefweb/CWebView.cpp @@ -936,10 +936,10 @@ void CWebView::OnBeforeClose(CefRefPtr browser) // // // // //////////////////////////////////////////////////////////////////// -bool CWebView::OnBeforePopup(CefRefPtr browser, CefRefPtr frame, int popup_id, const CefString& target_url, - const CefString& target_frame_name, CefLifeSpanHandler::WindowOpenDisposition target_disposition, bool user_gesture, - const CefPopupFeatures& popupFeatures, CefWindowInfo& windowInfo, CefRefPtr& client, CefBrowserSettings& settings, - CefRefPtr& extra_info, bool* no_javascript_access) +bool CWebView::OnBeforePopup(CefRefPtr browser, CefRefPtr frame, const CefString& target_url, const CefString& target_frame_name, + CefLifeSpanHandler::WindowOpenDisposition target_disposition, bool user_gesture, const CefPopupFeatures& popupFeatures, + CefWindowInfo& windowInfo, CefRefPtr& client, CefBrowserSettings& settings, CefRefPtr& extra_info, + bool* no_javascript_access) { // ATTENTION: This method is called on the IO thread diff --git a/Client/cefweb/CWebView.h b/Client/cefweb/CWebView.h index 3705815b4a..69fa691d3a 100644 --- a/Client/cefweb/CWebView.h +++ b/Client/cefweb/CWebView.h @@ -152,10 +152,10 @@ class CWebView : public CWebViewInterface, // CefLifeSpawnHandler methods virtual void OnBeforeClose(CefRefPtr browser) override; - virtual bool OnBeforePopup(CefRefPtr browser, CefRefPtr frame, int popup_id, const CefString& target_url, - const CefString& target_frame_name, CefLifeSpanHandler::WindowOpenDisposition target_disposition, bool user_gesture, - const CefPopupFeatures& popupFeatures, CefWindowInfo& windowInfo, CefRefPtr& client, CefBrowserSettings& settings, - CefRefPtr& extra_info, bool* no_javascript_access) override; + virtual bool OnBeforePopup(CefRefPtr browser, CefRefPtr frame, const CefString& target_url, const CefString& target_frame_name, + CefLifeSpanHandler::WindowOpenDisposition target_disposition, bool user_gesture, const CefPopupFeatures& popupFeatures, + CefWindowInfo& windowInfo, CefRefPtr& client, CefBrowserSettings& settings, CefRefPtr& extra_info, + bool* no_javascript_access) override; virtual void OnAfterCreated(CefRefPtr browser) override; // CefJSDialogHandler methods