commit 2979f70dd960752cdaf91248c64bf97f2af472ed
parent 8b8cc098e2ebff59de0a6a2020f85cd6c8ec5b70
Author: Dan Baker <dbaker@mozilla.com>
Date: Tue, 2 Dec 2025 00:26:43 -0700
Bug 2000941 - Vendor libwebrtc from a4f0e9cabe
Upstream commit: https://webrtc.googlesource.com/src/+/a4f0e9cabe9fa8d92c885e42c25761943668f993
Remove spammy "Cursor might be flickering" logs
Chrome Remote Desktop stores the previous frame for topoff
extrapolations, and in case of multi-monitor/multi-stream, there are
multiple DesktopAndCursorComposers running, so the end result is that
the CRD host logs will be spammed by "Cursor might be flickering"
entries once the user enables relative mouse mode.
Per discussion in the bug, the author agrees to remove the log, so this
CL removes it.
Bug: chromium:446750553
Change-Id: I55617975712ffc174bb76be3417d8e8dc02df73e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/411680
Auto-Submit: Yuwei Huang <yuweih@chromium.org>
Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Commit-Queue: Mark Foltz <mfoltz@chromium.org>
Reviewed-by: Mark Foltz <mfoltz@chromium.org>
Cr-Commit-Position: refs/heads/main@{#45734}
Diffstat:
2 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor
@@ -1,4 +1,4 @@
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T07:24:11.019655+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T07:26:29.101846+00:00.
# base of lastest vendoring
-4509dba6ea
+a4f0e9cabe
diff --git a/third_party/libwebrtc/modules/desktop_capture/desktop_and_cursor_composer.cc b/third_party/libwebrtc/modules/desktop_capture/desktop_and_cursor_composer.cc
@@ -30,17 +30,6 @@ namespace webrtc {
namespace {
-// Global reference counter which is increased when a DesktopFrameWithCursor is
-// created and decreased when the same object is destructed. Only used for
-// debugging purposes to ensure that we never end up in state where
-// `g_ref_count` is larger than one since that could indicate a flickering
-// cursor (cursor-less version of the frame is not restored properly and it can
-// can lead to visible trails of old cursors).
-// See https://crbug.com/1421656#c99 for more details.
-int g_ref_count = 0;
-
-uint64_t g_num_flicker_warnings = 0;
-
// Helper function that blends one image into another. Source image must be
// pre-multiplied with the alpha channel. Destination is assumed to be opaque.
void AlphaBlend(uint8_t* dest,
@@ -111,7 +100,6 @@ DesktopFrameWithCursor::DesktopFrameWithCursor(
frame->data(),
frame->shared_memory()),
original_frame_(std::move(frame)) {
- ++g_ref_count;
MoveFrameInfoFrom(original_frame_.get());
DesktopVector image_pos = position.subtract(cursor.hotspot());
@@ -154,11 +142,6 @@ DesktopFrameWithCursor::DesktopFrameWithCursor(
}
DesktopFrameWithCursor::~DesktopFrameWithCursor() {
- if (--g_ref_count > 0) {
- ++g_num_flicker_warnings;
- RTC_LOG(LS_WARNING) << "Cursor might be flickering; number of warnings="
- << g_num_flicker_warnings;
- }
// Restore original content of the frame.
if (restore_frame_) {
DesktopRect target_rect = DesktopRect::MakeSize(restore_frame_->size());
