Update the native_viewport interface to allow specification of the surface configuration, currently…

services/gles2/command_buffer_driver.h

 // Copyright 2013 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 SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_
 #define SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/timer/timer.h"
 #include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
+#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_surface.h"
 
 namespace gpu {
 class CommandBufferService;
 class GpuScheduler;
 class GpuControlService;
 class SyncPointManager;
 namespace gles2 {
 class GLES2Decoder;
 class MailboxManager;
 }
@@ skipping 12 matching lines @@
   class Client {
    public:
     virtual ~Client();
     virtual void UpdateVSyncParameters(base::TimeTicks timebase,
                                        base::TimeDelta interval) = 0;
     virtual void DidLoseContext() = 0;
   };
   // Offscreen.
   CommandBufferDriver(gfx::GLShareGroup* share_group,
                       gpu::gles2::MailboxManager* mailbox_manager,
-                      gpu::SyncPointManager* sync_point_manager);
+                      gpu::SyncPointManager* sync_point_manager,
+                      gfx::SurfaceConfiguration requested_configuration);

[abarth-chromium, 2015/06/09 00:30:21]

gfx::SurfaceConfiguration -> const gfx::SurfaceConfiguration&

[iansf, 2015/06/09 01:52:04]

Done.

   // Onscreen.
   CommandBufferDriver(gfx::AcceleratedWidget widget,
                       gfx::GLShareGroup* share_group,
                       gpu::gles2::MailboxManager* mailbox_manager,
-                      gpu::SyncPointManager* sync_point_manager);
+                      gpu::SyncPointManager* sync_point_manager,
+                      gfx::SurfaceConfiguration requested_configuration);

[abarth-chromium, 2015/06/09 00:30:21]

gfx::SurfaceConfiguration -> const gfx::SurfaceConfiguration&

[iansf, 2015/06/09 01:52:04]

Done.

   ~CommandBufferDriver();
 
   void set_client(scoped_ptr<Client> client) { client_ = client.Pass(); }
 
   void Initialize(mojo::CommandBufferSyncClientPtr sync_client,
                   mojo::CommandBufferLostContextObserverPtr loss_observer,
                   mojo::ScopedSharedBufferHandle shared_state);
   void SetGetBuffer(int32_t buffer);
   void Flush(int32_t put_offset);
   void MakeProgress(int32_t last_get_offset);
@@ skipping 18 matching lines @@
   mojo::CommandBufferLostContextObserverPtr loss_observer_;
   gfx::AcceleratedWidget widget_;
   scoped_ptr<gpu::CommandBufferService> command_buffer_;
   scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
   scoped_ptr<gpu::GpuScheduler> scheduler_;
   scoped_refptr<gfx::GLContext> context_;
   scoped_refptr<gfx::GLSurface> surface_;
   scoped_refptr<gfx::GLShareGroup> share_group_;
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
   scoped_refptr<gpu::SyncPointManager> sync_point_manager_;
+  gfx::SurfaceConfiguration requested_configuration_;
 
   scoped_refptr<base::SingleThreadTaskRunner> context_lost_task_runner_;
   base::Callback<void(int32_t)> context_lost_callback_;
 
   base::WeakPtrFactory<CommandBufferDriver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CommandBufferDriver);
 };
 
 }  // namespace gles2
 
 #endif  // SERVICES_GLES2_COMMAND_BUFFER_DRIVER_H_