Tomas Popela
5 years ago
parent
82c3fb0c11
commit
782a626758
@ -1,13 +0,0 @@
|
|||||||
diff -up chromium-61.0.3163.79/base/numerics/safe_math_shared_impl.h.fixgcc3 chromium-61.0.3163.79/base/numerics/safe_math_shared_impl.h
|
|
||||||
--- chromium-61.0.3163.79/base/numerics/safe_math_shared_impl.h.fixgcc3 2017-09-06 16:30:15.898454585 -0400
|
|
||||||
+++ chromium-61.0.3163.79/base/numerics/safe_math_shared_impl.h 2017-09-06 16:30:27.570229539 -0400
|
|
||||||
@@ -21,8 +21,7 @@
|
|
||||||
#if !defined(__native_client__) && \
|
|
||||||
((defined(__clang__) && \
|
|
||||||
((__clang_major__ > 3) || \
|
|
||||||
- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
|
|
||||||
- (defined(__GNUC__) && __GNUC__ >= 5))
|
|
||||||
+ (__clang_major__ == 3 && __clang_minor__ >= 4))))
|
|
||||||
#include "base/numerics/safe_math_clang_gcc_impl.h"
|
|
||||||
#define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
|
|
||||||
#else
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
diff -up chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_ptr_info.h
|
|
||||||
--- chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix 2018-08-09 03:21:23.066802340 -0400
|
|
||||||
+++ chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_ptr_info.h 2018-08-09 03:25:10.638595925 -0400
|
|
||||||
@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo {
|
|
||||||
|
|
||||||
bool is_valid() const { return handle_.is_valid(); }
|
|
||||||
|
|
||||||
- explicit operator bool() const { return handle_.is_valid(); }
|
|
||||||
+ explicit operator bool() const { return (bool) handle_.is_valid(); }
|
|
||||||
|
|
||||||
ScopedInterfaceEndpointHandle PassHandle() {
|
|
||||||
return std::move(handle_);
|
|
||||||
diff -up chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_request.h.boolfix chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_request.h
|
|
||||||
--- chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_request.h.boolfix 2018-08-09 03:21:23.067802318 -0400
|
|
||||||
+++ chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_request.h 2018-08-09 03:24:44.935229067 -0400
|
|
||||||
@@ -50,7 +50,7 @@ class AssociatedInterfaceRequest {
|
|
||||||
// handle.
|
|
||||||
bool is_pending() const { return handle_.is_valid(); }
|
|
||||||
|
|
||||||
- explicit operator bool() const { return handle_.is_valid(); }
|
|
||||||
+ explicit operator bool() const { return (bool) handle_.is_valid(); }
|
|
||||||
|
|
||||||
ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); }
|
|
||||||
|
|
||||||
diff -up chromium-68.0.3440.106/mojo/public/cpp/bindings/interface_request.h.boolfix chromium-68.0.3440.106/mojo/public/cpp/bindings/interface_request.h
|
|
||||||
--- chromium-68.0.3440.106/mojo/public/cpp/bindings/interface_request.h.boolfix 2018-08-08 15:11:05.000000000 -0400
|
|
||||||
+++ chromium-68.0.3440.106/mojo/public/cpp/bindings/interface_request.h 2018-08-09 03:21:23.067802318 -0400
|
|
||||||
@@ -54,7 +54,7 @@ class InterfaceRequest {
|
|
||||||
// Indicates whether the request currently contains a valid message pipe.
|
|
||||||
bool is_pending() const { return handle_.is_valid(); }
|
|
||||||
|
|
||||||
- explicit operator bool() const { return handle_.is_valid(); }
|
|
||||||
+ explicit operator bool() const { return (bool) handle_.is_valid(); }
|
|
||||||
|
|
||||||
// Removes the message pipe from the request and returns it.
|
|
||||||
ScopedMessagePipeHandle PassMessagePipe() { return std::move(handle_); }
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up chromium-72.0.3626.121/content/common/user_agent.cc.fedora-user-agent chromium-72.0.3626.121/content/common/user_agent.cc
|
|
||||||
--- chromium-72.0.3626.121/content/common/user_agent.cc.fedora-user-agent 2019-03-10 14:21:02.877454982 -0400
|
|
||||||
+++ chromium-72.0.3626.121/content/common/user_agent.cc 2019-03-10 14:22:05.728812272 -0400
|
|
||||||
@@ -36,7 +36,7 @@ std::string GetUserAgentPlatform() {
|
|
||||||
#elif defined(OS_MACOSX)
|
|
||||||
"Macintosh; ";
|
|
||||||
#elif defined(USE_X11) || defined(USE_OZONE)
|
|
||||||
- "X11; "; // strange, but that's what Firefox uses
|
|
||||||
+ "X11; Fedora; "; // strange, but that's what Firefox uses
|
|
||||||
#elif defined(OS_ANDROID)
|
|
||||||
"Linux; ";
|
|
||||||
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
diff -up chromium-72.0.3626.121/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 chromium-72.0.3626.121/gpu/ipc/common/mailbox_struct_traits.h
|
|
||||||
--- chromium-72.0.3626.121/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 2019-03-01 23:10:21.000000000 -0500
|
|
||||||
+++ chromium-72.0.3626.121/gpu/ipc/common/mailbox_struct_traits.h 2019-03-10 14:07:48.300244125 -0400
|
|
||||||
@@ -15,7 +15,7 @@ namespace mojo {
|
|
||||||
template <>
|
|
||||||
struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
|
|
||||||
static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
|
|
||||||
- return mailbox.name;
|
|
||||||
+ return base::make_span(mailbox.name);
|
|
||||||
}
|
|
||||||
static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
|
|
||||||
};
|
|
||||||
diff -up chromium-72.0.3626.121/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 chromium-72.0.3626.121/services/viz/public/cpp/compositing/quads_struct_traits.h
|
|
||||||
--- chromium-72.0.3626.121/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 2019-03-01 23:10:31.000000000 -0500
|
|
||||||
+++ chromium-72.0.3626.121/services/viz/public/cpp/compositing/quads_struct_traits.h 2019-03-10 14:07:48.303244046 -0400
|
|
||||||
@@ -340,7 +340,7 @@ struct StructTraits<viz::mojom::TextureQ
|
|
||||||
static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
|
|
||||||
const viz::TextureDrawQuad* quad =
|
|
||||||
viz::TextureDrawQuad::MaterialCast(&input);
|
|
||||||
- return quad->vertex_opacity;
|
|
||||||
+ return base::make_span(quad->vertex_opacity);
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool y_flipped(const viz::DrawQuad& input) {
|
|
||||||
diff -up chromium-72.0.3626.121/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 chromium-72.0.3626.121/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc
|
|
||||||
--- chromium-72.0.3626.121/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 2019-03-10 14:07:48.307243941 -0400
|
|
||||||
+++ chromium-72.0.3626.121/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2019-03-10 14:09:16.565920044 -0400
|
|
||||||
@@ -10,7 +10,7 @@
|
|
||||||
|
|
||||||
#include "modules/audio_processing/aec3/aec_state.h"
|
|
||||||
|
|
||||||
-#include <math.h>
|
|
||||||
+#include <cmath>
|
|
||||||
#include <algorithm>
|
|
||||||
#include <numeric>
|
|
||||||
#include <vector>
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
diff -up chromium-75.0.3770.100/v8/src/objects/js-objects.cc.fix-v8-gcc chromium-75.0.3770.100/v8/src/objects/js-objects.cc
|
|
||||||
--- chromium-75.0.3770.100/v8/src/objects/js-objects.cc.fix-v8-gcc 2019-06-25 10:55:08.132254304 -0400
|
|
||||||
+++ chromium-75.0.3770.100/v8/src/objects/js-objects.cc 2019-06-25 10:55:23.147933648 -0400
|
|
||||||
@@ -3792,6 +3792,10 @@ void JSObject::ApplyAttributesToDictiona
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+template void JSObject::ApplyAttributesToDictionary(
|
|
||||||
+ Isolate* isolate, ReadOnlyRoots roots, Handle<NumberDictionary> dictionary,
|
|
||||||
+ const PropertyAttributes attributes);
|
|
||||||
+
|
|
||||||
template <PropertyAttributes attrs>
|
|
||||||
Maybe<bool> JSObject::PreventExtensionsWithTransition(
|
|
||||||
Handle<JSObject> object, ShouldThrow should_throw) {
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
diff -up chromium-75.0.3770.80/third_party/zlib/zconf.h.nozmangle chromium-75.0.3770.80/third_party/zlib/zconf.h
|
|
||||||
--- chromium-75.0.3770.80/third_party/zlib/zconf.h.nozmangle 2019-06-05 11:12:30.420412467 -0400
|
|
||||||
+++ chromium-75.0.3770.80/third_party/zlib/zconf.h 2019-06-05 11:17:43.512683058 -0400
|
|
||||||
@@ -8,10 +8,6 @@
|
|
||||||
#ifndef ZCONF_H
|
|
||||||
#define ZCONF_H
|
|
||||||
|
|
||||||
-/* This include does prefixing as below, but with an updated set of names. Also
|
|
||||||
- * sets up export macros in component builds. */
|
|
||||||
-#include "chromeconf.h"
|
|
||||||
-
|
|
||||||
/*
|
|
||||||
* If you *really* need a unique prefix for all types and library functions,
|
|
||||||
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
diff -up chromium-75.0.3770.80/chrome/browser/performance_manager/render_process_user_data.cc.pure-virtual-fix chromium-75.0.3770.80/chrome/browser/performance_manager/render_process_user_data.cc
|
|
||||||
--- chromium-75.0.3770.80/chrome/browser/performance_manager/render_process_user_data.cc.pure-virtual-fix 2019-06-07 15:03:43.302202979 -0400
|
|
||||||
+++ chromium-75.0.3770.80/chrome/browser/performance_manager/render_process_user_data.cc 2019-06-07 15:04:25.140393048 -0400
|
|
||||||
@@ -116,4 +116,9 @@ void RenderProcessUserData::RenderProces
|
|
||||||
base::Unretained(process_node_.get()), info.exit_code));
|
|
||||||
}
|
|
||||||
|
|
||||||
+void RenderProcessUserData::RenderProcessHostDestroyed(
|
|
||||||
+ content::RenderProcessHost* host) {
|
|
||||||
+ host->RemoveUserData(kRenderProcessUserDataKey);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
} // namespace performance_manager
|
|
||||||
diff -up chromium-75.0.3770.80/chrome/browser/performance_manager/render_process_user_data.h.pure-virtual-fix chromium-75.0.3770.80/chrome/browser/performance_manager/render_process_user_data.h
|
|
||||||
--- chromium-75.0.3770.80/chrome/browser/performance_manager/render_process_user_data.h.pure-virtual-fix 2019-06-07 15:04:43.530039597 -0400
|
|
||||||
+++ chromium-75.0.3770.80/chrome/browser/performance_manager/render_process_user_data.h 2019-06-07 15:05:13.770458374 -0400
|
|
||||||
@@ -47,6 +47,7 @@ class RenderProcessUserData : public bas
|
|
||||||
void RenderProcessExited(
|
|
||||||
content::RenderProcessHost* host,
|
|
||||||
const content::ChildProcessTerminationInfo& info) override;
|
|
||||||
+ void RenderProcessHostDestroyed(content::RenderProcessHost* host) override;
|
|
||||||
|
|
||||||
// All instances are linked together in a doubly linked list to allow orderly
|
|
||||||
// destruction at browser shutdown time.
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
From 719df31ffd4d52b473509cf77acd9c02ec112acb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Date: Tue, 04 Jun 2019 18:38:12 +0200
|
|
||||||
Subject: [PATCH] GCC: fix noexcept from move constructor and assign operators of AccountInfo
|
|
||||||
|
|
||||||
AccountInfo declares them as noexcept and uses default implementation,
|
|
||||||
so all its members (including AccountId) should be noexcept. But AccountId
|
|
||||||
is not noexcept. To fix it we just need to make CoreAccountId move
|
|
||||||
operator/assign operator noexcept.
|
|
||||||
|
|
||||||
Bug: 819294
|
|
||||||
Change-Id: Ice38654ab7cf3b9eaa6f54aa36e1fec329264f98
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/google_apis/gaia/core_account_id.cc b/google_apis/gaia/core_account_id.cc
|
|
||||||
index d808082..12eefe3 100644
|
|
||||||
--- a/google_apis/gaia/core_account_id.cc
|
|
||||||
+++ b/google_apis/gaia/core_account_id.cc
|
|
||||||
@@ -6,8 +6,16 @@
|
|
||||||
|
|
||||||
CoreAccountId::CoreAccountId() = default;
|
|
||||||
|
|
||||||
+CoreAccountId::CoreAccountId(const CoreAccountId&) = default;
|
|
||||||
+
|
|
||||||
+CoreAccountId::CoreAccountId(CoreAccountId&&) noexcept = default;
|
|
||||||
+
|
|
||||||
CoreAccountId::~CoreAccountId() = default;
|
|
||||||
|
|
||||||
+CoreAccountId& CoreAccountId::operator=(const CoreAccountId&) = default;
|
|
||||||
+
|
|
||||||
+CoreAccountId& CoreAccountId::operator=(CoreAccountId&&) noexcept = default;
|
|
||||||
+
|
|
||||||
CoreAccountId::CoreAccountId(const char* id) : id(id) {}
|
|
||||||
|
|
||||||
CoreAccountId::CoreAccountId(std::string&& id) : id(std::move(id)) {}
|
|
||||||
diff --git a/google_apis/gaia/core_account_id.h b/google_apis/gaia/core_account_id.h
|
|
||||||
index 5ea602a..c2d1911 100644
|
|
||||||
--- a/google_apis/gaia/core_account_id.h
|
|
||||||
+++ b/google_apis/gaia/core_account_id.h
|
|
||||||
@@ -14,8 +14,13 @@
|
|
||||||
// for design and tracking).
|
|
||||||
struct CoreAccountId {
|
|
||||||
CoreAccountId();
|
|
||||||
+ CoreAccountId(const CoreAccountId&);
|
|
||||||
+ CoreAccountId(CoreAccountId&&) noexcept;
|
|
||||||
~CoreAccountId();
|
|
||||||
|
|
||||||
+ CoreAccountId& operator=(const CoreAccountId&);
|
|
||||||
+ CoreAccountId& operator=(CoreAccountId&&) noexcept;
|
|
||||||
+
|
|
||||||
// Those implicit constructor and conversion operator allow to
|
|
||||||
// progressively migrate the code to use this struct. Removing
|
|
||||||
// them is tracked by https://crbug.com/959161
|
|
||||||
@ -1,105 +0,0 @@
|
|||||||
From 84c91abab33966f928497c24db4a39f436d2dca8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Date: Fri, 07 Jun 2019 09:50:11 +0000
|
|
||||||
Subject: [PATCH] Make SharedMemoryMapping move constructor noexcept
|
|
||||||
|
|
||||||
As LayerTreeHostImpl::UIResourceData move constructor is declared
|
|
||||||
noexcept with default implementation, the move constructor of its
|
|
||||||
members should also be noexcept. GCC will fail to build otherwise
|
|
||||||
for mismatching noexcept declaration.
|
|
||||||
|
|
||||||
We also set the move assignment operator.
|
|
||||||
|
|
||||||
Bug: 819294
|
|
||||||
Change-Id: Icd663da83b882e15f7d16780c9241972e09bc492
|
|
||||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645297
|
|
||||||
Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
|
|
||||||
Cr-Commit-Position: refs/heads/master@{#667064}
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/base/memory/shared_memory_mapping.cc b/base/memory/shared_memory_mapping.cc
|
|
||||||
index 2be2570..8426fa8 100644
|
|
||||||
--- a/base/memory/shared_memory_mapping.cc
|
|
||||||
+++ b/base/memory/shared_memory_mapping.cc
|
|
||||||
@@ -33,7 +33,7 @@
|
|
||||||
|
|
||||||
SharedMemoryMapping::SharedMemoryMapping() = default;
|
|
||||||
|
|
||||||
-SharedMemoryMapping::SharedMemoryMapping(SharedMemoryMapping&& mapping)
|
|
||||||
+SharedMemoryMapping::SharedMemoryMapping(SharedMemoryMapping&& mapping) noexcept
|
|
||||||
: memory_(mapping.memory_),
|
|
||||||
size_(mapping.size_),
|
|
||||||
mapped_size_(mapping.mapped_size_),
|
|
||||||
@@ -42,7 +42,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
SharedMemoryMapping& SharedMemoryMapping::operator=(
|
|
||||||
- SharedMemoryMapping&& mapping) {
|
|
||||||
+ SharedMemoryMapping&& mapping) noexcept {
|
|
||||||
Unmap();
|
|
||||||
memory_ = mapping.memory_;
|
|
||||||
size_ = mapping.size_;
|
|
||||||
@@ -90,9 +90,9 @@
|
|
||||||
|
|
||||||
ReadOnlySharedMemoryMapping::ReadOnlySharedMemoryMapping() = default;
|
|
||||||
ReadOnlySharedMemoryMapping::ReadOnlySharedMemoryMapping(
|
|
||||||
- ReadOnlySharedMemoryMapping&&) = default;
|
|
||||||
+ ReadOnlySharedMemoryMapping&&) noexcept = default;
|
|
||||||
ReadOnlySharedMemoryMapping& ReadOnlySharedMemoryMapping::operator=(
|
|
||||||
- ReadOnlySharedMemoryMapping&&) = default;
|
|
||||||
+ ReadOnlySharedMemoryMapping&&) noexcept = default;
|
|
||||||
ReadOnlySharedMemoryMapping::ReadOnlySharedMemoryMapping(
|
|
||||||
void* address,
|
|
||||||
size_t size,
|
|
||||||
@@ -102,9 +102,9 @@
|
|
||||||
|
|
||||||
WritableSharedMemoryMapping::WritableSharedMemoryMapping() = default;
|
|
||||||
WritableSharedMemoryMapping::WritableSharedMemoryMapping(
|
|
||||||
- WritableSharedMemoryMapping&&) = default;
|
|
||||||
+ WritableSharedMemoryMapping&&) noexcept = default;
|
|
||||||
WritableSharedMemoryMapping& WritableSharedMemoryMapping::operator=(
|
|
||||||
- WritableSharedMemoryMapping&&) = default;
|
|
||||||
+ WritableSharedMemoryMapping&&) noexcept = default;
|
|
||||||
WritableSharedMemoryMapping::WritableSharedMemoryMapping(
|
|
||||||
void* address,
|
|
||||||
size_t size,
|
|
||||||
diff --git a/base/memory/shared_memory_mapping.h b/base/memory/shared_memory_mapping.h
|
|
||||||
index d9569af..2b8858e 100644
|
|
||||||
--- a/base/memory/shared_memory_mapping.h
|
|
||||||
+++ b/base/memory/shared_memory_mapping.h
|
|
||||||
@@ -32,8 +32,8 @@
|
|
||||||
SharedMemoryMapping();
|
|
||||||
|
|
||||||
// Move operations are allowed.
|
|
||||||
- SharedMemoryMapping(SharedMemoryMapping&& mapping);
|
|
||||||
- SharedMemoryMapping& operator=(SharedMemoryMapping&& mapping);
|
|
||||||
+ SharedMemoryMapping(SharedMemoryMapping&& mapping) noexcept;
|
|
||||||
+ SharedMemoryMapping& operator=(SharedMemoryMapping&& mapping) noexcept;
|
|
||||||
|
|
||||||
// Unmaps the region if the mapping is valid.
|
|
||||||
virtual ~SharedMemoryMapping();
|
|
||||||
@@ -93,8 +93,9 @@
|
|
||||||
ReadOnlySharedMemoryMapping();
|
|
||||||
|
|
||||||
// Move operations are allowed.
|
|
||||||
- ReadOnlySharedMemoryMapping(ReadOnlySharedMemoryMapping&&);
|
|
||||||
- ReadOnlySharedMemoryMapping& operator=(ReadOnlySharedMemoryMapping&&);
|
|
||||||
+ ReadOnlySharedMemoryMapping(ReadOnlySharedMemoryMapping&&) noexcept;
|
|
||||||
+ ReadOnlySharedMemoryMapping& operator=(
|
|
||||||
+ ReadOnlySharedMemoryMapping&&) noexcept;
|
|
||||||
|
|
||||||
// Returns the base address of the mapping. This is read-only memory. This is
|
|
||||||
// page-aligned. This is nullptr for invalid instances.
|
|
||||||
@@ -171,8 +172,9 @@
|
|
||||||
WritableSharedMemoryMapping();
|
|
||||||
|
|
||||||
// Move operations are allowed.
|
|
||||||
- WritableSharedMemoryMapping(WritableSharedMemoryMapping&&);
|
|
||||||
- WritableSharedMemoryMapping& operator=(WritableSharedMemoryMapping&&);
|
|
||||||
+ WritableSharedMemoryMapping(WritableSharedMemoryMapping&&) noexcept;
|
|
||||||
+ WritableSharedMemoryMapping& operator=(
|
|
||||||
+ WritableSharedMemoryMapping&&) noexcept;
|
|
||||||
|
|
||||||
// Returns the base address of the mapping. This is writable memory. This is
|
|
||||||
// page-aligned. This is nullptr for invalid instances.
|
|
||||||
@ -1,76 +0,0 @@
|
|||||||
From 0aca7b8dea0f52ba7bd58dfce4ac236ee60670a8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Date: Tue, 04 Jun 2019 19:44:58 +0200
|
|
||||||
Subject: [PATCH] GCC: FeaturePolicyParser ParseValueForFuzzer is not in anonymous namespace
|
|
||||||
|
|
||||||
Compilation fails because we are declaring ParseValueForFuzzer as friend method,
|
|
||||||
but we are declaring it is in anonymous namespace. Moving to global namespace
|
|
||||||
still fails (in this case in Clang).
|
|
||||||
|
|
||||||
So final solution is making it a public static method of FeaturePolicyParser.
|
|
||||||
|
|
||||||
Bug: 819294
|
|
||||||
Change-Id: Iea307cb6faef675b748d6eb5da2175dcbb17fdc7
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/third_party/blink/renderer/core/feature_policy/feature_policy_parser.cc b/third_party/blink/renderer/core/feature_policy/feature_policy_parser.cc
|
|
||||||
index 3b7f4a9..eaee409 100644
|
|
||||||
--- a/third_party/blink/renderer/core/feature_policy/feature_policy_parser.cc
|
|
||||||
+++ b/third_party/blink/renderer/core/feature_policy/feature_policy_parser.cc
|
|
||||||
@@ -317,6 +317,13 @@
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
+void FeaturePolicyParser::ParseValueForFuzzer(
|
|
||||||
+ blink::mojom::PolicyValueType feature_type,
|
|
||||||
+ const WTF::String& value_string) {
|
|
||||||
+ bool ok;
|
|
||||||
+ ParseValueForType(feature_type, value_string, &ok);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
bool IsFeatureDeclared(mojom::FeaturePolicyFeature feature,
|
|
||||||
const ParsedFeaturePolicy& policy) {
|
|
||||||
return std::any_of(policy.begin(), policy.end(),
|
|
||||||
diff --git a/third_party/blink/renderer/core/feature_policy/feature_policy_parser.h b/third_party/blink/renderer/core/feature_policy/feature_policy_parser.h
|
|
||||||
index fd25d90..36af405 100644
|
|
||||||
--- a/third_party/blink/renderer/core/feature_policy/feature_policy_parser.h
|
|
||||||
+++ b/third_party/blink/renderer/core/feature_policy/feature_policy_parser.h
|
|
||||||
@@ -16,9 +16,6 @@
|
|
||||||
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
|
|
||||||
#include "third_party/blink/renderer/platform/wtf/vector.h"
|
|
||||||
|
|
||||||
-// Forward declare for friendship.
|
|
||||||
-void ParseValueForFuzzer(blink::mojom::PolicyValueType, const WTF::String&);
|
|
||||||
-
|
|
||||||
namespace blink {
|
|
||||||
|
|
||||||
class Document;
|
|
||||||
@@ -79,8 +76,9 @@
|
|
||||||
const FeatureNameMap& feature_names,
|
|
||||||
ExecutionContext* execution_context = nullptr);
|
|
||||||
|
|
||||||
+ static void ParseValueForFuzzer(mojom::PolicyValueType, const String&);
|
|
||||||
+
|
|
||||||
private:
|
|
||||||
- friend void ::ParseValueForFuzzer(mojom::PolicyValueType, const String&);
|
|
||||||
static PolicyValue GetFallbackValueForFeature(
|
|
||||||
mojom::FeaturePolicyFeature feature);
|
|
||||||
static PolicyValue ParseValueForType(mojom::PolicyValueType feature_type,
|
|
||||||
diff --git a/third_party/blink/renderer/core/feature_policy/feature_policy_value_fuzzer.cc b/third_party/blink/renderer/core/feature_policy/feature_policy_value_fuzzer.cc
|
|
||||||
index 7f8e6aa..53350e43 100644
|
|
||||||
--- a/third_party/blink/renderer/core/feature_policy/feature_policy_value_fuzzer.cc
|
|
||||||
+++ b/third_party/blink/renderer/core/feature_policy/feature_policy_value_fuzzer.cc
|
|
||||||
@@ -23,9 +23,9 @@
|
|
||||||
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
|
|
||||||
static blink::BlinkFuzzerTestSupport test_support =
|
|
||||||
blink::BlinkFuzzerTestSupport();
|
|
||||||
- ParseValueForFuzzer(blink::mojom::PolicyValueType::kBool,
|
|
||||||
- WTF::String(data, size));
|
|
||||||
- ParseValueForFuzzer(blink::mojom::PolicyValueType::kDecDouble,
|
|
||||||
- WTF::String(data, size));
|
|
||||||
+ blink::FeaturePolicyParser::ParseValueForFuzzer(
|
|
||||||
+ blink::mojom::PolicyValueType::kBool, WTF::String(data, size));
|
|
||||||
+ blink::FeaturePolicyParser::ParseValueForFuzzer(
|
|
||||||
+ blink::mojom::PolicyValueType::kDecDouble, WTF::String(data, size));
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
From cf6d6b40d711fce93a24a2cf517fa3becdbae8bb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Date: Wed, 05 Jun 2019 17:18:40 +0000
|
|
||||||
Subject: [PATCH] Make blink::LayoutUnit::HasFraction constexpr
|
|
||||||
|
|
||||||
Other HasFraction methods as in PhysicalUnit are declared already
|
|
||||||
constexpr and using it. It breaks GCC build.
|
|
||||||
|
|
||||||
Bug: 819294.
|
|
||||||
Change-Id: I0c4bd9bd206d45cf31f7fa815ce8533718a425cb
|
|
||||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645222
|
|
||||||
Reviewed-by: vmpstr <vmpstr@chromium.org>
|
|
||||||
Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org>
|
|
||||||
Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Cr-Commit-Position: refs/heads/master@{#666336}
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/third_party/blink/renderer/platform/geometry/layout_unit.h b/third_party/blink/renderer/platform/geometry/layout_unit.h
|
|
||||||
index f073986..b6dbc76 100644
|
|
||||||
--- a/third_party/blink/renderer/platform/geometry/layout_unit.h
|
|
||||||
+++ b/third_party/blink/renderer/platform/geometry/layout_unit.h
|
|
||||||
@@ -202,7 +202,9 @@
|
|
||||||
return value_ > 0 ? LayoutUnit() : *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
- bool HasFraction() const { return RawValue() % kFixedPointDenominator; }
|
|
||||||
+ constexpr bool HasFraction() const {
|
|
||||||
+ return RawValue() % kFixedPointDenominator;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
LayoutUnit Fraction() const {
|
|
||||||
// Compute fraction using the mod operator to preserve the sign of the value
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
From abe74a7f0c53a43a9706a42d71b7ff4a5da53380 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Date: Tue, 11 Jun 2019 10:27:19 +0200
|
|
||||||
Subject: [PATCH] GCC: add noexcept move assignment in history::URLRow
|
|
||||||
|
|
||||||
In GCC, build is failing because history::QueryURLResult declares its move
|
|
||||||
assignment operator as noexcept using default implementation. That requires
|
|
||||||
its members to provide a move assignment operator that is noexcept too.
|
|
||||||
|
|
||||||
But URLRow was missing noexcept declaration in move assignment operator (even
|
|
||||||
though it was providing noexcept to its move constructor).
|
|
||||||
|
|
||||||
Bug: 819294
|
|
||||||
Change-Id: I726e3cf7a4a50c9206a5d0fba8a561d363483d4f
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/components/history/core/browser/url_row.cc b/components/history/core/browser/url_row.cc
|
|
||||||
index 44c22fd..aec0101 100644
|
|
||||||
--- a/components/history/core/browser/url_row.cc
|
|
||||||
+++ b/components/history/core/browser/url_row.cc
|
|
||||||
@@ -26,7 +26,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
URLRow& URLRow::operator=(const URLRow& other) = default;
|
|
||||||
-URLRow& URLRow::operator=(URLRow&& other) = default;
|
|
||||||
+URLRow& URLRow::operator=(URLRow&& other) noexcept = default;
|
|
||||||
|
|
||||||
void URLRow::Swap(URLRow* other) {
|
|
||||||
std::swap(id_, other->id_);
|
|
||||||
diff --git a/components/history/core/browser/url_row.h b/components/history/core/browser/url_row.h
|
|
||||||
index 8f6f9cf..31a1ef8 100644
|
|
||||||
--- a/components/history/core/browser/url_row.h
|
|
||||||
+++ b/components/history/core/browser/url_row.h
|
|
||||||
@@ -35,7 +35,7 @@
|
|
||||||
|
|
||||||
virtual ~URLRow();
|
|
||||||
URLRow& operator=(const URLRow& other);
|
|
||||||
- URLRow& operator=(URLRow&& other);
|
|
||||||
+ URLRow& operator=(URLRow&& other) noexcept;
|
|
||||||
|
|
||||||
URLID id() const { return id_; }
|
|
||||||
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
From 7dc76c8d9f4cfbce7cf11424120aa6f6094916dc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Date: Wed, 05 Jun 2019 21:09:01 +0000
|
|
||||||
Subject: [PATCH] GCC: XSetWindowAttributes struct initialization should keep order of declaration
|
|
||||||
|
|
||||||
XSetWindowAttributes initialization of attributes in GLSurfaceGLX is not in the
|
|
||||||
same order of the declaration. GCC fails because of that.
|
|
||||||
|
|
||||||
Bug: 819294
|
|
||||||
Change-Id: I8a97da980d5961a35a47ae4d0d8d558b85291f1f
|
|
||||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1646253
|
|
||||||
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
|
|
||||||
Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Cr-Commit-Position: refs/heads/master@{#666436}
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc
|
|
||||||
index f649dd4..0aa6892 100644
|
|
||||||
--- a/ui/gl/gl_surface_glx.cc
|
|
||||||
+++ b/ui/gl/gl_surface_glx.cc
|
|
||||||
@@ -583,10 +583,10 @@
|
|
||||||
|
|
||||||
XSetWindowAttributes swa = {
|
|
||||||
.background_pixmap = 0,
|
|
||||||
- .bit_gravity = NorthWestGravity,
|
|
||||||
- .colormap = g_colormap,
|
|
||||||
.background_pixel = 0, // ARGB(0,0,0,0) for compositing WM
|
|
||||||
.border_pixel = 0,
|
|
||||||
+ .bit_gravity = NorthWestGravity,
|
|
||||||
+ .colormap = g_colormap,
|
|
||||||
};
|
|
||||||
auto value_mask = CWBackPixmap | CWBitGravity | CWColormap | CWBorderPixel;
|
|
||||||
if (ui::IsCompositingManagerPresent() &&
|
|
||||||
@ -1,97 +0,0 @@
|
|||||||
From dcb55fb8f18abe5f43d260aa67b14b2dc996f992 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Date: Tue, 11 Jun 2019 08:00:13 +0000
|
|
||||||
Subject: [PATCH] GCC: move explicit specialization out of RunInfo
|
|
||||||
|
|
||||||
Explicit specialization in non-namespace scope is not allowed in C++, and GCC breaks
|
|
||||||
build because of that. Move the template specializations out of RunInfo declaration
|
|
||||||
in shape_result_inline_headeres.h to fix the GCC build issue.
|
|
||||||
|
|
||||||
Bug: 819294
|
|
||||||
Change-Id: Id083852bcf8e9efbdc911fdad28fd8767d2905d0
|
|
||||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1651728
|
|
||||||
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
|
|
||||||
Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Cr-Commit-Position: refs/heads/master@{#667901}
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/third_party/blink/renderer/platform/fonts/shaping/shape_result_inline_headers.h b/third_party/blink/renderer/platform/fonts/shaping/shape_result_inline_headers.h
|
|
||||||
index 76ee6091..c14d3a0 100644
|
|
||||||
--- a/third_party/blink/renderer/platform/fonts/shaping/shape_result_inline_headers.h
|
|
||||||
+++ b/third_party/blink/renderer/platform/fonts/shaping/shape_result_inline_headers.h
|
|
||||||
@@ -251,37 +251,6 @@
|
|
||||||
template <bool has_non_zero_glyph_offsets>
|
|
||||||
struct iterator final {};
|
|
||||||
|
|
||||||
- // For non-zero glyph offset array
|
|
||||||
- template <>
|
|
||||||
- struct iterator<true> final {
|
|
||||||
- // The constructor for ShapeResult
|
|
||||||
- explicit iterator(const GlyphOffsetArray& array)
|
|
||||||
- : pointer(array.storage_.get()) {
|
|
||||||
- DCHECK(pointer);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- // The constructor for ShapeResultView
|
|
||||||
- explicit iterator(const GlyphDataRange& range) : pointer(range.offsets) {
|
|
||||||
- DCHECK(pointer);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- GlyphOffset operator*() const { return *pointer; }
|
|
||||||
- void operator++() { ++pointer; }
|
|
||||||
-
|
|
||||||
- const GlyphOffset* pointer;
|
|
||||||
- };
|
|
||||||
-
|
|
||||||
- // For zero glyph offset array
|
|
||||||
- template <>
|
|
||||||
- struct iterator<false> final {
|
|
||||||
- explicit iterator(const GlyphOffsetArray& array) {
|
|
||||||
- DCHECK(!array.HasStorage());
|
|
||||||
- }
|
|
||||||
- explicit iterator(const GlyphDataRange& range) { DCHECK(!range.offsets); }
|
|
||||||
- GlyphOffset operator*() const { return GlyphOffset(); }
|
|
||||||
- void operator++() {}
|
|
||||||
- };
|
|
||||||
-
|
|
||||||
template <bool has_non_zero_glyph_offsets>
|
|
||||||
iterator<has_non_zero_glyph_offsets> GetIterator() const {
|
|
||||||
return iterator<has_non_zero_glyph_offsets>(*this);
|
|
||||||
@@ -495,6 +464,37 @@
|
|
||||||
float width_;
|
|
||||||
};
|
|
||||||
|
|
||||||
+// For non-zero glyph offset array
|
|
||||||
+template <>
|
|
||||||
+struct ShapeResult::RunInfo::GlyphOffsetArray::iterator<true> final {
|
|
||||||
+ // The constructor for ShapeResult
|
|
||||||
+ explicit iterator(const GlyphOffsetArray& array)
|
|
||||||
+ : pointer(array.storage_.get()) {
|
|
||||||
+ DCHECK(pointer);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // The constructor for ShapeResultView
|
|
||||||
+ explicit iterator(const GlyphDataRange& range) : pointer(range.offsets) {
|
|
||||||
+ DCHECK(pointer);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ GlyphOffset operator*() const { return *pointer; }
|
|
||||||
+ void operator++() { ++pointer; }
|
|
||||||
+
|
|
||||||
+ const GlyphOffset* pointer;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+// For zero glyph offset array
|
|
||||||
+template <>
|
|
||||||
+struct ShapeResult::RunInfo::GlyphOffsetArray::iterator<false> final {
|
|
||||||
+ explicit iterator(const GlyphOffsetArray& array) {
|
|
||||||
+ DCHECK(!array.HasStorage());
|
|
||||||
+ }
|
|
||||||
+ explicit iterator(const GlyphDataRange& range) { DCHECK(!range.offsets); }
|
|
||||||
+ GlyphOffset operator*() const { return GlyphOffset(); }
|
|
||||||
+ void operator++() {}
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
// Find the range of HarfBuzzRunGlyphData for the specified character index
|
|
||||||
// range. This function uses binary search twice, hence O(2 log n).
|
|
||||||
inline ShapeResult::RunInfo::GlyphDataRange
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
From d08ea83acc2f5ff395c1fe54f52687e92fe51c3b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Date: Tue, 04 Jun 2019 22:01:03 +0200
|
|
||||||
Subject: [PATCH] IWYU: ThemeService requires NativeTheme
|
|
||||||
|
|
||||||
As ThemeService referes to NativeTheme through a ScopedObserver,
|
|
||||||
the full declaration is required.
|
|
||||||
|
|
||||||
Bug: 819294
|
|
||||||
Change-Id: I9d5bd2e87cfaa76e87f9b5509daea24848906a63
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
|
|
||||||
index d65388e2..23dc86d 100644
|
|
||||||
--- a/chrome/browser/themes/theme_service.cc
|
|
||||||
+++ b/chrome/browser/themes/theme_service.cc
|
|
||||||
@@ -54,7 +54,6 @@
|
|
||||||
#include "ui/gfx/color_palette.h"
|
|
||||||
#include "ui/gfx/image/image_skia.h"
|
|
||||||
#include "ui/native_theme/common_theme.h"
|
|
||||||
-#include "ui/native_theme/native_theme.h"
|
|
||||||
|
|
||||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
||||||
#include "base/scoped_observer.h"
|
|
||||||
diff --git a/chrome/browser/themes/theme_service.h b/chrome/browser/themes/theme_service.h
|
|
||||||
index 6c79c72..f93dc0d 100644
|
|
||||||
--- a/chrome/browser/themes/theme_service.h
|
|
||||||
+++ b/chrome/browser/themes/theme_service.h
|
|
||||||
@@ -25,6 +25,7 @@
|
|
||||||
#include "extensions/buildflags/buildflags.h"
|
|
||||||
#include "extensions/common/extension_id.h"
|
|
||||||
#include "ui/base/theme_provider.h"
|
|
||||||
+#include "ui/native_theme/native_theme.h"
|
|
||||||
#include "ui/native_theme/native_theme_observer.h"
|
|
||||||
|
|
||||||
class BrowserThemePack;
|
|
||||||
@ -1,115 +0,0 @@
|
|||||||
From fdb3bb1f8c41d044a5b0cb80257a26dd3c8f83a3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Date: Tue, 11 Jun 2019 17:39:38 +0000
|
|
||||||
Subject: [PATCH] GCC: do not use old C notation to assign struct with property names.
|
|
||||||
|
|
||||||
The notation for initialization of structs referring to its properties
|
|
||||||
is invalid in C++. This is not accepted in GCC. It was making build
|
|
||||||
fail in VulkanCommandBuffer.
|
|
||||||
|
|
||||||
./../../../chromium-76.0.3806.1/gpu/vulkan/vulkan_command_buffer.cc: In member function 'void gpu::VulkanCommandBuffer::TransitionImageLayout(VkImage, VkImageLayout, VkImageLayout)':
|
|
||||||
./../../../chromium-76.0.3806.1/gpu/vulkan/vulkan_command_buffer.cc:214:7: error: expected primary-expression before '.' token
|
|
||||||
.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
|
|
||||||
^
|
|
||||||
./../../../chromium-76.0.3806.1/gpu/vulkan/vulkan_command_buffer.cc:215:7: error: expected primary-expression before '.' token
|
|
||||||
.subresourceRange.baseMipLevel = 0,
|
|
||||||
^
|
|
||||||
./../../../chromium-76.0.3806.1/gpu/vulkan/vulkan_command_buffer.cc:216:7: error: expected primary-expression before '.' token
|
|
||||||
.subresourceRange.levelCount = 1,
|
|
||||||
^
|
|
||||||
./../../../chromium-76.0.3806.1/gpu/vulkan/vulkan_command_buffer.cc:217:7: error: expected primary-expression before '.' token
|
|
||||||
.subresourceRange.baseArrayLayer = 0,
|
|
||||||
^
|
|
||||||
./../../../chromium-76.0.3806.1/gpu/vulkan/vulkan_command_buffer.cc:218:7: error: expected primary-expression before '.' token
|
|
||||||
.subresourceRange.layerCount = 1,
|
|
||||||
^
|
|
||||||
./../../../chromium-76.0.3806.1/gpu/vulkan/vulkan_command_buffer.cc: In member function 'void gpu::VulkanCommandBuffer::CopyBufferToImage(VkBuffer, VkImage, uint32_t, uint32_t, uint32_t, uint32_t)':
|
|
||||||
./../../../chromium-76.0.3806.1/gpu/vulkan/vulkan_command_buffer.cc:235:7: error: expected primary-expression before '.' token
|
|
||||||
.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
|
|
||||||
^
|
|
||||||
./../../../chromium-76.0.3806.1/gpu/vulkan/vulkan_command_buffer.cc:236:7: error: expected primary-expression before '.' token
|
|
||||||
.imageSubresource.mipLevel = 0,
|
|
||||||
^
|
|
||||||
./../../../chromium-76.0.3806.1/gpu/vulkan/vulkan_command_buffer.cc:237:7: error: expected primary-expression before '.' token
|
|
||||||
.imageSubresource.baseArrayLayer = 0,
|
|
||||||
^
|
|
||||||
./../../../chromium-76.0.3806.1/gpu/vulkan/vulkan_command_buffer.cc:238:7: error: expected primary-expression before '.' token
|
|
||||||
.imageSubresource.layerCount = 1,
|
|
||||||
^
|
|
||||||
Bug: 819294
|
|
||||||
|
|
||||||
Change-Id: I999abece0c727e77964789183642ba62009c2c22
|
|
||||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1651802
|
|
||||||
Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Reviewed-by: Antoine Labour <piman@chromium.org>
|
|
||||||
Cr-Commit-Position: refs/heads/master@{#668033}
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/gpu/vulkan/vulkan_command_buffer.cc b/gpu/vulkan/vulkan_command_buffer.cc
|
|
||||||
index ba776e4..4f14c85 100644
|
|
||||||
--- a/gpu/vulkan/vulkan_command_buffer.cc
|
|
||||||
+++ b/gpu/vulkan/vulkan_command_buffer.cc
|
|
||||||
@@ -207,21 +207,20 @@
|
|
||||||
void VulkanCommandBuffer::TransitionImageLayout(VkImage image,
|
|
||||||
VkImageLayout old_layout,
|
|
||||||
VkImageLayout new_layout) {
|
|
||||||
- VkImageMemoryBarrier barrier = {
|
|
||||||
- .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
|
|
||||||
- .srcAccessMask = GetAccessMask(old_layout),
|
|
||||||
- .dstAccessMask = GetAccessMask(new_layout),
|
|
||||||
- .oldLayout = old_layout,
|
|
||||||
- .newLayout = new_layout,
|
|
||||||
- .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
|
|
||||||
- .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
|
|
||||||
- .image = image,
|
|
||||||
- .subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
|
|
||||||
- .subresourceRange.baseMipLevel = 0,
|
|
||||||
- .subresourceRange.levelCount = 1,
|
|
||||||
- .subresourceRange.baseArrayLayer = 0,
|
|
||||||
- .subresourceRange.layerCount = 1,
|
|
||||||
- };
|
|
||||||
+ VkImageMemoryBarrier barrier = {};
|
|
||||||
+ barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
|
|
||||||
+ barrier.srcAccessMask = GetAccessMask(old_layout);
|
|
||||||
+ barrier.dstAccessMask = GetAccessMask(new_layout);
|
|
||||||
+ barrier.oldLayout = old_layout;
|
|
||||||
+ barrier.newLayout = new_layout;
|
|
||||||
+ barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
|
|
||||||
+ barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
|
|
||||||
+ barrier.image = image;
|
|
||||||
+ barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
|
|
||||||
+ barrier.subresourceRange.baseMipLevel = 0;
|
|
||||||
+ barrier.subresourceRange.levelCount = 1;
|
|
||||||
+ barrier.subresourceRange.baseArrayLayer = 0;
|
|
||||||
+ barrier.subresourceRange.layerCount = 1;
|
|
||||||
vkCmdPipelineBarrier(command_buffer_, GetPipelineStageFlags(old_layout),
|
|
||||||
GetPipelineStageFlags(new_layout), 0, 0, nullptr, 0,
|
|
||||||
nullptr, 1, &barrier);
|
|
||||||
@@ -233,17 +232,16 @@
|
|
||||||
uint32_t buffer_height,
|
|
||||||
uint32_t width,
|
|
||||||
uint32_t height) {
|
|
||||||
- VkBufferImageCopy region = {
|
|
||||||
- .bufferOffset = 0,
|
|
||||||
- .bufferRowLength = buffer_width,
|
|
||||||
- .bufferImageHeight = buffer_height,
|
|
||||||
- .imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
|
|
||||||
- .imageSubresource.mipLevel = 0,
|
|
||||||
- .imageSubresource.baseArrayLayer = 0,
|
|
||||||
- .imageSubresource.layerCount = 1,
|
|
||||||
- .imageOffset = {0, 0, 0},
|
|
||||||
- .imageExtent = {width, height, 1},
|
|
||||||
- };
|
|
||||||
+ VkBufferImageCopy region = {};
|
|
||||||
+ region.bufferOffset = 0;
|
|
||||||
+ region.bufferRowLength = buffer_width;
|
|
||||||
+ region.bufferImageHeight = buffer_height;
|
|
||||||
+ region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
|
|
||||||
+ region.imageSubresource.mipLevel = 0;
|
|
||||||
+ region.imageSubresource.baseArrayLayer = 0;
|
|
||||||
+ region.imageSubresource.layerCount = 1;
|
|
||||||
+ region.imageOffset = {0, 0, 0};
|
|
||||||
+ region.imageExtent = {width, height, 1};
|
|
||||||
vkCmdCopyBufferToImage(command_buffer_, buffer, image,
|
|
||||||
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ®ion);
|
|
||||||
}
|
|
||||||
@ -1,225 +0,0 @@
|
|||||||
diff -up chromium-76.0.3809.100/net/third_party/quiche/src/quic/core/crypto/transport_parameters.cc.quiche-compile-fix chromium-76.0.3809.100/net/third_party/quiche/src/quic/core/crypto/transport_parameters.cc
|
|
||||||
--- chromium-76.0.3809.100/net/third_party/quiche/src/quic/core/crypto/transport_parameters.cc.quiche-compile-fix 2019-08-14 09:58:07.721193200 +0200
|
|
||||||
+++ chromium-76.0.3809.100/net/third_party/quiche/src/quic/core/crypto/transport_parameters.cc 2019-08-14 09:59:33.131041525 +0200
|
|
||||||
@@ -62,37 +62,37 @@ const size_t kStatelessResetTokenLength
|
|
||||||
std::string TransportParameterIdToString(
|
|
||||||
TransportParameters::TransportParameterId param_id) {
|
|
||||||
switch (param_id) {
|
|
||||||
- case kOriginalConnectionId:
|
|
||||||
+ case TransportParameters::kOriginalConnectionId:
|
|
||||||
return "original_connection_id";
|
|
||||||
- case kIdleTimeout:
|
|
||||||
+ case TransportParameters::kIdleTimeout:
|
|
||||||
return "idle_timeout";
|
|
||||||
- case kStatelessResetToken:
|
|
||||||
+ case TransportParameters::kStatelessResetToken:
|
|
||||||
return "stateless_reset_token";
|
|
||||||
- case kMaxPacketSize:
|
|
||||||
+ case TransportParameters::kMaxPacketSize:
|
|
||||||
return "max_packet_size";
|
|
||||||
- case kInitialMaxData:
|
|
||||||
+ case TransportParameters::kInitialMaxData:
|
|
||||||
return "initial_max_data";
|
|
||||||
- case kInitialMaxStreamDataBidiLocal:
|
|
||||||
+ case TransportParameters::kInitialMaxStreamDataBidiLocal:
|
|
||||||
return "initial_max_stream_data_bidi_local";
|
|
||||||
- case kInitialMaxStreamDataBidiRemote:
|
|
||||||
+ case TransportParameters::kInitialMaxStreamDataBidiRemote:
|
|
||||||
return "initial_max_stream_data_bidi_remote";
|
|
||||||
- case kInitialMaxStreamDataUni:
|
|
||||||
+ case TransportParameters::kInitialMaxStreamDataUni:
|
|
||||||
return "initial_max_stream_data_uni";
|
|
||||||
- case kInitialMaxStreamsBidi:
|
|
||||||
+ case TransportParameters::kInitialMaxStreamsBidi:
|
|
||||||
return "initial_max_streams_bidi";
|
|
||||||
- case kInitialMaxStreamsUni:
|
|
||||||
+ case TransportParameters::kInitialMaxStreamsUni:
|
|
||||||
return "initial_max_streams_uni";
|
|
||||||
- case kAckDelayExponent:
|
|
||||||
+ case TransportParameters::kAckDelayExponent:
|
|
||||||
return "ack_delay_exponent";
|
|
||||||
- case kMaxAckDelay:
|
|
||||||
+ case TransportParameters::kMaxAckDelay:
|
|
||||||
return "max_ack_delay";
|
|
||||||
- case kDisableMigration:
|
|
||||||
+ case TransportParameters::kDisableMigration:
|
|
||||||
return "disable_migration";
|
|
||||||
- case kPreferredAddress:
|
|
||||||
+ case TransportParameters::kPreferredAddress:
|
|
||||||
return "preferred_address";
|
|
||||||
- case kGoogleQuicParam:
|
|
||||||
+ case TransportParameters::kGoogleQuicParam:
|
|
||||||
return "google";
|
|
||||||
- case kGoogleQuicVersion:
|
|
||||||
+ case TransportParameters::kGoogleQuicVersion:
|
|
||||||
return "google-version";
|
|
||||||
}
|
|
||||||
return "Unknown(" + QuicTextUtils::Uint64ToString(param_id) + ")";
|
|
||||||
@@ -390,7 +390,7 @@ bool SerializeTransportParameters(const
|
|
||||||
CBB original_connection_id_param;
|
|
||||||
if (!in.original_connection_id.IsEmpty()) {
|
|
||||||
DCHECK_EQ(Perspective::IS_SERVER, in.perspective);
|
|
||||||
- if (!CBB_add_u16(¶ms, kOriginalConnectionId) ||
|
|
||||||
+ if (!CBB_add_u16(¶ms, TransportParameters::kOriginalConnectionId) ||
|
|
||||||
!CBB_add_u16_length_prefixed(¶ms, &original_connection_id_param) ||
|
|
||||||
!CBB_add_bytes(
|
|
||||||
&original_connection_id_param,
|
|
||||||
@@ -412,7 +412,7 @@ bool SerializeTransportParameters(const
|
|
||||||
if (!in.stateless_reset_token.empty()) {
|
|
||||||
DCHECK_EQ(kStatelessResetTokenLength, in.stateless_reset_token.size());
|
|
||||||
DCHECK_EQ(Perspective::IS_SERVER, in.perspective);
|
|
||||||
- if (!CBB_add_u16(¶ms, kStatelessResetToken) ||
|
|
||||||
+ if (!CBB_add_u16(¶ms, TransportParameters::kStatelessResetToken) ||
|
|
||||||
!CBB_add_u16_length_prefixed(¶ms, &stateless_reset_token_param) ||
|
|
||||||
!CBB_add_bytes(&stateless_reset_token_param,
|
|
||||||
in.stateless_reset_token.data(),
|
|
||||||
@@ -438,7 +438,7 @@ bool SerializeTransportParameters(const
|
|
||||||
|
|
||||||
// disable_migration
|
|
||||||
if (in.disable_migration) {
|
|
||||||
- if (!CBB_add_u16(¶ms, kDisableMigration) ||
|
|
||||||
+ if (!CBB_add_u16(¶ms, TransportParameters::kDisableMigration) ||
|
|
||||||
!CBB_add_u16(¶ms, 0u)) { // 0 is the length of this parameter.
|
|
||||||
QUIC_BUG << "Failed to write disable_migration for " << in;
|
|
||||||
return false;
|
|
||||||
@@ -458,7 +458,7 @@ bool SerializeTransportParameters(const
|
|
||||||
QUIC_BUG << "Bad lengths " << *in.preferred_address;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
- if (!CBB_add_u16(¶ms, kPreferredAddress) ||
|
|
||||||
+ if (!CBB_add_u16(¶ms, TransportParameters::kPreferredAddress) ||
|
|
||||||
!CBB_add_u16_length_prefixed(¶ms, &preferred_address_params) ||
|
|
||||||
!CBB_add_bytes(
|
|
||||||
&preferred_address_params,
|
|
||||||
@@ -491,7 +491,7 @@ bool SerializeTransportParameters(const
|
|
||||||
if (in.google_quic_params) {
|
|
||||||
const QuicData& serialized_google_quic_params =
|
|
||||||
in.google_quic_params->GetSerialized();
|
|
||||||
- if (!CBB_add_u16(¶ms, kGoogleQuicParam) ||
|
|
||||||
+ if (!CBB_add_u16(¶ms, TransportParameters::kGoogleQuicParam) ||
|
|
||||||
!CBB_add_u16_length_prefixed(¶ms, &google_quic_params) ||
|
|
||||||
!CBB_add_bytes(&google_quic_params,
|
|
||||||
reinterpret_cast<const uint8_t*>(
|
|
||||||
@@ -505,7 +505,7 @@ bool SerializeTransportParameters(const
|
|
||||||
|
|
||||||
// Google-specific version extension.
|
|
||||||
CBB google_version_params;
|
|
||||||
- if (!CBB_add_u16(¶ms, kGoogleQuicVersion) ||
|
|
||||||
+ if (!CBB_add_u16(¶ms, TransportParameters::kGoogleQuicVersion) ||
|
|
||||||
!CBB_add_u16_length_prefixed(¶ms, &google_version_params) ||
|
|
||||||
!CBB_add_u32(&google_version_params, in.version)) {
|
|
||||||
QUIC_BUG << "Failed to write Google version extension for " << in;
|
|
||||||
@@ -565,7 +565,7 @@ bool ParseTransportParameters(const uint
|
|
||||||
}
|
|
||||||
bool parse_success = true;
|
|
||||||
switch (param_id) {
|
|
||||||
- case kOriginalConnectionId:
|
|
||||||
+ case TransportParameters::kOriginalConnectionId:
|
|
||||||
if (!out->original_connection_id.IsEmpty()) {
|
|
||||||
QUIC_DLOG(ERROR) << "Received a second original connection ID";
|
|
||||||
return false;
|
|
||||||
@@ -581,10 +581,10 @@ bool ParseTransportParameters(const uint
|
|
||||||
CBS_len(&value));
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
- case kIdleTimeout:
|
|
||||||
+ case TransportParameters::kIdleTimeout:
|
|
||||||
parse_success = out->idle_timeout_milliseconds.ReadFromCbs(&value);
|
|
||||||
break;
|
|
||||||
- case kStatelessResetToken:
|
|
||||||
+ case TransportParameters::kStatelessResetToken:
|
|
||||||
if (!out->stateless_reset_token.empty()) {
|
|
||||||
QUIC_DLOG(ERROR) << "Received a second stateless reset token";
|
|
||||||
return false;
|
|
||||||
@@ -597,36 +597,36 @@ bool ParseTransportParameters(const uint
|
|
||||||
out->stateless_reset_token.assign(CBS_data(&value),
|
|
||||||
CBS_data(&value) + CBS_len(&value));
|
|
||||||
break;
|
|
||||||
- case kMaxPacketSize:
|
|
||||||
+ case TransportParameters::kMaxPacketSize:
|
|
||||||
parse_success = out->max_packet_size.ReadFromCbs(&value);
|
|
||||||
break;
|
|
||||||
- case kInitialMaxData:
|
|
||||||
+ case TransportParameters::kInitialMaxData:
|
|
||||||
parse_success = out->initial_max_data.ReadFromCbs(&value);
|
|
||||||
break;
|
|
||||||
- case kInitialMaxStreamDataBidiLocal:
|
|
||||||
+ case TransportParameters::kInitialMaxStreamDataBidiLocal:
|
|
||||||
parse_success =
|
|
||||||
out->initial_max_stream_data_bidi_local.ReadFromCbs(&value);
|
|
||||||
break;
|
|
||||||
- case kInitialMaxStreamDataBidiRemote:
|
|
||||||
+ case TransportParameters::kInitialMaxStreamDataBidiRemote:
|
|
||||||
parse_success =
|
|
||||||
out->initial_max_stream_data_bidi_remote.ReadFromCbs(&value);
|
|
||||||
break;
|
|
||||||
- case kInitialMaxStreamDataUni:
|
|
||||||
+ case TransportParameters::kInitialMaxStreamDataUni:
|
|
||||||
parse_success = out->initial_max_stream_data_uni.ReadFromCbs(&value);
|
|
||||||
break;
|
|
||||||
- case kInitialMaxStreamsBidi:
|
|
||||||
+ case TransportParameters::kInitialMaxStreamsBidi:
|
|
||||||
parse_success = out->initial_max_streams_bidi.ReadFromCbs(&value);
|
|
||||||
break;
|
|
||||||
- case kInitialMaxStreamsUni:
|
|
||||||
+ case TransportParameters::kInitialMaxStreamsUni:
|
|
||||||
parse_success = out->initial_max_streams_uni.ReadFromCbs(&value);
|
|
||||||
break;
|
|
||||||
- case kAckDelayExponent:
|
|
||||||
+ case TransportParameters::kAckDelayExponent:
|
|
||||||
parse_success = out->ack_delay_exponent.ReadFromCbs(&value);
|
|
||||||
break;
|
|
||||||
- case kMaxAckDelay:
|
|
||||||
+ case TransportParameters::kMaxAckDelay:
|
|
||||||
parse_success = out->max_ack_delay.ReadFromCbs(&value);
|
|
||||||
break;
|
|
||||||
- case kDisableMigration:
|
|
||||||
+ case TransportParameters::kDisableMigration:
|
|
||||||
if (out->disable_migration) {
|
|
||||||
QUIC_DLOG(ERROR) << "Received a second disable migration";
|
|
||||||
return false;
|
|
||||||
@@ -638,7 +638,7 @@ bool ParseTransportParameters(const uint
|
|
||||||
}
|
|
||||||
out->disable_migration = true;
|
|
||||||
break;
|
|
||||||
- case kPreferredAddress: {
|
|
||||||
+ case TransportParameters::kPreferredAddress: {
|
|
||||||
uint16_t ipv4_port, ipv6_port;
|
|
||||||
in_addr ipv4_address;
|
|
||||||
in6_addr ipv6_address;
|
|
||||||
@@ -692,7 +692,7 @@ bool ParseTransportParameters(const uint
|
|
||||||
QuicMakeUnique<TransportParameters::PreferredAddress>(
|
|
||||||
preferred_address);
|
|
||||||
} break;
|
|
||||||
- case kGoogleQuicParam: {
|
|
||||||
+ case TransportParameters::kGoogleQuicParam: {
|
|
||||||
if (out->google_quic_params) {
|
|
||||||
QUIC_DLOG(ERROR) << "Received a second Google parameter";
|
|
||||||
return false;
|
|
||||||
@@ -701,7 +701,7 @@ bool ParseTransportParameters(const uint
|
|
||||||
reinterpret_cast<const char*>(CBS_data(&value)), CBS_len(&value));
|
|
||||||
out->google_quic_params = CryptoFramer::ParseMessage(serialized_params);
|
|
||||||
} break;
|
|
||||||
- case kGoogleQuicVersion: {
|
|
||||||
+ case TransportParameters::kGoogleQuicVersion: {
|
|
||||||
if (!CBS_get_u32(&value, &out->version)) {
|
|
||||||
QUIC_DLOG(ERROR) << "Failed to parse Google version extension";
|
|
||||||
return false;
|
|
||||||
diff -up chromium-76.0.3809.100/net/third_party/quiche/src/quic/core/quic_socket_address_coder.cc.quiche-compile-fix chromium-76.0.3809.100/net/third_party/quiche/src/quic/core/quic_socket_address_coder.cc
|
|
||||||
--- chromium-76.0.3809.100/net/third_party/quiche/src/quic/core/quic_socket_address_coder.cc.quiche-compile-fix 2019-08-14 09:59:19.139902052 +0200
|
|
||||||
+++ chromium-76.0.3809.100/net/third_party/quiche/src/quic/core/quic_socket_address_coder.cc 2019-08-14 09:59:33.132041535 +0200
|
|
||||||
@@ -2,10 +2,12 @@
|
|
||||||
// Use of this source code is governed by a BSD-style license that can be
|
|
||||||
// found in the LICENSE file.
|
|
||||||
|
|
||||||
-#include <string>
|
|
||||||
-
|
|
||||||
#include "net/third_party/quiche/src/quic/core/quic_socket_address_coder.h"
|
|
||||||
|
|
||||||
+#include <cstring>
|
|
||||||
+#include <string>
|
|
||||||
+#include <vector>
|
|
||||||
+
|
|
||||||
namespace quic {
|
|
||||||
|
|
||||||
namespace {
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
From 53bb5a463ee956c70230eaa5450022185d0ddc3c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Date: Thu, 06 Jun 2019 07:54:05 +0000
|
|
||||||
Subject: [PATCH] ThrottlingController::Liveness needs to be uint32_t
|
|
||||||
|
|
||||||
We are setting kAlive and kDead values assigning values that
|
|
||||||
are bigger than the maximum signed int32. It is better to use
|
|
||||||
uint32_t in this case.
|
|
||||||
|
|
||||||
Bug: 819294
|
|
||||||
Change-Id: If72b48291a66a3a9db24b4c8e2d11d31936a66ee
|
|
||||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645772
|
|
||||||
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
|
|
||||||
Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Cr-Commit-Position: refs/heads/master@{#666619}
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/services/network/throttling/throttling_controller.h b/services/network/throttling/throttling_controller.h
|
|
||||||
index 43751c4..3c6f87b 100644
|
|
||||||
--- a/services/network/throttling/throttling_controller.h
|
|
||||||
+++ b/services/network/throttling/throttling_controller.h
|
|
||||||
@@ -38,7 +38,7 @@
|
|
||||||
|
|
||||||
// TODO(https://crbug.com/960874): Debugging code to try and shed some light
|
|
||||||
// on why the owned maps are invalid.
|
|
||||||
- enum class Liveness : int32_t {
|
|
||||||
+ enum class Liveness : uint32_t {
|
|
||||||
kAlive = 0xCA11AB13,
|
|
||||||
kDead = 0xDEADBEEF,
|
|
||||||
};
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
From 0370838723e786b51e7ec8ab55014811ec3e3aa3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jose Dapena Paz <jose.dapena@lge.com>
|
|
||||||
Date: Thu, 18 Jul 2019 14:26:11 +0200
|
|
||||||
Subject: [PATCH] Make base::WeakPtr move constructor/operator noexcept to fix GCC build regression
|
|
||||||
|
|
||||||
A GCC build regression has happened on DisjointRangeLockManager, as its move
|
|
||||||
operator and constructor were declared noexcept. This was failing because the
|
|
||||||
default implementation depended on base::WeakPtr, that did not provide
|
|
||||||
noexcept declaration for them.
|
|
||||||
|
|
||||||
So make base::WeakPtr noexcept.
|
|
||||||
|
|
||||||
Bug: 819294
|
|
||||||
Change-Id: I936784b881c7c1afea136ceedbe9341e76464f95
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/base/memory/weak_ptr.cc b/base/memory/weak_ptr.cc
|
|
||||||
index 64fd499..0efcc44 100644
|
|
||||||
--- a/base/memory/weak_ptr.cc
|
|
||||||
+++ b/base/memory/weak_ptr.cc
|
|
||||||
@@ -46,7 +46,7 @@
|
|
||||||
|
|
||||||
WeakReference::~WeakReference() = default;
|
|
||||||
|
|
||||||
-WeakReference::WeakReference(WeakReference&& other) = default;
|
|
||||||
+WeakReference::WeakReference(WeakReference&& other) noexcept = default;
|
|
||||||
|
|
||||||
WeakReference::WeakReference(const WeakReference& other) = default;
|
|
||||||
|
|
||||||
diff --git a/base/memory/weak_ptr.h b/base/memory/weak_ptr.h
|
|
||||||
index 72b5f1f..ccd22fd13 100644
|
|
||||||
--- a/base/memory/weak_ptr.h
|
|
||||||
+++ b/base/memory/weak_ptr.h
|
|
||||||
@@ -116,9 +116,9 @@
|
|
||||||
explicit WeakReference(const scoped_refptr<Flag>& flag);
|
|
||||||
~WeakReference();
|
|
||||||
|
|
||||||
- WeakReference(WeakReference&& other);
|
|
||||||
+ WeakReference(WeakReference&& other) noexcept;
|
|
||||||
WeakReference(const WeakReference& other);
|
|
||||||
- WeakReference& operator=(WeakReference&& other) = default;
|
|
||||||
+ WeakReference& operator=(WeakReference&& other) noexcept = default;
|
|
||||||
WeakReference& operator=(const WeakReference& other) = default;
|
|
||||||
|
|
||||||
bool IsValid() const;
|
|
||||||
@@ -153,9 +153,9 @@
|
|
||||||
~WeakPtrBase();
|
|
||||||
|
|
||||||
WeakPtrBase(const WeakPtrBase& other) = default;
|
|
||||||
- WeakPtrBase(WeakPtrBase&& other) = default;
|
|
||||||
+ WeakPtrBase(WeakPtrBase&& other) noexcept = default;
|
|
||||||
WeakPtrBase& operator=(const WeakPtrBase& other) = default;
|
|
||||||
- WeakPtrBase& operator=(WeakPtrBase&& other) = default;
|
|
||||||
+ WeakPtrBase& operator=(WeakPtrBase&& other) noexcept = default;
|
|
||||||
|
|
||||||
void reset() {
|
|
||||||
ref_ = internal::WeakReference();
|
|
||||||
@@ -236,7 +236,7 @@
|
|
||||||
ptr_ = reinterpret_cast<uintptr_t>(t);
|
|
||||||
}
|
|
||||||
template <typename U>
|
|
||||||
- WeakPtr(WeakPtr<U>&& other) : WeakPtrBase(std::move(other)) {
|
|
||||||
+ WeakPtr(WeakPtr<U>&& other) noexcept : WeakPtrBase(std::move(other)) {
|
|
||||||
// Need to cast from U* to T* to do pointer adjustment in case of multiple
|
|
||||||
// inheritance. This also enforces the "U is a T" rule.
|
|
||||||
T* t = reinterpret_cast<U*>(other.ptr_);
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
diff -up chromium-76.0.3809.132/services/network/cross_origin_read_blocking.cc.gcc-ambigous-instantiation chromium-76.0.3809.132/services/network/cross_origin_read_blocking.cc
|
|
||||||
--- chromium-76.0.3809.132/services/network/cross_origin_read_blocking.cc.gcc-ambigous-instantiation 2019-08-26 21:02:33.000000000 +0200
|
|
||||||
+++ chromium-76.0.3809.132/services/network/cross_origin_read_blocking.cc 2019-08-27 06:58:23.963821667 +0200
|
|
||||||
@@ -207,7 +207,7 @@ std::set<int>& GetPluginProxyingProcesse
|
|
||||||
// confirmation sniffing because images, scripts, etc. are frequently
|
|
||||||
// mislabelled by http servers as HTML/JSON/XML).
|
|
||||||
base::flat_set<std::string>& GetNeverSniffedMimeTypes() {
|
|
||||||
- static base::NoDestructor<base::flat_set<std::string>> s_types({
|
|
||||||
+ static base::NoDestructor<base::flat_set<std::string>> s_types{{
|
|
||||||
// The list below has been populated based on most commonly used content
|
|
||||||
// types according to HTTP Archive - see:
|
|
||||||
// https://github.com/whatwg/fetch/issues/860#issuecomment-457330454
|
|
||||||
@@ -219,7 +219,7 @@ base::flat_set<std::string>& GetNeverSni
|
|
||||||
"application/x-protobuf",
|
|
||||||
"application/zip",
|
|
||||||
"text/event-stream",
|
|
||||||
- });
|
|
||||||
+ }};
|
|
||||||
|
|
||||||
// All items need to be lower-case, to support case-insensitive comparisons
|
|
||||||
// later.
|
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
diff -up chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h
|
||||||
|
--- chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix 2019-09-09 23:55:20.000000000 +0200
|
||||||
|
+++ chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h 2019-09-12 15:43:30.025360946 +0200
|
||||||
|
@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo {
|
||||||
|
|
||||||
|
bool is_valid() const { return handle_.is_valid(); }
|
||||||
|
|
||||||
|
- explicit operator bool() const { return handle_.is_valid(); }
|
||||||
|
+ explicit operator bool() const { return (bool) handle_.is_valid(); }
|
||||||
|
|
||||||
|
ScopedInterfaceEndpointHandle PassHandle() {
|
||||||
|
return std::move(handle_);
|
||||||
|
diff -up chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h.boolfix chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h
|
||||||
|
--- chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h.boolfix 2019-09-09 23:55:20.000000000 +0200
|
||||||
|
+++ chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h 2019-09-12 15:43:30.025360946 +0200
|
||||||
|
@@ -51,7 +51,7 @@ class AssociatedInterfaceRequest {
|
||||||
|
// handle.
|
||||||
|
bool is_pending() const { return handle_.is_valid(); }
|
||||||
|
|
||||||
|
- explicit operator bool() const { return handle_.is_valid(); }
|
||||||
|
+ explicit operator bool() const { return (bool) handle_.is_valid(); }
|
||||||
|
|
||||||
|
ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); }
|
||||||
|
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
diff -up chromium-77.0.3865.75/content/common/user_agent.cc.fedora-user-agent chromium-77.0.3865.75/content/common/user_agent.cc
|
||||||
|
--- chromium-77.0.3865.75/content/common/user_agent.cc.fedora-user-agent 2019-09-12 15:49:11.902270729 +0200
|
||||||
|
+++ chromium-77.0.3865.75/content/common/user_agent.cc 2019-09-12 15:50:11.555732044 +0200
|
||||||
|
@@ -35,7 +35,7 @@ std::string GetUserAgentPlatform() {
|
||||||
|
#elif defined(OS_MACOSX)
|
||||||
|
return "Macintosh; ";
|
||||||
|
#elif defined(USE_X11) || defined(USE_OZONE)
|
||||||
|
- return "X11; "; // strange, but that's what Firefox uses
|
||||||
|
+ return "X11; Fedora; "; // strange, but that's what Firefox uses
|
||||||
|
#elif defined(OS_ANDROID)
|
||||||
|
return "Linux; ";
|
||||||
|
#elif defined(OS_POSIX)
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
diff -up chromium-77.0.3865.75/v8/src/objects/js-objects.cc.fix-v8-gcc chromium-77.0.3865.75/v8/src/objects/js-objects.cc
|
||||||
|
--- chromium-77.0.3865.75/v8/src/objects/js-objects.cc.fix-v8-gcc 2019-09-12 15:55:18.936238980 +0200
|
||||||
|
+++ chromium-77.0.3865.75/v8/src/objects/js-objects.cc 2019-09-12 15:56:06.796645726 +0200
|
||||||
|
@@ -3773,6 +3773,10 @@ Handle<NumberDictionary> CreateElementDi
|
||||||
|
return new_element_dictionary;
|
||||||
|
}
|
||||||
|
|
||||||
|
+template void JSObject::ApplyAttributesToDictionary(
|
||||||
|
+ Isolate* isolate, ReadOnlyRoots roots, Handle<NumberDictionary> dictionary,
|
||||||
|
+ const PropertyAttributes attributes);
|
||||||
|
+
|
||||||
|
template <PropertyAttributes attrs>
|
||||||
|
Maybe<bool> JSObject::PreventExtensionsWithTransition(
|
||||||
|
Handle<JSObject> object, ShouldThrow should_throw) {
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
diff -up chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h
|
||||||
|
--- chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath 2019-09-12 09:55:13.041038765 +0200
|
||||||
|
+++ chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h 2019-09-12 10:11:14.088101504 +0200
|
||||||
|
@@ -24,8 +24,7 @@
|
||||||
|
#elif !defined(__native_client__) && \
|
||||||
|
((defined(__clang__) && \
|
||||||
|
((__clang_major__ > 3) || \
|
||||||
|
- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
|
||||||
|
- (defined(__GNUC__) && __GNUC__ >= 5))
|
||||||
|
+ (__clang_major__ == 3 && __clang_minor__ >= 4)))
|
||||||
|
#include "base/numerics/safe_math_clang_gcc_impl.h"
|
||||||
|
#define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
|
||||||
|
#else
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
diff -up chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h
|
||||||
|
--- chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 2019-09-09 23:55:18.000000000 +0200
|
||||||
|
+++ chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h 2019-09-12 10:13:16.710206500 +0200
|
||||||
|
@@ -15,7 +15,7 @@ namespace mojo {
|
||||||
|
template <>
|
||||||
|
struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
|
||||||
|
static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
|
||||||
|
- return mailbox.name;
|
||||||
|
+ return base::make_span(mailbox.name);
|
||||||
|
}
|
||||||
|
static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
|
||||||
|
};
|
||||||
|
diff -up chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h
|
||||||
|
--- chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 2019-09-09 23:55:23.000000000 +0200
|
||||||
|
+++ chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h 2019-09-12 10:13:16.710206500 +0200
|
||||||
|
@@ -391,7 +391,7 @@ struct StructTraits<viz::mojom::TextureQ
|
||||||
|
static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
|
||||||
|
const viz::TextureDrawQuad* quad =
|
||||||
|
viz::TextureDrawQuad::MaterialCast(&input);
|
||||||
|
- return quad->vertex_opacity;
|
||||||
|
+ return base::make_span(quad->vertex_opacity);
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool y_flipped(const viz::DrawQuad& input) {
|
||||||
|
diff -up chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc
|
||||||
|
--- chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 2019-09-12 10:13:16.711206509 +0200
|
||||||
|
+++ chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2019-09-12 15:41:15.300158849 +0200
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
|
||||||
|
#include "modules/audio_processing/aec3/aec_state.h"
|
||||||
|
|
||||||
|
-#include <math.h>
|
||||||
|
+#include <cmath>
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
#include <numeric>
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
diff -up chromium-77.0.3865.75/third_party/zlib/zconf.h.nozmangle chromium-77.0.3865.75/third_party/zlib/zconf.h
|
||||||
|
--- chromium-77.0.3865.75/third_party/zlib/zconf.h.nozmangle 2019-09-12 09:36:37.924086850 +0200
|
||||||
|
+++ chromium-77.0.3865.75/third_party/zlib/zconf.h 2019-09-12 09:53:01.623958551 +0200
|
||||||
|
@@ -9,18 +9,6 @@
|
||||||
|
#define ZCONF_H
|
||||||
|
|
||||||
|
/*
|
||||||
|
- * This library is also built as a part of AOSP, which does not need to include
|
||||||
|
- * chromeconf.h. This config does not want chromeconf.h, so it can set this
|
||||||
|
- * macro to opt out. While this works today, there's no guarantee that building
|
||||||
|
- * zlib outside of Chromium keeps working in the future.
|
||||||
|
- */
|
||||||
|
-#if !defined(CHROMIUM_ZLIB_NO_CHROMECONF)
|
||||||
|
-/* This include does prefixing as below, but with an updated set of names. Also
|
||||||
|
- * sets up export macros in component builds. */
|
||||||
|
-#include "chromeconf.h"
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
-/*
|
||||||
|
* If you *really* need a unique prefix for all types and library functions,
|
||||||
|
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
|
||||||
|
* Even better than compiling with -DZ_PREFIX would be to use configure to set
|
||||||
Loading…
Reference in new issue