chromium: update to 71.0.3578.80.

[ci skip]
This commit is contained in:
Rasmus Thomsen 2018-12-07 17:26:36 +01:00 committed by Johannes
parent d3033bc5b4
commit 5444531744
10 changed files with 39 additions and 288 deletions

View file

@ -6,19 +6,18 @@
+ return (1 << 23);
--- chrome/app/shutdown_signal_handlers_posix.cc.orig
+++ chrome/app/shutdown_signal_handlers_posix.cc
@@ -184,12 +184,20 @@
@@ -184,11 +184,19 @@
g_shutdown_pipe_read_fd = pipefd[0];
g_shutdown_pipe_write_fd = pipefd[1];
#if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
#if !defined(ADDRESS_SANITIZER)
+# if defined(__GLIBC__)
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
+# else
+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2 * 8; // match up musls 2k PTHREAD_STACK_MIN with glibcs 16k
+# endif
#else
// ASan instrumentation and -finstrument-functions (used for keeping the
// shadow stacks) bloat the stack frames, so we need to increase the stack
// size to avoid hitting the guard page.
// ASan instrumentation bloats the stack frames, so we need to increase the
// stack size to avoid hitting the guard page.
+# if defined(__GLIBC__)
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
+# else
@ -27,3 +26,4 @@
#endif
ShutdownDetector* detector = new ShutdownDetector(
g_shutdown_pipe_read_fd, shutdown_callback, task_runner);

View file

@ -1,11 +1,11 @@
--- ./base/debug/stack_trace.cc.orig
+++ ./base/debug/stack_trace.cc
@@ -214,7 +214,7 @@
std::string StackTrace::ToString() const {
--- base/debug/stack_trace.cc.orig 2018-12-08 14:11:25.303475116 +0100
+++ base/debug/stack_trace.cc 2018-12-08 18:00:43.874946999 +0100
@@ -229,7 +229,7 @@
}
std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
std::stringstream stream;
-#if !defined(__UCLIBC__) && !defined(_AIX)
+#if defined(__GLIBC__) && !defined(_AIX)
OutputToStream(&stream);
OutputToStreamWithPrefix(&stream, prefix_string);
#endif
return stream.str();

View file

@ -1,30 +0,0 @@
Upstream: Yes
Source:https://chromium.googlesource.com/chromium/src.git/+/e3ad3deb6a6e79284f3748fa7410311d87df91c5
From e3ad3deb6a6e79284f3748fa7410311d87df91c5 Mon Sep 17 00:00:00 2001
From: Henrique Nakashima <hnakashima@chromium.org>
Date: Tue, 4 Sep 2018 16:49:51 +0000
Subject: [PATCH] IWYU: stdint.h in pdfium_mem_buffer_file_write.h for uint8_t
Bug: 879900
Change-Id: I9c15d1c280a23c53d31f2d72c9d0d1db79eab886
Reviewed-on: https://chromium-review.googlesource.com/1204410
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588547}
---
pdf/pdfium/pdfium_mem_buffer_file_write.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/pdf/pdfium/pdfium_mem_buffer_file_write.h b/pdf/pdfium/pdfium_mem_buffer_file_write.h
index 03c54bb63800e..82e82d23684d8 100644
--- pdf/pdfium/pdfium_mem_buffer_file_write.h
+++ pdf/pdfium/pdfium_mem_buffer_file_write.h
@@ -6,6 +6,7 @@
#define PDF_PDFIUM_PDFIUM_MEM_BUFFER_FILE_WRITE_H_
#include <stddef.h>
+#include <stdint.h>
#include <vector>

View file

@ -1,99 +0,0 @@
Upstream: Yes
Source: https://chromium.googlesource.com/chromium/src/+/87902b3202f81d689dd314c17006ffc907fe12a1
From 87902b3202f81d689dd314c17006ffc907fe12a1 Mon Sep 17 00:00:00 2001
From: Wang Qing <wangqing-hf@loongson.cn>
Date: Mon, 3 Sep 2018 02:41:08 +0000
Subject: [PATCH] Fix build error for blink.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This CLs fixed the error of constexpr function call to non-constexpr function.
Bug: 878202
Change-Id: I6ad217a687e62a9a384980d852743a56479de3a9
Reviewed-on: https://chromium-review.googlesource.com/1192467
Commit-Queue: 汪 清 <wangqing-hf@loongson.cn>
Reviewed-by: Eric Willigers <ericwilligers@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588316}
---
.../core/animation/animation_time_delta.cc | 22 ++++++++++++++
.../core/animation/animation_time_delta.h | 30 +++++++------------
2 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/third_party/blink/renderer/core/animation/animation_time_delta.cc b/third_party/blink/renderer/core/animation/animation_time_delta.cc
index 1b25469c7f2f5..2e30a18890dab 100644
--- third_party/blink/renderer/core/animation/animation_time_delta.cc
+++ third_party/blink/renderer/core/animation/animation_time_delta.cc
@@ -7,6 +7,28 @@
namespace blink {
#if !defined(BLINK_ANIMATION_USE_TIME_DELTA)
+// Comparison operators on AnimationTimeDelta.
+bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs,
+ const AnimationTimeDelta& rhs) {
+ return lhs.InSecondsF() == rhs.InSecondsF();
+}
+bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs,
+ const AnimationTimeDelta& rhs) {
+ return lhs.InSecondsF() != rhs.InSecondsF();
+}
+bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs,
+ const AnimationTimeDelta& rhs) {
+ return lhs.InSecondsF() > rhs.InSecondsF();
+}
+bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs,
+ const AnimationTimeDelta& rhs) {
+ return lhs.InSecondsF() >= rhs.InSecondsF();
+}
+bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs,
+ const AnimationTimeDelta& rhs) {
+ return lhs.InSecondsF() <= rhs.InSecondsF();
+}
+
std::ostream& operator<<(std::ostream& os, AnimationTimeDelta time) {
return os << time.InSecondsF() << " s";
}
diff --git a/third_party/blink/renderer/core/animation/animation_time_delta.h b/third_party/blink/renderer/core/animation/animation_time_delta.h
index 1903c1150d3ec..95d218466d90a 100644
--- third_party/blink/renderer/core/animation/animation_time_delta.h
+++ third_party/blink/renderer/core/animation/animation_time_delta.h
@@ -90,26 +90,16 @@ AnimationTimeDelta operator*(T a, AnimationTimeDelta td) {
}
// Comparison operators on AnimationTimeDelta.
-constexpr bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs,
- const AnimationTimeDelta& rhs) {
- return lhs.InSecondsF() == rhs.InSecondsF();
-}
-constexpr bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs,
- const AnimationTimeDelta& rhs) {
- return lhs.InSecondsF() != rhs.InSecondsF();
-}
-constexpr bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs,
- const AnimationTimeDelta& rhs) {
- return lhs.InSecondsF() > rhs.InSecondsF();
-}
-constexpr bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs,
- const AnimationTimeDelta& rhs) {
- return lhs.InSecondsF() >= rhs.InSecondsF();
-}
-constexpr bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs,
- const AnimationTimeDelta& rhs) {
- return lhs.InSecondsF() <= rhs.InSecondsF();
-}
+bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs,
+ const AnimationTimeDelta& rhs);
+bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs,
+ const AnimationTimeDelta& rhs);
+bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs,
+ const AnimationTimeDelta& rhs);
+bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs,
+ const AnimationTimeDelta& rhs);
+bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs,
+ const AnimationTimeDelta& rhs);
// Defined to allow DCHECK_EQ/etc to work with the class.
CORE_EXPORT std::ostream& operator<<(std::ostream& os, AnimationTimeDelta time);

View file

@ -1,37 +0,0 @@
Upstream: Yes
Source: https://chromium.googlesource.com/chromium/src/+/cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4
From cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4 Mon Sep 17 00:00:00 2001
From: Maksim Sisov <msisov@igalia.com>
Date: Fri, 7 Sep 2018 18:57:42 +0000
Subject: [PATCH] OmniboxTextView: fix gcc error for structure initialization
It looks like there is bug in GCC 6, which cannot go through
structure initialization normally.
Thus, instead of a default initialization of one of the members,
explicitly initialize it to a default value.
Change-Id: Ia55cc6658e6b6b2f8a80c2582dd28f001c9e648c
Reviewed-on: https://chromium-review.googlesource.com/1213181
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#589614}
---
chrome/browser/ui/views/omnibox/omnibox_text_view.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
index f0a8083dc9300..9021284f166de 100644
--- chrome/browser/ui/views/omnibox/omnibox_text_view.cc
+++ chrome/browser/ui/views/omnibox/omnibox_text_view.cc
@@ -175,7 +175,8 @@ void ApplyTextStyleForType(SuggestionAnswer::TextStyle text_style,
style = {part_color, .baseline = gfx::SUPERIOR};
break;
case SuggestionAnswer::TextStyle::BOLD:
- style = {part_color, .weight = gfx::Font::Weight::BOLD};
+ style = {part_color, .baseline = gfx::NORMAL_BASELINE,
+ .weight = gfx::Font::Weight::BOLD};
break;
case SuggestionAnswer::TextStyle::NORMAL:
case SuggestionAnswer::TextStyle::NORMAL_DIM:

View file

@ -1,70 +0,0 @@
Upstream: Yes
Source: https://chromium.googlesource.com/chromium/src/+/e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d
From e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d Mon Sep 17 00:00:00 2001
From: Maksim Sisov <msisov@igalia.com>
Date: Thu, 13 Sep 2018 15:17:29 +0000
Subject: [PATCH] ScrollPaintPropertyNode: Rename SnapContainerData() to
GetSnapContainerData()
GCC is stricter than clang when it comes to class members' names and how
they can change the meaning of a previously existing symbol with the same
name.
Here is a short error message:
error: changes meaning of 'SnapContainerData' from 'using SnapContainerData =
class cc::SnapContainerData' [-fpermissive] using SnapContainerData =
cc::SnapContainerData;
Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I0de5460f17b13484253e1ff0538b111c9a3b0d13
Reviewed-on: https://chromium-review.googlesource.com/1213180
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Reviewed-by: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#591015}
---
.../renderer/core/paint/paint_property_tree_update_tests.cc | 2 +-
.../platform/graphics/compositing/property_tree_manager.cc | 2 +-
.../platform/graphics/paint/scroll_paint_property_node.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc b/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc
index 0d999d45076f3..1fe1815a5659c 100644
--- third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc
+++ third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc
@@ -1310,7 +1310,7 @@ TEST_P(PaintPropertyTreeUpdateTest, EnsureSnapContainerData) {
GetDocument().View()->Resize(300, 300);
GetDocument().View()->UpdateAllLifecyclePhases();
- auto doc_snap_container_data = DocScroll()->SnapContainerData();
+ auto doc_snap_container_data = DocScroll()->GetSnapContainerData();
ASSERT_TRUE(doc_snap_container_data);
EXPECT_EQ(doc_snap_container_data->scroll_snap_type().axis, SnapAxis::kBoth);
EXPECT_EQ(doc_snap_container_data->scroll_snap_type().strictness,
diff --git a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc
index 745b8c8b387ea..5f87eeea94357 100644
--- third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc
+++ third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc
@@ -333,7 +333,7 @@ void PropertyTreeManager::CreateCompositorScrollNode(
scroll_node->OverscrollBehaviorX()),
static_cast<cc::OverscrollBehavior::OverscrollBehaviorType>(
scroll_node->OverscrollBehaviorY()));
- compositor_node.snap_container_data = scroll_node->SnapContainerData();
+ compositor_node.snap_container_data = scroll_node->GetSnapContainerData();
auto compositor_element_id = scroll_node->GetCompositorElementId();
if (compositor_element_id) {
diff --git a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
index e1479269ccc37..5bd7f65f10bac 100644
--- third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
+++ third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
@@ -99,7 +99,7 @@ class PLATFORM_EXPORT ScrollPaintPropertyNode
return state_.overscroll_behavior.y;
}
- base::Optional<SnapContainerData> SnapContainerData() const {
+ base::Optional<SnapContainerData> GetSnapContainerData() const {
return state_.snap_container_data;
}

View file

@ -1,19 +0,0 @@
Source: Gentoo
Upstream: No
Reason: Set widevine as available on linux
description: indicate that widevine continues to be supported on linux
author: Gregory M. Turner
origin: https://gitweb.gentoo.org/repo/gentoo.git/commit/www-client/chromium/files?id=09b804516320eee06930303870cd68008aac8a8a
--- third_party/widevine/cdm/BUILD.gn.old
+++ third_party/widevine/cdm/BUILD.gn
@@ -11,7 +11,7 @@ import("//third_party/widevine/cdm/widevine.gni")
# Internal Cast builds set enable_widevine=true to bring in Widevine support.
# TODO(xhwang): Support component updated CDM on other platforms and remove this
# assert.
-assert(!enable_widevine || is_win || is_mac || is_chromecast,
+assert(!enable_widevine || is_win || is_mac || is_chromecast || is_linux,
"Component updated CDM only supported on Windows and Mac for now.")
widevine_arch = current_cpu

View file

@ -1,17 +1,23 @@
Source: Debian
Upstream: No
Reason: Set widevine version as undefined
From 5818fdbef3d399fe1bfbb56f81e59184e1a8e467 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppymaster@gmail.com>
Date: Sun, 14 Oct 2018 20:04:03 -0400
Subject: [PATCH] Define WIDEVINE_CDM_VERSION_STRING
description: set widevine version as undefined
author: Michael Gilbert <mgilbert@debian.org>
---
third_party/widevine/cdm/widevine_cdm_version.h | 1 +
1 file changed, 1 insertion(+)
--- third_party/widevine/cdm/stub/widevine_cdm_version.h
+++ third_party/widevine/cdm/stub/widevine_cdm_version.h
@@ -10,6 +10,7 @@
#include "third_party/widevine/cdm/widevine_cdm_common.h"
+#define WIDEVINE_CDM_VERSION_STRING "undefined"
#define WIDEVINE_CDM_AVAILABLE
diff --git a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h
index dd6efed02646..eaa017197e61 100644
--- third_party/widevine/cdm/widevine_cdm_version.h
+++ third_party/widevine/cdm/widevine_cdm_version.h
@@ -11,5 +11,6 @@
// If the Widevine CDM is available define the following:
// - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
// as a string, e.g., "1.0.123.456").
+#define WIDEVINE_CDM_VERSION_STRING "unknown"
#endif // WIDEVINE_CDM_VERSION_H_
--
2.19.1

View file

@ -54,22 +54,22 @@
count = std::min(arraysize(trace_), count);
// Though the backtrace API man page does not list any possible negative
@@ -736,13 +736,13 @@
// NOTE: This code MUST be async-signal safe (it's used by in-process
// stack dumping signal handler). NO malloc or stdio is allowed here.
@@ -827,13 +827,13 @@
// NOTE: This code MUST be async-signal safe (it's used by in-process
// stack dumping signal handler). NO malloc or stdio is allowed here.
-#if !defined(__UCLIBC__) && !defined(_AIX)
+#if defined(__GLIBC__) && !defined(_AIX)
PrintBacktraceOutputHandler handler;
ProcessBacktrace(trace_, count_, &handler);
ProcessBacktrace(trace_, count_, prefix_string, &handler);
#endif
}
-#if !defined(__UCLIBC__) && !defined(_AIX)
+#if defined(__GLIBC__) && !defined(_AIX)
void StackTrace::OutputToStream(std::ostream* os) const {
void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
const char* prefix_string) const {
StreamBacktraceOutputHandler handler(os);
ProcessBacktrace(trace_, count_, &handler);
--- third_party/blink/renderer/platform/wtf/assertions.cc.orig 2017-09-11 12:27:06.948854813 +0000
+++ third_party/blink/renderer/platform/wtf/assertions.cc 2017-09-11 12:29:34.639862433 +0000
@@ -56,7 +56,7 @@

View file

@ -1,14 +1,14 @@
# Template file for 'chromium'
pkgname=chromium
# See http://www.chromium.org/developers/calendar for the latest version
version=70.0.3538.110
revision=2
version=71.0.3578.80
revision=1
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
checksum=445ef88fcf283206c1eba4faeb1c186c805e053d8b4ffeac1fcb88187bc1942f
checksum=025b3520750d11f260acc4cbff5759137444ffb4c82361138dfd22f87b77ad0d
only_for_archs="i686 x86_64 x86_64-musl"
lib32disabled=yes