Add the backchannel for Blobs to be received into Blink from the database backend.

Source/modules/indexeddb/WebIDBCallbacksImpl.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 15 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/indexeddb/WebIDBCallbacksImpl.h"
 
 #include "core/dom/DOMError.h"
 #include "modules/indexeddb/IDBMetadata.h"
 #include "modules/indexeddb/IDBRequest.h"
 #include "platform/SharedBuffer.h"
+#include "public/platform/WebBlobInfo.h"
 #include "public/platform/WebData.h"
 #include "public/platform/WebIDBCursor.h"
 #include "public/platform/WebIDBDatabase.h"
 #include "public/platform/WebIDBDatabaseError.h"
 #include "public/platform/WebIDBKey.h"
 
+using blink::WebBlobInfo;
 using blink::WebData;
 using blink::WebIDBCursor;
 using blink::WebIDBDatabase;
 using blink::WebIDBDatabaseError;
 using blink::WebIDBIndex;
 using blink::WebIDBKey;
 using blink::WebIDBKeyPath;
 using blink::WebIDBMetadata;
+using blink::WebVector;
 
 namespace WebCore {
 
+

[jsbell, 2014/04/15 18:29:07]

Remove this extra blank line

[ericu, 2014/04/16 23:04:14]

Done.

 // static
 PassOwnPtr<WebIDBCallbacksImpl> WebIDBCallbacksImpl::create(PassRefPtr<IDBRequest> request)
 {
     return adoptPtr(new WebIDBCallbacksImpl(request));
 }
 
 WebIDBCallbacksImpl::WebIDBCallbacksImpl(PassRefPtr<IDBRequest> request)
     : m_request(request)
 {
 }
 
 WebIDBCallbacksImpl::~WebIDBCallbacksImpl()
 {
 }
 
+static PassOwnPtr<Vector<WebBlobInfo> > ConvertBlobInfo(const WebVector<WebBlobInfo>& webBlobInfo)
+{
+    OwnPtr<Vector<WebBlobInfo> > blobInfo = adoptPtr(new Vector<WebBlobInfo>(webBlobInfo.size()));
+    for (size_t i = 0; i < webBlobInfo.size(); ++i)
+        (*blobInfo)[i] = webBlobInfo[i];
+    return blobInfo.release();
+}
+
 void WebIDBCallbacksImpl::onError(const WebIDBDatabaseError& error)
 {
     m_request->onError(error);
 }
 
-void WebIDBCallbacksImpl::onSuccess(const blink::WebVector<blink::WebString>& webStringList)
+void WebIDBCallbacksImpl::onSuccess(const WebVector<blink::WebString>& webStringList)
 {
     Vector<String> stringList;
     for (size_t i = 0; i < webStringList.size(); ++i)
         stringList.append(webStringList[i]);
     m_request->onSuccess(stringList);
 }
 
 void WebIDBCallbacksImpl::onSuccess(WebIDBCursor* cursor, const WebIDBKey& key, const WebIDBKey& primaryKey, const WebData& value)
 {
-    m_request->onSuccess(adoptPtr(cursor), key, primaryKey, value);
+    OwnPtr<Vector<blink::WebBlobInfo> > blobInfo(adoptPtr(new Vector<blink::WebBlobInfo>()));
+    m_request->onSuccess(adoptPtr(cursor), key, primaryKey, value, blobInfo.release());
+}
+
+void WebIDBCallbacksImpl::onSuccess(WebIDBCursor* cursor, const WebIDBKey& key, const WebIDBKey& primaryKey, const WebData& value, const WebVector<WebBlobInfo>& webBlobInfo)
+{
+    m_request->onSuccess(adoptPtr(cursor), key, primaryKey, value, ConvertBlobInfo(webBlobInfo));
 }
 
 void WebIDBCallbacksImpl::onSuccess(WebIDBDatabase* backend, const WebIDBMetadata& metadata)
 {
     m_request->onSuccess(adoptPtr(backend), metadata);
 }
 
 void WebIDBCallbacksImpl::onSuccess(const WebIDBKey& key)
 {
     m_request->onSuccess(key);
 }
 
 void WebIDBCallbacksImpl::onSuccess(const WebData& value)
 {
-    m_request->onSuccess(value);
+    OwnPtr<Vector<blink::WebBlobInfo> > blobInfo(adoptPtr(new Vector<blink::WebBlobInfo>()));
+    m_request->onSuccess(value, blobInfo.release());
+}
+
+void WebIDBCallbacksImpl::onSuccess(const WebData& value, const WebVector<WebBlobInfo>& webBlobInfo)
+{
+    m_request->onSuccess(value, ConvertBlobInfo(webBlobInfo));
 }
 
 void WebIDBCallbacksImpl::onSuccess(const WebData& value, const WebIDBKey& key, const WebIDBKeyPath& keyPath)
 {
-    m_request->onSuccess(value, key, keyPath);
+    OwnPtr<Vector<blink::WebBlobInfo> > blobInfo(adoptPtr(new Vector<blink::WebBlobInfo>()));
+    m_request->onSuccess(value, blobInfo.release(), key, keyPath);
+}
+
+void WebIDBCallbacksImpl::onSuccess(const WebData& value, const WebVector<WebBlobInfo>& webBlobInfo, const WebIDBKey& key, const WebIDBKeyPath& keyPath)
+{
+    m_request->onSuccess(value, ConvertBlobInfo(webBlobInfo), key, keyPath);
 }
 
 void WebIDBCallbacksImpl::onSuccess(long long value)
 {
     m_request->onSuccess(value);
 }
 
 void WebIDBCallbacksImpl::onSuccess()
 {
     m_request->onSuccess();
 }
 
 void WebIDBCallbacksImpl::onSuccess(const WebIDBKey& key, const WebIDBKey& primaryKey, const WebData& value)
 {
-    m_request->onSuccess(key, primaryKey, value);
+    OwnPtr<Vector<blink::WebBlobInfo> > blobInfo(adoptPtr(new Vector<blink::WebBlobInfo>()));
+    m_request->onSuccess(key, primaryKey, value, blobInfo.release());
+}
+
+void WebIDBCallbacksImpl::onSuccess(const WebIDBKey& key, const WebIDBKey& primaryKey, const WebData& value, const WebVector<WebBlobInfo>& webBlobInfo)
+{
+    m_request->onSuccess(key, primaryKey, value, ConvertBlobInfo(webBlobInfo));
 }
 
 void WebIDBCallbacksImpl::onBlocked(long long oldVersion)
 {
     m_request->onBlocked(oldVersion);
 }
 
 void WebIDBCallbacksImpl::onUpgradeNeeded(long long oldVersion, WebIDBDatabase* database, const WebIDBMetadata& metadata, unsigned short dataLoss, blink::WebString dataLossMessage)
 {
     m_request->onUpgradeNeeded(oldVersion, adoptPtr(database), metadata, static_cast<blink::WebIDBDataLoss>(dataLoss), dataLossMessage);
 }
 
 } // namespace blink