From fba29ac0013a504ce8205d3fe3dca0c0177fa0f5 Mon Sep 17 00:00:00 2001 From: amaitland Date: Fri, 12 Dec 2014 13:15:03 +1000 Subject: [PATCH 1/3] Move managedCefBrowserAdapter creation to constructor (same as WPF control) --- CefSharp.WinForms/ChromiumWebBrowser.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CefSharp.WinForms/ChromiumWebBrowser.cs b/CefSharp.WinForms/ChromiumWebBrowser.cs index 40fea7ea82..5f424d1596 100644 --- a/CefSharp.WinForms/ChromiumWebBrowser.cs +++ b/CefSharp.WinForms/ChromiumWebBrowser.cs @@ -61,6 +61,8 @@ public ChromiumWebBrowser(string address) FocusHandler = new DefaultFocusHandler(this); ResourceHandler = new DefaultResourceHandler(); + + managedCefBrowserAdapter = new ManagedCefBrowserAdapter(this); } protected override void Dispose(bool disposing) @@ -151,7 +153,6 @@ public void SendMouseWheelEvent(int x, int y, int deltaX, int deltaY) protected override void OnHandleCreated(EventArgs e) { - managedCefBrowserAdapter = new ManagedCefBrowserAdapter(this); managedCefBrowserAdapter.CreateBrowser(BrowserSettings ?? new BrowserSettings(), Handle, Address); base.OnHandleCreated(e); From 0efff78f0dbddb1baec44df16930a76a446fdae8 Mon Sep 17 00:00:00 2001 From: amaitland Date: Fri, 12 Dec 2014 13:16:59 +1000 Subject: [PATCH 2/3] Update examples to call RegisterJsObject in constructor --- CefSharp.WinForms.Example/BrowserTabUserControl.cs | 8 +------- CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs | 2 ++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CefSharp.WinForms.Example/BrowserTabUserControl.cs b/CefSharp.WinForms.Example/BrowserTabUserControl.cs index 0a20c25bdc..28095a5b4d 100644 --- a/CefSharp.WinForms.Example/BrowserTabUserControl.cs +++ b/CefSharp.WinForms.Example/BrowserTabUserControl.cs @@ -33,8 +33,8 @@ public BrowserTabUserControl(string url) browser.StatusMessage += OnBrowserStatusMessage; browser.IsBrowserInitializedChanged += OnIsBrowserInitializedChanged; browser.IsLoadingChanged += OnIsLoadingChanged; - browser.HandleCreated += OnBrowserHandleCreated; browser.DragHandler = new DragHandler(); + browser.RegisterJsObject("bound", new BoundObject()); CefExample.RegisterTestResources(browser); @@ -43,11 +43,6 @@ public BrowserTabUserControl(string url) Disposed += BrowserTabUserControlDisposed; } - - private void OnBrowserHandleCreated(object sender, EventArgs e) - { - Browser.RegisterJsObject("bound", new BoundObject()); - } private void BrowserTabUserControlDisposed(object sender, EventArgs e) { @@ -61,7 +56,6 @@ private void BrowserTabUserControlDisposed(object sender, EventArgs e) browser.StatusMessage -= OnBrowserStatusMessage; browser.IsBrowserInitializedChanged -= OnIsBrowserInitializedChanged; browser.IsLoadingChanged -= OnIsLoadingChanged; - browser.HandleCreated -= OnBrowserHandleCreated; browser.Dispose(); } diff --git a/CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs b/CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs index 2ec7fb7e86..b3672323d6 100644 --- a/CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs +++ b/CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs @@ -4,6 +4,7 @@ using System; using System.Windows.Forms; +using CefSharp.Example; using CefSharp.WinForms.Example.Controls; namespace CefSharp.WinForms.Example.Minimal @@ -57,6 +58,7 @@ private void CreateBrowser() browser.TitleChanged += OnBrowserTitleChanged; browser.AddressChanged += OnBrowserAddressChanged; browser.Paint += BrowserPaint; + browser.RegisterJsObject("bound", new BoundObject()); } private void OnBrowserConsoleMessage(object sender, ConsoleMessageEventArgs args) From 56e9b9db37a82d11558703c7466d15fcbdca6bbb Mon Sep 17 00:00:00 2001 From: amaitland Date: Fri, 12 Dec 2014 13:17:34 +1000 Subject: [PATCH 3/3] Remove hack for #522 that's no longer required --- CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs b/CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs index b3672323d6..22125e2166 100644 --- a/CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs +++ b/CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs @@ -31,14 +31,6 @@ public SimpleBrowserForm() Load += OnLoad; } - private void BrowserPaint(object sender, PaintEventArgs e) - { - browser.Paint -= BrowserPaint; - - //Invalidate browser as short term fix for #522 - browser.Invalidate(); - } - private void OnLoad(object sender, EventArgs e) { CreateBrowser(); @@ -57,7 +49,6 @@ private void CreateBrowser() browser.StatusMessage += OnBrowserStatusMessage; browser.TitleChanged += OnBrowserTitleChanged; browser.AddressChanged += OnBrowserAddressChanged; - browser.Paint += BrowserPaint; browser.RegisterJsObject("bound", new BoundObject()); }