WinForms - Add ChromiumWebBrowser.FromBrowser static method

amaitland · amaitland · commit 409c8a85f4ec · 2022-01-10T14:10:26.000+10:00
- Can be used to get ChromiumWebBrowser instance from IBrowser instance
- Added generic base implementation to reduce code duplication
diff --git a/CefSharp.WinForms/ChromiumWebBrowser.cs b/CefSharp.WinForms/ChromiumWebBrowser.cs
@@ -789,5 +789,16 @@ public IBrowser GetBrowser()
 
             return browser;
         }
+
+        /// <summary>
+        /// Gets the <see cref="ChromiumWebBrowser"/> associated with
+        /// a specific <see cref="IBrowser"/> instance. 
+        /// </summary>
+        /// <param name="browser">browser</param>
+        /// <returns>returns the assocaited <see cref="ChromiumWebBrowser"/> or null if Disposed or no host found.</returns>
+        public static ChromiumWebBrowser FromBrowser(IBrowser browser)
+        {
+            return FromBrowser<ChromiumWebBrowser>(browser);
+        }
     }
 }
diff --git a/CefSharp.WinForms/Host/ChromiumHostControl.cs b/CefSharp.WinForms/Host/ChromiumHostControl.cs
@@ -298,21 +298,7 @@ protected override void Dispose(bool disposing)
         /// <returns>returns the assocaited <see cref="ChromiumHostControl"/> or null if Disposed or no host found.</returns>
         public static ChromiumHostControl FromBrowser(IBrowser browser)
         {
-            if (browser.IsDisposed)
-            {
-                return null;
-            }
-
-            var windowHandle = browser.GetHost().GetWindowHandle();
-
-            if (windowHandle == IntPtr.Zero)
-            {
-                return null;
-            }
-
-            var control = Control.FromChildHandle(windowHandle) as ChromiumHostControl;
-
-            return control;
+            return FromBrowser<ChromiumHostControl>(browser);
         }
     }
 }
diff --git a/CefSharp.WinForms/Host/ChromiumHostControlBase.cs b/CefSharp.WinForms/Host/ChromiumHostControlBase.cs
@@ -181,5 +181,30 @@ internal void RaiseIsBrowserInitializedChangedEvent()
         {
             IsBrowserInitializedChanged?.Invoke(this, EventArgs.Empty);
         }
+
+        /// <summary>
+        /// Gets the <see cref="ChromiumHostControl"/> or <see cref="ChromiumWebBrowser"/> associated with
+        /// a specific <see cref="IBrowser"/> instance. 
+        /// </summary>
+        /// <param name="browser">browser</param>
+        /// <returns>returns the assocaited <see cref="ChromiumHostControl"/> or <see cref="ChromiumWebBrowser"/> or null if Disposed or no host found.</returns>
+        internal static T FromBrowser<T>(IBrowser browser) where T : ChromiumHostControlBase
+        {
+            if (browser.IsDisposed)
+            {
+                return null;
+            }
+
+            var windowHandle = browser.GetHost().GetWindowHandle();
+
+            if (windowHandle == IntPtr.Zero)
+            {
+                return null;
+            }
+
+            var control = Control.FromChildHandle(windowHandle) as T;
+
+            return control;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -789,5 +789,16 @@ public IBrowser GetBrowser()`
`789`	`789`
`790`	`790`	`return browser;`
`791`	`791`	`}`
	`792`	`+`
	`793`	`+ /// <summary>`
	`794`	`+ /// Gets the <see cref="ChromiumWebBrowser"/> associated with`
	`795`	`+ /// a specific <see cref="IBrowser"/> instance.`
	`796`	`+ /// </summary>`
	`797`	`+ /// <param name="browser">browser</param>`
	`798`	`+ /// <returns>returns the assocaited <see cref="ChromiumWebBrowser"/> or null if Disposed or no host found.</returns>`
	`799`	`+ public static ChromiumWebBrowser FromBrowser(IBrowser browser)`
	`800`	`+ {`
	`801`	`+ return FromBrowser<ChromiumWebBrowser>(browser);`
	`802`	`+ }`
`792`	`803`	`}`
`793`	`804`	`}`
Original file line number	Diff line number	Diff line change
`@@ -298,21 +298,7 @@ protected override void Dispose(bool disposing)`
`298`	`298`	`/// <returns>returns the assocaited <see cref="ChromiumHostControl"/> or null if Disposed or no host found.</returns>`
`299`	`299`	`public static ChromiumHostControl FromBrowser(IBrowser browser)`
`300`	`300`	`{`
`301`		`- if (browser.IsDisposed)`
`302`		`- {`
`303`		`- return null;`
`304`		`- }`
`305`		`-`
`306`		`- var windowHandle = browser.GetHost().GetWindowHandle();`
`307`		`-`
`308`		`- if (windowHandle == IntPtr.Zero)`
`309`		`- {`
`310`		`- return null;`
`311`		`- }`
`312`		`-`
`313`		`- var control = Control.FromChildHandle(windowHandle) as ChromiumHostControl;`
`314`		`-`
`315`		`- return control;`
	`301`	`+ return FromBrowser<ChromiumHostControl>(browser);`
`316`	`302`	`}`
`317`	`303`	`}`
`318`	`304`	`}`