diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /JavaScriptCore/profiler/ProfilerServer.mm | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'JavaScriptCore/profiler/ProfilerServer.mm')
| -rw-r--r-- | JavaScriptCore/profiler/ProfilerServer.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/JavaScriptCore/profiler/ProfilerServer.mm b/JavaScriptCore/profiler/ProfilerServer.mm index a3944de..7d87f96 100644 --- a/JavaScriptCore/profiler/ProfilerServer.mm +++ b/JavaScriptCore/profiler/ProfilerServer.mm @@ -30,7 +30,7 @@ #import "JSRetainPtr.h" #import <Foundation/Foundation.h> -#if PLATFORM(IPHONE_SIMULATOR) +#if PLATFORM(IOS_SIMULATOR) #import <Foundation/NSDistributedNotificationCenter.h> #endif @@ -65,7 +65,7 @@ if ([defaults boolForKey:@"EnableJSProfiling"]) [self startProfiling]; -#if !PLATFORM(IPHONE) || PLATFORM(IPHONE_SIMULATOR) +#if !PLATFORM(IOS) || PLATFORM(IOS_SIMULATOR) // FIXME: <rdar://problem/6546135> // The catch-all notifications [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(startProfiling) name:@"ProfilerServerStartNotification" object:nil]; @@ -76,7 +76,7 @@ NSProcessInfo *processInfo = [NSProcessInfo processInfo]; _serverName = [[NSString alloc] initWithFormat:@"ProfilerServer-%d", [processInfo processIdentifier]]; -#if !PLATFORM(IPHONE) || PLATFORM(IPHONE_SIMULATOR) +#if !PLATFORM(IOS) || PLATFORM(IOS_SIMULATOR) // FIXME: <rdar://problem/6546135> [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(startProfiling) name:[_serverName stringByAppendingString:@"-Start"] object:nil]; [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(stopProfiling) name:[_serverName stringByAppendingString:@"-Stop"] object:nil]; |