Dotnet/CefSharp.MinimalExample
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21 from cefsharp/cefsharp/43

Browse Source 
Upgrade to 43.0.0 Release
This commit is contained in:
Alex Maitland
2015-09-21 10:43:56 +10:00
parent 08f4d67e59 33f4cf9492
commit 12109da067
8 changed files with 61 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CefSharp.MinimalExample.OffScreen/CefSharp.MinimalExample.OffScreen.csproj
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.OffScreen.41.0.1\build\CefSharp.OffScreen.props" Condition="Exists('..\packages\CefSharp.OffScreen.41.0.1\build\CefSharp.OffScreen.props')" /> <Import Project="..\packages\CefSharp.OffScreen.43.0.0\build\CefSharp.OffScreen.props" Condition="Exists('..\packages\CefSharp.OffScreen.43.0.0\build\CefSharp.OffScreen.props')" />
<Import Project="..\packages\CefSharp.Common.41.0.1\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.41.0.1\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -82,7 +82,7 @@
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\cef.redist.x86.3.2272.32\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2272.32\build\cef.redist.x86.targets')" /> <Import Project="..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x64.3.2272.32\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2272.32\build\cef.redist.x64.targets')" /> <Import Project="..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.41.0.1\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.41.0.1\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.targets')" />
</Project> </Project>

54
CefSharp.MinimalExample.OffScreen/Program.cs
View File

@@ -5,6 +5,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Threading;
using CefSharp.OffScreen; using CefSharp.OffScreen;
namespace CefSharp.MinimalExample.OffScreen namespace CefSharp.MinimalExample.OffScreen
@@ -28,7 +29,7 @@ namespace CefSharp.MinimalExample.OffScreen
// An event that is fired when the first page is finished loading. // An event that is fired when the first page is finished loading.
// This returns to us from another thread. // This returns to us from another thread.
browser.FrameLoadEnd += BrowserFrameLoadEnd; browser.LoadingStateChanged += BrowserLoadingStateChanged;
// We have to wait for something, otherwise the process will exit too soon. // We have to wait for something, otherwise the process will exit too soon.
Console.ReadKey(); Console.ReadKey();
@@ -38,39 +39,48 @@ namespace CefSharp.MinimalExample.OffScreen
Cef.Shutdown(); Cef.Shutdown();
} }
private static void BrowserFrameLoadEnd(object sender, FrameLoadEndEventArgs e) private static void BrowserLoadingStateChanged(object sender, LoadingStateChangedEventArgs e)
{ {
// Check to ensure it is the main frame which has finished loading // Check to see if loading is complete - this event is called twice, one when loading starts
// second time when it's finished
// (rather than an iframe within the main frame). // (rather than an iframe within the main frame).
if (e.IsMainFrame) if (!e.IsLoading)
{ {
// Remove the load event handler, because we only want one snapshot of the initial page. // Remove the load event handler, because we only want one snapshot of the initial page.
browser.FrameLoadEnd -= BrowserFrameLoadEnd; browser.LoadingStateChanged -= BrowserLoadingStateChanged;
// Wait for the screenshot to be taken. var scriptTask = browser.EvaluateScriptAsync("document.getElementById('lst-ib').value = 'CefSharp Was Here!'");
var task = browser.ScreenshotAsync();
task.Wait();
// Make a file to save it to (e.g. C:\Users\jan\Desktop\CefSharp screenshot.png) scriptTask.ContinueWith(t =>
var screenshotPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "CefSharp screenshot.png"); {
//Give the browser a little time to render
Thread.Sleep(500);
// Wait for the screenshot to be taken.
var task = browser.ScreenshotAsync();
task.ContinueWith(x =>
{
// Make a file to save it to (e.g. C:\Users\jan\Desktop\CefSharp screenshot.png)
var screenshotPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "CefSharp screenshot.png");
Console.WriteLine(); Console.WriteLine();
Console.WriteLine("Screenshot ready. Saving to {0}", screenshotPath); Console.WriteLine("Screenshot ready. Saving to {0}", screenshotPath);
// Save the Bitmap to the path. // Save the Bitmap to the path.
// The image type is auto-detected via the ".png" extension. // The image type is auto-detected via the ".png" extension.
task.Result.Save(screenshotPath); task.Result.Save(screenshotPath);
// We no longer need the Bitmap. // We no longer need the Bitmap.
// Dispose it to avoid keeping the memory alive. Especially important in 32-bit applications. // Dispose it to avoid keeping the memory alive. Especially important in 32-bit applications.
task.Result.Dispose(); task.Result.Dispose();
Console.WriteLine("Screenshot saved. Launching your default image viewer..."); Console.WriteLine("Screenshot saved. Launching your default image viewer...");
// Tell Windows to launch the saved image. // Tell Windows to launch the saved image.
Process.Start(screenshotPath); Process.Start(screenshotPath);
Console.WriteLine("Image viewer launched. Press any key to exit."); Console.WriteLine("Image viewer launched. Press any key to exit.");
});
});
} }
} }
} }

8
CefSharp.MinimalExample.OffScreen/packages.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="cef.redist.x64" version="3.2272.32" targetFramework="net40-Client" /> <package id="cef.redist.x64" version="3.2357.1287" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2272.32" targetFramework="net40-Client" /> <package id="cef.redist.x86" version="3.2357.1287" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="41.0.1" targetFramework="net40-Client" /> <package id="CefSharp.Common" version="43.0.0" targetFramework="net40-Client" />
<package id="CefSharp.OffScreen" version="41.0.1" targetFramework="net40-Client" /> <package id="CefSharp.OffScreen" version="43.0.0" targetFramework="net40-Client" />
</packages> </packages>

4
CefSharp.MinimalExample.WinForms/BrowserForm.cs
View File

@@ -26,7 +26,7 @@ namespace CefSharp.MinimalExample.WinForms
}; };
toolStripContainer.ContentPanel.Controls.Add(browser); toolStripContainer.ContentPanel.Controls.Add(browser);
browser.NavStateChanged += OnBrowserNavStateChanged; browser.LoadingStateChanged += OnLoadingStateChanged;
browser.ConsoleMessage += OnBrowserConsoleMessage; browser.ConsoleMessage += OnBrowserConsoleMessage;
browser.StatusMessage += OnBrowserStatusMessage; browser.StatusMessage += OnBrowserStatusMessage;
browser.TitleChanged += OnBrowserTitleChanged; browser.TitleChanged += OnBrowserTitleChanged;
@@ -47,7 +47,7 @@ namespace CefSharp.MinimalExample.WinForms
this.InvokeOnUiThreadIfRequired(() => statusLabel.Text = args.Value); this.InvokeOnUiThreadIfRequired(() => statusLabel.Text = args.Value);
} }
private void OnBrowserNavStateChanged(object sender, NavStateChangedEventArgs args) private void OnLoadingStateChanged(object sender, LoadingStateChangedEventArgs args)
{ {
SetCanGoBack(args.CanGoBack); SetCanGoBack(args.CanGoBack);
SetCanGoForward(args.CanGoForward); SetCanGoForward(args.CanGoForward);

10
CefSharp.MinimalExample.WinForms/CefSharp.MinimalExample.WinForms.csproj
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.WinForms.41.0.1\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.41.0.1\build\CefSharp.WinForms.props')" /> <Import Project="..\packages\CefSharp.WinForms.43.0.0\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.43.0.0\build\CefSharp.WinForms.props')" />
<Import Project="..\packages\CefSharp.Common.41.0.1\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.41.0.1\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -98,7 +98,7 @@
<None Include="Resources\chromium-256.png" /> <None Include="Resources\chromium-256.png" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\cef.redist.x86.3.2272.32\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2272.32\build\cef.redist.x86.targets')" /> <Import Project="..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x64.3.2272.32\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2272.32\build\cef.redist.x64.targets')" /> <Import Project="..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.41.0.1\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.41.0.1\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.targets')" />
</Project> </Project>

8
CefSharp.MinimalExample.WinForms/packages.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="cef.redist.x64" version="3.2272.32" targetFramework="net40-Client" /> <package id="cef.redist.x64" version="3.2357.1287" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2272.32" targetFramework="net40-Client" /> <package id="cef.redist.x86" version="3.2357.1287" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="41.0.1" targetFramework="net40-Client" /> <package id="CefSharp.Common" version="43.0.0" targetFramework="net40-Client" />
<package id="CefSharp.WinForms" version="41.0.1" targetFramework="net40-Client" /> <package id="CefSharp.WinForms" version="43.0.0" targetFramework="net40-Client" />
</packages> </packages>

10
CefSharp.MinimalExample.Wpf/CefSharp.MinimalExample.Wpf.csproj
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\CefSharp.Wpf.41.0.1\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.41.0.1\build\CefSharp.Wpf.props')" /> <Import Project="..\packages\CefSharp.Wpf.43.0.0\build\CefSharp.Wpf.props" Condition="Exists('..\packages\CefSharp.Wpf.43.0.0\build\CefSharp.Wpf.props')" />
<Import Project="..\packages\CefSharp.Common.41.0.1\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.41.0.1\build\CefSharp.Common.props')" /> <Import Project="..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -132,9 +132,9 @@
<Resource Include="chromium-256.ico" /> <Resource Include="chromium-256.ico" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\cef.redist.x86.3.2272.32\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2272.32\build\cef.redist.x86.targets')" /> <Import Project="..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2357.1287\build\cef.redist.x86.targets')" />
<Import Project="..\packages\cef.redist.x64.3.2272.32\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2272.32\build\cef.redist.x64.targets')" /> <Import Project="..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2357.1287\build\cef.redist.x64.targets')" />
<Import Project="..\packages\CefSharp.Common.41.0.1\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.41.0.1\build\CefSharp.Common.targets')" /> <Import Project="..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.43.0.0\build\CefSharp.Common.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

8
CefSharp.MinimalExample.Wpf/packages.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="cef.redist.x64" version="3.2272.32" targetFramework="net40-Client" /> <package id="cef.redist.x64" version="3.2357.1287" targetFramework="net40-Client" />
<package id="cef.redist.x86" version="3.2272.32" targetFramework="net40-Client" /> <package id="cef.redist.x86" version="3.2357.1287" targetFramework="net40-Client" />
<package id="CefSharp.Common" version="41.0.1" targetFramework="net40-Client" /> <package id="CefSharp.Common" version="43.0.0" targetFramework="net40-Client" />
<package id="CefSharp.Wpf" version="41.0.1" targetFramework="net40-Client" /> <package id="CefSharp.Wpf" version="43.0.0" targetFramework="net40-Client" />
</packages> </packages>