Title: [275592] trunk/Source/WebKit
- Revision
- 275592
- Author
- jer.no...@apple.com
- Date
- 2021-04-07 01:30:32 -0700 (Wed, 07 Apr 2021)
Log Message
Unreviewed build fix after r275571 and r275537, which introduced conflicting changes.
* UIProcess/API/Cocoa/WKWebViewTesting.mm:
(-[WKWebView _createMediaSessionCoordinatorForTesting:completionHandler:]):
(-[WKMediaSessionCoordinatorHelper playSessionWithCompletion:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (275591 => 275592)
--- trunk/Source/WebKit/ChangeLog 2021-04-07 07:42:44 UTC (rev 275591)
+++ trunk/Source/WebKit/ChangeLog 2021-04-07 08:30:32 UTC (rev 275592)
@@ -1,3 +1,11 @@
+2021-04-07 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed build fix after r275571 and r275537, which introduced conflicting changes.
+
+ * UIProcess/API/Cocoa/WKWebViewTesting.mm:
+ (-[WKWebView _createMediaSessionCoordinatorForTesting:completionHandler:]):
+ (-[WKMediaSessionCoordinatorHelper playSessionWithCompletion:]):
+
2021-04-06 Wenson Hsieh <wenson_hs...@apple.com>
Address some post-landing comments after r275491
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm (275591 => 275592)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm 2021-04-07 07:42:44 UTC (rev 275591)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm 2021-04-07 08:30:32 UTC (rev 275592)
@@ -406,10 +406,10 @@
callback(false);
}
- void playSession(CompletionHandler<void(bool)>&& callback) final
+ void playSession(Optional<double> atTime, Optional<double> hostTime, CompletionHandler<void(bool)>&& callback) final
{
if (auto coordinatorClient = client())
- coordinatorClient->playSession(WTFMove(callback));
+ coordinatorClient->playSession(WTFMove(atTime), WTFMove(hostTime), WTFMove(callback));
else
callback(false);
}
@@ -593,7 +593,7 @@
- (void)playSessionWithCompletion:(void(^)(BOOL))completionHandler
{
- m_coordinatorClient->playSession(makeBlockPtr(completionHandler));
+ m_coordinatorClient->playSession({ }, { }, makeBlockPtr(completionHandler));
}
- (void)pauseSessionWithCompletion:(void(^)(BOOL))completionHandler
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
