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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/modules/imagecapture/ImageCapture.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp
diff --git a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp
index ff23736127ea0ef2889e9b24478cfc5adbce614d..7821578d1ce1512bf730964fd40ea8d949028ea8 100644
--- a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp
+++ b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp
@@ -218,17 +218,15 @@ void ImageCapture::onSetOptions(ScriptPromiseResolver* resolver, bool result)
m_serviceRequests.remove(resolver);
}
-void ImageCapture::onTakePhoto(ScriptPromiseResolver* resolver, const String& mimeType, mojo::WTFArray<uint8_t> data)
+void ImageCapture::onTakePhoto(ScriptPromiseResolver* resolver, const String& mimeType, const Vector<uint8_t>& data)
{
if (!m_serviceRequests.contains(resolver))
return;
- if (data.is_null() || data.empty()) {
+ if (data.isEmpty())
resolver->reject(DOMException::create(UnknownError, "platform error"));
- } else {
- const auto& storage = data.storage();
- resolver->resolve(Blob::create(storage.data(), storage.size(), mimeType));
- }
+ else
+ resolver->resolve(Blob::create(data.data(), data.size(), mimeType));
m_serviceRequests.remove(resolver);
}
« 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