Title: [157978] branches/safari-537.73-branch/Source/WTF
- Revision
- 157978
- Author
- [email protected]
- Date
- 2013-10-24 18:34:56 -0700 (Thu, 24 Oct 2013)
Log Message
Merged r154655. <rdar://problem/15109412>
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WTF/ChangeLog (157977 => 157978)
--- branches/safari-537.73-branch/Source/WTF/ChangeLog 2013-10-25 01:32:06 UTC (rev 157977)
+++ branches/safari-537.73-branch/Source/WTF/ChangeLog 2013-10-25 01:34:56 UTC (rev 157978)
@@ -1,5 +1,19 @@
2013-10-24 Lucas Forschler <[email protected]>
+ Merge r154655
+
+ 2013-08-26 Andy Estes <[email protected]>
+
+ Don't leak objects in HardAutorelease when OBJC_NO_GC is undefined but
+ Objective-C GC is disabled at runtime.
+
+ Reviewed by Darin Adler.
+
+ * wtf/ObjcRuntimeExtras.h:
+ (HardAutorelease):
+
+2013-10-24 Lucas Forschler <[email protected]>
+
Merge r154647
2013-08-23 Andy Estes <[email protected]>
Modified: branches/safari-537.73-branch/Source/WTF/wtf/ObjcRuntimeExtras.h (157977 => 157978)
--- branches/safari-537.73-branch/Source/WTF/wtf/ObjcRuntimeExtras.h 2013-10-25 01:32:06 UTC (rev 157977)
+++ branches/safari-537.73-branch/Source/WTF/wtf/ObjcRuntimeExtras.h 2013-10-25 01:34:56 UTC (rev 157978)
@@ -51,7 +51,8 @@
#ifndef OBJC_NO_GC
if (object)
CFMakeCollectable(object);
-#elif !__has_feature(objc_arc)
+#endif
+#if !__has_feature(objc_arc)
[(id)object autorelease];
#endif
return (id)object;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
