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

Side by Side Diff: third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

Issue 2166713002: ImageCapture: replace Mojo String/Array with stl/wtf string/vector (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: forgot media/.../mojo_bindings.gyp Created 4 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 | « third_party/WebKit/Source/modules/imagecapture/ImageCapture.h ('k') | no next file » | 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 "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
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, mojo::WTFArray<uint8_t> data) 221 void ImageCapture::onTakePhoto(ScriptPromiseResolver* resolver, const String& mi meType, const Vector<uint8_t>& data)
222 { 222 {
223 if (!m_serviceRequests.contains(resolver)) 223 if (!m_serviceRequests.contains(resolver))
224 return; 224 return;
225 225
226 if (data.is_null() || data.empty()) { 226 if (data.isEmpty())
227 resolver->reject(DOMException::create(UnknownError, "platform error")); 227 resolver->reject(DOMException::create(UnknownError, "platform error"));
228 } else { 228 else
229 const auto& storage = data.storage(); 229 resolver->resolve(Blob::create(data.data(), data.size(), mimeType));
230 resolver->resolve(Blob::create(storage.data(), storage.size(), mimeType) );
231 }
232 m_serviceRequests.remove(resolver); 230 m_serviceRequests.remove(resolver);
233 } 231 }
234 232
235 void ImageCapture::onServiceConnectionError() 233 void ImageCapture::onServiceConnectionError()
236 { 234 {
237 m_service.reset(); 235 m_service.reset();
238 for (ScriptPromiseResolver* resolver : m_serviceRequests) 236 for (ScriptPromiseResolver* resolver : m_serviceRequests)
239 resolver->reject(DOMException::create(NotFoundError, kNoServiceError)); 237 resolver->reject(DOMException::create(NotFoundError, kNoServiceError));
240 m_serviceRequests.clear(); 238 m_serviceRequests.clear();
241 } 239 }
242 240
243 DEFINE_TRACE(ImageCapture) 241 DEFINE_TRACE(ImageCapture)
244 { 242 {
245 visitor->trace(m_streamTrack); 243 visitor->trace(m_streamTrack);
246 visitor->trace(m_serviceRequests); 244 visitor->trace(m_serviceRequests);
247 EventTargetWithInlineData::trace(visitor); 245 EventTargetWithInlineData::trace(visitor);
248 ContextLifecycleObserver::trace(visitor); 246 ContextLifecycleObserver::trace(visitor);
249 } 247 }
250 248
251 } // namespace blink 249 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/imagecapture/ImageCapture.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698