Unreviewed, rolling out r117095.

http://trac.webkit.org/changeset/117095
https://bugs.webkit.org/show_bug.cgi?id=86511

broke Qt Mac build (Requested by estes on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-05-15

* 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::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: http://svn.webkit.org/repository/webkit/trunk@117125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 94ec970..cc08588 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,42 @@
+2012-05-15  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r117095.
+        http://trac.webkit.org/changeset/117095
+        https://bugs.webkit.org/show_bug.cgi?id=86511
+
+        broke Qt Mac build (Requested by estes on #webkit).
+
+        * 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::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-15  Alexey Proskuryakov  <ap@apple.com>
 
         [WK2] Crash when dropping a reference to a non-existing file

diff --git a/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp b/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp
index 4a24225..c1874d9 100644 (file)
--- a/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp
+++ b/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NetscapePluginModule.h"
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include "Module.h"
 #include "NPRuntimeUtilities.h"
 #include "NetscapeBrowserFuncs.h"
@@ -271,4 +269,3 @@ void NetscapePluginModule::unload()
 
 } // namespace WebKit
 
-#endif // ENABLE(NETSCAPE_PLUGIN_API)

diff --git a/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h b/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h
index f11eae3..e96bd2d 100644 (file)
--- a/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h
+++ b/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h
@@ -26,8 +26,6 @@
 #ifndef NetscapePluginModule_h
 #define NetscapePluginModule_h
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include "Module.h"
 #include "PluginModuleInfo.h"
 #include "PluginQuirks.h"
@@ -101,6 +99,4 @@ private:
     
 } // namespace WebKit
 
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
 #endif // NetscapePluginModule_h

diff --git a/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm b/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
index 439de79..ae247a1 100644 (file)
--- a/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
+++ b/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
@@ -26,8 +26,6 @@
 #import "config.h"
 #import "NetscapePluginModule.h"
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #import "PluginProcessProxy.h"
 #import <WebCore/WebCoreNSStringExtras.h>
 #import <wtf/HashSet.h>
@@ -528,5 +526,3 @@ void NetscapePluginModule::determineQuirks()
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)

diff --git a/Source/WebKit2/Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp b/Source/WebKit2/Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp
index bffdde2..36cbce2 100644 (file)
--- a/Source/WebKit2/Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp
+++ b/Source/WebKit2/Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NetscapePluginModule.h"
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include <WebCore/FileSystem.h>
 #include <wtf/OwnArrayPtr.h>
 
@@ -141,4 +139,3 @@ void NetscapePluginModule::determineQuirks()
 
 } // namespace WebKit
 
-#endif // ENABLE(NETSCAPE_PLUGIN_API)

diff --git a/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp b/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
index f92fb0b..ea59e3d 100644 (file)
--- a/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
+++ b/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#if PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+#if PLUGIN_ARCHITECTURE(X11)
 
 #include "NetscapePluginModule.h"
 
@@ -225,4 +225,4 @@ bool NetscapePluginModule::scanPlugin(const String& pluginPath)
 
 } // namespace WebKit
 
-#endif // PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+#endif // PLUGIN_ARCHITECTURE(X11)

diff --git a/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm b/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
index 4f30e55..7a04b53 100644 (file)
--- a/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
+++ b/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
@@ -26,15 +26,12 @@
 #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 {
@@ -76,13 +73,7 @@ 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)

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp
index edf42e4..2e6d118 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "JSNPMethod.h"
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include "JSNPObject.h"
 #include <JavaScriptCore/Error.h>
 #include <JavaScriptCore/FunctionPrototype.h>
@@ -88,5 +86,3 @@ CallType JSNPMethod::getCallData(JSCell*, CallData& callData)
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h b/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h
index 3cb33fc..a622389 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h
@@ -26,8 +26,6 @@
 #ifndef JSNPMethod_h
 #define JSNPMethod_h
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include <JavaScriptCore/FunctionPrototype.h>
 #include <JavaScriptCore/InternalFunction.h>
 #include <JavaScriptCore/JSGlobalObject.h>
@@ -72,6 +70,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
 #endif // JSNPMethod_h

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp
index 5c64527..825ba94 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "JSNPObject.h"
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include "JSNPMethod.h"
 #include "NPJSObject.h"
 #include "NPRuntimeObjectMap.h"
@@ -492,5 +490,3 @@ JSObject* JSNPObject::throwInvalidAccessError(ExecState* exec)
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h b/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h
index 5723baa..f8ae98e 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h
@@ -26,8 +26,6 @@
 #ifndef JSNPObject_h
 #define JSNPObject_h
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include <JavaScriptCore/JSGlobalObject.h>
 #include <JavaScriptCore/JSObject.h>
 #include <JavaScriptCore/ObjectPrototype.h>
@@ -106,6 +104,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
 #endif // JSNPObject_h

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp
index 4cea7e5..802c2df 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NPJSObject.h"
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include "JSNPObject.h"
 #include "NPRuntimeObjectMap.h"
 #include "NPRuntimeUtilities.h"
@@ -383,5 +381,3 @@ bool NPJSObject::NP_Construct(NPObject* npObject, const NPVariant* arguments, ui
 }
     
 } // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.h
index 9dc0824..f0ee07a 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.h
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.h
@@ -26,8 +26,6 @@
 #ifndef NPJSObject_h
 #define NPJSObject_h
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include <JavaScriptCore/Strong.h>
 #include <WebCore/npruntime_internal.h>
 #include <wtf/Noncopyable.h>
@@ -97,6 +95,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
 #endif // NPJSObject_h

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp
index c883e3c..2efa0b8 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NPRuntimeObjectMap.h"
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include "JSNPObject.h"
 #include "NPJSObject.h"
 #include "NPRuntimeUtilities.h"
@@ -303,5 +301,3 @@ void NPRuntimeObjectMap::finalize(JSC::Handle<JSC::Unknown> handle, void* contex
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h
index d9c002e..deffd54 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h
@@ -26,8 +26,6 @@
 #ifndef NPJSObjectWrapperMap_h
 #define NPJSObjectWrapperMap_h
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include <WebCore/RunLoop.h>
 #include <heap/Weak.h>
 #include <wtf/Forward.h>
@@ -103,6 +101,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
 #endif // NPJSObjectWrapperMap_h

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp
index 2cb507b..71bf90b 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NPRuntimeUtilities.h"
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include <wtf/text/CString.h>
 
 namespace WebKit {
@@ -152,5 +150,3 @@ void releaseNPVariantValue(NPVariant* variant)
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h
index 4775d62..2f135b2 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h
@@ -26,8 +26,6 @@
 #ifndef NPRuntimeUtilities_h
 #define NPRuntimeUtilities_h
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include <WebCore/npruntime_internal.h>
 #include <wtf/Forward.h>
 
@@ -69,6 +67,4 @@ void releaseNPVariantValue(NPVariant*);
 
 }
 
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
 #endif // NPRuntimeUtilities_h

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
index 80daaaa..fcd31f1 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NetscapeBrowserFuncs.h"
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include "NPRuntimeUtilities.h"
 #include "NetscapePlugin.h"
 #include "PluginController.h"
@@ -1062,5 +1060,3 @@ NPNetscapeFuncs* netscapeBrowserFuncs()
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h
index 37e61da..583df97 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h
@@ -26,8 +26,6 @@
 #ifndef NetscapeBrowserFuncs_h
 #define NetscapeBrowserFuncs_h
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include <WebCore/npfunctions.h>
 
 namespace WebKit {
@@ -39,6 +37,5 @@ NPNetscapeFuncs* netscapeBrowserFuncs();
 
 } // namespace WebKit
 
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
 
 #endif // NetscapeBrowserFuncs_h

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
index d191980..adc632d 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NetscapePlugin.h"
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include "NPRuntimeObjectMap.h"
 #include "NPRuntimeUtilities.h"
 #include "NetscapePluginStream.h"
@@ -972,5 +970,3 @@ bool NetscapePlugin::convertFromRootView(const IntPoint& pointInRootViewCoordina
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
index 9194984..7bba977 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
@@ -26,8 +26,6 @@
 #ifndef NetscapePlugin_h
 #define NetscapePlugin_h
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include "NetscapePluginModule.h"
 #include "Plugin.h"
 #include <WebCore/AffineTransform.h>
@@ -362,6 +360,4 @@ public: // Need to call it in the NPN_GetValue browser callback.
 
 } // namespace WebKit
 
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
 #endif // NetscapePlugin_h

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp
index b584af8..b5cf547 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#if PLUGIN_ARCHITECTURE(UNSUPPORTED) && ENABLE(NETSCAPE_PLUGIN_API)
+#if PLUGIN_ARCHITECTURE(UNSUPPORTED)
 
 #include "NetscapePlugin.h"
 
@@ -95,4 +95,4 @@ bool NetscapePlugin::wantsPluginRelativeNPWindowCoordinates()
 
 } // namespace WebKit
 
-#endif // PLUGIN_ARCHITECTURE(UNSUPPORTED) && ENABLE(NETSCAPE_PLUGIN_API)
+#endif // PLUGIN_ARCHITECTURE(UNSUPPORTED)

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
index 65ab2e5..5e496e3 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NetscapePluginStream.h"
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include "NetscapePlugin.h"
 #include <utility>
 #include <wtf/PassOwnPtr.h>
@@ -363,5 +361,3 @@ void NetscapePluginStream::notifyAndDestroyStream(NPReason reason)
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
index b95b235..05873e4 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
@@ -26,8 +26,6 @@
 #ifndef NetscapePluginStream_h
 #define NetscapePluginStream_h
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include <WebCore/FileSystem.h>
 #include <WebCore/RunLoop.h>
 #include <WebCore/npruntime_internal.h>
@@ -112,6 +110,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
 #endif // NetscapePluginStream_h

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm b/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
index f1fa2f6..d011345 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
@@ -26,8 +26,6 @@
 #import "config.h"
 #import "NetscapePlugin.h"
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #import "NetscapeBrowserFuncs.h"
 #import "PluginController.h"
 #import "WebEvent.h"
@@ -1108,5 +1106,3 @@ void NetscapePlugin::nullEventTimerFired()
 #endif
 
 } // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h b/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h
index 8449af6..4c77981 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h
@@ -26,8 +26,6 @@
 #ifndef NetscapeSandboxFunctions_h
 #define NetscapeSandboxFunctions_h
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include <WebCore/npapi.h>
 
 #ifdef __cplusplus
@@ -57,6 +55,4 @@ WKNSandboxFunctions* netscapeSandboxFunctions();
 }
 #endif
 
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
 #endif

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm b/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm
index 4160656..8448612 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "PluginProxy.h"
 
-#if ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
+#if ENABLE(PLUGIN_PROCESS)
 
 #import "PluginController.h"
 #import "PluginControllerProxyMessages.h"
@@ -88,4 +88,4 @@ void PluginProxy::setLayerHostingContextID(uint32_t layerHostingContextID)
 
 } // namespace WebKit
 
-#endif // ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
+#endif // ENABLE(PLUGIN_PROCESS)

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp
index f140a9c..7af1784 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PluginProxy.h"
 
-#if ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
+#if ENABLE(PLUGIN_PROCESS)
 
 #include <WebCore/NotImplemented.h>
 
@@ -40,4 +40,4 @@ bool PluginProxy::needsBackingStore() const
 
 } // namespace WebKit
 
-#endif // ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
+#endif // ENABLE(PLUGIN_PROCESS)

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp
index 9d0deb2..b14f31d 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NetscapePlugin.h"
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
 #include "PluginController.h"
 #include "WebEvent.h"
 #include "WindowGeometry.h"
@@ -398,5 +396,3 @@ BOOL NetscapePlugin::hookedTrackPopupMenu(HMENU hMenu, UINT uFlags, int x, int y
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)

diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
index da2478d..6564fd1 100644 (file)
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#if PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+#if PLUGIN_ARCHITECTURE(X11)
 
 #include "NetscapePlugin.h"
 
@@ -622,4 +622,4 @@ bool NetscapePlugin::platformHandleKeyboardEvent(const WebKeyboardEvent& event)
 
 } // namespace WebKit
 
-#endif // PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+#endif // PLUGIN_ARCHITECTURE(X11)