bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 75.0.3749.0 (#645082)

Browse Source
This commit is contained in:
Daniel Nitsche
2019-04-16 14:38:48 +00:00
committed by Marshall Greenblatt
parent 1beec23065
commit 879911b721
79 changed files with 620 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
patch/patches/base_value_646113.patch
View File

@@ -1,5 +1,5 @@
diff --git base/values.cc base/values.cc
index 2b0c6c8163d8..fc12313a7bb5 100644
index 6f3a9e2cd8a2..d35972814034 100644
--- base/values.cc
+++ base/values.cc
@@ -22,20 +22,6 @@
@@ -23,100 +23,67 @@ index 2b0c6c8163d8..fc12313a7bb5 100644
namespace {
const char* const kTypeNames[] = {"null", "boolean", "integer", "double",
@@ -90,7 +76,7 @@ std::unique_ptr<Value> CopyWithoutEmptyChildren(const Value& node) {
} // namespace
-constexpr uint16_t Value::kMagicIsAlive;
+constexpr uint32_t Value::kMagicIsAlive;
// static
std::unique_ptr<Value> Value::CreateWithCopiedBuffer(const char* buffer,
@@ -112,9 +98,9 @@ Value::Value(Value&& that) noexcept {
InternalMoveConstructFrom(std::move(that));
@@ -150,15 +136,15 @@ Value::Value(Type type) : type_(type) {
}
-Value::Value() noexcept : type_(Type::NONE), is_alive_(kMagicIsAlive) {}
+Value::Value() noexcept : type_(Type::NONE) {}
-Value::Value(Type type) : type_(type), is_alive_(kMagicIsAlive) {
+Value::Value(Type type) : type_(type) {
// Initialize with the default value.
switch (type_) {
case Type::NONE:
@@ -144,20 +130,11 @@ Value::Value(Type type) : type_(type), is_alive_(kMagicIsAlive) {
}
}
-Value::Value(bool in_bool)
Value::Value(bool in_bool)
- : bool_type_(Type::BOOLEAN),
- bool_is_alive_(kMagicIsAlive),
- bool_value_(in_bool) {}
+Value::Value(bool in_bool) : type_(Type::BOOLEAN), bool_value_(in_bool) {}
+ : type_(Type::BOOLEAN),
bool_value_(in_bool) {}
-Value::Value(int in_int)
Value::Value(int in_int)
- : int_type_(Type::INTEGER),
- int_is_alive_(kMagicIsAlive),
- int_value_(in_int) {}
+Value::Value(int in_int) : type_(Type::INTEGER), int_value_(in_int) {}
+ : type_(Type::INTEGER),
int_value_(in_int) {}
-Value::Value(double in_double)
Value::Value(double in_double)
- : double_type_(Type::DOUBLE),
- double_is_alive_(kMagicIsAlive),
- double_value_(in_double) {
+Value::Value(double in_double) : type_(Type::DOUBLE), double_value_(in_double) {
+ : type_(Type::DOUBLE),
double_value_(in_double) {
if (!std::isfinite(double_value_)) {
NOTREACHED() << "Non-finite (i.e. NaN or positive/negative infinity) "
<< "values cannot be represented in JSON";
@@ -170,9 +147,7 @@ Value::Value(const char* in_string) : Value(std::string(in_string)) {}
@@ -172,7 +158,7 @@ Value::Value(const char* in_string) : Value(std::string(in_string)) {}
Value::Value(StringPiece in_string) : Value(std::string(in_string)) {}
Value::Value(std::string&& in_string) noexcept
- : string_type_(Type::STRING),
- string_is_alive_(kMagicIsAlive),
- string_value_(std::move(in_string)) {
+ : type_(Type::STRING), string_value_(std::move(in_string)) {
+ : type_(Type::STRING),
string_value_(std::move(in_string)) {
DCHECK(IsStringUTF8(string_value_));
}
@@ -181,22 +156,15 @@ Value::Value(const char16* in_string16) : Value(StringPiece16(in_string16)) {}
@@ -182,19 +168,19 @@ Value::Value(const char16* in_string16) : Value(StringPiece16(in_string16)) {}
Value::Value(StringPiece16 in_string16) : Value(UTF16ToUTF8(in_string16)) {}
Value::Value(const std::vector<char>& in_blob)
- : binary_type_(Type::BINARY),
- binary_is_alive_(kMagicIsAlive),
- binary_value_(in_blob.begin(), in_blob.end()) {}
+ : type_(Type::BINARY), binary_value_(in_blob.begin(), in_blob.end()) {}
+ : type_(Type::BINARY),
binary_value_(in_blob.begin(), in_blob.end()) {}
Value::Value(base::span<const uint8_t> in_blob)
- : binary_type_(Type::BINARY),
- binary_is_alive_(kMagicIsAlive),
- binary_value_(in_blob.begin(), in_blob.end()) {}
+ : type_(Type::BINARY), binary_value_(in_blob.begin(), in_blob.end()) {}
+ : type_(Type::BINARY),
binary_value_(in_blob.begin(), in_blob.end()) {}
Value::Value(BlobStorage&& in_blob) noexcept
- : binary_type_(Type::BINARY),
- binary_is_alive_(kMagicIsAlive),
- binary_value_(std::move(in_blob)) {}
+ : type_(Type::BINARY), binary_value_(std::move(in_blob)) {}
+ : type_(Type::BINARY),
binary_value_(std::move(in_blob)) {}
-Value::Value(const DictStorage& in_dict)
- : dict_type_(Type::DICTIONARY), dict_is_alive_(kMagicIsAlive), dict_() {
+Value::Value(const DictStorage& in_dict) : type_(Type::DICTIONARY), dict_() {
Value::Value(const DictStorage& in_dict)
- : dict_type_(Type::DICTIONARY), dict_() {
+ : type_(Type::DICTIONARY), dict_() {
dict_.reserve(in_dict.size());
for (const auto& it : in_dict) {
dict_.try_emplace(dict_.end(), it.first,
@@ -205,21 +173,16 @@ Value::Value(const DictStorage& in_dict)
@@ -203,17 +189,17 @@ Value::Value(const DictStorage& in_dict)
}
Value::Value(DictStorage&& in_dict) noexcept
- : dict_type_(Type::DICTIONARY),
- dict_is_alive_(kMagicIsAlive),
- dict_(std::move(in_dict)) {}
+ : type_(Type::DICTIONARY), dict_(std::move(in_dict)) {}
+ : type_(Type::DICTIONARY),
dict_(std::move(in_dict)) {}
-Value::Value(const ListStorage& in_list)
- : list_type_(Type::LIST), list_is_alive_(kMagicIsAlive), list_() {
-Value::Value(const ListStorage& in_list) : list_type_(Type::LIST), list_() {
+Value::Value(const ListStorage& in_list) : type_(Type::LIST), list_() {
list_.reserve(in_list.size());
for (const auto& val : in_list)
@@ -125,46 +92,18 @@ index 2b0c6c8163d8..fc12313a7bb5 100644
Value::Value(ListStorage&& in_list) noexcept
- : list_type_(Type::LIST),
- list_is_alive_(kMagicIsAlive),
- list_(std::move(in_list)) {}
+ : type_(Type::LIST), list_(std::move(in_list)) {}
+ : type_(Type::LIST),
list_(std::move(in_list)) {}
Value& Value::operator=(Value&& that) noexcept {
InternalCleanup();
@@ -733,7 +696,6 @@ size_t Value::EstimateMemoryUsage() const {
void Value::InternalMoveConstructFrom(Value&& that) {
type_ = that.type_;
- is_alive_ = that.is_alive_;
switch (type_) {
case Type::NONE:
diff --git base/values.h base/values.h
index 7546fa53756d..00a357342d23 100644
index 7bc355ee586d..441967681a4b 100644
--- base/values.h
+++ base/values.h
@@ -96,6 +96,10 @@ class BASE_EXPORT Value {
// Note: Do not add more types. See the file-level comment above for why.
};
+ // Magic IsAlive signature to debug double frees.
+ // TODO(crbug.com/859477): Remove once root cause is found.
+ static constexpr uint32_t kMagicIsAlive = 0x15272f19;
+
// For situations where you want to keep ownership of your buffer, this
// factory method creates a new BinaryValue by copying the contents of the
// buffer that's passed in.
@@ -375,100 +379,28 @@ class BASE_EXPORT Value {
@@ -390,78 +390,18 @@ class BASE_EXPORT Value {
size_t EstimateMemoryUsage() const;
protected:
- // Magic IsAlive signature to debug double frees.
- // TODO(crbug.com/859477): Remove once root cause is found.
- static constexpr uint16_t kMagicIsAlive = 0x2f19;
+ // TODO(crbug.com/646113): Make these private once DictionaryValue and
+ // ListValue are properly inlined.
+ Type type_;
- // Technical note:
- // The naive way to implement a tagged union leads to wasted bytes
- // in the object on CPUs like ARM ones, which impose an 8-byte alignment
@@ -194,35 +133,32 @@ index 7546fa53756d..00a357342d23 100644
- // that |double_value_| below is always located at an offset that is a
- // multiple of 8, relative to the start of the overall data structure.
- //
- // Each struct must declare its own |type_| and |is_alive_| field, which
- // must have a different name, to appease the C++ compiler.
- // Each struct must declare its own |type_| field, which must have a different
- // name, to appease the C++ compiler.
- //
- // Using this technique sizeof(base::Value) == 16 on 32-bit ARM instead
- // of 24, without losing any information. Results are unchanged for x86,
- // x86_64 and arm64 (16, 32 and 32 bytes respectively).
+ // TODO(crbug.com/646113): Make these private once DictionaryValue and
+ // ListValue are properly inlined.
+ Type type_;
+
union {
- struct {
- // TODO(crbug.com/646113): Make these private once DictionaryValue and
- // ListValue are properly inlined.
- Type type_ : 8;
-
- // IsAlive member to debug double frees.
- // TODO(crbug.com/859477): Remove once root cause is found.
- uint16_t is_alive_ = kMagicIsAlive;
- };
- struct {
- Type bool_type_ : 8;
- uint16_t bool_is_alive_;
- bool bool_value_;
- };
- struct {
- Type int_type_ : 8;
- uint16_t int_is_alive_;
- int int_value_;
- };
- struct {
- Type double_type_ : 8;
- uint16_t double_is_alive_;
- // Subtle: On architectures that require it, the compiler will ensure
- // that |double_value_|'s offset is a multiple of 8 (e.g. 32-bit ARM).
- // See technical note above to understand why it is important.
@@ -230,22 +166,18 @@ index 7546fa53756d..00a357342d23 100644
- };
- struct {
- Type string_type_ : 8;
- uint16_t string_is_alive_;
- std::string string_value_;
- };
- struct {
- Type binary_type_ : 8;
- uint16_t binary_is_alive_;
- BlobStorage binary_value_;
- };
- struct {
- Type dict_type_ : 8;
- uint16_t dict_is_alive_;
- DictStorage dict_;
- };
- struct {
- Type list_type_ : 8;
- uint16_t list_is_alive_;
- ListStorage list_;
- };
+ bool bool_value_;
@@ -258,19 +190,8 @@ index 7546fa53756d..00a357342d23 100644
};
private:
- friend class ValuesTest_SizeOfValue_Test;
void InternalMoveConstructFrom(Value&& that);
void InternalCleanup();
+ // IsAlive member to debug double frees.
+ // TODO(crbug.com/859477): Remove once root cause is found.
+ uint32_t is_alive_ = kMagicIsAlive;
+
DISALLOW_COPY_AND_ASSIGN(Value);
};
diff --git base/values_unittest.cc base/values_unittest.cc
index 0a641bcc7ef4..bedacd9b1dee 100644
index 2907dc066843..3a65e2d6ff2b 100644
--- base/values_unittest.cc
+++ base/values_unittest.cc
@@ -6,7 +6,6 @@
@@ -289,16 +210,18 @@ index 0a641bcc7ef4..bedacd9b1dee 100644
#include "base/strings/string16.h"
#include "base/strings/string_piece.h"
#include "base/strings/utf_string_conversions.h"
@@ -25,43 +23,6 @@
@@ -26,46 +24,6 @@
namespace base {
-// Test is currently incorrect on Windows x86.
-#if !defined(OS_WIN) || !defined(ARCH_CPU_X86)
-TEST(ValuesTest, SizeOfValue) {
- // Ensure that base::Value is as small as possible, i.e. that there is
- // no wasted space after the inner value due to alignment constraints.
- // Distinguish between the 'header' that includes |type_| and |is_alive_|
- // and the inner value that follows it, which can be a bool, int, double,
- // string, blob, list or dict.
- // Distinguish between the 'header' that includes |type_| and and the inner
- // value that follows it, which can be a bool, int, double, string, blob, list
- // or dict.
-#define INNER_TYPES_LIST(X) \
- X(bool, bool_value_) \
- X(int, int_value_) \
@@ -329,6 +252,7 @@ index 0a641bcc7ef4..bedacd9b1dee 100644
- LOG(INFO) << "max_inner_struct_limit=" << max_inner_struct_limit;
- }
-}
-#endif
-
TEST(ValuesTest, TestNothrow) {
static_assert(std::is_nothrow_move_constructible<Value>::value,