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

Changeset 220045 in webkit


Ignore:
Timestamp:
Jul 29, 2017, 12:36:47 PM (9 years ago)
Author:
fpizlo@apple.com
Message:

Unreviewed, rollout r220044 because it set the bots on fire.

It seems that the "-Wunguarded-availability-new" pragma is not widely supported. So, a bunch of the
Mac bots are now unable to build and that includes EWS.

Fixing by rolling it out.

  • platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
  • platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
  • platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:

(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setHasAvailableAudioSample):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::addAudioRenderer):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::removeAudioRenderer):

  • platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h:
  • platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:

(-[WebAVSampleBufferErrorListener beginObservingRenderer:]):
(-[WebAVSampleBufferErrorListener stopObservingRenderer:]):
(-[WebAVSampleBufferErrorListener observeValueForKeyPath:ofObject:change:context:]):
(WebCore::SourceBufferPrivateAVFObjC::trackDidChangeEnabled):
(WebCore::SourceBufferPrivateAVFObjC::rendererDidReceiveError):
(WebCore::SourceBufferPrivateAVFObjC::flush):

Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r220044 r220045  
     12017-07-29  Filip Pizlo  <fpizlo@apple.com>
     2
     3        Unreviewed, rollout r220044 because it set the bots on fire.
     4       
     5        It seems that the "-Wunguarded-availability-new" pragma is not widely supported. So, a bunch of the
     6        Mac bots are now unable to build and that includes EWS.
     7       
     8        Fixing by rolling it out.
     9
     10        * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
     11        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
     12        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
     13        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setHasAvailableAudioSample):
     14        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::addAudioRenderer):
     15        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::removeAudioRenderer):
     16        * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h:
     17        * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
     18        (-[WebAVSampleBufferErrorListener beginObservingRenderer:]):
     19        (-[WebAVSampleBufferErrorListener stopObservingRenderer:]):
     20        (-[WebAVSampleBufferErrorListener observeValueForKeyPath:ofObject:change:context:]):
     21        (WebCore::SourceBufferPrivateAVFObjC::trackDidChangeEnabled):
     22        (WebCore::SourceBufferPrivateAVFObjC::rendererDidReceiveError):
     23        (WebCore::SourceBufferPrivateAVFObjC::flush):
     24
    1252017-07-29  Dan Bernstein  <mitz@apple.com>
    226

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h

    r220044 r220045  
    5555    // SourceBufferPrivateAVFObjCErrorClient
    5656    void layerDidReceiveError(AVSampleBufferDisplayLayer *, NSError *, bool& shouldIgnore) override;
    57 #pragma clang diagnostic push
    58 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    5957    void rendererDidReceiveError(AVSampleBufferAudioRenderer *, NSError *, bool& shouldIgnore) override;
    60 #pragma clang diagnostic pop
    6158
    6259    void addSourceBuffer(SourceBufferPrivateAVFObjC*);

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h

    r220044 r220045  
    7272    static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
    7373
    74 #pragma clang diagnostic push
    75 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    7674    void addAudioRenderer(AVSampleBufferAudioRenderer*);
    7775    void removeAudioRenderer(AVSampleBufferAudioRenderer*);
    78 #pragma clang diagnostic pop
    7976
    8077    MediaPlayer::NetworkState networkState() const override;
    … …  
    8986    void setHasAvailableVideoFrame(bool);
    9087    bool hasAvailableVideoFrame() const override;
    91 #pragma clang diagnostic push
    92 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    9388    void setHasAvailableAudioSample(AVSampleBufferAudioRenderer*, bool);
    94 #pragma clang diagnostic pop
    9589    bool allRenderersHaveAvailableSamples() const { return m_allRenderersHaveAvailableSamples; }
    9690    void updateAllRenderersHaveAvailableSamples();
    … …  
    259253        bool hasAudibleSample { false };
    260254    };
    261 #pragma clang diagnostic push
    262 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    263255    HashMap<RetainPtr<AVSampleBufferAudioRenderer>, AudioRendererProperties> m_sampleBufferAudioRendererMap;
    264256    RetainPtr<AVSampleBufferRenderSynchronizer> m_synchronizer;
    265 #pragma clang diagnostic pop
    266257    RetainPtr<id> m_timeJumpedObserver;
    267258    RetainPtr<id> m_durationObserver;

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

    r220044 r220045  
    6767SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVAsset)
    6868SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVURLAsset)
    69 #pragma clang diagnostic push
    70 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    7169SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVSampleBufferAudioRenderer)
    72 #pragma clang diagnostic pop
    7370SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVSampleBufferDisplayLayer)
    74 #pragma clang diagnostic push
    75 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    7671SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVSampleBufferRenderSynchronizer)
    77 #pragma clang diagnostic pop
    7872SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVStreamDataParser)
    7973SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVStreamSession);
    … …  
    800794}
    801795
    802 #pragma clang diagnostic push
    803 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    804796void MediaPlayerPrivateMediaSourceAVFObjC::setHasAvailableAudioSample(AVSampleBufferAudioRenderer* renderer, bool flag)
    805 #pragma clang diagnostic pop
    806797{
    807798    auto iter = m_sampleBufferAudioRendererMap.find(renderer);
    … …  
    1005996}
    1006997
    1007 #pragma clang diagnostic push
    1008 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    1009998void MediaPlayerPrivateMediaSourceAVFObjC::addAudioRenderer(AVSampleBufferAudioRenderer* audioRenderer)
    1010 #pragma clang diagnostic pop
    1011999{
    10121000    if (m_sampleBufferAudioRendererMap.contains(audioRenderer))
    … …  
    10231011}
    10241012
    1025 #pragma clang diagnostic push
    1026 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    10271013void MediaPlayerPrivateMediaSourceAVFObjC::removeAudioRenderer(AVSampleBufferAudioRenderer* audioRenderer)
    1028 #pragma clang diagnostic pop
    10291014{
    10301015    auto iter = m_sampleBufferAudioRendererMap.find(audioRenderer);

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h

    r220044 r220045  
    6969    virtual ~SourceBufferPrivateAVFObjCErrorClient() { }
    7070    virtual void layerDidReceiveError(AVSampleBufferDisplayLayer *, NSError *, bool& shouldIgnore) = 0;
    71 #pragma clang diagnostic push
    72 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    7371    virtual void rendererDidReceiveError(AVSampleBufferAudioRenderer *, NSError *, bool& shouldIgnore) = 0;
    74 #pragma clang diagnostic pop
    7572};
    7673
    … …  
    113110    void unregisterForErrorNotifications(SourceBufferPrivateAVFObjCErrorClient*);
    114111    void layerDidReceiveError(AVSampleBufferDisplayLayer *, NSError *);
    115 #pragma clang diagnostic push
    116 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    117112    void rendererDidReceiveError(AVSampleBufferAudioRenderer *, NSError *);
    118 #pragma clang diagnostic pop
    119113
    120114    void setVideoLayer(AVSampleBufferDisplayLayer*);
    … …  
    146140
    147141    void flushVideo();
    148 #pragma clang diagnostic push
    149 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    150142    void flush(AVSampleBufferAudioRenderer *);
    151 #pragma clang diagnostic pop
    152143
    153144    WeakPtr<SourceBufferPrivateAVFObjC> createWeakPtr() { return m_weakFactory.createWeakPtr(); }
    … …  
    163154    RetainPtr<AVAsset> m_asset;
    164155    RetainPtr<AVSampleBufferDisplayLayer> m_displayLayer;
    165 #pragma clang diagnostic push
    166 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    167156    HashMap<int, RetainPtr<AVSampleBufferAudioRenderer>> m_audioRenderers;
    168 #pragma clang diagnostic pop
    169157    RetainPtr<WebAVStreamDataParserListener> m_delegate;
    170158    RetainPtr<WebAVSampleBufferErrorListener> m_errorListener;

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

    r220044 r220045  
    6868SOFT_LINK_CLASS(AVFoundation, AVAssetTrack)
    6969SOFT_LINK_CLASS(AVFoundation, AVStreamDataParser)
    70 #pragma clang diagnostic push
    71 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    7270SOFT_LINK_CLASS(AVFoundation, AVSampleBufferAudioRenderer)
    73 #pragma clang diagnostic pop
    7471SOFT_LINK_CLASS(AVFoundation, AVSampleBufferDisplayLayer)
    7572SOFT_LINK_CLASS(AVFoundation, AVStreamSession)
    … …  
    225222    WebCore::SourceBufferPrivateAVFObjC* _parent;
    226223    Vector<RetainPtr<AVSampleBufferDisplayLayer>> _layers;
    227 #pragma clang diagnostic push
    228 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    229224    Vector<RetainPtr<AVSampleBufferAudioRenderer>> _renderers;
    230 #pragma clang diagnostic pop
    231225}
    232226
    … …  
    235229- (void)beginObservingLayer:(AVSampleBufferDisplayLayer *)layer;
    236230- (void)stopObservingLayer:(AVSampleBufferDisplayLayer *)layer;
    237 #pragma clang diagnostic push
    238 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    239231- (void)beginObservingRenderer:(AVSampleBufferAudioRenderer *)renderer;
    240232- (void)stopObservingRenderer:(AVSampleBufferAudioRenderer *)renderer;
    241 #pragma clang diagnostic pop
    242233@end
    243234
    … …  
    302293}
    303294
    304 #pragma clang diagnostic push
    305 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    306295- (void)beginObservingRenderer:(AVSampleBufferAudioRenderer*)renderer
    307296{
    308 #pragma clang diagnostic pop
    309297    ASSERT(_parent);
    310298    ASSERT(!_renderers.contains(renderer));
    … …  
    314302}
    315303
    316 #pragma clang diagnostic push
    317 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    318304- (void)stopObservingRenderer:(AVSampleBufferAudioRenderer*)renderer
    319 #pragma clang diagnostic pop
    320305{
    321306    ASSERT(_parent);
    … …  
    353338
    354339    } else if ([object isKindOfClass:getAVSampleBufferAudioRendererClass()]) {
    355 #pragma clang diagnostic push
    356 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    357340        RetainPtr<AVSampleBufferAudioRenderer> renderer = (AVSampleBufferAudioRenderer *)object;
    358 #pragma clang diagnostic pop
    359341        RetainPtr<NSError> error = [change valueForKey:NSKeyValueChangeNewKey];
    360342
    … …  
    812794
    813795    if (!track->enabled()) {
    814 #pragma clang diagnostic push
    815 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    816796        RetainPtr<AVSampleBufferAudioRenderer> renderer = m_audioRenderers.get(trackID);
    817 #pragma clang diagnostic pop
    818797        [m_parser setShouldProvideMediaData:NO forTrackID:trackID];
    819798        if (m_mediaSource)
    … …  
    821800    } else {
    822801        [m_parser setShouldProvideMediaData:YES forTrackID:trackID];
    823 #pragma clang diagnostic push
    824 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    825802        RetainPtr<AVSampleBufferAudioRenderer> renderer;
    826 #pragma clang diagnostic pop
    827803        if (!m_audioRenderers.contains(trackID)) {
    828804            renderer = adoptNS([allocAVSampleBufferAudioRendererInstance() init]);
    … …  
    914890}
    915891
    916 #pragma clang diagnostic push
    917 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    918892void SourceBufferPrivateAVFObjC::rendererDidReceiveError(AVSampleBufferAudioRenderer *renderer, NSError *error)
    919 #pragma clang diagnostic pop
    920893{
    921894    LOG(MediaSource, "SourceBufferPrivateAVFObjC::rendererDidReceiveError(%p): renderer(%p), error(%@)", this, renderer, [error description]);
    … …  
    966939}
    967940
    968 #pragma clang diagnostic push
    969 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    970941void SourceBufferPrivateAVFObjC::flush(AVSampleBufferAudioRenderer *renderer)
    971 #pragma clang diagnostic pop
    972942{
    973943    [renderer flush];
Note: See TracChangeset for help on using the changeset viewer.