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

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

Issue 2401393003: Add multiline braille support. (Closed)
Patch Set: Got braille cells to show up on braille display Created 4 years, 2 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/brlapi_connection.cc
diff --git a/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc b/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc
index 5739710383dceb519f03c0051fd71f11a875efd0..a4f7ab1318945134843aae3b1c18a3687014d4ad 100644
--- a/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc
+++ b/chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc
@@ -43,8 +43,8 @@ class BrlapiConnectionImpl : public BrlapiConnection,
bool Connected() override { return handle_ != nullptr; }
brlapi_error_t* BrlapiError() override;
std::string BrlapiStrError() override;
- bool GetDisplaySize(size_t* size) override;
- bool WriteDots(const unsigned char* cells) override;
+ bool GetDisplaySize(unsigned int* rows, unsigned int* columns) override;
+ bool WriteDots(const std::vector<unsigned char> cells) override;
int ReadKey(brlapi_keyCode_t* keyCode) override;
// MessageLoopForIO::Watcher
@@ -101,9 +101,9 @@ BrlapiConnection::ConnectResult BrlapiConnectionImpl::Connect(
Disconnect();
return CONNECT_ERROR_RETRY;
}
+ unsigned int rows, columns;
- size_t size;
- if (!GetDisplaySize(&size)) {
+ if (!GetDisplaySize(&rows, &columns)) {
// Error already logged.
Disconnect();
return CONNECT_ERROR_RETRY;
@@ -112,7 +112,7 @@ BrlapiConnection::ConnectResult BrlapiConnectionImpl::Connect(
// A display size of 0 means no display connected. We can't reliably
// detect when a display gets connected, so fail and let the caller
// retry connecting.
- if (size == 0) {
+ if (rows * columns == 0) {
VLOG(1) << "No braille display connected";
Disconnect();
return CONNECT_ERROR_RETRY;
@@ -162,24 +162,24 @@ std::string BrlapiConnectionImpl::BrlapiStrError() {
return libbrlapi_loader_->brlapi_strerror(BrlapiError());
}
-bool BrlapiConnectionImpl::GetDisplaySize(size_t* size) {
+bool BrlapiConnectionImpl::GetDisplaySize(unsigned int* columns,
+ unsigned int* rows) {
if (!CheckConnected()) {
return false;
}
- unsigned int columns, rows;
- if (libbrlapi_loader_->brlapi__getDisplaySize(
- handle_.get(), &columns, &rows) < 0) {
+ if (libbrlapi_loader_->brlapi__getDisplaySize(handle_.get(), columns, rows) <
+ 0) {
LOG(ERROR) << "Couldn't get braille display size " << BrlapiStrError();
return false;
}
- *size = columns * rows;
return true;
}
-bool BrlapiConnectionImpl::WriteDots(const unsigned char* cells) {
+bool BrlapiConnectionImpl::WriteDots(const std::vector<unsigned char> cells) {
+ // Cells is a 2D vector, compressed into 1D.
if (!CheckConnected())
return false;
- if (libbrlapi_loader_->brlapi__writeDots(handle_.get(), cells) < 0) {
+ if (libbrlapi_loader_->brlapi__writeDots(handle_.get(), &cells[0]) < 0) {
VLOG(1) << "Couldn't write to brlapi: " << BrlapiStrError();
return false;
}

Powered by Google App Engine
This is Rietveld 408576698