Changeset 208735 in webkit


Ignore:
Timestamp:
Nov 15, 2016 10:19:19 AM (7 years ago)
Author:
jonlee@apple.com
Message:

Remove HasMediaCaptureDevice
​https://bugs.webkit.org/show_bug.cgi?id=164767
<rdar://problem/29263696>

Reviewed by Eric Carlson.

Source/WebCore:

  • Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::mediaState): Remove HasMediaCaptureDevice in state.

  • page/MediaProducer.h:
  • testing/Internals.cpp:

(WebCore::Internals::pageMediaState): Remove it in the media string.

Source/WebKit2:

  • UIProcess/API/C/WKPage.cpp: Remove kWKMediaHasCaptureDevice.

(WKPageGetMediaState):

  • UIProcess/API/C/WKPagePrivate.h:

LayoutTests:

  • fast/mediastream/MediaStream-page-muted-expected.txt: Remove check for HasMediaCaptureDevice.
  • fast/mediastream/MediaStream-page-muted.html:
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r208733 r208735  
     12016-11-15  Jon Lee  <jonlee@apple.com>
     2
     3        Remove HasMediaCaptureDevice
     4        https://bugs.webkit.org/show_bug.cgi?id=164767
     5        <rdar://problem/29263696>
     6
     7        Reviewed by Eric Carlson.
     8
     9        * fast/mediastream/MediaStream-page-muted-expected.txt: Remove check for HasMediaCaptureDevice.
     10        * fast/mediastream/MediaStream-page-muted.html:
     11
    1122016-11-14  Dave Hyatt  <hyatt@apple.com>
    213

  • trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt

    r207839 r208735  
    1313EVENT: mute
    1414PASS muteChangedEvent.target.muted is true
    15 PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
    1615EVENT: mute
    1716PASS muteChangedEvent.target.muted is true
    18 PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
    1917
    2018PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became false
    … …  
    2321EVENT: unmute
    2422PASS muteChangedEvent.target.muted is false
    25 PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
    2623EVENT: unmute
    2724PASS muteChangedEvent.target.muted is false
    28 PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
    2925
    3026PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became true

  • trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html

    r207839 r208735  
    2525                debug(`EVENT: ${muteChangedEvent.type}`);
    2626                shouldBe('muteChangedEvent.target.muted', (muteChangedEvent.type == "mute").toString());
    27                 shouldBe("window.internals.pageMediaState().includes('HasMediaCaptureDevice')", "true");
    2827
    2928                if (++eventCount == 2) {

  • trunk/Source/WebCore/ChangeLog

    r208733 r208735  
     12016-11-15  Jon Lee  <jonlee@apple.com>
     2
     3        Remove HasMediaCaptureDevice
     4        https://bugs.webkit.org/show_bug.cgi?id=164767
     5        <rdar://problem/29263696>
     6
     7        Reviewed by Eric Carlson.
     8
     9        * Modules/mediastream/MediaStream.cpp:
     10        (WebCore::MediaStream::mediaState): Remove HasMediaCaptureDevice in state.
     11        * page/MediaProducer.h:
     12        * testing/Internals.cpp:
     13        (WebCore::Internals::pageMediaState): Remove it in the media string.
     14
    1152016-11-14  Dave Hyatt  <hyatt@apple.com>
    216

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

    r208688 r208735  
    313313        return state;
    314314
    315     state |= HasMediaCaptureDevice;
    316315    if (m_private->isProducingData())
    317316        state |= HasActiveMediaCaptureDevice;

  • trunk/Source/WebCore/page/MediaProducer.h

    r208179 r208735  
    4444        HasAudioOrVideo = 1 << 10,
    4545        HasActiveMediaCaptureDevice = 1 << 11,
    46         HasMediaCaptureDevice = 1 << 12,
    4746    };
    4847    typedef unsigned MediaStateFlags;

  • trunk/Source/WebCore/testing/Internals.cpp

    r208682 r208735  
    30133013    if (state & MediaProducer::HasActiveMediaCaptureDevice)
    30143014        string.append("HasActiveMediaCaptureDevice,");
    3015     if (state & MediaProducer::HasMediaCaptureDevice)
    3016         string.append("HasMediaCaptureDevice,");
    30173015
    30183016    if (string.isEmpty())

  • trunk/Source/WebKit2/ChangeLog

    r208732 r208735  
     12016-11-15  Jon Lee  <jonlee@apple.com>
     2
     3        Remove HasMediaCaptureDevice
     4        https://bugs.webkit.org/show_bug.cgi?id=164767
     5        <rdar://problem/29263696>
     6
     7        Reviewed by Eric Carlson.
     8
     9        * UIProcess/API/C/WKPage.cpp: Remove kWKMediaHasCaptureDevice.
     10        (WKPageGetMediaState):
     11        * UIProcess/API/C/WKPagePrivate.h:
     12
    1132016-11-15  Daniel Bates  <dabates@apple.com>
    214

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

    r208342 r208735  
    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

    r207839 r208735  
    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.