tor-browser

commit b0dc617b7c64b3146378a50637c7572d27f34475
parent 61dd0a7d681f8fecae5cbdf7af7779e5ac116aef
Author: june wilde <junewilde@pm.me>
Date:   Wed,  2 Oct 2024 20:19:01 -0700

BB 42758: Fix WebRTC build errors.

Diffstat:
M
third_party/abseil-cpp/absl/base/internal/thread_identity.cc
 | 
2
+-
M
third_party/abseil-cpp/absl/base/internal/thread_identity.h
 | 
2
+-
M
third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc
 | 
8
+++-----
M
third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc
 | 
2
+-
M
third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.h
 | 
2
+-

5 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/third_party/abseil-cpp/absl/base/internal/thread_identity.cc b/third_party/abseil-cpp/absl/base/internal/thread_identity.cc
@@ -14,7 +14,7 @@
 
 #include "absl/base/internal/thread_identity.h"
 
-#if !defined(_WIN32) || defined(__MINGW32__)
+#if !defined(_WIN32)
 #include <pthread.h>
 #ifndef __wasi__
 // WASI does not provide this header, either way we disable use
diff --git a/third_party/abseil-cpp/absl/base/internal/thread_identity.h b/third_party/abseil-cpp/absl/base/internal/thread_identity.h
@@ -217,7 +217,7 @@ void ClearCurrentThreadIdentity();
 #error ABSL_THREAD_IDENTITY_MODE cannot be directly set
 #elif defined(ABSL_FORCE_THREAD_IDENTITY_MODE)
 #define ABSL_THREAD_IDENTITY_MODE ABSL_FORCE_THREAD_IDENTITY_MODE
-#elif defined(_WIN32) && !defined(__MINGW32__)
+#elif defined(_WIN32)
 #define ABSL_THREAD_IDENTITY_MODE ABSL_THREAD_IDENTITY_MODE_USE_CPP11
 #elif defined(__APPLE__) && defined(ABSL_HAVE_THREAD_LOCAL)
 #define ABSL_THREAD_IDENTITY_MODE ABSL_THREAD_IDENTITY_MODE_USE_CPP11
diff --git a/third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc b/third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#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>
@@ -253,9 +253,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);
     }
   }
diff --git a/third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc b/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>
 
diff --git a/third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.h b/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>