From 7a21ae831f98fd909692635076aba9e3c66b719a Mon Sep 17 00:00:00 2001
From: Steve Smith <steve@orderedlist.com>
Date: Thu, 12 Sep 2013 11:20:38 -0400
Subject: [PATCH] Skip the whole AtomFramelessWindow.

Just round the web view and set the bounds to the window, not the main
view.
---
 browser/native_window_mac.mm | 40 ++++++++--------------------------------
 1 file changed, 8 insertions(+), 32 deletions(-)

diff --git a/browser/native_window_mac.mm b/browser/native_window_mac.mm
index 7c64f87..23648b7 100644
--- a/browser/native_window_mac.mm
+++ b/browser/native_window_mac.mm
@@ -100,20 +100,6 @@ static const CGFloat kAtomWindowCornerRadius = 4.0;
 
 @end
 
-@interface AtomFramelessNSWindow : AtomNSWindow
-- (void)drawCustomFrameRect:(NSRect)rect forView:(NSView*)view;
-@end
-
-@implementation AtomFramelessNSWindow
-
-- (void)drawCustomFrameRect:(NSRect)rect forView:(NSView*)view {
-  [[NSBezierPath bezierPathWithRect:rect] addClip];
-  [[NSColor clearColor] set];
-  NSRectFill(rect);
-}
-
-@end
-
 @interface ControlRegionView : NSView {
  @private
   atom::NativeWindowMac* shellWindow_;  // Weak; owns self.
@@ -168,24 +154,14 @@ NativeWindowMac::NativeWindowMac(content::WebContents* web_contents,
       height);
 
   AtomNSWindow* atomWindow;
-  NSUInteger style_mask = NSTitledWindowMask | NSClosableWindowMask |
-                          NSMiniaturizableWindowMask | NSResizableWindowMask |
-                          NSTexturedBackgroundWindowMask;
-  if (has_frame_) {
-    atomWindow = [[AtomNSWindow alloc]
-        initWithContentRect:cocoa_bounds
-                  styleMask:style_mask
-                    backing:NSBackingStoreBuffered
-                      defer:YES];
-  } else {
-    atomWindow = [[AtomFramelessNSWindow alloc]
-        initWithContentRect:cocoa_bounds
-                  styleMask:style_mask
-                    backing:NSBackingStoreBuffered
-                      defer:YES];
-    [atomWindow setOpaque:NO];
-    [atomWindow setBackgroundColor:[NSColor clearColor]];
-  }
+
+  atomWindow = [[AtomNSWindow alloc]
+      initWithContentRect:cocoa_bounds
+                styleMask:NSTitledWindowMask | NSClosableWindowMask |
+                            NSMiniaturizableWindowMask | NSResizableWindowMask |
+                            NSTexturedBackgroundWindowMask
+                  backing:NSBackingStoreBuffered
+                    defer:YES];
 
   [atomWindow setShell:this];
   window_ = atomWindow;
-- 
2.7.4