diff options
| author | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 23:17:37 +0000 |
|---|---|---|
| committer | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 23:17:37 +0000 |
| commit | fb8d32aab3a33166d3c1814e295eeafbea97174b (patch) | |
| tree | 333cebe6d64ed3edb2fc5a3d7ef03fe8f5dec1b1 /o3d/plugin/cross | |
| parent | ebe89e0676c12a6ebccb35fef1611323d1b35afb (diff) | |
| download | chromium_src-fb8d32aab3a33166d3c1814e295eeafbea97174b.zip chromium_src-fb8d32aab3a33166d3c1814e295eeafbea97174b.tar.gz chromium_src-fb8d32aab3a33166d3c1814e295eeafbea97174b.tar.bz2 | |
Changes needed to get Mac plugin gyp project build compiling and linking.
Review URL: http://codereview.chromium.org/165433
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin/cross')
| -rw-r--r-- | o3d/plugin/cross/async_loading.cc | 1 | ||||
| -rw-r--r-- | o3d/plugin/cross/main.cc | 6 | ||||
| -rw-r--r-- | o3d/plugin/cross/np_v8_bridge.cc | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/o3d/plugin/cross/async_loading.cc b/o3d/plugin/cross/async_loading.cc index dfcbcfe..e0f577f 100644 --- a/o3d/plugin/cross/async_loading.cc +++ b/o3d/plugin/cross/async_loading.cc @@ -228,7 +228,6 @@ void userglue_method_send(void *plugin_data, PluginObject *plugin_object = static_cast<PluginObject *>(plugin_data); StreamManager *stream_manager = plugin_object->stream_manager(); StreamManager::FinishedCallback *callback = NULL; - bool result = false; if (request->done()) { request->set_success(false); diff --git a/o3d/plugin/cross/main.cc b/o3d/plugin/cross/main.cc index da16756..1d33da5 100644 --- a/o3d/plugin/cross/main.cc +++ b/o3d/plugin/cross/main.cc @@ -49,10 +49,10 @@ namespace o3d { NPError NP_GetValue(void *instance, NPPVariable variable, void *value) { switch (variable) { case NPPVpluginNameString: - *static_cast<char **>(value) = O3D_PLUGIN_NAME; + *static_cast<char **>(value) = const_cast<char*>(O3D_PLUGIN_NAME); break; case NPPVpluginDescriptionString: - *static_cast<char **>(value) = O3D_PLUGIN_DESCRIPTION; + *static_cast<char **>(value) = const_cast<char*>(O3D_PLUGIN_DESCRIPTION); break; default: return NPERR_INVALID_PARAM; @@ -170,7 +170,7 @@ NPError EXPORT_SYMBOL OSCALL NP_GetEntryPoints(NPPluginFuncs *pluginFuncs) { } char * EXPORT_SYMBOL NP_GetMIMEDescription(void) { - return O3D_PLUGIN_MIME_TYPE "::O3D MIME"; + return const_cast<char*>(O3D_PLUGIN_MIME_TYPE "::O3D MIME"); } } // namespace o3d / extern "C" diff --git a/o3d/plugin/cross/np_v8_bridge.cc b/o3d/plugin/cross/np_v8_bridge.cc index e36b9d8..2acdfd8 100644 --- a/o3d/plugin/cross/np_v8_bridge.cc +++ b/o3d/plugin/cross/np_v8_bridge.cc @@ -484,7 +484,8 @@ class NPV8Object : public NPObject { // Due to a bug in Chrome, need to filter out any properties that // are functions. See comment in HasProperty. int num_non_function_properties = 0; - for (int i = 0; i != v8_names->Length(); ++i) { + int length = v8_names->Length(); + for (int i = 0; i < length; ++i) { Local<Value> v8_property_value = v8_object->Get(v8_names->Get(Int32::New(i))); if (!v8_property_value->IsFunction()) { |