Changeset 286777 in webkit for trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm

Timestamp:

Dec 9, 2021, 6:46:27 AM (3 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r286764.
​https://bugs.webkit.org/show_bug.cgi?id=234081

broke the build

Reverted changeset:

"Add ability to inject messages into webpushd"
​https://bugs.webkit.org/show_bug.cgi?id=233988
​https://commits.webkit.org/r286764

File:

• trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (modified) (2 diffs)

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm

@@ -40 +40 @@
 #import "WKWebsiteDataRecordInternal.h"
 #import "WebPageProxy.h"
-#import "WebPushMessage.h"
 #import "WebResourceLoadStatisticsStore.h"
 #import "WebsiteDataFetchOption.h"
@@ -763 +762 @@
 }
 
--(void)_getPendingPushMessages:(void(^)(NSArray<NSDictionary *> *))completionHandler
+-(void)_))completionHandler
 {
 #if ENABLE(SERVICE_WORKER)
-    _websiteDataStore->networkProcess().getPendingPushMessages(_websiteDataStore->sessionID(), [completionHandler = makeBlockPtr(completionHandler)] (const Vector<WebKit::WebPushMessage>& messages) {
-        auto result = adoptNS([[NSMutableArray alloc] initWithCapacity:messages.size()]);
-        for (auto& message : messages)
-            [result addObject:message.toDictionary()];
-
-        completionHandler(result.get());
-    });
-#endif
-}
-
--(void)_processPushMessage:(NSDictionary *)pushMessageDictionary completionHandler:(void(^)(bool wasProcessed))completionHandler
-{
-#if ENABLE(SERVICE_WORKER)
-    auto pushMessage = WebKit::WebPushMessage::fromDictionary(pushMessageDictionary);
-    if (!pushMessage) {
-        completionHandler(false);
-        return;
-    }
-
-    _websiteDataStore->networkProcess().processPushMessage(_websiteDataStore->sessionID(), *pushMessage, [completionHandler = makeBlockPtr(completionHandler)] (bool wasProcessed) {
+    std::optional<Span<const uint8_t>> data;
+    if (message)
+        data = Span<const uint8_t> { reinterpret_cast<const uint8_t*>(message.bytes), message.length };
+    _websiteDataStore->networkProcess().processPushMessage(_websiteDataStore->sessionID(), data, registration, [completionHandler = makeBlockPtr(completionHandler)] (bool wasProcessed) {
         completionHandler(wasProcessed);
     });