| 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 "modules/imagecapture/ImageCapture.h" | 5 #include "modules/imagecapture/ImageCapture.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/CallbackPromiseAdapter.h" | 7 #include "bindings/core/v8/CallbackPromiseAdapter.h" |
| 8 #include "bindings/core/v8/ScriptPromiseResolver.h" | 8 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 9 #include "core/dom/DOMException.h" | 9 #include "core/dom/DOMException.h" |
| 10 #include "core/dom/ExceptionCode.h" | 10 #include "core/dom/ExceptionCode.h" |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 if (!m_serviceRequests.contains(resolver)) | 223 if (!m_serviceRequests.contains(resolver)) |
| 224 return; | 224 return; |
| 225 | 225 |
| 226 if (result) | 226 if (result) |
| 227 resolver->resolve(); | 227 resolver->resolve(); |
| 228 else | 228 else |
| 229 resolver->reject(DOMException::create(UnknownError, "setOptions failed")
); | 229 resolver->reject(DOMException::create(UnknownError, "setOptions failed")
); |
| 230 m_serviceRequests.remove(resolver); | 230 m_serviceRequests.remove(resolver); |
| 231 } | 231 } |
| 232 | 232 |
| 233 void ImageCapture::onTakePhoto(ScriptPromiseResolver* resolver, const String& mi
meType, const Vector<uint8_t>& data) | 233 void ImageCapture::onTakePhoto(ScriptPromiseResolver* resolver, media::mojom::bl
ink::BlobPtr blob) |
| 234 { | 234 { |
| 235 if (!m_serviceRequests.contains(resolver)) | 235 if (!m_serviceRequests.contains(resolver)) |
| 236 return; | 236 return; |
| 237 | 237 |
| 238 if (data.isEmpty()) | 238 // TODO(mcasas): Should be using a mojo::StructTraits. |
| 239 if (blob->data.isEmpty()) |
| 239 resolver->reject(DOMException::create(UnknownError, "platform error")); | 240 resolver->reject(DOMException::create(UnknownError, "platform error")); |
| 240 else | 241 else |
| 241 resolver->resolve(Blob::create(data.data(), data.size(), mimeType)); | 242 resolver->resolve(Blob::create(blob->data.data(), blob->data.size(), blo
b->mime_type)); |
| 242 m_serviceRequests.remove(resolver); | 243 m_serviceRequests.remove(resolver); |
| 243 } | 244 } |
| 244 | 245 |
| 245 void ImageCapture::onServiceConnectionError() | 246 void ImageCapture::onServiceConnectionError() |
| 246 { | 247 { |
| 247 m_service.reset(); | 248 m_service.reset(); |
| 248 for (ScriptPromiseResolver* resolver : m_serviceRequests) | 249 for (ScriptPromiseResolver* resolver : m_serviceRequests) |
| 249 resolver->reject(DOMException::create(NotFoundError, kNoServiceError)); | 250 resolver->reject(DOMException::create(NotFoundError, kNoServiceError)); |
| 250 m_serviceRequests.clear(); | 251 m_serviceRequests.clear(); |
| 251 } | 252 } |
| 252 | 253 |
| 253 DEFINE_TRACE(ImageCapture) | 254 DEFINE_TRACE(ImageCapture) |
| 254 { | 255 { |
| 255 visitor->trace(m_streamTrack); | 256 visitor->trace(m_streamTrack); |
| 256 visitor->trace(m_serviceRequests); | 257 visitor->trace(m_serviceRequests); |
| 257 EventTargetWithInlineData::trace(visitor); | 258 EventTargetWithInlineData::trace(visitor); |
| 258 ContextLifecycleObserver::trace(visitor); | 259 ContextLifecycleObserver::trace(visitor); |
| 259 } | 260 } |
| 260 | 261 |
| 261 } // namespace blink | 262 } // namespace blink |
| OLD | NEW |