Title: [276696] trunk/Source/WebCore
Revision
276696
Author
[email protected]
Date
2021-04-28 01:09:16 -0700 (Wed, 28 Apr 2021)

Log Message

Use a WeakHashSet for Document::m_mediaElements
https://bugs.webkit.org/show_bug.cgi?id=225082

Patch by Ian Gilbert <[email protected]> on 2021-04-28
Reviewed by Ryosuke Niwa.

Refactoring to use weak pointer instead of raw pointer.
No observable change of behavior.

* dom/Document.cpp:
(WebCore::Document::registerMediaElement):
(WebCore::Document::unregisterMediaElement):
(WebCore::Document::forEachMediaElement):
* dom/Document.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (276695 => 276696)


--- trunk/Source/WebCore/ChangeLog	2021-04-28 07:36:48 UTC (rev 276695)
+++ trunk/Source/WebCore/ChangeLog	2021-04-28 08:09:16 UTC (rev 276696)
@@ -1,3 +1,19 @@
+2021-04-28  Ian Gilbert  <[email protected]>
+
+        Use a WeakHashSet for Document::m_mediaElements
+        https://bugs.webkit.org/show_bug.cgi?id=225082
+
+        Reviewed by Ryosuke Niwa.
+
+        Refactoring to use weak pointer instead of raw pointer.
+        No observable change of behavior.
+
+        * dom/Document.cpp:
+        (WebCore::Document::registerMediaElement):
+        (WebCore::Document::unregisterMediaElement):
+        (WebCore::Document::forEachMediaElement):
+        * dom/Document.h:
+
 2021-04-27  Basuke Suzuki  <[email protected]>
 
         [PlayStation] Suppress warnings for %llu format specifier for uint64_t.

Modified: trunk/Source/WebCore/dom/Document.cpp (276695 => 276696)


--- trunk/Source/WebCore/dom/Document.cpp	2021-04-28 07:36:48 UTC (rev 276695)
+++ trunk/Source/WebCore/dom/Document.cpp	2021-04-28 08:09:16 UTC (rev 276696)
@@ -1858,21 +1858,21 @@
 
 void Document::registerMediaElement(HTMLMediaElement& element)
 {
-    m_mediaElements.add(&element);
+    m_mediaElements.add(element);
 }
 
 void Document::unregisterMediaElement(HTMLMediaElement& element)
 {
-    m_mediaElements.remove(&element);
+    m_mediaElements.remove(element);
 }
 
 void Document::forEachMediaElement(const Function<void(HTMLMediaElement&)>& function)
 {
-    Vector<Ref<HTMLMediaElement>> elements;
-    for (auto* element : m_mediaElements)
-        elements.append(*element);
-    for (auto& element : elements)
+    ASSERT(!m_mediaElements.hasNullReferences());
+    m_mediaElements.forEach([&](auto& element) {
+        auto protectedElement = makeRef(element);
         function(element);
+    });
 }
 
 #endif

Modified: trunk/Source/WebCore/dom/Document.h (276695 => 276696)


--- trunk/Source/WebCore/dom/Document.h	2021-04-28 07:36:48 UTC (rev 276695)
+++ trunk/Source/WebCore/dom/Document.h	2021-04-28 08:09:16 UTC (rev 276696)
@@ -1872,7 +1872,7 @@
     HashSet<Element*> m_documentSuspensionCallbackElements;
 
 #if ENABLE(VIDEO)
-    HashSet<HTMLMediaElement*> m_mediaElements;
+    WeakHashSet<HTMLMediaElement> m_mediaElements;
 #endif
 
 #if ENABLE(VIDEO)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to