WebSocket Pepper API: allow to release in completion callbacks

ppapi/tests/test_websocket.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/tests/test_websocket.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #include <algorithm>
@@ skipping 62 matching lines @@
         was_clean(was_clean),
         close_code(close_code),
         var(var) {
   }
   EventType event_type;
   bool was_clean;
   uint16_t close_code;
   pp::Var var;
 };
 
+class ReleaseResourceDelegate : public TestCompletionCallback::Delegate {
+ public:
+  explicit ReleaseResourceDelegate(const PPB_Core* core_interface,
+                                   PP_Resource resource)
+      : core_interface_(core_interface),
+        resource_(resource) {
+  }
+
+  // TestCompletionCallback::Delegate implementation.
+  virtual void OnCallback(void* user_data, int32_t result) {

[dmichael (off chromium), 2012/06/26 16:01:40]

nit: OVERRIDE

[Takashi Toyoshima, 2012/06/27 08:09:05]

This code is for NaCl targeted compilers, so I think we couldn't use OVERRIDE
macro here.

+    if (resource_)
+      core_interface_->ReleaseResource(resource_);
+  }
+
+ private:
+  const PPB_Core* core_interface_;
+  PP_Resource resource_;
+};
+
 class TestWebSocketAPI : public pp::WebSocketAPI {
  public:
   explicit TestWebSocketAPI(pp::Instance* instance)
       : pp::WebSocketAPI(instance),
         connected_(false),
         received_(false),
         closed_(false),
         wait_for_connected_(false),
         wait_for_received_(false),
         wait_for_closed_(false),
@@ skipping 474 matching lines @@
   ws = Connect(GetFullURL(kEchoServerURL), &result, "");
   ASSERT_TRUE(ws);
   ASSERT_EQ(PP_OK, result);
   callback.WaitForResult(websocket_interface_->Close(
       ws, PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, PP_MakeUndefined(),
       callback.GetCallback().pp_completion_callback()));
   CHECK_CALLBACK_BEHAVIOR(callback);
   ASSERT_EQ(PP_OK, callback.result());
   core_interface_->ReleaseResource(ws);
 
+  // Release the resource before the completion callback is invoked.

[Takashi Toyoshima, 2012/06/27 08:09:05]

I notice that we already have this first case in TestAbortCall().
I'll remove this first case.

Also I move the second one into TestAbortCalls().

+  ws = Connect(GetFullURL(kEchoServerURL), &result, "");
+  ASSERT_TRUE(ws);
+  ASSERT_EQ(PP_OK, result);
+  result = websocket_interface_->Close(
+      ws, PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, PP_MakeUndefined(),
+      callback.GetCallback().pp_completion_callback());
+  core_interface_->ReleaseResource(ws);
+  callback.WaitForResult(result);
+  CHECK_CALLBACK_BEHAVIOR(callback);
+  ASSERT_EQ(PP_ERROR_ABORTED, callback.result());
+
+  // Release the resource in the completion callback.
+  ws = Connect(GetFullURL(kEchoServerURL), &result, "");
+  ASSERT_TRUE(ws);
+  ASSERT_EQ(PP_OK, result);
+  result = websocket_interface_->Close(
+      ws, PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, PP_MakeUndefined(),
+      callback.GetCallback().pp_completion_callback());
+  ReleaseResourceDelegate delegate(core_interface_, ws);
+  callback.SetDelegate(&delegate);
+  callback.WaitForResult(result);
+  CHECK_CALLBACK_BEHAVIOR(callback);
+  ASSERT_EQ(PP_OK, callback.result());
+
   // Close in connecting.
   // The ongoing connect failed with PP_ERROR_ABORTED, then the close is done
   // successfully.
   ws = websocket_interface_->Create(instance_->pp_instance());
   result = websocket_interface_->Connect(
       ws, url, protocols, 0U, callback.GetCallback().pp_completion_callback());
   ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
   result = websocket_interface_->Close(
       ws, PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, reason,
       another_callback.GetCallback().pp_completion_callback());
@@ skipping 820 matching lines @@
   size_t last_event = events_on_closed - 1;
   for (uint32_t i = 1; i < last_event; ++i) {
     ASSERT_EQ(WebSocketEvent::EVENT_MESSAGE, events[i].event_type);
     ASSERT_TRUE(AreEqualWithString(events[i].var.pp_var(), message));
   }
   ASSERT_EQ(WebSocketEvent::EVENT_CLOSE, events[last_event].event_type);
   ASSERT_TRUE(events[last_event].was_clean);
 
   PASS();
 }