From 23cc7854c7e8969e35bc99a208fe5df0c324d070 Mon Sep 17 00:00:00 2001 From: Sheen Tian Date: Sun, 19 Jan 2025 19:21:10 +0800 Subject: [PATCH] feat: unify the paramters type --- src/details/CCefClientDelegate.h | 112 +++++++++--------- .../CCefClientDelegate_ContextMenuHandler.cpp | 26 ++-- .../CCefClientDelegate_DialogHandler.cpp | 4 +- .../CCefClientDelegate_DisplayHandler.cpp | 4 +- .../CCefClientDelegate_DownloadHandler.cpp | 12 +- .../CCefClientDelegate_DragHandler.cpp | 4 +- .../CCefClientDelegate_JSDialogHandler.cpp | 12 +- .../CCefClientDelegate_KeyboardHandler.cpp | 4 +- .../CCefClientDelegate_LifeSpanHandler.cpp | 6 +- .../CCefClientDelegate_RenderHandler.cpp | 30 ++--- thirdparty/CMakeLists.txt | 2 +- 11 files changed, 110 insertions(+), 106 deletions(-) diff --git a/src/details/CCefClientDelegate.h b/src/details/CCefClientDelegate.h index dcc3b835..03bd32e5 100644 --- a/src/details/CCefClientDelegate.h +++ b/src/details/CCefClientDelegate.h @@ -73,29 +73,29 @@ class CCefClientDelegate // ContextMenuHandler #pragma region ContextMenuHandler - virtual void onBeforeContextMenu(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr params, - CefRefPtr model) override; - - virtual bool onRunContextMenu(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr params, - CefRefPtr model, - CefRefPtr callback) override; - - virtual bool onContextMenuCommand(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr params, + virtual void onBeforeContextMenu(CefRefPtr& browser, + CefRefPtr& frame, + CefRefPtr& params, + CefRefPtr& model) override; + + virtual bool onRunContextMenu(CefRefPtr& browser, + CefRefPtr& frame, + CefRefPtr& params, + CefRefPtr& model, + CefRefPtr& callback) override; + + virtual bool onContextMenuCommand(CefRefPtr& browser, + CefRefPtr& frame, + CefRefPtr& params, int command_id, CefContextMenuHandler::EventFlags event_flags) override; - virtual void onContextMenuDismissed(CefRefPtr browser, CefRefPtr frame) override; + virtual void onContextMenuDismissed(CefRefPtr& browser, CefRefPtr& frame) override; #pragma endregion // DialogHandler #pragma region DialogHandler - virtual bool onFileDialog(CefRefPtr browser, + virtual bool onFileDialog(CefRefPtr& browser, CefBrowserHost::FileDialogMode mode, const CefString& title, const CefString& default_file_path, @@ -103,7 +103,7 @@ class CCefClientDelegate #if CEF_VERSION_MAJOR < 102 int selected_accept_filter, #endif - CefRefPtr callback) override; + CefRefPtr& callback) override; #pragma endregion // DisplayHandler @@ -112,13 +112,13 @@ class CCefClientDelegate CefRefPtr& frame, const CefString& url) override; virtual void titleChanged(CefRefPtr& browser, const CefString& title) override; - virtual void faviconURLChanged(CefRefPtr browser, const std::vector& icon_urls) override; + virtual void faviconURLChanged(CefRefPtr& browser, const std::vector& icon_urls) override; virtual void fullscreenModeChanged(CefRefPtr& browser, bool fullscreen) override; virtual bool tooltipMessage(CefRefPtr& browser, const CefString& text) override; virtual void statusMessage(CefRefPtr& browser, const CefString& value) override; virtual void consoleMessage(CefRefPtr& browser, const CefString& message, int level) override; virtual void loadingProgressChanged(CefRefPtr& browser, double progress) override; - virtual bool cursorChanged(CefRefPtr browser, + virtual bool cursorChanged(CefRefPtr& browser, CefCursorHandle cursor, cef_cursor_type_t type, const CefCursorInfo& custom_cursor_info) override; @@ -126,20 +126,20 @@ class CCefClientDelegate // DownloadHander #pragma region DownloadHander - virtual void onBeforeDownload(CefRefPtr browser, - CefRefPtr download_item, + virtual void onBeforeDownload(CefRefPtr& browser, + CefRefPtr& download_item, const CefString& suggested_name, - CefRefPtr callback) override; + CefRefPtr& callback) override; - virtual void onDownloadUpdated(CefRefPtr browser, - CefRefPtr download_item, - CefRefPtr callback) override; + virtual void onDownloadUpdated(CefRefPtr& browser, + CefRefPtr& download_item, + CefRefPtr& callback) override; #pragma endregion // DragHandler #pragma region DragHandler - virtual bool onDragEnter(CefRefPtr browser, - CefRefPtr dragData, + virtual bool onDragEnter(CefRefPtr& browser, + CefRefPtr& dragData, CefDragHandler::DragOperationsMask mask) override; virtual void draggableRegionChanged(CefRefPtr& browser, CefRefPtr& frame, @@ -155,28 +155,28 @@ class CCefClientDelegate // JSDialogHandler #pragma region JSDialogHandler - virtual bool onJSDialog(CefRefPtr browser, + virtual bool onJSDialog(CefRefPtr& browser, const CefString& origin_url, CefJSDialogHandler::JSDialogType dialog_type, const CefString& message_text, const CefString& default_prompt_text, - CefRefPtr callback, + CefRefPtr& callback, bool& suppress_message) override; - virtual bool onBeforeUnloadDialog(CefRefPtr browser, + virtual bool onBeforeUnloadDialog(CefRefPtr& browser, const CefString& message_text, bool is_reload, - CefRefPtr callback) override; - virtual void onResetDialogState(CefRefPtr browser) override; - virtual void onDialogClosed(CefRefPtr browser) override; + CefRefPtr& callback) override; + virtual void onResetDialogState(CefRefPtr& browser) override; + virtual void onDialogClosed(CefRefPtr& browser) override; #pragma endregion // KeyboardHandler #pragma region KeyboardHandler - virtual bool onPreKeyEvent(CefRefPtr browser, + virtual bool onPreKeyEvent(CefRefPtr& browser, const CefKeyEvent& event, CefEventHandle os_event, bool* is_keyboard_shortcut) override; - virtual bool onKeyEvent(CefRefPtr browser, const CefKeyEvent& event, CefEventHandle os_event) override; + virtual bool onKeyEvent(CefRefPtr& browser, const CefKeyEvent& event, CefEventHandle os_event) override; #pragma endregion // LifeSpanHandler @@ -190,9 +190,9 @@ class CCefClientDelegate CefBrowserSettings& settings, bool& disableJavascriptAccess) override; virtual void onAfterCreate(CefRefPtr& browser) override; - virtual bool doClose(CefRefPtr browser) override; - virtual bool requestClose(CefRefPtr browser) override; - virtual void onBeforeClose(CefRefPtr browser) override; + virtual bool doClose(CefRefPtr& browser) override; + virtual bool requestClose(CefRefPtr& browser) override; + virtual void onBeforeClose(CefRefPtr& browser) override; #pragma endregion // LoadHandler @@ -213,43 +213,47 @@ class CCefClientDelegate // RenderHandler #pragma region RenderHandler - virtual bool getRootScreenRect(CefRefPtr browser, CefRect& rect) override; - virtual void getViewRect(CefRefPtr browser, CefRect& rect) override; - virtual bool getScreenPoint(CefRefPtr browser, int viewX, int viewY, int& screenX, int& screenY) override; - virtual bool getScreenInfo(CefRefPtr browser, CefScreenInfo& screen_info) override; - virtual void onPopupShow(CefRefPtr browser, bool show) override; - virtual void onPopupSize(CefRefPtr browser, const CefRect& rect) override; - virtual void onPaint(CefRefPtr browser, + virtual bool getRootScreenRect(CefRefPtr& browser, CefRect& rect) override; + virtual void getViewRect(CefRefPtr& browser, CefRect& rect) override; + virtual bool getScreenPoint(CefRefPtr& browser, + int viewX, + int viewY, + int& screenX, + int& screenY) override; + virtual bool getScreenInfo(CefRefPtr& browser, CefScreenInfo& screen_info) override; + virtual void onPopupShow(CefRefPtr& browser, bool show) override; + virtual void onPopupSize(CefRefPtr& browser, const CefRect& rect) override; + virtual void onPaint(CefRefPtr& browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, const void* buffer, int width, int height) override; #if CEF_VERSION_MAJOR < 124 - virtual void onAcceleratedPaint(CefRefPtr browser, + virtual void onAcceleratedPaint(CefRefPtr& browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, void* shared_handle) override; #else - virtual void onAcceleratedPaint(CefRefPtr browser, + virtual void onAcceleratedPaint(CefRefPtr& browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, const CefAcceleratedPaintInfo& info) override; #endif - virtual bool startDragging(CefRefPtr browser, - CefRefPtr drag_data, + virtual bool startDragging(CefRefPtr& browser, + CefRefPtr& drag_data, CefRenderHandler::DragOperationsMask allowed_ops, int x, int y) override; - virtual void updateDragCursor(CefRefPtr browser, CefRenderHandler::DragOperation operation) override; - virtual void onScrollOffsetChanged(CefRefPtr browser, double x, double y) override; - virtual void onImeCompositionRangeChanged(CefRefPtr browser, + virtual void updateDragCursor(CefRefPtr& browser, CefRenderHandler::DragOperation operation) override; + virtual void onScrollOffsetChanged(CefRefPtr& browser, double x, double y) override; + virtual void onImeCompositionRangeChanged(CefRefPtr& browser, const CefRange& selected_range, const CefRenderHandler::RectList& character_bounds) override; - virtual void onTextSelectionChanged(CefRefPtr browser, + virtual void onTextSelectionChanged(CefRefPtr& browser, const CefString& selected_text, const CefRange& selected_range) override; - virtual void onVirtualKeyboardRequested(CefRefPtr browser, + virtual void onVirtualKeyboardRequested(CefRefPtr& browser, CefRenderHandler::TextInputMode input_mode) override; #pragma endregion }; diff --git a/src/details/handler/CCefClientDelegate_ContextMenuHandler.cpp b/src/details/handler/CCefClientDelegate_ContextMenuHandler.cpp index 6d30375d..597584ee 100644 --- a/src/details/handler/CCefClientDelegate_ContextMenuHandler.cpp +++ b/src/details/handler/CCefClientDelegate_ContextMenuHandler.cpp @@ -9,10 +9,10 @@ #include "details/QCefViewPrivate.h" void -CCefClientDelegate::onBeforeContextMenu(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr params, - CefRefPtr model) +CCefClientDelegate::onBeforeContextMenu(CefRefPtr& browser, + CefRefPtr& frame, + CefRefPtr& params, + CefRefPtr& model) { FLog(); @@ -40,11 +40,11 @@ CCefClientDelegate::onBeforeContextMenu(CefRefPtr browser, } bool -CCefClientDelegate::onRunContextMenu(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr params, - CefRefPtr model, - CefRefPtr callback) +CCefClientDelegate::onRunContextMenu(CefRefPtr& browser, + CefRefPtr& frame, + CefRefPtr& params, + CefRefPtr& model, + CefRefPtr& callback) { FLog(); @@ -65,9 +65,9 @@ CCefClientDelegate::onRunContextMenu(CefRefPtr browser, } bool -CCefClientDelegate::onContextMenuCommand(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr params, +CCefClientDelegate::onContextMenuCommand(CefRefPtr& browser, + CefRefPtr& frame, + CefRefPtr& params, int command_id, CefContextMenuHandler::EventFlags event_flags) { @@ -77,7 +77,7 @@ CCefClientDelegate::onContextMenuCommand(CefRefPtr browser, } void -CCefClientDelegate::onContextMenuDismissed(CefRefPtr browser, CefRefPtr frame) +CCefClientDelegate::onContextMenuDismissed(CefRefPtr& browser, CefRefPtr& frame) { FLog(); diff --git a/src/details/handler/CCefClientDelegate_DialogHandler.cpp b/src/details/handler/CCefClientDelegate_DialogHandler.cpp index 71e491b5..616bb228 100644 --- a/src/details/handler/CCefClientDelegate_DialogHandler.cpp +++ b/src/details/handler/CCefClientDelegate_DialogHandler.cpp @@ -9,7 +9,7 @@ #include "details/utils/ValueConvertor.h" bool -CCefClientDelegate::onFileDialog(CefRefPtr browser, +CCefClientDelegate::onFileDialog(CefRefPtr& browser, CefBrowserHost::FileDialogMode mode, const CefString& title, const CefString& default_file_path, @@ -17,7 +17,7 @@ CCefClientDelegate::onFileDialog(CefRefPtr browser, #if CEF_VERSION_MAJOR < 102 int selected_accept_filter, #endif - CefRefPtr callback) + CefRefPtr& callback) { QMetaObject::invokeMethod(pCefViewPrivate_, [=]() { QStringList filters; diff --git a/src/details/handler/CCefClientDelegate_DisplayHandler.cpp b/src/details/handler/CCefClientDelegate_DisplayHandler.cpp index df295619..34a08874 100644 --- a/src/details/handler/CCefClientDelegate_DisplayHandler.cpp +++ b/src/details/handler/CCefClientDelegate_DisplayHandler.cpp @@ -86,7 +86,7 @@ CCefClientDelegate::titleChanged(CefRefPtr& browser, const CefString } void -CCefClientDelegate::faviconURLChanged(CefRefPtr browser, const std::vector& icon_urls) +CCefClientDelegate::faviconURLChanged(CefRefPtr& browser, const std::vector& icon_urls) { if (!IsValidBrowser(browser)) return; @@ -145,7 +145,7 @@ CCefClientDelegate::loadingProgressChanged(CefRefPtr& browser, doubl } bool -CCefClientDelegate::cursorChanged(CefRefPtr browser, +CCefClientDelegate::cursorChanged(CefRefPtr& browser, CefCursorHandle cursor, cef_cursor_type_t type, const CefCursorInfo& custom_cursor_info) diff --git a/src/details/handler/CCefClientDelegate_DownloadHandler.cpp b/src/details/handler/CCefClientDelegate_DownloadHandler.cpp index baf4f6b2..ff4e579a 100644 --- a/src/details/handler/CCefClientDelegate_DownloadHandler.cpp +++ b/src/details/handler/CCefClientDelegate_DownloadHandler.cpp @@ -10,10 +10,10 @@ #include "details/utils/ValueConvertor.h" void -CCefClientDelegate::onBeforeDownload(CefRefPtr browser, - CefRefPtr download_item, +CCefClientDelegate::onBeforeDownload(CefRefPtr& browser, + CefRefPtr& download_item, const CefString& suggested_name, - CefRefPtr callback) + CefRefPtr& callback) { FLog(); @@ -80,9 +80,9 @@ CCefClientDelegate::onBeforeDownload(CefRefPtr browser, } void -CCefClientDelegate::onDownloadUpdated(CefRefPtr browser, - CefRefPtr download_item, - CefRefPtr callback) +CCefClientDelegate::onDownloadUpdated(CefRefPtr& browser, + CefRefPtr& download_item, + CefRefPtr& callback) { FLog(); diff --git a/src/details/handler/CCefClientDelegate_DragHandler.cpp b/src/details/handler/CCefClientDelegate_DragHandler.cpp index b68f1efa..e43be296 100644 --- a/src/details/handler/CCefClientDelegate_DragHandler.cpp +++ b/src/details/handler/CCefClientDelegate_DragHandler.cpp @@ -7,8 +7,8 @@ #include "details/QCefViewPrivate.h" bool -CCefClientDelegate::onDragEnter(CefRefPtr browser, - CefRefPtr dragData, +CCefClientDelegate::onDragEnter(CefRefPtr& browser, + CefRefPtr& dragData, CefDragHandler::DragOperationsMask mask) { // Return false for default drag handling behavior or true to cancel the drag event. diff --git a/src/details/handler/CCefClientDelegate_JSDialogHandler.cpp b/src/details/handler/CCefClientDelegate_JSDialogHandler.cpp index 271c698d..17749405 100644 --- a/src/details/handler/CCefClientDelegate_JSDialogHandler.cpp +++ b/src/details/handler/CCefClientDelegate_JSDialogHandler.cpp @@ -12,12 +12,12 @@ #include "details/utils/ValueConvertor.h" bool -CCefClientDelegate::onJSDialog(CefRefPtr browser, +CCefClientDelegate::onJSDialog(CefRefPtr& browser, const CefString& origin_url, CefJSDialogHandler::JSDialogType dialog_type, const CefString& message_text, const CefString& default_prompt_text, - CefRefPtr callback, + CefRefPtr& callback, bool& suppress_message) { /// Called to run a JavaScript dialog. @@ -109,10 +109,10 @@ CCefClientDelegate::onJSDialog(CefRefPtr browser, } bool -CCefClientDelegate::onBeforeUnloadDialog(CefRefPtr browser, +CCefClientDelegate::onBeforeUnloadDialog(CefRefPtr& browser, const CefString& message_text, bool is_reload, - CefRefPtr callback) + CefRefPtr& callback) { /// Called to run a dialog asking the user if they want to leave a page. /// Return false to use the default dialog implementation. Return true if the @@ -139,7 +139,7 @@ CCefClientDelegate::onBeforeUnloadDialog(CefRefPtr browser, } void -CCefClientDelegate::onResetDialogState(CefRefPtr browser) +CCefClientDelegate::onResetDialogState(CefRefPtr& browser) { /// Called to cancel any pending dialogs and reset any saved dialog state. /// Will be called due to events like page navigation irregardless of whether @@ -156,7 +156,7 @@ CCefClientDelegate::onResetDialogState(CefRefPtr browser) } void -CCefClientDelegate::onDialogClosed(CefRefPtr browser) +CCefClientDelegate::onDialogClosed(CefRefPtr& browser) { /// Called when the dialog is closed. } diff --git a/src/details/handler/CCefClientDelegate_KeyboardHandler.cpp b/src/details/handler/CCefClientDelegate_KeyboardHandler.cpp index 4753b70c..055afb54 100644 --- a/src/details/handler/CCefClientDelegate_KeyboardHandler.cpp +++ b/src/details/handler/CCefClientDelegate_KeyboardHandler.cpp @@ -5,7 +5,7 @@ #include "details/QCefViewPrivate.h" bool -CCefClientDelegate::onPreKeyEvent(CefRefPtr browser, +CCefClientDelegate::onPreKeyEvent(CefRefPtr& browser, const CefKeyEvent& event, CefEventHandle os_event, bool* is_keyboard_shortcut) @@ -39,7 +39,7 @@ CCefClientDelegate::onPreKeyEvent(CefRefPtr browser, } bool -CCefClientDelegate::onKeyEvent(CefRefPtr browser, const CefKeyEvent& event, CefEventHandle os_event) +CCefClientDelegate::onKeyEvent(CefRefPtr& browser, const CefKeyEvent& event, CefEventHandle os_event) { #if defined(Q_OS_MACOS) // it seems Qt breaks the macOS shortcut key, so we need to fix it diff --git a/src/details/handler/CCefClientDelegate_LifeSpanHandler.cpp b/src/details/handler/CCefClientDelegate_LifeSpanHandler.cpp index 1442e148..242c1514 100644 --- a/src/details/handler/CCefClientDelegate_LifeSpanHandler.cpp +++ b/src/details/handler/CCefClientDelegate_LifeSpanHandler.cpp @@ -181,7 +181,7 @@ CCefClientDelegate::onAfterCreate(CefRefPtr& browser) } bool -CCefClientDelegate::doClose(CefRefPtr browser) +CCefClientDelegate::doClose(CefRefPtr& browser) { qDebug() << "destroy browser from native"; @@ -189,7 +189,7 @@ CCefClientDelegate::doClose(CefRefPtr browser) } bool -CCefClientDelegate::requestClose(CefRefPtr browser) +CCefClientDelegate::requestClose(CefRefPtr& browser) { qDebug() << "destroy browser request from web"; @@ -209,6 +209,6 @@ CCefClientDelegate::requestClose(CefRefPtr browser) } void -CCefClientDelegate::onBeforeClose(CefRefPtr browser) +CCefClientDelegate::onBeforeClose(CefRefPtr& browser) { } diff --git a/src/details/handler/CCefClientDelegate_RenderHandler.cpp b/src/details/handler/CCefClientDelegate_RenderHandler.cpp index ae199f00..5d23d9bb 100644 --- a/src/details/handler/CCefClientDelegate_RenderHandler.cpp +++ b/src/details/handler/CCefClientDelegate_RenderHandler.cpp @@ -10,7 +10,7 @@ // OSR mode bool -CCefClientDelegate::getRootScreenRect(CefRefPtr browser, CefRect& rect) +CCefClientDelegate::getRootScreenRect(CefRefPtr& browser, CefRect& rect) { if (!IsValidBrowser(browser)) { return false; @@ -39,7 +39,7 @@ CCefClientDelegate::getRootScreenRect(CefRefPtr browser, CefRect& re } void -CCefClientDelegate::getViewRect(CefRefPtr browser, CefRect& rect) +CCefClientDelegate::getViewRect(CefRefPtr& browser, CefRect& rect) { if (!IsValidBrowser(browser)) { rect.Set(0, 0, 1, 1); @@ -54,7 +54,7 @@ CCefClientDelegate::getViewRect(CefRefPtr browser, CefRect& rect) } bool -CCefClientDelegate::getScreenPoint(CefRefPtr browser, int viewX, int viewY, int& screenX, int& screenY) +CCefClientDelegate::getScreenPoint(CefRefPtr& browser, int viewX, int viewY, int& screenX, int& screenY) { if (!IsValidBrowser(browser)) return false; @@ -66,7 +66,7 @@ CCefClientDelegate::getScreenPoint(CefRefPtr browser, int viewX, int } bool -CCefClientDelegate::getScreenInfo(CefRefPtr browser, CefScreenInfo& screen_info) +CCefClientDelegate::getScreenInfo(CefRefPtr& browser, CefScreenInfo& screen_info) { if (!IsValidBrowser(browser)) return false; @@ -102,7 +102,7 @@ CCefClientDelegate::getScreenInfo(CefRefPtr browser, CefScreenInfo& } void -CCefClientDelegate::onPopupShow(CefRefPtr browser, bool show) +CCefClientDelegate::onPopupShow(CefRefPtr& browser, bool show) { if (!IsValidBrowser(browser)) return; @@ -111,7 +111,7 @@ CCefClientDelegate::onPopupShow(CefRefPtr browser, bool show) } void -CCefClientDelegate::onPopupSize(CefRefPtr browser, const CefRect& rect) +CCefClientDelegate::onPopupSize(CefRefPtr& browser, const CefRect& rect) { if (!IsValidBrowser(browser)) return; @@ -120,7 +120,7 @@ CCefClientDelegate::onPopupSize(CefRefPtr browser, const CefRect& re } void -CCefClientDelegate::onPaint(CefRefPtr browser, +CCefClientDelegate::onPaint(CefRefPtr& browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, const void* buffer, @@ -167,7 +167,7 @@ CCefClientDelegate::onAcceleratedPaint(CefRefPtr browser, } #else void -CCefClientDelegate::onAcceleratedPaint(CefRefPtr browser, +CCefClientDelegate::onAcceleratedPaint(CefRefPtr& browser, CefRenderHandler::PaintElementType type, const CefRenderHandler::RectList& dirtyRects, const CefAcceleratedPaintInfo& info) @@ -187,8 +187,8 @@ CCefClientDelegate::onAcceleratedPaint(CefRefPtr browser, #endif bool -CCefClientDelegate::startDragging(CefRefPtr browser, - CefRefPtr drag_data, +CCefClientDelegate::startDragging(CefRefPtr& browser, + CefRefPtr& drag_data, CefRenderHandler::DragOperationsMask allowed_ops, int x, int y) @@ -197,17 +197,17 @@ CCefClientDelegate::startDragging(CefRefPtr browser, } void -CCefClientDelegate::updateDragCursor(CefRefPtr browser, CefRenderHandler::DragOperation operation) +CCefClientDelegate::updateDragCursor(CefRefPtr& browser, CefRenderHandler::DragOperation operation) { } void -CCefClientDelegate::onScrollOffsetChanged(CefRefPtr browser, double x, double y) +CCefClientDelegate::onScrollOffsetChanged(CefRefPtr& browser, double x, double y) { } void -CCefClientDelegate::onImeCompositionRangeChanged(CefRefPtr browser, +CCefClientDelegate::onImeCompositionRangeChanged(CefRefPtr& browser, const CefRange& selected_range, const CefRenderHandler::RectList& character_bounds) { @@ -227,14 +227,14 @@ CCefClientDelegate::onImeCompositionRangeChanged(CefRefPtr browser, } void -CCefClientDelegate::onTextSelectionChanged(CefRefPtr browser, +CCefClientDelegate::onTextSelectionChanged(CefRefPtr& browser, const CefString& selected_text, const CefRange& selected_range) { } void -CCefClientDelegate::onVirtualKeyboardRequested(CefRefPtr browser, +CCefClientDelegate::onVirtualKeyboardRequested(CefRefPtr& browser, CefRenderHandler::TextInputMode input_mode) { } diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index d7137287..6963f934 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -4,7 +4,7 @@ include(FetchContent) FetchContent_Declare( CefViewCore GIT_REPOSITORY https://github.com/CefView/CefViewCore.git - GIT_TAG 4919e35e0b2330fc511ff3a1ebc3dbe71ad2702d + GIT_TAG 935b79cad6815a43163e3f3dbef6cefeb91acb86 ) # set CEF version to be used