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

Unified Diff: chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc

Issue 820673004: json_schema_compiler: Use std::vector<char> for binary values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simplify_json_schema
Patch Set: Fix merge error. Created 5 years, 11 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
Index: chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc
index bc8409fc4bb73e9f019391f7174922796470c704..0ead4f57968133d329acee3cb9e9afd326343df2 100644
--- a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc
+++ b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc
@@ -11,6 +11,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/stl_util.h"
#include "base/time/time.h"
#include "chrome/browser/extensions/api/braille_display_private/brlapi_connection.h"
#include "chrome/browser/extensions/api/braille_display_private/brlapi_keycode_map.h"
@@ -93,7 +94,7 @@ scoped_ptr<DisplayState> BrailleControllerImpl::GetDisplayState() {
return display_state.Pass();
}
-void BrailleControllerImpl::WriteDots(const std::string& cells) {
+void BrailleControllerImpl::WriteDots(const std::vector<char>& cells) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (connection_ && connection_->Connected()) {
size_t size;
@@ -101,7 +102,8 @@ void BrailleControllerImpl::WriteDots(const std::string& cells) {
Disconnect();
}
std::vector<unsigned char> sizedCells(size);
- std::memcpy(&sizedCells[0], cells.data(), std::min(cells.size(), size));
+ std::memcpy(&sizedCells[0], vector_as_array(&cells),
+ std::min(cells.size(), size));
if (size > cells.size())
std::fill(sizedCells.begin() + cells.size(), sizedCells.end(), 0);
if (!connection_->WriteDots(&sizedCells[0]))

Powered by Google App Engine
This is Rietveld 408576698