[tbb-commits] [Git][tpo/applications/mullvad-browser][mullvad-browser-128.4.0esr-14.5-1] 2 commits: Bug 373 - reenable webrtc builds

[morgan (@morgan)]

morgan pushed to branch mullvad-browser-128.4.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser


Commits:
4dc1a0a0 by june wilde at 2024-10-31T18:35:39+00:00
Bug 373 - reenable webrtc builds

- - - - -
7e34aa7e by june wilde at 2024-10-31T18:35:39+00:00
fixup! MB 320: Temporarily disable WebRTC and WDBA on Windows.

- - - - -


4 changed files:

- mozconfig-windows-x86_64
- 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:

=====================================
mozconfig-windows-x86_64
=====================================
@@ -23,5 +23,4 @@ ac_add_options --disable-notification-server
 ac_add_options --disable-eme
 
 # tor-browser#320: Temporarily disable until we resolve the mingw problems.
-ac_add_options --disable-webrtc
 ac_add_options --disable-default-browser-agent


=====================================
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()) {
     ComPtr<ABI::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;
   }
 
-  ComPtr<Windows::Graphics::DirectX::Direct3D11::IDirect3DDxgiInterfaceAccess>
+  ComPtr<ABI::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/mullvad-browser/-/compare/60885fba73491dc2cee6a6acc686cb3ce00f1399...7e34aa7e4b80a8cd81f9a1cdefe497f94478f651

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/60885fba73491dc2cee6a6acc686cb3ce00f1399...7e34aa7e4b80a8cd81f9a1cdefe497f94478f651
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20241031/3c8f0859/attachment-0001.htm>