Make channel preemption not require view contexts for hookup

content/browser/gpu/gpu_process_host.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
 #define CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
 
 #include <map>
 #include <queue>
 #include <set>
 #include <string>
 
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time/time.h"
-#include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/gpu_memory_uma_stats.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/common/gpu/gpu_result_codes.h"
 #include "content/public/browser/browser_child_process_host_delegate.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/config/gpu_info.h"
 #include "ipc/ipc_sender.h"
 #include "ipc/message_filter.h"
@@ skipping 75 matching lines @@
   bool Send(IPC::Message* msg) override;
 
   // Adds a message filter to the GpuProcessHost's channel.
   void AddFilter(IPC::MessageFilter* filter);
 
   // Tells the GPU process to create a new channel for communication with a
   // client. Once the GPU process responds asynchronously with the IPC handle
   // and GPUInfo, we call the callback.
   void EstablishGpuChannel(int client_id,
                            uint64_t client_tracing_id,
-                           bool share_context,
+                           bool preempts,
+                           bool preempted,
                            bool allow_future_sync_points,
                            bool allow_real_time_streams,
                            const EstablishChannelCallback& callback);
 
   // Tells the GPU process to create a new command buffer that draws into the
   // given surface.
   void CreateViewCommandBuffer(
       const gfx::GLSurfaceHandle& compositing_surface,
-      int surface_id,
       int client_id,
       const GPUCreateCommandBufferConfig& init_params,
       int route_id,
       const CreateCommandBufferCallback& callback);
 
   // Tells the GPU process to create a new GPU memory buffer.
   void CreateGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
                              const gfx::Size& size,
                              gfx::BufferFormat format,
                              gfx::BufferUsage usage,
@@ skipping 36 matching lines @@
   bool OnMessageReceived(const IPC::Message& message) override;
   void OnChannelConnected(int32 peer_pid) override;
   void OnProcessLaunched() override;
   void OnProcessLaunchFailed() override;
   void OnProcessCrashed(int exit_code) override;
 
   // Message handlers.
   void OnInitialized(bool result, const gpu::GPUInfo& gpu_info);
   void OnChannelEstablished(const IPC::ChannelHandle& channel_handle);
   void OnCommandBufferCreated(CreateCommandBufferResult result);
-  void OnDestroyCommandBuffer(int32 surface_id);
   void OnGpuMemoryBufferCreated(const gfx::GpuMemoryBufferHandle& handle);
   void OnDidCreateOffscreenContext(const GURL& url);
   void OnDidLoseContext(bool offscreen,
                         gpu::error::ContextLostReason reason,
                         const GURL& url);
   void OnDidDestroyOffscreenContext(const GURL& url);
   void OnGpuMemoryUmaStatsReceived(const GPUMemoryUmaStats& stats);
 #if defined(OS_MACOSX)
   void OnAcceleratedSurfaceBuffersSwapped(const IPC::Message& message);
 #endif
@@ skipping 20 matching lines @@
   // These are the channel requests that we have already sent to
   // the GPU process, but haven't heard back about yet.
   std::queue<EstablishChannelCallback> channel_requests_;
 
   // The pending create command buffer requests we need to reply to.
   std::queue<CreateCommandBufferCallback> create_command_buffer_requests_;
 
   // The pending create gpu memory buffer requests we need to reply to.
   std::queue<CreateGpuMemoryBufferCallback> create_gpu_memory_buffer_requests_;
 
-  // Surface ids for pending gpu memory buffer request refs.
-  std::queue<int32> create_gpu_memory_buffer_surface_refs_;
-
   // Qeueud messages to send when the process launches.
   std::queue<IPC::Message*> queued_messages_;
 
   // Whether the GPU process is valid, set to false after Send() failed.
   bool valid_;
 
   // Whether we are running a GPU thread inside the browser process instead
   // of a separate GPU process.
   bool in_process_;
 
@@ skipping 35 matching lines @@
   // Statics kept around to send to UMA histograms on GPU process lost.
   bool uma_memory_stats_received_;
   GPUMemoryUmaStats uma_memory_stats_;
 
   typedef std::map<int32, scoped_refptr<ShaderDiskCache> >
       ClientIdToShaderCacheMap;
   ClientIdToShaderCacheMap client_id_to_shader_cache_;
 
   std::string shader_prefix_key_;
 
-  // Keep an extra reference to the SurfaceRef stored in the GpuSurfaceTracker
-  // in this map so that we don't destroy it whilst the GPU process is
-  // drawing to it.
-  typedef std::multimap<int, scoped_refptr<GpuSurfaceTracker::SurfaceRef> >
-      SurfaceRefMap;
-  SurfaceRefMap surface_refs_;
-
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   // Unique unguessable token that the GPU process is using to register
   // IOSurfaces.
   IOSurfaceManagerToken io_surface_manager_token_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(GpuProcessHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_