Mac: Clean up plumbing of accelerated widgets

content/browser/compositor/gpu_output_surface_mac.mm

 // Copyright 2016 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 "content/browser/compositor/gpu_output_surface_mac.h"
 
 #include "cc/output/compositor_frame.h"
 #include "components/display_compositor/compositor_overlay_candidate_validator.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/ipc/client/gpu_process_hosted_ca_layer_tree_params.h"
 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
 #include "ui/base/cocoa/remote_layer_api.h"
+#include "ui/compositor/compositor.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/gfx/mac/io_surface.h"
 
 namespace content {
 
 struct GpuOutputSurfaceMac::RemoteLayers {
   void UpdateLayers(CAContextID content_ca_context_id,
                     CAContextID fullscreen_low_power_ca_context_id) {
     if (content_ca_context_id) {
       if ([content_layer contextId] != content_ca_context_id) {
@@ skipping 16 matching lines @@
     } else {
       fullscreen_low_power_layer.reset();
     }
   }
 
   base::scoped_nsobject<CALayerHost> content_layer;
   base::scoped_nsobject<CALayerHost> fullscreen_low_power_layer;
 };
 
 GpuOutputSurfaceMac::GpuOutputSurfaceMac(
+    gfx::AcceleratedWidget widget,
     scoped_refptr<ContextProviderCommandBuffer> context,
     gpu::SurfaceHandle surface_handle,
     scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
     cc::SyntheticBeginFrameSource* begin_frame_source,
     std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
         overlay_candidate_validator,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager)
     : GpuSurfacelessBrowserCompositorOutputSurface(
           std::move(context),
           surface_handle,
           std::move(vsync_manager),
           begin_frame_source,
           std::move(overlay_candidate_validator),
           GL_TEXTURE_RECTANGLE_ARB,
           GL_RGBA,
           gfx::BufferFormat::RGBA_8888,
           gpu_memory_buffer_manager),
+      widget_(widget),
       remote_layers_(new RemoteLayers) {}
 
 GpuOutputSurfaceMac::~GpuOutputSurfaceMac() {}
 
 void GpuOutputSurfaceMac::SwapBuffers(cc::CompositorFrame frame) {
   GpuSurfacelessBrowserCompositorOutputSurface::SwapBuffers(std::move(frame));
 
   if (should_show_frames_state_ ==
       SHOULD_NOT_SHOW_FRAMES_NO_SWAP_AFTER_SUSPENDED) {
     should_show_frames_state_ = SHOULD_SHOW_FRAMES;
   }
 }
 
 void GpuOutputSurfaceMac::OnGpuSwapBuffersCompleted(
     const std::vector<ui::LatencyInfo>& latency_info,
     gfx::SwapResult result,
     const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) {
   remote_layers_->UpdateLayers(params_mac->ca_context_id,
                                params_mac->fullscreen_low_power_ca_context_id);
   if (should_show_frames_state_ == SHOULD_SHOW_FRAMES) {
-    ui::AcceleratedWidgetMac* widget = ui::AcceleratedWidgetMac::Get(
-        content::GpuSurfaceTracker::Get()->AcquireNativeWidget(
-            params_mac->surface_handle));
+    ui::AcceleratedWidgetMac* widget = ui::AcceleratedWidgetMac::Get(widget_);
     if (widget) {
       if (remote_layers_->content_layer) {
         widget->GotCALayerFrame(
             base::scoped_nsobject<CALayer>(remote_layers_->content_layer.get(),
                                            base::scoped_policy::RETAIN),
             params_mac->fullscreen_low_power_ca_context_valid,
             base::scoped_nsobject<CALayer>(
                 remote_layers_->fullscreen_low_power_layer.get(),
                 base::scoped_policy::RETAIN),
             params_mac->pixel_size, params_mac->scale_factor);
@@ skipping 31 matching lines @@
           SHOULD_NOT_SHOW_FRAMES_NO_SWAP_AFTER_SUSPENDED;
     }
   }
 }
 
 bool GpuOutputSurfaceMac::SurfaceIsSuspendForRecycle() const {
   return should_show_frames_state_ == SHOULD_NOT_SHOW_FRAMES_SUSPENDED;
 }
 
 }  // namespace content