Merge remote-tracking branch 'remotes/upstream/master' into JsBinding_WIP

Author: amaitland

CefSharp.Core/CefSettings.h

@@ -106,6 +106,12 @@ namespace CefSharp
             void set(String^ value) { StringUtils::AssignNativeFromClr(_cefSettings->cache_path, value); }
         }
 
+        virtual property bool IgnoreCertificateErrors
+        {
+            bool get() { return _cefSettings->ignore_certificate_errors; }
+            void set(bool value) { _cefSettings->ignore_certificate_errors = value; }
+        }
+
         virtual property String^ Locale
         {
             String^ get() { return StringUtils::ToClr(_cefSettings->locale); }

CefSharp.Wpf/ChromiumWebBrowser.cs

@@ -777,12 +777,18 @@ private void UpdateTooltip(string text)
 
         private void OnGotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
         {
-            managedCefBrowserAdapter.SendFocusEvent(true);
+            if (managedCefBrowserAdapter != null)
+            {
+                managedCefBrowserAdapter.SendFocusEvent(true);
+            }
         }
 
         private void OnLostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
         {
-            managedCefBrowserAdapter.SendFocusEvent(false);
+            if (managedCefBrowserAdapter != null)
+            {
+                managedCefBrowserAdapter.SendFocusEvent(false);
+            }
         }
 
         protected override void OnPreviewKeyDown(KeyEventArgs e)
@@ -842,19 +848,25 @@ protected override void OnMouseMove(MouseEventArgs e)
             var point = GetPixelPosition(e);
             var modifiers = GetModifiers(e);
 
-            managedCefBrowserAdapter.OnMouseMove((int)point.X, (int)point.Y, false, modifiers);
+            if (managedCefBrowserAdapter != null)
+            {
+                managedCefBrowserAdapter.OnMouseMove((int)point.X, (int)point.Y, false, modifiers);
+            }
         }
 
         protected override void OnMouseWheel(MouseWheelEventArgs e)
         {
             var point = GetPixelPosition(e);
 
-            managedCefBrowserAdapter.OnMouseWheel(
-                (int)point.X,
-                (int)point.Y,
-                deltaX: 0,
-                deltaY: e.Delta
-            );
+            if (managedCefBrowserAdapter != null)
+            {
+                managedCefBrowserAdapter.OnMouseWheel(
+                    (int)point.X,
+                    (int)point.Y,
+                    deltaX: 0,
+                    deltaY: e.Delta
+                    );
+            }
         }
 
         protected void PopupMouseEnter(object sender, MouseEventArgs e)
@@ -884,7 +896,11 @@ protected override void OnMouseUp(MouseButtonEventArgs e)
         protected override void OnMouseLeave(MouseEventArgs e)
         {
             var modifiers = GetModifiers(e);
-            managedCefBrowserAdapter.OnMouseMove(0, 0, true, modifiers);
+
+            if (managedCefBrowserAdapter != null)
+            {
+                managedCefBrowserAdapter.OnMouseMove(0, 0, true, modifiers);
+            }
         }
 
         private void OnMouseButton(MouseButtonEventArgs e)
@@ -913,7 +929,10 @@ private void OnMouseButton(MouseButtonEventArgs e)
             var mouseUp = (e.ButtonState == MouseButtonState.Released);
             var point = GetPixelPosition(e);
 
-            managedCefBrowserAdapter.OnMouseButton((int)point.X, (int)point.Y, mouseButtonType, mouseUp, e.ClickCount, modifiers);
+            if (managedCefBrowserAdapter != null)
+            {
+                managedCefBrowserAdapter.OnMouseButton((int)point.X, (int)point.Y, mouseButtonType, mouseUp, e.ClickCount, modifiers);
+            }
         }
 
         void IWebBrowserInternal.OnInitialized()

README.WPF.md

@@ -6,15 +6,15 @@ CefSharp is based on CEF (Chromium Embeddable Framework), which is composed of a
 
 This is done automatically by the CefSharp.Wpf NuGet package (or the packages it depend on). However, it is only possible to copy these files into *either* the Debug or Release target of your project. Because it is the default when creating a new project, and the target which is normally used when developing .NET applications, I have chosen to place them in the bin\Debug folder for now. This means that if you want to run your application in Release mode, you need to copy these files from bin\Debug to bin\Release for the moment.
 
-To be able to use CefSharp.Wpf, you basically just have to add a WebView like this:
+To be able to use CefSharp.Wpf, you basically just have to add a ChromiumWebBrowser like this:
 
 ``` xml
 <Window x:Class="WpfApplication3.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:cefSharp="clr-namespace:CefSharp.Wpf;assembly=CefSharp.Wpf" Title="MainWindow" Height="350" Width="525">
     <Grid>
-        <cefSharp:WebView x:Name="WebView" />
+        <cefSharp:ChromiumWebBrowser x:Name="Browser" Address="http://www.google.com.au" />
     </Grid>
 </Window>
 ```
@@ -28,23 +28,7 @@ To be able to use CefSharp.Wpf, you basically just have to add a WebView like th
         {
             InitializeComponent();
 
-            WebView.PropertyChanged += OnWebViewPropertyChanged;
-
             Cef.Initialize(new Settings());
         }
-
-        private void OnWebViewPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            switch (e.PropertyName)
-            {
-                case "IsBrowserInitialized":
-                    if (WebView.IsBrowserInitialized)
-                    {
-                        WebView.Load("http://10.211.55.2:42000");
-                    }
-
-                    break;
-            }
-        }
     }
 ```