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

Side by Side Diff: device/generic_sensor/sensor_provider_impl.cc

Issue 2896583005: Reland: Refactor DeviceMotionEventPump to use //device/generic_sensor instead of //device/sensors (Closed)
Patch Set: fix compile error on Windows Created 3 years, 5 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
« no previous file with comments | « device/generic_sensor/platform_sensor_provider_win.cc ('k') | services/device/device_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "device/generic_sensor/sensor_provider_impl.h" 5 #include "device/generic_sensor/sensor_provider_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/feature_list.h"
9 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
10 #include "base/threading/thread_task_runner_handle.h" 11 #include "base/threading/thread_task_runner_handle.h"
11 #include "device/generic_sensor/platform_sensor_provider.h" 12 #include "device/generic_sensor/platform_sensor_provider.h"
12 #include "device/generic_sensor/sensor_impl.h" 13 #include "device/generic_sensor/sensor_impl.h"
13 #include "mojo/public/cpp/bindings/strong_binding.h" 14 #include "mojo/public/cpp/bindings/strong_binding.h"
15 #include "services/device/public/cpp/device_features.h"
14 16
15 namespace device { 17 namespace device {
16 18
17 namespace { 19 namespace {
18 20
19 void RunCallback(mojom::SensorInitParamsPtr init_params, 21 void RunCallback(mojom::SensorInitParamsPtr init_params,
20 mojom::SensorClientRequest client, 22 mojom::SensorClientRequest client,
21 SensorProviderImpl::GetSensorCallback callback) { 23 SensorProviderImpl::GetSensorCallback callback) {
22 std::move(callback).Run(std::move(init_params), std::move(client)); 24 std::move(callback).Run(std::move(init_params), std::move(client));
23 } 25 }
(...skipping 23 matching lines...) Expand all
47 SensorProviderImpl::SensorProviderImpl(PlatformSensorProvider* provider) 49 SensorProviderImpl::SensorProviderImpl(PlatformSensorProvider* provider)
48 : provider_(provider), weak_ptr_factory_(this) { 50 : provider_(provider), weak_ptr_factory_(this) {
49 DCHECK(provider_); 51 DCHECK(provider_);
50 } 52 }
51 53
52 SensorProviderImpl::~SensorProviderImpl() {} 54 SensorProviderImpl::~SensorProviderImpl() {}
53 55
54 void SensorProviderImpl::GetSensor(mojom::SensorType type, 56 void SensorProviderImpl::GetSensor(mojom::SensorType type,
55 mojom::SensorRequest sensor_request, 57 mojom::SensorRequest sensor_request,
56 GetSensorCallback callback) { 58 GetSensorCallback callback) {
59 // TODO(juncai): remove when the GenericSensor feature goes stable.
60 // For sensors that are used by DeviceMotionEvent, don't check the
61 // features::kGenericSensor flag.
62 if (!base::FeatureList::IsEnabled(features::kGenericSensor) &&
63 !(type == mojom::SensorType::ACCELEROMETER ||
64 type == mojom::SensorType::LINEAR_ACCELERATION ||
65 type == mojom::SensorType::GYROSCOPE)) {
66 NotifySensorCreated(nullptr, nullptr, std::move(callback));
67 return;
68 }
69
57 auto cloned_handle = provider_->CloneSharedBufferHandle(); 70 auto cloned_handle = provider_->CloneSharedBufferHandle();
58 if (!cloned_handle.is_valid()) { 71 if (!cloned_handle.is_valid()) {
59 NotifySensorCreated(nullptr, nullptr, std::move(callback)); 72 NotifySensorCreated(nullptr, nullptr, std::move(callback));
60 return; 73 return;
61 } 74 }
62 75
63 scoped_refptr<PlatformSensor> sensor = provider_->GetSensor(type); 76 scoped_refptr<PlatformSensor> sensor = provider_->GetSensor(type);
64 if (!sensor) { 77 if (!sensor) {
65 PlatformSensorProviderBase::CreateSensorCallback cb = base::Bind( 78 PlatformSensorProviderBase::CreateSensorCallback cb = base::Bind(
66 &SensorProviderImpl::SensorCreated, weak_ptr_factory_.GetWeakPtr(), 79 &SensorProviderImpl::SensorCreated, weak_ptr_factory_.GetWeakPtr(),
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 init_params->minimum_frequency = sensor->GetMinimumSupportedFrequency(); 115 init_params->minimum_frequency = sensor->GetMinimumSupportedFrequency();
103 DCHECK_GT(init_params->minimum_frequency, 0.0); 116 DCHECK_GT(init_params->minimum_frequency, 0.0);
104 117
105 NotifySensorCreated(std::move(init_params), sensor_impl->GetClient(), 118 NotifySensorCreated(std::move(init_params), sensor_impl->GetClient(),
106 std::move(callback)); 119 std::move(callback));
107 120
108 mojo::MakeStrongBinding(std::move(sensor_impl), std::move(sensor_request)); 121 mojo::MakeStrongBinding(std::move(sensor_impl), std::move(sensor_request));
109 } 122 }
110 123
111 } // namespace device 124 } // namespace device
OLDNEW
« no previous file with comments | « device/generic_sensor/platform_sensor_provider_win.cc ('k') | services/device/device_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698