Changeset 187712 in webkit

Timestamp:

Jul 31, 2015 11:39:36 PM (9 years ago)

Author:

mrajca@apple.com

Message:

Media Session: give media elements unique IDs ​https://bugs.webkit.org/show_bug.cgi?id=147322

Reviewed by Eric Carlson.

• html/HTMLMediaElement.cpp:

(WebCore::elementIDsToElements): Create a global map of element IDs to elements.
(WebCore::HTMLMediaElement::elementWithID): Retrieve the element with the given ID.
(WebCore::HTMLMediaElement::HTMLMediaElement): Give the element a unique ID.
(WebCore::HTMLMediaElement::playInternal): Removed whitespace.
(WebCore::HTMLMediaElement::pauseInternal): Ditto.

• html/HTMLMediaElement.h:

(WebCore::HTMLMediaElement::elementID):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (4 diffs)
• html/HTMLMediaElement.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-27  Matt Rajca  <mrajca@apple.com>
+
+        Media Session: give media elements unique IDs
+        https://bugs.webkit.org/show_bug.cgi?id=147322
+
+        Reviewed by Eric Carlson.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::elementIDsToElements): Create a global map of element IDs to elements.
+        (WebCore::HTMLMediaElement::elementWithID): Retrieve the element with the given ID.
+        (WebCore::HTMLMediaElement::HTMLMediaElement): Give the element a unique ID.
+        (WebCore::HTMLMediaElement::playInternal): Removed whitespace.
+        (WebCore::HTMLMediaElement::pauseInternal): Ditto.
+        * html/HTMLMediaElement.h:
+        (WebCore::HTMLMediaElement::elementID):
+
 2015-07-31  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -289 +289 @@
 }
 
+#if ENABLE(MEDIA_SESSION)
+typedef HashMap<uint64_t, HTMLMediaElement*> IDToElementMap;
+
+static IDToElementMap& elementIDsToElements()
+{
+    static NeverDestroyed<IDToElementMap> map;
+    return map;
+}
+
+HTMLMediaElement* HTMLMediaElement::elementWithID(uint64_t id)
+{
+    return elementIDsToElements().get(id);
+}
+
+static uint64_t nextElementID()
+{
+    static uint64_t elementID = 0;
+    return ++elementID;
+}
+#endif
+
 HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& document, bool createdByParser)
     : HTMLElement(tagName, document)
@@ -417 +438 @@
 
 #if ENABLE(MEDIA_SESSION)
+    m_elementID = nextElementID();
+    elementIDsToElements().add(m_elementID, this);
+
     setSessionInternal(document.defaultMediaSession());
 #endif
@@ -2854 +2878 @@
         return;
     }
-    
+
     // 4.8.10.9. Playing the media resource
     if (!m_player || m_networkState == NETWORK_EMPTY)
@@ -2920 +2944 @@
         return;
     }
-    
+
     // 4.8.10.9. Playing the media resource
     if (!m_player || m_networkState == NETWORK_EMPTY) {

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -430 +430 @@
 
     void setShouldDuck(bool);
+
+    static HTMLMediaElement* elementWithID(uint64_t);
+    uint64_t elementID() const { return m_elementID; }
 #endif
 
@@ -831 +834 @@
     RefPtr<MediaSession> m_session;
     bool m_shouldDuck { false };
+    uint64_t m_elementID;
 #endif