summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2019-06-19 17:24:22 -0400
committerMike Gilbert <floppym@gentoo.org>2019-06-19 17:24:22 -0400
commit7bcc030cf5bc9e3df3f5f9d3345b706f2349ff08 (patch)
tree23c5ed376b783d9cb6dfc9f71f086f731f9484d8 /www-client/chromium/files
parentwww-client/chromium: stable channel bump (diff)
downloadgentoo-7bcc030cf5bc9e3df3f5f9d3345b706f2349ff08.tar.gz
gentoo-7bcc030cf5bc9e3df3f5f9d3345b706f2349ff08.tar.bz2
gentoo-7bcc030cf5bc9e3df3f5f9d3345b706f2349ff08.zip
www-client/chromium: remove old
Package-Manager: Portage-2.3.67_p10, Repoman-2.3.14_p5 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r--www-client/chromium/files/chromium-74-7685422.patch42
-rw-r--r--www-client/chromium/files/chromium-74-c2c467f.patch75
2 files changed, 0 insertions, 117 deletions
diff --git a/www-client/chromium/files/chromium-74-7685422.patch b/www-client/chromium/files/chromium-74-7685422.patch
deleted file mode 100644
index 19747245bd78..000000000000
--- a/www-client/chromium/files/chromium-74-7685422.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 7685422a90e1da829cb32d685a4b970d30738098 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Wed, 3 Apr 2019 18:35:04 +0000
-Subject: [PATCH] base: Value::Type enum class size should be 8-bit.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC is complaining because, when base::Type is used to declare the different
-variants of Type in its union, they are forced to take 8-bit, that is smaller
-than the enum class default size (same as int).
-
-So this change sets explicitely the enum class underlying type to be unsigned
-char.
-
-BUG=chromium:819294
-
-Change-Id: I1765e2503e2c3d3675c73ecb0f7f5bc33456e6f0
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1550366
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#647382}
----
- base/values.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/base/values.h b/base/values.h
-index c455936d4961..14b76acec02f 100644
---- a/base/values.h
-+++ b/base/values.h
-@@ -86,7 +86,7 @@ class BASE_EXPORT Value {
- // See technical note below explaining why this is used.
- using DoubleStorage = struct { alignas(4) char v[sizeof(double)]; };
-
-- enum class Type {
-+ enum class Type : unsigned char {
- NONE = 0,
- BOOLEAN,
- INTEGER,
---
-2.21.0
-
diff --git a/www-client/chromium/files/chromium-74-c2c467f.patch b/www-client/chromium/files/chromium-74-c2c467f.patch
deleted file mode 100644
index e9e5d22e4a87..000000000000
--- a/www-client/chromium/files/chromium-74-c2c467f.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From c2c467f69fc00d353879d7add5f2c04a6acabbb1 Mon Sep 17 00:00:00 2001
-From: David 'Digit' Turner <digit@google.com>
-Date: Wed, 20 Mar 2019 21:41:09 +0000
-Subject: [PATCH] base: Value::FindDoubleKey() converts integers to doubles
-
-Ensure that FindDoubleKey() can return the value of an
-INTEGER key as a double. This is consistent with the behaviour
-of Value::GetDouble() which will auto-convert INTEGER values
-to doubles.
-
-BUG=646113
-R=dcheng@chromium.org,jdoerrie@chromium.org,sdefresne@chromium.org,hidehiko@chromium.org
-
-Change-Id: I2c08cb91b6cfd5db268a182ffffe16682d848008
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1529017
-Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
-Reviewed-by: Daniel Cheng <dcheng@chromium.org>
-Commit-Queue: David Turner <digit@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#642680}
----
- base/values.cc | 10 ++++++++--
- base/values.h | 2 ++
- base/values_unittest.cc | 2 +-
- 3 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/base/values.cc b/base/values.cc
-index 035aa2350cde..69d66ff8ab00 100644
---- a/base/values.cc
-+++ b/base/values.cc
-@@ -339,8 +339,14 @@ base::Optional<int> Value::FindIntKey(StringPiece key) const {
- }
-
- base::Optional<double> Value::FindDoubleKey(StringPiece key) const {
-- const Value* result = FindKeyOfType(key, Type::DOUBLE);
-- return result ? base::make_optional(result->double_value_) : base::nullopt;
-+ const Value* result = FindKey(key);
-+ if (result) {
-+ if (result->is_int())
-+ return base::make_optional(static_cast<double>(result->int_value_));
-+ if (result->is_double())
-+ return base::make_optional(result->double_value_);
-+ }
-+ return base::nullopt;
- }
-
- const std::string* Value::FindStringKey(StringPiece key) const {
-diff --git a/base/values.h b/base/values.h
-index e31cadd83102..6f2cd3cc3d79 100644
---- a/base/values.h
-+++ b/base/values.h
-@@ -200,6 +200,8 @@ class BASE_EXPORT Value {
- // function's name.
- base::Optional<bool> FindBoolKey(StringPiece key) const;
- base::Optional<int> FindIntKey(StringPiece key) const;
-+ // Note FindDoubleKey() will auto-convert INTEGER keys to their double
-+ // value, for consistency with GetDouble().
- base::Optional<double> FindDoubleKey(StringPiece key) const;
-
- // |FindStringKey| returns |nullptr| if value is not found or not a string.
-diff --git a/base/values_unittest.cc b/base/values_unittest.cc
-index b23fd8332491..7c545c09d947 100644
---- a/base/values_unittest.cc
-+++ b/base/values_unittest.cc
-@@ -674,7 +674,7 @@ TEST(ValuesTest, FindDoubleKey) {
- const Value dict(std::move(storage));
- EXPECT_EQ(base::nullopt, dict.FindDoubleKey("null"));
- EXPECT_EQ(base::nullopt, dict.FindDoubleKey("bool"));
-- EXPECT_EQ(base::nullopt, dict.FindDoubleKey("int"));
-+ EXPECT_NE(base::nullopt, dict.FindDoubleKey("int"));
- EXPECT_NE(base::nullopt, dict.FindDoubleKey("double"));
- EXPECT_EQ(base::nullopt, dict.FindDoubleKey("string"));
- EXPECT_EQ(base::nullopt, dict.FindDoubleKey("blob"));
---
-2.21.0
-