Changeset 199059 in webkit

Timestamp:

Apr 5, 2016, 9:22:39 AM (11 years ago)

Author:

achristensen@apple.com

Message:

Speculative build fix after r199043

• bindings/js/SerializedScriptValue.cpp:

(WebCore::SerializedScriptValue::wireFormatVersion):
(WebCore::SerializedScriptValue::writeBlobsToDiskForIndexedDB):

• bindings/js/SerializedScriptValue.h:

(WebCore::SerializedScriptValue::data):
(WebCore::SerializedScriptValue::hasBlobURLs):
(WebCore::SerializedScriptValue::createFromWireBytes):
Initializer lists weren't the problem. Missing precompiler macros was.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/SerializedScriptValue.cpp (modified) (3 diffs)
• bindings/js/SerializedScriptValue.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-05  Alex Christensen  <achristensen@webkit.org>
+
+        Speculative build fix after r199043
+
+        * bindings/js/SerializedScriptValue.cpp:
+        (WebCore::SerializedScriptValue::wireFormatVersion):
+        (WebCore::SerializedScriptValue::writeBlobsToDiskForIndexedDB):
+        * bindings/js/SerializedScriptValue.h:
+        (WebCore::SerializedScriptValue::data):
+        (WebCore::SerializedScriptValue::hasBlobURLs):
+        (WebCore::SerializedScriptValue::createFromWireBytes):
+        Initializer lists weren't the problem.  Missing precompiler macros was.
+
 2016-04-05  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp

@@ -2748 +2748 @@
 }
 
+#if ENABLE(INDEXED_DATABASE)
 void SerializedScriptValue::writeBlobsToDiskForIndexedDB(std::function<void (const IDBValue&)> completionHandler)
 {
@@ -2753 +2754 @@
 
     if (m_blobURLs.isEmpty()) {
-        completionHandler(IDBValue());
+        completionHandler({ });
         return;
     }
@@ -2760 +2761 @@
     blobRegistry().writeBlobsToTemporaryFiles(m_blobURLs, [completionHandler, this, protector](const Vector<String>&) {
         // FIXME: Return an IDBValue that contains both the SerializedScriptValue data and all blob file data.
-        completionHandler(IDBValue());
+        completionHandler({ });
     });
 }
+#endif
 
 } // namespace WebCore

trunk/Source/WebCore/bindings/js/SerializedScriptValue.h

@@ -85 +85 @@
     const Vector<uint8_t>& data() const { return m_data; }
     bool hasBlobURLs() const { return !m_blobURLs.isEmpty(); }
+#if ENABLE(INDEXED_DATABASE)
     void writeBlobsToDiskForIndexedDB(std::function<void (const IDBValue&)> completionHandler);
+#endif
 
     static Ref<SerializedScriptValue> createFromWireBytes(Vector<uint8_t>&& data)