From 8ac0c55e32023e56a0225f4938f9bb3e861addba Mon Sep 17 00:00:00 2001 From: Markus Stange Date: Wed, 12 Nov 2008 14:18:18 +0100 Subject: [PATCH] Bug 462245 - Remove override of +[NSGrayFrame drawBevel:...] because it's unnecessary and causes a crash with ShapeShifter on 10.4, r=josh sr=roc a=beltzner --- widget/src/cocoa/nsCocoaWindow.mm | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/widget/src/cocoa/nsCocoaWindow.mm b/widget/src/cocoa/nsCocoaWindow.mm index ed58182445d..38e69c3695c 100644 --- a/widget/src/cocoa/nsCocoaWindow.mm +++ b/widget/src/cocoa/nsCocoaWindow.mm @@ -2129,33 +2129,6 @@ void patternDraw(void* aInfo, CGContextRef aContext) @end -// This is an internal Apple class, which we need to work around a bug in. It is -// the class responsible for drawing the titlebar for metal windows. It actually -// is a few levels deep in the inhertiance graph, but we don't need to know about -// all its superclasses. -@interface NSGrayFrame : NSObject -+ (void)drawBevel:(NSRect)bevel inFrame:(NSRect)frame topCornerRounded:(BOOL)top; -+ (void)drawBevel:(NSRect)bevel inFrame:(NSRect)frame topCornerRounded:(BOOL)top bottomCornerRounded:(BOOL)bottom; -@end - -@implementation NSGrayFrame(DrawingBugWorkaround) - -// Work around a bug in this method -- it draws a strange 1px border on the left and -// right edges of a window. We don't want that, so call the similar method defined -// in the superclass. -+ (void)drawBevel:(NSRect)bevel inFrame:(NSRect)frame topCornerRounded:(BOOL)top bottomCornerRounded:(BOOL)bottom -{ - NS_OBJC_BEGIN_TRY_ABORT_BLOCK; - - if ([self respondsToSelector:@selector(drawBevel:inFrame:topCornerRounded:)]) - [self drawBevel:bevel inFrame:frame topCornerRounded:top]; - - NS_OBJC_END_TRY_ABORT_BLOCK; -} - -@end - - @interface NSWindow (MethodSwizzling) - (void)nsCocoaWindow_NSWindow_sendEvent:(NSEvent *)anEvent; @end