Cookie API: Use req id to match call and callback

rogerwang · rogerwang · commit 389036151a0a · 2013-11-07T14:30:55.000+08:00
diff --git a/src/api/window/window.cc b/src/api/window/window.cc
@@ -21,6 +21,7 @@
 #include "content/nw/src/api/window/window.h"
 
 #include "base/values.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/nw/src/api/dispatcher_host.h"
 #include "content/nw/src/api/menu/menu.h"
@@ -282,8 +283,8 @@ void Window::CookieGet(const base::ListValue& arguments, bool get_all) {
 
   CookieAPIContext* api_context = new CookieAPIContext;
   api_context->store_context_ = context_getter;
-
-  arguments.GetDictionary(0, &details);
+  arguments.GetInteger(0, &api_context->req_id_);
+  arguments.GetDictionary(1, &details);
   if (details) {
     api_context->details_.reset(details->DeepCopyWithoutEmptyChildren());
     details->GetString("url", &url);
@@ -376,7 +377,7 @@ void Window::RespondOnUIThread(CookieAPIContext* api_context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   base::ListValue ret;
   ret.Append(api_context->result_.release());
-  dispatcher_host()->SendEvent(this, "__nw_gotcookie", ret);
+  dispatcher_host()->SendEvent(this, base::StringPrintf("__nw_gotcookie%d", api_context->req_id_), ret);
 }
 
 }  // namespace api
diff --git a/src/api/window/window.h b/src/api/window/window.h
@@ -42,6 +42,7 @@ class CookieAPIContext : public base::RefCountedThreadSafe<CookieAPIContext> {
   scoped_ptr<base::DictionaryValue> details_;
   scoped_ptr<base::ListValue> result_;
   GURL url_;
+  int req_id_;
 };
 
 
diff --git a/src/api/window_bindings.js b/src/api/window_bindings.js
@@ -22,24 +22,27 @@ function Window(routing_id, nobind) {
 
     var that = this;
     this.cookies = {
+        req_id : 0,
         get : function(details, cb) {
-            CallObjectMethod(that, 'CookieGet', [ details ]);
+            this.req_id++;
             if (typeof cb == 'function') {
-                that.once('__nw_gotcookie', function(cookie) {
+                that.once('__nw_gotcookie' + this.req_id, function(cookie) {
                     if (cookie.length > 0)
                         cb(cookie[0]);
                     else
                         cb(null);
                 });
             }
+            CallObjectMethod(that, 'CookieGet', [ this.req_id, details ]);
         },
         getAll : function(details, cb) {
-            CallObjectMethod(that, 'CookieGetAll', [ details ]);
+            this.req_id++;
             if (typeof cb == 'function') {
-                that.once('__nw_gotcookie', function(cookie) {
+                that.once('__nw_gotcookie' + this.req_id, function(cookie) {
                     cb(cookie);
                 });
             }
+            CallObjectMethod(that, 'CookieGetAll', [ this.req_id, details ]);
         }
     }
 }
