Browse Source

Core - Change from using GetBrowser() method to BrowserHost

- BrowserHost will return null if not set where GetBrowser() will throw an exception
pull/3965/head
Alex Maitland 4 years ago
parent
commit
27816d54b8
  1. 2
      CefSharp.WinForms/WebBrowserExtensions.cs
  2. 2
      CefSharp.Wpf.Example/Controls/ChromiumWebBrowserWithScreenshotSupport.cs
  3. 2
      CefSharp.Wpf.Example/MainWindow.xaml.cs
  4. 4
      CefSharp.Wpf/Internals/WpfKeyboardHandler.cs
  5. 4
      CefSharp.Wpf/Internals/WpfLegacyKeyboardHandler.cs

2
CefSharp.WinForms/WebBrowserExtensions.cs

@ -47,7 +47,7 @@ namespace CefSharp.WinForms
return false;
}
var browser = chromiumWebBrowser.GetBrowser();
var browser = chromiumWebBrowser.BrowserCore;
if (browser == null)
{

2
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)
{

2
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;
}
};

4
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();

4
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)
{

Loading…
Cancel
Save