Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae

1 files changed, 8 insertions, 2 deletions

diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h
index e181a3e1a8..dc5f584865 100644
--- a/content/common/gpu/gpu_channel.h
+++ b/content/common/gpu/gpu_channel.h
@@ -17,6 +17,7 @@
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/gpu_memory_manager.h"
+#include "content/common/gpu/gpu_result_codes.h"
 #include "content/common/message_router.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ui/gfx/native_widget_types.h"
@@ -58,7 +59,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,
@@ -107,7 +109,7 @@ class GpuChannel : public IPC::Listener, public IPC::Sender {
   // other channels.
   void StubSchedulingChanged(bool scheduled);
 
-  bool CreateViewCommandBuffer(
+  CreateCommandBufferResult CreateViewCommandBuffer(
       const gfx::GLSurfaceHandle& window,
       int32 surface_id,
       const GPUCreateCommandBufferConfig& init_params,
@@ -150,6 +152,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;
 
@@ -225,6 +229,8 @@ class GpuChannel : public IPC::Listener, public IPC::Sender {
 
   size_t num_stubs_descheduled_;
 
+  bool allow_future_sync_points_;
+
   DISALLOW_COPY_AND_ASSIGN(GpuChannel);
 };