From 279407f7a300e0914b5fdc6b0b6cb0fb3b23a2f8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 5 Oct 2015 19:32:23 +0800
Subject: [PATCH] osx: Fix converting size for frameless window

---
 atom/browser/native_window_mac.mm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 76f9b0d0de07..70c3cfc0cc7b 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -789,12 +789,18 @@ void NativeWindowMac::HandleKeyboardEvent(
 }
 
 gfx::Size NativeWindowMac::ContentSizeToWindowSize(const gfx::Size& size) {
+  if (!has_frame())
+    return size;
+
   NSRect content = NSMakeRect(0, 0, size.width(), size.height());
   NSRect frame = [window_ frameRectForContentRect:content];
   return gfx::Size(frame.size);
 }
 
 gfx::Size NativeWindowMac::WindowSizeToContentSize(const gfx::Size& size) {
+  if (!has_frame())
+    return size;
+
   NSRect frame = NSMakeRect(0, 0, size.width(), size.height());
   NSRect content = [window_ contentRectForFrameRect:frame];
   return gfx::Size(content.size);