diff options
| author | dglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 23:20:33 +0000 |
|---|---|---|
| committer | dglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-18 23:20:33 +0000 |
| commit | b205d20619df6f2bbf4433fe0e1686b06b797b16 (patch) | |
| tree | ecce5b1124a50fb2867f7e11923412ecf5fb7873 /webkit/tools/npapi_layout_test_plugin | |
| parent | 5979aedca6f9145a8933c7b57dee7c6b48168a4e (diff) | |
| download | chromium_src-b205d20619df6f2bbf4433fe0e1686b06b797b16.zip chromium_src-b205d20619df6f2bbf4433fe0e1686b06b797b16.tar.gz chromium_src-b205d20619df6f2bbf4433fe0e1686b06b797b16.tar.bz2 | |
Port PluginObject fix downstream. See http://trac.webkit.org/changeset/61415/ for more details.
R=japhet
TEST=plugins/embed-property.html
BUG=none
Review URL: http://codereview.chromium.org/2816016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50295 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 | 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 43bc616..884a918 100644 --- a/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp +++ b/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp @@ -244,7 +244,10 @@ static bool pluginGetProperty(NPObject* obj, NPIdentifier name, NPVariant* resul { PluginObject* plugin = reinterpret_cast<PluginObject*>(obj); if (name == pluginPropertyIdentifiers[ID_PROPERTY_PROPERTY]) { - STRINGZ_TO_NPVARIANT("property", *result); + static const char* originalString = "property"; + char* buf = static_cast<char*>(browser->memalloc(strlen(originalString) + 1)); + strcpy(buf, originalString); + STRINGZ_TO_NPVARIANT(buf, *result); return true; } else if (name == pluginPropertyIdentifiers[ID_PROPERTY_EVENT_LOGGING]) { BOOLEAN_TO_NPVARIANT(plugin->eventLogging, *result); |