| 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 if (!m_service) { | 85 if (!m_service) { |
| 86 resolver->reject(DOMException::create(NotFoundError, kNoServiceError)); | 86 resolver->reject(DOMException::create(NotFoundError, kNoServiceError)); |
| 87 return promise; | 87 return promise; |
| 88 } | 88 } |
| 89 | 89 |
| 90 m_serviceRequests.add(resolver); | 90 m_serviceRequests.add(resolver); |
| 91 | 91 |
| 92 // m_streamTrack->component()->source()->id() is the renderer "name" of the
camera; | 92 // m_streamTrack->component()->source()->id() is the renderer "name" of the
camera; |
| 93 // TODO(mcasas) consider sending the security origin as well: | 93 // TODO(mcasas) consider sending the security origin as well: |
| 94 // scriptState->getExecutionContext()->getSecurityOrigin()->toString() | 94 // scriptState->getExecutionContext()->getSecurityOrigin()->toString() |
| 95 m_service->GetCapabilities(m_streamTrack->component()->source()->id(), creat
eBaseCallback(bind(&ImageCapture::onCapabilities, wrapPersistent(this), wrapPers
istent(resolver)))); | 95 m_service->GetCapabilities(m_streamTrack->component()->source()->id(), creat
eBaseCallback(WTF::bind(&ImageCapture::onCapabilities, wrapPersistent(this), wra
pPersistent(resolver)))); |
| 96 return promise; | 96 return promise; |
| 97 } | 97 } |
| 98 | 98 |
| 99 ScriptPromise ImageCapture::setOptions(ScriptState* scriptState, const PhotoSett
ings& photoSettings, ExceptionState& exceptionState) | 99 ScriptPromise ImageCapture::setOptions(ScriptState* scriptState, const PhotoSett
ings& photoSettings, ExceptionState& exceptionState) |
| 100 { | 100 { |
| 101 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; | 101 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; |
| 102 ScriptPromise promise = resolver->promise(); | 102 ScriptPromise promise = resolver->promise(); |
| 103 | 103 |
| 104 if (trackIsInactive(*m_streamTrack)) { | 104 if (trackIsInactive(*m_streamTrack)) { |
| 105 resolver->reject(DOMException::create(InvalidStateError, "The associated
Track is in an invalid state.")); | 105 resolver->reject(DOMException::create(InvalidStateError, "The associated
Track is in an invalid state.")); |
| 106 return promise; | 106 return promise; |
| 107 } | 107 } |
| 108 | 108 |
| 109 if (!m_service) { | 109 if (!m_service) { |
| 110 resolver->reject(DOMException::create(NotFoundError, kNoServiceError)); | 110 resolver->reject(DOMException::create(NotFoundError, kNoServiceError)); |
| 111 return promise; | 111 return promise; |
| 112 } | 112 } |
| 113 | 113 |
| 114 m_serviceRequests.add(resolver); | 114 m_serviceRequests.add(resolver); |
| 115 | 115 |
| 116 // TODO(mcasas): should be using a mojo::StructTraits instead. | 116 // TODO(mcasas): should be using a mojo::StructTraits instead. |
| 117 media::mojom::blink::PhotoSettingsPtr settings = media::mojom::blink::PhotoS
ettings::New(); | 117 media::mojom::blink::PhotoSettingsPtr settings = media::mojom::blink::PhotoS
ettings::New(); |
| 118 settings->has_zoom = photoSettings.hasZoom(); | 118 settings->has_zoom = photoSettings.hasZoom(); |
| 119 if (settings->has_zoom) | 119 if (settings->has_zoom) |
| 120 settings->zoom = photoSettings.zoom(); | 120 settings->zoom = photoSettings.zoom(); |
| 121 | 121 |
| 122 m_service->SetOptions(m_streamTrack->component()->source()->id(), std::move(
settings), createBaseCallback(bind(&ImageCapture::onSetOptions, wrapPersistent(t
his), wrapPersistent(resolver)))); | 122 m_service->SetOptions(m_streamTrack->component()->source()->id(), std::move(
settings), createBaseCallback(WTF::bind(&ImageCapture::onSetOptions, wrapPersist
ent(this), wrapPersistent(resolver)))); |
| 123 return promise; | 123 return promise; |
| 124 } | 124 } |
| 125 | 125 |
| 126 | 126 |
| 127 ScriptPromise ImageCapture::takePhoto(ScriptState* scriptState, ExceptionState&
exceptionState) | 127 ScriptPromise ImageCapture::takePhoto(ScriptState* scriptState, ExceptionState&
exceptionState) |
| 128 { | 128 { |
| 129 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; | 129 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; |
| 130 ScriptPromise promise = resolver->promise(); | 130 ScriptPromise promise = resolver->promise(); |
| 131 | 131 |
| 132 if (trackIsInactive(*m_streamTrack)) { | 132 if (trackIsInactive(*m_streamTrack)) { |
| 133 resolver->reject(DOMException::create(InvalidStateError, "The associated
Track is in an invalid state.")); | 133 resolver->reject(DOMException::create(InvalidStateError, "The associated
Track is in an invalid state.")); |
| 134 return promise; | 134 return promise; |
| 135 } | 135 } |
| 136 | 136 |
| 137 if (!m_service) { | 137 if (!m_service) { |
| 138 resolver->reject(DOMException::create(NotFoundError, kNoServiceError)); | 138 resolver->reject(DOMException::create(NotFoundError, kNoServiceError)); |
| 139 return promise; | 139 return promise; |
| 140 } | 140 } |
| 141 | 141 |
| 142 m_serviceRequests.add(resolver); | 142 m_serviceRequests.add(resolver); |
| 143 | 143 |
| 144 // m_streamTrack->component()->source()->id() is the renderer "name" of the
camera; | 144 // m_streamTrack->component()->source()->id() is the renderer "name" of the
camera; |
| 145 // TODO(mcasas) consider sending the security origin as well: | 145 // TODO(mcasas) consider sending the security origin as well: |
| 146 // scriptState->getExecutionContext()->getSecurityOrigin()->toString() | 146 // scriptState->getExecutionContext()->getSecurityOrigin()->toString() |
| 147 m_service->TakePhoto(m_streamTrack->component()->source()->id(), createBaseC
allback(bind(&ImageCapture::onTakePhoto, wrapPersistent(this), wrapPersistent(re
solver)))); | 147 m_service->TakePhoto(m_streamTrack->component()->source()->id(), createBaseC
allback(WTF::bind(&ImageCapture::onTakePhoto, wrapPersistent(this), wrapPersiste
nt(resolver)))); |
| 148 return promise; | 148 return promise; |
| 149 } | 149 } |
| 150 | 150 |
| 151 ScriptPromise ImageCapture::grabFrame(ScriptState* scriptState, ExceptionState&
exceptionState) | 151 ScriptPromise ImageCapture::grabFrame(ScriptState* scriptState, ExceptionState&
exceptionState) |
| 152 { | 152 { |
| 153 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; | 153 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; |
| 154 ScriptPromise promise = resolver->promise(); | 154 ScriptPromise promise = resolver->promise(); |
| 155 | 155 |
| 156 if (trackIsInactive(*m_streamTrack)) { | 156 if (trackIsInactive(*m_streamTrack)) { |
| 157 resolver->reject(DOMException::create(InvalidStateError, "The associated
Track is in an invalid state.")); | 157 resolver->reject(DOMException::create(InvalidStateError, "The associated
Track is in an invalid state.")); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 177 ImageCapture::ImageCapture(ExecutionContext* context, MediaStreamTrack* track) | 177 ImageCapture::ImageCapture(ExecutionContext* context, MediaStreamTrack* track) |
| 178 : ActiveScriptWrappable(this) | 178 : ActiveScriptWrappable(this) |
| 179 , ContextLifecycleObserver(context) | 179 , ContextLifecycleObserver(context) |
| 180 , m_streamTrack(track) | 180 , m_streamTrack(track) |
| 181 { | 181 { |
| 182 DCHECK(m_streamTrack); | 182 DCHECK(m_streamTrack); |
| 183 DCHECK(!m_service.is_bound()); | 183 DCHECK(!m_service.is_bound()); |
| 184 | 184 |
| 185 Platform::current()->serviceRegistry()->connectToRemoteService(mojo::GetProx
y(&m_service)); | 185 Platform::current()->serviceRegistry()->connectToRemoteService(mojo::GetProx
y(&m_service)); |
| 186 | 186 |
| 187 m_service.set_connection_error_handler(createBaseCallback(bind(&ImageCapture
::onServiceConnectionError, wrapWeakPersistent(this)))); | 187 m_service.set_connection_error_handler(createBaseCallback(WTF::bind(&ImageCa
pture::onServiceConnectionError, wrapWeakPersistent(this)))); |
| 188 | 188 |
| 189 } | 189 } |
| 190 | 190 |
| 191 void ImageCapture::onCapabilities(ScriptPromiseResolver* resolver, media::mojom:
:blink::PhotoCapabilitiesPtr capabilities) | 191 void ImageCapture::onCapabilities(ScriptPromiseResolver* resolver, media::mojom:
:blink::PhotoCapabilitiesPtr capabilities) |
| 192 { | 192 { |
| 193 DVLOG(1) << __FUNCTION__; | 193 DVLOG(1) << __FUNCTION__; |
| 194 if (!m_serviceRequests.contains(resolver)) | 194 if (!m_serviceRequests.contains(resolver)) |
| 195 return; | 195 return; |
| 196 if (capabilities.is_null()) { | 196 if (capabilities.is_null()) { |
| 197 resolver->reject(DOMException::create(UnknownError, "platform error")); | 197 resolver->reject(DOMException::create(UnknownError, "platform error")); |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 | 241 |
| 242 DEFINE_TRACE(ImageCapture) | 242 DEFINE_TRACE(ImageCapture) |
| 243 { | 243 { |
| 244 visitor->trace(m_streamTrack); | 244 visitor->trace(m_streamTrack); |
| 245 visitor->trace(m_serviceRequests); | 245 visitor->trace(m_serviceRequests); |
| 246 EventTargetWithInlineData::trace(visitor); | 246 EventTargetWithInlineData::trace(visitor); |
| 247 ContextLifecycleObserver::trace(visitor); | 247 ContextLifecycleObserver::trace(visitor); |
| 248 } | 248 } |
| 249 | 249 |
| 250 } // namespace blink | 250 } // namespace blink |
| OLD | NEW |