Upgrade to 3.2883.1552

Add isMainFrame to IRequestContextHandler.OnBeforePluginLoad (CEF API changed)
mars-huang · Feb 1, 2017 · 8a9b0de · 8a9b0de
1 parent 2b4840f
commit 8a9b0de
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 23 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.2883.1545\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.2883.1545\build\cef.sdk.props')" />
+  <Import Project="..\packages\cef.sdk.3.2883.1552\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.2883.1552\build\cef.sdk.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -67,7 +67,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <NuGetPackageImportStamp>f7925841</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>feb99166</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>

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.2883.1545" targetFramework="Native" />
+  <package id="cef.sdk" version="3.2883.1552" targetFramework="Native" />
 </packages>
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.2883.1545\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.2883.1545\build\cef.sdk.props')" />
+  <Import Project="..\packages\cef.sdk.3.2883.1552\build\cef.sdk.props" Condition="Exists('..\packages\cef.sdk.3.2883.1552\build\cef.sdk.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -67,7 +67,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>11.0.51106.1</_ProjectFileVersion>
-    <NuGetPackageImportStamp>2ce946f2</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>5afa3199</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>

diff --git a/CefSharp.Core/RequestContextHandler.h b/CefSharp.Core/RequestContextHandler.h
@@ -45,6 +45,7 @@ namespace CefSharp
 
         virtual bool OnBeforePluginLoad(const CefString& mime_type,
             const CefString& plugin_url,
+            bool is_main_frame,
             const CefString& top_origin_url,
             CefRefPtr<CefWebPluginInfo> plugin_info,
             CefRequestContextHandler::PluginPolicy* plugin_policy) OVERRIDE
@@ -56,6 +57,7 @@ namespace CefSharp
 
                 auto result = _requestContextHandler->OnBeforePluginLoad(StringUtils::ToClr(mime_type),
                                                                 StringUtils::ToClr(plugin_url),
+                                                                is_main_frame,
                                                                 StringUtils::ToClr(top_origin_url),
                                                                 pluginInfo,
                                                                 pluginPolicy);

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.2883.1545" targetFramework="Native" />
+  <package id="cef.sdk" version="3.2883.1552" targetFramework="Native" />
 </packages>
diff --git a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj
@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
-    <NuGetPackageImportStamp>0d9430cd</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>437304d9</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -95,6 +95,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.2883.1545\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2883.1545\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.2883.1545\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2883.1545\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x64.3.2883.1552\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2883.1552\build\cef.redist.x64.targets')" />
+  <Import Project="..\packages\cef.redist.x86.3.2883.1552\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2883.1552\build\cef.redist.x86.targets')" />
 </Project>
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.2883.1545" targetFramework="net452" />
-  <package id="cef.redist.x86" version="3.2883.1545" targetFramework="net452" />
+  <package id="cef.redist.x64" version="3.2883.1552" targetFramework="net452" />
+  <package id="cef.redist.x86" version="3.2883.1552" targetFramework="net452" />
 </packages>
diff --git a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj
@@ -21,7 +21,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>a2503883</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>1e004422</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
@@ -185,6 +185,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.2883.1545\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2883.1545\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.2883.1545\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2883.1545\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x64.3.2883.1552\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2883.1552\build\cef.redist.x64.targets')" />
+  <Import Project="..\packages\cef.redist.x86.3.2883.1552\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2883.1552\build\cef.redist.x86.targets')" />
 </Project>
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.2883.1545" targetFramework="net452" />
-  <package id="cef.redist.x86" version="3.2883.1545" targetFramework="net452" />
+  <package id="cef.redist.x64" version="3.2883.1552" targetFramework="net452" />
+  <package id="cef.redist.x86" version="3.2883.1552" targetFramework="net452" />
 </packages>
diff --git a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj
@@ -21,7 +21,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>7a75bfb3</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>b61df991</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -186,6 +186,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.2883.1545\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2883.1545\build\cef.redist.x64.targets')" />
-  <Import Project="..\packages\cef.redist.x86.3.2883.1545\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2883.1545\build\cef.redist.x86.targets')" />
+  <Import Project="..\packages\cef.redist.x64.3.2883.1552\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2883.1552\build\cef.redist.x64.targets')" />
+  <Import Project="..\packages\cef.redist.x86.3.2883.1552\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2883.1552\build\cef.redist.x86.targets')" />
 </Project>
diff --git a/CefSharp.Wpf.Example/Handlers/RequestContextHandler.cs b/CefSharp.Wpf.Example/Handlers/RequestContextHandler.cs
@@ -6,7 +6,7 @@ namespace CefSharp.Wpf.Example.Handlers
 {
     public class RequestContextHandler : IRequestContextHandler
     {
-        bool IRequestContextHandler.OnBeforePluginLoad(string mimeType, string url, string topOriginUrl, WebPluginInfo pluginInfo, ref PluginPolicy pluginPolicy)
+        bool IRequestContextHandler.OnBeforePluginLoad(string mimeType, string url, bool isMainFrame, string topOriginUrl, WebPluginInfo pluginInfo, ref PluginPolicy pluginPolicy)
         {
             //pluginPolicy = PluginPolicy.Disable;
             //return true;

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.2883.1545" targetFramework="net452" />
-  <package id="cef.redist.x86" version="3.2883.1545" targetFramework="net452" />
+  <package id="cef.redist.x64" version="3.2883.1552" targetFramework="net452" />
+  <package id="cef.redist.x86" version="3.2883.1552" targetFramework="net452" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
   <package id="MvvmLightLibs" version="5.1.1.0" targetFramework="net45" />
 </packages>
diff --git a/CefSharp/IRequestContextHandler.cs b/CefSharp/IRequestContextHandler.cs
@@ -27,10 +27,11 @@ public interface IRequestContextHandler
         /// </summary>
         /// <param name="mimeType">is the mime type of the plugin that will be loaded</param>
         /// <param name="url">is the content URL that the plugin will load and may be empty</param>
+        /// <param name="isMainFrame">will be true if the plugin is being loaded in the main (top-level) frame</param>
         /// <param name="topOriginUrl">is the URL for the top-level frame that contains the plugin</param>
         /// <param name="pluginInfo">includes additional information about the plugin that will be loaded</param>
         /// <param name="pluginPolicy">Modify and return true to change the policy.</param>
         /// <returns>Return false to use the recommended policy. Modify and return true to change the policy.</returns>
-        bool OnBeforePluginLoad(string mimeType, string url, string topOriginUrl, WebPluginInfo pluginInfo, ref PluginPolicy pluginPolicy);
+        bool OnBeforePluginLoad(string mimeType, string url, bool isMainFrame, string topOriginUrl, WebPluginInfo pluginInfo, ref PluginPolicy pluginPolicy);
     }
 }