diff options
| author | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 16:51:38 +0000 |
|---|---|---|
| committer | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 16:51:38 +0000 |
| commit | 5f6745ebf3f595e6cddaf70b76d78699e40b0a44 (patch) | |
| tree | 32addee40780977d039c520fb12087dccf1ef8fc /webkit/glue | |
| parent | 194b41be7fdce80b33da38a844fb70a7b5eadb78 (diff) | |
| download | chromium_src-5f6745ebf3f595e6cddaf70b76d78699e40b0a44.zip chromium_src-5f6745ebf3f595e6cddaf70b76d78699e40b0a44.tar.gz chromium_src-5f6745ebf3f595e6cddaf70b76d78699e40b0a44.tar.bz2 | |
To implement Pepper in Native Client we need access to the implementation of the
Pepper APIs in Chrome. Specifically, we need to be able to get the base::SharedMemory
or TransportDIB memory regions used to communicate with devices. To enable doing this,
especially in 64-bit Chrome, I needed to change the GetStateContext and SetStateContext
functions to manipulate 64-bit values. This CL does not include the Native Client
hookup to the new APIs, but is needed to do so.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/569004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
4 files changed, 12 insertions, 12 deletions
diff --git a/webkit/glue/plugins/npapi_extension_thunk.cc b/webkit/glue/plugins/npapi_extension_thunk.cc index 5700ef5..61054c7 100644 --- a/webkit/glue/plugins/npapi_extension_thunk.cc +++ b/webkit/glue/plugins/npapi_extension_thunk.cc @@ -61,7 +61,7 @@ static NPError Device2DInitializeContext(NPP id, static NPError Device2DSetStateContext(NPP id, NPDeviceContext* context, int32 state, - int32 value) { + intptr_t value) { scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id); if (plugin) { return plugin->webplugin()->delegate()->Device2DSetStateContext( @@ -73,7 +73,7 @@ static NPError Device2DSetStateContext(NPP id, static NPError Device2DGetStateContext(NPP id, NPDeviceContext* context, int32 state, - int32* value) { + intptr_t* value) { scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id); if (plugin) { return plugin->webplugin()->delegate()->Device2DGetStateContext( @@ -173,7 +173,7 @@ static NPError Device3DInitializeContext(NPP id, static NPError Device3DSetStateContext(NPP id, NPDeviceContext* context, int32 state, - int32 value) { + intptr_t value) { scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id); if (plugin) { return plugin->webplugin()->delegate()->Device3DSetStateContext( @@ -185,7 +185,7 @@ static NPError Device3DSetStateContext(NPP id, static NPError Device3DGetStateContext(NPP id, NPDeviceContext* context, int32 state, - int32* value) { + intptr_t* value) { scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id); if (plugin) { return plugin->webplugin()->delegate()->Device3DGetStateContext( @@ -292,7 +292,7 @@ static NPError DeviceAudioInitializeContext(NPP id, static NPError DeviceAudioSetStateContext(NPP id, NPDeviceContext* context, int32 state, - int32 value) { + intptr_t value) { scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id); if (plugin) { return plugin->webplugin()->delegate()->DeviceAudioSetStateContext( @@ -304,7 +304,7 @@ static NPError DeviceAudioSetStateContext(NPP id, static NPError DeviceAudioGetStateContext(NPP id, NPDeviceContext* context, int32 state, - int32* value) { + intptr_t* value) { scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id); return plugin->webplugin()->delegate()->DeviceAudioGetStateContext( static_cast<NPDeviceContextAudio*>(context), state, value); diff --git a/webkit/glue/plugins/webplugin_2d_device_delegate.h b/webkit/glue/plugins/webplugin_2d_device_delegate.h index 55b50b7..69bd53a 100644 --- a/webkit/glue/plugins/webplugin_2d_device_delegate.h +++ b/webkit/glue/plugins/webplugin_2d_device_delegate.h @@ -29,12 +29,12 @@ class WebPlugin2DDeviceDelegate { } virtual NPError Device2DSetStateContext(NPDeviceContext2D* context, int32 state, - int32 value) { + intptr_t value) { return NPERR_GENERIC_ERROR; } virtual NPError Device2DGetStateContext(NPDeviceContext2D* context, int32 state, - int32* value) { + intptr_t* value) { return NPERR_GENERIC_ERROR; } virtual NPError Device2DFlushContext(NPP id, diff --git a/webkit/glue/plugins/webplugin_3d_device_delegate.h b/webkit/glue/plugins/webplugin_3d_device_delegate.h index 42dc300..c2c98f3 100644 --- a/webkit/glue/plugins/webplugin_3d_device_delegate.h +++ b/webkit/glue/plugins/webplugin_3d_device_delegate.h @@ -29,12 +29,12 @@ class WebPlugin3DDeviceDelegate { } virtual NPError Device3DSetStateContext(NPDeviceContext3D* context, int32 state, - int32 value) { + intptr_t value) { return NPERR_GENERIC_ERROR; } virtual NPError Device3DGetStateContext(NPDeviceContext3D* context, int32 state, - int32* value) { + intptr_t* value) { return NPERR_GENERIC_ERROR; } virtual NPError Device3DFlushContext(NPP id, diff --git a/webkit/glue/plugins/webplugin_audio_device_delegate.h b/webkit/glue/plugins/webplugin_audio_device_delegate.h index 260bcbd..3f37246 100644 --- a/webkit/glue/plugins/webplugin_audio_device_delegate.h +++ b/webkit/glue/plugins/webplugin_audio_device_delegate.h @@ -29,11 +29,11 @@ class WebPluginAudioDeviceDelegate { return NPERR_GENERIC_ERROR; } virtual NPError DeviceAudioSetStateContext(NPDeviceContextAudio* context, - int32 state, int32 value) { + int32 state, intptr_t value) { return NPERR_GENERIC_ERROR; } virtual NPError DeviceAudioGetStateContext(NPDeviceContextAudio* context, - int32 state, int32* value) { + int32 state, intptr_t* value) { return NPERR_GENERIC_ERROR; } virtual NPError DeviceAudioFlushContext( |