Skip to content

Commit d1eb321

Browse files
nvborisenkonvborisenko
committed
Move Emulation
1 parent a5969b1 commit d1eb321

File tree

3 files changed

+56
-55
lines changed

3 files changed

+56
-55
lines changed

‎dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -23,45 +23,6 @@
2323
namespace OpenQA.Selenium.BiDi.Communication.Json;
2424

2525
#region https://github.com/dotnet/runtime/issues/72604
26-
[JsonSerializable(typeof(Script.EvaluateResultSuccess))]
27-
[JsonSerializable(typeof(Script.EvaluateResultException))]
28-
29-
[JsonSerializable(typeof(Script.NumberRemoteValue))]
30-
[JsonSerializable(typeof(Script.BooleanRemoteValue))]
31-
[JsonSerializable(typeof(Script.BigIntRemoteValue))]
32-
[JsonSerializable(typeof(Script.StringRemoteValue))]
33-
[JsonSerializable(typeof(Script.NullRemoteValue))]
34-
[JsonSerializable(typeof(Script.UndefinedRemoteValue))]
35-
[JsonSerializable(typeof(Script.SymbolRemoteValue))]
36-
[JsonSerializable(typeof(Script.ArrayRemoteValue))]
37-
[JsonSerializable(typeof(Script.ObjectRemoteValue))]
38-
[JsonSerializable(typeof(Script.FunctionRemoteValue))]
39-
[JsonSerializable(typeof(Script.RegExpRemoteValue))]
40-
[JsonSerializable(typeof(Script.DateRemoteValue))]
41-
[JsonSerializable(typeof(Script.MapRemoteValue))]
42-
[JsonSerializable(typeof(Script.SetRemoteValue))]
43-
[JsonSerializable(typeof(Script.WeakMapRemoteValue))]
44-
[JsonSerializable(typeof(Script.WeakSetRemoteValue))]
45-
[JsonSerializable(typeof(Script.GeneratorRemoteValue))]
46-
[JsonSerializable(typeof(Script.ErrorRemoteValue))]
47-
[JsonSerializable(typeof(Script.ProxyRemoteValue))]
48-
[JsonSerializable(typeof(Script.PromiseRemoteValue))]
49-
[JsonSerializable(typeof(Script.TypedArrayRemoteValue))]
50-
[JsonSerializable(typeof(Script.ArrayBufferRemoteValue))]
51-
[JsonSerializable(typeof(Script.NodeListRemoteValue))]
52-
[JsonSerializable(typeof(Script.HtmlCollectionRemoteValue))]
53-
[JsonSerializable(typeof(Script.NodeRemoteValue))]
54-
[JsonSerializable(typeof(Script.WindowProxyRemoteValue))]
55-
56-
[JsonSerializable(typeof(Script.WindowRealmInfo))]
57-
[JsonSerializable(typeof(Script.DedicatedWorkerRealmInfo))]
58-
[JsonSerializable(typeof(Script.SharedWorkerRealmInfo))]
59-
[JsonSerializable(typeof(Script.ServiceWorkerRealmInfo))]
60-
[JsonSerializable(typeof(Script.WorkerRealmInfo))]
61-
[JsonSerializable(typeof(Script.PaintWorkletRealmInfo))]
62-
[JsonSerializable(typeof(Script.AudioWorkletRealmInfo))]
63-
[JsonSerializable(typeof(Script.WorkletRealmInfo))]
64-
6526
[JsonSerializable(typeof(Log.GenericLogEntry))]
6627
[JsonSerializable(typeof(Log.ConsoleLogEntry))]
6728
[JsonSerializable(typeof(Log.JavascriptLogEntry))]
@@ -70,12 +31,6 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
7031
[JsonSerializable(typeof(Command))]
7132
[JsonSerializable(typeof(EmptyResult))]
7233

73-
74-
75-
76-
77-
78-
7934
[JsonSerializable(typeof(Input.PerformActionsCommand))]
8035
[JsonSerializable(typeof(Input.ReleaseActionsCommand))]
8136
[JsonSerializable(typeof(Input.SetFilesCommand))]
@@ -84,12 +39,5 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
8439
[JsonSerializable(typeof(IEnumerable<Input.INoneSourceAction>))]
8540
[JsonSerializable(typeof(IEnumerable<Input.IWheelSourceAction>))]
8641

87-
[JsonSerializable(typeof(Emulation.SetTimezoneOverrideCommand))]
88-
[JsonSerializable(typeof(Emulation.SetUserAgentOverrideCommand))]
89-
[JsonSerializable(typeof(Emulation.SetLocaleOverrideCommand))]
90-
[JsonSerializable(typeof(Emulation.SetForcedColorsModeThemeOverrideCommand))]
91-
[JsonSerializable(typeof(Emulation.SetScriptingEnabledCommand))]
92-
[JsonSerializable(typeof(Emulation.SetScreenOrientationOverrideCommand))]
93-
[JsonSerializable(typeof(Emulation.SetGeolocationOverrideCommand))]
9442

9543
internal partial class BiDiJsonSerializerContext : JsonSerializerContext;

‎dotnet/src/webdriver/BiDi/Emulation/EmulationModule.cs‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
using System.Text.Json.Serialization;
2222
using System.Threading.Tasks;
2323
using OpenQA.Selenium.BiDi.Communication;
24-
using OpenQA.Selenium.BiDi.Communication.Json;
2524

2625
namespace OpenQA.Selenium.BiDi.Emulation;
2726

2827
public sealed class EmulationModule : Module
2928
{
30-
private JsonSerializerContext _jsonContext = null!;
29+
private EmulationModuleJsonSerializerContext _jsonContext = null!;
3130

3231
public async Task<EmptyResult> SetTimezoneOverrideAsync(string? timezone, SetTimezoneOverrideOptions? options = null)
3332
{
@@ -96,6 +95,19 @@ public async Task<EmptyResult> SetGeolocationPositionErrorOverrideAsync(SetGeolo
9695

9796
protected internal override void Initialize(JsonSerializerOptions options)
9897
{
99-
_jsonContext = new BiDiJsonSerializerContext(options);
98+
_jsonContext = new(options);
10099
}
101100
}
101+
102+
[JsonSerializable(typeof(Command))]
103+
[JsonSerializable(typeof(EmptyResult))]
104+
105+
[JsonSerializable(typeof(SetTimezoneOverrideCommand))]
106+
[JsonSerializable(typeof(SetUserAgentOverrideCommand))]
107+
[JsonSerializable(typeof(SetLocaleOverrideCommand))]
108+
[JsonSerializable(typeof(SetForcedColorsModeThemeOverrideCommand))]
109+
[JsonSerializable(typeof(SetScriptingEnabledCommand))]
110+
[JsonSerializable(typeof(SetScreenOrientationOverrideCommand))]
111+
[JsonSerializable(typeof(SetGeolocationOverrideCommand))]
112+
113+
internal partial class EmulationModuleJsonSerializerContext : JsonSerializerContext;

‎dotnet/src/webdriver/BiDi/Script/ScriptModule.cs‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,47 @@ protected internal override void Initialize(JsonSerializerOptions options)
117117
}
118118
}
119119

120+
#region https://github.com/dotnet/runtime/issues/72604
121+
[JsonSerializable(typeof(Script.EvaluateResultSuccess))]
122+
[JsonSerializable(typeof(Script.EvaluateResultException))]
123+
124+
[JsonSerializable(typeof(Script.NumberRemoteValue))]
125+
[JsonSerializable(typeof(Script.BooleanRemoteValue))]
126+
[JsonSerializable(typeof(Script.BigIntRemoteValue))]
127+
[JsonSerializable(typeof(Script.StringRemoteValue))]
128+
[JsonSerializable(typeof(Script.NullRemoteValue))]
129+
[JsonSerializable(typeof(Script.UndefinedRemoteValue))]
130+
[JsonSerializable(typeof(Script.SymbolRemoteValue))]
131+
[JsonSerializable(typeof(Script.ArrayRemoteValue))]
132+
[JsonSerializable(typeof(Script.ObjectRemoteValue))]
133+
[JsonSerializable(typeof(Script.FunctionRemoteValue))]
134+
[JsonSerializable(typeof(Script.RegExpRemoteValue))]
135+
[JsonSerializable(typeof(Script.DateRemoteValue))]
136+
[JsonSerializable(typeof(Script.MapRemoteValue))]
137+
[JsonSerializable(typeof(Script.SetRemoteValue))]
138+
[JsonSerializable(typeof(Script.WeakMapRemoteValue))]
139+
[JsonSerializable(typeof(Script.WeakSetRemoteValue))]
140+
[JsonSerializable(typeof(Script.GeneratorRemoteValue))]
141+
[JsonSerializable(typeof(Script.ErrorRemoteValue))]
142+
[JsonSerializable(typeof(Script.ProxyRemoteValue))]
143+
[JsonSerializable(typeof(Script.PromiseRemoteValue))]
144+
[JsonSerializable(typeof(Script.TypedArrayRemoteValue))]
145+
[JsonSerializable(typeof(Script.ArrayBufferRemoteValue))]
146+
[JsonSerializable(typeof(Script.NodeListRemoteValue))]
147+
[JsonSerializable(typeof(Script.HtmlCollectionRemoteValue))]
148+
[JsonSerializable(typeof(Script.NodeRemoteValue))]
149+
[JsonSerializable(typeof(Script.WindowProxyRemoteValue))]
150+
151+
[JsonSerializable(typeof(Script.WindowRealmInfo))]
152+
[JsonSerializable(typeof(Script.DedicatedWorkerRealmInfo))]
153+
[JsonSerializable(typeof(Script.SharedWorkerRealmInfo))]
154+
[JsonSerializable(typeof(Script.ServiceWorkerRealmInfo))]
155+
[JsonSerializable(typeof(Script.WorkerRealmInfo))]
156+
[JsonSerializable(typeof(Script.PaintWorkletRealmInfo))]
157+
[JsonSerializable(typeof(Script.AudioWorkletRealmInfo))]
158+
[JsonSerializable(typeof(Script.WorkletRealmInfo))]
159+
#endregion
160+
120161
[JsonSerializable(typeof(Command))]
121162
[JsonSerializable(typeof(EmptyResult))]
122163

0 commit comments

Comments
 (0)