Skip to content

Commit

Permalink
FIXME: Use sk_tool_utils::copy_to() instead of .deepCopyTo().
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeykuzmin committed Oct 5, 2017
1 parent dfda264 commit 44d1fd2
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions atom/common/api/atom_api_clipboard.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
#include "atom/common/native_mate_converters/string16_converter.h"
#include "base/strings/utf_string_conversions.h"
#include "third_party/skia/include/core/SkBitmap.h"
#if 0 // FIXME(alexeykuzmin)
#include "third_party/skia/tools/sk_tool_utils.h"
#endif
#include "ui/base/clipboard/scoped_clipboard_writer.h"

#include "atom/common/node_includes.h"
Expand Down Expand Up @@ -167,13 +170,15 @@ gfx::Image Clipboard::ReadImage(mate::Arguments* args) {

void Clipboard::WriteImage(const gfx::Image& image, mate::Arguments* args) {
ui::ScopedClipboardWriter writer(GetClipboardType(args));
SkBitmap orig = image.AsBitmap();
SkBitmap bmp;
// TODO(ferreus): Replace with sk_tools_utils::copy_to (chrome60)
if (image.AsBitmap().deepCopyTo(&bmp)) {
writer.WriteImage(bmp);
} else {
writer.WriteImage(image.AsBitmap());
}

// FIXME(alexeykuzmin): skia doesn't export sk_tool_utils::copy_to().
// if (sk_tool_utils::copy_to(&bmp, orig.colorType(), orig)) {
// writer.WriteImage(bmp);
// } else {
writer.WriteImage(orig);
// }
}

#if !defined(OS_MACOSX)
Expand Down

0 comments on commit 44d1fd2

Please sign in to comment.