Title: [201722] trunk/Source/WebKit2
- Revision
- 201722
- Author
- [email protected]
- Date
- 2016-06-06 13:11:29 -0700 (Mon, 06 Jun 2016)
Log Message
Fix build after r201717
Unreviewed.
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles):
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::grantSandboxExtensionsToDatabaseProcessForBlobs):
* NetworkProcess/NetworkProcess.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (201721 => 201722)
--- trunk/Source/WebKit2/ChangeLog 2016-06-06 19:23:29 UTC (rev 201721)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-06 20:11:29 UTC (rev 201722)
@@ -1,5 +1,18 @@
2016-06-06 Brady Eidson <[email protected]>
+ Fix build after r201717
+
+ Unreviewed.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles):
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::grantSandboxExtensionsToDatabaseProcessForBlobs):
+ * NetworkProcess/NetworkProcess.h:
+
+2016-06-06 Brady Eidson <[email protected]>
+
Modern IDB: Crash seen in IDBConnectionProxy::putOrAdd on GuardMalloc bot
https://bugs.webkit.org/show_bug.cgi?id=158124
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (201721 => 201722)
--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2016-06-06 19:23:29 UTC (rev 201721)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2016-06-06 20:11:29 UTC (rev 201722)
@@ -319,7 +319,7 @@
for (auto& file : fileReferences)
file->revokeFileAccess();
- NetworkProcess::singleton().grantSandboxExtensionsToDatabaseProcessForBlobs(fileNames, [this, protectedThis = WTFMove(protectedThis), requestIdentifier, fileNames = WTFMove(fileNames)]() {
+ NetworkProcess::singleton().grantSandboxExtensionsToDatabaseProcessForBlobs(fileNames, [this, protectedThis = WTFMove(protectedThis), requestIdentifier, fileNames]() {
if (!m_connection || !m_connection->isValid())
return;
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (201721 => 201722)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-06-06 19:23:29 UTC (rev 201721)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-06-06 20:11:29 UTC (rev 201722)
@@ -293,12 +293,12 @@
SessionTracker::destroySession(sessionID);
}
-void NetworkProcess::grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, std::function<void ()> completionHandler)
+void NetworkProcess::grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, NoncopyableFunction<void ()>&& completionHandler)
{
static uint64_t lastRequestID;
uint64_t requestID = ++lastRequestID;
- m_sandboxExtensionForBlobsCompletionHandlers.set(requestID, completionHandler);
+ m_sandboxExtensionForBlobsCompletionHandlers.set(requestID, WTFMove(completionHandler));
parentProcessConnection()->send(Messages::NetworkProcessProxy::GrantSandboxExtensionsToDatabaseProcessForBlobs(requestID, filenames), 0);
}
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (201721 => 201722)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-06-06 19:23:29 UTC (rev 201721)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-06-06 20:11:29 UTC (rev 201722)
@@ -113,7 +113,7 @@
void ensurePrivateBrowsingSession(WebCore::SessionID);
- void grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, std::function<void ()> completionHandler);
+ void grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, NoncopyableFunction<void ()>&& completionHandler);
private:
NetworkProcess();
@@ -205,7 +205,7 @@
typedef HashMap<const char*, std::unique_ptr<NetworkProcessSupplement>, PtrHash<const char*>> NetworkProcessSupplementMap;
NetworkProcessSupplementMap m_supplements;
- HashMap<uint64_t, std::function<void ()>> m_sandboxExtensionForBlobsCompletionHandlers;
+ HashMap<uint64_t, NoncopyableFunction<void ()>> m_sandboxExtensionForBlobsCompletionHandlers;
#if PLATFORM(COCOA)
void platformInitializeNetworkProcessCocoa(const NetworkProcessCreationParameters&);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
