Title: [249689] branches/safari-608-branch/Source/WebCore
- Revision
- 249689
- Author
- alanc...@apple.com
- Date
- 2019-09-09 20:19:33 -0700 (Mon, 09 Sep 2019)
Log 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
Modified Paths
Diff
Modified: branches/safari-608-branch/Source/WebCore/ChangeLog (249688 => 249689)
--- branches/safari-608-branch/Source/WebCore/ChangeLog 2019-09-10 03:19:29 UTC (rev 249688)
+++ branches/safari-608-branch/Source/WebCore/ChangeLog 2019-09-10 03:19:33 UTC (rev 249689)
@@ -1,5 +1,37 @@
2019-09-09 Kocsen Chung <kocsen_ch...@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 <you...@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_ch...@apple.com>
+
Cherry-pick r248161. rdar://problem/55183128
[iOS] Directly use RealtimeMediaSourceCenter to compute the media capture state
Modified: branches/safari-608-branch/Source/WebCore/dom/Document.cpp (249688 => 249689)
--- branches/safari-608-branch/Source/WebCore/dom/Document.cpp 2019-09-10 03:19:29 UTC (rev 249688)
+++ branches/safari-608-branch/Source/WebCore/dom/Document.cpp 2019-09-10 03:19:33 UTC (rev 249689)
@@ -3984,7 +3984,7 @@
for (auto& audioProducer : m_audioProducers)
state |= audioProducer.mediaState();
-#if PLATFORM(IOS_FAMILY)
+#if ENABLE(MEDIA_STREAM) && PLATFORM(IOS_FAMILY)
state |= MediaStreamTrack::captureState();
#endif
@@ -4030,7 +4030,7 @@
for (auto& audioProducer : m_audioProducers)
audioProducer.pageMutedStateDidChange();
-#if PLATFORM(IOS_FAMILY)
+#if ENABLE(MEDIA_STREAM) && PLATFORM(IOS_FAMILY)
MediaStreamTrack::muteCapture();
#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
