Changeset 46180 in webkit for trunk/JavaScriptCore/wtf/FastMalloc.cpp

Timestamp:

Jul 21, 2009, 11:13:11 AM (16 years ago)

Author:

Adam Roben

Message:

Roll out r46153, r46154, and r46155

These changes were causing build failures and assertion failures on
Windows.

JavaScriptCore:

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/JSArray.cpp:
• runtime/StringPrototype.cpp:
• runtime/UString.cpp:
• runtime/UString.h:
• wtf/FastMalloc.cpp:
• wtf/FastMalloc.h:
• wtf/Platform.h:
• wtf/PossiblyNull.h: Removed.

WebCore:

• ForwardingHeaders/wtf/PossiblyNull.h: Removed.
• platform/graphics/cg/ImageBufferCG.cpp:

File:

• trunk/JavaScriptCore/wtf/FastMalloc.cpp (modified) (7 diffs)

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -173 +173 @@
 }
     
-TryMallocReturnValue tryFastZeroedMalloc(size_t n) 
+void* tryFastZeroedMalloc(size_t n) 
 {
-    void* result;
-    if (!tryFastMalloc(n).getValue(result))
+    void* result = tryFastMalloc(n);
+    if (!result)
         return 0;
     memset(result, 0, n);
@@ -195 +195 @@
 namespace WTF {
 
-TryMallocReturnValue tryFastMalloc(size_t n) 
+void* tryFastMalloc(size_t n) 
 {
     ASSERT(!isForbidden());
@@ -231 +231 @@
 }
 
-TryMallocReturnValue tryFastCalloc(size_t n_elements, size_t element_size)
+void* tryFastCalloc(size_t n_elements, size_t element_size)
 {
     ASSERT(!isForbidden());
@@ -286 +286 @@
 }
 
-TryMallocReturnValue tryFastRealloc(void* p, size_t n)
+void* tryFastRealloc(void* p, size_t n)
 {
     ASSERT(!isForbidden());
@@ -3388 +3388 @@
 }
 
-TryMallocReturnValue tryFastMalloc(size_t size)
+void* tryFastMalloc(size_t size)
 {
     return malloc<false>(size);
@@ -3449 +3449 @@
 }
 
-TryMallocReturnValue tryFastCalloc(size_t n, size_t elem_size)
+void* tryFastCalloc(size_t n, size_t elem_size)
 {
     return calloc<false>(n, elem_size);
@@ -3513 +3513 @@
 }
 
-TryMallocReturnValue tryFastRealloc(void* old_ptr, size_t new_size)
+void* tryFastRealloc(void* old_ptr, size_t new_size)
 {
     return realloc<false>(old_ptr, new_size);