diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 01:51:17 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 01:51:17 +0000 |
| commit | e860be5cce381803cb3116b4476a173fdf9d60c9 (patch) | |
| tree | 516cb9be9b333c9fb3563efc32c66a642d46296f /webkit | |
| parent | e09cee46b136f877390960323c84ef935ce5b7df (diff) | |
| download | chromium_src-e860be5cce381803cb3116b4476a173fdf9d60c9.zip chromium_src-e860be5cce381803cb3116b4476a173fdf9d60c9.tar.gz chromium_src-e860be5cce381803cb3116b4476a173fdf9d60c9.tar.bz2 | |
Rename testCallbackRet to testCallbackReturn.
This function was an extension to the NPAPI test plugin that was added
to the Chromium fork. Allow the function call to be called
testCallbackReturn rather than testCallbackRet so we can move the test
to a more common location upstream without using the abbreviated name:
https://bugs.webkit.org/show_bug.cgi?id=49103 .
Review URL: http://codereview.chromium.org/4639003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/npapi_layout_test_plugin/PluginObject.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp b/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp index 83a4fc4..3f3ae4d 100644 --- a/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp +++ b/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp @@ -156,6 +156,7 @@ enum { ID_TEST_EVALUATE, ID_TEST_GET_PROPERTY_RETURN_VALUE, ID_TEST_CALLBACK_METHOD_RET, + ID_TEST_CALLBACK_METHOD_RETURN, ID_TEST_CREATE_TEST_OBJECT, ID_TEST_PASS_TEST_OBJECT, ID_TEST_CLONE_OBJECT, @@ -190,6 +191,7 @@ static const NPUTF8 *pluginMethodIdentifierNames[NUM_METHOD_IDENTIFIERS] = { "testEvaluate", "testGetPropertyReturnValue", "testCallbackRet", // Chrome bug 897451 + "testCallbackReturn", // Chrome bug 897451 "testCreateTestObject", // Chrome bug 1093606 "testPassTestObject", // Chrome bug 1093606 "testCloneObject", @@ -802,7 +804,8 @@ static bool pluginInvoke(NPObject* header, NPIdentifier name, const NPVariant* a return testIdentifierToInt(plugin, args, argCount, result); else if (name == pluginMethodIdentifiers[ID_TEST_POSTURL_FILE]) return testPostURLFile(plugin, args, argCount, result); - else if (name == pluginMethodIdentifiers[ID_TEST_CALLBACK_METHOD_RET]) { + else if (name == pluginMethodIdentifiers[ID_TEST_CALLBACK_METHOD_RET] || + name == pluginMethodIdentifiers[ID_TEST_CALLBACK_METHOD_RETURN]) { // call whatever method name we're given, and pass it the 'window' obj. // we expect the function to return its argument. if (argCount > 0 && NPVARIANT_IS_STRING(args[0])) { |