Hold json context per module

Author: nvborisenko

dotnet/src/webdriver/BiDi/BiDi.cs

@@ -55,7 +55,7 @@ internal Session.SessionModule SessionModule
             if (_sessionModule is not null) return _sessionModule;
             lock (_moduleLock)
             {
-                _sessionModule ??= Module.Create<Session.SessionModule>(_broker);
+                _sessionModule ??= Module.Create<Session.SessionModule>(this, _broker);
             }
             return _sessionModule;
         }
@@ -68,7 +68,7 @@ public BrowsingContext.BrowsingContextModule BrowsingContext
             if (_browsingContextModule is not null) return _browsingContextModule;
             lock (_moduleLock)
             {
-                _browsingContextModule ??= Module.Create<BrowsingContext.BrowsingContextModule>(_broker);
+                _browsingContextModule ??= Module.Create<BrowsingContext.BrowsingContextModule>(this, _broker);
             }
             return _browsingContextModule;
         }
@@ -81,7 +81,7 @@ public Browser.BrowserModule Browser
             if (_browserModule is not null) return _browserModule;
             lock (_moduleLock)
             {
-                _browserModule ??= Module.Create<Browser.BrowserModule>(_broker);
+                _browserModule ??= Module.Create<Browser.BrowserModule>(this, _broker);
             }
             return _browserModule;
         }
@@ -94,7 +94,7 @@ public Network.NetworkModule Network
             if (_networkModule is not null) return _networkModule;
             lock (_moduleLock)
             {
-                _networkModule ??= Module.Create<Network.NetworkModule>(_broker);
+                _networkModule ??= Module.Create<Network.NetworkModule>(this, _broker);
             }
             return _networkModule;
         }
@@ -107,7 +107,7 @@ internal Input.InputModule InputModule
             if (_inputModule is not null) return _inputModule;
             lock (_moduleLock)
             {
-                _inputModule ??= Module.Create<Input.InputModule>(_broker);
+                _inputModule ??= Module.Create<Input.InputModule>(this, _broker);
             }
             return _inputModule;
         }
@@ -120,7 +120,7 @@ public Script.ScriptModule Script
             if (_scriptModule is not null) return _scriptModule;
             lock (_moduleLock)
             {
-                _scriptModule ??= Module.Create<Script.ScriptModule>(_broker);
+                _scriptModule ??= Module.Create<Script.ScriptModule>(this, _broker);
             }
             return _scriptModule;
         }
@@ -133,7 +133,7 @@ public Log.LogModule Log
             if (_logModule is not null) return _logModule;
             lock (_moduleLock)
             {
-                _logModule ??= Module.Create<Log.LogModule>(_broker);
+                _logModule ??= Module.Create<Log.LogModule>(this, _broker);
             }
             return _logModule;
         }
@@ -146,7 +146,7 @@ public Storage.StorageModule Storage
             if (_storageModule is not null) return _storageModule;
             lock (_moduleLock)
             {
-                _storageModule ??= Module.Create<Storage.StorageModule>(_broker);
+                _storageModule ??= Module.Create<Storage.StorageModule>(this, _broker);
             }
             return _storageModule;
         }
@@ -159,7 +159,7 @@ public WebExtension.WebExtensionModule WebExtension
             if (_webExtensionModule is not null) return _webExtensionModule;
             lock (_moduleLock)
             {
-                _webExtensionModule ??= Module.Create<WebExtension.WebExtensionModule>(_broker);
+                _webExtensionModule ??= Module.Create<WebExtension.WebExtensionModule>(this, _broker);
             }
             return _webExtensionModule;
         }
@@ -172,7 +172,7 @@ public Emulation.EmulationModule Emulation
             if (_emulationModule is not null) return _emulationModule;
             lock (_moduleLock)
             {
-                _emulationModule ??= Module.Create<Emulation.EmulationModule>(_broker);
+                _emulationModule ??= Module.Create<Emulation.EmulationModule>(this, _broker);
             }
             return _emulationModule;
         }

dotnet/src/webdriver/BiDi/Browser/BrowserModule.cs

@@ -77,7 +77,7 @@ public async Task<EmptyResult> SetDownloadBehaviorDeniedAsync(SetDownloadBehavio
         return await Broker.ExecuteCommandAsync<SetDownloadBehaviorCommand, EmptyResult>(new SetDownloadBehaviorCommand(@params), options, JsonContext).ConfigureAwait(false);
     }
 
-    protected internal override JsonSerializerContext ConfigureJson(JsonSerializerOptions options)
+    protected internal override JsonSerializerContext Initialize(JsonSerializerOptions options)
     {
         return new BrowserModuleJsonSerializerContext(options);
     }