Mac: Clean up plumbing of accelerated widgets

gpu/ipc/service/image_transport_surface_overlay_mac.mm

 // Copyright 2015 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 "gpu/ipc/service/image_transport_surface_overlay_mac.h"
 
 #include <CoreGraphics/CoreGraphics.h>
 #include <IOSurface/IOSurface.h>
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/CGLTypes.h>
@@ skipping 41 matching lines @@
   }
 }
 
 void IOSurfaceContextNoOp(scoped_refptr<ui::IOSurfaceContext>) {
 }
 
 }  // namespace
 
 namespace gpu {
 
-scoped_refptr<gl::GLSurface> ImageTransportSurfaceCreateNativeSurface(
-    GpuChannelManager* manager,
-    GpuCommandBufferStub* stub,
-    SurfaceHandle handle) {
-  return new ImageTransportSurfaceOverlayMac(stub, handle);
-}
-
 ImageTransportSurfaceOverlayMac::ImageTransportSurfaceOverlayMac(
-    GpuCommandBufferStub* stub,
-    SurfaceHandle handle)
+    GpuCommandBufferStub* stub)
     : stub_(stub->AsWeakPtr()),
-      handle_(handle),
       use_remote_layer_api_(ui::RemoteLayerAPISupported()),
       scale_factor_(1),
       gl_renderer_id_(0) {
   ui::GpuSwitchingManager::GetInstance()->AddObserver(this);
   ca_layer_tree_coordinator_.reset(
       new ui::CALayerTreeCoordinator(use_remote_layer_api_));
 }
 
 ImageTransportSurfaceOverlayMac::~ImageTransportSurfaceOverlayMac() {
   ui::GpuSwitchingManager::GetInstance()->RemoveObserver(this);
@@ skipping 44 matching lines @@
   return false;
 }
 
 void ImageTransportSurfaceOverlayMac::SetLatencyInfo(
     const std::vector<ui::LatencyInfo>& latency_info) {
   latency_info_.insert(latency_info_.end(), latency_info.begin(),
                        latency_info.end());
 }
 
 void ImageTransportSurfaceOverlayMac::SendAcceleratedSurfaceBuffersSwapped(
-    gpu::SurfaceHandle surface_handle,
     CAContextID ca_context_id,
     bool fullscreen_low_power_ca_context_valid,
     CAContextID fullscreen_low_power_ca_context_id,
     const gfx::ScopedRefCountedIOSurfaceMachPort& io_surface,
     const gfx::Size& size,
     float scale_factor,
     std::vector<ui::LatencyInfo> latency_info) {
   // TRACE_EVENT for gpu tests:
   TRACE_EVENT_INSTANT2("test_gpu", "SwapBuffers", TRACE_EVENT_SCOPE_THREAD,
                        "GLImpl", static_cast<int>(gl::GetGLImplementation()),
                        "width", size.width());
 
   GpuCommandBufferMsg_SwapBuffersCompleted_Params params;
-  params.surface_handle = surface_handle;
   params.ca_context_id = ca_context_id;
   params.fullscreen_low_power_ca_context_valid =
       fullscreen_low_power_ca_context_valid;
   params.fullscreen_low_power_ca_context_id =
       fullscreen_low_power_ca_context_id;
   params.io_surface = io_surface;
   params.pixel_size = size;
   params.scale_factor = scale_factor;
   params.latency_info = std::move(latency_info);
   params.result = gfx::SwapResult::SWAP_ACK;
@@ skipping 107 matching lines @@
     ca_context_id = [ca_context_ contextId];
     fullscreen_low_power_ca_context_id =
         [fullscreen_low_power_ca_context_ contextId];
   } else {
     IOSurfaceRef io_surface =
         ca_layer_tree_coordinator_->GetIOSurfaceForDisplay();
     if (io_surface)
       io_surface_mach_port.reset(IOSurfaceCreateMachPort(io_surface));
   }
   SendAcceleratedSurfaceBuffersSwapped(
-      handle_, ca_context_id, fullscreen_low_power_layer_valid,
+      ca_context_id, fullscreen_low_power_layer_valid,
       fullscreen_low_power_ca_context_id, io_surface_mach_port, pixel_size_,
       scale_factor_, std::move(latency_info_));
 
   // Reset all state for the next frame.
   latency_info_.clear();
   return gfx::SwapResult::SWAP_ACK;
 }
 
 gfx::SwapResult ImageTransportSurfaceOverlayMac::SwapBuffers() {
   return SwapBuffersInternal(
@@ skipping 99 matching lines @@
   gl_renderer_id_ = context_renderer_id & kCGLRendererIDMatchingMask;
 
   // Post a task holding a reference to the new GL context. The reason for
   // this is to avoid creating-then-destroying the context for every image
   // transport surface that is observing the GPU switch.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&IOSurfaceContextNoOp, context_on_new_gpu));
 }
 
 }  // namespace gpu