Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/glue/plugins/npapi_extension_thunk.cc

Issue 5998002: Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/plugins/npapi_extension_thunk.h ('k') | webkit/glue/plugins/plugin_constants_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/plugins/npapi_extension_thunk.cc
diff --git a/webkit/plugins/npapi/npapi_extension_thunk.cc b/webkit/glue/plugins/npapi_extension_thunk.cc
similarity index 86%
rename from webkit/plugins/npapi/npapi_extension_thunk.cc
rename to webkit/glue/plugins/npapi_extension_thunk.cc
index ff3e59aa5bf88cb3c10de2f31d65c709e7e9e36a..05a9c5d15278e8d0c5a7a72b4c59a49a045e42a1 100644
--- a/webkit/plugins/npapi/npapi_extension_thunk.cc
+++ b/webkit/glue/plugins/npapi_extension_thunk.cc
@@ -2,36 +2,33 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/plugins/npapi/npapi_extension_thunk.h"
+#include "webkit/glue/plugins/npapi_extension_thunk.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "third_party/npapi/bindings/npapi_extensions.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
-#include "webkit/plugins/npapi/webplugin.h"
-#include "webkit/plugins/npapi/webplugin_delegate.h"
+#include "webkit/glue/plugins/plugin_instance.h"
+#include "webkit/glue/plugins/webplugin.h"
+#include "webkit/glue/plugins/webplugin_delegate.h"
#include "webkit/glue/webkit_glue.h"
-namespace webkit {
-namespace npapi {
-
// FindInstance()
// Finds a PluginInstance from an NPP.
// The caller must take a reference if needed.
-static PluginInstance* FindInstance(NPP id) {
+static NPAPI::PluginInstance* FindInstance(NPP id) {
if (id == NULL) {
NOTREACHED();
return NULL;
}
- return static_cast<PluginInstance*>(id->ndata);
+ return static_cast<NPAPI::PluginInstance*>(id->ndata);
}
// 2D device API ---------------------------------------------------------------
static NPError Device2DQueryCapability(NPP id, int32_t capability,
int32_t* value) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
plugin->webplugin()->delegate()->Device2DQueryCapability(capability, value);
return NPERR_NO_ERROR;
@@ -43,7 +40,7 @@ static NPError Device2DQueryCapability(NPP id, int32_t capability,
static NPError Device2DQueryConfig(NPP id,
const NPDeviceConfig* request,
NPDeviceConfig* obtain) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device2DQueryConfig(
static_cast<const NPDeviceContext2DConfig*>(request),
@@ -55,7 +52,7 @@ static NPError Device2DQueryConfig(NPP id,
static NPError Device2DInitializeContext(NPP id,
const NPDeviceConfig* config,
NPDeviceContext* context) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device2DInitializeContext(
static_cast<const NPDeviceContext2DConfig*>(config),
@@ -68,7 +65,7 @@ static NPError Device2DSetStateContext(NPP id,
NPDeviceContext* context,
int32_t state,
intptr_t value) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device2DSetStateContext(
static_cast<NPDeviceContext2D*>(context), state, value);
@@ -80,7 +77,7 @@ static NPError Device2DGetStateContext(NPP id,
NPDeviceContext* context,
int32_t state,
intptr_t* value) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device2DGetStateContext(
static_cast<NPDeviceContext2D*>(context), state, value);
@@ -92,7 +89,7 @@ static NPError Device2DFlushContext(NPP id,
NPDeviceContext* context,
NPDeviceFlushContextCallbackPtr callback,
void* user_data) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
NPError err = plugin->webplugin()->delegate()->Device2DFlushContext(
id, static_cast<NPDeviceContext2D*>(context), callback, user_data);
@@ -112,7 +109,7 @@ static NPError Device2DFlushContext(NPP id,
static NPError Device2DDestroyContext(NPP id,
NPDeviceContext* context) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device2DDestroyContext(
static_cast<NPDeviceContext2D*>(context));
@@ -144,7 +141,7 @@ static NPError Device2DMapBuffer(NPP id,
static NPError Device3DQueryCapability(NPP id, int32_t capability,
int32_t* value) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
plugin->webplugin()->delegate()->Device3DQueryCapability(capability, value);
return NPERR_NO_ERROR;
@@ -156,7 +153,7 @@ static NPError Device3DQueryCapability(NPP id, int32_t capability,
static NPError Device3DQueryConfig(NPP id,
const NPDeviceConfig* request,
NPDeviceConfig* obtain) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device3DQueryConfig(
static_cast<const NPDeviceContext3DConfig*>(request),
@@ -168,7 +165,7 @@ static NPError Device3DQueryConfig(NPP id,
static NPError Device3DInitializeContext(NPP id,
const NPDeviceConfig* config,
NPDeviceContext* context) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device3DInitializeContext(
static_cast<const NPDeviceContext3DConfig*>(config),
@@ -181,7 +178,7 @@ static NPError Device3DSetStateContext(NPP id,
NPDeviceContext* context,
int32_t state,
intptr_t value) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device3DSetStateContext(
static_cast<NPDeviceContext3D*>(context), state, value);
@@ -193,7 +190,7 @@ static NPError Device3DGetStateContext(NPP id,
NPDeviceContext* context,
int32_t state,
intptr_t* value) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device3DGetStateContext(
static_cast<NPDeviceContext3D*>(context), state, value);
@@ -205,7 +202,7 @@ static NPError Device3DFlushContext(NPP id,
NPDeviceContext* context,
NPDeviceFlushContextCallbackPtr callback,
void* user_data) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device3DFlushContext(
id, static_cast<NPDeviceContext3D*>(context), callback, user_data);
@@ -215,7 +212,7 @@ static NPError Device3DFlushContext(NPP id,
static NPError Device3DDestroyContext(NPP id,
NPDeviceContext* context) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device3DDestroyContext(
static_cast<NPDeviceContext3D*>(context));
@@ -227,7 +224,7 @@ static NPError Device3DCreateBuffer(NPP id,
NPDeviceContext* context,
size_t size,
int32_t* buffer_id) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device3DCreateBuffer(
static_cast<NPDeviceContext3D*>(context), size, buffer_id);
@@ -238,7 +235,7 @@ static NPError Device3DCreateBuffer(NPP id,
static NPError Device3DDestroyBuffer(NPP id,
NPDeviceContext* context,
int32_t buffer_id) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device3DDestroyBuffer(
static_cast<NPDeviceContext3D*>(context), buffer_id);
@@ -250,7 +247,7 @@ static NPError Device3DMapBuffer(NPP id,
NPDeviceContext* context,
int32_t buffer_id,
NPDeviceBuffer* buffer) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device3DMapBuffer(
static_cast<NPDeviceContext3D*>(context), buffer_id, buffer);
@@ -261,7 +258,7 @@ static NPError Device3DMapBuffer(NPP id,
// Experimental 3D device API --------------------------------------------------
static NPError Device3DGetNumConfigs(NPP id, int32_t* num_configs) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device3DGetNumConfigs(num_configs);
}
@@ -271,7 +268,7 @@ static NPError Device3DGetNumConfigs(NPP id, int32_t* num_configs) {
static NPError Device3DGetConfigAttribs(NPP id,
int32_t config,
int32_t* attrib_list) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device3DGetConfigAttribs(
config,
@@ -284,7 +281,7 @@ static NPError Device3DCreateContext(NPP id,
int32_t config,
const int32_t* attrib_list,
NPDeviceContext** context) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device3DCreateContext(
config,
@@ -302,7 +299,7 @@ static NPError Device3DSynchronizeContext(
int32_t* output_attrib_list,
NPDeviceSynchronizeContextCallbackPtr callback,
void* callback_data) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device3DSynchronizeContext(
id,
@@ -322,7 +319,7 @@ static NPError Device3DRegisterCallback(
int32_t callback_type,
NPDeviceGenericCallbackPtr callback,
void* callback_data) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->Device3DRegisterCallback(
id,
@@ -338,7 +335,7 @@ static NPError Device3DRegisterCallback(
static NPError DeviceAudioQueryCapability(NPP id, int32_t capability,
int32_t* value) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
plugin->webplugin()->delegate()->DeviceAudioQueryCapability(capability,
value);
@@ -351,7 +348,7 @@ static NPError DeviceAudioQueryCapability(NPP id, int32_t capability,
static NPError DeviceAudioQueryConfig(NPP id,
const NPDeviceConfig* request,
NPDeviceConfig* obtain) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->DeviceAudioQueryConfig(
static_cast<const NPDeviceContextAudioConfig*>(request),
@@ -363,7 +360,7 @@ static NPError DeviceAudioQueryConfig(NPP id,
static NPError DeviceAudioInitializeContext(NPP id,
const NPDeviceConfig* config,
NPDeviceContext* context) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->DeviceAudioInitializeContext(
static_cast<const NPDeviceContextAudioConfig*>(config),
@@ -376,7 +373,7 @@ static NPError DeviceAudioSetStateContext(NPP id,
NPDeviceContext* context,
int32_t state,
intptr_t value) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
return plugin->webplugin()->delegate()->DeviceAudioSetStateContext(
static_cast<NPDeviceContextAudio*>(context), state, value);
@@ -388,7 +385,7 @@ static NPError DeviceAudioGetStateContext(NPP id,
NPDeviceContext* context,
int32_t state,
intptr_t* value) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
return plugin->webplugin()->delegate()->DeviceAudioGetStateContext(
static_cast<NPDeviceContextAudio*>(context), state, value);
}
@@ -397,14 +394,14 @@ static NPError DeviceAudioFlushContext(NPP id,
NPDeviceContext* context,
NPDeviceFlushContextCallbackPtr callback,
void* user_data) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
return plugin->webplugin()->delegate()->DeviceAudioFlushContext(
id, static_cast<NPDeviceContextAudio*>(context), callback, user_data);
}
static NPError DeviceAudioDestroyContext(NPP id,
NPDeviceContext* context) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
return plugin->webplugin()->delegate()->DeviceAudioDestroyContext(
static_cast<NPDeviceContextAudio*>(context));
}
@@ -480,7 +477,7 @@ static NPError ChooseFile(NPP id,
NPChooseFileMode mode,
NPChooseFileCallback callback,
void* user_data) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (!plugin)
return NPERR_GENERIC_ERROR;
@@ -493,7 +490,7 @@ static NPError ChooseFile(NPP id,
}
static void NumberOfFindResultsChanged(NPP id, int total, bool final_result) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin) {
plugin->webplugin()->delegate()->NumberOfFindResultsChanged(
total, final_result);
@@ -501,13 +498,13 @@ static void NumberOfFindResultsChanged(NPP id, int total, bool final_result) {
}
static void SelectedFindResultChanged(NPP id, int index) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (plugin)
plugin->webplugin()->delegate()->SelectedFindResultChanged(index);
}
static NPWidgetExtensions* GetWidgetExtensions(NPP id) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (!plugin)
return NULL;
@@ -515,7 +512,7 @@ static NPWidgetExtensions* GetWidgetExtensions(NPP id) {
}
static NPError NPSetCursor(NPP id, NPCursorType type) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (!plugin)
return NPERR_GENERIC_ERROR;
@@ -524,13 +521,15 @@ static NPError NPSetCursor(NPP id, NPCursorType type) {
}
static NPFontExtensions* GetFontExtensions(NPP id) {
- scoped_refptr<PluginInstance> plugin(FindInstance(id));
+ scoped_refptr<NPAPI::PluginInstance> plugin(FindInstance(id));
if (!plugin)
return NULL;
return plugin->webplugin()->delegate()->GetFontExtensions();
}
+namespace NPAPI {
+
NPError GetPepperExtensionsFunctions(void* value) {
static const NPNExtensions kExtensions = {
&AcquireDevice,
@@ -549,5 +548,4 @@ NPError GetPepperExtensionsFunctions(void* value) {
return NPERR_NO_ERROR;
}
-} // namespace npapi
-} // namespace webkit
+} // namespace NPAPI
« no previous file with comments | « webkit/glue/plugins/npapi_extension_thunk.h ('k') | webkit/glue/plugins/plugin_constants_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698