[Mac] Update frameless window implementation to upstream.

zcbenz · zcbenz · commit e58bee2db4b0 · 2012-11-14T10:38:24.000+08:00
diff --git a/nw.gypi b/nw.gypi
@@ -60,6 +60,8 @@
         '<(DEPTH)/chrome/browser/status_icons/status_icon_observer.h',
         '<(DEPTH)/chrome/browser/status_icons/status_tray.cc',
         '<(DEPTH)/chrome/browser/status_icons/status_tray.h',
+        '<(DEPTH)/chrome/browser/ui/cocoa/custom_frame_view.h',
+        '<(DEPTH)/chrome/browser/ui/cocoa/custom_frame_view.mm',
         '<(DEPTH)/chrome/browser/ui/base_window.h',
         '<(DEPTH)/chrome/browser/ui/gtk/gtk_window_util.cc',
         '<(DEPTH)/chrome/browser/ui/gtk/gtk_window_util.h',
diff --git a/src/browser/native_window_mac.mm b/src/browser/native_window_mac.mm
@@ -23,6 +23,7 @@
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/values.h"
+#import "chrome/browser/ui/cocoa/custom_frame_view.h"
 #include "chrome/common/extensions/draggable_region.h"
 #include "content/nw/src/api/menu/menu.h"
 #include "content/nw/src/api/app/app.h"
@@ -172,6 +173,12 @@ - (void)mouseDragged:(NSEvent*)event {
 
 @end
 
+// This is really a method on NSGrayFrame, so it should only be called on the
+// view passed into -[NSWindow drawCustomFrameRect:forView:].
+@interface NSView (PrivateMethods)
+- (CGFloat)roundedCornerRadius;
+@end
+
 @interface ShellNSWindow : UnderlayOpenGLHostingWindow {
  @private
   content::Shell* shell_;
@@ -197,6 +204,52 @@ - (void)closeAllWindows:(id)sender {
 
 @end
 
+@interface ShellFramelessNSWindow : ShellNSWindow
+
+- (void)drawCustomFrameRect:(NSRect)rect forView:(NSView*)view;
+
+@end
+
+@implementation ShellFramelessNSWindow
+
+- (void)drawCustomFrameRect:(NSRect)rect forView:(NSView*)view {
+  [super drawCustomFrameRect:rect forView:view];
+
+  [[NSBezierPath bezierPathWithRect:rect] addClip];
+  [[NSColor clearColor] set];
+  NSRectFill(rect);
+
+  // Set up our clip.
+  CGFloat cornerRadius = 4.0;
+  if ([view respondsToSelector:@selector(roundedCornerRadius)])
+    cornerRadius = [view roundedCornerRadius];
+  [[NSBezierPath bezierPathWithRoundedRect:[view bounds]
+                                   xRadius:cornerRadius
+                                   yRadius:cornerRadius] addClip];
+  [[NSColor whiteColor] set];
+  NSRectFill(rect);
+}
+
++ (NSRect)frameRectForContentRect:(NSRect)contentRect
+                        styleMask:(NSUInteger)mask {
+  return contentRect;
+}
+
++ (NSRect)contentRectForFrameRect:(NSRect)frameRect
+                        styleMask:(NSUInteger)mask {
+  return frameRect;
+}
+
+- (NSRect)frameRectForContentRect:(NSRect)contentRect {
+  return contentRect;
+}
+
+- (NSRect)contentRectForFrameRect:(NSRect)frameRect {
+  return frameRect;
+}
+
+@end
+
 namespace nw {
 
 NativeWindowCocoa::NativeWindowCocoa(
@@ -219,11 +272,20 @@ - (void)closeAllWindows:(id)sender {
   NSUInteger style_mask = NSTitledWindowMask | NSClosableWindowMask |
                           NSMiniaturizableWindowMask | NSResizableWindowMask |
                           NSTexturedBackgroundWindowMask;
-  ShellNSWindow* shell_window = [[ShellNSWindow alloc]
-      initWithContentRect:cocoa_bounds
-                styleMask:style_mask
-                  backing:NSBackingStoreBuffered
-                    defer:NO];
+  ShellNSWindow* shell_window;
+  if (has_frame_) {
+    shell_window = [[ShellNSWindow alloc]
+        initWithContentRect:cocoa_bounds
+                  styleMask:style_mask
+                    backing:NSBackingStoreBuffered
+                      defer:NO];
+  } else {
+    shell_window = [[ShellFramelessNSWindow alloc]
+        initWithContentRect:cocoa_bounds
+                  styleMask:style_mask
+                    backing:NSBackingStoreBuffered
+                      defer:NO];
+  }
   window_ = shell_window;
   [shell_window setShell:shell];
   [window() setDelegate:[[NativeWindowDelegate alloc] initWithShell:shell]];
