Back out cset 143ddd8eded9 (bug 1117635) for breaking some people's OS X builds on a CLOSED TREE. a=RyanVM
authorChris Peterson <cpeterson@mozilla.com>
Wed, 07 Jan 2015 11:58:19 -0800
changeset 248362 a39d8f6fc252d83379c019d5bdf44cb640584615
parent 248361 9b49d075575fede0e0dac9d91e27e27b8dadbf1f
child 248363 0962698c14a0458765a2774f16b7ae3abeb1bfb8
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRyanVM
bugs1117635
milestone37.0a1
backs out143ddd8eded99c6ef815efec3bfe3dc41d7b8acf
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out cset 143ddd8eded9 (bug 1117635) for breaking some people's OS X builds on a CLOSED TREE. a=RyanVM
toolkit/xre/MacApplicationDelegate.mm
--- a/toolkit/xre/MacApplicationDelegate.mm
+++ b/toolkit/xre/MacApplicationDelegate.mm
@@ -41,17 +41,17 @@ public:
   ~AutoAutoreleasePool()
   {
     [mLocalPool release];
   }
 private:
   NSAutoreleasePool *mLocalPool;
 };
 
-@interface MacApplicationDelegate : NSObject<NSApplicationDelegate>
+@interface MacApplicationDelegate : NSObject
 {
 }
 
 @end
 
 static bool sProcessedGetURLEvent = false;
 
 @class GeckoNSApplication;
@@ -84,17 +84,17 @@ SetupMacApplicationDelegate()
 
   // This call makes it so that application:openFile: doesn't get bogus calls
   // from Cocoa doing its own parsing of the argument string. And yes, we need
   // to use a string with a boolean value in it. That's just how it works.
   [[NSUserDefaults standardUserDefaults] setObject:@"NO"
                                             forKey:@"NSTreatUnknownArgumentsAsOpen"];
 
   // Create the delegate. This should be around for the lifetime of the app.
-  id<NSApplicationDelegate> delegate = [[MacApplicationDelegate alloc] init];
+  MacApplicationDelegate *delegate = [[MacApplicationDelegate alloc] init];
   [NSApp setDelegate:delegate];
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
 // Indirectly make the OS process any pending GetURL Apple events.  This is
 // done via _DPSNextEvent() (an undocumented AppKit function called from
 // [NSApplication nextEventMatchingMask:untilDate:inMode:dequeue:]).  Apple