From 1cd88924057509ec73059406a7a5b909e48fc203 Mon Sep 17 00:00:00 2001 From: "koz@chromium.org" Date: Fri, 1 Feb 2013 06:54:42 +0000 Subject: Revert 180093 > PPAPI: Fix WebSocket Var ref leak receiving binary > > BUG=173503 > > > Review URL: https://chromiumcodereview.appspot.com/12096099 This seems to have broken WebSocket tests on the mac bots http://build.chromium.org/p/chromium.mac/builders/Mac10.6%20Tests%20%281%29/builds/35419 http://build.chromium.org/p/chromium.mac/builders/Mac10.7%20Tests%20%281%29/builds/7829 TBR=dmichael@chromium.org Review URL: https://codereview.chromium.org/12096107 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180105 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/proxy/websocket_resource.cc | 6 +++--- ppapi/shared_impl/var_tracker.cc | 13 ++++--------- ppapi/shared_impl/var_tracker.h | 6 ------ ppapi/tests/test_case.h | 2 +- ppapi/tests/test_websocket.cc | 1 - 5 files changed, 8 insertions(+), 20 deletions(-) (limited to 'ppapi') 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 message_var( - PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferVar( + scoped_refptr message_var(ArrayBufferVar::FromPPVar( + PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar( message.size(), - &message.front())); + &message.front()))); received_messages_.push(message_var); if (!TrackedCallback::IsPending(receive_callback_)) 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 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 VarTracker::GetLiveVars() { diff --git a/ppapi/shared_impl/var_tracker.h b/ppapi/shared_impl/var_tracker.h index 1d0c0d6..b873250 100644 --- a/ppapi/shared_impl/var_tracker.h +++ b/ppapi/shared_impl/var_tracker.h @@ -73,12 +73,6 @@ class PPAPI_SHARED_EXPORT VarTracker // Same as above, but copy the contents of |data| in to the new array buffer. PP_Var MakeArrayBufferPPVar(uint32 size_in_bytes, const void* data); - // Create an ArrayBuffer and copy the contents of |data| in to it. The - // returned object has 0 reference count in the tracker, and like all - // RefCounted objects, has a 0 initial internal reference count. (You should - // usually immediately put this in a scoped_refptr). - ArrayBufferVar* MakeArrayBufferVar(uint32 size_in_bytes, const void* data); - // Return a vector containing all PP_Vars that are in the tracker. This is // to help implement PPB_Testing_Dev.GetLiveVars and should generally not be // used in production code. The PP_Vars are returned in no particular order, diff --git a/ppapi/tests/test_case.h b/ppapi/tests/test_case.h index b63309f..b06f941 100644 --- a/ppapi/tests/test_case.h +++ b/ppapi/tests/test_case.h @@ -313,7 +313,7 @@ class TestCaseFactory { instance_->pp_instance()) != objects) \ error_message = MakeFailureMessage(__FILE__, __LINE__, \ "reference leak check"); \ - instance_->LogTest(#name, CheckResourcesAndVars(error_message)); \ + instance_->LogTest(#name, error_message); \ } // Helper macros for checking values in tests, and returning a location diff --git a/ppapi/tests/test_websocket.cc b/ppapi/tests/test_websocket.cc index acbad3e..d5dc486 100644 --- a/ppapi/tests/test_websocket.cc +++ b/ppapi/tests/test_websocket.cc @@ -464,7 +464,6 @@ std::string TestWebSocket::TestValidConnect() { PP_Var extensions = websocket_interface_->GetExtensions(ws); ASSERT_TRUE(AreEqualWithString(extensions, "")); core_interface_->ReleaseResource(ws); - ReleaseVar(extensions); PASS(); } -- cgit v1.1