Changeset 215668 in webkit

Timestamp:

Apr 22, 2017, 11:46:06 AM (9 years ago)

Author:

eric.carlson@apple.com

Message:

[MediaStream] Fix regression caused by r215626
​https://bugs.webkit.org/show_bug.cgi?id=171168
<rdar://problem/31774787>

Reviewed by Antoine Quint.

No new tests, fixes fast/mediastream/MediaStream-page-muted.html

• Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::mediaState): Test muted before m_isProducingData because if both are
true we want to report that the stream is muted.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/mediastream/MediaStream.cpp (modified) (2 diffs)
• WebKit2/UIProcess/WebPageProxy.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-22  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] Fix regression caused by r215626
+        https://bugs.webkit.org/show_bug.cgi?id=171168
+        <rdar://problem/31774787>
+
+        Reviewed by Antoine Quint.
+
+        No new tests, fixes fast/mediastream/MediaStream-page-muted.html
+
+        * Modules/mediastream/MediaStream.cpp:
+        (WebCore::MediaStream::mediaState): Test muted before m_isProducingData because if both are 
+        true we want to report that the stream is muted.
+
 2017-04-21  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp

@@ -337 +337 @@
         state |= HasAudioOrVideo;
         if (m_private->hasCaptureAudioSource()) {
-            if (m_isProducingData)
+            if (m_private->muted())
+                state |= HasMutedAudioCaptureDevice;
+            else if (m_isProducingData)
                 state |= HasActiveAudioCaptureDevice;
-            else if (m_private->muted())
-                state |= HasMutedAudioCaptureDevice;
         }
     }
@@ -347 +347 @@
         state |= HasAudioOrVideo;
         if (m_private->hasCaptureVideoSource()) {
-            if (m_isProducingData)
+            if (m_private->muted())
+                state |= HasMutedVideoCaptureDevice;
+            else if (m_isProducingData)
                 state |= HasActiveVideoCaptureDevice;
-            else if (m_private->muted())
-                state |= HasMutedVideoCaptureDevice;
         }
     }

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -4199 +4199 @@
 void WebPageProxy::setMuted(WebCore::MediaProducer::MutedStateFlags state)
 {
-    if (m_mutedState == state)
-        return;
-
     m_mutedState = state;