Attachment 342888 Details for Bug 186743 – Patch

[patch] Patch

bug-186743-20180616224704.patch (text/plain), 6.75 KB, created by youenn fablet on 2018-06-16 13:47:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2018-06-16 13:47:05 PDT

Size: 6.75 KB

patch

obsolete

>Subversion Revision: 232870
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 93f1328a22f33888f29635bbd5333f0df049b211..b3889a2996b1f0190a6664def594b9c478725cc0 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,28 @@
>+2018-06-16  Youenn Fablet  <youenn@apple.com>
>+
>+        Rename Document::hasHadActiveMediaStreamTrack to Document::hasHadCaptureMediaStreamTrack
>+        https://bugs.webkit.org/show_bug.cgi?id=186743
>+        rdar://problem/41151193
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Covered by existing tests.
>+
>+        Rename setter and getter to be more accurate.
>+        Move the place to call the setter to when creating a capture stream.
>+
>+        * Modules/mediastream/MediaDevicesRequest.cpp:
>+        (WebCore::MediaDevicesRequest::start):
>+        * Modules/mediastream/MediaStream.cpp:
>+        (WebCore::MediaStream::statusDidChange):
>+        * Modules/mediastream/UserMediaRequest.cpp:
>+        (WebCore::UserMediaRequest::mediaStreamIsReady):
>+        * dom/Document.h:
>+        (WebCore::Document::setHasCaptureMediaStreamTrack):
>+        (WebCore::Document::hasHadCaptureMediaStreamTrack const):
>+        (WebCore::Document::setHasActiveMediaStreamTrack): Deleted.
>+        (WebCore::Document::hasHadActiveMediaStreamTrack const): Deleted.
>+
> 2018-06-15  Youenn Fablet  <youenn@apple.com>
> 
>         Need to properly handle removal of worker in SWServer::unregisterServiceWorkerClient timer lambda
>diff --git a/Source/WebCore/Modules/mediastream/MediaDevicesRequest.cpp b/Source/WebCore/Modules/mediastream/MediaDevicesRequest.cpp
>index 12400dcf2deed8fbc25e1bfa42398822326f4183..e2c5bf70a26724fd057c9a6ae461ad5ada53f9e0 100644
>--- a/Source/WebCore/Modules/mediastream/MediaDevicesRequest.cpp
>+++ b/Source/WebCore/Modules/mediastream/MediaDevicesRequest.cpp
>@@ -123,7 +123,7 @@ void MediaDevicesRequest::start()
>         Vector<Ref<MediaDeviceInfo>> devices;
>         for (auto& deviceInfo : captureDevices) {
>             auto label = emptyString();
>-            if (originHasPersistentAccess || document.hasHadActiveMediaStreamTrack())
>+            if (originHasPersistentAccess || document.hasHadCaptureMediaStreamTrack())
>                 label = deviceInfo.label();
> 
>             auto id = RealtimeMediaSourceCenter::singleton().hashStringWithSalt(deviceInfo.persistentId(), deviceIdentifierHashSalt);
>@@ -135,7 +135,7 @@ void MediaDevicesRequest::start()
>             devices.append(MediaDeviceInfo::create(scriptExecutionContext(), label, id, groupId, deviceType));
>         }
> 
>-        if (!originHasPersistentAccess && !document.hasHadActiveMediaStreamTrack())
>+        if (!originHasPersistentAccess && !document.hasHadCaptureMediaStreamTrack())
>             filterDeviceList(devices);
> 
>         callOnMainThread([protectedThis = makeRef(*this), devices = WTFMove(devices)]() mutable {
>diff --git a/Source/WebCore/Modules/mediastream/MediaStream.cpp b/Source/WebCore/Modules/mediastream/MediaStream.cpp
>index b77809d2e74e20c85ea0c1f11b8f7834ac66e16b..c284a4108db2f624a6dff1d0c944dc29d28e8e11 100644
>--- a/Source/WebCore/Modules/mediastream/MediaStream.cpp
>+++ b/Source/WebCore/Modules/mediastream/MediaStream.cpp
>@@ -336,7 +336,6 @@ void MediaStream::statusDidChange()
>     if (Document* document = this->document()) {
>         if (!m_isActive)
>             return;
>-        document->setHasActiveMediaStreamTrack();
>         document->updateIsPlayingMedia();
>     }
> }
>diff --git a/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp b/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp
>index 00ec3ed6497aede39c123d6e53b1b823f7863857..785bf16a2512e397ea7d99021ec5f8442d9e93c1 100644
>--- a/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp
>+++ b/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp
>@@ -353,6 +353,7 @@ void UserMediaRequest::PendingActivationMediaStream::characteristicsChanged()
> 
> void UserMediaRequest::mediaStreamIsReady(Ref<MediaStream>&& stream)
> {
>+    stream->document()->setHasCaptureMediaStreamTrack();
>     m_promise.resolve(WTFMove(stream));
>     // We are in an observer iterator loop, we do not want to change the observers within this loop.
>     callOnMainThread([stream = WTFMove(m_pendingActivationMediaStream)] { });
>diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
>index 0cb3c1c5842dd7d7bbf54207cb939c3c70046c44..6ed1e6879ca1e1d89af89b21a2dd0ff65fe3c990 100644
>--- a/Source/WebCore/dom/Document.h
>+++ b/Source/WebCore/dom/Document.h
>@@ -1332,8 +1332,8 @@ public:
>     void removeViewportDependentPicture(HTMLPictureElement&);
> 
> #if ENABLE(MEDIA_STREAM)
>-    void setHasActiveMediaStreamTrack() { m_hasHadActiveMediaStreamTrack = true; }
>-    bool hasHadActiveMediaStreamTrack() const { return m_hasHadActiveMediaStreamTrack; }
>+    void setHasCaptureMediaStreamTrack() { m_hasHadCaptureMediaStreamTrack = true; }
>+    bool hasHadCaptureMediaStreamTrack() const { return m_hasHadCaptureMediaStreamTrack; }
>     void setDeviceIDHashSalt(const String& salt) { m_idHashSalt = salt; }
>     String deviceIDHashSalt() const { return m_idHashSalt; }
>     void stopMediaCapture();
>@@ -1895,7 +1895,7 @@ private:
> #if ENABLE(MEDIA_STREAM)
>     HashSet<HTMLMediaElement*> m_mediaStreamStateChangeElements;
>     String m_idHashSalt;
>-    bool m_hasHadActiveMediaStreamTrack { false };
>+    bool m_hasHadCaptureMediaStreamTrack { false };
> #endif
> 
> #ifndef NDEBUG
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 6493de34a88c353f5e0f2849695ef9f3ab692667..b626c6dbe7aac17c780c03d3b58ccd14e9018ba2 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-06-16  Youenn Fablet  <youenn@apple.com>
>+
>+        Rename Document::hasHadActiveMediaStreamTrack to Document::hasHadCaptureMediaStreamTrack
>+        https://bugs.webkit.org/show_bug.cgi?id=186743
>+        rdar://problem/41151193
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/mediastream/media-devices-enumerate-devices.html:
>+
> 2018-06-15  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [WPE][GTK][WebGL] Layout test fast/canvas/webgl/simulated-vertexAttrib0-invalid-indicies.html is failing
>diff --git a/LayoutTests/fast/mediastream/media-devices-enumerate-devices.html b/LayoutTests/fast/mediastream/media-devices-enumerate-devices.html
>index e175a194bffc561f80e44de3fc91c74be9f5067c..6a99dba5942e8aafe4204da1bac8c2850db5e317 100644
>--- a/LayoutTests/fast/mediastream/media-devices-enumerate-devices.html
>+++ b/LayoutTests/fast/mediastream/media-devices-enumerate-devices.html
>@@ -27,6 +27,7 @@
>             if (window.testRunner)
>                 testRunner.setUserMediaPermission(true);
> 
>+            new window.webkitAudioContext().createMediaStreamDestination();
>             return navigator.mediaDevices.enumerateDevices()
>                 .then((devices) => {
>                     deviceCount = devices.length;

Actions: View | Formatted Diff | Diff

Attachments on bug 186743: 342888