Decouple Realm from FrameManager

Author: kblok

lib/PuppeteerSharp/Cdp/CdpFrame.cs

@@ -317,13 +317,13 @@ internal void UpdateClient(CDPSession client, bool keepWorlds = false)
             MainRealm = new IsolatedWorld(
                 this,
                 null,
-                FrameManager.TimeoutSettings,
+                Page.DefaultTimeout,
                 true);
 
             IsolatedRealm = new IsolatedWorld(
                 this,
                 null,
-                FrameManager.TimeoutSettings,
+                Page.DefaultTimeout,
                 false);
         }
         else

lib/PuppeteerSharp/Cdp/CdpWebWorker.cs

@@ -50,7 +50,7 @@ internal CdpWebWorker(
         _id = targetId;
         Client = client;
         _targetType = targetType;
-        World = new IsolatedWorld(null, this, new TimeoutSettings(), true);
+        World = new IsolatedWorld(null, this, Puppeteer.DefaultTimeout, true);
         _consoleAPICalled = consoleAPICalled;
         _exceptionThrown = exceptionThrown;
         client.MessageReceived += OnMessageReceived;

lib/PuppeteerSharp/IsolatedWorld.cs

@@ -30,8 +30,8 @@ internal class IsolatedWorld : Realm, IDisposable, IAsyncDisposable
         public IsolatedWorld(
             Frame frame,
             WebWorker worker,
-            TimeoutSettings timeoutSettings,
-            bool isMainWorld) : base(timeoutSettings)
+            int timeout,
+            bool isMainWorld) : base(timeout)
         {
             Frame = frame;
             Worker = worker;

lib/PuppeteerSharp/PuppeteerSharp.csproj

@@ -12,10 +12,10 @@
     <Description>Headless Browser .NET API</Description>
     <PackageId>PuppeteerSharp</PackageId>
     <PackageReleaseNotes></PackageReleaseNotes>
-    <PackageVersion>20.2.2</PackageVersion>
-    <ReleaseVersion>20.2.2</ReleaseVersion>
-    <AssemblyVersion>20.2.2</AssemblyVersion>
-    <FileVersion>20.2.2</FileVersion>
+    <PackageVersion>20.2.3</PackageVersion>
+    <ReleaseVersion>20.2.3</ReleaseVersion>
+    <AssemblyVersion>20.2.3</AssemblyVersion>
+    <FileVersion>20.2.3</FileVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
     <DebugType>embedded</DebugType>

lib/PuppeteerSharp/Realm.cs

@@ -3,16 +3,11 @@
 
 namespace PuppeteerSharp
 {
-    internal abstract class Realm
+    internal abstract class Realm(int timeout)
     {
-        public Realm(TimeoutSettings timeoutSettings)
-        {
-            TimeoutSettings = timeoutSettings;
-        }
-
-        internal TaskManager TaskManager { get; set; } = new();
+        internal TaskManager TaskManager { get; } = new();
 
-        internal TimeoutSettings TimeoutSettings { get; }
+        internal int Timeout { get; } = timeout;
 
         internal abstract IEnvironment Environment { get; }
 
@@ -42,7 +37,7 @@ internal async Task<IJSHandle> WaitForFunctionAsync(string script, WaitForFuncti
                 false,
                 options.Polling,
                 options.PollingInterval,
-                options.Timeout ?? TimeoutSettings.Timeout,
+                options.Timeout ?? Timeout,
                 options.Root,
                 args);
 
@@ -59,7 +54,7 @@ internal async Task<IJSHandle> WaitForExpressionAsync(string script, WaitForFunc
                 true,
                 options.Polling,
                 options.PollingInterval,
-                options.Timeout ?? TimeoutSettings.Timeout,
+                options.Timeout ?? Timeout,
                 null, // Root
                 null); // args