Skip to content

Commit 68a9754

Browse files
committed
Fixes to get #210 compiling, on my latest renamings and refactorings.
1 parent c75a956 commit 68a9754

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

CefSharp.WinForm/WebView.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace CefSharp.WinForm
88
public class WebView : Control, IRenderWebBrowser
99
{
1010
private BrowserCore browserCore;
11-
private CefBrowserWrapper cefBrowserWrapper;
11+
private ManagedCefBrowserAdapter managedCefBrowserAdapter;
1212
public BrowserSettings BrowserSettings { get; set; }
1313

1414
public string Title { get; set; }
@@ -43,14 +43,14 @@ public WebView(string address, BrowserSettings settings)
4343

4444
private void OnApplicationExit(object sender, EventArgs e)
4545
{
46-
if (cefBrowserWrapper == null)
46+
if (managedCefBrowserAdapter == null)
4747
{
4848
return;
4949
}
5050

51-
cefBrowserWrapper.Close();
52-
cefBrowserWrapper.Dispose();
53-
cefBrowserWrapper = null;
51+
managedCefBrowserAdapter.Close();
52+
managedCefBrowserAdapter.Dispose();
53+
managedCefBrowserAdapter = null;
5454

5555
Cef.Shutdown();
5656
}
@@ -61,15 +61,15 @@ public void LoadHtml(string html, string url)
6161

6262
public void Load(String url)
6363
{
64-
cefBrowserWrapper.LoadUrl(url);
64+
managedCefBrowserAdapter.LoadUrl(url);
6565
}
6666

6767
public void RegisterJsObject(string name, object objectToBind)
6868
{
6969
throw new NotImplementedException();
7070
}
7171

72-
public void ExecuteScript(string script)
72+
public void ExecuteScriptAsync(string script)
7373
{
7474
throw new NotImplementedException();
7575
}
@@ -97,15 +97,15 @@ public void OnInitialized()
9797
protected override void OnHandleCreated(EventArgs e)
9898
{
9999
base.OnHandleCreated(e);
100-
cefBrowserWrapper = new CefBrowserWrapper(this);
101-
cefBrowserWrapper.CreateBrowser(BrowserSettings ?? new BrowserSettings(), Handle, browserCore.Address);
100+
managedCefBrowserAdapter = new ManagedCefBrowserAdapter(this);
101+
managedCefBrowserAdapter.CreateBrowser(BrowserSettings ?? new BrowserSettings(), Handle, browserCore.Address);
102102
}
103103

104104
protected override void OnSizeChanged(EventArgs e)
105105
{
106106
base.OnSizeChanged(e);
107-
if (cefBrowserWrapper != null)
108-
cefBrowserWrapper.OnSizeChanged(Handle);
107+
if (managedCefBrowserAdapter != null)
108+
managedCefBrowserAdapter.OnSizeChanged(Handle);
109109
}
110110

111111
public void SetAddress(string address)

CefSharp.WinForms.Example/Browser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public void SetIsLoading(bool is_loading)
195195

196196
public void ExecuteScript(string script)
197197
{
198-
web_view.ExecuteScript(script);
198+
web_view.ExecuteScriptAsync(script);
199199
}
200200

201201
public object EvaluateScript(string script)

0 commit comments

Comments
 (0)