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

Changeset 285729 in webkit


Ignore:
Timestamp:
Nov 12, 2021, 9:52:26 AM (5 years ago)
Author:
Chris Dumez
Message:

Rename ProcessLauncherMac.mm to ProcessLauncherDarwin.mm
​https://bugs.webkit.org/show_bug.cgi?id=233045

Reviewed by Brent Fulgham.

Rename ProcessLauncherMac.mm to ProcessLauncherDarwin.mm since this implementation is used by both macOS and iOS.
I chose the Darwin naming (as opposed to the Cocoa one) because the implementation only relies on libXPC and mach.

  • SourcesCocoa.txt:
  • UIProcess/Launcher/darwin/ProcessLauncherDarwin.mm: Renamed from Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm.

(WebKit::serviceName):
(WebKit::shouldLeakBoost):
(WebKit::systemDirectoryPath):
(WebKit::ProcessLauncher::launchProcess):
(WebKit::ProcessLauncher::terminateProcess):
(WebKit::ProcessLauncher::platformInvalidate):
(WebKit::ProcessLauncher::terminateXPCConnection):
(WebKit::terminateWithReason):

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

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r285726 r285729  
     12021-11-12  Chris Dumez  <cdumez@apple.com>
     2
     3        Rename ProcessLauncherMac.mm to ProcessLauncherDarwin.mm
     4        https://bugs.webkit.org/show_bug.cgi?id=233045
     5
     6        Reviewed by Brent Fulgham.
     7
     8        Rename ProcessLauncherMac.mm to ProcessLauncherDarwin.mm since this implementation is used by both macOS and iOS.
     9        I chose the Darwin naming (as opposed to the Cocoa one) because the implementation only relies on libXPC and mach.
     10
     11        * SourcesCocoa.txt:
     12        * UIProcess/Launcher/darwin/ProcessLauncherDarwin.mm: Renamed from Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm.
     13        (WebKit::serviceName):
     14        (WebKit::shouldLeakBoost):
     15        (WebKit::systemDirectoryPath):
     16        (WebKit::ProcessLauncher::launchProcess):
     17        (WebKit::ProcessLauncher::terminateProcess):
     18        (WebKit::ProcessLauncher::platformInvalidate):
     19        (WebKit::ProcessLauncher::terminateXPCConnection):
     20        (WebKit::terminateWithReason):
     21        * WebKit.xcodeproj/project.pbxproj:
     22
    1232021-11-12  Chris Dumez  <cdumez@apple.com>
    224

  • trunk/Source/WebKit/SourcesCocoa.txt

    r285637 r285729  
    512512UIProcess/ios/WKWebEvent.mm
    513513
    514 UIProcess/Launcher/mac/ProcessLauncherMac.mm
     514UIProcess/Launcher/darwin/ProcessLauncherDarwin.mm
    515515
    516516UIProcess/mac/CorrectionPanel.mm

  • trunk/Source/WebKit/UIProcess/Launcher/darwin/ProcessLauncherDarwin.mm

    r285728 r285729  
    11/*
    2  * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010-2021 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    166166        xpc_connection_send_message(m_xpcConnection.get(), preBootstrapMessage.get());
    167167    }
    168    
     168
    169169    // Create the listening port.
    170170    mach_port_t listeningPort = MACH_PORT_NULL;
    … …  
    196196    // FIXME: Switch to xpc_connection_set_bootstrap once it's available everywhere we need.
    197197    auto bootstrapMessage = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
    198    
     198
    199199    if (m_client) {
    200200        if (m_client->shouldConfigureJSCForTesting())
    … …  
    234234    auto errorHandlerImpl = [weakProcessLauncher = WeakPtr { *this }, listeningPort] (xpc_object_t event) {
    235235        ASSERT(!event || xpc_get_type(event) == XPC_TYPE_ERROR);
    236        
     236
    237237        auto processLauncher = weakProcessLauncher.get();
    238238        if (!processLauncher)
    … …  
    329329    if (!m_processIdentifier)
    330330        return;
    331    
     331
    332332    kill(m_processIdentifier, SIGKILL);
    333333    m_processIdentifier = 0;
    334334}
    335    
     335
    336336void ProcessLauncher::platformInvalidate()
    337337{

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

    r285637 r285729  
    37893789                4683569A21E81CC7006E27A3 /* ProvisionalPageProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProvisionalPageProxy.h; sourceTree = "<group>"; };
    37903790                4683569B21E81CC7006E27A3 /* ProvisionalPageProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProvisionalPageProxy.cpp; sourceTree = "<group>"; };
     3791                469DE802273ECC5D00930276 /* ProcessLauncherDarwin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ProcessLauncherDarwin.mm; sourceTree = "<group>"; };
    37913792                46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BackgroundProcessResponsivenessTimer.cpp; sourceTree = "<group>"; };
    37923793                46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackgroundProcessResponsivenessTimer.h; sourceTree = "<group>"; };
    … …  
    51885189                BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = WebPageProxy.cpp; sourceTree = "<group>"; };
    51895190                BC111B0D112F5E4F00337BAB /* WebProcessProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebProcessProxy.cpp; sourceTree = "<group>"; };
    5190                 BC111B1B112F5FE600337BAB /* ProcessLauncherMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ProcessLauncherMac.mm; sourceTree = "<group>"; };
    51915191                BC111B5B112F629800337BAB /* WebEventFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebEventFactory.h; sourceTree = "<group>"; };
    51925192                BC111B5C112F629800337BAB /* WebEventFactory.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebEventFactory.mm; sourceTree = "<group>"; };
    … …  
    84188418                        sourceTree = "<group>";
    84198419                };
     8420                469DE801273ECC5D00930276 /* darwin */ = {
     8421                        isa = PBXGroup;
     8422                        children = (
     8423                                469DE802273ECC5D00930276 /* ProcessLauncherDarwin.mm */,
     8424                        );
     8425                        path = darwin;
     8426                        sourceTree = "<group>";
     8427                };
    84208428                4A410F4119AF7B27002EBAB5 /* MediaStream */ = {
    84218429                        isa = PBXGroup;
    … …  
    1042710435                        isa = PBXGroup;
    1042810436                        children = (
    10429                                 BC111B19112F5FC500337BAB /* mac */,
     10437                                469DE801273ECC5D00930276 /* darwin */,
    1043010438                                1AE117F511DBB30900981615 /* ProcessLauncher.cpp */,
    1043110439                                BC1A7C571136E19C00FB7167 /* ProcessLauncher.h */,
    1043210440                        );
    1043310441                        path = Launcher;
    10434                         sourceTree = "<group>";
    10435                 };
    10436                 BC111B19112F5FC500337BAB /* mac */ = {
    10437                         isa = PBXGroup;
    10438                         children = (
    10439                                 BC111B1B112F5FE600337BAB /* ProcessLauncherMac.mm */,
    10440                         );
    10441                         path = mac;
    1044210442                        sourceTree = "<group>";
    1044310443                };
Note: See TracChangeset for help on using the changeset viewer.