MacViews: Fix CompositingWidgetTest.Transparency_DesktopWidgetTranslucent

ui/views/widget/widget_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <memory>
 #include <set>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 3844 matching lines @@
 #endif
       Widget widget;
       InitializeWidgetForOpacity(widget, CreateParams(widget_type), opacity);
 
       // Use NativeWidgetAura directly.
       if (IsMus() &&
           (widget_type == Widget::InitParams::TYPE_WINDOW_FRAMELESS ||
            widget_type == Widget::InitParams::TYPE_CONTROL))
         continue;
 
+#if defined(OS_MACOSX)
+      // Mac always always has a compositing window manager, but doesn't have
+      // transparent titlebars which is what ShouldWindowContentsBeTransparent()
+      // is currently used for. Asking for transparency should get it. Note that
+      // TestViewsDelegate::use_transparent_windows_ determines the result of
+      // INFER_OPACITY: assume it is false.
+      bool should_be_transparent =
+          opacity == Widget::InitParams::TRANSLUCENT_WINDOW;
+#else
+      bool should_be_transparent = widget.ShouldWindowContentsBeTransparent();
+#endif
+
       EXPECT_EQ(IsNativeWindowTransparent(widget.GetNativeWindow()),
-                widget.ShouldWindowContentsBeTransparent());
+                should_be_transparent);

[sadrul, 2016/12/07 18:03:35]

Should NativeWidgetMac::ShouldWindowContentsBeTransparent() be updated instead?
Although from the comment above, it sounds like not?

[tapted, 2016/12/07 23:35:52]

Yeah I thought about it, but I think
NativeWidgetMac::ShouldWindowContentsBeTransparent() is returning the right
thing for now. There's a bit more in the CL description about how tab_strip.cc
uses it.

Looking a the code in TabStrip::GetInactiveAlpha(), I think if I end up needing
to change NativeWidgetMac::ShouldWindowContentsBeTransparent(), the right fix
would be to rename the function to something like `GetNativeWindowFrameAlpha()`,
and return a float (or [0,255], or an SkAlpha). (currently
TabStrip::GetInactiveAlpha() relies on #if defined(USE_ASH))

 
       // When using the Mandoline UI Service, the translucency does not rely on
       // the widget type.
       if (IsMus())
         continue;
 
 #if defined(USE_X11)
       if (HasCompositingManager() &&
           (widget_type == Widget::InitParams::TYPE_DRAG ||
            widget_type == Widget::InitParams::TYPE_WINDOW)) {
@@ skipping 15 matching lines @@
 
 // Test opacity when compositing is enabled.
 TEST_F(CompositingWidgetTest, Transparency_DesktopWidgetInferOpacity) {
   CheckAllWidgetsForOpacity(Widget::InitParams::INFER_OPACITY);
 }
 
 TEST_F(CompositingWidgetTest, Transparency_DesktopWidgetOpaque) {
   CheckAllWidgetsForOpacity(Widget::InitParams::OPAQUE_WINDOW);
 }
 
-// Failing on Mac. http://cbrug.com/623421
-#if defined(OS_MACOSX)
-#define MAYBE_Transparency_DesktopWidgetTranslucent \
-    DISABLED_Transparency_DesktopWidgetTranslucent
-#else
-#define MAYBE_Transparency_DesktopWidgetTranslucent \
-    Transparency_DesktopWidgetTranslucent
-#endif
-TEST_F(CompositingWidgetTest, MAYBE_Transparency_DesktopWidgetTranslucent) {
+TEST_F(CompositingWidgetTest, Transparency_DesktopWidgetTranslucent) {
   CheckAllWidgetsForOpacity(Widget::InitParams::TRANSLUCENT_WINDOW);
 }
 
 #endif  // !defined(OS_CHROMEOS)
 
 }  // namespace test
 }  // namespace views