Guard Netscape plug-in code with ENABLE(NETSCAPE_PLUGIN_API)
authoraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 May 2012 18:04:06 +0000 (18:04 +0000)
committeraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 May 2012 18:04:06 +0000 (18:04 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@117095 268f45cc-cd09-0410-ab3c-d52691b4dbfc

30 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp
Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h
Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
Source/WebKit2/Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp
Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h
Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h
Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.h
Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h
Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h
Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h
Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h
Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm
Source/WebKit2/WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp

index daebe8d..3ac8179 100644 (file)
@@ -1,3 +1,42 @@
+2012-05-15  Andy Estes  <aestes@apple.com>
+
+        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  <aestes@apple.com>
 
         Guard some AppKit-specific code in WebKit2 with USE(APPKIT)
index c1874d9..4a24225 100644 (file)
@@ -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 @@ void NetscapePluginModule::unload()
 
 } // namespace WebKit
 
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
index e96bd2d..f11eae3 100644 (file)
@@ -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 @@ private:
     
 } // namespace WebKit
 
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
 #endif // NetscapePluginModule_h
index ae247a1..439de79 100644 (file)
@@ -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 @@ void NetscapePluginModule::determineQuirks()
 }
 
 } // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
index 36cbce2..bffdde2 100644 (file)
@@ -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 @@ void NetscapePluginModule::determineQuirks()
 
 } // namespace WebKit
 
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
index ea59e3d..f92fb0b 100644 (file)
@@ -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 @@ bool NetscapePluginModule::scanPlugin(const String& pluginPath)
 
 } // namespace WebKit
 
-#endif // PLUGIN_ARCHITECTURE(X11)
+#endif // PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
index 7a04b53..4f30e55 100644 (file)
 #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 @@ Vector<String> PluginInfoStore::individualPluginPaths()
 
 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)
index 2e6d118..edf42e4 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "JSNPMethod.h"
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
 #include "JSNPObject.h"
 #include <JavaScriptCore/Error.h>
 #include <JavaScriptCore/FunctionPrototype.h>
@@ -86,3 +88,5 @@ CallType JSNPMethod::getCallData(JSCell*, CallData& callData)
 }
 
 } // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
index a622389..3cb33fc 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef JSNPMethod_h
 #define JSNPMethod_h
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
 #include <JavaScriptCore/FunctionPrototype.h>
 #include <JavaScriptCore/InternalFunction.h>
 #include <JavaScriptCore/JSGlobalObject.h>
@@ -70,4 +72,6 @@ private:
 
 } // namespace WebKit
 
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
 #endif // JSNPMethod_h
index 825ba94..5c64527 100644 (file)
@@ -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 @@ JSObject* JSNPObject::throwInvalidAccessError(ExecState* exec)
 }
 
 } // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
index f8ae98e..5723baa 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef JSNPObject_h
 #define JSNPObject_h
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
 #include <JavaScriptCore/JSGlobalObject.h>
 #include <JavaScriptCore/JSObject.h>
 #include <JavaScriptCore/ObjectPrototype.h>
@@ -104,4 +106,6 @@ private:
 
 } // namespace WebKit
 
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
 #endif // JSNPObject_h
index 802c2df..4cea7e5 100644 (file)
@@ -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 @@ bool NPJSObject::NP_Construct(NPObject* npObject, const NPVariant* arguments, ui
 }
     
 } // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
index f0ee07a..9dc0824 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef NPJSObject_h
 #define NPJSObject_h
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
 #include <JavaScriptCore/Strong.h>
 #include <WebCore/npruntime_internal.h>
 #include <wtf/Noncopyable.h>
@@ -95,4 +97,6 @@ private:
 
 } // namespace WebKit
 
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
 #endif // NPJSObject_h
index 2efa0b8..c883e3c 100644 (file)
@@ -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 @@ void NPRuntimeObjectMap::finalize(JSC::Handle<JSC::Unknown> handle, void* contex
 }
 
 } // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
index deffd54..d9c002e 100644 (file)
@@ -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 @@ private:
 
 } // namespace WebKit
 
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
 #endif // NPJSObjectWrapperMap_h
index 71bf90b..2cb507b 100644 (file)
@@ -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 @@ void releaseNPVariantValue(NPVariant* variant)
 }
 
 } // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
index 2f135b2..4775d62 100644 (file)
@@ -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 @@ void releaseNPVariantValue(NPVariant*);
 
 }
 
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
 #endif // NPRuntimeUtilities_h
index fcd31f1..80daaaa 100644 (file)
@@ -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 @@ NPNetscapeFuncs* netscapeBrowserFuncs()
 }
 
 } // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
index 583df97..37e61da 100644 (file)
@@ -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 @@ NPNetscapeFuncs* netscapeBrowserFuncs();
 
 } // namespace WebKit
 
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
 
 #endif // NetscapeBrowserFuncs_h
index adc632d..d191980 100644 (file)
@@ -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 @@ bool NetscapePlugin::convertFromRootView(const IntPoint& pointInRootViewCoordina
 }
 
 } // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
index 7bba977..9194984 100644 (file)
@@ -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 @@ public: // Need to call it in the NPN_GetValue browser callback.
 
 } // namespace WebKit
 
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
 #endif // NetscapePlugin_h
index b5cf547..b584af8 100644 (file)
@@ -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 @@ bool NetscapePlugin::wantsPluginRelativeNPWindowCoordinates()
 
 } // namespace WebKit
 
-#endif // PLUGIN_ARCHITECTURE(UNSUPPORTED)
+#endif // PLUGIN_ARCHITECTURE(UNSUPPORTED) && ENABLE(NETSCAPE_PLUGIN_API)
index 5e496e3..65ab2e5 100644 (file)
@@ -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 @@ void NetscapePluginStream::notifyAndDestroyStream(NPReason reason)
 }
 
 } // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
index 05873e4..b95b235 100644 (file)
@@ -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 @@ private:
 
 } // namespace WebKit
 
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
 #endif // NetscapePluginStream_h
index d011345..f1fa2f6 100644 (file)
@@ -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 @@ void NetscapePlugin::nullEventTimerFired()
 #endif
 
 } // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
index 4c77981..8449af6 100644 (file)
@@ -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 @@ WKNSandboxFunctions* netscapeSandboxFunctions();
 }
 #endif
 
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
+
 #endif
index 8448612..4160656 100644 (file)
@@ -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 @@ void PluginProxy::setLayerHostingContextID(uint32_t layerHostingContextID)
 
 } // namespace WebKit
 
-#endif // ENABLE(PLUGIN_PROCESS)
+#endif // ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
index 7af1784..f140a9c 100644 (file)
@@ -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 @@ bool PluginProxy::needsBackingStore() const
 
 } // namespace WebKit
 
-#endif // ENABLE(PLUGIN_PROCESS)
+#endif // ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
index b14f31d..9d0deb2 100644 (file)
@@ -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 @@ BOOL NetscapePlugin::hookedTrackPopupMenu(HMENU hMenu, UINT uFlags, int x, int y
 }
 
 } // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
index 6564fd1..da2478d 100644 (file)
@@ -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 @@ bool NetscapePlugin::platformHandleKeyboardEvent(const WebKeyboardEvent& event)
 
 } // namespace WebKit
 
-#endif // PLUGIN_ARCHITECTURE(X11)
+#endif // PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)