Bug 1084589 - Fix a Yosemite topcrasher. r=gijskruitbosch a=gavin
authorSteven Michaud <smichaud@pobox.com>
Fri, 17 Oct 2014 19:36:51 -0500
changeset 225727 3a24d0c65745
parent 225726 f752e25f4c42
child 225728 6b4c22bfe385
push id3993
push usersmichaud@pobox.com
push date2014-10-18 00:37 +0000
treeherdermozilla-beta@3a24d0c65745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgijskruitbosch, gavin
bugs1084589
milestone34.0
Bug 1084589 - Fix a Yosemite topcrasher. r=gijskruitbosch a=gavin
widget/cocoa/nsNativeThemeCocoa.mm
--- a/widget/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/cocoa/nsNativeThemeCocoa.mm
@@ -865,17 +865,17 @@ GetAquaAppearance()
 
 @interface NSObject(NSAppearanceCoreUIRendering)
 - (void)_drawInRect:(CGRect)rect context:(CGContextRef)cgContext options:(id)options;
 @end
 
 static void
 RenderWithCoreUI(CGRect aRect, CGContextRef cgContext, NSDictionary* aOptions)
 {
-  static id appearance = GetAquaAppearance();
+  id appearance = GetAquaAppearance();
 
   if (aRect.size.width * aRect.size.height > BITMAP_MAX_AREA) {
     return;
   }
 
   if (appearance && [appearance respondsToSelector:@selector(_drawInRect:context:options:)]) {
     // Render through NSAppearance on Mac OS 10.10 and up. This will call
     // CUIDraw with a CoreUI renderer that will give us the correct 10.10