Changeset 279133 in webkit


Ignore:
Timestamp:
Jun 22, 2021, 11:49:09 AM (4 years ago)
Author:
jer.noble@apple.com
Message:

[Cocoa] Upstream GroupActivitiesCoordinator
​https://bugs.webkit.org/show_bug.cgi?id=226757

Reviewed by Eric Carlson.

Upstream the backing objects for a GroupActivities-based MediaSessionCoordinator.

  • SourcesCocoa.txt:
  • UIProcess/Cocoa/GroupActivities/GroupActivitiesCoordinator.h: Added.
  • UIProcess/Cocoa/GroupActivities/GroupActivitiesCoordinator.mm: Added.

(-[WKGroupActivitiesCoordinatorDelegate initWithParent:]):
(-[WKGroupActivitiesCoordinatorDelegate playbackCoordinator:didIssuePlayCommand:completionHandler:]):
(-[WKGroupActivitiesCoordinatorDelegate playbackCoordinator:didIssuePauseCommand:completionHandler:]):
(-[WKGroupActivitiesCoordinatorDelegate playbackCoordinator:didIssueSeekCommand:completionHandler:]):
(-[WKGroupActivitiesCoordinatorDelegate playbackCoordinator:didIssueBufferingCommand:completionHandler:]):
(-[WKGroupActivitiesCoordinatorDelegate playbackCoordinator:didIssuePrepareTransitionCommand:]):
(WebKit::GroupActivitiesCoordinator::create):
(WebKit::GroupActivitiesCoordinator::GroupActivitiesCoordinator):
(WebKit::GroupActivitiesCoordinator::~GroupActivitiesCoordinator):
(WebKit::GroupActivitiesCoordinator::sessionStateChanged):
(WebKit::GroupActivitiesCoordinator::identifier const):
(WebKit::GroupActivitiesCoordinator::join):
(WebKit::GroupActivitiesCoordinator::leave):
(WebKit::GroupActivitiesCoordinator::seekTo):
(WebKit::GroupActivitiesCoordinator::play):
(WebKit::GroupActivitiesCoordinator::pause):
(WebKit::GroupActivitiesCoordinator::setTrack):
(WebKit::GroupActivitiesCoordinator::positionStateChanged):
(WebKit::GroupActivitiesCoordinator::readyStateChanged):
(WebKit::GroupActivitiesCoordinator::playbackStateChanged):
(WebKit::GroupActivitiesCoordinator::trackIdentifierChanged):
(WebKit::GroupActivitiesCoordinator::issuePlayCommand):
(WebKit::GroupActivitiesCoordinator::issuePauseCommand):
(WebKit::GroupActivitiesCoordinator::issueSeekCommand):
(WebKit::GroupActivitiesCoordinator::issueBufferingCommand):
(WebKit::GroupActivitiesCoordinator::issuePrepareTransitionCommand):

  • UIProcess/Cocoa/GroupActivities/GroupActivitiesSession.h: Added.

(WebKit::GroupActivitiesSession::groupSession):

  • UIProcess/Cocoa/GroupActivities/GroupActivitiesSession.mm: Added.

(WebKit::GroupActivitiesSession::create):
(WebKit::GroupActivitiesSession::GroupActivitiesSession):
(WebKit::GroupActivitiesSession::~GroupActivitiesSession):
(WebKit::GroupActivitiesSession::join):
(WebKit::GroupActivitiesSession::leave):
(WebKit::GroupActivitiesSession::state const):
(WebKit::GroupActivitiesSession::uuid const):
(WebKit::GroupActivitiesSession::fallbackURL const):
(WebKit::GroupActivitiesSession::addStateChangeObserver):
(WebKit::GroupActivitiesSession::addFallbackURLObserver):

  • UIProcess/Cocoa/GroupActivities/GroupActivitiesSessionNotifier.h: Added.
  • UIProcess/Cocoa/GroupActivities/GroupActivitiesSessionNotifier.mm: Added.

(WebKitSwiftLibrary):
(WebKit::GroupActivitiesSessionNotifier::sharedNotifier):
(WebKit::GroupActivitiesSessionNotifier::GroupActivitiesSessionNotifier):
(WebKit::GroupActivitiesSessionNotifier::sessionStateChanged):
(WebKit::GroupActivitiesSessionNotifier::addWebPage):
(WebKit::GroupActivitiesSessionNotifier::removeWebPage):
(WebKit::GroupActivitiesSessionNotifier::webPageURLChanged):
(WebKit::GroupActivitiesSessionNotifier::hasSessionForURL):
(WebKit::GroupActivitiesSessionNotifier::takeSessionForURL):

  • UIProcess/Cocoa/GroupActivities/WKGroupSession.h: Added.
  • UIProcess/Cocoa/GroupActivities/WKGroupSession.swift: Added.

(WKURLActivityWrapper.urlActivity):
(WKURLActivityWrapper.fallbackURL):
(WKGroupSessionWrapper.groupSession):
(WKGroupSessionWrapper.cancellables):
(WKGroupSessionWrapper.activity):
(WKGroupSessionWrapper.uuid):
(WKGroupSessionWrapper.wrapperSessionState(_:)):
(WKGroupSessionWrapper.state):
(WKGroupSessionWrapper.newActivityCallback):
(WKGroupSessionWrapper.stateChangedCallback):
(WKGroupSessionWrapper.join):
(WKGroupSessionWrapper.leave):
(WKGroupSessionWrapper.coordinate(_:)):
(WKGroupSessionWrapper.activityChanged(_:)):
(WKGroupSessionWrapper.stateChanged(_:)):
(WKGroupSessionObserver.newSessionCallback):
(WKGroupSessionObserver.cancellables):
(WKGroupSessionObserver.recievedSession(_:)):

  • UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.h:
  • UIProcess/WebPageProxy.cpp:

(WebKit::m_limitsNavigationsToAppBoundDomains):
(WebKit::WebPageProxy::~WebPageProxy):
(WebKit::WebPageProxy::didCommitLoadForFrame):

  • WebKit.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit
Files:
10 added
5 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r279122 r279133  
     12021-06-07  Jer Noble  <jer.noble@apple.com>
     2
     3        [Cocoa] Upstream GroupActivitiesCoordinator
     4        https://bugs.webkit.org/show_bug.cgi?id=226757
     5
     6        Reviewed by Eric Carlson.
     7
     8        Upstream the backing objects for a GroupActivities-based MediaSessionCoordinator.
     9
     10        * SourcesCocoa.txt:
     11        * UIProcess/Cocoa/GroupActivities/GroupActivitiesCoordinator.h: Added.
     12        * UIProcess/Cocoa/GroupActivities/GroupActivitiesCoordinator.mm: Added.
     13        (-[WKGroupActivitiesCoordinatorDelegate initWithParent:]):
     14        (-[WKGroupActivitiesCoordinatorDelegate playbackCoordinator:didIssuePlayCommand:completionHandler:]):
     15        (-[WKGroupActivitiesCoordinatorDelegate playbackCoordinator:didIssuePauseCommand:completionHandler:]):
     16        (-[WKGroupActivitiesCoordinatorDelegate playbackCoordinator:didIssueSeekCommand:completionHandler:]):
     17        (-[WKGroupActivitiesCoordinatorDelegate playbackCoordinator:didIssueBufferingCommand:completionHandler:]):
     18        (-[WKGroupActivitiesCoordinatorDelegate playbackCoordinator:didIssuePrepareTransitionCommand:]):
     19        (WebKit::GroupActivitiesCoordinator::create):
     20        (WebKit::GroupActivitiesCoordinator::GroupActivitiesCoordinator):
     21        (WebKit::GroupActivitiesCoordinator::~GroupActivitiesCoordinator):
     22        (WebKit::GroupActivitiesCoordinator::sessionStateChanged):
     23        (WebKit::GroupActivitiesCoordinator::identifier const):
     24        (WebKit::GroupActivitiesCoordinator::join):
     25        (WebKit::GroupActivitiesCoordinator::leave):
     26        (WebKit::GroupActivitiesCoordinator::seekTo):
     27        (WebKit::GroupActivitiesCoordinator::play):
     28        (WebKit::GroupActivitiesCoordinator::pause):
     29        (WebKit::GroupActivitiesCoordinator::setTrack):
     30        (WebKit::GroupActivitiesCoordinator::positionStateChanged):
     31        (WebKit::GroupActivitiesCoordinator::readyStateChanged):
     32        (WebKit::GroupActivitiesCoordinator::playbackStateChanged):
     33        (WebKit::GroupActivitiesCoordinator::trackIdentifierChanged):
     34        (WebKit::GroupActivitiesCoordinator::issuePlayCommand):
     35        (WebKit::GroupActivitiesCoordinator::issuePauseCommand):
     36        (WebKit::GroupActivitiesCoordinator::issueSeekCommand):
     37        (WebKit::GroupActivitiesCoordinator::issueBufferingCommand):
     38        (WebKit::GroupActivitiesCoordinator::issuePrepareTransitionCommand):
     39        * UIProcess/Cocoa/GroupActivities/GroupActivitiesSession.h: Added.
     40        (WebKit::GroupActivitiesSession::groupSession):
     41        * UIProcess/Cocoa/GroupActivities/GroupActivitiesSession.mm: Added.
     42        (WebKit::GroupActivitiesSession::create):
     43        (WebKit::GroupActivitiesSession::GroupActivitiesSession):
     44        (WebKit::GroupActivitiesSession::~GroupActivitiesSession):
     45        (WebKit::GroupActivitiesSession::join):
     46        (WebKit::GroupActivitiesSession::leave):
     47        (WebKit::GroupActivitiesSession::state const):
     48        (WebKit::GroupActivitiesSession::uuid const):
     49        (WebKit::GroupActivitiesSession::fallbackURL const):
     50        (WebKit::GroupActivitiesSession::addStateChangeObserver):
     51        (WebKit::GroupActivitiesSession::addFallbackURLObserver):
     52        * UIProcess/Cocoa/GroupActivities/GroupActivitiesSessionNotifier.h: Added.
     53        * UIProcess/Cocoa/GroupActivities/GroupActivitiesSessionNotifier.mm: Added.
     54        (WebKitSwiftLibrary):
     55        (WebKit::GroupActivitiesSessionNotifier::sharedNotifier):
     56        (WebKit::GroupActivitiesSessionNotifier::GroupActivitiesSessionNotifier):
     57        (WebKit::GroupActivitiesSessionNotifier::sessionStateChanged):
     58        (WebKit::GroupActivitiesSessionNotifier::addWebPage):
     59        (WebKit::GroupActivitiesSessionNotifier::removeWebPage):
     60        (WebKit::GroupActivitiesSessionNotifier::webPageURLChanged):
     61        (WebKit::GroupActivitiesSessionNotifier::hasSessionForURL):
     62        (WebKit::GroupActivitiesSessionNotifier::takeSessionForURL):
     63        * UIProcess/Cocoa/GroupActivities/WKGroupSession.h: Added.
     64        * UIProcess/Cocoa/GroupActivities/WKGroupSession.swift: Added.
     65        (WKURLActivityWrapper.urlActivity):
     66        (WKURLActivityWrapper.fallbackURL):
     67        (WKGroupSessionWrapper.groupSession):
     68        (WKGroupSessionWrapper.cancellables):
     69        (WKGroupSessionWrapper.activity):
     70        (WKGroupSessionWrapper.uuid):
     71        (WKGroupSessionWrapper.wrapperSessionState(_:)):
     72        (WKGroupSessionWrapper.state):
     73        (WKGroupSessionWrapper.newActivityCallback):
     74        (WKGroupSessionWrapper.stateChangedCallback):
     75        (WKGroupSessionWrapper.join):
     76        (WKGroupSessionWrapper.leave):
     77        (WKGroupSessionWrapper.coordinate(_:)):
     78        (WKGroupSessionWrapper.activityChanged(_:)):
     79        (WKGroupSessionWrapper.stateChanged(_:)):
     80        (WKGroupSessionObserver.newSessionCallback):
     81        (WKGroupSessionObserver.cancellables):
     82        (WKGroupSessionObserver.recievedSession(_:)):
     83        * UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.h:
     84        * UIProcess/WebPageProxy.cpp:
     85        (WebKit::m_limitsNavigationsToAppBoundDomains):
     86        (WebKit::WebPageProxy::~WebPageProxy):
     87        (WebKit::WebPageProxy::didCommitLoadForFrame):
     88        * WebKit.xcodeproj/project.pbxproj:
     89
    1902021-06-22  Peng Liu  <peng.liu6@apple.com>
    291

  • trunk/Source/WebKit/SourcesCocoa.txt

    r279060 r279133  
    375375UIProcess/Automation/mac/WebAutomationSessionMac.mm
    376376
     377UIProcess/Cocoa/GroupActivities/GroupActivitiesCoordinator.mm
     378UIProcess/Cocoa/GroupActivities/GroupActivitiesSession.mm
     379UIProcess/Cocoa/GroupActivities/GroupActivitiesSessionNotifier.mm
     380
    377381UIProcess/Cocoa/SOAuthorization/NavigationSOAuthorizationSession.mm
    378382UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.mm

  • trunk/Source/WebKit/UIProcess/Cocoa/GroupActivities/GroupActivitiesSessionNotifier.h

    r279130 r279133  
    11/*
    2  * Copyright (C) 2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2021 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2626#pragma once
    2727
    28 #if ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS_FAMILY)
     28#if ENABLE(MEDIA_SESSION_COORDINATOR) && HAVE(GROUP_ACTIVITIES)
    2929
    30 #include <WebCore/ScrollingTreeFrameScrollingNode.h>
     30#include "GroupActivitiesSession.h"
     31#include <wtf/HashMap.h>
     32#include <wtf/URLHash.h>
     33#include <wtf/WeakPtr.h>
     34
     35OBJC_CLASS WKGroupSessionObserver;
    3136
    3237namespace WebKit {
    3338
    34 class ScrollingTreeScrollingNodeDelegateIOS;
     39class WebPageProxy;
    3540
    36 class ScrollingTreeFrameScrollingNodeRemoteIOS : public WebCore::ScrollingTreeFrameScrollingNode {
     41class GroupActivitiesSessionNotifier : public CanMakeWeakPtr<GroupActivitiesSessionNotifier> {
     42    WTF_MAKE_FAST_ALLOCATED;
    3743public:
    38     static Ref<ScrollingTreeFrameScrollingNodeRemoteIOS> create(WebCore::ScrollingTree&, WebCore::ScrollingNodeType, WebCore::ScrollingNodeID);
    39     virtual ~ScrollingTreeFrameScrollingNodeRemoteIOS();
     44    static GroupActivitiesSessionNotifier& sharedNotifier();
    4045
    41     UIScrollView *scrollView() const;
     46    bool hasSessionForURL(const URL&);
     47    RefPtr<GroupActivitiesSession> takeSessionForURL(const URL&);
     48    void removeSession(const GroupActivitiesSession&);
     49
     50    void addWebPage(WebPageProxy&);
     51    void removeWebPage(WebPageProxy&);
     52    void webPageURLChanged(WebPageProxy&);
    4253
    4354private:
    44     ScrollingTreeFrameScrollingNodeRemoteIOS(WebCore::ScrollingTree&, WebCore::ScrollingNodeType, WebCore::ScrollingNodeID);
     55    friend class NeverDestroyed<GroupActivitiesSessionNotifier>;
     56    GroupActivitiesSessionNotifier();
    4557
    46     void commitStateBeforeChildren(const WebCore::ScrollingStateNode&) override;
    47     void commitStateAfterChildren(const WebCore::ScrollingStateNode&) override;
     58    void sessionStateChanged(const GroupActivitiesSession&, GroupActivitiesSession::State);
    4859
    49     WebCore::FloatPoint minimumScrollPosition() const override;
    50     WebCore::FloatPoint maximumScrollPosition() const override;
    51 
    52     void repositionScrollingLayers() override;
    53     void repositionRelatedLayers() override;
    54 
    55     std::unique_ptr<ScrollingTreeScrollingNodeDelegateIOS> m_scrollingNodeDelegate;
    56 
    57     RetainPtr<CALayer> m_counterScrollingLayer;
    58     RetainPtr<CALayer> m_headerLayer;
    59     RetainPtr<CALayer> m_footerLayer;
     60    HashMap<URL, Ref<GroupActivitiesSession>> m_sessions;
     61    RetainPtr<WKGroupSessionObserver> m_sessionObserver;
     62    WeakHashSet<WebPageProxy> m_webPages;
     63    GroupActivitiesSession::StateChangeObserver m_stateChangeObserver;
    6064};
    6165
    62 } // namespace WebKit
     66}
    6367
    64 #endif // ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS_FAMILY)
     68#endif

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.h

    r278183 r279133  
    2727
    2828#if ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS_FAMILY)
     29
     30OBJC_CLASS UIScrollView;
    2931
    3032#include <WebCore/ScrollingTreeFrameScrollingNode.h>

  • trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

    r279086 r279133  
    301301#include "MediaSessionCoordinatorProxyPrivate.h"
    302302#include "RemoteMediaSessionCoordinatorProxy.h"
     303#endif
     304
     305#if HAVE(GROUP_ACTIVITIES)
     306#include "GroupActivitiesSessionNotifier.h"
     307#endif
    303308
    304309#if ENABLE(APP_HIGHLIGHTS)
    … …  
    312317#define WEBPAGEPROXY_DESTRUCTOR_WKCOORDINATOR_ADDITIONS
    313318#define WEBPAGEPROXY_DIDCOMMITLOADFORFRAME_WKCOORDINATOR_ADDITIONS
    314 #endif
    315319#endif
    316320
    … …  
    572576#endif
    573577
    574 #if ENABLE(MEDIA_SESSION_COORDINATOR)
    575     WEBPAGEPROXY_CONSTRUCTOR_WKCOORDINATOR_ADDITIONS
     578#if ENABLE(MEDIA_SESSION_COORDINATOR) && HAVE(GROUP_ACTIVITIES)
     579    GroupActivitiesSessionNotifier::sharedNotifier().addWebPage(*this);
    576580#endif
    577581}
    … …  
    615619#if ENABLE(MEDIA_SESSION_COORDINATOR)
    616620    WEBPAGEPROXY_DESTRUCTOR_WKCOORDINATOR_ADDITIONS
     621#endif
     622#if ENABLE(MEDIA_SESSION_COORDINATOR) && HAVE(GROUP_ACTIVITIES)
     623    GroupActivitiesSessionNotifier::sharedNotifier().removeWebPage(*this);
    617624#endif
    618625}
    … …  
    49204927    }
    49214928
    4922 #if ENABLE(MEDIA_SESSION_COORDINATOR)
    4923     WEBPAGEPROXY_DIDCOMMITLOADFORFRAME_WKCOORDINATOR_ADDITIONS
     4929#if ENABLE(MEDIA_SESSION_COORDINATOR) && HAVE(GROUP_ACTIVITIES)
     4930    if (frame->isMainFrame())
     4931        GroupActivitiesSessionNotifier::sharedNotifier().webPageURLChanged(*this);
    49244932#endif
    49254933}

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r279060 r279133  
    44        classes = {
    55        };
    6         objectVersion = 52;
     6        objectVersion = 54;
    77        objects = {
    88
    … …  
    19041904                CD8252DE25D4916C00862FD8 /* RemoteRemoteCommandListenerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD8252DA25D4915400862FD8 /* RemoteRemoteCommandListenerProxyMessageReceiver.cpp */; };
    19051905                CD8252E225D4919100862FD8 /* RemoteRemoteCommandListenerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD8252E025D4918400862FD8 /* RemoteRemoteCommandListenerMessageReceiver.cpp */; };
    1906                 CD9549432615917B008372D9 /* WKGroupSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDF17CC3260E8FAB00F0A4E8 /* WKGroupSession.swift */; };
    19071906                CDA041F41ACE2105004A13EC /* BackBoardServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA041F31ACE2105004A13EC /* BackBoardServicesSPI.h */; };
    19081907                CDA29A1B1CBDBF4100901CCF /* PlaybackSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A191CBDBF4100901CCF /* PlaybackSessionManager.h */; };
    … …  
    19381937                CDE555342406EB8C008A3DDB /* RemoteLegacyCDMSessionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDE5552E2406B897008A3DDB /* RemoteLegacyCDMSessionMessageReceiver.cpp */; };
    19391938                CDE555352406EB8C008A3DDB /* RemoteLegacyCDMSessionProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDE555312406B897008A3DDB /* RemoteLegacyCDMSessionProxyMessageReceiver.cpp */; };
     1939                CDF1B915266F396A0007EC10 /* WKGroupSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDF1B90D266F395E0007EC10 /* WKGroupSession.swift */; };
     1940                CDF1B91B267025550007EC10 /* WebKitSwiftSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDF1B91A267021D60007EC10 /* WebKitSwiftSoftLink.mm */; };
    19401941                CE11AD521CBC482F00681EE5 /* CodeSigning.h in Headers */ = {isa = PBXBuildFile; fileRef = CE11AD511CBC482F00681EE5 /* CodeSigning.h */; };
    19411942                CE1A0BD61A48E6C60054EF74 /* TCCSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1A0BD01A48E6C60054EF74 /* TCCSPI.h */; };
    … …  
    58135814                CDE555312406B897008A3DDB /* RemoteLegacyCDMSessionProxyMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteLegacyCDMSessionProxyMessageReceiver.cpp; sourceTree = "<group>"; };
    58145815                CDF17CC3260E8FAB00F0A4E8 /* WKGroupSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WKGroupSession.swift; sourceTree = "<group>"; };
     5816                CDF1B90D266F395E0007EC10 /* WKGroupSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKGroupSession.swift; sourceTree = "<group>"; };
     5817                CDF1B90E266F395E0007EC10 /* GroupActivitiesSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GroupActivitiesSession.h; sourceTree = "<group>"; };
     5818                CDF1B90F266F395E0007EC10 /* GroupActivitiesCoordinator.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GroupActivitiesCoordinator.mm; sourceTree = "<group>"; };
     5819                CDF1B910266F395E0007EC10 /* WKGroupSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKGroupSession.h; sourceTree = "<group>"; };
     5820                CDF1B911266F395E0007EC10 /* GroupActivitiesSession.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GroupActivitiesSession.mm; sourceTree = "<group>"; };
     5821                CDF1B912266F395E0007EC10 /* GroupActivitiesCoordinator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GroupActivitiesCoordinator.h; sourceTree = "<group>"; };
     5822                CDF1B913266F395E0007EC10 /* GroupActivitiesSessionNotifier.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GroupActivitiesSessionNotifier.mm; sourceTree = "<group>"; };
     5823                CDF1B914266F395F0007EC10 /* GroupActivitiesSessionNotifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GroupActivitiesSessionNotifier.h; sourceTree = "<group>"; };
     5824                CDF1B919267021D60007EC10 /* WebKitSwiftSoftLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebKitSwiftSoftLink.h; sourceTree = "<group>"; };
     5825                CDF1B91A267021D60007EC10 /* WebKitSwiftSoftLink.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WebKitSwiftSoftLink.mm; sourceTree = "<group>"; };
    58155826                CE11AD4F1CBC47F800681EE5 /* CodeSigning.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CodeSigning.mm; sourceTree = "<group>"; };
    58165827                CE11AD511CBC482F00681EE5 /* CodeSigning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeSigning.h; sourceTree = "<group>"; };
    … …  
    70107021                        children = (
    70117022                                CDF17C93260D3B5200F0A4E8 /* Coordinator */,
     7023                                CDF1B90C266F395E0007EC10 /* GroupActivities */,
    70127024                                57FD316B22B3367E008D0E8B /* SOAuthorization */,
    70137025                                99C81D551C20DFBE005C4C82 /* AutomationClient.h */,
    … …  
    70647076                                C18F3A13256332A600797E66 /* WebInspectorPreferenceObserver.h */,
    70657077                                C18F3A142563334300797E66 /* WebInspectorPreferenceObserver.mm */,
     7078                                CDF1B919267021D60007EC10 /* WebKitSwiftSoftLink.h */,
     7079                                CDF1B91A267021D60007EC10 /* WebKitSwiftSoftLink.mm */,
    70667080                                1AC0273E196622D600C12B75 /* WebPageProxyCocoa.mm */,
    70677081                                7C4694CB1A4B510A00AD5845 /* WebPasteboardProxyCocoa.mm */,
    … …  
    1147311487                        path = usr/local/include/WebKitAdditions;
    1147411488                        sourceTree = BUILT_PRODUCTS_DIR;
     11489                };
     11490                CDF1B90C266F395E0007EC10 /* GroupActivities */ = {
     11491                        isa = PBXGroup;
     11492                        children = (
     11493                                CDF1B912266F395E0007EC10 /* GroupActivitiesCoordinator.h */,
     11494                                CDF1B90F266F395E0007EC10 /* GroupActivitiesCoordinator.mm */,
     11495                                CDF1B90E266F395E0007EC10 /* GroupActivitiesSession.h */,
     11496                                CDF1B911266F395E0007EC10 /* GroupActivitiesSession.mm */,
     11497                                CDF1B914266F395F0007EC10 /* GroupActivitiesSessionNotifier.h */,
     11498                                CDF1B913266F395E0007EC10 /* GroupActivitiesSessionNotifier.mm */,
     11499                                CDF1B910266F395E0007EC10 /* WKGroupSession.h */,
     11500                                CDF1B90D266F395E0007EC10 /* WKGroupSession.swift */,
     11501                        );
     11502                        path = GroupActivities;
     11503                        sourceTree = "<group>";
    1147511504                };
    1147611505                CE1A0BCA1A48E6C60054EF74 /* spi */ = {
    … …  
    1328013309                        buildConfigurationList = CD95493B26159004008372D9 /* Build configuration list for PBXNativeTarget "WebKitSwift" */;
    1328113310                        buildPhases = (
    13282                                 CDF17CBE260DAD1B00F0A4E8 /* Copy Additional Sources */,
    1328313311                                CD95493126159004008372D9 /* Headers */,
    1328413312                                CD95493226159004008372D9 /* Sources */,
    1328513313                                CD95493326159004008372D9 /* Frameworks */,
    13286                                 CD954942261590EE008372D9 /* Copy ObjC Interface Header */,
    1328713314                        );
    1328813315                        buildRules = (
    … …  
    1396513992                        shellPath = /bin/sh;
    1396613993                        shellScript = "Scripts/generate-derived-sources.sh\n";
    13967                 };
    13968                 CD954942261590EE008372D9 /* Copy ObjC Interface Header */ = {
    13969                         isa = PBXShellScriptBuildPhase;
    13970                         buildActionMask = 2147483647;
    13971                         files = (
    13972                         );
    13973                         inputFileListPaths = (
    13974                         );
    13975                         inputPaths = (
    13976                                 "$(DERIVED_SOURCES_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)",
    13977                         );
    13978                         name = "Copy ObjC Interface Header";
    13979                         outputFileListPaths = (
    13980                         );
    13981                         outputPaths = (
    13982                                 "$(BUILT_PRODUCTS_DIR)/usr/local/include/$(TARGET_NAME)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)",
    13983                         );
    13984                         runOnlyForDeploymentPostprocessing = 0;
    13985                         shellPath = /bin/sh;
    13986                         shellScript = "if [[ \"$WK_HAVE_COORDINATOR\" == \"YES\" ]]\nthen\n    ditto \"${DERIVED_SOURCES_DIR}/${SWIFT_OBJC_INTERFACE_HEADER_NAME}\" \"${BUILT_PRODUCTS_DIR}/usr/local/include/${TARGET_NAME}/${SWIFT_OBJC_INTERFACE_HEADER_NAME}\"\nfi\n";
    13987                 };
    13988                 CDF17CBE260DAD1B00F0A4E8 /* Copy Additional Sources */ = {
    13989                         isa = PBXShellScriptBuildPhase;
    13990                         buildActionMask = 2147483647;
    13991                         files = (
    13992                         );
    13993                         inputFileListPaths = (
    13994                         );
    13995                         inputPaths = (
    13996                                 "$(SDK_DIR)/usr/local/include/WebKitAdditions/WKCoordinator.h",
    13997                                 "$(SDK_DIR)/usr/local/include/WebKitAdditions/WKCoordinator.mm",
    13998                                 "$(SDK_DIR)/usr/local/include/WebKitAdditions/WKGroupSession.swift",
    13999                         );
    14000                         name = "Copy Additional Sources";
    14001                         outputFileListPaths = (
    14002                         );
    14003                         outputPaths = (
    14004                                 "$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/WKCoordinator.h",
    14005                                 "$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/WKCoordinator.mm",
    14006                                 "$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/WKGroupSession.swift",
    14007                         );
    14008                         runOnlyForDeploymentPostprocessing = 0;
    14009                         shellPath = /bin/bash;
    14010                         shellScript = "set -e\n\nRELATIVE_SOURCE_PATH=\"usr/local/include/WebKitAdditions\"\nSOURCE_PATH=\"$SDK_DIR/$RELATIVE_SOURCE_PATH\"\nDESTINATION_PATH=\"$BUILT_PRODUCTS_DIR/$RELATIVE_SOURCE_PATH\"\n\nfor SOURCE in WKCoordinator.h WKCoordinator.mm WKGroupSession.swift; do\n    if [[ \"$SOURCE_PATH/$SOURCE\" -nt \"$DESTINATION_PATH/$SOURCE\" ]]; then\n        ditto \"$SOURCE_PATH/$SOURCE\" \"$DESTINATION_PATH/$SOURCE\"\n    fi\ndone\n";
    1401113994                };
    1401213995                E1AC2E2C20F7B95800B0897D /* Unlock Keychain */ = {
    … …  
    1414414127                                C1A152D724E5A29A00978C8B /* HandleXPCEndpointMessages.mm in Sources */,
    1414514128                                2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */,
     14129                                CDF1B91B267025550007EC10 /* WebKitSwiftSoftLink.mm in Sources */,
    1414614130                                2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */,
    1414714131                                9BF5EC642541145600984E77 /* JSIPCBinding.cpp in Sources */,
    … …  
    1458214566                        buildActionMask = 2147483647;
    1458314567                        files = (
    14584                                 CD9549432615917B008372D9 /* WKGroupSession.swift in Sources */,
     14568                                CDF1B915266F396A0007EC10 /* WKGroupSession.swift in Sources */,
    1458514569                        );
    1458614570                        runOnlyForDeploymentPostprocessing = 0;
Note: See TracChangeset for help on using the changeset viewer.