Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Cef Version 59.0.0 #2114

Merged
merged 11 commits into from
Oct 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
8 changes: 4 additions & 4 deletions CefSharp.BrowserSubprocess.Core/Resource.rc
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.BrowserSubprocess.Core/packages.config
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 3 additions & 3 deletions CefSharp.BrowserSubprocess/app.manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>

<asmv1:assembly
manifestVersion="1.0"
Expand All @@ -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">
Expand Down Expand Up @@ -48,4 +48,4 @@
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application>
</compatibility>
</asmv1:assembly>
</asmv1:assembly>
9 changes: 4 additions & 5 deletions CefSharp.Core/CefSharp.Core.vcxproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
4 changes: 2 additions & 2 deletions CefSharp.Core/CefSharp.Core.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 3 additions & 3 deletions CefSharp.Core/Internals/CefBrowserHostWrapper.cpp
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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)
Expand Down Expand Up @@ -603,4 +603,4 @@ int CefBrowserHostWrapper::GetCefKeyboardModifiers(WPARAM wparam, LPARAM lparam)
break;
}
return modifiers;
}
}
9 changes: 4 additions & 5 deletions CefSharp.Core/ManagedCefBrowserAdapter.cpp
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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.");
}
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions CefSharp.Core/Resource.rc
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down
16 changes: 2 additions & 14 deletions CefSharp.Core/WindowInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Core/packages.config
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 5 additions & 4 deletions CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<NuGetPackageImportStamp>8b6c24fc</NuGetPackageImportStamp>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion CefSharp.OffScreen.Example/app.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions CefSharp.OffScreen.Example/packages.config
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 5 additions & 4 deletions CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
6 changes: 3 additions & 3 deletions CefSharp.WinForms.Example/app.manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>

<asmv1:assembly
manifestVersion="1.0"
Expand All @@ -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>
Expand Down Expand Up @@ -55,4 +55,4 @@
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application>
</compatibility>
</asmv1:assembly>
</asmv1:assembly>
4 changes: 2 additions & 2 deletions CefSharp.WinForms.Example/packages.config
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 5 additions & 4 deletions CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion CefSharp.Wpf.Example/app.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions CefSharp.Wpf.Example/packages.config
Original file line number Diff line number Diff line change
@@ -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>
Loading