[webkit-changes] [205213] trunk/Source/WebKit2

Tue, 30 Aug 2016 17:37:53 -0700

Title: [205213] trunk/Source/WebKit2
Revision
205213
Author
[email protected]
Date
2016-08-30 17:37:59 -0700 (Tue, 30 Aug 2016)

Log Message

Try to fix the 32-bit build.

* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::deleteWebsiteData):
(WebKit::WebProcessProxy::deleteWebsiteDataForOrigins):
* UIProcess/WebProcessProxy.h:


Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (205212 => 205213)


--- trunk/Source/WebKit2/ChangeLog	2016-08-31 00:34:39 UTC (rev 205212)
+++ trunk/Source/WebKit2/ChangeLog	2016-08-31 00:37:59 UTC (rev 205213)
@@ -1,5 +1,14 @@
 2016-08-30  Anders Carlsson  <[email protected]>
 
+        Try to fix the 32-bit build.
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::deleteWebsiteData):
+        (WebKit::WebProcessProxy::deleteWebsiteDataForOrigins):
+        * UIProcess/WebProcessProxy.h:
+
+2016-08-30  Anders Carlsson  <[email protected]>
+
         Switch more messages over to Connection::sendWithReply
         https://bugs.webkit.org/show_bug.cgi?id=161415

Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (205212 => 205213)


--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp	2016-08-31 00:34:39 UTC (rev 205212)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp	2016-08-31 00:37:59 UTC (rev 205213)
@@ -722,7 +722,7 @@
     });
 }
 
-void WebProcessProxy::deleteWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
+void WebProcessProxy::deleteWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::chrono::system_clock::time_point modifiedSince, Function<void ()> completionHandler)
 {
     ASSERT(canSendMessage());
 
@@ -735,7 +735,7 @@
     });
 }
 
-void WebProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler)
+void WebProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, Function<void ()> completionHandler)
 {
     ASSERT(canSendMessage());
 
@@ -746,7 +746,7 @@
     for (auto& origin : origins)
         originData.append(SecurityOriginData::fromSecurityOrigin(*origin));
 
-    connection()->sendWithReply(Messages::WebProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, originData), 0, RunLoop::main(), [this, token, completionHandler, sessionID](auto reply) {
+    connection()->sendWithReply(Messages::WebProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, originData), 0, RunLoop::main(), [this, token, completionHandler = WTFMove(completionHandler), sessionID](auto reply) {
         completionHandler();
         RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), "%p - WebProcessProxy is releasing a background assertion because the Web process is done deleting Website data for several origins", this);
     });

Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (205212 => 205213)


--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h	2016-08-31 00:34:39 UTC (rev 205212)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h	2016-08-31 00:37:59 UTC (rev 205213)
@@ -120,8 +120,8 @@
     void releasePageCache();
 
     void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, Function<void (WebsiteData)> completionHandler);
-    void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
-    void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType>, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler);
+    void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, Function<void ()> completionHandler);
+    void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType>, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, Function<void ()> completionHandler);
 
     void enableSuddenTermination();
     void disableSuddenTermination();

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to