Changeset 30897 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

Mar 7, 2008, 11:54:51 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

Unify concept of enabling Netscape Plug-in API (NPAPI).

Reviewed by Darin.

• wtf/Platform.h: Define ENABLE_NETSCAPE_PLUGIN_API here.

WebCore:

Unify concept of enabling Netscape Plug-in API (NPAPI).

Reviewed by Darin.

No test cases since there is no change in functionality.

• DerivedSources.make: Added check for ENABLE_NETSCAPE_PLUGIN_API macro. If defined as "1", add WebCore.NPAPI.exp to WEBCORE_EXPORT_DEPENDENCIES.
• WebCore.NPAPI.exp: Added.
• WebCore.base.exp: Moved exported NPAPI methods to WebCore.NPAPI.exp.
• WebCore.xcodeproj/project.pbxproj: Removed changes in r30826 (except comments) since we now handle exported NPAPI methods via DerivedSources.make.

• config.h: Removed USE(NPOBJECT) since we now use ENABLE(NETSCAPE_PLUGIN_API) as defined in Platform.h.

• bindings/objc/DOM.mm: Replaced USE(NPOBJECT) with ENABLE(NETSCAPE_PLUGIN_API). (-[DOMElement _NPObject]):

bridge/NP_jsobject.cpp: Replaced !PLATFORM(DARWIN)

!defined(LP64) with

ENABLE(NETSCAPE_PLUGIN_API).

• bridge/NP_jsobject.h: Ditto.
• bridge/c/c_class.cpp: Ditto.
• bridge/c/c_class.h: Ditto.
• bridge/c/c_instance.cpp: Ditto.
• bridge/c/c_instance.h: Ditto.
• bridge/c/c_runtime.cpp: Ditto.
• bridge/c/c_runtime.h: Ditto.
• bridge/c/c_utility.cpp: Ditto.
• bridge/c/c_utility.h: Ditto.
• bridge/npruntime.cpp: Ditto.
• bridge/npruntime_impl.h: Ditto.
• bridge/npruntime_priv.h: Ditto.
• bridge/runtime.cpp: Ditto. (KJS::Bindings::Instance::createBindingForLanguageInstance):

• html/HTMLPlugInElement.cpp: Replaced USE(NPOBJECT) with ENABLE(NETSCAPE_PLUGIN_API). (WebCore::HTMLPlugInElement::HTMLPlugInElement): (WebCore::HTMLPlugInElement::~HTMLPlugInElement):
• html/HTMLPlugInElement.h: Ditto.

• page/Frame.cpp: Replaced USE(NPOBJECT) with ENABLE(NETSCAPE_PLUGIN_API). (WebCore::Frame::clearScriptObjects): (WebCore::FramePrivate::FramePrivate): Also added #if ENABLE(NETSCAPE_PLUGIN_API) guard around m_windowScriptNPObject.
• page/Frame.h: Replaced USE(NPOBJECT) with ENABLE(NETSCAPE_PLUGIN_API).
• page/FramePrivate.h: Added #if ENABLE(NETSCAPE_PLUGIN_API) guard around m_windowScriptNPObject.
• page/mac/FrameMac.mm: Replaced USE(NPOBJECT) with ENABLE(NETSCAPE_PLUGIN_API). (WebCore::Frame::createScriptInstanceForWidget):

WebKit/mac:

Unify concept of enabling Netscape Plug-in API (NPAPI).

Reviewed by Darin.

• WebKit.exp: Removed unused class export for WebBaseNetscapePluginView.

• WebKitPrefix.h: Removed WTF_USE_NPOBJECT since we now use ENABLE(NETSCAPE_PLUGIN_API) as defined in Platform.h.

• Plugins/WebBaseNetscapePluginStream.h: Replaced #ifndef LP64 with #if ENABLE(NETSCAPE_PLUGIN_API).
• Plugins/WebBaseNetscapePluginStream.mm: Ditto.
• Plugins/WebBaseNetscapePluginView.h: Ditto.
• Plugins/WebBaseNetscapePluginView.mm: Ditto.
• Plugins/WebBaseNetscapePluginViewInternal.h: Ditto.
• Plugins/WebBaseNetscapePluginViewPrivate.h: Ditto.
• Plugins/WebBasePluginPackage.h: Ditto.
• Plugins/WebBasePluginPackage.m: Ditto. (+[WebBasePluginPackage pluginWithPath:]):
• Plugins/WebNetscapeDeprecatedFunctions.c: Ditto.
• Plugins/WebNetscapeDeprecatedFunctions.h: Ditto.
• Plugins/WebNetscapePluginEmbeddedView.h: Ditto.
• Plugins/WebNetscapePluginEmbeddedView.mm: Ditto.
• Plugins/WebNetscapePluginPackage.h: Ditto.
• Plugins/WebNetscapePluginPackage.m: Ditto.
• Plugins/WebNetscapePluginStream.h: Ditto.
• Plugins/WebNetscapePluginStream.mm: Ditto.
• Plugins/WebPluginDatabase.m: Ditto. (-[WebPluginDatabase pluginForKey:withEnumeratorSelector:]):
• Plugins/npapi.m: Ditto.
• WebCoreSupport/WebFrameLoaderClient.mm: Ditto. (WebFrameLoaderClient::objectContentType): (WebFrameLoaderClient::createPlugin):
• WebView/WebHTMLView.mm: Ditto. (-[NSArray _web_makePluginViewsPerformSelector:withObject:]):
• WebView/WebHTMLViewInternal.h: Ditto.

• WebView/WebFrame.mm: Replaced #ifndef LP64 with #if ENABLE(NETSCAPE_PLUGIN_API). Moved methods below from (WebPrivate) category to (WebInternal) category so we don't expose the ENABLE() macro from the private header. (-[WebFrame _recursive_resumeNullEventsForAllNetscapePlugins]): (-[WebFrame _recursive_pauseNullEventsForAllNetscapePlugins]):
• WebView/WebFrameInternal.h: Ditto.
• WebView/WebFramePrivate.h: Ditto.

File:

• trunk/JavaScriptCore/wtf/Platform.h (modified) (3 diffs)

trunk/JavaScriptCore/wtf/Platform.h

@@ -218 +218 @@
 #endif
 
+#if PLATFORM(MAC) && defined(__LP64__)
+#define ENABLE_NETSCAPE_PLUGIN_API 0
+#elif PLATFORM(GTK) || PLATFORM(MAC) || PLATFORM(SYMBIAN) || PLATFORM(WIN)
+#define ENABLE_NETSCAPE_PLUGIN_API 1
+#endif
+
 #if PLATFORM(WIN)
 #define WTF_USE_WININET 1
@@ -231 +237 @@
 #endif
 
+/* ENABLE macro defaults */
+
 #if !defined(ENABLE_ICONDATABASE)
 #define ENABLE_ICONDATABASE 1
@@ -243 +251 @@
 #endif
 
+#if !defined(ENABLE_NETSCAPE_PLUGIN_API)
+#define ENABLE_NETSCAPE_PLUGIN_API 0
+#endif
+
 #endif /* WTF_Platform_h */