Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Unified Diff: ppapi/shared_impl/var_tracker.cc

Issue 12096107: Revert 180093 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/shared_impl/var_tracker.h ('k') | ppapi/tests/test_case.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « ppapi/shared_impl/var_tracker.h ('k') | ppapi/tests/test_case.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698