From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebKit2/Shared/Plugins/PluginModuleInfo.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/WebKit2/Shared/Plugins/PluginModuleInfo.h') diff --git a/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h b/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h index bc0302957..e5360f8d4 100644 --- a/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h +++ b/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h @@ -23,12 +23,11 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PluginModuleInfo_h -#define PluginModuleInfo_h +#pragma once #include -#if PLATFORM(MAC) +#if PLATFORM(COCOA) #include #endif @@ -43,22 +42,23 @@ enum PluginModuleLoadPolicy { // The plug-in should be blocked from being instantiated. // Note that the plug-in will still be seen by e.g. navigator.plugins - PluginModuleBlocked, + PluginModuleBlockedForSecurity, + PluginModuleBlockedForCompatibility, }; struct PluginModuleInfo { String path; WebCore::PluginInfo info; -#if PLATFORM(MAC) +#if PLATFORM(COCOA) cpu_type_t pluginArchitecture; String bundleIdentifier; String versionString; String shortVersionString; - String preferencePanePath; + bool hasSandboxProfile; +#elif PLATFORM(GTK) + bool requiresGtk2; #endif }; } // namespace WebKit - -#endif // PluginModuleInfo_h -- cgit v1.2.1