Changeset 249689 in webkit

Timestamp:

Sep 9, 2019, 8:19:33 PM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r248170. rdar://problem/55183128

[iOS] Directly use RealtimeMediaSourceCenter to compute the media capture state
​https://bugs.webkit.org/show_bug.cgi?id=200368
<rdar://problem/53191450>

Unreviewed.
Build fix by guarding with MEDIA_STREAM in addition to IOS.

• dom/Document.cpp: (WebCore::Document::updateIsPlayingMedia): (WebCore::Document::pageMutedStateDidChange):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@248170 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-608-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)

branches/safari-608-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-09-09  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r248170. rdar://problem/55183128
+
+    [iOS] Directly use RealtimeMediaSourceCenter to compute the media capture  state
+    https://bugs.webkit.org/show_bug.cgi?id=200368
+    <rdar://problem/53191450>
+    
+    Unreviewed.
+    Build fix by guarding with MEDIA_STREAM in addition to IOS.
+    
+    
+    * dom/Document.cpp:
+    (WebCore::Document::updateIsPlayingMedia):
+    (WebCore::Document::pageMutedStateDidChange):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248170 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-08-02  Youenn Fablet  <youenn@apple.com>
+
+            [iOS] Directly use RealtimeMediaSourceCenter to compute the media capture  state
+            https://bugs.webkit.org/show_bug.cgi?id=200368
+            <rdar://problem/53191450>
+
+            Unreviewed.
+            Build fix by guarding with MEDIA_STREAM in addition to IOS.
+
+            * dom/Document.cpp:
+            (WebCore::Document::updateIsPlayingMedia):
+            (WebCore::Document::pageMutedStateDidChange):
+
 2019-09-09  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608-branch/Source/WebCore/dom/Document.cpp

@@ -3985 +3985 @@
         state |= audioProducer.mediaState();
 
-#if PLATFORM(IOS_FAMILY)
+#if ENABLE(MEDIA_STREAM) && PLATFORM(IOS_FAMILY)
     state |= MediaStreamTrack::captureState();
 #endif
@@ -4031 +4031 @@
         audioProducer.pageMutedStateDidChange();
 
-#if PLATFORM(IOS_FAMILY)
+#if ENABLE(MEDIA_STREAM) && PLATFORM(IOS_FAMILY)
     MediaStreamTrack::muteCapture();
 #endif