Merge pull request #2114 from GrabzIt/master

Update to Cef Version 59.0.0
cefsharp · Oct 7, 2017 · 653896a · 653896a
2 parents 8a14405 + f76f4d9
commit 653896a
Show file tree

Hide file tree

Showing 24 changed files with 68 additions and 84 deletions.
diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\cef.sdk.3.3029.1611\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.3029.1611\build\cef.sdk.props')" />
+  <Import Project="..\packages\cef.sdk.3.3071.1649\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.3071.1649\build\cef.sdk.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -66,9 +66,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <NuGetPackageImportStamp>0c266be5</NuGetPackageImportStamp>
-  </PropertyGroup>
+  <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <LinkKeyFile>..\CefSharp.snk</LinkKeyFile>
@@ -221,11 +219,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <ResourceCompile Include="Resource.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Resource.rc" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>
diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj.filters b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj.filters
@@ -153,9 +153,9 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <ResourceCompile Include="Resource.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Resource.rc" />
+    <None Include="packages.config" />
   </ItemGroup>
 </Project>
diff --git a/CefSharp.BrowserSubprocess.Core/Resource.rc b/CefSharp.BrowserSubprocess.Core/Resource.rc
@@ -1,6 +1,6 @@
 1 VERSIONINFO
- FILEVERSION 58.0.0
- PRODUCTVERSION 58.0.0
+ FILEVERSION 59.0.0
+ PRODUCTVERSION 59.0.0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -16,10 +16,10 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "CefSharp.BrowserSubprocess.Core"
-            VALUE "FileVersion", "58.0.0"
+            VALUE "FileVersion", "59.0.0"
             VALUE "LegalCopyright", "Copyright © 2010-2017 The CefSharp Authors"
             VALUE "ProductName", "CefSharp"
-            VALUE "ProductVersion", "58.0.0"
+            VALUE "ProductVersion", "59.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/CefSharp.BrowserSubprocess.Core/packages.config b/CefSharp.BrowserSubprocess.Core/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.sdk" version="3.3029.1611" targetFramework="Native" />
+  <package id="cef.sdk" version="3.3071.1649" targetFramework="native" />
 </packages>
diff --git a/CefSharp.BrowserSubprocess/app.manifest b/CefSharp.BrowserSubprocess/app.manifest
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <asmv1:assembly
     manifestVersion="1.0"
@@ -8,7 +8,7 @@
     xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <assemblyIdentity version="58.0.0.0" name="CefSharp.BrowserSubprocess.app" />
+  <assemblyIdentity version="59.0.0.0" name="CefSharp.BrowserSubprocess.app" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
@@ -48,4 +48,4 @@
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
     </application>
   </compatibility>
-</asmv1:assembly>
+</asmv1:assembly>
diff --git a/CefSharp.Core/CefSharp.Core.vcxproj b/CefSharp.Core/CefSharp.Core.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\cef.sdk.3.3029.1611\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.3029.1611\build\cef.sdk.props')" />
+  <Import Project="..\packages\cef.sdk.3.3071.1649\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.3071.1649\build\cef.sdk.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -67,7 +67,6 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>11.0.51106.1</_ProjectFileVersion>
-    <NuGetPackageImportStamp>892d6872</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
@@ -329,11 +328,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <ResourceCompile Include="Resource.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Resource.rc" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>
diff --git a/CefSharp.Core/CefSharp.Core.vcxproj.filters b/CefSharp.Core/CefSharp.Core.vcxproj.filters
@@ -284,9 +284,9 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <ResourceCompile Include="Resource.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Resource.rc" />
+    <None Include="packages.config" />
   </ItemGroup>
 </Project>
diff --git a/CefSharp.Core/Internals/CefBrowserHostWrapper.cpp b/CefSharp.Core/Internals/CefBrowserHostWrapper.cpp
@@ -1,4 +1,4 @@
-// Copyright © 2010-2017 The CefSharp Authors. All rights reserved.
+// Copyright © 2010-2017 The CefSharp Authors. All rights reserved.
 //
 // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 
@@ -20,7 +20,7 @@ void CefBrowserHostWrapper::DragTargetDragEnter(IDragData^ dragData, MouseEvent
 
     auto dragDataWrapper = static_cast<CefDragDataWrapper^>(dragData);
     dragDataWrapper->ResetFileContents(); // Recommended by documentation to reset before calling DragEnter
-    _browserHost->DragTargetDragEnter(dragDataWrapper, GetCefMouseEvent(mouseEvent), (CefBrowserHost::DragOperationsMask) allowedOperations);
+    _browserHost->DragTargetDragEnter(static_cast<CefRefPtr<CefDragData>>(dragDataWrapper), GetCefMouseEvent(mouseEvent), (CefBrowserHost::DragOperationsMask) allowedOperations);
 }
 
 void CefBrowserHostWrapper::DragTargetDragOver(MouseEvent mouseEvent, DragOperationsMask allowedOperations)
@@ -603,4 +603,4 @@ int CefBrowserHostWrapper::GetCefKeyboardModifiers(WPARAM wparam, LPARAM lparam)
         break;
     }
     return modifiers;
-}
+}
diff --git a/CefSharp.Core/ManagedCefBrowserAdapter.cpp b/CefSharp.Core/ManagedCefBrowserAdapter.cpp
@@ -1,4 +1,4 @@
-// Copyright © 2010-2017 The CefSharp Authors. All rights reserved.
+// Copyright © 2010-2017 The CefSharp Authors. All rights reserved.
 //
 // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 
@@ -25,12 +25,11 @@ void ManagedCefBrowserAdapter::CreateOffscreenBrowser(IntPtr windowHandle, Brows
     auto hwnd = static_cast<HWND>(windowHandle.ToPointer());
 
     CefWindowInfo window;
-    auto transparent = browserSettings->OffScreenTransparentBackground.GetValueOrDefault(true);
-    window.SetAsWindowless(hwnd, transparent);
+    window.SetAsWindowless(hwnd);
     CefString addressNative = StringUtils::ToNative(address);
 
     if (!CefBrowserHost::CreateBrowser(window, _clientAdapter.get(), addressNative,
-        *browserSettings->_browserSettings, requestContext))
+        *browserSettings->_browserSettings, static_cast<CefRefPtr<CefRequestContext>>(requestContext)))
     {
         throw gcnew InvalidOperationException("Failed to create offscreen browser. Call Cef.Initialize() first.");
     }
@@ -78,7 +77,7 @@ void ManagedCefBrowserAdapter::CreateBrowser(BrowserSettings^ browserSettings, R
     CefString addressNative = StringUtils::ToNative(address);
 
     CefBrowserHost::CreateBrowser(window, _clientAdapter.get(), addressNative,
-        *browserSettings->_browserSettings, requestContext);
+        *browserSettings->_browserSettings, static_cast<CefRefPtr<CefRequestContext>>(requestContext));
 }
 
 void ManagedCefBrowserAdapter::Resize(int width, int height)

diff --git a/CefSharp.Core/Resource.rc b/CefSharp.Core/Resource.rc
@@ -1,6 +1,6 @@
 1 VERSIONINFO
- FILEVERSION 58.0.0
- PRODUCTVERSION 58.0.0
+ FILEVERSION 59.0.0
+ PRODUCTVERSION 59.0.0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -16,10 +16,10 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "CefSharp.Core"
-            VALUE "FileVersion", "58.0.0"
+            VALUE "FileVersion", "59.0.0"
             VALUE "LegalCopyright", "Copyright © 2010-2017 The CefSharp Authors"
             VALUE "ProductName", "CefSharp"
-            VALUE "ProductVersion", "58.0.0"
+            VALUE "ProductVersion", "59.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/CefSharp.Core/WindowInfo.h b/CefSharp.Core/WindowInfo.h
@@ -131,18 +131,6 @@ namespace CefSharp
             }
         }
 
-        virtual property bool TransparentPaintingEnabled
-        {
-            bool get()
-            {
-                return _windowInfo->transparent_painting_enabled == 1;
-            }
-            void set(bool transparentPaintingEnabled)
-            {
-                _windowInfo->transparent_painting_enabled = transparentPaintingEnabled;
-            }
-        }
-
         virtual property bool WindowlessRenderingEnabled
         {
             bool get()
@@ -170,9 +158,9 @@ namespace CefSharp
             _windowInfo->SetAsPopup((HWND)parentHandle.ToPointer(), StringUtils::ToNative(windowName));
         }
 
-        virtual void SetAsWindowless(IntPtr parentHandle, bool transparent)
+        virtual void SetAsWindowless(IntPtr parentHandle)
         {
-            _windowInfo->SetAsWindowless((HWND)parentHandle.ToPointer(), transparent);
+            _windowInfo->SetAsWindowless((HWND)parentHandle.ToPointer());
         }
 
         CefWindowInfo* GetWindowInfo()

diff --git a/CefSharp.Core/packages.config b/CefSharp.Core/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.sdk" version="3.3029.1611" targetFramework="Native" />
+  <package id="cef.sdk" version="3.3071.1649" targetFramework="native" />
 </packages>
diff --git a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj
@@ -13,7 +13,8 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
-    <NuGetPackageImportStamp>8b6c24fc</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -95,6 +96,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\CefSharp.props" />
   <Import Project="$(SolutionDir)\CefSharp.Native.props" />
-  <Import Project="..\packages\cef.redist.x64.3.3029.1611\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.3029.1611\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.3029.1611\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.3029.1611\build\cef.redist.x86.targets')" />
-</Project>
+  <Import Project="..\packages\cef.redist.x64.3.3071.1649\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.3071.1649\build\cef.redist.x64.targets')" />
+  <Import Project="..\packages\cef.redist.x86.3.3071.1649\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.3071.1649\build\cef.redist.x86.targets')" />
+</Project>
diff --git a/CefSharp.OffScreen.Example/app.manifest b/CefSharp.OffScreen.Example/app.manifest
@@ -7,7 +7,7 @@
   xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <assemblyIdentity version="58.0.0.0" name="CefSharp.OffScreen.Example.app" />
+  <assemblyIdentity version="59.0.0.0" name="CefSharp.OffScreen.Example.app" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

diff --git a/CefSharp.OffScreen.Example/packages.config b/CefSharp.OffScreen.Example/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.3029.1611" targetFramework="net452" />
-  <package id="cef.redist.x86" version="3.3029.1611" targetFramework="net452" />
+  <package id="cef.redist.x64" version="3.3071.1649" targetFramework="net452" />
+  <package id="cef.redist.x86" version="3.3071.1649" targetFramework="net452" />
 </packages>
diff --git a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj
@@ -21,7 +21,8 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>5f632012</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
@@ -185,6 +186,6 @@
   <Import Project="$(SolutionDir)\CefSharp.Native.props" />
   <Import Project="..\packages\cef.redist.x64.3.2272.30\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2272.30\build\cef.redist.x64.targets')" />
   <Import Project="..\packages\cef.redist.x86.3.2272.30\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2272.30\build\cef.redist.x86.targets')" />
-  <Import Project="..\packages\cef.redist.x64.3.3029.1611\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.3029.1611\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.3029.1611\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.3029.1611\build\cef.redist.x86.targets')" />
-</Project>
+  <Import Project="..\packages\cef.redist.x64.3.3071.1649\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.3071.1649\build\cef.redist.x64.targets')" />
+  <Import Project="..\packages\cef.redist.x86.3.3071.1649\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.3071.1649\build\cef.redist.x86.targets')" />
+</Project>
diff --git a/CefSharp.WinForms.Example/app.manifest b/CefSharp.WinForms.Example/app.manifest
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <asmv1:assembly
     manifestVersion="1.0"
@@ -8,7 +8,7 @@
     xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <assemblyIdentity version="58.0.0.0" name="CefSharp.WinForms.Example.app" />
+  <assemblyIdentity version="59.0.0.0" name="CefSharp.WinForms.Example.app" />
 
   <dependency>
     <dependentAssembly>
@@ -55,4 +55,4 @@
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
     </application>
   </compatibility>
-</asmv1:assembly>
+</asmv1:assembly>
diff --git a/CefSharp.WinForms.Example/packages.config b/CefSharp.WinForms.Example/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.3029.1611" targetFramework="net452" />
-  <package id="cef.redist.x86" version="3.3029.1611" targetFramework="net452" />
+  <package id="cef.redist.x64" version="3.3071.1649" targetFramework="net452" />
+  <package id="cef.redist.x86" version="3.3071.1649" targetFramework="net452" />
 </packages>
diff --git a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj
@@ -21,7 +21,8 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>a03680f0</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -187,6 +188,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\CefSharp.props" />
   <Import Project="$(SolutionDir)\CefSharp.Native.props" />
-  <Import Project="..\packages\cef.redist.x64.3.3029.1611\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.3029.1611\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.3029.1611\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.3029.1611\build\cef.redist.x86.targets')" />
-</Project>
+  <Import Project="..\packages\cef.redist.x64.3.3071.1649\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.3071.1649\build\cef.redist.x64.targets')" />
+  <Import Project="..\packages\cef.redist.x86.3.3071.1649\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.3071.1649\build\cef.redist.x86.targets')" />
+</Project>
diff --git a/CefSharp.Wpf.Example/app.manifest b/CefSharp.Wpf.Example/app.manifest
@@ -7,7 +7,7 @@
   xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <assemblyIdentity version="58.0.0.0" name="CefSharp.Wpf.Example.app" />
+  <assemblyIdentity version="59.0.0.0" name="CefSharp.Wpf.Example.app" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

diff --git a/CefSharp.Wpf.Example/packages.config b/CefSharp.Wpf.Example/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.3029.1611" targetFramework="net452" />
-  <package id="cef.redist.x86" version="3.3029.1611" targetFramework="net452" />
+  <package id="cef.redist.x64" version="3.3071.1649" targetFramework="net452" />
+  <package id="cef.redist.x86" version="3.3071.1649" targetFramework="net452" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
   <package id="MvvmLightLibs" version="5.1.1.0" targetFramework="net45" />
 </packages>