Disable accelerated compositing to fix everything.

diff --git a/app/atom_main_delegate.cc b/app/atom_main_delegate.cc
index 4a9581e..1f3d9cb 100644 (file)
--- a/app/atom_main_delegate.cc
+++ b/app/atom_main_delegate.cc
@@ -46,9 +46,14 @@ void AtomMainDelegate::PreSandboxStartup() {
 #endif
   InitializeResourceBundle();
 
-  // Disable renderer sandbox for most of node's functions.
   CommandLine* command_line = CommandLine::ForCurrentProcess();
+
+  // Disable renderer sandbox for most of node's functions.
   command_line->AppendSwitch(switches::kNoSandbox);
+
+  // Disable accelerated compositing since it caused a lot of troubles (black
+  // devtools, screen flashes) and needed lots of effort to make it right.
+  command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
 }
 
 void AtomMainDelegate::InitializeResourceBundle() {

diff --git a/browser/ui/atom_event_processing_window.h b/browser/ui/atom_event_processing_window.h
index 3080084..92a2471 100644 (file)
--- a/browser/ui/atom_event_processing_window.h
+++ b/browser/ui/atom_event_processing_window.h
@@ -7,12 +7,10 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "ui/base/cocoa/underlay_opengl_hosting_window.h"
-
 // Override NSWindow to access unhandled keyboard events (for command
 // processing); subclassing NSWindow is the only method to do
 // this.
-@interface AtomEventProcessingWindow : UnderlayOpenGLHostingWindow {
+@interface AtomEventProcessingWindow : NSWindow {
  @private
   BOOL redispatchingEvent_;
   BOOL eventHandled_;

diff --git a/vendor/brightray b/vendor/brightray
index 4ca4ef9..927194b 160000 (submodule)
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 4ca4ef93c54c30001e0cac1da8a681c5af4f3cbb
+Subproject commit 927194b05eafd56df6633d225919a65d2e2812ee