Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: webkit/extensions/v8/profiler_extension.cc

Issue 6990051: Unix ifdefs patch for ui/ and webkit/ (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: removed some too general ifdefs and ppapi changes Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/extensions/v8/profiler_extension.cc
diff --git a/webkit/extensions/v8/profiler_extension.cc b/webkit/extensions/v8/profiler_extension.cc
index 487649a3bbd716c8e023f15073698656e3e9d6e5..72fc3a7ec83d6cdd33afaf2a70bae3ebf87e3f0b 100644
--- a/webkit/extensions/v8/profiler_extension.cc
+++ b/webkit/extensions/v8/profiler_extension.cc
@@ -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();

Powered by Google App Engine
This is Rietveld 408576698