[Transparency] add switch to disable the code

jefry-vcube · jefry-vcube · commit c740fd60fcfd · 2014-11-20T16:33:19.000+08:00
diff --git a/src/browser/native_window.cc b/src/browser/native_window.cc
@@ -22,6 +22,7 @@
 
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
+#include "base/command_line.h"
 #include "content/nw/src/browser/capture_page_helper.h"
 #include "content/nw/src/common/shell_switches.h"
 #include "content/nw/src/nw_package.h"
@@ -38,6 +39,9 @@
 #include "content/nw/src/browser/native_window_aura.h"
 #endif
 
+namespace content {
+  extern bool g_support_transparency;
+}
 
 namespace nw {
 
@@ -73,7 +77,9 @@ NativeWindow::NativeWindow(const base::WeakPtr<content::Shell>& shell,
       has_frame_(true),
       capture_page_helper_(NULL) {
   manifest->GetBoolean(switches::kmFrame, &has_frame_);
-  manifest->GetBoolean(switches::kmTransparent, &transparent_);
+  content::g_support_transparency = !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kmDisableTransparency);
+  if (content::g_support_transparency)
+    manifest->GetBoolean(switches::kmTransparent, &transparent_);
 
   LoadAppIconFromPackage(manifest);
 }
diff --git a/src/browser/native_window_aura.cc b/src/browser/native_window_aura.cc
@@ -82,6 +82,9 @@
 #include "ash/accelerators/accelerator_table.h"
 #endif
 
+namespace content {
+  extern bool g_support_transparency;
+}
 
 
 namespace nw {
@@ -296,7 +299,8 @@ NativeWindowAura::NativeWindowAura(const base::WeakPtr<content::Shell>& shell,
   params.delegate = this;
   params.remove_standard_frame = !has_frame();
   params.use_system_default_icon = true;
-  if (transparent_) params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
+  if (content::g_support_transparency && transparent_)
+    params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   if (is_fullscreen_)
     params.show_state = ui::SHOW_STATE_FULLSCREEN;
 
@@ -396,6 +400,8 @@ bool NativeWindowAura::IsFullscreen() {
 }
 
 void NativeWindowAura::SetTransparent(bool transparent) {
+  if (!content::g_support_transparency)
+    return;
 #if defined(OS_WIN)
   // Check for Windows Vista or higher, transparency isn't supported in 
   // anything lower. 
diff --git a/src/browser/native_window_mac.mm b/src/browser/native_window_mac.mm
@@ -41,6 +41,10 @@
 #include "third_party/skia/include/core/SkRegion.h"
 #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
 
+namespace content {
+  extern bool g_support_transparency;
+}
+
 @interface NSWindow (NSPrivateApis)
 - (void)setBottomCornerRounded:(BOOL)rounded;
 @end
@@ -282,7 +286,7 @@ - (void)drawCustomFrameRect:(NSRect)rect forView:(NSView*)view {
   [[NSBezierPath bezierPathWithRoundedRect:[view bounds]
                                    xRadius:cornerRadius
                                    yRadius:cornerRadius] addClip];
-  if ([self isOpaque])
+  if ([self isOpaque] || !content::g_support_transparency)
     [[NSColor whiteColor] set];
   else
     [[NSColor clearColor] set];
@@ -548,6 +552,7 @@ - (void)drawRect:(NSRect)dirtyRect {
 
 void NativeWindowCocoa::SetTransparent(bool transparent) {
   
+  if (!content::g_support_transparency) return;
   if (!transparent_ && transparent) {
     opaque_color_ = [window() backgroundColor];
   }
diff --git a/src/common/shell_switches.cc b/src/common/shell_switches.cc
@@ -73,6 +73,7 @@ const char kmAsDesktop[]  = "as_desktop";
 const char kmFullscreen[] = "fullscreen";
 const char kmInitialFocus[] = "focus";
 const char kmTransparent[] = "transparent";
+const char kmDisableTransparency[] = "disable_transparency";
 
 // Make windows icon hide show or hide in taskbar.
 const char kmShowInTaskbar[] = "show_in_taskbar";
diff --git a/src/common/shell_switches.h b/src/common/shell_switches.h
@@ -55,6 +55,7 @@ extern const char kmKiosk[];
 extern const char kmAlwaysOnTop[];
 extern const char kmInitialFocus[];
 extern const char kmTransparent[];
+extern const char kmDisableTransparency[];
 
 extern const char kmWebgl[];
 extern const char kmJava[];
