Title: [199059] trunk/Source/WebCore
- Revision
- 199059
- Author
- achristen...@apple.com
- Date
- 2016-04-05 09:22:39 -0700 (Tue, 05 Apr 2016)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (199058 => 199059)
--- trunk/Source/WebCore/ChangeLog 2016-04-05 16:15:39 UTC (rev 199058)
+++ trunk/Source/WebCore/ChangeLog 2016-04-05 16:22:39 UTC (rev 199059)
@@ -3,7 +3,20 @@
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 <achristen...@webkit.org>
+
+ Speculative build fix after r199043
+
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::SerializedScriptValue::writeBlobsToDiskForIndexedDB):
Explicitly call constructor instead of using an initializer list.
2016-04-05 Xabier Rodriguez Calvar <calva...@igalia.com>
Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (199058 => 199059)
--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2016-04-05 16:15:39 UTC (rev 199058)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2016-04-05 16:22:39 UTC (rev 199059)
@@ -2747,20 +2747,22 @@
return CurrentVersion;
}
+#if ENABLE(INDEXED_DATABASE)
void SerializedScriptValue::writeBlobsToDiskForIndexedDB(std::function<void (const IDBValue&)> completionHandler)
{
ASSERT(isMainThread());
if (m_blobURLs.isEmpty()) {
- completionHandler(IDBValue());
+ completionHandler({ });
return;
}
RefPtr<SerializedScriptValue> protector(this);
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
Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.h (199058 => 199059)
--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.h 2016-04-05 16:15:39 UTC (rev 199058)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.h 2016-04-05 16:22:39 UTC (rev 199059)
@@ -84,7 +84,9 @@
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)
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
