Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Side by Side Diff: services/native_viewport/native_viewport_impl.cc

Issue 1168993002: Update the native_viewport interface to allow specification of the surface configuration, currently… (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Final cleanups Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "services/native_viewport/native_viewport_impl.h" 5 #include "services/native_viewport/native_viewport_impl.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/time/time.h" 11 #include "base/time/time.h"
12 #include "mojo/converters/geometry/geometry_type_converters.h" 12 #include "mojo/converters/geometry/geometry_type_converters.h"
13 #include "mojo/converters/native_viewport/surface_configuration_type_converters. h"
13 #include "mojo/public/cpp/application/interface_factory.h" 14 #include "mojo/public/cpp/application/interface_factory.h"
14 #include "services/gles2/gpu_state.h" 15 #include "services/gles2/gpu_state.h"
15 #include "services/native_viewport/platform_viewport_headless.h" 16 #include "services/native_viewport/platform_viewport_headless.h"
16 #include "ui/events/event.h" 17 #include "ui/events/event.h"
18 #include "ui/gl/gl_surface.h"
17 19
18 namespace native_viewport { 20 namespace native_viewport {
19 21
20 NativeViewportImpl::NativeViewportImpl( 22 NativeViewportImpl::NativeViewportImpl(
21 bool is_headless, 23 bool is_headless,
22 const scoped_refptr<gles2::GpuState>& gpu_state, 24 const scoped_refptr<gles2::GpuState>& gpu_state,
23 mojo::InterfaceRequest<mojo::NativeViewport> request) 25 mojo::InterfaceRequest<mojo::NativeViewport> request)
24 : is_headless_(is_headless), 26 : is_headless_(is_headless),
25 context_provider_(gpu_state), 27 context_provider_(gpu_state),
26 sent_metrics_(false), 28 sent_metrics_(false),
27 metrics_(mojo::ViewportMetrics::New()), 29 metrics_(mojo::ViewportMetrics::New()),
28 binding_(this, request.Pass()), 30 binding_(this, request.Pass()),
29 weak_factory_(this) { 31 weak_factory_(this) {
30 binding_.set_error_handler(this); 32 binding_.set_error_handler(this);
31 } 33 }
32 34
33 NativeViewportImpl::~NativeViewportImpl() { 35 NativeViewportImpl::~NativeViewportImpl() {
34 // Destroy the NativeViewport early on as it may call us back during 36 // Destroy the NativeViewport early on as it may call us back during
35 // destruction and we want to be in a known state. 37 // destruction and we want to be in a known state.
36 platform_viewport_.reset(); 38 platform_viewport_.reset();
37 } 39 }
38 40
39 void NativeViewportImpl::Create(mojo::SizePtr size, 41 void NativeViewportImpl::Create(
40 const CreateCallback& callback) { 42 mojo::SizePtr size,
43 mojo::SurfaceConfigurationPtr requested_configuration,
44 const CreateCallback& callback) {
45 if (requested_configuration == nullptr)
46 requested_configuration = mojo::SurfaceConfiguration::New();
47
41 create_callback_ = callback; 48 create_callback_ = callback;
42 metrics_->size = size.Clone(); 49 metrics_->size = size.Clone();
50 context_provider_.set_surface_configuration(
51 requested_configuration.To<gfx::SurfaceConfiguration>());
43 if (is_headless_) 52 if (is_headless_)
44 platform_viewport_ = PlatformViewportHeadless::Create(this); 53 platform_viewport_ = PlatformViewportHeadless::Create(this);
45 else 54 else
46 platform_viewport_ = PlatformViewport::Create(this); 55 platform_viewport_ = PlatformViewport::Create(this);
47 platform_viewport_->Init(gfx::Rect(size.To<gfx::Size>())); 56 platform_viewport_->Init(gfx::Rect(size.To<gfx::Size>()));
48 } 57 }
49 58
50 void NativeViewportImpl::RequestMetrics( 59 void NativeViewportImpl::RequestMetrics(
51 const RequestMetricsCallback& callback) { 60 const RequestMetricsCallback& callback) {
52 if (!sent_metrics_) { 61 if (!sent_metrics_) {
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 void NativeViewportImpl::OnConnectionError() { 164 void NativeViewportImpl::OnConnectionError() {
156 binding_.set_error_handler(nullptr); 165 binding_.set_error_handler(nullptr);
157 delete this; 166 delete this;
158 } 167 }
159 168
160 void NativeViewportImpl::AckEvent(int32 pointer_id) { 169 void NativeViewportImpl::AckEvent(int32 pointer_id) {
161 pointers_waiting_on_ack_.erase(pointer_id); 170 pointers_waiting_on_ack_.erase(pointer_id);
162 } 171 }
163 172
164 } // namespace native_viewport 173 } // namespace native_viewport
OLDNEW
« no previous file with comments | « services/native_viewport/native_viewport_impl.h ('k') | services/native_viewport/onscreen_context_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698