Chromium Code Reviews| Index: services/native_viewport/native_viewport_impl.cc |
| diff --git a/services/native_viewport/native_viewport_impl.cc b/services/native_viewport/native_viewport_impl.cc |
| index f39f53b3f9bad9bf35df8d60a8d2dc9442a3bc8d..7dddd709de0c649ca2bcf6fe4a09278320fe1f4f 100644 |
| --- a/services/native_viewport/native_viewport_impl.cc |
| +++ b/services/native_viewport/native_viewport_impl.cc |
| @@ -10,10 +10,14 @@ |
| #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_implementation.h" |
| +#include "ui/gl/gl_surface.h" |
| +#include "ui/gl/gl_surface_egl.h" |
|
abarth-chromium
2015/06/09 00:30:21
Do we need gl_implementation.h and gl_surface_egl.
iansf
2015/06/09 01:52:04
Done.
|
| namespace native_viewport { |
| @@ -36,10 +40,14 @@ NativeViewportImpl::~NativeViewportImpl() { |
| platform_viewport_.reset(); |
| } |
| -void NativeViewportImpl::Create(mojo::SizePtr size, |
| - const CreateCallback& callback) { |
| +void NativeViewportImpl::Create( |
| + mojo::SizePtr size, |
| + mojo::SurfaceConfigurationPtr requested_configuration, |
| + const CreateCallback& callback) { |
| create_callback_ = callback; |
| metrics_->size = size.Clone(); |
| + context_provider_.SetSurfaceConfiguration( |
| + requested_configuration.To<gfx::SurfaceConfiguration>()); |
| if (is_headless_) |
| platform_viewport_ = PlatformViewportHeadless::Create(this); |
| else |