⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 245971 in webkit


Ignore:
Timestamp:
May 31, 2019, 10:09:23 AM (7 years ago)
Author:
Kocsen Chung
Message:

Revert r245946. rdar://problem/47390407

Location:
branches/safari-608.1.27-branch
Files:
3 deleted
23 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-608.1.27-branch/LayoutTests/ChangeLog

    r245953 r245971  
     12019-05-31  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Revert r245946. rdar://problem/47390407
     4
    152019-05-30  Ryosuke Niwa  <rniwa@webkit.org>
    26

  • branches/safari-608.1.27-branch/Source/WebCore/ChangeLog

    r245960 r245971  
     12019-05-31  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Revert r245946. rdar://problem/47390407
     4
    152019-05-31  Joonghun Park  <jh718.park@samsung.com>
    26

  • branches/safari-608.1.27-branch/Source/WebCore/SourcesCocoa.txt

    r245946 r245971  
    543543platform/mediastream/mac/RealtimeIncomingVideoSourceCocoa.mm
    544544platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp
    545 platform/mediastream/mac/RealtimeMediaSourceCenterMac.mm
    546545platform/mediastream/mac/RealtimeOutgoingAudioSourceCocoa.cpp
    547546platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.cpp

  • branches/safari-608.1.27-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r245946 r245971  
    72797279                4162A4551011464700DFF3ED /* JSDedicatedWorkerGlobalScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDedicatedWorkerGlobalScope.cpp; sourceTree = "<group>"; };
    72807280                4162A4561011464700DFF3ED /* JSDedicatedWorkerGlobalScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDedicatedWorkerGlobalScope.h; sourceTree = "<group>"; };
    7281                 416CE4A4229DF12E00A8A686 /* RealtimeMediaSourceCenterMac.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RealtimeMediaSourceCenterMac.mm; sourceTree = "<group>"; };
    72827281                416D759F20C6441300D02D2C /* NetworkLoadInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkLoadInformation.h; sourceTree = "<group>"; };
    72837282                416E0B37209BC3C2004A95D9 /* FetchIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FetchIdentifier.h; sourceTree = "<group>"; };
    … …  
    1588415883                                5CDD83391E4324BB00621E83 /* RealtimeIncomingVideoSourceCocoa.mm */,
    1588515884                                4A0FFAA31AAF5EF60062803B /* RealtimeMediaSourceCenterMac.cpp */,
    15886                                 416CE4A4229DF12E00A8A686 /* RealtimeMediaSourceCenterMac.mm */,
    1588715885                                41103AA71E39790A00769F14 /* RealtimeOutgoingAudioSourceCocoa.cpp */,
    1588815886                                41103AA81E39790A00769F14 /* RealtimeOutgoingAudioSourceCocoa.h */,
    … …  
    1638916387                        isa = PBXGroup;
    1639016388                        children = (
     16389                                6F0CD694229ED32700C5994E /* InlineLine.h */,
     16390                                6F0CD692229ED31900C5994E /* InlineLine.cpp */,
    1639116391                                6FE7DDDD20EC6E8B008B5B4E /* text */,
    1639216392                                6F7CA3C9208C2B2E002F29AB /* InlineFormattingContext.cpp */,
    … …  
    1639916399                                1123AFDC209ABBBA00736ACC /* InlineInvalidation.h */,
    1640016400                                6FE7CFA02177EEF1005B1573 /* InlineItem.h */,
    16401                                 6F0CD692229ED31900C5994E /* InlineLine.cpp */,
    16402                                 6F0CD694229ED32700C5994E /* InlineLine.h */,
    1640316401                                6FB47E612277425A00C7BCB0 /* InlineLineBox.h */,
    1640416402                                6FE198132178397B00446F08 /* InlineLineBreaker.cpp */,
    … …  
    2819428192                                714C7C671FDAD2A900F2BEE1 /* AnimationPlaybackEventInit.h in Headers */,
    2819528193                                71025ECD1F99F0CE004A250C /* AnimationTimeline.h in Headers */,
     28194                                6F0CD695229ED32700C5994E /* InlineLine.h in Headers */,
    2819628195                                0F580FAF149800D400FB5BD8 /* AnimationUtilities.h in Headers */,
    2819728196                                57152B5A21CB3E88000C37CA /* ApduCommand.h in Headers */,
    … …  
    2949929498                                6FE7CFA22177EEF2005B1573 /* InlineItem.h in Headers */,
    2950029499                                BCE789161120D6080060ECE5 /* InlineIterator.h in Headers */,
    29501                                 6F0CD695229ED32700C5994E /* InlineLine.h in Headers */,
    2950229500                                6FB47E632277425A00C7BCB0 /* InlineLineBox.h in Headers */,
    2950329501                                6FE198172178397C00446F08 /* InlineLineBreaker.h in Headers */,

  • branches/safari-608.1.27-branch/Source/WebCore/dom/Document.cpp

    r245958 r245971  
    76497649        return;
    76507650
    7651     RealtimeMediaSourceCenter::singleton().setCapturePageState(hidden(), page()->isMediaCaptureMuted());
     7651    RealtimeMediaSourceCenter::singleton().setVideoCapturePageState(hidden(), page()->isMediaCaptureMuted());
    76527652#endif
    76537653}

  • branches/safari-608.1.27-branch/Source/WebCore/page/RuntimeEnabledFeatures.h

    r245946 r245971  
    357357    bool pageAtRuleSupportEnabled() const { return m_pageAtRuleSupportEnabled; }
    358358    void setPageAtRuleSupportEnabled(bool isEnabled) { m_pageAtRuleSupportEnabled = isEnabled; }
    359 
    360     bool interruptAudioOnPageVisibilityChangeEnabled() const { return m_interruptAudioOnPageVisibilityChangeEnabled; }
    361     void setInterruptAudioOnPageVisibilityChangeEnabled(bool enabled) { m_interruptAudioOnPageVisibilityChangeEnabled = enabled; }
    362359
    363360    WEBCORE_EXPORT static RuntimeEnabledFeatures& sharedFeatures();
    … …  
    544541
    545542    bool m_referrerPolicyAttributeEnabled { false };
    546     bool m_interruptAudioOnPageVisibilityChangeEnabled { false };
    547543
    548544    friend class WTF::NeverDestroyed<RuntimeEnabledFeatures>;

  • branches/safari-608.1.27-branch/Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp

    r245946 r245971  
    3939#include "Logging.h"
    4040#include "MediaStreamPrivate.h"
    41 #include "RuntimeEnabledFeatures.h"
    4241#include <wtf/SHA1.h>
    4342
    … …  
    264263}
    265264
    266 void RealtimeMediaSourceCenter::setCapturePageState(bool interrupted, bool pageMuted)
    267 {
    268     if (RuntimeEnabledFeatures::sharedFeatures().interruptAudioOnPageVisibilityChangeEnabled())
    269         audioCaptureFactory().setAudioCapturePageState(interrupted, pageMuted);
     265void RealtimeMediaSourceCenter::setVideoCapturePageState(bool interrupted, bool pageMuted)
     266{
    270267    videoCaptureFactory().setVideoCapturePageState(interrupted, pageMuted);
    271268}
    … …  
    321318}
    322319
    323 #if !PLATFORM(COCOA)
    324 bool RealtimeMediaSourceCenter::shouldInterruptAudioOnPageVisibilityChange()
    325 {
    326     return false;
    327 }
    328 #endif
    329 
    330320} // namespace WebCore
    331321

  • branches/safari-608.1.27-branch/Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.h

    r245946 r245971  
    8787    WEBCORE_EXPORT void setDevicesChangedObserver(std::function<void()>&&);
    8888
    89     void setCapturePageState(bool interrupted, bool pageMuted);
     89    void setVideoCapturePageState(bool, bool);
    9090
    9191    void captureDevicesChanged();
    92 
    93     WEBCORE_EXPORT static bool shouldInterruptAudioOnPageVisibilityChange();
    9492
    9593private:
    … …  
    116114    VideoCaptureFactory* m_videoCaptureFactoryOverride { nullptr };
    117115    DisplayCaptureFactory* m_displayCaptureFactoryOverride { nullptr };
    118 
    119     bool m_shouldInterruptAudioOnPageVisibilityChange { false };
    120116};
    121117

  • branches/safari-608.1.27-branch/Source/WebCore/platform/mediastream/RealtimeMediaSourceFactory.h

    r245946 r245971  
    5858    virtual CaptureSourceOrError createAudioCaptureSource(const CaptureDevice&, String&&, const MediaConstraints*) = 0;
    5959    virtual CaptureDeviceManager& audioCaptureDeviceManager() = 0;
    60     virtual void setAudioCapturePageState(bool interrupted, bool pageMuted)
    61     {
    62         UNUSED_PARAM(interrupted);
    63         UNUSED_PARAM(pageMuted);
    64     }
    6560
    6661protected:
    … …  
    7772    virtual CaptureSourceOrError createVideoCaptureSource(const CaptureDevice&, String&&, const MediaConstraints*) = 0;
    7873    virtual CaptureDeviceManager& videoCaptureDeviceManager() = 0;
    79     virtual void setVideoCapturePageState(bool interrupted, bool pageMuted)
    80     {
    81         UNUSED_PARAM(interrupted);
    82         UNUSED_PARAM(pageMuted);
    83     }
     74    virtual void setVideoCapturePageState(bool, bool) { }
    8475
    8576protected:
    … …  
    9283    virtual CaptureSourceOrError createDisplayCaptureSource(const CaptureDevice&, const MediaConstraints*) = 0;
    9384    virtual CaptureDeviceManager& displayCaptureDeviceManager() = 0;
     85    virtual void setDisplayCapturePageState(bool , bool) { }
    9486
    9587protected:

  • branches/safari-608.1.27-branch/Source/WebCore/platform/mediastream/ios/CoreAudioCaptureSourceIOS.mm

    r245946 r245971  
    127127}
    128128
    129 void CoreAudioCaptureSourceFactory::setAudioCapturePageState(bool interrupted, bool pageMuted)
    130 {
    131     if (auto* activeSource = this->activeSource())
    132         activeSource->setInterrupted(interrupted, pageMuted);
    133 }
    134 
    135129}
    136130

  • branches/safari-608.1.27-branch/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.h

    r245946 r245971  
    143143
    144144    CaptureDeviceManager& audioCaptureDeviceManager() final;
    145 #if PLATFORM(IOS_FAMILY)
    146     void setAudioCapturePageState(bool interrupted, bool pageMuted) final;
    147 #endif
    148145};
    149146

  • branches/safari-608.1.27-branch/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp

    r245946 r245971  
    3939#include "Logging.h"
    4040#include "MediaStreamPrivate.h"
    41 #include "RuntimeEnabledFeatures.h"
    4241#include "ScreenDisplayCaptureSourceMac.h"
    4342#include "WindowDisplayCaptureSourceMac.h"

  • branches/safari-608.1.27-branch/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp

    r245946 r245971  
    9797private:
    9898#if PLATFORM(IOS_FAMILY)
    99     void setVideoCapturePageState(bool interrupted, bool pageMuted) final
     99    void setVideoCapturePageState(bool interrupted, bool pageMuted)
    100100    {
    101101        if (activeSource())
    … …  
    140140    }
    141141private:
    142 #if PLATFORM(IOS_FAMILY)
    143     void setAudioCapturePageState(bool interrupted, bool pageMuted) final
    144     {
    145         if (activeSource())
    146             activeSource()->setInterrupted(interrupted, pageMuted);
    147     }
    148 #endif
    149142    CaptureDeviceManager& audioCaptureDeviceManager() final { return MockRealtimeMediaSourceCenter::singleton().audioCaptureDeviceManager(); }
    150143};

  • branches/safari-608.1.27-branch/Source/WebCore/testing/Internals.cpp

    r245947 r245971  
    533533
    534534    MediaEngineConfigurationFactory::disableMock();
    535 
    536 #if ENABLE(MEDIA_STREAM)
    537     RuntimeEnabledFeatures::sharedFeatures().setInterruptAudioOnPageVisibilityChangeEnabled(false);
    538 #endif
    539535}
    540536
    … …  
    15071503
    15081504#if ENABLE(MEDIA_STREAM)
    1509 void Internals::setShouldInterruptAudioOnPageVisibilityChange(bool shouldInterrupt)
    1510 {
    1511     RuntimeEnabledFeatures::sharedFeatures().setInterruptAudioOnPageVisibilityChangeEnabled(shouldInterrupt);
    1512 }
    15131505
    15141506void Internals::setMockMediaCaptureDevicesEnabled(bool enabled)

  • branches/safari-608.1.27-branch/Source/WebCore/testing/Internals.h

    r245947 r245971  
    517517
    518518#if ENABLE(MEDIA_STREAM)
    519     void setShouldInterruptAudioOnPageVisibilityChange(bool);
    520519    void setMockMediaCaptureDevicesEnabled(bool);
    521520    void setMediaCaptureRequiresSecureConnection(bool);

  • branches/safari-608.1.27-branch/Source/WebCore/testing/Internals.idl

    r245947 r245971  
    673673    [Conditional=WEB_RTC] void applyRotationForOutgoingVideoSources(RTCPeerConnection connection);
    674674
    675     [Conditional=MEDIA_STREAM] void setShouldInterruptAudioOnPageVisibilityChange(boolean shouldInterrupt);
    676675    [Conditional=MEDIA_STREAM] void setCameraMediaStreamTrackOrientation(MediaStreamTrack track, short orientation);
    677676    [Conditional=MEDIA_STREAM] void observeMediaStreamTrack(MediaStreamTrack track);

  • branches/safari-608.1.27-branch/Source/WebKit/ChangeLog

    r245957 r245971  
     12019-05-31  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Revert r245946. rdar://problem/47390407
     4
    152019-05-31  Carlos Garcia Campos  <cgarcia@igalia.com>
    26

  • branches/safari-608.1.27-branch/Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb

    r245946 r245971  
    3737#include <WebCore/DeprecatedGlobalSettings.h>
    3838#include <WebCore/LibWebRTCProvider.h>
    39 #include <WebCore/RealtimeMediaSourceCenter.h>
    4039#include <WebCore/SecurityOrigin.h>
    4140#include <WebCore/Settings.h>

  • branches/safari-608.1.27-branch/Source/WebKit/Shared/WebPreferences.yaml

    r245946 r245971  
    546546  condition: ENABLE(WEB_RTC)
    547547
    548 InterruptAudioOnPageVisibilityChangeEnabled:
    549   type: bool
    550   defaultValue: WebCore::RealtimeMediaSourceCenter::shouldInterruptAudioOnPageVisibilityChange()
    551   webcoreBinding: RuntimeEnabledFeatures
    552   condition: ENABLE(MEDIA_STREAM)
    553 
    554548WebRTCUnifiedPlanEnabled:
    555549  type: bool

  • branches/safari-608.1.27-branch/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm

    r245946 r245971  
    650650}
    651651
    652 - (BOOL)_interruptAudioOnPageVisibilityChangeEnabled
    653 {
    654     return _preferences->interruptAudioOnPageVisibilityChangeEnabled();
    655 }
    656 
    657 - (void)_setInterruptAudioOnPageVisibilityChangeEnabled:(BOOL)enabled
    658 {
    659     _preferences->setInterruptAudioOnPageVisibilityChangeEnabled(enabled);
    660 }
    661 
    662652- (BOOL)_enumeratingAllNetworkInterfacesEnabled
    663653{

  • branches/safari-608.1.27-branch/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h

    r245946 r245971  
    121121@property (nonatomic, setter=_setWebRTCLegacyAPIEnabled:) BOOL _webRTCLegacyAPIEnabled WK_API_AVAILABLE(macos(10.13), ios(11.0));
    122122@property (nonatomic, setter=_setInactiveMediaCaptureSteamRepromptIntervalInMinutes:) double _inactiveMediaCaptureSteamRepromptIntervalInMinutes WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
    123 @property (nonatomic, setter=_setInterruptAudioOnPageVisibilityChangeEnabled:) BOOL _interruptAudioOnPageVisibilityChangeEnabled WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    124123
    125124@property (nonatomic, setter=_setJavaScriptCanAccessClipboard:) BOOL _javaScriptCanAccessClipboard WK_API_AVAILABLE(macos(10.13), ios(11.0));

  • branches/safari-608.1.27-branch/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp

    r245946 r245971  
    367367}
    368368
    369 #if PLATFORM(IOS)
    370 void UserMediaCaptureManager::setAudioCapturePageState(bool interrupted, bool pageMuted)
    371 {
    372     if (auto* activeSource = static_cast<AudioCaptureFactory*>(this)->activeSource())
    373         activeSource->setInterrupted(interrupted, pageMuted);
    374 }
    375 
    376 void UserMediaCaptureManager::setVideoCapturePageState(bool interrupted, bool pageMuted)
    377 {
    378     if (auto* activeSource = static_cast<VideoCaptureFactory*>(this)->activeSource())
    379         activeSource->setInterrupted(interrupted, pageMuted);
    380 }
     369}
     370
    381371#endif
    382 
    383 }
    384 
    385 #endif

  • branches/safari-608.1.27-branch/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.h

    r245946 r245971  
    8080    WebCore::CaptureDeviceManager& displayCaptureDeviceManager() final { return m_noOpCaptureDeviceManager; }
    8181
    82 #if PLATFORM(IOS_FAMILY)
    83     void setAudioCapturePageState(bool interrupted, bool pageMuted) final;
    84     void setVideoCapturePageState(bool interrupted, bool pageMuted) final;
    85 #endif
    86 
    8782    // IPC::MessageReceiver
    8883    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;
Note: See TracChangeset for help on using the changeset viewer.