Use new devtools structure in brightray.

Fixes #210.
Fixes #275.

diff --git a/atom.gyp b/atom.gyp
index d66d19d..bedaf41 100644 (file)
--- a/atom.gyp
+++ b/atom.gyp
@@ -675,6 +675,7 @@
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+              '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
               'external_binaries/Squirrel.framework',
               'external_binaries/ReactiveCocoa.framework',
               'external_binaries/Mantle.framework',

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 19510c8..74bc52b 100644 (file)
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -70,12 +70,6 @@ NativeWindow::NativeWindow(content::WebContents* web_contents,
           brightray::InspectableWebContents::Create(web_contents)) {
   options.Get(switches::kFrame, &has_frame_);
 
-#if defined(OS_MACOSX)
-  // Temporary fix for flashing devtools, try removing this after upgraded to
-  // Chrome 32.
-  web_contents->GetView()->SetAllowOverlappingViews(false);
-#endif
-
   // Read icon before window is created.
   gfx::ImageSkia icon;
   if (options.Get(switches::kIcon, &icon))
@@ -209,11 +203,6 @@ bool NativeWindow::HasModalDialog() {
 
 void NativeWindow::OpenDevTools() {
   inspectable_web_contents()->ShowDevTools();
-#if defined(OS_MACOSX)
-  // Temporary fix for flashing devtools, try removing this after upgraded to
-  // Chrome 32.
-  GetDevToolsWebContents()->GetView()->SetAllowOverlappingViews(false);
-#endif
 }
 
 void NativeWindow::CloseDevTools() {

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index e88491d..c14e816 100644 (file)
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -520,6 +520,12 @@ void NativeWindowMac::HandleKeyboardEvent(
 void NativeWindowMac::InstallView() {
   NSView* view = inspectable_web_contents()->GetView()->GetNativeView();
   if (has_frame_) {
+    // Add layer with white background for the contents view.
+    base::scoped_nsobject<CALayer> layer([[CALayer alloc] init]);
+    [layer setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
+    [view setLayer:layer];
+    [view setWantsLayer:YES];
+
     [view setFrame:[[window_ contentView] bounds]];
     [[window_ contentView] addSubview:view];
   } else {

diff --git a/vendor/brightray b/vendor/brightray
index d8f8787..1e41ef6 160000 (submodule)
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit d8f87871bab2ed0ef5bc6513dbbe5c83ddbfbf47
+Subproject commit 1e41ef63ebd7ecb1ffb3a6fec74b5a5264f20092