Diff
Modified: trunk/Source/WebKit2/ChangeLog (117124 => 117125)
--- trunk/Source/WebKit2/ChangeLog 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-15 19:55:38 UTC (rev 117125)
@@ -1,3 +1,42 @@
+2012-05-15 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
[WK2] Crash when dropping a reference to a non-existing file
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp (117124 => 117125)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
} // namespace WebKit
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h (117124 => 117125)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
} // namespace WebKit
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
#endif // NetscapePluginModule_h
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (117124 => 117125)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
}
} // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp (117124 => 117125)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
} // namespace WebKit
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (117124 => 117125)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
} // namespace WebKit
-#endif // PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+#endif // PLUGIN_ARCHITECTURE(X11)
Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm (117124 => 117125)
--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
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 (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -26,8 +26,6 @@
#include "config.h"
#include "JSNPMethod.h"
-#if ENABLE(NETSCAPE_PLUGIN_API)
-
#include "JSNPObject.h"
#include <_javascript_Core/Error.h>
#include <_javascript_Core/FunctionPrototype.h>
@@ -88,5 +86,3 @@
}
} // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPMethod.h 2012-05-15 19:55:38 UTC (rev 117125)
@@ -26,8 +26,6 @@
#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>
@@ -72,6 +70,4 @@
} // namespace WebKit
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
#endif // JSNPMethod_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
}
} // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h 2012-05-15 19:55:38 UTC (rev 117125)
@@ -26,8 +26,6 @@
#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>
@@ -106,6 +104,4 @@
} // namespace WebKit
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
#endif // JSNPObject_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
}
} // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.h (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.h 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.h 2012-05-15 19:55:38 UTC (rev 117125)
@@ -26,8 +26,6 @@
#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>
@@ -97,6 +95,4 @@
} // namespace WebKit
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
#endif // NPJSObject_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
}
} // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
} // namespace WebKit
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
#endif // NPJSObjectWrapperMap_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
}
} // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeUtilities.h 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
}
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
#endif // NPRuntimeUtilities_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
}
} // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
} // namespace WebKit
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
#endif // NetscapeBrowserFuncs_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
}
} // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
} // namespace WebKit
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
#endif // NetscapePlugin_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
} // namespace WebKit
-#endif // PLUGIN_ARCHITECTURE(UNSUPPORTED) && ENABLE(NETSCAPE_PLUGIN_API)
+#endif // PLUGIN_ARCHITECTURE(UNSUPPORTED)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
}
} // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
} // namespace WebKit
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
#endif // NetscapePluginStream_h
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
#endif
} // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapeSandboxFunctions.h 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
}
#endif
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
#endif
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
} // namespace WebKit
-#endif // ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
+#endif // ENABLE(PLUGIN_PROCESS)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/qt/PluginProxyQt.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
} // namespace WebKit
-#endif // ENABLE(PLUGIN_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
+#endif // ENABLE(PLUGIN_PROCESS)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
}
} // namespace WebKit
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (117124 => 117125)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2012-05-15 19:52:12 UTC (rev 117124)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2012-05-15 19:55:38 UTC (rev 117125)
@@ -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 @@
} // namespace WebKit
-#endif // PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+#endif // PLUGIN_ARCHITECTURE(X11)
