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

Author: amaitland

.nuget/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist" version="3.1650.1562-pre0" />
+  <package id="cef.redist" version="3.1750.1738" />
 </packages>

CefSharp.Core/BrowserSettings.h

@@ -248,18 +248,6 @@ namespace CefSharp
             void set(Nullable<bool>^ value) { _browserSettings->tab_to_links = CefStateFromDisabledSetting(value); }
         }
 
-        property String^ UserStyleSheetLocation
-        {
-            String^ get() { return StringUtils::ToClr(_browserSettings->user_style_sheet_location); }
-            void set(String^ value) { StringUtils::AssignNativeFromClr(_browserSettings->user_style_sheet_location, value); }
-        }
-
-        property Nullable<bool>^ AuthorAndUserStylesDisabled
-        {
-            Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->author_and_user_styles); }
-            void set(Nullable<bool>^ value) { _browserSettings->author_and_user_styles = CefStateFromDisabledSetting(value); }
-        }
-
         property Nullable<bool>^ LocalStorageDisabled
         {
             Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->local_storage); }

CefSharp.Core/Cef.h

@@ -148,7 +148,7 @@ namespace CefSharp
                 CefMainArgs main_args;
                 CefRefPtr<CefSharpApp> app(new CefSharpApp(cefSettings));
 
-                int exitCode = CefExecuteProcess(main_args, app.get());
+                int exitCode = CefExecuteProcess(main_args, app.get(), NULL);
 
                 if (exitCode >= 0)
                 {
@@ -157,7 +157,7 @@ namespace CefSharp
                     return false;
                 }
 
-                success = CefInitialize(main_args, *(cefSettings->_cefSettings), app.get());
+                success = CefInitialize(main_args, *(cefSettings->_cefSettings), app.get(), NULL);
                 app->CompleteSchemeRegistrations();
                 _initialized = success;
 
@@ -318,7 +318,7 @@ namespace CefSharp
         }
 
         /// <summary> Flush the backing store (if any) to disk and execute the specified |handler| on the IO thread when done. Returns </summary>
-        /// <param name="handler">A user-provided ICompletion handler implementation.</param>
+        /// <param name="handler">A user-provided ICompletionHandler implementation.</param>
         /// <return>Returns false if cookies cannot be accessed.</return>
         static bool FlushStore(ICompletionHandler^ handler)
         {

CefSharp.Core/CefSettings.h

@@ -65,7 +65,7 @@ namespace CefSharp
     public:
         CefSettings() : _cefSettings(new ::CefSettings())
         {
-            MultiThreadedMessageLoop = true;
+            _cefSettings->multi_threaded_message_loop = true;
             BrowserSubprocessPath = "CefSharp.BrowserSubprocess.exe";
             cefCustomSchemes = gcnew List<CefCustomScheme^>();
             cefCommandLineArgs = gcnew Dictionary<String^, String^>();
@@ -86,12 +86,7 @@ namespace CefSharp
 
         virtual property bool MultiThreadedMessageLoop
         {
-            bool get() { return _cefSettings->multi_threaded_message_loop; }
-
-            // CefSharp doesn't support single threaded message loop (and there's little point in supporting it), so we make this
-            // property read-only externally.
-        private:
-            void set(bool value) sealed { _cefSettings->multi_threaded_message_loop = value; }
+            bool get() { return _cefSettings->multi_threaded_message_loop == 1; }
         }
 
         virtual property String^ BrowserSubprocessPath
@@ -108,7 +103,7 @@ namespace CefSharp
 
         virtual property bool IgnoreCertificateErrors
         {
-            bool get() { return _cefSettings->ignore_certificate_errors; }
+            bool get() { return _cefSettings->ignore_certificate_errors == 1; }
             void set(bool value) { _cefSettings->ignore_certificate_errors = value; }
         }
 
@@ -138,7 +133,7 @@ namespace CefSharp
 
         virtual property bool PackLoadingDisabled
         {
-            bool get() { return _cefSettings->pack_loading_disabled; }
+            bool get() { return _cefSettings->pack_loading_disabled == 1; }
             void set(bool value) { _cefSettings->pack_loading_disabled = value; }
         }
 

CefSharp.Core/CefSharp.Core.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\cef.sdk.3.1650.1562-pre2\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.1650.1562-pre2\build\cef.sdk.props')" />
+  <Import Project="..\packages\cef.sdk.3.1750.1738\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.1750.1738\build\cef.sdk.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -279,6 +279,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\cef.sdk.3.1650.1562-pre2\build\cef.sdk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.sdk.3.1650.1562-pre2\build\cef.sdk.props'))" />
+    <Error Condition="!Exists('..\packages\cef.sdk.3.1750.1738\build\cef.sdk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.sdk.3.1750.1738\build\cef.sdk.props'))" />
   </Target>
 </Project>

CefSharp.Core/Internals/ClientAdapter.cpp

@@ -140,7 +140,7 @@ namespace CefSharp
 
             // TODO: windows_key_code could possibly be the wrong choice here (the OnKeyEvent signature has changed since CEF1). The
             // other option would be native_key_code.
-            return handler->OnKeyEvent(_browserControl, KeyTypeToManaged(event.type), event.windows_key_code, event.modifiers, event.is_system_key);
+            return handler->OnKeyEvent(_browserControl, KeyTypeToManaged(event.type), event.windows_key_code, event.modifiers, event.is_system_key == 1);
         }
 
         bool ClientAdapter::OnPreKeyEvent(CefRefPtr<CefBrowser> browser, const CefKeyEvent& event, CefEventHandle os_event, bool* is_keyboard_shortcut)
@@ -152,7 +152,7 @@ namespace CefSharp
                 return false;
             }
 
-            return handler->OnPreKeyEvent(_browserControl, (KeyType)event.type, event.windows_key_code, event.native_key_code, event.modifiers, event.is_system_key, *is_keyboard_shortcut);
+            return handler->OnPreKeyEvent(_browserControl, (KeyType)event.type, event.windows_key_code, event.native_key_code, event.modifiers, event.is_system_key == 1, *is_keyboard_shortcut);
         }
 
         void ClientAdapter::OnLoadStart(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame)
@@ -265,8 +265,6 @@ namespace CefSharp
             }
             else if (requestResponse->Action == ResponseAction::Respond)
             {
-                CefRefPtr<StreamAdapter> adapter = new StreamAdapter(requestResponse->ResponseStream);
-
                 throw gcnew NotImplementedException("Respond is not yet supported.");
 
                 //resourceStream = CefStreamReader::CreateForHandler(static_cast<CefRefPtr<CefReadHandler>>(adapter));

CefSharp.Core/Internals/CookieVisitor.cpp

@@ -20,8 +20,8 @@ namespace CefSharp
             cookie->Value = StringUtils::ToClr(cefCookie.value);
             cookie->Domain = StringUtils::ToClr(cefCookie.domain);
             cookie->Path = StringUtils::ToClr(cefCookie.path);
-            cookie->Secure = cefCookie.secure;
-            cookie->HttpOnly = cefCookie.httponly;
+            cookie->Secure = cefCookie.secure == 1;
+            cookie->HttpOnly = cefCookie.httponly == 1;
 
             if (cefCookie.has_expires)
             {

CefSharp.Core/Internals/RenderClientAdapter.h

@@ -198,7 +198,7 @@ namespace CefSharp
                 CopyMemory(*backBufferHandle, (void*)buffer, numberOfBytes);
             };
 
-            IMPLEMENT_REFCOUNTING(RenderClientAdapterInternal)
+            IMPLEMENT_REFCOUNTING(RenderClientAdapter)
         };
     }
 }

CefSharp.Core/ManagedCefBrowserAdapter.h

@@ -48,23 +48,6 @@ namespace CefSharp
         };
 
     public:
-        property String^ DevToolsUrl
-        {
-            String^ get()
-            {
-                auto cefHost = _renderClientAdapter->TryGetCefHost();
-
-                if (cefHost != nullptr)
-                {
-                    return StringUtils::ToClr(cefHost->GetDevToolsURL(true));
-                }
-                else
-                {
-                    return nullptr;
-                }
-            }
-        }
-
         ManagedCefBrowserAdapter(IWebBrowserInternal^ webBrowserInternal)
         {
             _renderClientAdapter = new RenderClientAdapter(webBrowserInternal, gcnew Action(this, &ManagedCefBrowserAdapter::OnInitialized));

CefSharp.Core/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.sdk" version="3.1650.1562-pre2" targetFramework="Native" />
+  <package id="cef.sdk" version="3.1750.1738" targetFramework="Native" />
 </packages>