Title: [135854] trunk/Source/WTF
- Revision
- 135854
- Author
- [email protected]
- Date
- 2012-11-27 05:52:21 -0800 (Tue, 27 Nov 2012)
Log Message
Unreviewed, rolling out r135828.
http://trac.webkit.org/changeset/135828
https://bugs.webkit.org/show_bug.cgi?id=103405
[Chromium] Multiple ASAN errors after a WebKit roll due to
mismatched malloc/delete (not free) resulting from
StringImpl::deref() (Requested by apavlov on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-11-27
* wtf/FastAllocBase.h:
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (135853 => 135854)
--- trunk/Source/WTF/ChangeLog 2012-11-27 13:49:51 UTC (rev 135853)
+++ trunk/Source/WTF/ChangeLog 2012-11-27 13:52:21 UTC (rev 135854)
@@ -1,3 +1,16 @@
+2012-11-27 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r135828.
+ http://trac.webkit.org/changeset/135828
+ https://bugs.webkit.org/show_bug.cgi?id=103405
+
+ [Chromium] Multiple ASAN errors after a WebKit roll due to
+ mismatched malloc/delete (not free) resulting from
+ StringImpl::deref() (Requested by apavlov on #webkit).
+
+ * wtf/FastAllocBase.h:
+ * wtf/Platform.h:
+
2012-11-26 Adam Barth <[email protected]>
[Chromium] fastMalloc has an extra branch on Windows
Modified: trunk/Source/WTF/wtf/FastAllocBase.h (135853 => 135854)
--- trunk/Source/WTF/wtf/FastAllocBase.h 2012-11-27 13:49:51 UTC (rev 135853)
+++ trunk/Source/WTF/wtf/FastAllocBase.h 2012-11-27 13:52:21 UTC (rev 135854)
@@ -93,8 +93,6 @@
#include <wtf/StdLibExtras.h>
#include <wtf/TypeTraits.h>
-#if ENABLE(PER_OBJECT_FASTMALLOC_NEW)
-
#define WTF_MAKE_FAST_ALLOCATED \
public: \
void* operator new(size_t, void* p) { return p; } \
@@ -133,14 +131,6 @@
private: \
typedef int __thisIsHereToForceASemicolonAfterThisMacro
-#else // !ENABLE(PER_OBJECT_FASTMALLOC_NEW)
-
-#define WTF_MAKE_FAST_ALLOCATED \
-private: \
-typedef int __thisIsHereToForceASemicolonAfterThisMacro
-
-#endif
-
namespace WTF {
// fastNew / fastDelete
Modified: trunk/Source/WTF/wtf/Platform.h (135853 => 135854)
--- trunk/Source/WTF/wtf/Platform.h 2012-11-27 13:49:51 UTC (rev 135853)
+++ trunk/Source/WTF/wtf/Platform.h 2012-11-27 13:52:21 UTC (rev 135854)
@@ -579,16 +579,15 @@
#endif
#if PLATFORM(CHROMIUM)
+#if OS(DARWIN)
/* We can't override the global operator new and delete on OS(DARWIN) because
- * some object are allocated by WebKit and deallocated by the embedder.
- *
- * On non-OS(DARWIN), the "system malloc" is actually TCMalloc anyway, so there's
- * no need to use WebKit's copy of TCMalloc. */
+ * some object are allocated by WebKit and deallocated by the embedder. */
#define ENABLE_GLOBAL_FASTMALLOC_NEW 0
-#if !OS(DARWIN)
-#define ENABLE_PER_OBJECT_FASTMALLOC_NEW 0
+#else /* !OS(DARWIN) */
+/* On non-OS(DARWIN), the "system malloc" is actually TCMalloc anyway, so there's
+ * no need to use WebKit's copy of TCMalloc. */
#define USE_SYSTEM_MALLOC 1
-#endif /* !OS(DARWIN) */
+#endif /* OS(DARWIN) */
#endif /* PLATFORM(CHROMIUM) */
#if PLATFORM(IOS)
@@ -824,10 +823,6 @@
#define ENABLE_GLOBAL_FASTMALLOC_NEW 1
#endif
-#if !defined(ENABLE_PER_OBJECT_FASTMALLOC_NEW)
-#define ENABLE_PER_OBJECT_FASTMALLOC_NEW 1
-#endif
-
#if !defined(ENABLE_PARSED_STYLE_SHEET_CACHING)
#define ENABLE_PARSED_STYLE_SHEET_CACHING 1
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
