PR Chromium 126.2.70 to 127.3.50 (#27)

* Upgrade to 127.3.5+g114ea2a+chromium-127.0.6533.120 * Change Cef.IsInitialized from bool to bool? * InitializeCefInternal() missing fix * Update ChromiumWebBrowser.cs
mitchcapper · Aug 28, 2024 · eed6bdc · eed6bdc
1 parent e400a5d
commit eed6bdc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/CefSharp.Wpf.HwndHost/CefSharp.Wpf.HwndHost/CefSharp.Wpf.HwndHost.csproj b/CefSharp.Wpf.HwndHost/CefSharp.Wpf.HwndHost/CefSharp.Wpf.HwndHost.csproj
@@ -5,7 +5,7 @@
         <RootNamespace>CefSharp.Wpf.HwndHost</RootNamespace>
         <CefSharpAnyCpuSupport>true</CefSharpAnyCpuSupport>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<Version>126.2.70</Version>
+		<Version>127.3.50</Version>
 		<Authors>The CefSharp Authors</Authors>
 		<Description>The CefSharp Chromium-based browser component. The CefSharp.Wpf.HwndHost.ChromiumWebBrowser control is a drop in replacement for the CefSharp.Wpf.ChromiumWebBrowser that's rougly equivilent to hosting the WinForms version in WPF.</Description>
 		<Copyright>Copyright © The CefSharp Authors</Copyright>
@@ -23,11 +23,11 @@
     </PropertyGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-        <PackageReference Include="CefSharp.Common" Version="126.2.70" />
+        <PackageReference Include="CefSharp.Common" Version="127.3.50" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
-        <PackageReference Include="CefSharp.Common.NETCore" Version="126.2.70" />
+        <PackageReference Include="CefSharp.Common.NETCore" Version="127.3.50" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/CefSharp.Wpf.HwndHost/CefSharp.Wpf.HwndHost/ChromiumWebBrowser.cs b/CefSharp.Wpf.HwndHost/CefSharp.Wpf.HwndHost/ChromiumWebBrowser.cs
@@ -31,6 +31,8 @@ public class ChromiumWebBrowser : System.Windows.Interop.HwndHost, IWebBrowserIn
             "The ChromiumWebBrowser instance creates the underlying Chromium Embedded Framework (CEF) browser instance in an async fashion. " +
             "The undelying CefBrowser instance is not yet initialized. Use the IsBrowserInitializedChanged event and check " +
             "the IsBrowserInitialized property to determine when the browser has been initialized.";
+        private const string CefInitializeFailedErrorMessage = "Cef.Initialize() failed.Check the log file see https://github.com/cefsharp/CefSharp/wiki/Trouble-Shooting#log-file for details.";
+        private const string CefIsInitializedFalseErrorMessage = "Cef.IsInitialized was false!.Check the log file for errors!. See https://github.com/cefsharp/CefSharp/wiki/Trouble-Shooting#log-file for details.";
 
         [DllImport("user32.dll", EntryPoint = "CreateWindowEx", CharSet = CharSet.Unicode)]
         private static extern IntPtr CreateWindowEx(int dwExStyle,
@@ -629,16 +631,7 @@ public ChromiumWebBrowser(string initialAddress)
         [MethodImpl(MethodImplOptions.NoInlining)]
         private void NoInliningConstructor()
         {
-            //Initialize CEF if it hasn't already been initialized
-            if (!Cef.IsInitialized)
-            {
-                var settings = new CefSettings();
-
-                if (!Cef.Initialize(settings))
-                {
-                    throw new InvalidOperationException("Cef::Initialize() failed");
-                }
-            }
+            InitializeCefInternal();
 
             //Add this ChromiumWebBrowser instance to a list of IDisposable objects
             // that if still alive at the time Cef.Shutdown is called will be disposed of
@@ -1716,6 +1709,22 @@ public IBrowser GetBrowser()
             return browser;
         }
 
+        private static void InitializeCefInternal()
+        {
+            if (Cef.IsInitialized == null)
+            {
+                if (!Cef.Initialize(new CefSettings()))
+                {
+                    throw new InvalidOperationException(CefInitializeFailedErrorMessage);
+                }
+            }
+
+            if (Cef.IsInitialized == false)
+            {
+                throw new InvalidOperationException(CefIsInitializedFalseErrorMessage);
+            }
+        }
+
         /// <summary>
         /// Check is browserisinitialized
         /// </summary>

diff --git a/CefSharp.Wpf.HwndHost/appveyor.yml b/CefSharp.Wpf.HwndHost/appveyor.yml
@@ -1,6 +1,6 @@
 image: Visual Studio 2019
 
-version: 126.2.70-CI{build}
+version: 127.3.50-CI{build}
 
 clone_depth: 10