diff --git a/third_party/libwebrtc/README.moz-ff-commit b/third_party/libwebrtc/README.moz-ff-commit index 8b7cd2c0d488e..96f0ed337c631 100644 --- a/third_party/libwebrtc/README.moz-ff-commit +++ b/third_party/libwebrtc/README.moz-ff-commit @@ -13329,3 +13329,6 @@ ed21d96e13 # MOZ_LIBWEBRTC_SRC=/home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src MOZ_LIBWEBRTC_COMMIT=mjfdev bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh # base of lastest vendoring edbaf57bd4 +# MOZ_LIBWEBRTC_SRC=/home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src MOZ_LIBWEBRTC_COMMIT=mjfdev bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh +# base of lastest vendoring +f8775cf269 diff --git a/third_party/libwebrtc/README.mozilla b/third_party/libwebrtc/README.mozilla index 142b2429ea86b..685dff2c776b2 100644 --- a/third_party/libwebrtc/README.mozilla +++ b/third_party/libwebrtc/README.mozilla @@ -8898,3 +8898,5 @@ libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwe libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-07-13T18:58:11.746777. # python3 vendor-libwebrtc.py --from-local /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src --commit mjfdev libwebrtc libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-07-13T18:58:53.750894. +# python3 vendor-libwebrtc.py --from-local /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src --commit mjfdev libwebrtc +libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-07-13T18:59:33.589540. 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 index 355bfacfbb891..bde91bd07bb0e 100644 --- a/third_party/libwebrtc/modules/desktop_capture/desktop_and_cursor_composer.cc +++ b/third_party/libwebrtc/modules/desktop_capture/desktop_and_cursor_composer.cc @@ -218,7 +218,7 @@ void DesktopAndCursorComposer::OnCaptureResult( !desktop_capturer_->IsOccluded(cursor_position_)) { DesktopVector relative_position = cursor_position_.subtract(frame->top_left()); -#if defined(WEBRTC_MAC) +#if defined(WEBRTC_MAC) || defined(CHROMEOS) // On OSX, the logical(DIP) and physical coordinates are used mixingly. // For example, the captured cursor has its size in physical pixels(2x) // and location in logical(DIP) pixels on Retina monitor. This will cause diff --git a/third_party/libwebrtc/modules/desktop_capture/desktop_frame.cc b/third_party/libwebrtc/modules/desktop_capture/desktop_frame.cc index 65f77212e9a97..66f750d4b3b31 100644 --- a/third_party/libwebrtc/modules/desktop_capture/desktop_frame.cc +++ b/third_party/libwebrtc/modules/desktop_capture/desktop_frame.cc @@ -112,7 +112,7 @@ DesktopRect DesktopFrame::rect() const { float DesktopFrame::scale_factor() const { float scale = 1.0f; -#if defined(WEBRTC_MAC) +#if defined(WEBRTC_MAC) || defined(CHROMEOS) // At least on Windows the logical and physical pixel are the same // See http://crbug.com/948362. if (!dpi().is_zero() && dpi().x() == dpi().y())