diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 20:05:57 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 20:05:57 +0000 |
| commit | 6a0ee4ec5905be6182b20218da1c276fc7e457fd (patch) | |
| tree | 5ade1bf32e5f2d6c27026bdbbb03a50d1eefd5d6 /webkit/default_plugin/plugin_main.h | |
| parent | a0ae20be77b89edf8ecf221ef3decc37b870014b (diff) | |
| download | chromium_src-6a0ee4ec5905be6182b20218da1c276fc7e457fd.zip chromium_src-6a0ee4ec5905be6182b20218da1c276fc7e457fd.tar.gz chromium_src-6a0ee4ec5905be6182b20218da1c276fc7e457fd.tar.bz2 | |
Linux: Initial scaffolding for default plugin.
Basically the linux version of http://codereview.chromium.org/2075006
BUG=10952
TEST=Go to http://www.adobe.com/shockwave/welcome/. The task manager should show that the default plugin is running, and the "Missing Plug-in" text should look slightly different than it did before. Also, the plugin area is now grey instead of transparent. (this test depends on a small webkit shown below)
Requires commenting out
if (objectContentType(url, mimeType) != ObjectContentNetscapePlugin)
return 0;
in WebKit/WebKit/chromium/src/FrameLoaderClientImpl.cpp's createPlugin() as well, else the default plugin won't load.
Review URL: http://codereview.chromium.org/2079016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/default_plugin/plugin_main.h')
| -rw-r--r-- | webkit/default_plugin/plugin_main.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/webkit/default_plugin/plugin_main.h b/webkit/default_plugin/plugin_main.h index 4f73651..dc1e071 100644 --- a/webkit/default_plugin/plugin_main.h +++ b/webkit/default_plugin/plugin_main.h @@ -23,12 +23,19 @@ NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason); int32 NPP_WriteReady(NPP instance, NPStream* stream); int32 NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer); +#if defined(OS_POSIX) && !defined(OS_MACOSX) +NPError NPP_GetValue(NPP instance, NPPVariable variable, void* value); +#endif void NPP_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData); int16 NPP_HandleEvent(NPP instance, void* event); +#if defined(OS_POSIX) && !defined(OS_MACOSX) +NPError API_CALL NP_Initialize(NPNetscapeFuncs* funcs, NPPluginFuncs* p_funcs); +#else NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* funcs); NPError API_CALL NP_Initialize(NPNetscapeFuncs* funcs); +#endif NPError API_CALL NP_Shutdown(void); } // default_plugin |