Mac: Clean up ifdefs in output surface

content/browser/compositor/gpu_process_transport_factory.cc

 // Copyright 2014 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_process_transport_factory.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 55 matching lines @@
 #include "components/display_compositor/compositor_overlay_candidate_validator_ozone.h"
 #include "content/browser/compositor/software_output_device_ozone.h"
 #include "ui/ozone/public/overlay_candidates_ozone.h"
 #include "ui/ozone/public/overlay_manager_ozone.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/ozone_switches.h"
 #elif defined(USE_X11)
 #include "content/browser/compositor/software_output_device_x11.h"
 #elif defined(OS_MACOSX)
 #include "components/display_compositor/compositor_overlay_candidate_validator_mac.h"
+#include "content/browser/compositor/gpu_output_surface_mac.h"
 #include "content/browser/compositor/software_output_device_mac.h"
 #include "gpu/config/gpu_driver_bug_workaround_type.h"
 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
 #include "ui/base/cocoa/remote_layer_api.h"
 #include "ui/base/ui_base_switches.h"
 #elif defined(OS_ANDROID)
 #include "components/display_compositor/compositor_overlay_candidate_validator_android.h"
 #endif
 #if !defined(GPU_SURFACE_HANDLE_IS_ACCELERATED_WINDOW)
 #include "content/browser/gpu/gpu_surface_tracker.h"
@@ skipping 360 matching lines @@
     } else {
       DCHECK(context_provider);
       const auto& capabilities = context_provider->ContextCapabilities();
       if (data->surface_handle == gpu::kNullSurfaceHandle) {
         surface = base::WrapUnique(new OffscreenBrowserCompositorOutputSurface(
             context_provider, compositor->vsync_manager(),
             compositor->task_runner().get(),
             std::unique_ptr<
                 display_compositor::CompositorOverlayCandidateValidator>()));
       } else if (capabilities.surfaceless) {
-        GLenum target = GL_TEXTURE_2D;
-        GLenum format = GL_RGB;
 #if defined(OS_MACOSX)
-        target = GL_TEXTURE_RECTANGLE_ARB;
-        format = GL_RGBA;
-#endif
+        surface = base::WrapUnique(new GpuOutputSurfaceMac(
+            context_provider, data->surface_handle, compositor->vsync_manager(),
+            compositor->task_runner().get(),
+            CreateOverlayCandidateValidator(compositor->widget()),
+            BrowserGpuMemoryBufferManager::current()));
+#else
         surface =
             base::WrapUnique(new GpuSurfacelessBrowserCompositorOutputSurface(
                 context_provider, data->surface_handle,
                 compositor->vsync_manager(), compositor->task_runner().get(),
-                CreateOverlayCandidateValidator(compositor->widget()), target,
-                format, BrowserGpuMemoryBufferManager::current()));
+                CreateOverlayCandidateValidator(compositor->widget()),
+                GL_TEXTURE_2D, GL_RGB,
+                BrowserGpuMemoryBufferManager::current()));
+#endif
       } else {
         std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
             validator;
 #if !defined(OS_MACOSX)
         // Overlays are only supported on surfaceless output surfaces on Mac.
         validator = CreateOverlayCandidateValidator(compositor->widget());
 #endif
         surface = base::WrapUnique(new GpuBrowserCompositorOutputSurface(
             context_provider, compositor->vsync_manager(),
             compositor->task_runner().get(), std::move(validator)));
@@ skipping 303 matching lines @@
       shared_vulkan_context_provider_ =
           cc::VulkanInProcessContextProvider::Create();
     }
 
     shared_vulkan_context_provider_initialized_ = true;
   }
   return shared_vulkan_context_provider_;
 }
 
 }  // namespace content