Index: webkit/tools/npapi_layout_test_plugin/PluginObject.cpp |
diff --git a/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp b/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp |
index 2e671e60417c8b9b8800c0320ff9a38ac38991ee..f06e09981274ec09a99e0419ac9793256d696ee5 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) |