diff --git a/Dotnet/Overlay/Cef/OffScreenBrowser.cs b/Dotnet/Overlay/Cef/OffScreenBrowser.cs index 30320f48..2e45af18 100644 --- a/Dotnet/Overlay/Cef/OffScreenBrowser.cs +++ b/Dotnet/Overlay/Cef/OffScreenBrowser.cs @@ -26,7 +26,7 @@ namespace VRCX private static readonly Logger logger = LogManager.GetCurrentClassLogger(); - public OffScreenBrowser(string address, int width, int height, IRequestContext requestContext = null) + public OffScreenBrowser(string address, int width, int height) : base(address, automaticallyCreateBrowser: false) { var windowInfo = new WindowInfo(); @@ -42,7 +42,7 @@ namespace VRCX WindowlessFrameRate = 60 }; - CreateBrowser(windowInfo, browserSettings, requestContext); + CreateBrowser(windowInfo, browserSettings); Size = new System.Drawing.Size(width, height); RenderHandler = this; diff --git a/Dotnet/Overlay/Cef/OffScreenBrowserLegacy.cs b/Dotnet/Overlay/Cef/OffScreenBrowserLegacy.cs index d6b177c3..64c388b1 100644 --- a/Dotnet/Overlay/Cef/OffScreenBrowserLegacy.cs +++ b/Dotnet/Overlay/Cef/OffScreenBrowserLegacy.cs @@ -24,7 +24,7 @@ namespace VRCX private int _width; private int _height; - public OffScreenBrowserLegacy(string address, int width, int height, IRequestContext requestContext = null) + public OffScreenBrowserLegacy(string address, int width, int height) : base(address, automaticallyCreateBrowser: false) { _paintBufferLock = new ReaderWriterLockSlim(); @@ -42,7 +42,7 @@ namespace VRCX WindowlessFrameRate = 24 }; - CreateBrowser(windowInfo, browserSettings, requestContext); + CreateBrowser(windowInfo, browserSettings); Size = new System.Drawing.Size(width, height); RenderHandler = this; diff --git a/Dotnet/Overlay/Cef/VRCXVRCef.cs b/Dotnet/Overlay/Cef/VRCXVRCef.cs index a6692cef..350adc89 100644 --- a/Dotnet/Overlay/Cef/VRCXVRCef.cs +++ b/Dotnet/Overlay/Cef/VRCXVRCef.cs @@ -33,15 +33,7 @@ namespace VRCX private static readonly float[] _rotationRight = { -90f * (float)(Math.PI / 180f), -90f * (float)(Math.PI / 180f), -90f * (float)(Math.PI / 180f) }; private static OffScreenBrowser _wristOverlay; private static OffScreenBrowser _hmdOverlay; - - private static readonly IRequestContext VrOverlayRequestContext = new RequestContext( - new RequestContextSettings - { - CachePath = string.Empty, - PersistSessionCookies = false, - PersistUserPreferences = false - } - ); + private readonly List _deviceList; private readonly ReaderWriterLockSlim _deviceListLock; private bool _active; @@ -205,15 +197,13 @@ namespace VRCX _wristOverlay = new OffScreenBrowser( Program.LaunchDebug ? "http://localhost:9000/vr.html?wrist" : "file://vrcx/vr.html?wrist", 512, - 512, - VrOverlayRequestContext + 512 ); _hmdOverlay = new OffScreenBrowser( Program.LaunchDebug ? "http://localhost:9000/vr.html?hmd" : "file://vrcx/vr.html?hmd", 1024, - 1024, - VrOverlayRequestContext + 1024 ); while (_thread != null) diff --git a/Dotnet/Overlay/Cef/VRCXVRLegacy.cs b/Dotnet/Overlay/Cef/VRCXVRLegacy.cs index 0b5c90a5..f14896cd 100644 --- a/Dotnet/Overlay/Cef/VRCXVRLegacy.cs +++ b/Dotnet/Overlay/Cef/VRCXVRLegacy.cs @@ -33,15 +33,7 @@ namespace VRCX private static readonly float[] _rotationRight = { -90f * (float)(Math.PI / 180f), -90f * (float)(Math.PI / 180f), -90f * (float)(Math.PI / 180f) }; private static OffScreenBrowserLegacy _wristOverlay; private static OffScreenBrowserLegacy _hmdOverlay; - - private static readonly IRequestContext VrOverlayRequestContext = new RequestContext( - new RequestContextSettings - { - CachePath = string.Empty, - PersistSessionCookies = false, - PersistUserPreferences = false - } - ); + private readonly List _deviceList; private readonly ReaderWriterLockSlim _deviceListLock; private bool _active; @@ -203,15 +195,13 @@ namespace VRCX _wristOverlay = new OffScreenBrowserLegacy( Program.LaunchDebug ? "http://localhost:9000/vr.html?wrist" : "file://vrcx/vr.html?wrist", 512, - 512, - VrOverlayRequestContext + 512 ); _hmdOverlay = new OffScreenBrowserLegacy( Program.LaunchDebug ? "http://localhost:9000/vr.html?hmd" : "file://vrcx/vr.html?hmd", 1024, - 1024, - VrOverlayRequestContext + 1024 ); while (_thread != null)