Changeset 247323 in webkit


Ignore:
Timestamp:
Jul 10, 2019 1:13:26 PM (5 years ago)
Author:
Chris Dumez
Message:

Unreviewed, rolling out r247292.

Caused CloseWebViewDuringEnterFullscreen.VideoFullscreen API
test to time out on Mojave bots

Reverted changeset:

"Stop using GenericTaskQueue from multiple threads"
https://bugs.webkit.org/show_bug.cgi?id=199652
https://trac.webkit.org/changeset/247292

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r247316 r247323  
     12019-07-10  Chris Dumez  <cdumez@apple.com>
     2
     3        Unreviewed, rolling out r247292.
     4
     5        Caused CloseWebViewDuringEnterFullscreen.VideoFullscreen API
     6        test to time out on Mojave bots
     7
     8        Reverted changeset:
     9
     10        "Stop using GenericTaskQueue from multiple threads"
     11        https://bugs.webkit.org/show_bug.cgi?id=199652
     12        https://trac.webkit.org/changeset/247292
     13
    1142019-07-10  Robin Morisset  <rmorisset@apple.com>
    215
  • trunk/Source/WebCore/platform/GenericTaskQueue.h

    r247292 r247323  
    7272};
    7373
    74 template <typename T>
    75 class GenericTaskQueue : public CanMakeWeakPtr<GenericTaskQueue<T>> {
     74template <typename T, typename C = unsigned>
     75class GenericTaskQueue : public CanMakeWeakPtr<GenericTaskQueue<T, C>> {
    7676public:
    7777    GenericTaskQueue()
     
    125125private:
    126126    TaskDispatcher<T> m_dispatcher;
    127     unsigned m_pendingTasks { 0 };
     127    C m_pendingTasks { 0 };
    128128    bool m_isClosed { false };
    129129};
  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r247292 r247323  
    170170{
    171171    WeakPtr<MediaPlayerPrivateAVFoundationObjC> m_player;
     172    GenericTaskQueue<Timer, std::atomic<unsigned>> m_taskQueue;
    172173    int m_delayCallbacks;
    173174}
     
    184185@interface WebCoreAVFLoaderDelegate : NSObject<AVAssetResourceLoaderDelegate> {
    185186    WeakPtr<MediaPlayerPrivateAVFoundationObjC> m_player;
     187    GenericTaskQueue<Timer, std::atomic<unsigned>> m_taskQueue;
    186188}
    187189- (id)initWithPlayer:(WeakPtr<MediaPlayerPrivateAVFoundationObjC>&&)player;
     
    32863288- (void)metadataLoaded
    32873289{
    3288     callOnMainThread([player = m_player] {
     3290    m_taskQueue.enqueueTask([player = m_player] {
    32893291        if (player)
    32903292            player->metadataLoaded();
     
    32953297{
    32963298    UNUSED_PARAM(unusedNotification);
    3297     callOnMainThread([player = m_player] {
     3299    m_taskQueue.enqueueTask([player = m_player] {
    32983300        if (player)
    32993301            player->didEnd();
     
    33033305- (void)observeValueForKeyPath:keyPath ofObject:(id)object change:(NSDictionary *)change context:(MediaPlayerAVFoundationObservationContext)context
    33043306{
    3305     callOnMainThread([player = m_player, keyPath = retainPtr(keyPath), change = retainPtr(change), object = retainPtr(object), context] {
     3307    m_taskQueue.enqueueTask([player = m_player, keyPath = retainPtr(keyPath), change = retainPtr(change), object = retainPtr(object), context] {
    33063308        if (!player)
    33073309            return;
     
    34063408    UNUSED_PARAM(output);
    34073409
    3408     callOnMainThread([player = m_player, strings = retainPtr(strings), nativeSamples = retainPtr(nativeSamples), itemTime] {
     3410    m_taskQueue.enqueueTask([player = m_player, strings = retainPtr(strings), nativeSamples = retainPtr(nativeSamples), itemTime] {
    34093411        if (!player)
    34103412            return;
     
    34183420    UNUSED_PARAM(output);
    34193421
    3420     callOnMainThread([player = m_player] {
     3422    m_taskQueue.enqueueTask([player = m_player] {
    34213423        if (player)
    34223424            player->flushCues();
     
    34453447        return NO;
    34463448
    3447     callOnMainThread([player = m_player, loadingRequest = retainPtr(loadingRequest)] {
     3449    m_taskQueue.enqueueTask([player = m_player, loadingRequest = retainPtr(loadingRequest)] {
    34483450        if (!player) {
    34493451            [loadingRequest finishLoadingWithError:nil];
     
    34693471{
    34703472    UNUSED_PARAM(resourceLoader);
    3471     callOnMainThread([player = m_player, loadingRequest = retainPtr(loadingRequest)] {
     3473    m_taskQueue.enqueueTask([player = m_player, loadingRequest = retainPtr(loadingRequest)] {
    34723474        if (player)
    34733475            player->didCancelLoadingRequest(loadingRequest.get());
Note: See TracChangeset for help on using the changeset viewer.