Added minimal WPF designer support (#1989)

merceyz · amaitland · commit a35a030ee873 · 2017-03-20T11:35:09.000+10:00
diff --git a/CefSharp.Wpf/ChromiumWebBrowser.cs b/CefSharp.Wpf/ChromiumWebBrowser.cs
@@ -45,7 +45,7 @@ public class ChromiumWebBrowser : ContentControl, IRenderWebBrowser, IWpfWebBrow
         /// <summary>
         /// The tool tip
         /// </summary>
-        private readonly ToolTip toolTip;
+        private ToolTip toolTip;
         /// <summary>
         /// The managed cef browser adapter
         /// </summary>
@@ -86,6 +86,11 @@ public class ChromiumWebBrowser : ContentControl, IRenderWebBrowser, IWpfWebBrow
         /// The dispose count
         /// </summary>
         private int disposeCount;
+        /// <summary>
+        /// A flag that indicates whether or not the designer is active
+        /// NOTE: Needs to be static for OnApplicationExit
+        /// </summary>
+        private static bool designMode;
 
         /// <summary>
         /// Gets or sets the browser settings.
@@ -348,6 +353,21 @@ static ChromiumWebBrowser()
         /// </summary>
         /// <exception cref="System.InvalidOperationException">Cef::Initialize() failed</exception>
         public ChromiumWebBrowser()
+        {
+            designMode = System.ComponentModel.DesignerProperties.GetIsInDesignMode(this);
+
+            if (!designMode)
+            {
+                InitializeFieldsAndCef();
+            }
+        }
+
+        /// <summary>
+        /// Required for designer support - this method cannot be inlined as the designer
+        /// will attempt to load libcef.dll and will subsiquently throw an exception.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private void InitializeFieldsAndCef()
         {
             if (!Cef.IsInitialized && !Cef.Initialize())
             {
@@ -414,22 +434,31 @@ public ChromiumWebBrowser()
         /// </summary>
         ~ChromiumWebBrowser()
         {
-            Dispose(false);
+            if (!designMode)
+            {
+                Dispose(false);
+            }
         }
 
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         public void Dispose()
         {
-            Dispose(true);
+            if (!designMode)
+            {
+                Dispose(true);
+            }
+
             GC.SuppressFinalize(this);
         }
 
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources.
         /// </summary>
         /// <param name="isDisposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        // This method cannot be inlined as the designer will attempt to load libcef.dll and will subsiquently throw an exception.
+        [MethodImpl(MethodImplOptions.NoInlining)]
         protected virtual void Dispose(bool isDisposing)
         {
             //If disposeCount is 0 then we'll update it to 1 and begin disposing
@@ -1473,7 +1502,7 @@ private void RemoveSourceHook()
         /// <returns>bool to indicate if browser was created. If the browser has already been created then this will return false.</returns>
         protected virtual bool CreateOffscreenBrowser(Size size)
         {
-            if (browserCreated || System.ComponentModel.DesignerProperties.GetIsInDesignMode(this) || size.IsEmpty || size.Equals(new Size(0, 0)))
+            if (browserCreated || size.IsEmpty || size.Equals(new Size(0, 0)))
             {
                 return false;
             }
@@ -1559,6 +1588,19 @@ private void OnIsVisibleChanged(object sender, DependencyPropertyChangedEventArg
         /// <param name="sender">The sender.</param>
         /// <param name="e">The <see cref="ExitEventArgs"/> instance containing the event data.</param>
         private static void OnApplicationExit(object sender, ExitEventArgs e)
+        {
+            if (!designMode)
+            {
+                ShutdownCef();
+            }
+        }
+
+        /// <summary>
+        /// Required for designer support - this method cannot be inlined as the designer
+        /// will attempt to load libcef.dll and will subsiquently throw an exception.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ShutdownCef()
         {
             Cef.Shutdown();
         }
