diff options
| author | chromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 23:44:58 +0000 |
|---|---|---|
| committer | chromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 23:44:58 +0000 |
| commit | 2ec8df5602bedf518d0119005690b101d5b598ef (patch) | |
| tree | 04b9d44fdc22ceab2d10a02108765729062241c4 /webkit/extensions | |
| parent | 88efcce0d60e09489d8a3761f4c8fd0d4b51c625 (diff) | |
| download | chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.zip chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.tar.gz chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.tar.bz2 | |
Made the OS_LINUX ifdefs in ui/ and webkit/ directories more cross-platform, so that these files can be used on multiple POSIX platforms.
Review URL: http://codereview.chromium.org/6990051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/extensions')
| -rw-r--r-- | webkit/extensions/v8/profiler_extension.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/webkit/extensions/v8/profiler_extension.cc b/webkit/extensions/v8/profiler_extension.cc index 487649a..8683353 100644 --- a/webkit/extensions/v8/profiler_extension.cc +++ b/webkit/extensions/v8/profiler_extension.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,7 +13,7 @@ #include "base/third_party/purify/pure.h" #endif // QUANTIFY -#if defined(USE_TCMALLOC) && defined(OS_LINUX) +#if defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX) #include "third_party/tcmalloc/chromium/src/google/profiler.h" #endif @@ -71,7 +71,7 @@ class ProfilerWrapper : public v8::Extension { const v8::Arguments& args) { #if defined(QUANTIFY) QuantifyStartRecordingData(); -#elif defined(USE_TCMALLOC) && defined(OS_LINUX) +#elif defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX) ::ProfilerStart("chrome-profile"); #endif return v8::Undefined(); @@ -81,7 +81,7 @@ class ProfilerWrapper : public v8::Extension { const v8::Arguments& args) { #if defined(QUANTIFY) QuantifyStopRecordingData(); -#elif defined(USE_TCMALLOC) && defined(OS_LINUX) +#elif defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX) ::ProfilerStop(); #endif return v8::Undefined(); @@ -97,7 +97,7 @@ class ProfilerWrapper : public v8::Extension { static v8::Handle<v8::Value> ProfilerFlush( const v8::Arguments& args) { -#if defined(USE_TCMALLOC) && defined(OS_LINUX) +#if defined(USE_TCMALLOC) && defined(OS_POSIX) && !defined(OS_MACOSX) ::ProfilerFlush(); #endif return v8::Undefined(); |