Changeset 236110 in webkit

Timestamp:

Sep 18, 2018, 2:16:40 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r235438 - MediaDevices should be collectable as soon as its document is stopped
​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.

Location:

releases/WebKitGTK/webkit-2.22

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaDevices.cpp (modified) (1 diff)
• Source/WebCore/dom/ActiveDOMObject.cpp (modified) (1 diff)
• Source/WebCore/dom/ActiveDOMObject.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog

@@ +1 @@
+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-27  Myles C. Maxfield  <mmaxfield@apple.com>
 

releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog

@@ +1 @@
+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-27  Myles C. Maxfield  <mmaxfield@apple.com>
 

releases/WebKitGTK/webkit-2.22/Source/WebCore/Modules/mediastream/MediaDevices.cpp

@@ -169 +169 @@
 bool MediaDevices::hasPendingActivity() const
 {
-    return scriptExecutionContext() && hasEventListeners(m_eventNames.devicechangeEvent);
+    return !isContextStopped() && hasEventListeners(m_eventNames.devicechangeEvent);
 }
 

releases/WebKitGTK/webkit-2.22/Source/WebCore/dom/ActiveDOMObject.cpp

@@ -107 +107 @@
 }
 
+bool ActiveDOMObject::isContextStopped() const
+{
+    return !scriptExecutionContext() || scriptExecutionContext()->activeDOMObjectsAreStopped();
+}
+
 } // namespace WebCore

releases/WebKitGTK/webkit-2.22/Source/WebCore/dom/ActiveDOMObject.h

@@ -111 +111 @@
     }
 
+    bool isContextStopped() const;
+
 protected:
     explicit ActiveDOMObject(ScriptExecutionContext*);