Changeset 259447 in webkit

Timestamp:

Apr 3, 2020 12:21:03 AM (4 years ago)

Author:

Peng Liu

Message:

WebCore::HTMLMediaElement::mediaCanStart crashes
​https://bugs.webkit.org/show_bug.cgi?id=209950

Reviewed by Jer Noble.

Source/WebCore:

Use WeakHashSet instead of HashSet to record MediaCanStartListeners in Document.

• dom/Document.cpp:

(WebCore::Document::addMediaCanStartListener):
(WebCore::Document::removeMediaCanStartListener):
(WebCore::Document::takeAnyMediaCanStartListener):

• dom/Document.h:
• page/MediaCanStartListener.h:

Source/WebKit:

UserMediaPermissionRequestManager does not need to inherit from
CanMakeWeakPtr<UserMediaPermissionRequestManager> because its
parent class MediaCanStartListener supports WeakPtr now.

• WebProcess/MediaStream/UserMediaPermissionRequestManager.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/dom/Document.h (modified) (1 diff)
• WebCore/page/MediaCanStartListener.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-03  Peng Liu  <peng.liu6@apple.com>
+
+        WebCore::HTMLMediaElement::mediaCanStart crashes
+        https://bugs.webkit.org/show_bug.cgi?id=209950
+
+        Reviewed by Jer Noble.
+
+        Use WeakHashSet instead of HashSet to record MediaCanStartListeners in Document.
+
+        * dom/Document.cpp:
+        (WebCore::Document::addMediaCanStartListener):
+        (WebCore::Document::removeMediaCanStartListener):
+        (WebCore::Document::takeAnyMediaCanStartListener):
+        * dom/Document.h:
+        * page/MediaCanStartListener.h:
+
 2020-04-03  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -6423 +6423 @@
 void Document::addMediaCanStartListener(MediaCanStartListener& listener)
 {
-    ASSERT(!m_mediaCanStartListeners.contains(&listener));
-    m_mediaCanStartListeners.add(&listener);
+    ASSERT(!m_mediaCanStartListeners.contains(listener));
+    m_mediaCanStartListeners.add(listener);
 }
 
 void Document::removeMediaCanStartListener(MediaCanStartListener& listener)
 {
-    ASSERT(m_mediaCanStartListeners.contains(&listener));
-    m_mediaCanStartListeners.remove(&listener);
+    ASSERT(m_mediaCanStartListeners.contains(listener));
+    m_mediaCanStartListeners.remove(listener);
 }
 
 MediaCanStartListener* Document::takeAnyMediaCanStartListener()
 {
-    return m_mediaCanStartListeners.takeAny();
+    if (m_mediaCanStartListeners.computesEmpty())
+        return nullptr;
+
+    MediaCanStartListener* listener = m_mediaCanStartListeners.begin().get();
+    m_mediaCanStartListeners.remove(*listener);
+
+    return listener;
 }
 

trunk/Source/WebCore/dom/Document.h

@@ -1826 +1826 @@
     RenderPtr<RenderView> m_renderView;
 
-    HashSet<MediaCanStartListener*> m_mediaCanStartListeners;
+    WeakHashSet<MediaCanStartListener> m_mediaCanStartListeners;
 
 #if ENABLE(FULLSCREEN_API)

trunk/Source/WebCore/page/MediaCanStartListener.h

@@ -26 +26 @@
 #pragma once
 
+#include <wtf/WeakPtr.h>
+
 namespace WebCore {
 
 class Document;
 
-class MediaCanStartListener {
+class MediaCanStartListener : public CanMakeWeakPtr<MediaCanStartListener> {
 public:
     virtual void mediaCanStart(Document&) = 0;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-03  Peng Liu  <peng.liu6@apple.com>
+
+        WebCore::HTMLMediaElement::mediaCanStart crashes
+        https://bugs.webkit.org/show_bug.cgi?id=209950
+
+        Reviewed by Jer Noble.
+
+        UserMediaPermissionRequestManager does not need to inherit from
+        CanMakeWeakPtr<UserMediaPermissionRequestManager> because its
+        parent class MediaCanStartListener supports WeakPtr now.
+
+        * WebProcess/MediaStream/UserMediaPermissionRequestManager.h:
+
 2020-04-02  John Wilander  <wilander@apple.com>
 

trunk/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.h

@@ -35 +35 @@
 class WebPage;
 
-class UserMediaPermissionRequestManager : public CanMakeWeakPtr<UserMediaPermissionRequestManager>, private WebCore::MediaCanStartListener {
+class UserMediaPermissionRequestManager : private WebCore::MediaCanStartListener {
     WTF_MAKE_FAST_ALLOCATED;
 public: