diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 21:10:23 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 21:10:23 +0000 |
| commit | 80196bd875c45e160437adb8b3bd8e060b2f1a72 (patch) | |
| tree | b9d9f89b1bf8d3e7610af35ea5e7ad2e636a50cb /webkit/tools/npapi_layout_test_plugin | |
| parent | 3470a325a84b16c3f38eedb2cc062e5ad0706399 (diff) | |
| download | chromium_src-80196bd875c45e160437adb8b3bd8e060b2f1a72.zip chromium_src-80196bd875c45e160437adb8b3bd8e060b2f1a72.tar.gz chromium_src-80196bd875c45e160437adb8b3bd8e060b2f1a72.tar.bz2 | |
linux: fix and build test plugins on 64-bit builds
We set -fPIC just on the layout test plugins and only in 64-bit mode.
This fixes 44 plugin layout tests on 64-bit.
(Retry, now just npapi_layout_test_plugin and not npapi_test_plugin.)
BUG=18337,24271
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=30851
Review URL: http://codereview.chromium.org/353022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30864 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/npapi_layout_test_plugin')
| -rw-r--r-- | webkit/tools/npapi_layout_test_plugin/PluginObject.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp b/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp index 2e671e6..f06e099 100644 --- a/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp +++ b/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp @@ -501,14 +501,14 @@ static bool testGetIntIdentifier(PluginObject*, const NPVariant* args, uint32_t if (NPVARIANT_IS_DOUBLE(args[0])) { identifier = browser->getintidentifier((int)NPVARIANT_TO_DOUBLE(args[0])); - INT32_TO_NPVARIANT((int32)identifier, *result); - return true; } else if (NPVARIANT_IS_INT32(args[0])) { identifier = browser->getintidentifier((int)NPVARIANT_TO_INT32(args[0])); - INT32_TO_NPVARIANT((int32)identifier, *result); - return true; + } else { + return false; } - return false; + + INT32_TO_NPVARIANT(static_cast<int32>(reinterpret_cast<intptr_t>(identifier)), *result); + return true; } static bool testGetProperty(PluginObject* obj, const NPVariant* args, uint32_t argCount, NPVariant* result) |