Merge pull request nwjs#2924 from jtg-gg/nw12-transparency

rogerwang · rogerwang · commit 080f17062cc8 · 2015-01-13T14:08:06.000+08:00
nw12 transparency rebase
diff --git a/src/browser/native_window.cc b/src/browser/native_window.cc
@@ -27,6 +27,7 @@
 #include "content/nw/src/common/shell_switches.h"
 #include "content/nw/src/nw_package.h"
 #include "content/nw/src/nw_shell.h"
+#include "content/public/common/content_switches.h"
 #include "grit/nw_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/rect.h"
@@ -41,6 +42,7 @@
 
 namespace content {
   extern bool g_support_transparency;
+  extern bool g_force_cpu_draw;
 }
 
 namespace nw {
@@ -78,9 +80,16 @@ NativeWindow::NativeWindow(const base::WeakPtr<content::Shell>& shell,
       capture_page_helper_(NULL) {
   manifest->GetBoolean(switches::kmFrame, &has_frame_);
   content::g_support_transparency = !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kmDisableTransparency);
-  if (content::g_support_transparency)
+  if (content::g_support_transparency) {
+    content::g_force_cpu_draw = base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceCpuDraw);
+    if (content::g_force_cpu_draw) {
+      if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableGpu)) {
+        content::g_force_cpu_draw = false;
+        LOG(WARNING) << "switch " << switches::kForceCpuDraw << " must be used with switch " << switches::kDisableGpu;
+      }
+    }
     manifest->GetBoolean(switches::kmTransparent, &transparent_);
-
+  }
   LoadAppIconFromPackage(manifest);
 }
 
diff --git a/src/browser/native_window_aura.cc b/src/browser/native_window_aura.cc
@@ -44,7 +44,7 @@
 #include "content/nw/src/nw_shell.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_view_host.h"
-#include "content/public/browser/render_widget_host_view.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/common/draggable_region.h"
@@ -84,6 +84,7 @@
 
 namespace content {
   extern bool g_support_transparency;
+  extern bool g_force_cpu_draw;
 }
 
 
@@ -458,15 +459,6 @@ void NativeWindowAura::SetTransparent(bool transparent) {
 
   // this is needed, or transparency will fail if it defined on startup
   bool change_window_style = false;
-
-  if (!has_frame_) {
-    const LONG lastStyle = GetWindowLong(hWnd, GWL_STYLE);
-    const LONG style = WS_CAPTION;
-    const LONG newStyle = transparent ? lastStyle | style : lastStyle & ~style;
-    SetWindowLong(hWnd, GWL_STYLE, newStyle);
-    change_window_style |= lastStyle != newStyle;
-  }
-
   const LONG lastExStyle = GetWindowLong(hWnd, GWL_EXSTYLE);
   const LONG exStyle = WS_EX_COMPOSITED;
   const LONG newExStyle = transparent ? lastExStyle | exStyle : lastExStyle & ~exStyle;
@@ -476,6 +468,13 @@ void NativeWindowAura::SetTransparent(bool transparent) {
   if (change_window_style) {
     window_->FrameTypeChanged();
   }
+
+  if (content::g_force_cpu_draw && transparent) {
+    // Quick FIX where window content is not updated
+    Minimize();
+    Restore();
+  }
+
 #elif defined(USE_X11) && !defined(OS_CHROMEOS)
 
   static char cachedRes = -1;
@@ -497,10 +496,9 @@ void NativeWindowAura::SetTransparent(bool transparent) {
     toolbar_->SchedulePaint();
   }
 
-  content::RenderWidgetHostView* rwhv = shell_->web_contents()->GetRenderWidgetHostView();
-  if (rwhv) {
-    if (transparent)
-      rwhv->SetBackgroundColor(SK_ColorTRANSPARENT);
+  content::RenderViewHostImpl* rvh = static_cast<content::RenderViewHostImpl*>(shell_->web_contents()->GetRenderViewHost());
+  if (rvh) {
+    rvh->SetBackgroundOpaque(!transparent);
   }
 
   transparent_ = transparent;
diff --git a/src/browser/native_window_mac.mm b/src/browser/native_window_mac.mm
@@ -45,6 +45,7 @@
 
 namespace content {
   extern bool g_support_transparency;
+  extern bool g_force_cpu_draw;
 }
 
 @interface NSWindow (NSPrivateApis)
@@ -397,7 +398,7 @@ - (void)drawRect:(NSRect)dirtyRect {
   window_ = shell_window;
   opaque_color_ = [window() backgroundColor];
   [shell_window setShell:shell];
-  [[window() contentView] setWantsLayer:YES];
+  [[window() contentView] setWantsLayer:!content::g_force_cpu_draw];
   [window() setDelegate:[[NativeWindowDelegate alloc] initWithShell:shell]];
 
   SetTransparent(transparent_);
@@ -555,6 +556,23 @@ - (void)drawRect:(NSRect)dirtyRect {
   return is_fullscreen_;
 }
 
+//debug function to iterate all the sublayers
+void SetTransparent (CALayer* layer, const bool transparent) {
+  if (layer == NULL) return;
+  [layer setBackgroundColor:CGColorGetConstantColor(transparent ? kCGColorClear : kCGColorWhite)];
+  for (CALayer* l in layer.sublayers) {
+    SetTransparent(l, transparent);
+  }
+}
+
+//debug function to iterate all the subviews
+void SetTransparent (NSView * view, const bool transparent) {
+  if (view == NULL) return;
+  SetTransparent(view.layer, transparent);
+  for (NSView* v in view.subviews)
+    SetTransparent(v, transparent);
+}
+  
 void NativeWindowCocoa::SetTransparent(bool transparent) {
   
   if (!content::g_support_transparency) return;
@@ -570,10 +588,16 @@ - (void)drawRect:(NSRect)dirtyRect {
   content::RenderViewHostImpl* rvh = static_cast<content::RenderViewHostImpl*>(shell_->web_contents()->GetRenderViewHost());
 
   if (rwhv) {
-    rvh->SetBackgroundOpaque(!transparent);
     [rwhv->background_layer_ setBackgroundColor:CGColorGetConstantColor(transparent ? kCGColorClear : kCGColorWhite)];
   }
   
+  if (rvh) {
+    rvh->SetBackgroundOpaque(!transparent);
+  }
+  
+  //this is for debugging, iterate all the subviews / sublayers
+  //nw::SetTransparent((NSView*)[window()contentView], transparent);
+  
   transparent_ = transparent;
   
 }
