summaryrefslogtreecommitdiffstats
path: root/webkit/plugins/ppapi/plugin_object.cc
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 22:50:43 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 22:50:43 +0000
commit872caf56ebb67c01a01d0c8c612e171fd4332624 (patch)
treeb574e7c9f2ac638f3dcd047bf58acc5365752df9 /webkit/plugins/ppapi/plugin_object.cc
parentf498828c37cca39771d2a578c609020b5293197c (diff)
downloadchromium_src-872caf56ebb67c01a01d0c8c612e171fd4332624.zip
chromium_src-872caf56ebb67c01a01d0c8c612e171fd4332624.tar.gz
chromium_src-872caf56ebb67c01a01d0c8c612e171fd4332624.tar.bz2
Remove PP_Module from parameters for PPB_Var.VarFromUtf8.
This change has tendrils stretching throughout the code, but mostly this lets us delete a bunch of stuff. This also does a slight refactor to put the PPB_Var implementations in 1 place, since they were already practically identical, and I didn't want to do the backwards-compat code in 2 places. BUG=106596 TEST=N/A TBR=darin,tony darin,tony TBR for rubber-stamp of webkit/glue/webkit_glue.gypi Review URL: http://codereview.chromium.org/8826011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113491 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi/plugin_object.cc')
-rw-r--r--webkit/plugins/ppapi/plugin_object.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/plugins/ppapi/plugin_object.cc b/webkit/plugins/ppapi/plugin_object.cc
index 5cd5396..61f155b 100644
--- a/webkit/plugins/ppapi/plugin_object.cc
+++ b/webkit/plugins/ppapi/plugin_object.cc
@@ -195,8 +195,8 @@ bool WrapperClass_Enumerate(NPObject* object, NPIdentifier** values,
for (uint32_t i = 0; i < property_count; ++i) {
if (!((*values)[i] = PPVarToNPIdentifier(properties[i]))) {
// Throw an exception for the failed convertion.
- *result_converter.exception() = StringVar::StringToPPVar(
- obj->instance()->module()->pp_module(), kInvalidValueException);
+ *result_converter.exception() =
+ StringVar::StringToPPVar(kInvalidValueException);
break;
}
(*count)++;