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

update chromium and v8 patches

Browse source
This commit is contained in:
Jeremy Apthorp 2018-09-20 17:30:26 -07:00
parent aefb8911ec
commit ef12492d6c
78 changed files with 2816 additions and 7025 deletions
Download patch file Download diff file Expand all files Collapse all files

15
patches/common/chromium/scoped_clipboard_writer.patch
View file

@ -1,5 +1,11 @@
From 691dce7bf41c6fbc8ce3bf9fc3fb4ec0ef0cca21 Mon Sep 17 00:00:00 2001
From: Anonymous <anonymous@electronjs.org>
Date: Thu, 20 Sep 2018 17:46:32 -0700
Subject: scoped_clipboard_writer.patch
diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
index 63b5d47b4069..5c48741a3fc7 100644
index 12680a66d17c..6b95e46e3558 100644
--- a/ui/base/clipboard/scoped_clipboard_writer.cc
+++ b/ui/base/clipboard/scoped_clipboard_writer.cc
@@ -103,17 +103,16 @@ void ScopedClipboardWriter::WriteImage(const SkBitmap& bitmap) {
@ -25,7 +31,7 @@ index 63b5d47b4069..5c48741a3fc7 100644
Clipboard::ObjectMapParams parameters;
parameters.push_back(format_parameter);
@@ -121,6 +120,13 @@ void ScopedClipboardWriter::WritePickledData(
@@ -131,6 +130,13 @@ void ScopedClipboardWriter::WriteData(const std::string& type,
objects_[Clipboard::CBF_DATA] = parameters;
}
@ -40,7 +46,7 @@ index 63b5d47b4069..5c48741a3fc7 100644
objects_.clear();
bitmap_.reset();
diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
index bb889c9dd484..bf6cafd9c55a 100644
index 385900eb67de..cf1f803ec123 100644
--- a/ui/base/clipboard/scoped_clipboard_writer.h
+++ b/ui/base/clipboard/scoped_clipboard_writer.h
@@ -57,6 +57,11 @@ class UI_BASE_EXPORT ScopedClipboardWriter {
@ -55,3 +61,6 @@ index bb889c9dd484..bf6cafd9c55a 100644
// Adds arbitrary pickled data to clipboard.
void WritePickledData(const base::Pickle& pickle,
const Clipboard::FormatType& format);
--
2.17.0