diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 03:37:59 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 03:37:59 +0000 |
| commit | a5717f0344b6156f816e5d3c564c0cc6693f4e8e (patch) | |
| tree | dab34d67b2c9e59b0e85411893f21080e3a4d717 /ppapi/shared_impl/var_tracker.cc | |
| parent | a1e5865d238c6c2a69f8321aea65bdecf840df18 (diff) | |
| download | chromium_src-a5717f0344b6156f816e5d3c564c0cc6693f4e8e.zip chromium_src-a5717f0344b6156f816e5d3c564c0cc6693f4e8e.tar.gz chromium_src-a5717f0344b6156f816e5d3c564c0cc6693f4e8e.tar.bz2 | |
Revert 180190
Windows tests are still failing:
http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%282%29/builds/12476/steps/browser_tests/logs/stdio
http://build.chromium.org/p/chromium.win/buildstatus?builder=XP%20Tests%20%28dbg%29%282%29&number=26342
> PPAPI: Fix WebSocket Var ref leak receiving binary
>
> BUG=173503
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=180093
>
> Reopened; was reverted here:
> https://src.chromium.org/viewvc/chrome?view=rev&revision=180105
> Tests were failing because the IRT was not rebuilt due to a gyp problem, which was fixed here:
> https://src.chromium.org/viewvc/chrome?view=rev&revision=180182
>
> Review URL: https://codereview.chromium.org/12096099
TBR=dmichael@chromium.org
Review URL: https://codereview.chromium.org/12192002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/shared_impl/var_tracker.cc')
| -rw-r--r-- | ppapi/shared_impl/var_tracker.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/ppapi/shared_impl/var_tracker.cc b/ppapi/shared_impl/var_tracker.cc index d515cf7..8214a30 100644 --- a/ppapi/shared_impl/var_tracker.cc +++ b/ppapi/shared_impl/var_tracker.cc @@ -186,18 +186,13 @@ PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes) { 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() { |