From ad0e0e737f43e863dc98a0ebb42ab21cb20fcb3f Mon Sep 17 00:00:00 2001 From: elvissteinjr Date: Sat, 13 Aug 2022 04:11:50 +0200 Subject: [PATCH] Fix OnAcceleratedPaint2() not being called when there's no new texture --- libcef_dll/cpptoc/render_handler_cpptoc.cc | 6 ++---- libcef_dll/ctocpp/render_handler_ctocpp.cc | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libcef_dll/cpptoc/render_handler_cpptoc.cc b/libcef_dll/cpptoc/render_handler_cpptoc.cc index 19fe8da61..ae7def22f 100644 --- a/libcef_dll/cpptoc/render_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/render_handler_cpptoc.cc @@ -339,8 +339,6 @@ render_handler_on_accelerated_paint2(struct _cef_render_handler_t* self, int new_texture) { shutdown_checker::AssertNotShutdown(); - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - DCHECK(self); if (!self) return; @@ -353,8 +351,8 @@ render_handler_on_accelerated_paint2(struct _cef_render_handler_t* self, if (dirtyRectsCount > 0 && !dirtyRects) return; // Verify param: shared_handle; type: simple_byaddr - DCHECK(shared_handle); - if (!shared_handle) + DCHECK(!new_texture || shared_handle); + if (new_texture && !shared_handle) return; // Translate param: dirtyRects; type: simple_vec_byref_const diff --git a/libcef_dll/ctocpp/render_handler_ctocpp.cc b/libcef_dll/ctocpp/render_handler_ctocpp.cc index 1dd1a340b..aa94f90be 100644 --- a/libcef_dll/ctocpp/render_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/render_handler_ctocpp.cc @@ -277,15 +277,13 @@ void CefRenderHandlerCToCpp::OnAcceleratedPaint2(CefRefPtr browser, if (CEF_MEMBER_MISSING(_struct, on_accelerated_paint2)) return; - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - // Verify param: browser; type: refptr_diff DCHECK(browser.get()); if (!browser.get()) return; // Verify param: shared_handle; type: simple_byaddr - DCHECK(shared_handle); - if (!shared_handle) + DCHECK(!new_texture || shared_handle); + if (new_texture && !shared_handle) return; // Translate param: dirtyRects; type: simple_vec_byref_const