Changeset 216183 in webkit


Ignore:
Timestamp:
May 4, 2017 5:56:54 AM (7 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r216172.
​https://bugs.webkit.org/show_bug.cgi?id=171654

FTBFS for iOS due to missing WebPageProxy::stopMediaCapture()
implementation. (Requested by ddkilzer on #webkit).

Reverted changeset:

"[MediaStream] Allow host application to enable/disable media
capture"
​https://bugs.webkit.org/show_bug.cgi?id=171292
​http://trac.webkit.org/changeset/216172

Location:
trunk
Files:
2 deleted
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r216174 r216183  
     12017-05-04  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r216172.
     4        https://bugs.webkit.org/show_bug.cgi?id=171654
     5
     6        FTBFS for iOS due to missing WebPageProxy::stopMediaCapture()
     7        implementation. (Requested by ddkilzer on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[MediaStream] Allow host application to enable/disable media
     12        capture"
     13        https://bugs.webkit.org/show_bug.cgi?id=171292
     14        http://trac.webkit.org/changeset/216172
     15
    1162017-05-03  Carlos Garcia Campos  <cgarcia@igalia.com>
    217

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

    r216172 r216183  
    315315}
    316316
    317 void MediaStream::endStream()
    318 {
    319     for (auto& track : m_trackSet.values())
    320         track->stopTrack(MediaStreamTrack::StopMode::PostEvent);
    321 }
    322 
    323317void MediaStream::pageMutedStateDidChange()
    324318{

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

    r216172 r216183  
    9292    void stopProducingData();
    9393
    94     void endStream();
    95 
    9694    // EventTarget
    9795    EventTargetInterface eventTargetInterface() const final { return MediaStreamEventTargetInterfaceType; }
    … …  
    108106
    109107    void addTrackFromPlatform(Ref<MediaStreamTrack>&&);
    110 
    111     Document* document() const;
    112108
    113109protected:
    … …  
    163159    void statusDidChange();
    164160
     161    Document* document() const;
     162
    165163    MediaStreamTrackVector trackVectorForType(RealtimeMediaSource::Type) const;
    166164

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

    r216172 r216183  
    6363}
    6464
     65MediaStreamRegistry::MediaStreamRegistry()
     66{
     67}
     68
    6569MediaStream* MediaStreamRegistry::lookUp(const URL& url) const
    6670{
    … …  
    8185void MediaStreamRegistry::unregisterStream(MediaStream& stream)
    8286{
    83     auto& allStreams = mediaStreams();
     87    Vector<MediaStream*>& allStreams = mediaStreams();
    8488    size_t pos = allStreams.find(&stream);
    8589    if (pos != notFound)
    … …  
    8791}
    8892
    89 void MediaStreamRegistry::forEach(std::function<void(MediaStream&)> callback) const
     93MediaStream* MediaStreamRegistry::lookUp(const MediaStreamPrivate& privateStream) const
    9094{
    91     for (auto& stream : mediaStreams())
    92         callback(*stream);
     95    Vector<MediaStream*>& allStreams = mediaStreams();
     96    for (auto& stream : allStreams) {
     97        if (&stream->privateStream() == &privateStream)
     98            return stream;
     99    }
     100
     101    return nullptr;
    93102}
    94103

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.h

    r216172 r216183  
    5555
    5656    MediaStream* lookUp(const URL&) const;
    57 
    58     void forEach(std::function<void(MediaStream&)>) const;
     57    MediaStream* lookUp(const MediaStreamPrivate&) const;
    5958
    6059private:
    61     MediaStreamRegistry() = default;
     60    MediaStreamRegistry();
    6261    HashMap<String, RefPtr<MediaStream>> m_mediaStreams;
    6362};

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

    r216172 r216183  
    114114}
    115115
    116 void MediaStreamTrack::stopTrack(StopMode mode)
     116void MediaStreamTrack::stopTrack()
    117117{
    118118    // NOTE: this method is called when the "stop" method is called from JS, using the "ImplementedAs" IDL attribute.
    … …  
    122122        return;
    123123
    124     // An 'ended' event is not posted if m_ended is true when trackEnded is called, so set it now if we are
    125     // not supposed to post the event.
    126     if (mode == StopMode::Silently)
    127         m_ended = true;
    128 
     124    m_ended = true;
    129125    m_private->endTrack();
    130     m_ended = true;
    131126}
    132127
    … …  
    309304void MediaStreamTrack::trackMutedChanged(MediaStreamTrackPrivate&)
    310305{
    311     if (scriptExecutionContext()->activeDOMObjectsAreSuspended() || scriptExecutionContext()->activeDOMObjectsAreStopped() || m_ended)
     306    if (scriptExecutionContext()->activeDOMObjectsAreSuspended() || scriptExecutionContext()->activeDOMObjectsAreStopped())
    312307        return;
    313308

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h

    r216172 r216183  
    7272
    7373    Ref<MediaStreamTrack> clone();
    74 
    75     enum class StopMode { Silently, PostEvent };
    76     void stopTrack(StopMode = StopMode::Silently);
     74    void stopTrack();
    7775
    7876    bool isCaptureTrack() const;

  • trunk/Source/WebCore/dom/Document.cpp

    r216172 r216183  
    272272#endif
    273273
    274 #if ENABLE(MEDIA_STREAM)
    275 #include "MediaStream.h"
    276 #include "MediaStreamRegistry.h"
    277 #endif
    278 
    279274using namespace WTF;
    280275using namespace Unicode;
    … …  
    69786973}
    69796974
    6980 #if ENABLE(MEDIA_STREAM)
    6981 void Document::stopMediaCapture()
    6982 {
    6983     MediaStreamRegistry::shared().forEach([this](MediaStream& stream) {
    6984         if (stream.document() == this)
    6985             stream.endStream();
    6986     });
    6987 }
    6988 #endif
    6989 
    69906975} // namespace WebCore

  • trunk/Source/WebCore/dom/Document.h

    r216172 r216183  
    12781278    void setDeviceIDHashSalt(const String& salt) { m_idHashSalt = salt; }
    12791279    String deviceIDHashSalt() const { return m_idHashSalt; }
    1280     void stopMediaCapture();
    12811280#endif
    12821281

  • trunk/Source/WebCore/page/Page.cpp

    r216172 r216183  
    15331533}
    15341534
    1535 void Page::stopMediaCapture()
    1536 {
    1537 #if ENABLE(MEDIA_STREAM)
    1538     for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
    1539         if (!frame->document())
    1540             continue;
    1541 
    1542         frame->document()->stopMediaCapture();
    1543     }
    1544 #endif
    1545 }
    1546 
    15471535#if ENABLE(MEDIA_SESSION)
    15481536void Page::handleMediaEvent(MediaEventType eventType)

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

    r216172 r216183  
    531531    bool isMediaCaptureMuted() const { return m_mutedState & MediaProducer::CaptureDevicesAreMuted; };
    532532    WEBCORE_EXPORT void setMuted(MediaProducer::MutedStateFlags);
    533     WEBCORE_EXPORT void stopMediaCapture();
    534533
    535534#if ENABLE(MEDIA_SESSION)

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm

    r216172 r216183  
    581581MediaPlayerPrivateMediaStreamAVFObjC::DisplayMode MediaPlayerPrivateMediaStreamAVFObjC::currentDisplayMode() const
    582582{
    583     if (m_intrinsicSize.isEmpty() || !metaDataAvailable() || !m_sampleBufferDisplayLayer)
     583    if (m_ended || m_intrinsicSize.isEmpty() || !metaDataAvailable() || !m_sampleBufferDisplayLayer)
    584584        return None;
    585585
    586586    if (auto* track = m_mediaStreamPrivate->activeVideoTrack()) {
    587         if (!track->enabled() || track->muted() || track->ended())
     587        if (!track->enabled() || track->muted())
    588588            return PaintItBlack;
    589589    }
    590590
    591     if (playing() && !m_ended) {
     591    if (playing()) {
    592592        if (!m_mediaStreamPrivate->isProducingData())
    593593            return PausedImage;
    … …  
    595595    }
    596596
    597     if (m_playbackState == PlaybackState::None || m_ended)
     597    if (m_playbackState == PlaybackState::None)
    598598        return PaintItBlack;
    599599
    … …  
    769769        if (ended != m_ended) {
    770770            m_ended = ended;
    771             if (m_player) {
     771            if (m_player)
    772772                m_player->timeChanged();
    773                 m_player->characteristicChanged();
    774             }
    775773        }
    776774    });

  • trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h

    r216172 r216183  
    9696    bool isProducingData() const;
    9797
    98     void endStream();
    99 
    10098    bool hasVideo() const;
    10199    bool hasAudio() const;

  • trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm

    r216172 r216183  
    182182void AVMediaCaptureSource::stopProducingData()
    183183{
    184     if (!m_session)
     184    if (!m_session || ![m_session isRunning])
    185185        return;
    186186
    187187    [m_objcObserver removeNotificationObservers];
    188 
    189     if ([m_session isRunning])
    190         [m_session stopRunning];
    191 
     188    [m_session stopRunning];
    192189#if PLATFORM(IOS)
    193190    m_session = nullptr;

  • trunk/Source/WebKit2/ChangeLog

    r216182 r216183  
     12017-05-04  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r216172.
     4        https://bugs.webkit.org/show_bug.cgi?id=171654
     5
     6        FTBFS for iOS due to missing WebPageProxy::stopMediaCapture()
     7        implementation. (Requested by ddkilzer on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[MediaStream] Allow host application to enable/disable media
     12        capture"
     13        https://bugs.webkit.org/show_bug.cgi?id=171292
     14        http://trac.webkit.org/changeset/216172
     15
    1162017-05-04  Carlos Garcia Campos  <cgarcia@igalia.com>
    217

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

    r216172 r216183  
    26782678}
    26792679
    2680 void WKPageSetMediaCaptureEnabled(WKPageRef page, bool enabled)
    2681 {
    2682     toImpl(page)->setMediaCaptureEnabled(enabled);
    2683 }
    2684 
    2685 bool WKPageGetMediaCaptureEnabled(WKPageRef page)
    2686 {
    2687     return toImpl(page)->mediaCaptureEnabled();
    2688 }
    2689 
    26902680void WKPageDidAllowPointerLock(WKPageRef page)
    26912681{

  • trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h

    r216172 r216183  
    128128
    129129WK_EXPORT void WKPageClearUserMediaState(WKPageRef page);
    130 WK_EXPORT void WKPageSetMediaCaptureEnabled(WKPageRef page, bool enabled);
    131 WK_EXPORT bool WKPageGetMediaCaptureEnabled(WKPageRef page);
    132130
    133131WK_EXPORT void WKPageDidAllowPointerLock(WKPageRef page);

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r216172 r216183  
    44744474}
    44754475
    4476 - (void)_setMediaCaptureEnabled:(BOOL)enabled
    4477 {
    4478     _page->setMediaCaptureEnabled(enabled);
    4479 }
    4480 
    4481 - (BOOL)_mediaCaptureEnabled
    4482 {
    4483     return _page->mediaCaptureEnabled();
    4484 }
    4485 
    44864476- (void)_setPageMuted:(_WKMediaMutedState)mutedState
    44874477{

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

    r216172 r216183  
    293293@property (nonatomic, readonly) BOOL _isInFullscreen WK_API_AVAILABLE(macosx(WK_MAC_TBA));
    294294
    295 - (void)_muteMediaCapture WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     295- (void)_muteMediaCapture;
    296296- (void)_setPageMuted:(_WKMediaMutedState)mutedState WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    297 
    298 @property (nonatomic, setter=_setMediaCaptureEnabled:) BOOL _mediaCaptureEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    299297
    300298@end

  • trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm

    r216172 r216183  
    116116    m_delegateMethods.webViewActionsForElementDefaultActions = [delegate respondsToSelector:@selector(_webView:actionsForElement:defaultActions:)];
    117117    m_delegateMethods.webViewDidNotHandleTapAsClickAtPoint = [delegate respondsToSelector:@selector(_webView:didNotHandleTapAsClickAtPoint:)];
    118     m_delegateMethods.presentingViewControllerForWebView = [delegate respondsToSelector:@selector(_presentingViewControllerForWebView:)];
    119 #endif
    120118    m_delegateMethods.webViewRequestUserMediaAuthorizationForDevicesURLMainFrameURLDecisionHandler = [delegate respondsToSelector:@selector(_webView:requestUserMediaAuthorizationForDevices:url:mainFrameURL:decisionHandler:)];
    121119    m_delegateMethods.webViewCheckUserMediaPermissionForURLMainFrameURLFrameIdentifierDecisionHandler = [delegate respondsToSelector:@selector(_webView:checkUserMediaPermissionForURL:mainFrameURL:frameIdentifier:decisionHandler:)];
    122120    m_delegateMethods.webViewMediaCaptureStateDidChange = [delegate respondsToSelector:@selector(_webView:mediaCaptureStateDidChange:)];
     121    m_delegateMethods.presentingViewControllerForWebView = [delegate respondsToSelector:@selector(_presentingViewControllerForWebView:)];
     122#endif
    123123    m_delegateMethods.dataDetectionContextForWebView = [delegate respondsToSelector:@selector(_dataDetectionContextForWebView:)];
    124124    m_delegateMethods.webViewImageOrMediaDocumentSizeChanged = [delegate respondsToSelector:@selector(_webView:imageOrMediaDocumentSizeChanged:)];

  • trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp

    r216172 r216183  
    9797UserMediaPermissionRequestManagerProxy::UserMediaPermissionRequestManagerProxy(WebPageProxy& page)
    9898    : m_page(page)
    99     , m_rejectionTimer(*this, &UserMediaPermissionRequestManagerProxy::rejectionTimerFired)
    10099{
    101100#if ENABLE(MEDIA_STREAM)
    … …  
    109108    UserMediaProcessManager::singleton().removeUserMediaPermissionRequestManagerProxy(*this);
    110109#endif
    111     invalidatePendingRequests();
    112 }
    113 
    114 void UserMediaPermissionRequestManagerProxy::invalidatePendingRequests()
     110    invalidateRequests();
     111}
     112
     113void UserMediaPermissionRequestManagerProxy::invalidateRequests()
    115114{
    116115    for (auto& request : m_pendingUserMediaRequests.values())
    … …  
    125124}
    126125
    127 void UserMediaPermissionRequestManagerProxy::stopCapture()
    128 {
    129     invalidatePendingRequests();
    130     m_page.process().send(Messages::WebPage::StopMediaCapture(), m_page.pageID());
    131 }
    132 
    133126void UserMediaPermissionRequestManagerProxy::clearCachedState()
    134127{
    135     invalidatePendingRequests();
     128    invalidateRequests();
    136129}
    137130
    … …  
    229222    UNUSED_PARAM(videoDeviceUID);
    230223#endif
    231 }
    232 
    233 void UserMediaPermissionRequestManagerProxy::rejectionTimerFired()
    234 {
    235     uint64_t userMediaID = m_pendingRejections[0];
    236     m_pendingRejections.remove(0);
    237 
    238     denyRequest(userMediaID, UserMediaPermissionRequestProxy::UserMediaAccessDenialReason::PermissionDenied, emptyString());
    239     if (!m_pendingRejections.isEmpty())
    240         scheduleNextRejection();
    241 }
    242 
    243 void UserMediaPermissionRequestManagerProxy::scheduleNextRejection()
    244 {
    245     const double mimimumDelayBeforeReplying = .25;
    246     if (!m_rejectionTimer.isActive())
    247         m_rejectionTimer.startOneShot(Seconds(mimimumDelayBeforeReplying + randomNumber()));
    248224}
    249225
    … …  
    297273    };
    298274
    299     if (!UserMediaProcessManager::singleton().captureEnabled()) {
    300         m_pendingRejections.append(userMediaID);
    301         scheduleNextRejection();
    302         return;
    303     }
    304 
    305275    auto audioConstraints = MediaConstraintsImpl::create(MediaConstraintsData(audioConstraintsData));
    306276    auto videoConstraints = MediaConstraintsImpl::create(MediaConstraintsData(videoConstraintsData));

  • trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h

    r216172 r216183  
    1818 */
    1919
    20 #pragma once
     20#ifndef UserMediaPermissionRequestManagerProxy_h
     21#define UserMediaPermissionRequestManagerProxy_h
    2122
    2223#include "UserMediaPermissionCheckProxy.h"
    2324#include "UserMediaPermissionRequestProxy.h"
    2425#include <WebCore/SecurityOrigin.h>
    25 #include <WebCore/Timer.h>
    2626#include <WebCore/UserMediaRequest.h>
    2727#include <wtf/HashMap.h>
    28 #include <wtf/Seconds.h>
    2928
    3029namespace WebCore {
    … …  
    5958    WebPageProxy& page() const { return m_page; }
    6059
    61     void invalidatePendingRequests();
     60    void invalidateRequests();
    6261
    6362    void requestUserMediaPermissionForFrame(uint64_t userMediaID, uint64_t frameID, String userMediaDocumentOriginIdentifier, String topLevelDocumentOriginIdentifier, const WebCore::MediaConstraintsData& audioConstraintsData, const WebCore::MediaConstraintsData& videoConstraintsData);
    … …  
    7170    void didCompleteUserMediaPermissionCheck(uint64_t, const String&, bool allow);
    7271
    73     void stopCapture();
    74     void scheduleNextRejection();
    75     void rejectionTimerFired();
    7672    void clearCachedState();
    7773
    … …  
    9086
    9187    WebPageProxy& m_page;
    92 
    93     WebCore::Timer m_rejectionTimer;
    94     Vector<uint64_t> m_pendingRejections;
    9588};
    9689
    9790} // namespace WebKit
    9891
     92#endif // UserMediaPermissionRequestManagerProxy_h

  • trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.cpp

    r216172 r216183  
    116116        for (auto& manager : state.value->managers()) {
    117117
    118             if (&manager->page() == &pageStartingCapture) {
    119 #if PLATFORM(IOS)
    120                 manager->page().stopMediaCapture();
    121 #endif
     118            if (&manager->page() == &pageStartingCapture)
    122119                continue;
    123             }
    124120
    125121            manager->page().setMuted(WebCore::MediaProducer::CaptureDevicesAreMuted);
    … …  
    235231}
    236232
    237 void UserMediaProcessManager::setCaptureEnabled(bool enabled)
    238 {
    239     if (enabled == m_captureEnabled)
    240         return;
    241 
    242     m_captureEnabled = enabled;
    243 
    244     if (enabled)
    245         return;
    246 
    247     for (auto& state : stateMap()) {
    248         for (auto& manager : state.value->managers())
    249             manager->stopCapture();
    250     }
    251 }
    252 
    253233} // namespace WebKit
    254234

  • trunk/Source/WebKit2/UIProcess/UserMediaProcessManager.h

    r216172 r216183  
    4040    void startedCaptureSession(UserMediaPermissionRequestManagerProxy&);
    4141    void endedCaptureSession(UserMediaPermissionRequestManagerProxy&);
    42 
    43     void setCaptureEnabled(bool);
    44     bool captureEnabled() const { return m_captureEnabled; }
    45 
    46 private:
    47     bool m_captureEnabled { true };
    4842};
    4943

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r216172 r216183  
    42074207}
    42084208
    4209 void WebPageProxy::setMediaCaptureEnabled(bool enabled)
    4210 {
    4211     m_mediaCaptureEnabled = enabled;
    4212 
    4213     if (!isValid())
    4214         return;
    4215 
    4216 #if ENABLE(MEDIA_STREAM)
    4217     UserMediaProcessManager::singleton().setCaptureEnabled(enabled);
    4218 #endif
    4219 }
    4220 
    42214209#if ENABLE(MEDIA_SESSION)
    42224210void WebPageProxy::handleMediaEvent(MediaEventType eventType)

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r216172 r216183  
    980980    void setMayStartMediaWhenInWindow(bool);
    981981    bool mayStartMediaWhenInWindow() const { return m_mayStartMediaWhenInWindow; }
    982     void setMediaCaptureEnabled(bool);
    983     bool mediaCaptureEnabled() const { return m_mediaCaptureEnabled; }
    984 
    985982       
    986983#if ENABLE(MEDIA_SESSION)
    … …  
    19391936    WebCore::MediaProducer::MutedStateFlags m_mutedState { WebCore::MediaProducer::NoneMuted };
    19401937    bool m_mayStartMediaWhenInWindow;
    1941     bool m_mediaCaptureEnabled { true };
    19421938
    19431939    bool m_waitingForDidUpdateActivityState;

  • trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp

    r216172 r216183  
    5757}
    5858
    59 void UserMediaPermissionRequestManager::cancelPendingRequests()
    60 {
    61     for (auto& request : m_idToUserMediaRequestMap.values())
    62         cancelUserMediaRequest(*request);
    63 
    64     for (auto& request : m_idToMediaDevicesEnumerationRequestMap.values())
    65         cancelMediaDevicesEnumeration(*request);
    66 }
    67 
    6859void UserMediaPermissionRequestManager::startUserMediaRequest(UserMediaRequest& request)
    6960{
    … …  
    114105    if (!requestID)
    115106        return;
    116 
    117     request.deny(UserMediaRequest::OtherFailure, emptyString());
    118107    m_idToUserMediaRequestMap.remove(requestID);
    119108    removeMediaRequestFromMaps(request);
    … …  
    202191    if (!requestID)
    203192        return;
    204     request.setDeviceInfo(Vector<CaptureDevice>(), emptyString(), false);
    205193    m_idToMediaDevicesEnumerationRequestMap.remove(requestID);
    206194}

  • trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h

    r216172 r216183  
    5656    void revokeUserMediaDeviceSandboxExtensions(const Vector<String>&);
    5757
    58     void cancelPendingRequests();
    59 
    6058private:
    6159    void sendUserMediaRequest(WebCore::UserMediaRequest&);

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r216172 r216183  
    45574557}
    45584558
    4559 void WebPage::stopMediaCapture()
    4560 {
    4561 #if ENABLE(MEDIA_STREAM)
    4562     m_page->stopMediaCapture();
    4563 #endif
    4564 }
    4565 
    45664559#if ENABLE(MEDIA_SESSION)
    45674560void WebPage::handleMediaEvent(uint32_t eventType)

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r216172 r216183  
    766766    void setMuted(WebCore::MediaProducer::MutedStateFlags);
    767767    void setMayStartMediaWhenInWindow(bool);
    768     void stopMediaCapture();
    769768
    770769#if ENABLE(MEDIA_SESSION)

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

    r216172 r216183  
    339339    SetMuted(WebCore::MediaProducer::MutedStateFlags muted)
    340340    SetMayStartMediaWhenInWindow(bool mayStartMedia)
    341     StopMediaCapture()
    342341
    343342#if ENABLE(MEDIA_SESSION)

  • trunk/Tools/ChangeLog

    r216179 r216183  
     12017-05-04  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r216172.
     4        https://bugs.webkit.org/show_bug.cgi?id=171654
     5
     6        FTBFS for iOS due to missing WebPageProxy::stopMediaCapture()
     7        implementation. (Requested by ddkilzer on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[MediaStream] Allow host application to enable/disable media
     12        capture"
     13        https://bugs.webkit.org/show_bug.cgi?id=171292
     14        http://trac.webkit.org/changeset/216172
     15
    1162017-05-04  Carlos Garcia Campos  <cgarcia@igalia.com>
    217

  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r216172 r216183  
    2626                07492B3C1DF8B86600633DE1 /* enumerateMediaDevices.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 07492B391DF8ADA400633DE1 /* enumerateMediaDevices.html */; };
    2727                074994421EA5034B000DA44E /* getUserMedia.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 4A410F4D19AF7BEF002EBAB5 /* getUserMedia.html */; };
    28                 0799C3491EBA2D7B003B7532 /* UserMediaDisabled.mm in Sources */ = {isa = PBXBuildFile; fileRef = 07EDEFAC1EB9400C00D43292 /* UserMediaDisabled.mm */; };
    29                 0799C34B1EBA3301003B7532 /* disableGetUserMedia.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 0799C34A1EBA32F4003B7532 /* disableGetUserMedia.html */; };
    3028                07C046CA1E4262A8007201E7 /* CARingBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C046C91E42573E007201E7 /* CARingBuffer.cpp */; };
    3129                0F139E771A423A5B00F590F5 /* WeakObjCPtr.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F139E751A423A5300F590F5 /* WeakObjCPtr.mm */; };
    … …  
    690688                                55226A2F1EBA44B900C36AD0 /* large-red-square-image.html in Copy Resources */,
    691689                                5797FE331EB15AB100B2F4A0 /* navigation-client-default-crypto.html in Copy Resources */,
    692                                 0799C34B1EBA3301003B7532 /* disableGetUserMedia.html in Copy Resources */,
    693690                                074994421EA5034B000DA44E /* getUserMedia.html in Copy Resources */,
    694691                                C9BF06EF1E9C132500595E3E /* autoplay-muted-with-controls.html in Copy Resources */,
    … …  
    883880                07492B3A1DF8AE2D00633DE1 /* EnumerateMediaDevices.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EnumerateMediaDevices.cpp; sourceTree = "<group>"; };
    884881                0766DD1F1A5AD5200023E3BB /* PendingAPIRequestURL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PendingAPIRequestURL.cpp; sourceTree = "<group>"; };
    885                 0799C34A1EBA32F4003B7532 /* disableGetUserMedia.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = disableGetUserMedia.html; sourceTree = "<group>"; };
    886882                07C046C91E42573E007201E7 /* CARingBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CARingBuffer.cpp; sourceTree = "<group>"; };
    887                 07EDEFAC1EB9400C00D43292 /* UserMediaDisabled.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UserMediaDisabled.mm; sourceTree = "<group>"; };
    888883                0BCD833414857CE400EA2003 /* HashMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HashMap.cpp; sourceTree = "<group>"; };
    889884                0BCD85691485C98B00EA2003 /* SetForScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetForScope.cpp; sourceTree = "<group>"; };
    … …  
    16771672                                A16F66B81C40E9E100BD4D24 /* Resources */,
    16781673                                7CEFA9641AC0B9E200B910FD /* _WKUserContentExtensionStore.mm */,
    1679                                 07EDEFAC1EB9400C00D43292 /* UserMediaDisabled.mm */,
    16801674                                37E7DD631EA06FF2009B396D /* AdditionalReadAccessAllowedURLs.mm */,
    16811675                                37E7DD661EA071F3009B396D /* AdditionalReadAccessAllowedURLsPlugin.mm */,
    … …  
    19031897                                A16F66B91C40EA2000BD4D24 /* ContentFiltering.html */,
    19041898                                5C2936941D5BFD1900DEAB1E /* CookieMessage.html */,
    1905                                 0799C34A1EBA32F4003B7532 /* disableGetUserMedia.html */,
    19061899                                837A35F01D9A1E6400663C57 /* DownloadRequestBlobURL.html */,
    19071900                                5714ECB81CA8B58800051AC8 /* DownloadRequestOriginalURL.html */,
    … …  
    30873080                                315231CA1EB3B3C700A22A16 /* GPUCommandQueue.mm in Sources */,
    30883081                                F4FA91811E61849B007B8C1D /* WKWebViewSelectionTests.mm in Sources */,
    3089                                 0799C3491EBA2D7B003B7532 /* UserMediaDisabled.mm in Sources */,
    30903082                                93F56DA91E5F919D003EDE84 /* WKWebViewSnapshot.mm in Sources */,
    30913083                                9984FACC1CFFAF60008D198C /* WKWebViewTextInput.mm in Sources */,
Note: See TracChangeset for help on using the changeset viewer.