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

services/native_viewport/native_viewport_impl.cc

 // Copyright 2014 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.
 
 #include "services/native_viewport/native_viewport_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
+#include "mojo/converters/native_viewport/surface_configuration_type_converters.h"
 #include "mojo/public/cpp/application/interface_factory.h"
 #include "services/gles2/gpu_state.h"
 #include "services/native_viewport/platform_viewport_headless.h"
 #include "ui/events/event.h"
+#include "ui/gl/gl_surface.h"
 
 namespace native_viewport {
 
 NativeViewportImpl::NativeViewportImpl(
     bool is_headless,
     const scoped_refptr<gles2::GpuState>& gpu_state,
     mojo::InterfaceRequest<mojo::NativeViewport> request)
     : is_headless_(is_headless),
       context_provider_(gpu_state),
       sent_metrics_(false),
       metrics_(mojo::ViewportMetrics::New()),
       binding_(this, request.Pass()),
       weak_factory_(this) {
   binding_.set_error_handler(this);
 }
 
 NativeViewportImpl::~NativeViewportImpl() {
   // Destroy the NativeViewport early on as it may call us back during
   // destruction and we want to be in a known state.
   platform_viewport_.reset();
 }
 
-void NativeViewportImpl::Create(mojo::SizePtr size,
-                                const CreateCallback& callback) {
+void NativeViewportImpl::Create(
+    const mojo::SizePtr size,
+    mojo::SurfaceConfigurationPtr requested_configuration,
+    const CreateCallback& callback) {
+
+  if (requested_configuration == nullptr) {
+    requested_configuration = mojo::SurfaceConfiguration::New();
+  }
+
   create_callback_ = callback;
   metrics_->size = size.Clone();
+  context_provider_.set_surface_configuration(
+      requested_configuration.To<gfx::SurfaceConfiguration>());
   if (is_headless_)
     platform_viewport_ = PlatformViewportHeadless::Create(this);
   else
     platform_viewport_ = PlatformViewport::Create(this);
   platform_viewport_->Init(gfx::Rect(size.To<gfx::Size>()));
 }
 
 void NativeViewportImpl::RequestMetrics(
     const RequestMetricsCallback& callback) {
   if (!sent_metrics_) {
@@ skipping 10 matching lines @@
 
 void NativeViewportImpl::Hide() {
   platform_viewport_->Hide();
 }
 
 void NativeViewportImpl::Close() {
   DCHECK(platform_viewport_);
   platform_viewport_->Close();
 }
 
-void NativeViewportImpl::SetSize(mojo::SizePtr size) {
+void NativeViewportImpl::SetSize(const mojo::SizePtr size) {
   platform_viewport_->SetBounds(gfx::Rect(size.To<gfx::Size>()));
 }
 
 void NativeViewportImpl::GetContextProvider(
     mojo::InterfaceRequest<mojo::ContextProvider> request) {
   context_provider_.Bind(request.Pass());
 }
 
 void NativeViewportImpl::SetEventDispatcher(
     mojo::NativeViewportEventDispatcherPtr dispatcher) {
@@ skipping 71 matching lines @@
 void NativeViewportImpl::OnConnectionError() {
   binding_.set_error_handler(nullptr);
   delete this;
 }
 
 void NativeViewportImpl::AckEvent(int32 pointer_id) {
   pointers_waiting_on_ack_.erase(pointer_id);
 }
 
 }  // namespace native_viewport