Diff
Modified: trunk/Source/WebKit2/ChangeLog (117094 => 117095)
--- trunk/Source/WebKit2/ChangeLog 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-15 18:04:06 UTC (rev 117095)
@@ -1,3 +1,42 @@
+2012-05-15 Andy Estes <[email protected]>
+
+ Guard Netscape plug-in code with ENABLE(NETSCAPE_PLUGIN_API)
+ https://bugs.webkit.org/show_bug.cgi?id=86496
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/Plugins/Netscape/NetscapePluginModule.cpp:
+ * Shared/Plugins/Netscape/NetscapePluginModule.h:
+ * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+ * Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp:
+ * Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
+ * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+ (WebKit::PluginInfoStore::individualPluginPaths):
+ (WebKit::PluginInfoStore::getPluginInfo):
+ * WebProcess/Plugins/Netscape/JSNPMethod.cpp:
+ * WebProcess/Plugins/Netscape/JSNPMethod.h:
+ * WebProcess/Plugins/Netscape/JSNPObject.cpp:
+ * WebProcess/Plugins/Netscape/JSNPObject.h:
+ * WebProcess/Plugins/Netscape/NPJSObject.cpp:
+ * WebProcess/Plugins/Netscape/NPJSObject.h:
+ * WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:
+ * WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h:
+ * WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp:
+ * WebProcess/Plugins/Netscape/NPRuntimeUtilities.h:
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h:
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ * WebProcess/Plugins/Netscape/NetscapePluginNone.cpp:
+ * WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:
+ * WebProcess/Plugins/Netscape/NetscapePluginStream.h:
+ * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+ * WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h:
+ * WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm:
+ * WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp:
+ * WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp:
+ * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+
2012-05-14 Andy Estes <[email protected]>
Guard some AppKit-specific code in WebKit2 with USE(APPKIT)
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp (117094 => 117095)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#include "config.h"
#include "NetscapePluginModule.h"
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include "Module.h"
#include "NPRuntimeUtilities.h"
#include "NetscapeBrowserFuncs.h"
@@ -269,3 +271,4 @@
} // namespace WebKit
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h (117094 => 117095)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#ifndef NetscapePluginModule_h
#define NetscapePluginModule_h
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include "Module.h"
#include "PluginModuleInfo.h"
#include "PluginQuirks.h"
@@ -99,4 +101,6 @@
} // namespace WebKit
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
#endif // NetscapePluginModule_h
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (117094 => 117095)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#import "config.h"
#import "NetscapePluginModule.h"
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#import "PluginProcessProxy.h"
#import <WebCore/WebCoreNSStringExtras.h>
#import <wtf/HashSet.h>
@@ -526,3 +528,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp (117094 => 117095)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#include "config.h"
#include "NetscapePluginModule.h"
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include <WebCore/FileSystem.h>
#include <wtf/OwnArrayPtr.h>
@@ -139,3 +141,4 @@
} // namespace WebKit
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (117094 => 117095)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -24,7 +24,7 @@
*/
#include "config.h"
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
#include "NetscapePluginModule.h"
@@ -225,4 +225,4 @@
} // namespace WebKit
-#endif // PLUGIN_ARCHITECTURE(X11)
+#endif // PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm (117094 => 117095)
--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,12 +26,15 @@
#import "config.h"
#import "PluginInfoStore.h"
-#import "NetscapePluginModule.h"
#import "WebKitSystemInterface.h"
#import <WebCore/WebCoreNSStringExtras.h>
#import <wtf/HashSet.h>
#import <wtf/RetainPtr.h>
+#if ENABLE(NETSCAPE_PLUGIN_API)
+#import "NetscapePluginModule.h"
+#endif
+
using namespace WebCore;
namespace WebKit {
@@ -73,7 +76,13 @@
bool PluginInfoStore::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin)
{
+#if ENABLE(NETSCAPE_PLUGIN_API)
return NetscapePluginModule::getPluginInfo(pluginPath, plugin);
+#else
+ UNUSED_PARAM(pluginPath);
+ UNUSED_PARAM(plugin);
+ return false;
+#endif
}
bool PluginInfoStore::shouldUsePlugin(Vector<PluginModuleInfo>& alreadyLoadedPlugins, const PluginModuleInfo& plugin)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#include "config.h"
#include "JSNPMethod.h"
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include "JSNPObject.h"
#include <_javascript_Core/Error.h>
#include <_javascript_Core/FunctionPrototype.h>
@@ -86,3 +88,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#ifndef JSNPMethod_h
#define JSNPMethod_h
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include <_javascript_Core/FunctionPrototype.h>
#include <_javascript_Core/InternalFunction.h>
#include <_javascript_Core/JSGlobalObject.h>
@@ -70,4 +72,6 @@
} // namespace WebKit
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
#endif // JSNPMethod_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#include "config.h"
#include "JSNPObject.h"
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include "JSNPMethod.h"
#include "NPJSObject.h"
#include "NPRuntimeObjectMap.h"
@@ -490,3 +492,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#ifndef JSNPObject_h
#define JSNPObject_h
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include <_javascript_Core/JSGlobalObject.h>
#include <_javascript_Core/JSObject.h>
#include <_javascript_Core/ObjectPrototype.h>
@@ -104,4 +106,6 @@
} // namespace WebKit
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
#endif // JSNPObject_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#include "config.h"
#include "NPJSObject.h"
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include "JSNPObject.h"
#include "NPRuntimeObjectMap.h"
#include "NPRuntimeUtilities.h"
@@ -381,3 +383,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.h (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.h 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.h 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#ifndef NPJSObject_h
#define NPJSObject_h
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include <_javascript_Core/Strong.h>
#include <WebCore/npruntime_internal.h>
#include <wtf/Noncopyable.h>
@@ -95,4 +97,6 @@
} // namespace WebKit
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
#endif // NPJSObject_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#include "config.h"
#include "NPRuntimeObjectMap.h"
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include "JSNPObject.h"
#include "NPJSObject.h"
#include "NPRuntimeUtilities.h"
@@ -301,3 +303,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#ifndef NPJSObjectWrapperMap_h
#define NPJSObjectWrapperMap_h
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include <WebCore/RunLoop.h>
#include <heap/Weak.h>
#include <wtf/Forward.h>
@@ -101,4 +103,6 @@
} // namespace WebKit
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
#endif // NPJSObjectWrapperMap_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#include "config.h"
#include "NPRuntimeUtilities.h"
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include <wtf/text/CString.h>
namespace WebKit {
@@ -150,3 +152,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#ifndef NPRuntimeUtilities_h
#define NPRuntimeUtilities_h
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include <WebCore/npruntime_internal.h>
#include <wtf/Forward.h>
@@ -67,4 +69,6 @@
}
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
#endif // NPRuntimeUtilities_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#include "config.h"
#include "NetscapeBrowserFuncs.h"
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include "NPRuntimeUtilities.h"
#include "NetscapePlugin.h"
#include "PluginController.h"
@@ -1060,3 +1062,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#ifndef NetscapeBrowserFuncs_h
#define NetscapeBrowserFuncs_h
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include <WebCore/npfunctions.h>
namespace WebKit {
@@ -37,5 +39,6 @@
} // namespace WebKit
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
#endif // NetscapeBrowserFuncs_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#include "config.h"
#include "NetscapePlugin.h"
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include "NPRuntimeObjectMap.h"
#include "NPRuntimeUtilities.h"
#include "NetscapePluginStream.h"
@@ -970,3 +972,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#ifndef NetscapePlugin_h
#define NetscapePlugin_h
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include "NetscapePluginModule.h"
#include "Plugin.h"
#include <WebCore/AffineTransform.h>
@@ -360,4 +362,6 @@
} // namespace WebKit
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
#endif // NetscapePlugin_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -25,7 +25,7 @@
*/
#include "config.h"
-#if PLUGIN_ARCHITECTURE(UNSUPPORTED)
+#if PLUGIN_ARCHITECTURE(UNSUPPORTED) && ENABLE(NETSCAPE_PLUGIN_API)
#include "NetscapePlugin.h"
@@ -95,4 +95,4 @@
} // namespace WebKit
-#endif // PLUGIN_ARCHITECTURE(UNSUPPORTED)
+#endif // PLUGIN_ARCHITECTURE(UNSUPPORTED) && ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#include "config.h"
#include "NetscapePluginStream.h"
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include "NetscapePlugin.h"
#include <utility>
#include <wtf/PassOwnPtr.h>
@@ -361,3 +363,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#ifndef NetscapePluginStream_h
#define NetscapePluginStream_h
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include <WebCore/FileSystem.h>
#include <WebCore/RunLoop.h>
#include <WebCore/npruntime_internal.h>
@@ -110,4 +112,6 @@
} // namespace WebKit
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
#endif // NetscapePluginStream_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#import "config.h"
#import "NetscapePlugin.h"
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#import "NetscapeBrowserFuncs.h"
#import "PluginController.h"
#import "WebEvent.h"
@@ -1106,3 +1108,5 @@
#endif
} // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#ifndef NetscapeSandboxFunctions_h
#define NetscapeSandboxFunctions_h
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include <WebCore/npapi.h>
#ifdef __cplusplus
@@ -55,4 +57,6 @@
}
#endif
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
#endif
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,7 +26,7 @@
#import "config.h"
#import "PluginProxy.h"
-#if ENABLE(PLUGIN_PROCESS)
+#if ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
#import "PluginController.h"
#import "PluginControllerProxyMessages.h"
@@ -88,4 +88,4 @@
} // namespace WebKit
-#endif // ENABLE(PLUGIN_PROCESS)
+#endif // ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,7 +26,7 @@
#include "config.h"
#include "PluginProxy.h"
-#if ENABLE(PLUGIN_PROCESS)
+#if ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
#include <WebCore/NotImplemented.h>
@@ -40,4 +40,4 @@
} // namespace WebKit
-#endif // ENABLE(PLUGIN_PROCESS)
+#endif // ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -26,6 +26,8 @@
#include "config.h"
#include "NetscapePlugin.h"
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
#include "PluginController.h"
#include "WebEvent.h"
#include "WindowGeometry.h"
@@ -396,3 +398,5 @@
}
} // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (117094 => 117095)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2012-05-15 18:00:13 UTC (rev 117094)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2012-05-15 18:04:06 UTC (rev 117095)
@@ -25,7 +25,7 @@
*/
#include "config.h"
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
#include "NetscapePlugin.h"
@@ -622,4 +622,4 @@
} // namespace WebKit
-#endif // PLUGIN_ARCHITECTURE(X11)
+#endif // PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
