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

Changeset 244801 in webkit


Ignore:
Timestamp:
Apr 30, 2019, 1:21:11 PM (7 years ago)
Author:
commit-queue@webkit.org
Message:

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

Causing assertion failures on debug queues (Requested by
ShawnRoberts on #webkit).

Reverted changeset:

"Make Document audio producers use WeakPtr"
​https://bugs.webkit.org/show_bug.cgi?id=197382
​https://trac.webkit.org/changeset/244773

Location:
trunk/Source
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r244773 r244801  
     12019-04-30  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r244773.
     4        https://bugs.webkit.org/show_bug.cgi?id=197436
     5
     6        Causing assertion failures on debug queues (Requested by
     7        ShawnRoberts on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Make Document audio producers use WeakPtr"
     12        https://bugs.webkit.org/show_bug.cgi?id=197382
     13        https://trac.webkit.org/changeset/244773
     14
    1152019-04-30  Youenn Fablet  <youenn@apple.com>
    216

  • trunk/Source/WTF/wtf/WeakHashSet.h

    r244773 r244801  
    2626#pragma once
    2727
    28 #include <wtf/Algorithms.h>
    2928#include <wtf/HashSet.h>
    3029#include <wtf/HashTraits.h>
    … …  
    125124    }
    126125
    127     bool hasNullReferences() const
    128     {
    129         return WTF::anyOf(m_set, [] (auto& value) { return !value->get(); });
    130     }
    131 
    132126    unsigned computeSize() const
    133127    {

  • trunk/Source/WebCore/ChangeLog

    r244800 r244801  
     12019-04-30  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r244773.
     4        https://bugs.webkit.org/show_bug.cgi?id=197436
     5
     6        Causing assertion failures on debug queues (Requested by
     7        ShawnRoberts on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Make Document audio producers use WeakPtr"
     12        https://bugs.webkit.org/show_bug.cgi?id=197382
     13        https://trac.webkit.org/changeset/244773
     14
    1152019-04-30  Commit Queue  <commit-queue@webkit.org>
    216

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

    r244773 r244801  
    5252    , public ActiveDOMObject
    5353    , public EventTargetWithInlineData
    54     , public MediaProducer
     54    , public CanMakeWeakPtr<MediaStreamTrack>
     55    , private MediaProducer
    5556    , private MediaStreamTrackPrivate::Observer
    5657#if !RELEASE_LOG_DISABLED

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

    r244773 r244801  
    39033903void Document::addAudioProducer(MediaProducer& audioProducer)
    39043904{
    3905     m_audioProducers.add(audioProducer);
     3905    m_audioProducers.add(&audioProducer);
    39063906    updateIsPlayingMedia();
    39073907}
    … …  
    39093909void Document::removeAudioProducer(MediaProducer& audioProducer)
    39103910{
    3911     m_audioProducers.remove(audioProducer);
     3911    m_audioProducers.remove(&audioProducer);
    39123912    updateIsPlayingMedia();
    39133913}
    … …  
    39273927void Document::updateIsPlayingMedia(uint64_t sourceElementID)
    39283928{
    3929     ASSERT(!m_audioProducers.hasNullReferences());
    3930 
    39313929    MediaProducer::MediaStateFlags state = MediaProducer::IsNotPlaying;
    3932     for (auto& audioProducer : m_audioProducers)
    3933         state |= audioProducer.mediaState();
     3930    for (auto* audioProducer : m_audioProducers)
     3931        state |= audioProducer->mediaState();
    39343932
    39353933#if ENABLE(MEDIA_SESSION)
    … …  
    39723970void Document::pageMutedStateDidChange()
    39733971{
    3974     for (auto& audioProducer : m_audioProducers)
    3975         audioProducer.pageMutedStateDidChange();
     3972    for (auto* audioProducer : m_audioProducers)
     3973        audioProducer->pageMutedStateDidChange();
    39763974}
    39773975

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

    r244773 r244801  
    6767#include <wtf/ObjectIdentifier.h>
    6868#include <wtf/UniqueRef.h>
    69 #include <wtf/WeakHashSet.h>
    7069#include <wtf/WeakPtr.h>
    7170#include <wtf/text/AtomicStringHash.h>
    … …  
    18931892    Ref<CSSFontSelector> m_fontSelector;
    18941893
    1895     WeakHashSet<MediaProducer> m_audioProducers;
     1894    HashSet<MediaProducer*> m_audioProducers;
    18961895
    18971896    HashSet<ShadowRoot*> m_inDocumentShadowRoots;

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r244773 r244801  
    17691769                return;
    17701770
    1771             auto currentMediaTime = this->currentMediaTime();
     1771            auto currentMediaTime = weakThis->currentMediaTime();
    17721772            INFO_LOG(LOGIDENTIFIER, " lambda, currentMediaTime: ", currentMediaTime);
    1773             this->updateActiveTextTrackCues(currentMediaTime);
     1773            weakThis->updateActiveTextTrackCues(currentMediaTime);
    17741774        }, nextInterestingTime);
    17751775    }

  • trunk/Source/WebCore/html/HTMLMediaElement.h

    r244773 r244801  
    574574    enum class AutoplayEventPlaybackState { None, PreventedAutoplay, StartedWithUserGesture, StartedWithoutUserGesture };
    575575
    576     using HTMLElement::weakPtrFactory;
    577 
    578576protected:
    579577    HTMLMediaElement(const QualifiedName&, Document&, bool createdByParser);

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

    r244773 r244801  
    2626#pragma once
    2727
    28 #include <wtf/WeakPtr.h>
    29 
    3028namespace WebCore {
    3129
    32 class MediaProducer : public CanMakeWeakPtr<MediaProducer> {
     30class MediaProducer {
    3331public:
    3432    enum MediaState {
Note: See TracChangeset for help on using the changeset viewer.