| 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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 if (!m_serviceRequests.contains(resolver)) | 211 if (!m_serviceRequests.contains(resolver)) |
| 212 return; | 212 return; |
| 213 | 213 |
| 214 if (result) | 214 if (result) |
| 215 resolver->resolve(); | 215 resolver->resolve(); |
| 216 else | 216 else |
| 217 resolver->reject(DOMException::create(UnknownError, "setOptions failed")
); | 217 resolver->reject(DOMException::create(UnknownError, "setOptions failed")
); |
| 218 m_serviceRequests.remove(resolver); | 218 m_serviceRequests.remove(resolver); |
| 219 } | 219 } |
| 220 | 220 |
| 221 void ImageCapture::onTakePhoto(ScriptPromiseResolver* resolver, const String& mi
meType, const Vector<uint8_t>& data) | 221 void ImageCapture::onTakePhoto(ScriptPromiseResolver* resolver, media::mojom::bl
ink::BlobPtr blob) |
| 222 { | 222 { |
| 223 if (!m_serviceRequests.contains(resolver)) | 223 if (!m_serviceRequests.contains(resolver)) |
| 224 return; | 224 return; |
| 225 | 225 |
| 226 if (data.isEmpty()) | 226 // TODO(mcasas): Should be using a mojo::StructTraits. |
| 227 if (blob->data.isEmpty()) |
| 227 resolver->reject(DOMException::create(UnknownError, "platform error")); | 228 resolver->reject(DOMException::create(UnknownError, "platform error")); |
| 228 else | 229 else |
| 229 resolver->resolve(Blob::create(data.data(), data.size(), mimeType)); | 230 resolver->resolve(Blob::create(blob->data.data(), blob->data.size(), blo
b->mime_type)); |
| 230 m_serviceRequests.remove(resolver); | 231 m_serviceRequests.remove(resolver); |
| 231 } | 232 } |
| 232 | 233 |
| 233 void ImageCapture::onServiceConnectionError() | 234 void ImageCapture::onServiceConnectionError() |
| 234 { | 235 { |
| 235 m_service.reset(); | 236 m_service.reset(); |
| 236 for (ScriptPromiseResolver* resolver : m_serviceRequests) | 237 for (ScriptPromiseResolver* resolver : m_serviceRequests) |
| 237 resolver->reject(DOMException::create(NotFoundError, kNoServiceError)); | 238 resolver->reject(DOMException::create(NotFoundError, kNoServiceError)); |
| 238 m_serviceRequests.clear(); | 239 m_serviceRequests.clear(); |
| 239 } | 240 } |
| 240 | 241 |
| 241 DEFINE_TRACE(ImageCapture) | 242 DEFINE_TRACE(ImageCapture) |
| 242 { | 243 { |
| 243 visitor->trace(m_streamTrack); | 244 visitor->trace(m_streamTrack); |
| 244 visitor->trace(m_serviceRequests); | 245 visitor->trace(m_serviceRequests); |
| 245 EventTargetWithInlineData::trace(visitor); | 246 EventTargetWithInlineData::trace(visitor); |
| 246 ContextLifecycleObserver::trace(visitor); | 247 ContextLifecycleObserver::trace(visitor); |
| 247 } | 248 } |
| 248 | 249 |
| 249 } // namespace blink | 250 } // namespace blink |
| OLD | NEW |