Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / common / gpu / gpu_channel.h

diff --git a/src/content/common/gpu/gpu_channel.h b/src/content/common/gpu/gpu_channel.h
index 7ad270f..d115b72 100644 (file)
--- a/src/content/common/gpu/gpu_channel.h
+++ b/src/content/common/gpu/gpu_channel.h
@@ -34,9 +34,6 @@ class WaitableEvent;
 
 namespace gpu {
 class PreemptionFlag;
-namespace gles2 {
-class ImageManager;
-}
 }
 
 namespace IPC {
@@ -59,7 +56,8 @@ class GpuChannel : public IPC::Listener, public IPC::Sender {
              gfx::GLShareGroup* share_group,
              gpu::gles2::MailboxManager* mailbox_manager,
              int client_id,
-             bool software);
+             bool software,
+             bool allow_future_sync_points);
   virtual ~GpuChannel();
 
   void Init(base::MessageLoopProxy* io_message_loop,
@@ -114,12 +112,6 @@ class GpuChannel : public IPC::Listener, public IPC::Sender {
       const GPUCreateCommandBufferConfig& init_params,
       int32 route_id);
 
-  void CreateImage(
-      gfx::PluginWindowHandle window,
-      int32 image_id,
-      gfx::Size* size);
-  void DeleteImage(int32 image_id);
-
   gfx::GLShareGroup* share_group() const { return share_group_.get(); }
 
   GpuCommandBufferStub* LookupCommandBuffer(int32 route_id);
@@ -151,6 +143,8 @@ class GpuChannel : public IPC::Listener, public IPC::Sender {
 
   uint64 GetMemoryUsage();
 
+  bool allow_future_sync_points() const { return allow_future_sync_points_; }
+
  private:
   friend class GpuChannelMessageFilter;
 
@@ -206,7 +200,6 @@ class GpuChannel : public IPC::Listener, public IPC::Sender {
   scoped_refptr<gfx::GLShareGroup> share_group_;
 
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
-  scoped_refptr<gpu::gles2::ImageManager> image_manager_;
 
   typedef IDMap<GpuCommandBufferStub, IDMapOwnPointer> StubMap;
   StubMap stubs_;
@@ -226,6 +219,8 @@ class GpuChannel : public IPC::Listener, public IPC::Sender {
 
   size_t num_stubs_descheduled_;
 
+  bool allow_future_sync_points_;
+
   DISALLOW_COPY_AND_ASSIGN(GpuChannel);
 };