viz/mac: Remove GpuSurfaceTracker, redefine gfx::AcceleratedWidget

GpuSurfaceTracker has been removed from all other desktop platforms (in
crrev.com/389975) and is not used on Mac. Remove it.

Include Mac in GPU_SURFACE_HANDLE_IS_ACCELERATED_WINDOW with other
desktop platforms.

Define gfx::AcceleratedWidget to be uint64_t instead of NSView*. It
never actually was NSView*, but was rather a sequence number used to
look up a ui::AcceleratedWidgetMac.

Fix a number of locations that were dangerously mixing NSView* and
gfx::AcceleratedWidget (now that they are incompatible types, this is
a compile error).

Bug: 772576
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I29212236627c512ed6a7fe55a8cf3e613e4e593a
Reviewed-on: https://chromium-review.googlesource.com/792295
Commit-Queue: ccameron <ccameron@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521030}

components/viz/service/display_embedder/software_output_device_mac_unittest.mm

@@ -13,7 +13,7 @@ namespace {
 
 TEST(SoftwareOutputDeviceMacTest, Basics) {
   std::unique_ptr<SoftwareOutputDeviceMac> device(
-      new SoftwareOutputDeviceMac(nullptr));
+      new SoftwareOutputDeviceMac(gfx::kNullAcceleratedWidget));
   gfx::Size pixel_size(512, 512);
   float scale_factor = 1;
 

content/browser/accessibility/browser_accessibility_manager_mac.mm

@@ -17,6 +17,7 @@
 #import "content/browser/accessibility/browser_accessibility_mac.h"
 #include "content/common/accessibility_messages.h"
 #include "content/public/browser/browser_thread.h"
+#include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
 #include "ui/accessibility/ax_role_properties.h"
 
 namespace {
@@ -486,7 +487,10 @@ BrowserAccessibilityManagerMac::GetUserInfoForValueChangedNotification(
 }
 
 NSView* BrowserAccessibilityManagerMac::GetParentView() {
-  return delegate() ? delegate()->AccessibilityGetAcceleratedWidget() : nullptr;
+  gfx::AcceleratedWidget accelerated_widget =
+      delegate() ? delegate()->AccessibilityGetAcceleratedWidget()
+                 : gfx::kNullAcceleratedWidget;
+  return ui::AcceleratedWidgetMac::GetNSView(accelerated_widget);
 }
 
 }  // namespace content

content/browser/gpu/gpu_process_host.cc

@@ -509,7 +509,7 @@ GpuProcessHost::~GpuProcessHost() {
   if (g_gpu_process_hosts[kind_] == this)
     g_gpu_process_hosts[kind_] = nullptr;
 
-#if defined(OS_MACOSX) || defined(OS_ANDROID)
+#if defined(OS_ANDROID)
   UMA_HISTOGRAM_COUNTS_100("GPU.AtExitSurfaceCount",
                            gpu::GpuSurfaceTracker::Get()->GetSurfaceCount());
 #endif

content/browser/renderer_host/render_widget_host_view_mac.mm

@@ -1733,8 +1733,15 @@ gfx::Point RenderWidgetHostViewMac::AccessibilityOriginInScreen(
   return gfx::Point(originInScreen.x, originInScreen.y);
 }
 
-NSView* RenderWidgetHostViewMac::AccessibilityGetAcceleratedWidget() {
-  return cocoa_view_;
+gfx::AcceleratedWidget
+RenderWidgetHostViewMac::AccessibilityGetAcceleratedWidget() {
+  if (browser_compositor_) {
+    ui::AcceleratedWidgetMac* accelerated_widget_mac =
+        browser_compositor_->GetAcceleratedWidgetMac();
+    if (accelerated_widget_mac)
+      return accelerated_widget_mac->accelerated_widget();
+  }
+  return gfx::kNullAcceleratedWidget;
 }
 
 void RenderWidgetHostViewMac::SetTextInputActive(bool active) {

gpu/gles2_conform_support/egl/display.cc

@@ -4,6 +4,7 @@
 
 #include "gpu/gles2_conform_support/egl/display.h"
 
+#include "build/build_config.h"
 #include "gpu/gles2_conform_support/egl/config.h"
 #include "gpu/gles2_conform_support/egl/context.h"
 #include "gpu/gles2_conform_support/egl/surface.h"
@@ -214,8 +215,12 @@ EGLSurface Display::CreateWindowSurface(ThreadState* ts,
     return result;
   }
   scoped_refptr<gl::GLSurface> gl_surface;
-  gl_surface =
-      gl::init::CreateViewGLSurface(static_cast<gfx::AcceleratedWidget>(win));
+#if defined(OS_MACOSX)
+  gfx::AcceleratedWidget widget = gfx::kNullAcceleratedWidget;
+#else
+  gfx::AcceleratedWidget widget = static_cast<gfx::AcceleratedWidget>(win);
+#endif
+  gl_surface = gl::init::CreateViewGLSurface(widget);
   if (!gl_surface)
     return ts->ReturnError(EGL_BAD_ALLOC, EGL_NO_SURFACE);
   surfaces_.emplace_back(new Surface(gl_surface.get(), config));

gpu/ipc/common/BUILD.gn

@@ -121,7 +121,7 @@ source_set("ipc_common_sources") {
     ]
   }
 
-  if (is_mac || is_android) {
+  if (is_android) {
     sources += [
       "gpu_surface_lookup.cc",
       "gpu_surface_lookup.h",

gpu/ipc/common/surface_handle.h

@@ -9,7 +9,8 @@
 
 #include "build/build_config.h"
 
-#if (defined(OS_WIN) || defined(USE_X11) || defined(USE_OZONE)) && \
+#if (defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_X11) || \
+     defined(USE_OZONE)) &&                                       \
     !defined(OS_NACL)
 #include "ui/gfx/native_widget_types.h"
 #define GPU_SURFACE_HANDLE_IS_ACCELERATED_WINDOW

ui/accelerated_widget_mac/accelerated_widget_mac.h

@@ -54,6 +54,12 @@ class ACCELERATED_WIDGET_MAC_EXPORT AcceleratedWidgetMac {
       base::TimeTicks* timebase, base::TimeDelta* interval) const;
 
   static AcceleratedWidgetMac* Get(gfx::AcceleratedWidget widget);
+
+  // Translate from a gfx::AcceleratedWidget to the NSView in which it will
+  // appear. This may return nil if |widget| is invalid or is not currently
+  // attached to an NSView.
+  static NSView* GetNSView(gfx::AcceleratedWidget widget);
+
   void GotCALayerFrame(base::scoped_nsobject<CALayer> content_layer,
                        const gfx::Size& pixel_size,
                        float scale_factor);

ui/accelerated_widget_mac/accelerated_widget_mac.mm

@@ -48,10 +48,8 @@ AcceleratedWidgetMac::AcceleratedWidgetMac() : view_(nullptr) {
 
   // Use a sequence number as the accelerated widget handle that we can use
   // to look up the internals structure.
-  static intptr_t last_sequence_number = 0;
-  last_sequence_number += 1;
-  native_widget_ = reinterpret_cast<gfx::AcceleratedWidget>(
-      last_sequence_number);
+  static uint64_t last_sequence_number = 0;
+  native_widget_ = ++last_sequence_number;
   g_widget_to_helper_map.Pointer()->insert(
       std::make_pair(native_widget_, this));
 }
@@ -106,6 +104,7 @@ void AcceleratedWidgetMac::GetVSyncParameters(
   }
 }
 
+// static
 AcceleratedWidgetMac* AcceleratedWidgetMac::Get(gfx::AcceleratedWidget widget) {
   WidgetToHelperMap::const_iterator found =
       g_widget_to_helper_map.Pointer()->find(widget);
@@ -117,6 +116,14 @@ AcceleratedWidgetMac* AcceleratedWidgetMac::Get(gfx::AcceleratedWidget widget) {
   return found->second;
 }
 
+// static
+NSView* AcceleratedWidgetMac::GetNSView(gfx::AcceleratedWidget widget) {
+  AcceleratedWidgetMac* widget_mac = Get(widget);
+  if (!widget_mac || !widget_mac->view_)
+    return nil;
+  return widget_mac->view_->AcceleratedWidgetGetNSView();
+}
+
 void AcceleratedWidgetMac::GotCALayerFrame(
     base::scoped_nsobject<CALayer> content_layer,
     const gfx::Size& pixel_size,

ui/compositor/test/test_compositor_host_mac.mm

@@ -44,6 +44,10 @@
   DCHECK(compositor_) << "Drawing with no compositor set.";
   compositor_->ScheduleFullRedraw();
 }
+
+- (gfx::AcceleratedWidget)widget {
+  return compositor_->widget();
+}
 @end
 
 namespace ui {
@@ -142,7 +146,7 @@ void TestCompositorHostMac::Show() {
                               defer:NO];
   base::scoped_nsobject<AcceleratedTestView> view(
       [[AcceleratedTestView alloc] init]);
-  compositor_.SetAcceleratedWidget(view);
+  compositor_.SetAcceleratedWidget([view widget]);
   compositor_.SetScaleAndSize(1.0f, bounds_.size());
   [view setCompositor:&compositor_];
   [window_ setContentView:view];

ui/gfx/mojo/struct_traits_unittest.cc

@@ -5,6 +5,7 @@
 #include <utility>
 
 #include "base/message_loop/message_loop.h"
+#include "build/build_config.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/mojo/buffer_types_struct_traits.h"
@@ -18,7 +19,7 @@ namespace gfx {
 namespace {
 
 gfx::AcceleratedWidget castToAcceleratedWidget(int i) {
-#if defined(USE_OZONE) || defined(USE_X11)
+#if defined(USE_OZONE) || defined(USE_X11) || defined(OS_MACOSX)
   return static_cast<gfx::AcceleratedWidget>(i);
 #else
   return reinterpret_cast<gfx::AcceleratedWidget>(i);

ui/gfx/native_widget_types.h

@@ -187,7 +187,7 @@ constexpr AcceleratedWidget kNullAcceleratedWidget = 0;
 typedef UIView* AcceleratedWidget;
 constexpr AcceleratedWidget kNullAcceleratedWidget = 0;
 #elif defined(OS_MACOSX)
-typedef NSView* AcceleratedWidget;
+typedef uint64_t AcceleratedWidget;
 constexpr AcceleratedWidget kNullAcceleratedWidget = 0;
 #elif defined(OS_ANDROID)
 typedef ANativeWindow* AcceleratedWidget;

ui/views/cocoa/bridged_native_widget.mm

@@ -1063,7 +1063,7 @@ void BridgedNativeWidget::OnShowAnimationComplete() {
 
 ui::InputMethod* BridgedNativeWidget::GetInputMethod() {
   if (!input_method_) {
-    input_method_ = ui::CreateInputMethod(this, nil);
+    input_method_ = ui::CreateInputMethod(this, gfx::kNullAcceleratedWidget);
     // For now, use always-focused mode on Mac for the input method.
     // TODO(tapted): Move this to OnWindowKeyStatusChangedTo() and balance.
     input_method_->OnFocus();