Fix Mac resize, delete more Mac code

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 57 matching lines @@
 #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/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"
 #endif
 
 #if defined(ENABLE_VULKAN)
@@ skipping 182 matching lines @@
   return GpuDataManagerImpl::GetInstance()->CanUseGpuBrowserCompositor();
 }
 
 void GpuProcessTransportFactory::CreateOutputSurface(
     base::WeakPtr<ui::Compositor> compositor) {
   DCHECK(!!compositor);
   PerCompositorData* data = per_compositor_data_[compositor.get()];
   if (!data) {
     data = CreatePerCompositorData(compositor.get());
   } else {
-#if defined(OS_MACOSX)
-    // TODO(piman): Use GpuSurfaceTracker to map ids to surfaces instead of an
-    // output_surface_map_ here.
-    output_surface_map_.Remove(data->surface_handle);
-#endif
     data->surface = nullptr;
   }
 
 #if defined(OS_WIN)
   gfx::RenderingWindowManager::GetInstance()->UnregisterParent(
       compositor->widget());
 #endif
 
   const bool use_vulkan = SharedVulkanContextProvider();
 
@@ skipping 94 matching lines @@
             std::move(gpu_channel_host), data->surface_handle,
             shared_worker_context_provider_.get(),
             command_buffer_metrics::DISPLAY_COMPOSITOR_ONSCREEN_CONTEXT);
         // TODO(vadimt): Remove ScopedTracker below once crbug.com/125248 is
         // fixed. Tracking time in BindToCurrentThread.
         tracked_objects::ScopedTracker tracking_profile(
             FROM_HERE_WITH_EXPLICIT_FUNCTION(
                 "125248"
                 " GpuProcessTransportFactory::EstablishedGpuChannel"
                 "::Compositor"));
+#if defined(OS_MACOSX)
+        // On Mac, GpuCommandBufferMsg_SwapBuffersCompleted must be handled in
+        // a nested message loop during resize.
+        context_provider->SetDefaultTaskRunner(
+            ui::WindowResizeHelperMac::Get()->task_runner());
+#endif
         if (!context_provider->BindToCurrentThread())
           context_provider = nullptr;
       }
     }
 
     bool created_gpu_browser_compositor =
         !!context_provider && !!shared_worker_context_provider_;
 
     UMA_HISTOGRAM_BOOLEAN("Aura.CreatedGpuBrowserCompositor",
                           created_gpu_browser_compositor);
@@ skipping 61 matching lines @@
         validator = CreateOverlayCandidateValidator(compositor->widget());
 #endif
         surface = base::WrapUnique(new GpuBrowserCompositorOutputSurface(
             context_provider, shared_worker_context_provider_,
             compositor->vsync_manager(), compositor->task_runner().get(),
             std::move(validator)));
       }
     }
   }
 
-#if defined(OS_MACOSX)
-  // TODO(piman): Use GpuSurfaceTracker to map ids to surfaces instead of an
-  // output_surface_map_ here.
-  output_surface_map_.AddWithID(surface.get(), data->surface_handle);
-#endif
   data->surface = surface.get();
   if (data->reflector)
     data->reflector->OnSourceSurfaceReady(data->surface);
 
 #if defined(OS_WIN)
   gfx::RenderingWindowManager::GetInstance()->DoSetParentOnChild(
       compositor->widget());
 #endif
 
   // This gets a bit confusing. Here we have a ContextProvider in the |surface|
@@ skipping 46 matching lines @@
   data->reflector->Shutdown();
   data->reflector = nullptr;
 }
 
 void GpuProcessTransportFactory::RemoveCompositor(ui::Compositor* compositor) {
   PerCompositorDataMap::iterator it = per_compositor_data_.find(compositor);
   if (it == per_compositor_data_.end())
     return;
   PerCompositorData* data = it->second;
   DCHECK(data);
-#if defined(OS_MACOSX)
-  // TODO(piman): Use GpuSurfaceTracker to map ids to surfaces instead of an
-  // output_surface_map_ here.
-  if (data->surface)
-    output_surface_map_.Remove(data->surface_handle);
-#endif
 #if !defined(GPU_SURFACE_HANDLE_IS_ACCELERATED_WINDOW)
   if (data->surface_handle)
     GpuSurfaceTracker::Get()->RemoveSurface(data->surface_handle);
 #endif
   delete data;
   per_compositor_data_.erase(it);
   if (per_compositor_data_.empty()) {
     // Destroying the GLHelper may cause some async actions to be cancelled,
     // causing things to request a new GLHelper. Due to crbug.com/176091 the
     // GLHelper created in this case would be lost/leaked if we just reset()
@@ skipping 106 matching lines @@
     ui::Compositor* compositor,
     bool suspended) {
   PerCompositorDataMap::iterator it = per_compositor_data_.find(compositor);
   if (it == per_compositor_data_.end())
     return;
   PerCompositorData* data = it->second;
   DCHECK(data);
   if (data->surface)
     data->surface->SetSurfaceSuspendedForRecycle(suspended);
 }
-
-bool GpuProcessTransportFactory::
-    SurfaceShouldNotShowFramesAfterSuspendForRecycle(
-        gpu::SurfaceHandle surface_handle) const {
-  BrowserCompositorOutputSurface* surface =
-      output_surface_map_.Lookup(surface_handle);
-  if (surface)
-    return surface->SurfaceShouldNotShowFramesAfterSuspendForRecycle();
-  return false;
-}
 #endif
 
 scoped_refptr<cc::ContextProvider>
 GpuProcessTransportFactory::SharedMainThreadContextProvider() {
   if (shared_main_thread_contexts_)
     return shared_main_thread_contexts_;
 
   if (!GpuDataManagerImpl::GetInstance()->CanUseGpuBrowserCompositor())
     return nullptr;
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_host(
@@ skipping 83 matching lines @@
       shared_vulkan_context_provider_ =
           cc::VulkanInProcessContextProvider::Create();
     }
 
     shared_vulkan_context_provider_initialized_ = true;
   }
   return shared_vulkan_context_provider_;
 }
 
 }  // namespace content