| Index: ppapi/shared_impl/var_tracker.cc
|
| ===================================================================
|
| --- ppapi/shared_impl/var_tracker.cc (revision 180103)
|
| +++ ppapi/shared_impl/var_tracker.cc (working copy)
|
| @@ -186,18 +186,13 @@
|
|
|
| PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes,
|
| const void* data) {
|
| - ArrayBufferVar* array_buffer = MakeArrayBufferVar(size_in_bytes, data);
|
| - return array_buffer ? array_buffer->GetPPVar() : PP_MakeNull();
|
| -}
|
| -
|
| -ArrayBufferVar* VarTracker::MakeArrayBufferVar(uint32 size_in_bytes,
|
| - const void* data) {
|
| DCHECK(CalledOnValidThread());
|
| - ArrayBufferVar* array_buffer(CreateArrayBuffer(size_in_bytes));
|
| +
|
| + scoped_refptr<ArrayBufferVar> array_buffer(CreateArrayBuffer(size_in_bytes));
|
| if (!array_buffer)
|
| - return NULL;
|
| + return PP_MakeNull();
|
| memcpy(array_buffer->Map(), data, size_in_bytes);
|
| - return array_buffer;
|
| + return array_buffer->GetPPVar();
|
| }
|
|
|
| std::vector<PP_Var> VarTracker::GetLiveVars() {
|
|
|