Fix Mac resize, delete more Mac code

gpu/ipc/client/gpu_channel_host.cc

 // Copyright (c) 2012 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/client/gpu_channel_host.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 #include "gpu/ipc/common/gpu_messages.h"
 #include "gpu/ipc/common/gpu_param_traits_macros.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "url/gurl.h"
 
+#if defined(OS_MACOSX)
+#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
+#endif
+
 using base::AutoLock;
 
 namespace gpu {
 namespace {
 
 // Global atomic to generate unique transfer buffer IDs.
 base::StaticAtomicSequenceNumber g_next_transfer_buffer_id;
 
 }  // namespace
 
@@ skipping 402 matching lines @@
     const IPC::Message& message) {
   // Never handle sync message replies or we will deadlock here.
   if (message.is_reply())
     return false;
 
   auto it = listeners_.find(message.routing_id());
   if (it == listeners_.end())
     return false;
 
   const ListenerInfo& info = it->second;
-  info.task_runner->PostTask(
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner = info.task_runner;
+#if defined(OS_MACOSX)
+  // On Mac, the IPCs ViewHostMsg_SwapCompositorFrame, ViewHostMsg_UpdateRect,
+  // and GpuCommandBufferMsg_SwapBuffersCompleted need to be handled in a
+  // nested message loop during resize.
+  if (message.type() == GpuCommandBufferMsg_SwapBuffersCompleted::ID)
+    task_runner = ui::WindowResizeHelperMac::Get()->task_runner();

[piman, 2016/05/10 22:24:16]

This is called in the renderer - e.g. for pepper. Does this make sense there?
Should we inject the task runner instead when creating the UI context, to avoid
this extra odd dependency?

[ccameron, 2016/05/11 06:23:01]

Good point -- moved the #if MAC parts into
GpuProcessTransportFactory::EstablishedGpuChannel (which has lots of OS-specific
goo).

+#endif
+  task_runner->PostTask(
       FROM_HERE,
       base::Bind(base::IgnoreResult(&IPC::Listener::OnMessageReceived),
                  info.listener, message));
   return true;
 }
 
 void GpuChannelHost::MessageFilter::OnChannelError() {
   // Set the lost state before signalling the proxies. That way, if they
   // themselves post a task to recreate the context, they will not try to re-use
   // this channel host.
@@ skipping 12 matching lines @@
 
   listeners_.clear();
 }
 
 bool GpuChannelHost::MessageFilter::IsLost() const {
   AutoLock lock(lock_);
   return lost_;
 }
 
 }  // namespace gpu