From 27816d54b8f91c878d325a590c1acc05fd977cc4 Mon Sep 17 00:00:00 2001 From: Alex Maitland Date: Wed, 5 Jan 2022 10:14:24 +1000 Subject: [PATCH] Core - Change from using GetBrowser() method to BrowserHost - BrowserHost will return null if not set where GetBrowser() will throw an exception --- CefSharp.WinForms/WebBrowserExtensions.cs | 2 +- .../Controls/ChromiumWebBrowserWithScreenshotSupport.cs | 2 +- CefSharp.Wpf.Example/MainWindow.xaml.cs | 2 +- CefSharp.Wpf/Internals/WpfKeyboardHandler.cs | 4 ++-- CefSharp.Wpf/Internals/WpfLegacyKeyboardHandler.cs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CefSharp.WinForms/WebBrowserExtensions.cs b/CefSharp.WinForms/WebBrowserExtensions.cs index 4616a6de7..0eb087962 100644 --- a/CefSharp.WinForms/WebBrowserExtensions.cs +++ b/CefSharp.WinForms/WebBrowserExtensions.cs @@ -47,7 +47,7 @@ namespace CefSharp.WinForms return false; } - var browser = chromiumWebBrowser.GetBrowser(); + var browser = chromiumWebBrowser.BrowserCore; if (browser == null) { diff --git a/CefSharp.Wpf.Example/Controls/ChromiumWebBrowserWithScreenshotSupport.cs b/CefSharp.Wpf.Example/Controls/ChromiumWebBrowserWithScreenshotSupport.cs index 4194b24b8..95c793d01 100644 --- a/CefSharp.Wpf.Example/Controls/ChromiumWebBrowserWithScreenshotSupport.cs +++ b/CefSharp.Wpf.Example/Controls/ChromiumWebBrowserWithScreenshotSupport.cs @@ -61,7 +61,7 @@ namespace CefSharp.Wpf.Example.Controls throw new Exception("Unable to take screenshot while browser is loading"); } - var browserHost = this.GetBrowser().GetHost(); + var browserHost = this.GetBrowserHost(); if (browserHost == null) { diff --git a/CefSharp.Wpf.Example/MainWindow.xaml.cs b/CefSharp.Wpf.Example/MainWindow.xaml.cs index 69f30c598..227ed152b 100644 --- a/CefSharp.Wpf.Example/MainWindow.xaml.cs +++ b/CefSharp.Wpf.Example/MainWindow.xaml.cs @@ -181,7 +181,7 @@ namespace CefSharp.Wpf.Example GetActiveBrowser = (extension, isIncognito) => { //Return the active browser for which the extension will act upon - return browser.GetBrowser(); + return browser.BrowserCore; } }; diff --git a/CefSharp.Wpf/Internals/WpfKeyboardHandler.cs b/CefSharp.Wpf/Internals/WpfKeyboardHandler.cs index 9dc0bbadf..e12751775 100644 --- a/CefSharp.Wpf/Internals/WpfKeyboardHandler.cs +++ b/CefSharp.Wpf/Internals/WpfKeyboardHandler.cs @@ -31,7 +31,7 @@ namespace CefSharp.Wpf.Internals public virtual void HandleKeyPress(KeyEventArgs e) { - var browser = owner.GetBrowser(); + var browser = owner.BrowserCore; var key = e.SystemKey == Key.None ? e.Key : e.SystemKey; if (browser != null) { @@ -92,7 +92,7 @@ namespace CefSharp.Wpf.Internals public virtual void HandleTextInput(TextCompositionEventArgs e) { - var browser = owner.GetBrowser(); + var browser = owner.BrowserCore; if (browser != null) { var browserHost = browser.GetHost(); diff --git a/CefSharp.Wpf/Internals/WpfLegacyKeyboardHandler.cs b/CefSharp.Wpf/Internals/WpfLegacyKeyboardHandler.cs index f53a9a907..cde00860b 100644 --- a/CefSharp.Wpf/Internals/WpfLegacyKeyboardHandler.cs +++ b/CefSharp.Wpf/Internals/WpfLegacyKeyboardHandler.cs @@ -90,7 +90,7 @@ namespace CefSharp.Wpf.Internals return IntPtr.Zero; } - var browser = owner.GetBrowser(); + var browser = owner.BrowserCore; if (browser != null) { browser.GetHost().SendKeyEvent(message, wParam.CastToInt32(), lParam.CastToInt32()); @@ -118,7 +118,7 @@ namespace CefSharp.Wpf.Internals var modifiers = e.GetModifiers(); var message = (int)(e.IsDown ? WM.KEYDOWN : WM.KEYUP); var virtualKey = KeyInterop.VirtualKeyFromKey(e.Key); - var browser = owner.GetBrowser(); + var browser = owner.BrowserCore; if (browser != null) {