WPF/WinForms/OffScreen - Move BrowserSettings Dispose into ManagedCefBrowserAdapter::CreateBrowser

amaitland · amaitland · commit d2d1e6f879af · 2019-03-22T10:46:54.000+10:00
- Improve BrowserSettings disposed check message Follow up to #2643
diff --git a/CefSharp.Core/ManagedCefBrowserAdapter.cpp b/CefSharp.Core/ManagedCefBrowserAdapter.cpp
@@ -30,14 +30,21 @@ void ManagedCefBrowserAdapter::CreateBrowser(IWindowInfo^ windowInfo, BrowserSet
 
     if (browserSettings->IsDisposed)
     {
-        throw gcnew ObjectDisposedException("browserSettings", "browser settings has already been Disposed and cannot be used.");
+        throw gcnew ObjectDisposedException("browserSettings", "browser settings has already been Disposed." +
+            "BrowserSettings created by CefSharp are automatically disposed, to control the lifecycle create and set your own instance.");
     }
 
     if (!CefBrowserHost::CreateBrowser(*cefWindowInfoWrapper->GetWindowInfo(), _clientAdapter.get(), addressNative,
         *browserSettings->_browserSettings, static_cast<CefRefPtr<CefRequestContext>>(requestContext)))
     {
         throw gcnew InvalidOperationException("CefBrowserHost::CreateBrowser call failed, review the CEF log file for more details.");
     }
+
+    //Dispose of BrowserSettings if we created it, if user created then they're responsible
+    if (browserSettings->FrameworkCreated)
+    {
+        delete browserSettings;
+    }
 }
 
 void ManagedCefBrowserAdapter::OnAfterBrowserCreated(IBrowser^ browser)
diff --git a/CefSharp.OffScreen/ChromiumWebBrowser.cs b/CefSharp.OffScreen/ChromiumWebBrowser.cs
@@ -411,11 +411,6 @@ public void CreateBrowser(IWindowInfo windowInfo = null, BrowserSettings browser
 
             managedCefBrowserAdapter.CreateBrowser(windowInfo, browserSettings, (RequestContext)RequestContext, Address);
 
-            if (browserSettings.FrameworkCreated)
-            {
-                browserSettings.Dispose();
-            }
-
             browserSettings = null;
         }
 
diff --git a/CefSharp.WinForms/ChromiumWebBrowser.cs b/CefSharp.WinForms/ChromiumWebBrowser.cs
@@ -672,11 +672,6 @@ private void CreateBrowser()
 
                     managedCefBrowserAdapter.CreateBrowser(windowInfo, browserSettings as BrowserSettings, requestContext as RequestContext, Address);
 
-                    if (browserSettings.FrameworkCreated)
-                    {
-                        browserSettings.Dispose();
-                    }
-
                     browserSettings = null;
                 }
                 else
diff --git a/CefSharp.Wpf/ChromiumWebBrowser.cs b/CefSharp.Wpf/ChromiumWebBrowser.cs
@@ -1745,12 +1745,6 @@ protected virtual bool CreateOffscreenBrowser(Size size)
                 //Workaround for issue https://github.com/cefsharp/CefSharp/issues/2300
                 managedCefBrowserAdapter.CreateBrowser(windowInfo, browserSettings as BrowserSettings, requestContext as RequestContext, address: null);
 
-                //Dispose of BrowserSettings if we created it, if user created then they're responsible
-                if (browserSettings.FrameworkCreated)
-                {
-                    browserSettings.Dispose();
-                }
-
                 browserSettings = null;
             }
             browserCreated = true;

Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,21 @@ void ManagedCefBrowserAdapter::CreateBrowser(IWindowInfo^ windowInfo, BrowserSet`
`30`	`30`
`31`	`31`	`if (browserSettings->IsDisposed)`
`32`	`32`	`{`
`33`		`- throw gcnew ObjectDisposedException("browserSettings", "browser settings has already been Disposed and cannot be used.");`
	`33`	`+ throw gcnew ObjectDisposedException("browserSettings", "browser settings has already been Disposed." +`
	`34`	`+ "BrowserSettings created by CefSharp are automatically disposed, to control the lifecycle create and set your own instance.");`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`if (!CefBrowserHost::CreateBrowser(*cefWindowInfoWrapper->GetWindowInfo(), _clientAdapter.get(), addressNative,`
`37`	`38`	`*browserSettings->_browserSettings, static_cast<CefRefPtr<CefRequestContext>>(requestContext)))`
`38`	`39`	`{`
`39`	`40`	`throw gcnew InvalidOperationException("CefBrowserHost::CreateBrowser call failed, review the CEF log file for more details.");`
`40`	`41`	`}`
	`42`	`+`
	`43`	`+ //Dispose of BrowserSettings if we created it, if user created then they're responsible`
	`44`	`+ if (browserSettings->FrameworkCreated)`
	`45`	`+ {`
	`46`	`+ delete browserSettings;`
	`47`	`+ }`
`41`	`48`	`}`
`42`	`49`
`43`	`50`	`void ManagedCefBrowserAdapter::OnAfterBrowserCreated(IBrowser^ browser)`
Original file line number	Diff line number	Diff line change
`@@ -411,11 +411,6 @@ public void CreateBrowser(IWindowInfo windowInfo = null, BrowserSettings browser`
`411`	`411`
`412`	`412`	`managedCefBrowserAdapter.CreateBrowser(windowInfo, browserSettings, (RequestContext)RequestContext, Address);`
`413`	`413`
`414`		`- if (browserSettings.FrameworkCreated)`
`415`		`- {`
`416`		`- browserSettings.Dispose();`
`417`		`- }`
`418`		`-`
`419`	`414`	`browserSettings = null;`
`420`	`415`	`}`
`421`	`416`