From 2413eebd7b554688e2268f1294f8bead4f792ce4 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 13 Dec 2013 00:57:08 +0800 Subject: [PATCH] Disable accelerated compositing to fix everything. --- app/atom_main_delegate.cc | 7 ++++++- browser/ui/atom_event_processing_window.h | 4 +--- vendor/brightray | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/atom_main_delegate.cc b/app/atom_main_delegate.cc index 4a9581e343..1f3d9cb690 100644 --- 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 3080084195..92a2471246 100644 --- a/browser/ui/atom_event_processing_window.h +++ b/browser/ui/atom_event_processing_window.h @@ -7,12 +7,10 @@ #import -#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 4ca4ef93c5..927194b05e 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit 4ca4ef93c54c30001e0cac1da8a681c5af4f3cbb +Subproject commit 927194b05eafd56df6633d225919a65d2e2812ee