Changeset 205420 in webkit


Ignore:
Timestamp:
Sep 4, 2016 11:11:57 AM (8 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] Wrapping XPC service execution in os_activity is no longer needed
​https://bugs.webkit.org/show_bug.cgi?id=161577

Reviewed by Sam Weinig.

Removed code that created an os_activity around the execution of the XPC service
code, because this workaround is no longer needed.

  • DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm:

(DatabaseServiceInitializer):

  • NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm:

(NetworkServiceInitializer):

  • PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm:

(PluginServiceInitializer):

  • WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm:

(WebContentServiceInitializer):

Location:
trunk/Source/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r205418 r205420  
     12016-09-04  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Wrapping XPC service execution in os_activity is no longer needed
     4        https://bugs.webkit.org/show_bug.cgi?id=161577
     5
     6        Reviewed by Sam Weinig.
     7
     8        Removed code that created an os_activity around the execution of the XPC service
     9        code, because this workaround is no longer needed.
     10
     11        * DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm:
     12        (DatabaseServiceInitializer):
     13        * NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm:
     14        (NetworkServiceInitializer):
     15        * PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm:
     16        (PluginServiceInitializer):
     17        * WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm:
     18        (WebContentServiceInitializer):
     19
    1202016-09-04  Commit Queue  <commit-queue@webkit.org>
    221

  • trunk/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseServiceEntryPoint.mm

    r202723 r205420  
    3131#import "XPCServiceEntryPoint.h"
    3232
    33 #if HAVE(OS_ACTIVITY)
    34 #include <os/activity.h>
    35 #endif
    36 
    3733using namespace WebKit;
    3834
    … …  
    4137void DatabaseServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage)
    4238{
    43 #if HAVE(OS_ACTIVITY)
    44 #pragma clang diagnostic push
    45 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
    46     os_activity_t activity = os_activity_start("com.apple.WebKit.Databases", OS_ACTIVITY_FLAG_DEFAULT);
    47 #pragma clang diagnostic pop
    48 #endif
    49 
    5039    XPCServiceInitializer<DatabaseProcess, XPCServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);
    51 
    52 #if HAVE(OS_ACTIVITY)
    53 #pragma clang diagnostic push
    54 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
    55     os_activity_end(activity);
    56 #pragma clang diagnostic pop
    57 #endif
    5840}

  • trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm

    r202723 r205420  
    3131#import "XPCServiceEntryPoint.h"
    3232
    33 #if HAVE(OS_ACTIVITY)
    34 #include <os/activity.h>
    35 #endif
    36 
    3733namespace WebKit {
    3834
    … …  
    5652    // the this process don't try to insert the shim and crash.
    5753    EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/SecItemShim.dylib");
    58 
    59 #if HAVE(OS_ACTIVITY)
    60 #pragma clang diagnostic push
    61 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
    62     os_activity_t activity = os_activity_start("com.apple.WebKit.Networking", OS_ACTIVITY_FLAG_DEFAULT);
    63 #pragma clang diagnostic pop
    64 #endif
    65 
    6654    XPCServiceInitializer<NetworkProcess, NetworkServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);
    67 
    68 #if HAVE(OS_ACTIVITY)
    69 #pragma clang diagnostic push
    70 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
    71     os_activity_end(activity);
    72 #pragma clang diagnostic pop
    73 #endif
    7455}

  • trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm

    r202723 r205420  
    3131#import "XPCServiceEntryPoint.h"
    3232#import <wtf/RunLoop.h>
    33 
    34 #if HAVE(OS_ACTIVITY)
    35 #include <os/activity.h>
    36 #endif
    3733
    3834#if ENABLE(NETSCAPE_PLUGIN_API)
    … …  
    8076    // spawned by the PluginProcess don't try to insert the shim and crash.
    8177    EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/PluginProcessShim.dylib");
    82 
    83 #if HAVE(OS_ACTIVITY)
    84 #pragma clang diagnostic push
    85 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
    86     os_activity_t activity = os_activity_start("com.apple.WebKit.Plugin", OS_ACTIVITY_FLAG_DEFAULT);
    87 #pragma clang diagnostic pop
    88 #endif
    89 
    9078    XPCServiceInitializer<PluginProcess, PluginServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);
    91 
    92 #if HAVE(OS_ACTIVITY)
    93 #pragma clang diagnostic push
    94 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
    95     os_activity_end(activity);
    96 #pragma clang diagnostic pop
    97 #endif
    9879#endif // ENABLE(NETSCAPE_PLUGIN_API)
    9980}

  • trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm

    r204466 r205420  
    3636#endif
    3737
    38 #if HAVE(OS_ACTIVITY)
    39 #include <os/activity.h>
    40 #endif
    41 
    4238using namespace WebCore;
    4339using namespace WebKit;
    … …  
    5147    EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/WebProcessShim.dylib");
    5248
    53 #if HAVE(OS_ACTIVITY)
    54 #pragma clang diagnostic push
    55 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
    56     os_activity_t activity = os_activity_start("com.apple.WebKit.WebContent", OS_ACTIVITY_FLAG_DEFAULT);
    57 #pragma clang diagnostic pop
    58 #endif
    59 
    6049#if PLATFORM(IOS)
    6150    GSInitialize();
    … …  
    6453
    6554    XPCServiceInitializer<WebProcess, XPCServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage);
    66 
    67 #if HAVE(OS_ACTIVITY)
    68 #pragma clang diagnostic push
    69 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
    70     os_activity_end(activity);
    71 #pragma clang diagnostic pop
    72 #endif
    7355}
Note: See TracChangeset for help on using the changeset viewer.