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

Unified Diff: chrome/common/mac/objc_zombie.mm

Issue 8477018: Pull back some CHECK calls which were removed. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month 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: chrome/common/mac/objc_zombie.mm
diff --git a/chrome/common/mac/objc_zombie.mm b/chrome/common/mac/objc_zombie.mm
index 452aa6f5b34e629a790172970ce33ea05dc3ff0e..18803b6d5b59a7c286580c5706f308f32fcebf46 100644
--- a/chrome/common/mac/objc_zombie.mm
+++ b/chrome/common/mac/objc_zombie.mm
@@ -450,7 +450,7 @@ bool ZombieEnable(bool zombieAllObjects,
size_t zombieCount) {
// Only allow enable/disable on the main thread, just to keep things
// simple.
- DCHECK([NSThread isMainThread]);
+ CHECK([NSThread isMainThread]);
Mark Mentovai 2011/11/05 00:49:02 Can this one stay D?
Scott Hess - ex-Googler 2011/11/08 18:47:51 Done.
if (!ZombieInit())
return false;
@@ -527,15 +527,16 @@ bool ZombieEnable(bool zombieAllObjects,
void ZombieDisable() {
// Only allow enable/disable on the main thread, just to keep things
// simple.
- DCHECK([NSThread isMainThread]);
+ CHECK([NSThread isMainThread]);
Mark Mentovai 2011/11/05 00:49:02 This too?
Scott Hess - ex-Googler 2011/11/08 18:47:51 Done.
// |ZombieInit()| was never called.
if (!g_originalDeallocIMP)
return;
- // Put back the original implementation of -[NSObject dealloc].
+ // Put back the original implementation of -[NSObject dealloc]. If
+ // the replacement is missing, things are fubar.
Method m = class_getInstanceMethod([NSObject class], @selector(dealloc));
- DCHECK(m);
+ CHECK(m);
Mark Mentovai 2011/11/05 00:49:02 This too? If m is 0, the next line will either cra
Scott Hess - ex-Googler 2011/11/08 18:47:51 Done.
method_setImplementation(m, g_originalDeallocIMP);
// Can safely grab this because it only happens on the main thread.

Powered by Google App Engine
This is Rietveld 408576698