Changeset 207837 in webkit
- Timestamp:
- Oct 25, 2016 12:37:15 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r207835 r207837 1 2016-10-25 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r207827 and r207828. 4 https://bugs.webkit.org/show_bug.cgi?id=163965 5 6 Caused LayoutTest webaudio/web-audio-is-playing.html to time 7 out on macOS. (Requested by ryanhaddad on #webkit). 8 9 Reverted changesets: 10 11 "[MediaStream] Add "has capture device" bit to media state 12 flags" 13 https://bugs.webkit.org/show_bug.cgi?id=163952 14 http://trac.webkit.org/changeset/207827 15 16 "[MediaStream] Add "has capture device" bit to media state 17 flags" 18 https://bugs.webkit.org/show_bug.cgi?id=163952 19 http://trac.webkit.org/changeset/207828 20 1 21 2016-10-25 Antoine Quint <graouts@apple.com> 2 22 -
trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt
r207827 r207837 8 8 PASS mediaStream is an instance of Object 9 9 PASS mediaStream.getTracks().length is 2 10 PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became true11 10 12 11 *** Muting capture devices 13 12 EVENT: mute 14 PASS muteChangedEvent.target.muted is true15 PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true 13 PASS event.target.muted is true 14 16 15 EVENT: mute 17 PASS muteChangedEvent.target.muted is true 18 PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true 16 PASS event.target.muted is true 19 17 20 PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became false21 18 22 19 *** Unmuting capture devices 23 20 EVENT: unmute 24 PASS muteChangedEvent.target.muted is false25 PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true 21 PASS event.target.muted is false 22 26 23 EVENT: unmute 27 PASS muteChangedEvent.target.muted is false 28 PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true 24 PASS event.target.muted is false 29 25 30 PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became true31 26 PASS successfullyParsed is true 32 27 -
trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html
r207827 r207837 6 6 let mediaStream; 7 7 let eventCount = 0; 8 let muteChangedEvent;9 10 function nextStep()11 {12 if (muteChangedEvent.type == "unmute") {13 finishJSTest();14 return;15 }16 17 debug("<br>*** Unmuting capture devices");18 eventCount = 0;19 internals.setPageMuted("");20 }21 8 22 9 function muteChanged(ev) 23 10 { 24 muteChangedEvent = ev;25 debug(`EVENT: ${ muteChangedEvent.type}`);26 shouldBe(' muteChangedEvent.target.muted', (muteChangedEvent.type == "mute").toString());27 shouldBe("window.internals.pageMediaState().includes('HasMediaCaptureDevice')", "true");11 event = ev; 12 debug(`EVENT: ${ev.type}`); 13 shouldBe('event.target.muted', (ev.type == "mute").toString()); 14 debug(""); 28 15 29 16 if (++eventCount == 2) { 30 debug(""); 31 let shouldBeActive = muteChangedEvent.type == "mute" ? "false" : "true"; 32 shouldBecomeEqual("window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice')", shouldBeActive, nextStep); 17 eventCount = 0; 18 19 if (ev.type == "unmute") { 20 finishJSTest(); 21 return; 22 } 23 24 if (window.internals) { 25 debug("<br>*** Unmuting capture devices"); 26 internals.setPageMuted(""); 27 } 33 28 } 34 }35 36 function muteCaptureDevices()37 {38 debug("<br>*** Muting capture devices");39 internals.setPageMuted("capturedevices");40 29 } 41 30 … … 55 44 } 56 45 57 shouldBecomeEqual("window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice')", "true", muteCaptureDevices); 46 if (window.internals) { 47 debug("<br>*** Muting capture devices"); 48 internals.setPageMuted("capturedevices"); 49 } 58 50 }) 59 51 .catch((err) => { -
trunk/LayoutTests/media/muted-video-is-playing-audio-expected.txt
r207827 r207837 4 4 5 5 6 PASS window.internals. pageMediaState().includes('IsPlayingAudio') became true7 PASS window.internals. pageMediaState().includes('IsPlayingAudio') became false8 PASS window.internals. pageMediaState().includes('IsPlayingAudio') became true6 PASS window.internals.isPagePlayingAudio() became true 7 PASS window.internals.isPagePlayingAudio() became false 8 PASS window.internals.isPagePlayingAudio() became true 9 9 PASS successfullyParsed is true 10 10 -
trunk/LayoutTests/media/muted-video-is-playing-audio.html
r207827 r207837 16 16 { 17 17 run("video.muted = false"); 18 shouldBecomeEqual("window.internals. pageMediaState().includes('IsPlayingAudio')", "true", finishJSTest);18 shouldBecomeEqual("window.internals.isPagePlayingAudio()", "true", finishJSTest); 19 19 } 20 20 … … 22 22 { 23 23 run("video.muted = true"); 24 shouldBecomeEqual("window.internals. pageMediaState().includes('IsPlayingAudio')", "false", testUnmutingVideo);24 shouldBecomeEqual("window.internals.isPagePlayingAudio()", "false", testUnmutingVideo); 25 25 } 26 26 27 shouldBecomeEqual("window.internals. pageMediaState().includes('IsPlayingAudio')", "true", testMutingVideo);27 shouldBecomeEqual("window.internals.isPagePlayingAudio()", "true", testMutingVideo); 28 28 </script> 29 29 <script src="../resources/js-test-post.js"></script> -
trunk/Source/WebCore/ChangeLog
r207835 r207837 1 2016-10-25 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r207827 and r207828. 4 https://bugs.webkit.org/show_bug.cgi?id=163965 5 6 Caused LayoutTest webaudio/web-audio-is-playing.html to time 7 out on macOS. (Requested by ryanhaddad on #webkit). 8 9 Reverted changesets: 10 11 "[MediaStream] Add "has capture device" bit to media state 12 flags" 13 https://bugs.webkit.org/show_bug.cgi?id=163952 14 http://trac.webkit.org/changeset/207827 15 16 "[MediaStream] Add "has capture device" bit to media state 17 flags" 18 https://bugs.webkit.org/show_bug.cgi?id=163952 19 http://trac.webkit.org/changeset/207828 20 1 21 2016-10-25 Antoine Quint <graouts@apple.com> 2 22 -
trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp
r207827 r207837 275 275 return state; 276 276 277 state |= HasMediaCaptureDevice; 278 if (m_private->isProducingData()) 277 if (m_externallyMuted || m_private->isProducingData()) 279 278 state |= HasActiveMediaCaptureDevice; 280 279 -
trunk/Source/WebCore/page/MediaProducer.h
r207827 r207837 45 45 HasAudioOrVideo = 1 << 10, 46 46 HasActiveMediaCaptureDevice = 1 << 11, 47 HasMediaCaptureDevice = 1 << 12,48 47 }; 49 48 typedef unsigned MediaStateFlags; -
trunk/Source/WebCore/testing/Internals.cpp
r207827 r207837 2967 2967 } 2968 2968 2969 String Internals::pageMediaState()2969 bool Internals::isPagePlayingAudio() 2970 2970 { 2971 2971 Document* document = contextDocument(); 2972 2972 if (!document || !document->page()) 2973 return emptyString(); 2974 2975 WebCore::MediaProducer::MediaStateFlags state = document->page()->mediaState(); 2976 StringBuilder string; 2977 if (state & MediaProducer::IsPlayingAudio) 2978 string.append("IsPlayingAudio,"); 2979 if (state & MediaProducer::IsPlayingVideo) 2980 string.append("IsPlayingVideo,"); 2981 if (state & MediaProducer::IsPlayingToExternalDevice) 2982 string.append("IsPlayingToExternalDevice,"); 2983 if (state & MediaProducer::RequiresPlaybackTargetMonitoring) 2984 string.append("RequiresPlaybackTargetMonitoring,"); 2985 if (state & MediaProducer::ExternalDeviceAutoPlayCandidate) 2986 string.append("ExternalDeviceAutoPlayCandidate,"); 2987 if (state & MediaProducer::DidPlayToEnd) 2988 string.append("DidPlayToEnd,"); 2989 if (state & MediaProducer::IsSourceElementPlaying) 2990 string.append("IsSourceElementPlaying,"); 2991 2992 if (state & MediaProducer::IsNextTrackControlEnabled) 2993 string.append("IsNextTrackControlEnabled,"); 2994 if (state & MediaProducer::IsPreviousTrackControlEnabled) 2995 string.append("IsPreviousTrackControlEnabled,"); 2996 2997 if (state & MediaProducer::HasPlaybackTargetAvailabilityListener) 2998 string.append("HasPlaybackTargetAvailabilityListener,"); 2999 if (state & MediaProducer::HasAudioOrVideo) 3000 string.append("HasAudioOrVideo,"); 3001 if (state & MediaProducer::HasActiveMediaCaptureDevice) 3002 string.append("HasActiveMediaCaptureDevice,"); 3003 if (state & MediaProducer::HasMediaCaptureDevice) 3004 string.append("HasMediaCaptureDevice,"); 3005 3006 if (string.isEmpty()) 3007 string.append("IsNotPlaying"); 3008 else 3009 string.resize(string.length() - 1); 3010 3011 return string.toString(); 2973 return false; 2974 2975 return !!(document->page()->mediaState() & MediaProducer::IsPlayingAudio); 3012 2976 } 3013 2977 -
trunk/Source/WebCore/testing/Internals.h
r207827 r207837 442 442 443 443 void setPageMuted(const String&); 444 String pageMediaState();444 bool isPagePlayingAudio(); 445 445 446 446 void setPageDefersLoading(bool); -
trunk/Source/WebCore/testing/Internals.idl
r207827 r207837 419 419 420 420 void setPageMuted(DOMString mutedState); 421 DOMString pageMediaState();421 boolean isPagePlayingAudio(); 422 422 423 423 void setPageDefersLoading(boolean defersLoading); -
trunk/Source/WebKit2/ChangeLog
r207828 r207837 1 2016-10-25 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r207827 and r207828. 4 https://bugs.webkit.org/show_bug.cgi?id=163965 5 6 Caused LayoutTest webaudio/web-audio-is-playing.html to time 7 out on macOS. (Requested by ryanhaddad on #webkit). 8 9 Reverted changesets: 10 11 "[MediaStream] Add "has capture device" bit to media state 12 flags" 13 https://bugs.webkit.org/show_bug.cgi?id=163952 14 http://trac.webkit.org/changeset/207827 15 16 "[MediaStream] Add "has capture device" bit to media state 17 flags" 18 https://bugs.webkit.org/show_bug.cgi?id=163952 19 http://trac.webkit.org/changeset/207828 20 1 21 2016-10-25 Eric Carlson <eric.carlson@apple.com> 2 22 -
trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp
r207828 r207837 2749 2749 if (coreState & WebCore::MediaProducer::IsPlayingVideo) 2750 2750 state |= kWKMediaIsPlayingVideo; 2751 if (coreState & WebCore::MediaProducer::HasMediaCaptureDevice)2752 state |= kWKMediaHasCaptureDevice;2753 2751 if (coreState & WebCore::MediaProducer::HasActiveMediaCaptureDevice) 2754 2752 state |= kWKMediaHasActiveCaptureDevice; -
trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h
r207828 r207837 135 135 kWKMediaIsPlayingVideo = 1 << 1, 136 136 kWKMediaHasActiveCaptureDevice = 1 << 2, 137 kWKMediaHasCaptureDevice = 1 << 3,138 137 }; 139 138 typedef uint32_t WKMediaState;
Note: See TracChangeset
for help on using the changeset viewer.