Skip to content

Commit 27816d5

Browse files
committed
Core - Change from using GetBrowser() method to BrowserHost
- BrowserHost will return null if not set where GetBrowser() will throw an exception
1 parent 6f0f20f commit 27816d5

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

CefSharp.WinForms/WebBrowserExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static bool DestroyWindow(this IWebBrowser chromiumWebBrowser)
4747
return false;
4848
}
4949

50-
var browser = chromiumWebBrowser.GetBrowser();
50+
var browser = chromiumWebBrowser.BrowserCore;
5151

5252
if (browser == null)
5353
{

CefSharp.Wpf.Example/Controls/ChromiumWebBrowserWithScreenshotSupport.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public Task<InteropBitmap> TakeScreenshot(Size screenshotSize, int? frameRate =
6161
throw new Exception("Unable to take screenshot while browser is loading");
6262
}
6363

64-
var browserHost = this.GetBrowser().GetHost();
64+
var browserHost = this.GetBrowserHost();
6565

6666
if (browserHost == null)
6767
{

CefSharp.Wpf.Example/MainWindow.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ private void CustomCommandBinding(object sender, ExecutedRoutedEventArgs e)
181181
GetActiveBrowser = (extension, isIncognito) =>
182182
{
183183
//Return the active browser for which the extension will act upon
184-
return browser.GetBrowser();
184+
return browser.BrowserCore;
185185
}
186186
};
187187

CefSharp.Wpf/Internals/WpfKeyboardHandler.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public virtual void Dispose()
3131

3232
public virtual void HandleKeyPress(KeyEventArgs e)
3333
{
34-
var browser = owner.GetBrowser();
34+
var browser = owner.BrowserCore;
3535
var key = e.SystemKey == Key.None ? e.Key : e.SystemKey;
3636
if (browser != null)
3737
{
@@ -92,7 +92,7 @@ public virtual void HandleKeyPress(KeyEventArgs e)
9292

9393
public virtual void HandleTextInput(TextCompositionEventArgs e)
9494
{
95-
var browser = owner.GetBrowser();
95+
var browser = owner.BrowserCore;
9696
if (browser != null)
9797
{
9898
var browserHost = browser.GetHost();

CefSharp.Wpf/Internals/WpfLegacyKeyboardHandler.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ protected virtual IntPtr SourceHook(IntPtr hWnd, int message, IntPtr wParam, Int
9090
return IntPtr.Zero;
9191
}
9292

93-
var browser = owner.GetBrowser();
93+
var browser = owner.BrowserCore;
9494
if (browser != null)
9595
{
9696
browser.GetHost().SendKeyEvent(message, wParam.CastToInt32(), lParam.CastToInt32());
@@ -118,7 +118,7 @@ public virtual void HandleKeyPress(KeyEventArgs e)
118118
var modifiers = e.GetModifiers();
119119
var message = (int)(e.IsDown ? WM.KEYDOWN : WM.KEYUP);
120120
var virtualKey = KeyInterop.VirtualKeyFromKey(e.Key);
121-
var browser = owner.GetBrowser();
121+
var browser = owner.BrowserCore;
122122

123123
if (browser != null)
124124
{

0 commit comments

Comments
 (0)