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

Changeset 237483 in webkit


Ignore:
Timestamp:
Oct 26, 2018, 2:33:21 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

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

broke internal iOS builds (Requested by zalan on #webkit).

Reverted changeset:

"Adopt -setOverrideRouteSharingPolicy:routingContextUID: SPI"
​https://bugs.webkit.org/show_bug.cgi?id=190951
​https://trac.webkit.org/changeset/237458

Location:
trunk/Source
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r237474 r237483  
     12018-10-26  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r237458.
     4        https://bugs.webkit.org/show_bug.cgi?id=190973
     5
     6        broke internal iOS builds (Requested by zalan on #webkit).
     7
     8        Reverted changeset:
     9
     10        "Adopt -setOverrideRouteSharingPolicy:routingContextUID: SPI"
     11        https://bugs.webkit.org/show_bug.cgi?id=190951
     12        https://trac.webkit.org/changeset/237458
     13
    1142018-10-26  Antoine Quint  <graouts@apple.com>
    215

  • trunk/Source/WebCore/PAL/ChangeLog

    r237466 r237483  
     12018-10-26  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r237458.
     4        https://bugs.webkit.org/show_bug.cgi?id=190973
     5
     6        broke internal iOS builds (Requested by zalan on #webkit).
     7
     8        Reverted changeset:
     9
     10        "Adopt -setOverrideRouteSharingPolicy:routingContextUID: SPI"
     11        https://bugs.webkit.org/show_bug.cgi?id=190951
     12        https://trac.webkit.org/changeset/237458
     13
    1142018-10-26  Timothy Hatcher  <timothy@apple.com>
    215

  • trunk/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h

    r237458 r237483  
    7474@property (nonatomic, readonly, getter=isPictureInPictureSuspended) BOOL pictureInPictureSuspended;
    7575@property (nonatomic, readonly) BOOL pictureInPictureWasStartedWhenEnteringBackground;
    76 - (void)setWebKitOverrideRouteSharingPolicy:(NSUInteger)routeSharingPolicy routingContextUID:(NSString *)routingContextUID;
    7776@end
    7877
    … …  
    165164@property (nonatomic, readonly, getter=isPictureInPictureActive) BOOL pictureInPictureActive;
    166165@property (nonatomic, readonly) BOOL pictureInPictureWasStartedWhenEnteringBackground;
    167 - (void)setWebKitOverrideRouteSharingPolicy:(NSUInteger)routeSharingPolicy routingContextUID:(NSString *)routingContextUID;
    168166@end
    169167

  • trunk/Source/WebCore/platform/cocoa/VideoFullscreenModel.h

    r237458 r237483  
    2929#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
    3030
    31 #include "AudioSession.h"
    3231#include "FloatRect.h"
    3332#include "HTMLMediaElementEnums.h"
    3433#include "MediaPlayerEnums.h"
    3534#include "PlaybackSessionModel.h"
    36 #include <wtf/CompletionHandler.h>
    3735
    3836#if PLATFORM(IOS_FAMILY)
    … …  
    6563    virtual void didExitPictureInPicture() = 0;
    6664
    67     virtual void requestRouteSharingPolicyAndContextUID(CompletionHandler<void(RouteSharingPolicy, String)>&& completionHandler) { completionHandler(RouteSharingPolicy::Default, emptyString()); }
    68 
    6965#if PLATFORM(IOS_FAMILY)
    7066    virtual UIViewController *presentingViewController() { return nullptr; }

  • trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.h

    r237458 r237483  
    7373    bool hasVideo() const override { return m_hasVideo; }
    7474
    75     WEBCORE_EXPORT void requestRouteSharingPolicyAndContextUID(CompletionHandler<void(RouteSharingPolicy, String)>&&) override;
    7675
    7776protected:

  • trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm

    r237458 r237483  
    188188}
    189189
    190 void VideoFullscreenModelVideoElement::requestRouteSharingPolicyAndContextUID(CompletionHandler<void(RouteSharingPolicy, String)>&& completionHandler)
    191 {
    192     auto& session = AudioSession::sharedSession();
    193     completionHandler(session.routeSharingPolicy(), session.routingContextUID());
    194 }
    195 
    196190void VideoFullscreenModelVideoElement::addClient(VideoFullscreenModelClient& client)
    197191{

  • trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.h

    r237458 r237483  
    5858class VideoFullscreenModel;
    5959class VideoFullscreenChangeObserver;
    60 
     60   
    6161class VideoFullscreenInterfaceAVKit final
    6262    : public VideoFullscreenModelClient
    … …  
    185185    RunLoop::Timer<VideoFullscreenInterfaceAVKit> m_watchdogTimer;
    186186    FloatRect m_inlineRect;
    187     RouteSharingPolicy m_routeSharingPolicy { RouteSharingPolicy::Default };
    188     String m_routingContextUID;
    189187    bool m_allowsPictureInPicturePlayback { false };
    190188    bool m_wirelessVideoPlaybackDisabled { true };

  • trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm

    r237458 r237483  
    542542
    543543- (BOOL)playerViewControllerShouldHandleDoneButtonTap:(AVPlayerViewController *)playerViewController;
    544 - (void)setWebKitOverrideRouteSharingPolicy:(NSUInteger)routeSharingPolicy routingContextUID:(NSString *)routingContextUID;
    545544@end
    546545NS_ASSUME_NONNULL_END
    … …  
    574573
    575574    return YES;
    576 }
    577 
    578 - (void)setWebKitOverrideRouteSharingPolicy:(NSUInteger)routeSharingPolicy routingContextUID:(NSString *)routingContextUID
    579 {
    580 #pragma clang diagnostic push
    581 #pragma clang diagnostic ignored "-Wunknown-pragmas"
    582 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    583     if ([_avPlayerViewController respondsToSelector:@selector(setWebKitOverrideRouteSharingPolicy:routingContextUID:)])
    584         [_avPlayerViewController setWebKitOverrideRouteSharingPolicy:routeSharingPolicy routingContextUID:routingContextUID];
    585 #pragma clang diagnostic pop
    586575}
    587576
    … …  
    770759    m_videoFullscreenModel = model;
    771760
    772     if (m_videoFullscreenModel) {
     761    if (m_videoFullscreenModel)
    773762        m_videoFullscreenModel->addClient(*this);
    774         m_videoFullscreenModel->requestRouteSharingPolicyAndContextUID([this, protectedThis = makeRefPtr(this)] (RouteSharingPolicy policy, String contextUID) {
    775             m_routeSharingPolicy = policy;
    776             m_routingContextUID = contextUID;
    777 
    778             if (m_playerViewController && !m_routingContextUID.isEmpty())
    779                 [m_playerViewController setWebKitOverrideRouteSharingPolicy:(NSUInteger)m_routeSharingPolicy routingContextUID:m_routingContextUID];
    780         });
    781     }
    782763
    783764    hasVideoChanged(m_videoFullscreenModel ? m_videoFullscreenModel->hasVideo() : false);
    … …  
    12401221    [m_playerViewController setAllowsPictureInPicturePlayback:m_allowsPictureInPicturePlayback];
    12411222    [playerController() setPictureInPicturePossible:m_allowsPictureInPicturePlayback];
    1242     if (!m_routingContextUID.isEmpty())
    1243         [m_playerViewController setWebKitOverrideRouteSharingPolicy:(NSUInteger)m_routeSharingPolicy routingContextUID:m_routingContextUID];
    12441223
    12451224#if PLATFORM(WATCHOS)

  • trunk/Source/WebKit/ChangeLog

    r237480 r237483  
     12018-10-26  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r237458.
     4        https://bugs.webkit.org/show_bug.cgi?id=190973
     5
     6        broke internal iOS builds (Requested by zalan on #webkit).
     7
     8        Reverted changeset:
     9
     10        "Adopt -setOverrideRouteSharingPolicy:routingContextUID: SPI"
     11        https://bugs.webkit.org/show_bug.cgi?id=190951
     12        https://trac.webkit.org/changeset/237458
     13
    1142018-10-26  Chris Dumez  <cdumez@apple.com>
    215

  • trunk/Source/WebKit/Platform/IPC/MessageSender.h

    r237458 r237483  
    6666    }
    6767
    68     template<typename T, typename... Args>
    69     void sendWithAsyncReply(T&& message, CompletionHandler<void(Args...)>&& args, uint64_t destinationID = 0)
    70     {
    71         ASSERT(messageSenderConnection());
    72 
    73         messageSenderConnection()->sendWithAsyncReply(WTFMove(message), WTFMove(args), destinationID);
    74     }
    75 
    7668    virtual bool sendMessage(std::unique_ptr<Encoder>, OptionSet<SendOption>);
    7769

  • trunk/Source/WebKit/Scripts/webkit/messages.py

    r237458 r237483  
    560560            if message.has_attribute(ASYNC_ATTRIBUTE):
    561561                move_parameters = message.name, ', '.join([move_type(x.type) for x in message.reply_parameters])
    562                 move_values = ', '.join(['WTFMove(*%s)' % x.name for x in message.reply_parameters])
    563562                result.append('void %s::callReply(IPC::Decoder& decoder, CompletionHandler<void(%s)>&& completionHandler)\n{\n' % move_parameters)
    564563                for x in message.reply_parameters:
    … …  
    566565                    result.append('    decoder >> %s;\n' % x.name)
    567566                    result.append('    if (!%s) {\n        ASSERT_NOT_REACHED();\n        return;\n    }\n' % x.name)
    568                 result.append('    completionHandler(%s);\n}\n\n' % move_values)
     567                result.append('    completionHandler(WTFMove(*%s));\n}\n\n' % (', *'.join(x.name for x in message.reply_parameters)))
    569568                result.append('void %s::cancelReply(CompletionHandler<void(%s)>&& completionHandler)\n{\n    completionHandler(' % move_parameters)
    570569                result.append(', '.join(['{ }' for x in message.reply_parameters]))

  • trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.h

    r237458 r237483  
    2929
    3030#include "MessageReceiver.h"
    31 #include <WebCore/AudioSession.h>
    3231#include <WebCore/GraphicsLayer.h>
    3332#include <WebCore/PlatformView.h>
    … …  
    3837#include <wtf/RefCounted.h>
    3938#include <wtf/RefPtr.h>
    40 #include <wtf/text/WTFString.h>
    4139
    4240#if PLATFORM(IOS_FAMILY)
    … …  
    9694    void willExitPictureInPicture() final;
    9795    void didExitPictureInPicture() final;
    98     void requestRouteSharingPolicyAndContextUID(CompletionHandler<void(WebCore::RouteSharingPolicy, String)>&&) final;
    9996
    10097    // VideoFullscreenChangeObserver
    … …  
    130127    void applicationDidBecomeActive();
    131128    bool isVisible() const;
    132 
    133     void requestRouteSharingPolicyAndContextUID(uint64_t contextId, CompletionHandler<void(WebCore::RouteSharingPolicy, String)>&&);
    134129
    135130#if ENABLE(VIDEO_PRESENTATION_MODE)

  • trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm

    r237458 r237483  
    275275}
    276276
    277 void VideoFullscreenModelContext::requestRouteSharingPolicyAndContextUID(CompletionHandler<void(WebCore::RouteSharingPolicy, String)>&& completionHandler)
    278 {
    279     if (m_manager)
    280         m_manager->requestRouteSharingPolicyAndContextUID(m_contextId, WTFMove(completionHandler));
    281     else
    282         completionHandler(WebCore::RouteSharingPolicy::Default, emptyString());
    283 }
    284 
    285277void VideoFullscreenModelContext::willEnterPictureInPicture()
    286278{
    … …  
    400392    for (auto& tuple : m_contextMap.values())
    401393        std::get<1>(tuple)->applicationDidBecomeActive();
    402 }
    403 
    404 void VideoFullscreenManagerProxy::requestRouteSharingPolicyAndContextUID(uint64_t contextId, CompletionHandler<void(WebCore::RouteSharingPolicy, String)>&& callback)
    405 {
    406     m_page->sendWithAsyncReply(Messages::VideoFullscreenManager::RequestRouteSharingPolicyAndContextUID(contextId), WTFMove(callback));
    407394}
    408395

  • trunk/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.h

    r237458 r237483  
    2828#if (PLATFORM(IOS_FAMILY) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
    2929
    30 #include "Connection.h"
    3130#include "MessageReceiver.h"
    32 #include "VideoFullscreenManagerMessages.h"
    3331#include <WebCore/EventListener.h>
    3432#include <WebCore/HTMLMediaElementEnums.h>
    … …  
    154152    void fullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode);
    155153    void fullscreenMayReturnToInline(uint64_t contextId, bool isPageVisible);
    156     void requestRouteSharingPolicyAndContextUID(uint64_t contextId, Messages::VideoFullscreenManager::RequestRouteSharingPolicyAndContextUID::AsyncReply&&);
    157 
     154   
    158155    WebPage* m_page;
    159156    Ref<PlaybackSessionManager> m_playbackSessionManager;

  • trunk/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.messages.in

    r237458 r237483  
    3636    FullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode)
    3737    FullscreenMayReturnToInline(uint64_t contextId, bool isPageVisible)
    38     RequestRouteSharingPolicyAndContextUID(uint64_t contextId) -> (enum:uint8_t WebCore::RouteSharingPolicy routeSharingPolicy, String routingContextUID) Async
    3938}
    4039#endif

  • trunk/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm

    r237458 r237483  
    3131#import "Logging.h"
    3232#import "PlaybackSessionManager.h"
     33#import "VideoFullscreenManagerMessages.h"
    3334#import "VideoFullscreenManagerProxyMessages.h"
    3435#import "WebCoreArgumentCoders.h"
    … …  
    558559    m_page->send(Messages::VideoFullscreenManagerProxy::PreparedToReturnToInline(contextId, true, inlineVideoFrame(*model.videoElement())), m_page->pageID());
    559560}
    560 
    561 void VideoFullscreenManager::requestRouteSharingPolicyAndContextUID(uint64_t contextId, Messages::VideoFullscreenManager::RequestRouteSharingPolicyAndContextUID::AsyncReply&& reply)
    562 {
    563     ensureModel(contextId).requestRouteSharingPolicyAndContextUID(WTFMove(reply));
    564 }
    565561   
    566562void VideoFullscreenManager::setVideoLayerFrameFenced(uint64_t contextId, WebCore::FloatRect bounds, IPC::Attachment fencePort)
Note: See TracChangeset for help on using the changeset viewer.