MediaDevices should be collectable as soon as its document is stopped

youennf · youennf · commit fe81a724fe88 · 2018-08-28T20:53:17.000Z
https://bugs.webkit.org/show_bug.cgi?id=189021 Reviewed by Eric Carlson. Source/WebCore: Introduce ActiveDOMObject::isContextStopped to check whether the context is stopped. Use this check in MediaDevices::hasPendingActivity so that it returns false as soon as active dom objects are stopped. Test: http/tests/media/collect-media-devices.https.html * Modules/mediastream/MediaDevices.cpp: (WebCore::MediaDevices::hasPendingActivity const): * dom/ActiveDOMObject.cpp: (WebCore::ActiveDOMObject::hasPendingActivity const): (WebCore::ActiveDOMObject::isContextStopped const): * dom/ActiveDOMObject.h: LayoutTests: * http/tests/media/media-stream/collect-media-devices.https-expected.txt: Added. * http/tests/media/media-stream/collect-media-devices.https.html: Added. * http/tests/media/media-stream/resources/mymediadevicesframe.htm: Added. Canonical link: https://commits.webkit.org/204092@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235438 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2018-08-28  Youenn Fablet  <youenn@apple.com>
+
+        MediaDevices should be collectable as soon as its document is stopped
+        https://bugs.webkit.org/show_bug.cgi?id=189021
+
+        Reviewed by Eric Carlson.
+
+        * http/tests/media/media-stream/collect-media-devices.https-expected.txt: Added.
+        * http/tests/media/media-stream/collect-media-devices.https.html: Added.
+        * http/tests/media/media-stream/resources/mymediadevicesframe.htm: Added.
+
 2018-08-28  Basuke Suzuki  <Basuke.Suzuki@sony.com>
 
         [Curl] Fix issue that extra cookie is added when redirect happens.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2018-08-28  Youenn Fablet  <youenn@apple.com>
+
+        MediaDevices should be collectable as soon as its document is stopped
+        https://bugs.webkit.org/show_bug.cgi?id=189021
+
+        Reviewed by Eric Carlson.
+
+        Introduce ActiveDOMObject::isContextStopped to check whether the context is stopped.
+        Use this check in MediaDevices::hasPendingActivity so that it returns false as soon as active dom objects are stopped.
+
+        Test: http/tests/media/collect-media-devices.https.html
+
+        * Modules/mediastream/MediaDevices.cpp:
+        (WebCore::MediaDevices::hasPendingActivity const):
+        * dom/ActiveDOMObject.cpp:
+        (WebCore::ActiveDOMObject::hasPendingActivity const):
+        (WebCore::ActiveDOMObject::isContextStopped const):
+        * dom/ActiveDOMObject.h:
+
 2018-08-28  Basuke Suzuki  <Basuke.Suzuki@sony.com>
 
         [Curl] Fix issue that extra cookie is added when redirect happens.
diff --git a/Source/WebCore/Modules/mediastream/MediaDevices.cpp b/Source/WebCore/Modules/mediastream/MediaDevices.cpp
@@ -162,7 +162,7 @@ void MediaDevices::scheduledEventTimerFired()
 
 bool MediaDevices::hasPendingActivity() const
 {
-    return scriptExecutionContext() && hasEventListeners(m_eventNames.devicechangeEvent);
+    return !isContextStopped() && hasEventListeners(m_eventNames.devicechangeEvent);
 }
 
 const char* MediaDevices::activeDOMObjectName() const
diff --git a/Source/WebCore/dom/ActiveDOMObject.cpp b/Source/WebCore/dom/ActiveDOMObject.cpp
@@ -106,4 +106,9 @@ void ActiveDOMObject::stop()
 {
 }
 
+bool ActiveDOMObject::isContextStopped() const
+{
+    return !scriptExecutionContext() || scriptExecutionContext()->activeDOMObjectsAreStopped();
+}
+
 } // namespace WebCore
diff --git a/Source/WebCore/dom/ActiveDOMObject.h b/Source/WebCore/dom/ActiveDOMObject.h
@@ -110,6 +110,8 @@ class ActiveDOMObject : public ContextDestructionObserver {
         return adoptRef(*new PendingActivity<T>(thisObject));
     }
 
+    bool isContextStopped() const;
+
 protected:
     explicit ActiveDOMObject(ScriptExecutionContext*);
     virtual ~ActiveDOMObject();

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ void MediaDevices::scheduledEventTimerFired()`
`162`	`162`
`163`	`163`	`bool MediaDevices::hasPendingActivity() const`
`164`	`164`	`{`
`165`		`- return scriptExecutionContext() && hasEventListeners(m_eventNames.devicechangeEvent);`
	`165`	`+ return !isContextStopped() && hasEventListeners(m_eventNames.devicechangeEvent);`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`const char* MediaDevices::activeDOMObjectName() const`
Original file line number	Diff line number	Diff line change
`@@ -106,4 +106,9 @@ void ActiveDOMObject::stop()`
`106`	`106`	`{`
`107`	`107`	`}`
`108`	`108`
	`109`	`+bool ActiveDOMObject::isContextStopped() const`
	`110`	`+{`
	`111`	`+ return !scriptExecutionContext() \|\| scriptExecutionContext()->activeDOMObjectsAreStopped();`
	`112`	`+}`
	`113`	`+`
`109`	`114`	`} // namespace WebCore`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,8 @@ class ActiveDOMObject : public ContextDestructionObserver {`
`110`	`110`	`return adoptRef(*new PendingActivity<T>(thisObject));`
`111`	`111`	`}`
`112`	`112`
	`113`	`+ bool isContextStopped() const;`
	`114`	`+`
`113`	`115`	`protected:`
`114`	`116`	`explicit ActiveDOMObject(ScriptExecutionContext*);`
`115`	`117`	`virtual ~ActiveDOMObject();`