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

Unified Diff: Source/config.h

Issue 148013010: Use PartitionAlloc for fastMalloc on Android (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reupload Created 6 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/config.h
diff --git a/Source/config.h b/Source/config.h
index 760d280b728481220ac234b9cb962b6124c269ec..356b8b2c275ef82f8ab47766be9e39bf6b17c0a3 100644
--- a/Source/config.h
+++ b/Source/config.h
@@ -98,14 +98,13 @@
#if OS(MACOSX)
#define WTF_USE_CF 1
#define WTF_USE_RUBBER_BANDING 1
+#endif /* OS(MACOSX) */
-/* We can't override the global operator new and delete on OS(MACOSX) because
- * some object are allocated by WebKit and deallocated by the embedder. */
-#else /* !OS(MACOSX) */
-/* On non-OS(MACOSX), the "system malloc" is actually TCMalloc anyway, so there's
+#if !OS(MACOSX) && !OS(ANDROID)
+/* On other platforms the "system malloc" is TCMalloc, so there's
* no need to use Blink's fast PartitionAlloc allocator. */
#define WTF_USE_SYSTEM_MALLOC 1
-#endif /* OS(MACOSX) */
+#endif /* !OS(MACOSX) && !OS(ANDROID) */
#if OS(POSIX)
#define HAVE_MMAP 1
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698