Make channel preemption not require view contexts for hookup

content/common/gpu/gpu_command_buffer_stub.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_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 56 matching lines @@
 
   typedef base::Callback<void(const std::vector<ui::LatencyInfo>&)>
       LatencyInfoCallback;
 
   GpuCommandBufferStub(
       GpuChannel* channel,
       base::SingleThreadTaskRunner* task_runner,
       GpuCommandBufferStub* share_group,
       const gfx::GLSurfaceHandle& handle,
       gpu::gles2::MailboxManager* mailbox_manager,
+      gpu::PreemptionFlag* preempt_by_flag,
       gpu::gles2::SubscriptionRefSet* subscription_ref_set,
       gpu::ValueStateMap* pending_valuebuffer_state,
       const gfx::Size& size,
       const gpu::gles2::DisallowedFeatures& disallowed_features,
       const std::vector<int32>& attribs,
       gfx::GpuPreference gpu_preference,
       int32 stream_id,
       int32 route_id,
-      int32 surface_id,
+      bool offscreen,
       GpuWatchdog* watchdog,
-      bool software,
       const GURL& active_url);
 
   ~GpuCommandBufferStub() override;
 
   // IPC::Listener implementation:
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // IPC::Sender implementation:
   bool Send(IPC::Message* msg) override;
 
@@ skipping 10 matching lines @@
   // Whether there are commands in the buffer that haven't been processed.
   bool HasUnprocessedCommands();
 
   gpu::gles2::GLES2Decoder* decoder() const { return decoder_.get(); }
   gpu::GpuScheduler* scheduler() const { return scheduler_.get(); }
   GpuChannel* channel() const { return channel_; }
 
   // Unique command buffer ID for this command buffer stub.
   uint64_t command_buffer_id() const { return command_buffer_id_; }
 
-  // Identifies the target surface.
-  int32 surface_id() const { return surface_id_; }
-
   // Identifies the various GpuCommandBufferStubs in the GPU process belonging
   // to the same renderer process.
   int32 route_id() const { return route_id_; }
 
   // Identifies the stream for this command buffer.
   int32 stream_id() const { return stream_id_; }
 
   gfx::GpuPreference gpu_preference() { return gpu_preference_; }
 
   int32 GetRequestedAttribute(int attr) const;
 
   // Sends a message to the console.
   void SendConsoleMessage(int32 id, const std::string& message);
 
   void SendCachedShader(const std::string& key, const std::string& shader);
 
   gfx::GLSurface* surface() const { return surface_.get(); }
 
   void AddDestructionObserver(DestructionObserver* observer);
   void RemoveDestructionObserver(DestructionObserver* observer);
 
   // Associates a sync point to this stub. When the stub is destroyed, it will
   // retire all sync points that haven't been previously retired.
   void AddSyncPoint(uint32 sync_point, bool retire);
 
-  void SetPreemptByFlag(scoped_refptr<gpu::PreemptionFlag> flag);
-
   void SetLatencyInfoCallback(const LatencyInfoCallback& callback);
 
   void MarkContextLost();
 
   const gpu::gles2::FeatureInfo* GetFeatureInfo() const;
 
   void SendSwapBuffersCompleted(
       const std::vector<ui::LatencyInfo>& latency_info,
       gfx::SwapResult result);
   void SendUpdateVSyncParameters(base::TimeTicks timebase,
@@ skipping 99 matching lines @@
   bool initialized_;
   gfx::GLSurfaceHandle handle_;
   gfx::Size initial_size_;
   gpu::gles2::DisallowedFeatures disallowed_features_;
   std::vector<int32> requested_attribs_;
   gfx::GpuPreference gpu_preference_;
   bool use_virtualized_gl_context_;
   const uint64_t command_buffer_id_;
   const int32 stream_id_;
   const int32 route_id_;
-  const int32 surface_id_;
-  bool software_;
+  const bool offscreen_;
   uint32 last_flush_count_;
 
   scoped_ptr<gpu::CommandBufferService> command_buffer_;
   scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
   scoped_ptr<gpu::GpuScheduler> scheduler_;
   scoped_ptr<gpu::SyncPointClient> sync_point_client_;
   scoped_refptr<gfx::GLSurface> surface_;
 
   scoped_ptr<GpuMemoryManagerClientState> memory_manager_client_state_;
   // The last memory allocation received from the GpuMemoryManager (used to
@@ skipping 23 matching lines @@
   size_t total_gpu_memory_;
   scoped_ptr<WaitForCommandState> wait_for_token_;
   scoped_ptr<WaitForCommandState> wait_for_get_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_