Title: [195239] trunk/Source/WebCore
Revision
195239
Author
[email protected]
Date
2016-01-18 16:06:46 -0800 (Mon, 18 Jan 2016)

Log Message

[Mac] Remove unused playerToPrivateMap()
https://bugs.webkit.org/show_bug.cgi?id=153203

Patch by Olivier Blin <[email protected]> on 2016-01-18
Reviewed by Darin Adler.

This was used in previous EME implementations, but is unnecessary
since r163907.

No new tests since this removes dead code only.

* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::globalLoaderDelegateQueue): Deleted.
(WebCore::MediaPlayerPrivateAVFoundationObjC::~MediaPlayerPrivateAVFoundationObjC): Deleted.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (195238 => 195239)


--- trunk/Source/WebCore/ChangeLog	2016-01-18 22:15:30 UTC (rev 195238)
+++ trunk/Source/WebCore/ChangeLog	2016-01-19 00:06:46 UTC (rev 195239)
@@ -1,3 +1,19 @@
+2016-01-18  Olivier Blin  <[email protected]>
+
+        [Mac] Remove unused playerToPrivateMap()
+        https://bugs.webkit.org/show_bug.cgi?id=153203
+
+        Reviewed by Darin Adler.
+
+        This was used in previous EME implementations, but is unnecessary
+        since r163907.
+
+        No new tests since this removes dead code only.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::globalLoaderDelegateQueue): Deleted.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::~MediaPlayerPrivateAVFoundationObjC): Deleted.
+
 2016-01-18  Simon Fraser  <[email protected]>
 
         Add TextStream-based logging for Position and VisiblePosition

Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (195238 => 195239)


--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	2016-01-18 22:15:30 UTC (rev 195238)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	2016-01-19 00:06:46 UTC (rev 195239)
@@ -388,15 +388,6 @@
 }
 #endif
 
-#if ENABLE(ENCRYPTED_MEDIA_V2)
-typedef HashMap<MediaPlayer*, MediaPlayerPrivateAVFoundationObjC*> PlayerToPrivateMapType;
-static PlayerToPrivateMapType& playerToPrivateMap()
-{
-    static NeverDestroyed<PlayerToPrivateMapType> map;
-    return map;
-};
-#endif
-
 #if HAVE(AVFOUNDATION_LOADER_DELEGATE)
 static dispatch_queue_t globalLoaderDelegateQueue()
 {
@@ -512,16 +503,10 @@
     , m_allowsWirelessVideoPlayback(true)
 #endif
 {
-#if ENABLE(ENCRYPTED_MEDIA_V2)
-    playerToPrivateMap().set(player, this);
-#endif
 }
 
 MediaPlayerPrivateAVFoundationObjC::~MediaPlayerPrivateAVFoundationObjC()
 {
-#if ENABLE(ENCRYPTED_MEDIA_V2)
-    playerToPrivateMap().remove(player());
-#endif
 #if HAVE(AVFOUNDATION_LOADER_DELEGATE)
     [m_loaderDelegate.get() setCallback:0];
     [[m_avAsset.get() resourceLoader] setDelegate:nil queue:0];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to