Changeset 207837 in webkit


Ignore:
Timestamp:
Oct 25, 2016 12:37:15 PM (7 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r207827 and r207828.
https://bugs.webkit.org/show_bug.cgi?id=163965

Caused LayoutTest webaudio/web-audio-is-playing.html to time
out on macOS. (Requested by ryanhaddad on #webkit).

Reverted changesets:

"[MediaStream] Add "has capture device" bit to media state
flags"
https://bugs.webkit.org/show_bug.cgi?id=163952
http://trac.webkit.org/changeset/207827

"[MediaStream] Add "has capture device" bit to media state
flags"
https://bugs.webkit.org/show_bug.cgi?id=163952
http://trac.webkit.org/changeset/207828

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r207835 r207837  
     12016-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
    1212016-10-25  Antoine Quint  <graouts@apple.com>
    222
  • trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt

    r207827 r207837  
    88PASS mediaStream is an instance of Object
    99PASS mediaStream.getTracks().length is 2
    10 PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became true
    1110
    1211*** Muting capture devices
    1312EVENT: mute
    14 PASS muteChangedEvent.target.muted is true
    15 PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
     13PASS event.target.muted is true
     14
    1615EVENT: mute
    17 PASS muteChangedEvent.target.muted is true
    18 PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
     16PASS event.target.muted is true
    1917
    20 PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became false
    2118
    2219*** Unmuting capture devices
    2320EVENT: unmute
    24 PASS muteChangedEvent.target.muted is false
    25 PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
     21PASS event.target.muted is false
     22
    2623EVENT: unmute
    27 PASS muteChangedEvent.target.muted is false
    28 PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
     24PASS event.target.muted is false
    2925
    30 PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became true
    3126PASS successfullyParsed is true
    3227
  • trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html

    r207827 r207837  
    66            let mediaStream;
    77            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             }
    218
    229            function muteChanged(ev)
    2310            {
    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("");
    2815
    2916                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                    }
    3328                }
    34             }
    35            
    36             function muteCaptureDevices()
    37             {
    38                 debug("<br>*** Muting capture devices");
    39                 internals.setPageMuted("capturedevices");
    4029            }
    4130           
     
    5544                        }
    5645
    57                         shouldBecomeEqual("window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice')", "true", muteCaptureDevices);
     46                        if (window.internals) {
     47                            debug("<br>*** Muting capture devices");
     48                            internals.setPageMuted("capturedevices");
     49                        }
    5850                    })
    5951                    .catch((err) => {
  • trunk/LayoutTests/media/muted-video-is-playing-audio-expected.txt

    r207827 r207837  
    44
    55
    6 PASS window.internals.pageMediaState().includes('IsPlayingAudio') became true
    7 PASS window.internals.pageMediaState().includes('IsPlayingAudio') became false
    8 PASS window.internals.pageMediaState().includes('IsPlayingAudio') became true
     6PASS window.internals.isPagePlayingAudio() became true
     7PASS window.internals.isPagePlayingAudio() became false
     8PASS window.internals.isPagePlayingAudio() became true
    99PASS successfullyParsed is true
    1010
  • trunk/LayoutTests/media/muted-video-is-playing-audio.html

    r207827 r207837  
    1616            {
    1717                run("video.muted = false");
    18                 shouldBecomeEqual("window.internals.pageMediaState().includes('IsPlayingAudio')", "true", finishJSTest);
     18                shouldBecomeEqual("window.internals.isPagePlayingAudio()", "true", finishJSTest);
    1919            }
    2020
     
    2222            {
    2323                run("video.muted = true");
    24                 shouldBecomeEqual("window.internals.pageMediaState().includes('IsPlayingAudio')", "false", testUnmutingVideo);
     24                shouldBecomeEqual("window.internals.isPagePlayingAudio()", "false", testUnmutingVideo);
    2525            }
    2626
    27             shouldBecomeEqual("window.internals.pageMediaState().includes('IsPlayingAudio')", "true", testMutingVideo);
     27            shouldBecomeEqual("window.internals.isPagePlayingAudio()", "true", testMutingVideo);
    2828        </script>
    2929        <script src="../resources/js-test-post.js"></script>
  • trunk/Source/WebCore/ChangeLog

    r207835 r207837  
     12016-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
    1212016-10-25  Antoine Quint  <graouts@apple.com>
    222
  • trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp

    r207827 r207837  
    275275        return state;
    276276
    277     state |= HasMediaCaptureDevice;
    278     if (m_private->isProducingData())
     277    if (m_externallyMuted || m_private->isProducingData())
    279278        state |= HasActiveMediaCaptureDevice;
    280279
  • trunk/Source/WebCore/page/MediaProducer.h

    r207827 r207837  
    4545        HasAudioOrVideo = 1 << 10,
    4646        HasActiveMediaCaptureDevice = 1 << 11,
    47         HasMediaCaptureDevice = 1 << 12,
    4847    };
    4948    typedef unsigned MediaStateFlags;
  • trunk/Source/WebCore/testing/Internals.cpp

    r207827 r207837  
    29672967}
    29682968
    2969 String Internals::pageMediaState()
     2969bool Internals::isPagePlayingAudio()
    29702970{
    29712971    Document* document = contextDocument();
    29722972    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);
    30122976}
    30132977
  • trunk/Source/WebCore/testing/Internals.h

    r207827 r207837  
    442442
    443443    void setPageMuted(const String&);
    444     String pageMediaState();
     444    bool isPagePlayingAudio();
    445445
    446446    void setPageDefersLoading(bool);
  • trunk/Source/WebCore/testing/Internals.idl

    r207827 r207837  
    419419
    420420    void setPageMuted(DOMString mutedState);
    421     DOMString pageMediaState();
     421    boolean isPagePlayingAudio();
    422422
    423423    void setPageDefersLoading(boolean defersLoading);
  • trunk/Source/WebKit2/ChangeLog

    r207828 r207837  
     12016-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
    1212016-10-25  Eric Carlson  <eric.carlson@apple.com>
    222
  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

    r207828 r207837  
    27492749    if (coreState & WebCore::MediaProducer::IsPlayingVideo)
    27502750        state |= kWKMediaIsPlayingVideo;
    2751     if (coreState & WebCore::MediaProducer::HasMediaCaptureDevice)
    2752         state |= kWKMediaHasCaptureDevice;
    27532751    if (coreState & WebCore::MediaProducer::HasActiveMediaCaptureDevice)
    27542752        state |= kWKMediaHasActiveCaptureDevice;
  • trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h

    r207828 r207837  
    135135    kWKMediaIsPlayingVideo = 1 << 1,
    136136    kWKMediaHasActiveCaptureDevice = 1 << 2,
    137     kWKMediaHasCaptureDevice = 1 << 3,
    138137};
    139138typedef uint32_t WKMediaState;
Note: See TracChangeset for help on using the changeset viewer.