morgan pushed to branch base-browser-128.4.0esr-14.0-1 at The Tor Project / Applications / Tor Browser

Commits: efcadd2e by june wilde at 2024-10-31T20:55:14+00:00 Bug 373 - reenable webrtc builds

- - - - -

3 changed files:

- third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc - third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc - third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.h

Changes:

===================================== third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc ===================================== @@ -10,9 +10,9 @@

#include "modules/desktop_capture/win/wgc_capture_session.h"

-#include <DispatcherQueue.h> +#include <dispatcherqueue.h> #include <windows.graphics.capture.interop.h> -#include <windows.graphics.directX.direct3d11.interop.h> +#include <windows.graphics.directx.direct3d11.interop.h> #include <windows.graphics.h> #include <wrl/client.h> #include <wrl/event.h> @@ -181,9 +181,7 @@ HRESULT WgcCaptureSession::StartCapture(const DesktopCaptureOptions& options) {

if (!options.prefer_cursor_embedded()) { ComPtrABI::Windows::Graphics::Capture::IGraphicsCaptureSession2 session2; - if (SUCCEEDED(session_->QueryInterface( - ABI::Windows::Graphics::Capture::IID_IGraphicsCaptureSession2, - &session2))) { + if (SUCCEEDED(session_->QueryInterface(IID_PPV_ARGS(&session2)))) { session2->put_IsCursorCaptureEnabled(false); } } @@ -367,7 +365,7 @@ HRESULT WgcCaptureSession::ProcessFrame() { return hr; }

- ComPtrWindows::Graphics::DirectX::Direct3D11::IDirect3DDxgiInterfaceAccess + ComPtrABI::Windows::Graphics::DirectX::Direct3D11::IDirect3DDxgiInterfaceAccess direct3DDxgiInterfaceAccess; hr = d3d_surface->QueryInterface(IID_PPV_ARGS(&direct3DDxgiInterfaceAccess)); if (FAILED(hr)) {

===================================== third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc ===================================== @@ -10,7 +10,7 @@

#include "modules/desktop_capture/win/wgc_capturer_win.h"

-#include <DispatcherQueue.h> +#include <dispatcherqueue.h> #include <windows.foundation.metadata.h> #include <windows.graphics.capture.h>

===================================== third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.h ===================================== @@ -11,7 +11,7 @@ #ifndef MODULES_DESKTOP_CAPTURE_WIN_WGC_CAPTURER_WIN_H_ #define MODULES_DESKTOP_CAPTURE_WIN_WGC_CAPTURER_WIN_H_

-#include <DispatcherQueue.h> +#include <dispatcherqueue.h> #include <d3d11.h> #include <wrl/client.h>

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/efcadd2e...