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/proxy | |
| 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/proxy')
| -rw-r--r-- | ppapi/proxy/websocket_resource.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/proxy/websocket_resource.cc b/ppapi/proxy/websocket_resource.cc index 7439826..c45de90 100644 --- a/ppapi/proxy/websocket_resource.cc +++ b/ppapi/proxy/websocket_resource.cc @@ -423,10 +423,10 @@ void WebSocketResource::OnPluginMsgReceiveBinaryReply( return; // Append received data to queue. - scoped_refptr<Var> message_var( - PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferVar( + scoped_refptr<Var> message_var(ArrayBufferVar::FromPPVar( + PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar( message.size(), - &message.front())); + &message.front()))); received_messages_.push(message_var); if (!TrackedCallback::IsPending(receive_callback_)) |