[Transparency][WIN] add "force-cpu-draw" command line switch / global…

… variable for transparency click through Conflicts: ui/views/win/hwnd_message_handler.cc
hdwdsj · Feb 28, 2015 · a9e8631 · a9e8631
1 parent 6b49cbf
commit a9e8631
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/content/browser/compositor/software_output_device_win.cc b/content/browser/compositor/software_output_device_win.cc
@@ -12,8 +12,11 @@
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/gdi_util.h"
 #include "ui/gfx/skia_util.h"
+#include "ui/views/win/hwnd_message_handler.h"
+#include "ui/gfx/win/hwnd_util.h"
 
 namespace content {
+extern bool g_force_cpu_draw;
 
 SoftwareOutputDeviceWin::SoftwareOutputDeviceWin(ui::Compositor* compositor)
     : hwnd_(compositor->widget()),
@@ -71,6 +74,14 @@ void SoftwareOutputDeviceWin::EndPaint(cc::SoftwareFrameData* frame_data) {
 
   SkCanvas* canvas = contents_->sk_canvas();
   DCHECK(canvas);
+
+  if (g_force_cpu_draw) {
+    LONG style = GetWindowLong(hwnd_, GWL_EXSTYLE);
+    is_hwnd_composited_ = !!(style & (WS_EX_COMPOSITED | WS_EX_LAYERED));
+    views::HWNDMessageHandler* window = reinterpret_cast<views::HWNDMessageHandler*>(gfx::GetWindowUserData(hwnd_));
+    is_hwnd_composited_ &= window->remove_standard_frame_;
+  }
+
   if (is_hwnd_composited_) {
     RECT wr;
     GetWindowRect(hwnd_, &wr);

diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -39,6 +39,10 @@
 #include "ui/wm/core/input_method_event_filter.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/public/scoped_tooltip_disabler.h"
+
+namespace content {
+  extern bool g_force_cpu_draw;
+}
 
 DECLARE_WINDOW_PROPERTY_TYPE(views::DesktopWindowTreeHostWin*);
 
@@ -908,6 +912,7 @@ void DesktopWindowTreeHostWin::HandleInputLanguageChange(
 
 bool DesktopWindowTreeHostWin::HandlePaintAccelerated(
     const gfx::Rect& invalid_rect) {
+  if (content::g_force_cpu_draw) return false;
   return native_widget_delegate_->OnNativeWidgetPaintAccelerated(invalid_rect);
 }
 

diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
@@ -46,6 +46,7 @@
 
 namespace content {
   extern bool g_support_transparency;
+  extern bool g_force_cpu_draw;
 }
 
 namespace views {
@@ -2564,7 +2565,7 @@ void HWNDMessageHandler::PerformDwmTransition() {
   // The non-client view needs to update too.
   delegate_->HandleFrameChanged();
 
-  if (IsVisible() && !delegate_->IsUsingCustomFrame()) {
+  if (IsVisible() && !delegate_->IsUsingCustomFrame() && !content::g_force_cpu_draw) {
     // For some reason, we need to hide the window after we change from a custom
     // frame to a native frame.  If we don't, the client area will be filled
     // with black.  This seems to be related to an interaction between DWM and