mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

run clang-format

Browse source
This commit is contained in:
Shelley Vohr 2018-04-16 15:08:17 -04:00
parent a19ddfc578
commit 354f872919
No known key found for this signature in database
GPG key ID: F13993A75599653C
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
atom/common/api/atom_api_clipboard.cc
View file

@ -52,8 +52,8 @@ std::string Clipboard::Read(const std::string& format_string) {
v8::Local<v8::Value> Clipboard::ReadBuffer(const std::string& format_string, v8::Local<v8::Value> Clipboard::ReadBuffer(const std::string& format_string,
mate::Arguments* args) { mate::Arguments* args) {
std::string data = Read(format_string); std::string data = Read(format_string);
return node::Buffer::Copy( return node::Buffer::Copy(args->isolate(), data.data(), data.length())
args->isolate(), data.data(), data.length()).ToLocalChecked(); .ToLocalChecked();
} }
void Clipboard::WriteBuffer(const std::string& format, void Clipboard::WriteBuffer(const std::string& format,
@ -97,11 +97,11 @@ base::string16 Clipboard::ReadText(mate::Arguments* args) {
base::string16 data; base::string16 data;
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
auto type = GetClipboardType(args); auto type = GetClipboardType(args);
if (clipboard->IsFormatAvailable( if (clipboard->IsFormatAvailable(ui::Clipboard::GetPlainTextWFormatType(),
ui::Clipboard::GetPlainTextWFormatType(), type)) { type)) {
clipboard->ReadText(type, &data); clipboard->ReadText(type, &data);
} else if (clipboard->IsFormatAvailable( } else if (clipboard->IsFormatAvailable(
ui::Clipboard::GetPlainTextFormatType(), type)) { ui::Clipboard::GetPlainTextFormatType(), type)) {
std::string result; std::string result;
clipboard->ReadAsciiText(type, &result); clipboard->ReadAsciiText(type, &result);
data = base::ASCIIToUTF16(result); data = base::ASCIIToUTF16(result);
@ -173,14 +173,16 @@ void Clipboard::WriteImage(const gfx::Image& image, mate::Arguments* args) {
SkBitmap bmp; SkBitmap bmp;
if (bmp.tryAllocPixels(orig.info()) && if (bmp.tryAllocPixels(orig.info()) &&
orig.readPixels(bmp.info(), bmp.getPixels(), bmp.rowBytes(), 0, 0)) { orig.readPixels(bmp.info(), bmp.getPixels(), bmp.rowBytes(), 0, 0)) {
writer.WriteImage(bmp); writer.WriteImage(bmp);
} }
} }
#if !defined(OS_MACOSX) #if !defined(OS_MACOSX)
void Clipboard::WriteFindText(const base::string16& text) {} void Clipboard::WriteFindText(const base::string16& text) {}
base::string16 Clipboard::ReadFindText() { return base::string16(); } base::string16 Clipboard::ReadFindText() {
return base::string16();
}
#endif #endif
void Clipboard::Clear(mate::Arguments* args) { void Clipboard::Clear(mate::Arguments* args) {
@ -193,8 +195,10 @@ void Clipboard::Clear(mate::Arguments* args) {
namespace { namespace {
void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused, void Initialize(v8::Local<v8::Object> exports,
v8::Local<v8::Context> context, void* priv) { v8::Local<v8::Value> unused,
v8::Local<v8::Context> context,
void* priv) {
mate::Dictionary dict(context->GetIsolate(), exports); mate::Dictionary dict(context->GetIsolate(), exports);
dict.SetMethod("availableFormats", &atom::api::Clipboard::AvailableFormats); dict.SetMethod("availableFormats", &atom::api::Clipboard::AvailableFormats);
dict.SetMethod("has", &atom::api::Clipboard::Has); dict.SetMethod("has", &atom::api::Clipboard::Has);