diff options
author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 19:07:50 +0000 |
---|---|---|
committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 19:07:50 +0000 |
commit | 51678ad73ad231bd77862f53e18e629420a26042 (patch) | |
tree | c54dc34d5d64fb1c796aa52573bbd23c24f2ca65 /webkit/plugins/npapi | |
parent | 8470f4693faac244f839c38358512244b47cb680 (diff) | |
download | chromium_src-51678ad73ad231bd77862f53e18e629420a26042.zip chromium_src-51678ad73ad231bd77862f53e18e629420a26042.tar.gz chromium_src-51678ad73ad231bd77862f53e18e629420a26042.tar.bz2 |
Add exports needed for glue to build as a component.
This adds WEBKIT_GLUE_EXPORT, WEBKIT_PLUGINS_EXPORT, and WEBKIT_EXTENSIONS_EXPORT macros that are used by the files in
webkit/{glue,plugins,extensions} to show what needs to be exported from a DLL.
R=darin@chromium.org
BUG=98755
TEST=waterfall stays green.
Review URL: http://codereview.chromium.org/8741006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/npapi')
-rw-r--r-- | webkit/plugins/npapi/plugin_constants_win.h | 11 | ||||
-rw-r--r-- | webkit/plugins/npapi/plugin_group.h | 3 | ||||
-rw-r--r-- | webkit/plugins/npapi/plugin_host.h | 5 | ||||
-rw-r--r-- | webkit/plugins/npapi/plugin_lib.h | 3 | ||||
-rw-r--r-- | webkit/plugins/npapi/plugin_list.h | 5 | ||||
-rw-r--r-- | webkit/plugins/npapi/webplugin.h | 3 | ||||
-rw-r--r-- | webkit/plugins/npapi/webplugin_delegate.h | 3 | ||||
-rw-r--r-- | webkit/plugins/npapi/webplugin_delegate_impl.h | 3 | ||||
-rw-r--r-- | webkit/plugins/npapi/webplugin_impl.h | 8 |
9 files changed, 27 insertions, 17 deletions
diff --git a/webkit/plugins/npapi/plugin_constants_win.h b/webkit/plugins/npapi/plugin_constants_win.h index edfbaaf..2ef80fe 100644 --- a/webkit/plugins/npapi/plugin_constants_win.h +++ b/webkit/plugins/npapi/plugin_constants_win.h @@ -6,6 +6,7 @@ #define WEBKIT_PLUGINS_NPAPI_PLUGIN_CONSTANTS_WIN_H_ #include "base/string16.h" +#include "webkit/plugins/webkit_plugins_export.h" namespace webkit { namespace npapi { @@ -14,22 +15,22 @@ namespace npapi { extern const char16 kNativeWindowClassName[]; // If property is non-zero window reparenting must add UIPI message filters. -extern const char16 kNativeWindowClassFilterProp[]; +WEBKIT_PLUGINS_EXPORT extern const char16 kNativeWindowClassFilterProp[]; // The name of the window class name for the wrapper HWND around the actual // plugin window that's used when running in multi-process mode. This window // is created on the browser UI thread. -extern const char16 kWrapperNativeWindowClassName[]; +WEBKIT_PLUGINS_EXPORT extern const char16 kWrapperNativeWindowClassName[]; // The name of the custom window message that the browser uses to tell the // plugin process to paint a window. -extern const char16 kPaintMessageName[]; +WEBKIT_PLUGINS_EXPORT extern const char16 kPaintMessageName[]; // The name of the registry key which NPAPI plugins update on installation. -extern const char16 kRegistryMozillaPlugins[]; +WEBKIT_PLUGINS_EXPORT extern const char16 kRegistryMozillaPlugins[]; extern const char16 kMozillaActiveXPlugin[]; -extern const char16 kNewWMPPlugin[]; +WEBKIT_PLUGINS_EXPORT extern const char16 kNewWMPPlugin[]; extern const char16 kOldWMPPlugin[]; extern const char16 kYahooApplicationStatePlugin[]; extern const char16 kWanWangProtocolHandlerPlugin[]; diff --git a/webkit/plugins/npapi/plugin_group.h b/webkit/plugins/npapi/plugin_group.h index 5880532..94e643d 100644 --- a/webkit/plugins/npapi/plugin_group.h +++ b/webkit/plugins/npapi/plugin_group.h @@ -12,6 +12,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" +#include "webkit/plugins/webkit_plugins_export.h" #include "webkit/plugins/webplugininfo.h" class FilePath; @@ -72,7 +73,7 @@ struct VersionRange { // of a plugin that is needed in order not to exhibit known security // vulnerabilities. -class PluginGroup { +class WEBKIT_PLUGINS_EXPORT PluginGroup { public: // Used by about:plugins to disable Reader plugin when internal PDF viewer is // enabled. diff --git a/webkit/plugins/npapi/plugin_host.h b/webkit/plugins/npapi/plugin_host.h index 2666e28..4eb38dc 100644 --- a/webkit/plugins/npapi/plugin_host.h +++ b/webkit/plugins/npapi/plugin_host.h @@ -13,6 +13,7 @@ #include "base/memory/ref_counted.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/nphostapi.h" +#include "webkit/plugins/webkit_plugins_export.h" namespace webkit { namespace npapi { @@ -28,7 +29,7 @@ class PluginHost : public base::RefCounted<PluginHost> { public: // Access the single PluginHost instance. Callers // must call deref() when finished with the object. - static PluginHost* Singleton(); + WEBKIT_PLUGINS_EXPORT static PluginHost* Singleton(); // The table of functions provided to the plugin. NPNetscapeFuncs* host_functions() { return &host_funcs_; } @@ -43,7 +44,7 @@ class PluginHost : public base::RefCounted<PluginHost> { std::vector<std::string>* values, std::vector<char>* body); - void PatchNPNetscapeFuncs(NPNetscapeFuncs* overrides); + WEBKIT_PLUGINS_EXPORT void PatchNPNetscapeFuncs(NPNetscapeFuncs* overrides); private: friend class base::RefCounted<PluginHost>; diff --git a/webkit/plugins/npapi/plugin_lib.h b/webkit/plugins/npapi/plugin_lib.h index 3ae5d9e..9051e2d 100644 --- a/webkit/plugins/npapi/plugin_lib.h +++ b/webkit/plugins/npapi/plugin_lib.h @@ -14,6 +14,7 @@ #include "build/build_config.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/webplugin.h" +#include "webkit/plugins/webkit_plugins_export.h" class FilePath; @@ -24,7 +25,7 @@ class PluginInstance; // A PluginLib is a single NPAPI Plugin Library, and is the lifecycle // manager for new PluginInstances. -class PluginLib : public base::RefCounted<PluginLib> { +class WEBKIT_PLUGINS_EXPORT PluginLib : public base::RefCounted<PluginLib> { public: static PluginLib* CreatePluginLib(const FilePath& filename); diff --git a/webkit/plugins/npapi/plugin_list.h b/webkit/plugins/npapi/plugin_list.h index 6265ec7..83822e7 100644 --- a/webkit/plugins/npapi/plugin_list.h +++ b/webkit/plugins/npapi/plugin_list.h @@ -18,6 +18,7 @@ #include "base/synchronization/lock.h" #include "third_party/npapi/bindings/nphostapi.h" #include "webkit/plugins/npapi/plugin_group.h" +#include "webkit/plugins/webkit_plugins_export.h" #include "webkit/plugins/webplugininfo.h" class GURL; @@ -32,7 +33,7 @@ struct DefaultLazyInstanceTraits; namespace webkit { namespace npapi { -extern FilePath::CharType kDefaultPluginLibraryName[]; +WEBKIT_PLUGINS_EXPORT extern FilePath::CharType kDefaultPluginLibraryName[]; // This struct holds entry points into a plugin. The entry points are // slightly different between Win/Mac and Unixes. Note that the interface for @@ -54,7 +55,7 @@ struct PluginEntryPoints { // the correct types. On Linux, it walks the plugin directories as well // (e.g. /usr/lib/browser-plugins/). // This object is thread safe. -class PluginList { +class WEBKIT_PLUGINS_EXPORT PluginList { public: // Gets the one instance of the PluginList. static PluginList* Singleton(); diff --git a/webkit/plugins/npapi/webplugin.h b/webkit/plugins/npapi/webplugin.h index f861517..1a14ed6 100644 --- a/webkit/plugins/npapi/webplugin.h +++ b/webkit/plugins/npapi/webplugin.h @@ -12,6 +12,7 @@ #include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" +#include "webkit/plugins/webkit_plugins_export.h" // TODO(port): this typedef is obviously incorrect on non-Windows // platforms, but now a lot of code now accidentally depends on them @@ -30,7 +31,7 @@ class WebPluginAcceleratedSurface; #endif // Describes the new location for a plugin window. -struct WebPluginGeometry { +struct WEBKIT_PLUGINS_EXPORT WebPluginGeometry { WebPluginGeometry(); ~WebPluginGeometry(); diff --git a/webkit/plugins/npapi/webplugin_delegate.h b/webkit/plugins/npapi/webplugin_delegate.h index 9009ebf..ce96884 100644 --- a/webkit/plugins/npapi/webplugin_delegate.h +++ b/webkit/plugins/npapi/webplugin_delegate.h @@ -13,6 +13,7 @@ #include "third_party/npapi/bindings/npapi.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h" #include "ui/gfx/native_widget_types.h" +#include "webkit/plugins/webkit_plugins_export.h" class GURL; struct NPObject; @@ -33,7 +34,7 @@ class WebPlugin; class WebPluginResourceClient; // This is the interface that a plugin implementation needs to provide. -class WebPluginDelegate { +class WEBKIT_PLUGINS_EXPORT WebPluginDelegate { public: virtual ~WebPluginDelegate() {} diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.h b/webkit/plugins/npapi/webplugin_delegate_impl.h index f811d72..bd83fa72 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl.h +++ b/webkit/plugins/npapi/webplugin_delegate_impl.h @@ -19,6 +19,7 @@ #include "ui/gfx/rect.h" #include "webkit/plugins/npapi/webplugin_delegate.h" #include "webkit/glue/webcursor.h" +#include "webkit/plugins/webkit_plugins_export.h" #if defined(OS_WIN) && !defined(USE_AURA) #include "base/memory/weak_ptr.h" @@ -61,7 +62,7 @@ class WebPluginIMEWin; // An implementation of WebPluginDelegate that runs in the plugin process, // proxied from the renderer by WebPluginDelegateProxy. -class WebPluginDelegateImpl : public WebPluginDelegate { +class WEBKIT_PLUGINS_EXPORT WebPluginDelegateImpl : public WebPluginDelegate { public: enum PluginQuirks { PLUGIN_QUIRK_SETWINDOW_TWICE = 1, // Win32 diff --git a/webkit/plugins/npapi/webplugin_impl.h b/webkit/plugins/npapi/webplugin_impl.h index ec0f30f..f1e5fd0 100644 --- a/webkit/plugins/npapi/webplugin_impl.h +++ b/webkit/plugins/npapi/webplugin_impl.h @@ -21,6 +21,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" #include "ui/gfx/native_widget_types.h" #include "webkit/plugins/npapi/webplugin.h" +#include "webkit/plugins/webkit_plugins_export.h" namespace WebKit { class WebFrame; @@ -43,9 +44,10 @@ class WebPluginPageDelegate; // This is the WebKit side of the plugin implementation that forwards calls, // after changing out of WebCore types, to a delegate. The delegate may // be in a different process. -class WebPluginImpl : public WebPlugin, - public WebKit::WebPlugin, - public WebKit::WebURLLoaderClient { +class WEBKIT_PLUGINS_EXPORT WebPluginImpl : + NON_EXPORTED_BASE(public WebPlugin), + NON_EXPORTED_BASE(public WebKit::WebPlugin), + NON_EXPORTED_BASE(public WebKit::WebURLLoaderClient) { public: WebPluginImpl( WebKit::WebFrame* frame, |