summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/message_channel.cc8
-rw-r--r--webkit/plugins/ppapi/npapi_glue.cc1
2 files changed, 5 insertions, 4 deletions
diff --git a/webkit/plugins/ppapi/message_channel.cc b/webkit/plugins/ppapi/message_channel.cc
index 4e9e82883..33b32b7 100644
--- a/webkit/plugins/ppapi/message_channel.cc
+++ b/webkit/plugins/ppapi/message_channel.cc
@@ -85,13 +85,13 @@ bool PPVarToV8Value(PP_Var var, v8::Handle<v8::Value>* result) {
break;
}
case PP_VARTYPE_OBJECT:
- // Objects are not currently supported.
+ case PP_VARTYPE_ARRAY:
+ case PP_VARTYPE_DICTIONARY:
+ case PP_VARTYPE_ARRAY_BUFFER:
+ // These are not currently supported.
NOTIMPLEMENTED();
result->Clear();
return false;
- default:
- result->Clear();
- return false;
}
return true;
}
diff --git a/webkit/plugins/ppapi/npapi_glue.cc b/webkit/plugins/ppapi/npapi_glue.cc
index ecc5a41..7f166cd 100644
--- a/webkit/plugins/ppapi/npapi_glue.cc
+++ b/webkit/plugins/ppapi/npapi_glue.cc
@@ -75,6 +75,7 @@ bool PPVarToNPVariant(PP_Var var, NPVariant* result) {
}
case PP_VARTYPE_ARRAY:
case PP_VARTYPE_DICTIONARY:
+ case PP_VARTYPE_ARRAY_BUFFER:
VOID_TO_NPVARIANT(*result);
break;
}