DomStorage async IPC message definitions and browser-side handlers. These messages aren't called ye…

content/browser/dom_storage/dom_storage_message_filter.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 "content/browser/dom_storage/dom_storage_message_filter.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/nullable_string16.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ skipping 68 matching lines @@
   DCHECK_EQ(0, connection_dispatching_message_for_);
 
   // The connection_id is always the first param.
   int connection_id = IPC::MessageIterator(message).NextInt();
   AutoReset<int> auto_reset(&connection_dispatching_message_for_,
                             connection_id);
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(DOMStorageMessageFilter, message, *message_was_ok)
     IPC_MESSAGE_HANDLER(DOMStorageHostMsg_OpenStorageArea, OnOpenStorageArea)
     IPC_MESSAGE_HANDLER(DOMStorageHostMsg_CloseStorageArea, OnCloseStorageArea)
+    IPC_MESSAGE_HANDLER(DOMStorageHostMsg_LoadStorageArea, OnLoadStorageArea)
     IPC_MESSAGE_HANDLER(DOMStorageHostMsg_Length, OnLength)
     IPC_MESSAGE_HANDLER(DOMStorageHostMsg_Key, OnKey)
     IPC_MESSAGE_HANDLER(DOMStorageHostMsg_GetItem, OnGetItem)
     IPC_MESSAGE_HANDLER(DOMStorageHostMsg_SetItem, OnSetItem)
+    IPC_MESSAGE_HANDLER(DOMStorageHostMsg_SetItemAsync, OnSetItemAsync)
     IPC_MESSAGE_HANDLER(DOMStorageHostMsg_RemoveItem, OnRemoveItem)
+    IPC_MESSAGE_HANDLER(DOMStorageHostMsg_RemoveItemAsync, OnRemoveItemAsync)
     IPC_MESSAGE_HANDLER(DOMStorageHostMsg_Clear, OnClear)
+    IPC_MESSAGE_HANDLER(DOMStorageHostMsg_ClearAsync, OnClearAsync)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void DOMStorageMessageFilter::OnOpenStorageArea(int connection_id,
                                                 int64 namespace_id,
                                                 const GURL& origin) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!host_->OpenStorageArea(connection_id, namespace_id, origin)) {
-    content::RecordAction(UserMetricsAction("BadMessageTerminate_DSMF"));
+    content::RecordAction(UserMetricsAction("BadMessageTerminate_DSMF_1"));
     BadMessageReceived();
   }
 }
 
 void DOMStorageMessageFilter::OnCloseStorageArea(int connection_id) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   host_->CloseStorageArea(connection_id);
 }
 
+void DOMStorageMessageFilter::OnLoadStorageArea(int connection_id,
+                                                dom_storage::ValuesMap* map) {
+  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
+  if (!host_->ExtractAreaValues(connection_id, map)) {
+    content::RecordAction(UserMetricsAction("BadMessageTerminate_DSMF_2"));
+    BadMessageReceived();
+  }
+}
+
 void DOMStorageMessageFilter::OnLength(int connection_id,
                                        unsigned* length) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   *length = host_->GetAreaLength(connection_id);
 }
 
 void DOMStorageMessageFilter::OnKey(int connection_id, unsigned index,
                                     NullableString16* key) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   *key = host_->GetAreaKey(connection_id, index);
@@ skipping 11 matching lines @@
     const string16& value, const GURL& page_url,
     WebKit::WebStorageArea::Result* result, NullableString16* old_value) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   *old_value = NullableString16(true);
   if (host_->SetAreaItem(connection_id, key, value, page_url, old_value))
     *result = WebKit::WebStorageArea::ResultOK;
   else
     *result = WebKit::WebStorageArea::ResultBlockedByQuota;
 }
 
+void DOMStorageMessageFilter::OnSetItemAsync(
+    int connection_id, int operation_id, const string16& key,
+    const string16& value, const GURL& page_url) {
+  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
+  NullableString16 not_used;
+  bool success = host_->SetAreaItem(connection_id, key, value,
+                                    page_url, &not_used);
+  Send(new DOMStorageMsg_AsyncOperationComplete(operation_id, success));
+}
+
 void DOMStorageMessageFilter::OnRemoveItem(
-    int connection_id, const string16& key, const GURL& pageUrl,
+    int connection_id, const string16& key, const GURL& page_url,
     NullableString16* old_value) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   string16 old_string_value;
-  if (host_->RemoveAreaItem(connection_id, key, pageUrl, &old_string_value))
+  if (host_->RemoveAreaItem(connection_id, key, page_url, &old_string_value))
     *old_value = NullableString16(old_string_value, false);
   else
     *old_value = NullableString16(true);
 }
 
+void DOMStorageMessageFilter::OnRemoveItemAsync(
+    int connection_id, int operation_id, const string16& key,
+    const GURL& page_url) {
+  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
+  string16 not_used;
+  host_->RemoveAreaItem(connection_id, key, page_url, &not_used);
+  Send(new DOMStorageMsg_AsyncOperationComplete(operation_id, true));
+}
+
 void DOMStorageMessageFilter::OnClear(int connection_id, const GURL& page_url,
                                       bool* something_cleared) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   *something_cleared = host_->ClearArea(connection_id, page_url);
 }
 
+void DOMStorageMessageFilter::OnClearAsync(
+    int connection_id, int operation_id, const GURL& page_url) {
+  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
+  host_->ClearArea(connection_id, page_url);
+  Send(new DOMStorageMsg_AsyncOperationComplete(operation_id, true));
+}
+
 void DOMStorageMessageFilter::OnDomStorageItemSet(
     const dom_storage::DomStorageArea* area,
     const string16& key,
     const string16& new_value,
     const NullableString16& old_value,
     const GURL& page_url) {
   SendDomStorageEvent(area, page_url,
                       NullableString16(key, false),
                       NullableString16(new_value, false),
                       old_value);
@@ skipping 28 matching lines @@
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   DOMStorageMsg_Event_Params params;
   params.origin = area->origin();
   params.page_url = page_url;
   params.connection_id = connection_dispatching_message_for_;
   params.key = key;
   params.new_value = new_value;
   params.old_value = old_value;
   Send(new DOMStorageMsg_Event(params));
 }