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

Commits:

3 changed files:

Changes:

  • third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc
    ... ... @@ -10,9 +10,9 @@
    10 10
     
    
    11 11
     #include "modules/desktop_capture/win/wgc_capture_session.h"
    
    12 12
     
    
    13
    -#include <DispatcherQueue.h>
    
    13
    +#include <dispatcherqueue.h>
    
    14 14
     #include <windows.graphics.capture.interop.h>
    
    15
    -#include <windows.graphics.directX.direct3d11.interop.h>
    
    15
    +#include <windows.graphics.directx.direct3d11.interop.h>
    
    16 16
     #include <windows.graphics.h>
    
    17 17
     #include <wrl/client.h>
    
    18 18
     #include <wrl/event.h>
    
    ... ... @@ -181,9 +181,7 @@ HRESULT WgcCaptureSession::StartCapture(const DesktopCaptureOptions& options) {
    181 181
     
    
    182 182
       if (!options.prefer_cursor_embedded()) {
    
    183 183
         ComPtr<ABI::Windows::Graphics::Capture::IGraphicsCaptureSession2> session2;
    
    184
    -    if (SUCCEEDED(session_->QueryInterface(
    
    185
    -            ABI::Windows::Graphics::Capture::IID_IGraphicsCaptureSession2,
    
    186
    -            &session2))) {
    
    184
    +    if (SUCCEEDED(session_->QueryInterface(IID_PPV_ARGS(&session2)))) {
    
    187 185
           session2->put_IsCursorCaptureEnabled(false);
    
    188 186
         }
    
    189 187
       }
    
    ... ... @@ -367,7 +365,7 @@ HRESULT WgcCaptureSession::ProcessFrame() {
    367 365
         return hr;
    
    368 366
       }
    
    369 367
     
    
    370
    -  ComPtr<Windows::Graphics::DirectX::Direct3D11::IDirect3DDxgiInterfaceAccess>
    
    368
    +  ComPtr<ABI::Windows::Graphics::DirectX::Direct3D11::IDirect3DDxgiInterfaceAccess>
    
    371 369
           direct3DDxgiInterfaceAccess;
    
    372 370
       hr = d3d_surface->QueryInterface(IID_PPV_ARGS(&direct3DDxgiInterfaceAccess));
    
    373 371
       if (FAILED(hr)) {
    

  • third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc
    ... ... @@ -10,7 +10,7 @@
    10 10
     
    
    11 11
     #include "modules/desktop_capture/win/wgc_capturer_win.h"
    
    12 12
     
    
    13
    -#include <DispatcherQueue.h>
    
    13
    +#include <dispatcherqueue.h>
    
    14 14
     #include <windows.foundation.metadata.h>
    
    15 15
     #include <windows.graphics.capture.h>
    
    16 16
     
    

  • third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.h
    ... ... @@ -11,7 +11,7 @@
    11 11
     #ifndef MODULES_DESKTOP_CAPTURE_WIN_WGC_CAPTURER_WIN_H_
    
    12 12
     #define MODULES_DESKTOP_CAPTURE_WIN_WGC_CAPTURER_WIN_H_
    
    13 13
     
    
    14
    -#include <DispatcherQueue.h>
    
    14
    +#include <dispatcherqueue.h>
    
    15 15
     #include <d3d11.h>
    
    16 16
     #include <wrl/client.h>
    
    17 17