From 2ded106d59250af124026c8b0d725b717a9123b5 Mon Sep 17 00:00:00 2001 From: amaitland Date: Wed, 1 Feb 2017 13:53:43 +1000 Subject: [PATCH] Upgrade to 3.2883.1552 Add isMainFrame to IRequestContextHandler.OnBeforePluginLoad (CEF API changed) --- .../CefSharp.BrowserSubprocess.Core.vcxproj | 4 ++-- CefSharp.BrowserSubprocess.Core/packages.config | 2 +- CefSharp.Core/CefSharp.Core.vcxproj | 4 ++-- CefSharp.Core/RequestContextHandler.h | 2 ++ CefSharp.Core/packages.config | 2 +- .../CefSharp.OffScreen.Example.csproj | 6 +++--- CefSharp.OffScreen.Example/packages.config | 4 ++-- CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj | 6 +++--- CefSharp.WinForms.Example/packages.config | 4 ++-- CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj | 6 +++--- CefSharp.Wpf.Example/Handlers/RequestContextHandler.cs | 2 +- CefSharp.Wpf.Example/packages.config | 4 ++-- CefSharp/IRequestContextHandler.cs | 3 ++- 13 files changed, 26 insertions(+), 23 deletions(-) diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj index 6261032f3e..a582e82f9a 100644 --- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj +++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj @@ -1,6 +1,6 @@  - + Debug @@ -67,7 +67,7 @@ - f7925841 + feb99166 true diff --git a/CefSharp.BrowserSubprocess.Core/packages.config b/CefSharp.BrowserSubprocess.Core/packages.config index 5fc8e484e4..2278db0cbd 100644 --- a/CefSharp.BrowserSubprocess.Core/packages.config +++ b/CefSharp.BrowserSubprocess.Core/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/CefSharp.Core/CefSharp.Core.vcxproj b/CefSharp.Core/CefSharp.Core.vcxproj index b0c3992280..b06b3e7e75 100644 --- a/CefSharp.Core/CefSharp.Core.vcxproj +++ b/CefSharp.Core/CefSharp.Core.vcxproj @@ -1,6 +1,6 @@  - + Debug @@ -67,7 +67,7 @@ <_ProjectFileVersion>11.0.51106.1 - 2ce946f2 + 5afa3199 bin\$(Platform)\$(Configuration)\ diff --git a/CefSharp.Core/RequestContextHandler.h b/CefSharp.Core/RequestContextHandler.h index c620752363..73c14c5f03 100644 --- 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 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 index 5fc8e484e4..2278db0cbd 100644 --- a/CefSharp.Core/packages.config +++ b/CefSharp.Core/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj index a124694e4a..2315547b0a 100644 --- a/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj +++ b/CefSharp.OffScreen.Example/CefSharp.OffScreen.Example.csproj @@ -13,7 +13,7 @@ 512 - 0d9430cd + 437304d9 true @@ -95,6 +95,6 @@ - - + + \ No newline at end of file diff --git a/CefSharp.OffScreen.Example/packages.config b/CefSharp.OffScreen.Example/packages.config index 4c03e6d789..a51aa027f4 100644 --- a/CefSharp.OffScreen.Example/packages.config +++ b/CefSharp.OffScreen.Example/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj index af51df4438..d7d62eb7df 100644 --- a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj +++ b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.csproj @@ -21,7 +21,7 @@ 3.5 Client - a2503883 + 1e004422 x64 @@ -185,6 +185,6 @@ - - + + \ No newline at end of file diff --git a/CefSharp.WinForms.Example/packages.config b/CefSharp.WinForms.Example/packages.config index 4c03e6d789..a51aa027f4 100644 --- a/CefSharp.WinForms.Example/packages.config +++ b/CefSharp.WinForms.Example/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj index 4aa9fe22a8..060aeff1a1 100644 --- a/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj +++ b/CefSharp.Wpf.Example/CefSharp.Wpf.Example.csproj @@ -21,7 +21,7 @@ 3.5 Client - 7a75bfb3 + b61df991 true @@ -186,6 +186,6 @@ - - + + \ No newline at end of file diff --git a/CefSharp.Wpf.Example/Handlers/RequestContextHandler.cs b/CefSharp.Wpf.Example/Handlers/RequestContextHandler.cs index 53b901764c..8f1267bf62 100644 --- 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 index 4d05da08e7..abb9e5cc67 100644 --- a/CefSharp.Wpf.Example/packages.config +++ b/CefSharp.Wpf.Example/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/CefSharp/IRequestContextHandler.cs b/CefSharp/IRequestContextHandler.cs index 9931423f91..af975ee0d2 100644 --- a/CefSharp/IRequestContextHandler.cs +++ b/CefSharp/IRequestContextHandler.cs @@ -27,10 +27,11 @@ public interface IRequestContextHandler /// /// is the mime type of the plugin that will be loaded /// is the content URL that the plugin will load and may be empty + /// will be true if the plugin is being loaded in the main (top-level) frame /// is the URL for the top-level frame that contains the plugin /// includes additional information about the plugin that will be loaded /// Modify and return true to change the policy. /// Return false to use the recommended policy. Modify and return true to change the policy. - 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); } }