Switch WebIDBDatabase::put over to the version with blobs.

Source/modules/indexeddb/IDBObjectStore.cpp

 /*
  * Copyright (C) 2010 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.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 22 matching lines @@
 #include "core/dom/DOMStringList.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "modules/indexeddb/IDBAny.h"
 #include "modules/indexeddb/IDBCursorWithValue.h"
 #include "modules/indexeddb/IDBDatabase.h"
 #include "modules/indexeddb/IDBKeyPath.h"
 #include "modules/indexeddb/IDBTracing.h"
 #include "modules/indexeddb/WebIDBCallbacksImpl.h"
 #include "platform/SharedBuffer.h"
+#include "public/platform/WebBlobInfo.h"
 #include "public/platform/WebData.h"
 #include "public/platform/WebIDBKey.h"
 #include "public/platform/WebIDBKeyRange.h"
+#include "public/platform/WebVector.h"
 
+using blink::WebBlobInfo;
 using blink::WebIDBCallbacks;
 using blink::WebIDBCursor;
 using blink::WebIDBDatabase;
+using blink::WebVector;
 
 namespace WebCore {
 
 IDBObjectStore::IDBObjectStore(const IDBObjectStoreMetadata& metadata, IDBTransaction* transaction)
     : m_metadata(metadata)
     , m_transaction(transaction)
     , m_deleted(false)
 {
     ASSERT(m_transaction);
     // We pass a reference to this object before it can be adopted.
@@ skipping 102 matching lines @@
     }
     if (!m_transaction->isActive()) {
         exceptionState.throwDOMException(TransactionInactiveError, IDBDatabase::transactionInactiveErrorMessage);
         return nullptr;
     }
     if (m_transaction->isReadOnly()) {
         exceptionState.throwDOMException(ReadOnlyError, IDBDatabase::transactionReadOnlyErrorMessage);
         return nullptr;
     }
 
-    RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(value, 0, exceptionState, toIsolate(executionContext));
+    Vector<WebBlobInfo> blobInfo;
+
+    RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(value, &blobInfo, exceptionState, toIsolate(executionContext));
     if (exceptionState.hadException())
         return nullptr;
 
+

[jsbell, 2014/04/30 21:38:33]

remove extra blank line

[ericu, 2014/04/30 22:30:44]

Done.

     if (serializedValue->containsBlobs()) {
         // FIXME: Add Blob/File/FileList support
         exceptionState.throwDOMException(DataCloneError, "The object store currently does not support blob values.");
         return nullptr;
     }
+    ASSERT(blobInfo.isEmpty());
 
     const IDBKeyPath& keyPath = m_metadata.keyPath;
     const bool usesInLineKeys = !keyPath.isNull();
     const bool hasKeyGenerator = autoIncrement();
 
     if (putMode != WebIDBDatabase::CursorUpdate && usesInLineKeys && key) {
         exceptionState.throwDOMException(DataError, "The object store uses in-line keys and the key parameter was provided.");
         return nullptr;
     }
     if (!usesInLineKeys && !hasKeyGenerator && !key) {
@@ skipping 35 matching lines @@
         IndexKeys keys;
         generateIndexKeysForValue(toIsolate(executionContext), it->value, value, &keys);
         indexIds.append(it->key);
         indexKeys.append(keys);
     }
 
     RefPtrWillBeRawPtr<IDBRequest> request = IDBRequest::create(executionContext, source, m_transaction.get());
     Vector<char> wireBytes;
     serializedValue->toWireBytes(wireBytes);
     RefPtr<SharedBuffer> valueBuffer = SharedBuffer::adoptVector(wireBytes);
-    backendDB()->put(m_transaction->id(), id(), blink::WebData(valueBuffer), key.release(), static_cast<WebIDBDatabase::PutMode>(putMode), WebIDBCallbacksImpl::create(request).leakPtr(), indexIds, indexKeys);
+
+    WebVector<WebBlobInfo> webBlobInfo(blobInfo.size());
+    for (size_t i = 0; i < blobInfo.size(); ++i) {
+        const WebBlobInfo& info = blobInfo[i];
+        if (info.isFile())

[jsbell, 2014/04/30 21:38:33]

Move this to a WebBlobInfo(const WebBlobInfo&) constructor?

[ericu, 2014/04/30 22:30:44]

Heh; it turns out that this dates back to when I was converting from IDBBlobInfo
to WebBlobInfo here.  Now I can just use the automagical Vector->WebVector
constructor and skip the whole local loop.

+            webBlobInfo[i] = WebBlobInfo(info.uuid(), info.filePath(), info.fileName(), info.type());
+        else
+            webBlobInfo[i] = WebBlobInfo(info.uuid(), info.type(), info.size());
+    }
+
+    backendDB()->put(m_transaction->id(), id(), blink::WebData(valueBuffer), webBlobInfo, key.release(), static_cast<WebIDBDatabase::PutMode>(putMode), WebIDBCallbacksImpl::create(request).leakPtr(), indexIds, indexKeys);
     return request.release();
 }
 
 PassRefPtrWillBeRawPtr<IDBRequest> IDBObjectStore::deleteFunction(ExecutionContext* context, const ScriptValue& key, ExceptionState& exceptionState)
 {
     IDB_TRACE("IDBObjectStore::delete");
     if (isDeleted()) {
         exceptionState.throwDOMException(InvalidStateError, IDBDatabase::objectStoreDeletedErrorMessage);
         return nullptr;
     }
@@ skipping 409 matching lines @@
     }
     return IDBIndexMetadata::InvalidId;
 }
 
 WebIDBDatabase* IDBObjectStore::backendDB() const
 {
     return m_transaction->backendDB();
 }
 
 } // namespace WebCore