Title: [262903] trunk/Source/WebKit
- Revision
- 262903
- Author
- [email protected]
- Date
- 2020-06-11 08:18:26 -0700 (Thu, 11 Jun 2020)
Log Message
[Cocoa] MediaUsageManagerCocoa should use a different USVideoUsage initializer
https://bugs.webkit.org/show_bug.cgi?id=213058
Reviewed by Jer Noble.
No new tests, tested manually.
* UIProcess/Media/cocoa/MediaUsageManagerCocoa.mm:
(WebKit::MediaUsageManagerCocoa::reset): Drive-by fix: don't call -stop unless the
element was playing.
(WebKit::MediaUsageManagerCocoa::updateMediaUsage): Use a different initializer so
we can pass in the state.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (262902 => 262903)
--- trunk/Source/WebKit/ChangeLog 2020-06-11 14:41:57 UTC (rev 262902)
+++ trunk/Source/WebKit/ChangeLog 2020-06-11 15:18:26 UTC (rev 262903)
@@ -1,3 +1,18 @@
+2020-06-11 Eric Carlson <[email protected]>
+
+ [Cocoa] MediaUsageManagerCocoa should use a different USVideoUsage initializer
+ https://bugs.webkit.org/show_bug.cgi?id=213058
+
+ Reviewed by Jer Noble.
+
+ No new tests, tested manually.
+
+ * UIProcess/Media/cocoa/MediaUsageManagerCocoa.mm:
+ (WebKit::MediaUsageManagerCocoa::reset): Drive-by fix: don't call -stop unless the
+ element was playing.
+ (WebKit::MediaUsageManagerCocoa::updateMediaUsage): Use a different initializer so
+ we can pass in the state.
+
2020-06-11 ChangSeok Oh <[email protected]>
[GTK] Implement button-press-event, button-release-event, and absolute-axis-event of GAMEPAD API.
Modified: trunk/Source/WebKit/UIProcess/Media/cocoa/MediaUsageManagerCocoa.mm (262902 => 262903)
--- trunk/Source/WebKit/UIProcess/Media/cocoa/MediaUsageManagerCocoa.mm 2020-06-11 14:41:57 UTC (rev 262902)
+++ trunk/Source/WebKit/UIProcess/Media/cocoa/MediaUsageManagerCocoa.mm 2020-06-11 15:18:26 UTC (rev 262903)
@@ -33,7 +33,7 @@
NS_ASSUME_NONNULL_BEGIN
@interface USVideoUsage : NSObject
-- (instancetype)initWithBundleIdentifier:(NSString *)bundleIdentifier URL:(NSURL *)url mediaURL:(NSURL *)mediaURL NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithBundleIdentifier:(NSString *)bundleIdentifier URL:(NSURL *)url mediaURL:(NSURL *)mediaURL videoMetadata:(NSDictionary<NSString *, id> *)videoMetadata NS_DESIGNATED_INITIALIZER;
- (void)stop;
- (void)restart;
- (void)updateVideoMetadata:(NSDictionary<NSString *, id> *)videoMetadata;
@@ -100,10 +100,8 @@
void MediaUsageManagerCocoa::reset()
{
for (auto& session : m_mediaSessions.values()) {
- if (session->usageTracker) {
+ if (session->usageTracker && session->mediaUsageInfo && session->mediaUsageInfo->isPlaying)
[session->usageTracker stop];
- session->usageTracker = nullptr;
- }
}
m_mediaSessions.clear();
}
@@ -144,21 +142,6 @@
}
}
- if (!session->usageTracker) {
- if (!mediaUsageInfo.isPlaying)
- return;
-
- session->usageTracker = adoptNS([PAL::allocUSVideoUsageInstance() initWithBundleIdentifier:session->bundleIdentifier URL:(NSURL *)session->pageURL mediaURL:(NSURL *)mediaUsageInfo.mediaURL]);
- ASSERT(session->usageTracker);
- }
-
- if (session->mediaUsageInfo && session->mediaUsageInfo->isPlaying != mediaUsageInfo.isPlaying) {
- if (mediaUsageInfo.isPlaying)
- [session->usageTracker restart];
- else
- [session->usageTracker stop];
- }
-
NSDictionary<NSString *, id> *metadata = @{
USVideoMetadataKeyCanShowControlsManager: @(mediaUsageInfo.canShowControlsManager),
USVideoMetadataKeyCanShowNowPlayingControls: @(mediaUsageInfo.canShowNowPlayingControls),
@@ -191,7 +174,25 @@
USVideoMetadataKeyIsLargeEnoughForMainContent: @(mediaUsageInfo.isLargeEnoughForMainContent),
};
- [session->usageTracker updateVideoMetadata:metadata];
+ if (!session->usageTracker) {
+ if (!mediaUsageInfo.isPlaying)
+ return;
+
+ session->usageTracker = adoptNS([PAL::allocUSVideoUsageInstance() initWithBundleIdentifier:session->bundleIdentifier URL:(NSURL *)session->pageURL
+ mediaURL:(NSURL *)mediaUsageInfo.mediaURL videoMetadata:metadata]);
+ ASSERT(session->usageTracker);
+ if (!session->usageTracker)
+ return;
+ } else
+ [session->usageTracker updateVideoMetadata:metadata];
+
+ if (session->mediaUsageInfo && session->mediaUsageInfo->isPlaying != mediaUsageInfo.isPlaying) {
+ if (mediaUsageInfo.isPlaying)
+ [session->usageTracker restart];
+ else
+ [session->usageTracker stop];
+ }
+
session->mediaUsageInfo = mediaUsageInfo;
} @catch(NSException *exception) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes