Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "device/generic_sensor/platform_sensor_provider.h" | 9 #include "device/generic_sensor/platform_sensor_provider.h" |
| 10 #include "device/generic_sensor/sensor_impl.h" | 10 #include "device/generic_sensor/sensor_impl.h" |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 25 // static | 25 // static |
| 26 void SensorProviderImpl::Create(mojom::SensorProviderRequest request) { | 26 void SensorProviderImpl::Create(mojom::SensorProviderRequest request) { |
| 27 PlatformSensorProvider* provider = PlatformSensorProvider::GetInstance(); | 27 PlatformSensorProvider* provider = PlatformSensorProvider::GetInstance(); |
| 28 if (provider) { | 28 if (provider) { |
| 29 mojo::MakeStrongBinding(base::WrapUnique(new SensorProviderImpl(provider)), | 29 mojo::MakeStrongBinding(base::WrapUnique(new SensorProviderImpl(provider)), |
| 30 std::move(request)); | 30 std::move(request)); |
| 31 } | 31 } |
| 32 } | 32 } |
| 33 | 33 |
| 34 SensorProviderImpl::SensorProviderImpl(PlatformSensorProvider* provider) | 34 SensorProviderImpl::SensorProviderImpl(PlatformSensorProvider* provider) |
| 35 : provider_(provider) { | 35 : provider_(provider), weak_ptr_factory_(this) { |
| 36 DCHECK(provider_); | 36 DCHECK(provider_); |
| 37 } | 37 } |
| 38 | 38 |
| 39 SensorProviderImpl::~SensorProviderImpl() {} | 39 SensorProviderImpl::~SensorProviderImpl() {} |
| 40 | 40 |
| 41 void SensorProviderImpl::GetSensor(mojom::SensorType type, | 41 void SensorProviderImpl::GetSensor(mojom::SensorType type, |
| 42 mojom::SensorRequest sensor_request, | 42 mojom::SensorRequest sensor_request, |
| 43 const GetSensorCallback& callback) { | 43 const GetSensorCallback& callback) { |
| 44 auto cloned_handle = provider_->CloneSharedBufferHandle(); | 44 auto cloned_handle = provider_->CloneSharedBufferHandle(); |
| 45 if (!cloned_handle.is_valid()) { | 45 if (!cloned_handle.is_valid()) { |
| 46 callback.Run(nullptr, nullptr); | 46 callback.Run(nullptr, nullptr); |
| 47 return; | 47 return; |
| 48 } | 48 } |
| 49 | 49 |
| 50 scoped_refptr<PlatformSensor> sensor = provider_->GetSensor(type); | 50 scoped_refptr<PlatformSensor> sensor = provider_->GetSensor(type); |
| 51 if (!sensor) { | 51 if (!sensor) { |
| 52 sensor = provider_->CreateSensor( | 52 PlatformSensorProviderBase::CreateSensorCallback cb = base::Bind( |
| 53 type, mojom::SensorInitParams::kReadBufferSize, GetBufferOffset(type)); | 53 &SensorProviderImpl::SensorCreated, weak_ptr_factory_.GetWeakPtr(), |
| 54 type, base::Passed(&cloned_handle), base::Passed(&sensor_request), | |
| 55 callback); | |
| 56 provider_->CreateSensor(type, mojom::SensorInitParams::kReadBufferSize, | |
| 57 GetBufferOffset(type), cb); | |
|
timvolodine
2016/09/30 18:50:48
you mentioned this is 'synchronous' on android/mac
maksims (do not use this acc)
2016/10/03 12:58:11
It's technically possible, but it would be conside
timvolodine
2016/10/03 17:44:12
I think this should be addressed to some extent to
maksims (do not use this acc)
2016/10/04 07:21:34
Sure. As per discussion with shalamov@, we had the
| |
| 58 return; | |
| 54 } | 59 } |
| 55 | 60 |
| 61 SensorCreated(type, std::move(cloned_handle), std::move(sensor_request), | |
| 62 callback, std::move(sensor)); | |
| 63 } | |
| 64 | |
| 65 void SensorProviderImpl::SensorCreated( | |
| 66 mojom::SensorType type, | |
| 67 mojo::ScopedSharedBufferHandle cloned_handle, | |
| 68 mojom::SensorRequest sensor_request, | |
| 69 const GetSensorCallback& callback, | |
| 70 scoped_refptr<PlatformSensor> sensor) { | |
| 56 if (!sensor) { | 71 if (!sensor) { |
| 57 callback.Run(nullptr, nullptr); | 72 callback.Run(nullptr, nullptr); |
| 58 return; | 73 return; |
| 59 } | 74 } |
| 60 | 75 |
| 61 auto sensor_impl = base::MakeUnique<SensorImpl>(sensor); | 76 auto sensor_impl = base::MakeUnique<SensorImpl>(sensor); |
| 62 | 77 |
| 63 auto init_params = mojom::SensorInitParams::New(); | 78 auto init_params = mojom::SensorInitParams::New(); |
| 64 init_params->memory = std::move(cloned_handle); | 79 init_params->memory = std::move(cloned_handle); |
| 65 init_params->buffer_offset = GetBufferOffset(type); | 80 init_params->buffer_offset = GetBufferOffset(type); |
| 66 init_params->mode = sensor->GetReportingMode(); | 81 init_params->mode = sensor->GetReportingMode(); |
| 67 init_params->default_configuration = sensor->GetDefaultConfiguration(); | 82 init_params->default_configuration = sensor->GetDefaultConfiguration(); |
| 68 | 83 |
| 69 callback.Run(std::move(init_params), sensor_impl->GetClient()); | 84 callback.Run(std::move(init_params), sensor_impl->GetClient()); |
| 70 | 85 |
| 71 mojo::MakeStrongBinding(std::move(sensor_impl), std::move(sensor_request)); | 86 mojo::MakeStrongBinding(std::move(sensor_impl), std::move(sensor_request)); |
| 72 } | 87 } |
| 73 | 88 |
| 74 } // namespace device | 89 } // namespace device |
| OLD | NEW |