Hello community,
here is the log from the commit of package chromium for openSUSE:Factory checked in at 2018-07-27 10:56:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Fri Jul 27 10:56:09 2018 rev:192 rq:625371 version:68.0.3440.75
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2018-07-12 09:20:32.262533683 +0200
+++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2018-07-27 10:57:43.297816453 +0200
@@ -1,0 +2,62 @@
+Wed Jul 25 15:56:24 UTC 2018 - guillaume.gardet@opensuse.org
+
+- Add patch to fix aarch64 build:
+ * chromium-vpx-aarch64.patch
+
+-------------------------------------------------------------------
+Wed Jul 25 14:29:16 UTC 2018 - tchvatal@suse.com
+
+- Add patch trying to build chromium on Leap 42.3:
+ * chromium-gcc7.patch
+
+-------------------------------------------------------------------
+Wed Jul 25 13:08:17 UTC 2018 - tchvatal@suse.com
+
+- Raise libvpx requirement to match what we really need
+
+-------------------------------------------------------------------
+Wed Jul 25 09:53:23 UTC 2018 - tchvatal@suse.com
+
+- Version update to 68.0.3440.75 bsc#1102530:
+ * CVE-2018-6153: Stack buffer overflow in Skia.
+ * CVE-2018-6154: Heap buffer overflow in WebGL.
+ * CVE-2018-6155: Use after free in WebRTC.
+ * CVE-2018-6156: Heap buffer overflow in WebRTC.
+ * CVE-2018-6157: Type confusion in WebRTC.
+ * CVE-2018-6158: Use after free in Blink.
+ * CVE-2018-6159: Same origin policy bypass in ServiceWorker.
+ * CVE-2018-6160: URL spoof in Chrome on iOS.
+ * CVE-2018-6161: Same origin policy bypass in WebAudio.
+ * CVE-2018-6162: Heap buffer overflow in WebGL.
+ * CVE-2018-6163: URL spoof in Omnibox.
+ * CVE-2018-6164: Same origin policy bypass in ServiceWorker.
+ * CVE-2018-6165: URL spoof in Omnibox.
+ * CVE-2018-6166: URL spoof in Omnibox.
+ * CVE-2018-6167: URL spoof in Omnibox.
+ * CVE-2018-6168: CORS bypass in Blink.
+ * CVE-2018-6169: Permissions bypass in extension installation.
+ * CVE-2018-6170: Type confusion in PDFium.
+ * CVE-2018-6171: Use after free in WebBluetooth.
+ * CVE-2018-6172: URL spoof in Omnibox.
+ * CVE-2018-6173: URL spoof in Omnibox.
+ * CVE-2018-6174: Integer overflow in SwiftShader.
+ * CVE-2018-6175: URL spoof in Omnibox.
+ * CVE-2018-6176: Local user privilege escalation in Extensions.
+ * CVE-2018-6177: Cross origin information leak in Blink.
+ * CVE-2018-6178: UI spoof in Extensions.
+ * CVE-2018-6179: Local file information leak in Extensions.
+ * CVE-2018-6044: Request privilege escalation in Extensions.
+ * CVE-2018-4117: Cross origin information leak in Blink.
+- Rebase patches:
+ * chromium-master-prefs-path.patch
+ * chromium-non-void-return.patch
+ * chromium-vaapi.patch
+- Add patches:
+ * chromium-cors-string.patch
+ * chromium-gcc.patch
+ * chromium-libjpeg.patch
+ * chromium-libwebp-shim.patch
+- Remove patches:
+ * chromium-gcc8.patch
+
+-------------------------------------------------------------------
Old:
----
chromium-67.0.3396.99.tar.xz
chromium-gcc8.patch
New:
----
chromium-68.0.3440.75.tar.xz
chromium-cors-string.patch
chromium-gcc.patch
chromium-gcc7.patch
chromium-libjpeg.patch
chromium-libwebp-shim.patch
chromium-vpx-aarch64.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.7v8y6n/_old 2018-07-27 10:57:54.105837134 +0200
+++ /var/tmp/diff_new_pack.7v8y6n/_new 2018-07-27 10:57:54.109837141 +0200
@@ -40,7 +40,7 @@
%bcond_with system_vpx
%bcond_with clang
Name: chromium
-Version: 67.0.3396.99
+Version: 68.0.3440.75
Release: 0
Summary: Google's open source browser project
License: BSD-3-Clause AND LGPL-2.1-or-later
@@ -69,9 +69,16 @@
Patch7: chromium-ffmpeg.patch
Patch8: chromium-drm.patch
Patch9: chromium-sandbox-pie.patch
-Patch10: chromium-gcc8.patch
+Patch10: chromium-libwebp-shim.patch
+Patch11: chromium-libjpeg.patch
+Patch12: chromium-cors-string.patch
+Patch13: chromium-gcc.patch
+Patch14: chromium-gcc7.patch
+# PATCH-FIX-UPSTREAM chromium-vpx-aarch64.patch - Fix vpx build on aarch64 (patch edited to match path for -p1)
+Patch15: chromium-vpx-aarch64.patch
# Google seem not too keen on merging this but GPU accel is quite important
# https://chromium-review.googlesource.com/c/chromium/src/+/532294
+# https://github.com/saiarcot895/chromium-ubuntu-build/tree/master/debian/patc...
Patch100: chromium-vaapi.patch
# Google does not care much about system libs here
# https://bugs.chromium.org/p/skia/issues/detail?id=6663
@@ -196,7 +203,7 @@
Obsoletes: chromium-ffmpeg
Obsoletes: chromium-ffmpegsumo
# no 32bit supported and it takes ages to build
-ExcludeArch: %{arm} i586 ppc ppc64 ppc64le
+ExcludeArch: %{arm} i586 ppc ppc64 ppc64le s390 s390x
%ifnarch aarch64
# Current tcmalloc does not support AArch64
BuildRequires: pkgconfig(libtcmalloc)
@@ -225,7 +232,7 @@
BuildRequires: pkgconfig(icu-i18n) >= 59.0
%endif
%if %{with system_vpx}
-BuildRequires: pkgconfig(vpx) >= 1.6.1
+BuildRequires: pkgconfig(vpx) > 1.7.0
%endif
%if %{with clang}
BuildRequires: clang >= 5.0.0
@@ -279,8 +286,11 @@
buildtools/third_party/libunwind
chrome/third_party/mozilla_security_manager
courgette/third_party
+ net/third_party/http2
net/third_party/mozilla_security_manager
net/third_party/nss
+ net/third_party/quic
+ net/third_party/spdy
third_party/WebKit
third_party/analytics
third_party/angle
@@ -338,11 +348,11 @@
third_party/libXNVCtrl
third_party/libaddressinput
third_party/libaom
- third_party/libaom/source/libaom/third_party/x86inc
third_party/libjingle
third_party/libphonenumber
third_party/libsecret
third_party/libsrtp
+ third_party/libsync
third_party/libudev
third_party/libusb
third_party/libwebm
@@ -359,6 +369,7 @@
third_party/openh264
third_party/openmax_dl
third_party/ots
+ third_party/perfetto
third_party/pdfium
third_party/pdfium/third_party/agg23
third_party/pdfium/third_party/base
@@ -370,16 +381,20 @@
third_party/pdfium/third_party/libpng16
third_party/pdfium/third_party/libtiff
third_party/pdfium/third_party/skia_shared
+ third_party/perfetto
third_party/ply
third_party/polymer
third_party/protobuf
third_party/protobuf/third_party/six
+ third_party/pyjson5
third_party/qcms
+ third_party/rnnoise
third_party/s2cellid
third_party/sfntly
third_party/shaderc
third_party/skia
third_party/skia/third_party/gif
+ third_party/skia/third_party/skcms
third_party/skia/third_party/vulkan
third_party/smhasher
third_party/spirv-headers
@@ -405,6 +420,7 @@
url/third_party/mozilla
v8/src/third_party/valgrind
v8/src/third_party/utf8-decoder
+ v8/third_party/antlr4
v8/third_party/inspector_protocol
)
%if %{with sle_bundles}
++++++ chromium-67.0.3396.99.tar.xz -> chromium-68.0.3440.75.tar.xz ++++++
/work/SRC/openSUSE:Factory/chromium/chromium-67.0.3396.99.tar.xz /work/SRC/openSUSE:Factory/.chromium.new/chromium-68.0.3440.75.tar.xz differ: char 26, line 1
++++++ chromium-cors-string.patch ++++++
From 01d891fa0790950549c7bedb34edf869827a372e Mon Sep 17 00:00:00 2001
From: Jose Dapena Paz
Date: Thu, 31 May 2018 17:03:37 +0000
Subject: [PATCH] CORS legacy: add missing string include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The cors_legacy.h file includes declarations using std::string, but
it is not declared due to missing #include <string>.
Also drop unneeded declarations in .cpp file.
Change-Id: I00df799f84a6c3530c2f12f1e52d24c7d9bd6bfd
Reviewed-on: https://chromium-review.googlesource.com/1080707
Reviewed-by: Tom Sepez
Commit-Queue: José Dapena Paz
Cr-Commit-Position: refs/heads/master@{#563282}
---
services/network/public/cpp/cors/cors_legacy.cc | 2 --
services/network/public/cpp/cors/cors_legacy.h | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/services/network/public/cpp/cors/cors_legacy.cc b/services/network/public/cpp/cors/cors_legacy.cc
index 8f32ac3be64e..f01af63619b5 100644
--- a/services/network/public/cpp/cors/cors_legacy.cc
+++ b/services/network/public/cpp/cors/cors_legacy.cc
@@ -5,8 +5,6 @@
#include "services/network/public/cpp/cors/cors_legacy.h"
#include <algorithm>
-#include <string>
-#include <vector>
#include "url/gurl.h"
#include "url/url_util.h"
diff --git a/services/network/public/cpp/cors/cors_legacy.h b/services/network/public/cpp/cors/cors_legacy.h
index d2cdf026ca3a..dc9295a92c47 100644
--- a/services/network/public/cpp/cors/cors_legacy.h
+++ b/services/network/public/cpp/cors/cors_legacy.h
@@ -5,6 +5,7 @@
#ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
#define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
+#include <string>
#include <vector>
#include "base/component_export.h"
--
2.17.1
++++++ chromium-gcc8.patch -> chromium-gcc.patch ++++++
--- /work/SRC/openSUSE:Factory/chromium/chromium-gcc8.patch 2018-07-01 21:28:04.744637398 +0200
+++ /work/SRC/openSUSE:Factory/.chromium.new/chromium-gcc.patch 2018-07-27 10:57:42.973815833 +0200
@@ -1,39 +1,35 @@
-diff -up chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h
---- chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix 2018-05-30 04:43:17.000000000 -0400
-+++ chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h 2018-05-30 12:33:03.268912315 -0400
-@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo {
+Index: chromium-68.0.3440.17/components/bookmarks/browser/bookmark_client.h
+===================================================================
+--- chromium-68.0.3440.17.orig/components/bookmarks/browser/bookmark_client.h
++++ chromium-68.0.3440.17/components/bookmarks/browser/bookmark_client.h
+@@ -26,6 +26,7 @@ namespace bookmarks {
+ class BookmarkModel;
+ class BookmarkNode;
+ class BookmarkPermanentNode;
++class UrlIndex;
+
+ // This class abstracts operations that depends on the embedder's environment,
+ // e.g. Chrome.
+Index: chromium-68.0.3440.17/components/bookmarks/browser/bookmark_storage.h
+===================================================================
+--- chromium-68.0.3440.17.orig/components/bookmarks/browser/bookmark_storage.h
++++ chromium-68.0.3440.17/components/bookmarks/browser/bookmark_storage.h
+@@ -19,6 +19,7 @@
+ #include "base/memory/weak_ptr.h"
+ #include "components/bookmarks/browser/bookmark_node.h"
+ #include "components/bookmarks/browser/titled_url_index.h"
++#include "components/bookmarks/browser/url_index.h"
+
+ namespace base {
+ class SequencedTaskRunner;
+@@ -29,7 +30,6 @@ namespace bookmarks {
+ class BookmarkClient;
+ class BookmarkModel;
+ class BookmarkNode;
+-class UrlIndex;
- bool is_valid() const { return handle_.is_valid(); }
-
-- explicit operator bool() const { return handle_; }
-+ explicit operator bool() const { return (bool) handle_; }
-
- ScopedInterfaceEndpointHandle PassHandle() {
- return std::move(handle_);
-diff -up chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h.boolfix chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h
---- chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h.boolfix 2018-05-30 04:43:17.000000000 -0400
-+++ chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h 2018-05-30 12:33:03.269912294 -0400
-@@ -50,7 +50,7 @@ class AssociatedInterfaceRequest {
- // handle.
- bool is_pending() const { return handle_.is_valid(); }
-
-- explicit operator bool() const { return handle_; }
-+ explicit operator bool() const { return (bool) handle_; }
-
- ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); }
-
-diff -up chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h.boolfix chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h
---- chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h.boolfix 2018-05-30 12:33:03.270912274 -0400
-+++ chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h 2018-05-30 12:34:05.156637922 -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_); }
+ // A list of BookmarkPermanentNodes that owns them.
+ using BookmarkPermanentNodeList =
--- chromium-67.0.3396.87/build/config/compiler/BUILD.gn.orig 2018-06-16 13:57:27.583106343 +0200
+++ chromium-67.0.3396.87/build/config/compiler/BUILD.gn 2018-06-16 14:24:26.713631391 +0200
@@ -1325,6 +1325,11 @@
++++++ chromium-gcc8.patch -> chromium-gcc7.patch ++++++
--- /work/SRC/openSUSE:Factory/chromium/chromium-gcc8.patch 2018-07-01 21:28:04.744637398 +0200
+++ /work/SRC/openSUSE:Factory/.chromium.new/chromium-gcc7.patch 2018-07-27 10:57:43.137816147 +0200
@@ -1,50 +1,63 @@
-diff -up chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h
---- chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix 2018-05-30 04:43:17.000000000 -0400
-+++ chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h 2018-05-30 12:33:03.268912315 -0400
-@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo {
-
- bool is_valid() const { return handle_.is_valid(); }
-
-- explicit operator bool() const { return handle_; }
-+ explicit operator bool() const { return (bool) handle_; }
-
- ScopedInterfaceEndpointHandle PassHandle() {
- return std::move(handle_);
-diff -up chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h.boolfix chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h
---- chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h.boolfix 2018-05-30 04:43:17.000000000 -0400
-+++ chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h 2018-05-30 12:33:03.269912294 -0400
-@@ -50,7 +50,7 @@ class AssociatedInterfaceRequest {
- // handle.
- bool is_pending() const { return handle_.is_valid(); }
-
-- explicit operator bool() const { return handle_; }
-+ explicit operator bool() const { return (bool) handle_; }
-
- ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); }
-
-diff -up chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h.boolfix chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h
---- chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h.boolfix 2018-05-30 12:33:03.270912274 -0400
-+++ chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h 2018-05-30 12:34:05.156637922 -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_); }
---- chromium-67.0.3396.87/build/config/compiler/BUILD.gn.orig 2018-06-16 13:57:27.583106343 +0200
-+++ chromium-67.0.3396.87/build/config/compiler/BUILD.gn 2018-06-16 14:24:26.713631391 +0200
-@@ -1325,6 +1325,11 @@
- # comments
- # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61638
- cflags += [ "-Wno-comments" ]
-+
-+ # too many warnings
-+ cflags += [ "-Wno-class-memaccess" ]
-+ cflags += [ "-Wno-packed-not-aligned" ]
-+ cflags += [ "-Wno-int-in-bool-context" ]
- }
- }
+From 122692ccee62223f266a988c575ae687e3f4c056 Mon Sep 17 00:00:00 2001
+From: Wang Qing
+Date: Fri, 18 May 2018 11:20:09 +0000
+Subject: [PATCH] Remove noexcept from file
+ "components/search_provider_logos/logo_common.cc".
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes the build error with the following message:
+
+ ../../components/search_provider_logos/logo_common.cc:17:15: error: function ‘search_provider_logos::LogoMetadata& search_provider_logos::LogoMetadata::operator=(search_provider_logos::LogoMetadata&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’
+ LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) noexcept = default;
+ ^
+ ../../components/search_provider_logos/logo_common.cc:31:1: error: function ‘search_provider_logos::LogoCallbacks::LogoCallbacks(search_provider_logos::LogoCallbacks&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’
+ LogoCallbacks::LogoCallbacks(LogoCallbacks&&) noexcept = default;
+ ^
+ ../../components/search_provider_logos/logo_common.cc:32:16: error: function ‘search_provider_logos::LogoCallbacks& search_provider_logos::LogoCallbacks::operator=(search_provider_logos::LogoCallbacks&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’
+ LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) noexcept = default;
+
+BUG= 844355
+R= bauerb@chromium.org
+
+Change-Id: I084d0d22f8a2cc976f5f8b24a8c623cd38f86876
+Reviewed-on: https://chromium-review.googlesource.com/1065521
+Reviewed-by: Bernhard Bauer
+Commit-Queue: 汪 清
+Cr-Commit-Position: refs/heads/master@{#559859}
+---
+ components/search_provider_logos/logo_common.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/components/search_provider_logos/logo_common.cc b/components/search_provider_logos/logo_common.cc
+index 05aae77a8a8d1..f0d2c674c505d 100644
+--- a/components/search_provider_logos/logo_common.cc
++++ b/components/search_provider_logos/logo_common.cc
+@@ -14,22 +14,22 @@ LogoMetadata::LogoMetadata() = default;
+ LogoMetadata::LogoMetadata(const LogoMetadata&) = default;
+ LogoMetadata::LogoMetadata(LogoMetadata&&) noexcept = default;
+ LogoMetadata& LogoMetadata::operator=(const LogoMetadata&) = default;
+-LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) noexcept = default;
++LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) = default;
+ LogoMetadata::~LogoMetadata() = default;
+
+ EncodedLogo::EncodedLogo() = default;
+ EncodedLogo::EncodedLogo(const EncodedLogo&) = default;
+ EncodedLogo::EncodedLogo(EncodedLogo&&) noexcept = default;
+ EncodedLogo& EncodedLogo::operator=(const EncodedLogo&) = default;
+-EncodedLogo& EncodedLogo::operator=(EncodedLogo&&) noexcept = default;
++EncodedLogo& EncodedLogo::operator=(EncodedLogo&&) = default;
+ EncodedLogo::~EncodedLogo() = default;
+
+ Logo::Logo() = default;
+ Logo::~Logo() = default;
+
+ LogoCallbacks::LogoCallbacks() = default;
+-LogoCallbacks::LogoCallbacks(LogoCallbacks&&) noexcept = default;
+-LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) noexcept = default;
++LogoCallbacks::LogoCallbacks(LogoCallbacks&&) = default;
++LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) = default;
+ LogoCallbacks::~LogoCallbacks() = default;
+ } // namespace search_provider_logos
++++++ chromium-libjpeg.patch ++++++
From c6b0194f7a4d9f494b2d51f46d2c332e2e5f4050 Mon Sep 17 00:00:00 2001
From: Daniel Bratell
Date: Mon, 28 May 2018 13:13:01 +0000
Subject: [PATCH] Use the same libjpeg in all of blink/platform
The normal libjpeg renames some symbols with macros so if its
headers are included together with libjpeg-turbo's headers
in the same translation unit, there will be an inconsistent
renaming of libjpeg symbols. This happened in some extreme
jumbo configuration and resulted in confising linker errors.
This patch changes an include so that jpeglib.h becomes included
the same way everywhere.
Change-Id: I7f122d0919d58371bb40dc0097a766b857b9815e
Reviewed-on: https://chromium-review.googlesource.com/1073423
Reviewed-by: Kentaro Hara
Commit-Queue: Daniel Bratell
Cr-Commit-Position: refs/heads/master@{#562243}
---
.../renderer/platform/image-encoders/image_encoder.cc | 11 +++++++++++
.../renderer/platform/image-encoders/image_encoder.h | 2 --
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
index 0c7f14c7c0e4..4c450f5d6783 100644
--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
@@ -4,6 +4,17 @@
#include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
+#include "build/build_config.h"
+
+#if defined(OS_WIN)
+#include // Included before jpeglib.h because of INT32 clash
+#endif // OS_WIN
+#include // Needed by jpeglib.h
+
+#include "jpeglib.h" // for JPEG_MAX_DIMENSION
+
+#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION
+
namespace blink {
bool ImageEncoder::Encode(Vector<unsigned char>* dst,
diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.h b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
index 0d1460f34827..40306097d507 100644
--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h
+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
@@ -7,8 +7,6 @@
#include "third_party/blink/renderer/platform/platform_export.h"
#include "third_party/blink/renderer/platform/wtf/vector.h"
-#include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION
-#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION
#include "third_party/skia/include/core/SkStream.h"
#include "third_party/skia/include/encode/SkJpegEncoder.h"
#include "third_party/skia/include/encode/SkPngEncoder.h"
--
2.17.1
++++++ chromium-libwebp-shim.patch ++++++
diff --git a/build/linux/unbundle/libwebp.gn b/build/linux/unbundle/libwebp.gn
index ab92adecf400..12574d87be58 100644
--- a/build/linux/unbundle/libwebp.gn
+++ b/build/linux/unbundle/libwebp.gn
@@ -2,12 +2,34 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/linux/pkg_config.gni")
+import("//build/shim_headers.gni")
+
+pkg_config("system_libwebp") {
+ packages = [
+ "libwebp",
+ "libwebpdemux",
+ "libwebpmux",
+ ]
+}
+
+shim_headers("libwebp_shim") {
+ root_path = "src"
+ headers = [
+ "webp/decode.h",
+ "webp/demux.h",
+ "webp/encode.h",
+ "webp/mux.h",
+ "webp/mux_types.h",
+ "webp/types.h",
+ ]
+}
+
source_set("libwebp_webp") {
- libs = [
- "webp",
- "webpdemux",
- "webpmux",
+ deps = [
+ ":libwebp_shim",
]
+ public_configs = [ ":system_libwebp" ]
}
group("libwebp") {
++++++ chromium-master-prefs-path.patch ++++++
--- /var/tmp/diff_new_pack.7v8y6n/_old 2018-07-27 10:57:54.285837478 +0200
+++ /var/tmp/diff_new_pack.7v8y6n/_new 2018-07-27 10:57:54.285837478 +0200
@@ -1,14 +1,14 @@
-Index: a/chromium/src/chrome/browser/first_run/first_run_linux.cc
+Index: chromium-68.0.3423.2/chrome/browser/first_run/first_run_internal_linux.cc
===================================================================
---- a/chrome/browser/first_run/first_run_internal_linux.cc
-+++ b/chrome/browser/first_run/first_run_internal_linux.cc
-@@ -22,8 +22,7 @@
+--- chromium-68.0.3423.2.orig/chrome/browser/first_run/first_run_internal_linux.cc
++++ chromium-68.0.3423.2/chrome/browser/first_run/first_run_internal_linux.cc
+@@ -20,8 +20,7 @@ bool IsOrganicFirstRun() {
base::FilePath MasterPrefsPath() {
// The standard location of the master prefs is next to the chrome binary.
base::FilePath master_prefs;
-- if (!PathService::Get(base::DIR_EXE, &master_prefs))
+- if (!base::PathService::Get(base::DIR_EXE, &master_prefs))
- return base::FilePath();
+ master_prefs = base::FilePath("/etc/chromium");
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
}
-
+
++++++ chromium-non-void-return.patch ++++++
--- /var/tmp/diff_new_pack.7v8y6n/_old 2018-07-27 10:57:54.293837493 +0200
+++ /var/tmp/diff_new_pack.7v8y6n/_new 2018-07-27 10:57:54.297837501 +0200
@@ -11,15 +11,179 @@
}
}
-Index: chromium-67.0.3396.30/chrome/browser/ui/webui/discards/discards_ui.cc
+Index: chromium-68.0.3440.17/cc/input/snap_fling_controller.cc
===================================================================
---- chromium-67.0.3396.30.orig/chrome/browser/ui/webui/discards/discards_ui.cc
-+++ chromium-67.0.3396.30/chrome/browser/ui/webui/discards/discards_ui.cc
-@@ -48,6 +48,7 @@ mojom::LifecycleUnitVisibility GetLifecy
+--- chromium-68.0.3440.17.orig/cc/input/snap_fling_controller.cc
++++ chromium-68.0.3440.17/cc/input/snap_fling_controller.cc
+@@ -26,6 +26,8 @@ bool SnapFlingController::FilterEventFor
+ case GestureScrollType::kEnd: {
+ return state_ == State::kActive || state_ == State::kFinished;
+ }
++ default:
++ return false;
+ }
+ }
+
+Index: chromium-68.0.3440.17/chrome/browser/ui/webui/discards/discards_ui.cc
+===================================================================
+--- chromium-68.0.3440.17.orig/chrome/browser/ui/webui/discards/discards_ui.cc
++++ chromium-68.0.3440.17/chrome/browser/ui/webui/discards/discards_ui.cc
+@@ -44,6 +44,8 @@ mojom::LifecycleUnitVisibility GetLifecy
+ return mojom::LifecycleUnitVisibility::OCCLUDED;
+ case content::Visibility::VISIBLE:
+ return mojom::LifecycleUnitVisibility::VISIBLE;
++ default:
++ return mojom::LifecycleUnitVisibility::VISIBLE;
+ }
+ #if defined(COMPILER_MSVC)
NOTREACHED();
- return mojom::LifecycleUnitVisibility::VISIBLE;
- #endif
-+ return mojom::LifecycleUnitVisibility::VISIBLE;
+Index: chromium-68.0.3440.17/components/autofill/core/browser/autofill_manager.cc
+===================================================================
+--- chromium-68.0.3440.17.orig/components/autofill/core/browser/autofill_manager.cc
++++ chromium-68.0.3440.17/components/autofill/core/browser/autofill_manager.cc
+@@ -303,6 +303,7 @@ PopupType AutofillManager::GetPopupType(
+
+ default:
+ NOTREACHED();
++ return PopupType::kUnspecified;
+ }
+ }
+
+Index: chromium-68.0.3440.17/components/cast_channel/cast_message_util.cc
+===================================================================
+--- chromium-68.0.3440.17.orig/components/cast_channel/cast_message_util.cc
++++ chromium-68.0.3440.17/components/cast_channel/cast_message_util.cc
+@@ -368,6 +368,8 @@ const char* GetAppAvailabilityResultToSt
+ return "unavailable";
+ case GetAppAvailabilityResult::kUnknown:
+ return "unknown";
++ default:
++ return "unknown";
+ }
+ }
+
+Index: chromium-68.0.3440.17/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
+===================================================================
+--- chromium-68.0.3440.17.orig/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
++++ chromium-68.0.3440.17/components/data_reduction_proxy/core/browser/data_reduction_proxy_util.cc
+@@ -329,6 +329,8 @@ PageloadMetrics_ConnectionType ProtoConn
+ return PageloadMetrics_ConnectionType_CONNECTION_NONE;
+ case net::NetworkChangeNotifier::CONNECTION_BLUETOOTH:
+ return PageloadMetrics_ConnectionType_CONNECTION_BLUETOOTH;
++ default:
++ return PageloadMetrics_ConnectionType_CONNECTION_UNKNOWN;
+ }
+ }
+
+Index: chromium-68.0.3440.17/content/browser/cache_storage/cache_storage_quota_client.cc
+===================================================================
+--- chromium-68.0.3440.17.orig/content/browser/cache_storage/cache_storage_quota_client.cc
++++ chromium-68.0.3440.17/content/browser/cache_storage/cache_storage_quota_client.cc
+@@ -98,6 +98,8 @@ storage::QuotaClient::ID CacheStorageQuo
+ return kServiceWorkerCache;
+ case CacheStorageOwner::kBackgroundFetch:
+ return kBackgroundFetch;
++ default:
++ return kBackgroundFetch;
+ }
+ }
+
+Index: chromium-68.0.3440.17/media/capture/video/video_capture_device_descriptor.cc
+===================================================================
+--- chromium-68.0.3440.17.orig/media/capture/video/video_capture_device_descriptor.cc
++++ chromium-68.0.3440.17/media/capture/video/video_capture_device_descriptor.cc
+@@ -92,6 +92,8 @@ const char* VideoCaptureDeviceDescriptor
+ return "Camera API2 Limited";
+ case VideoCaptureApi::UNKNOWN:
+ return "Unknown";
++ default:
++ return "Unknown";
+ }
+ }
+
+Index: chromium-68.0.3440.17/net/nqe/network_quality_estimator.cc
+===================================================================
+--- chromium-68.0.3440.17.orig/net/nqe/network_quality_estimator.cc
++++ chromium-68.0.3440.17/net/nqe/network_quality_estimator.cc
+@@ -1319,6 +1319,8 @@ base::TimeDelta NetworkQualityEstimator:
+ case nqe::internal::OBSERVATION_CATEGORY_COUNT:
+ NOTREACHED();
+ return base::TimeDelta();
++ default:
++ return base::TimeDelta();
+ }
+ }
+
+Index: chromium-68.0.3440.17/services/audio/public/cpp/audio_system_to_service_adapter.cc
+===================================================================
+--- chromium-68.0.3440.17.orig/services/audio/public/cpp/audio_system_to_service_adapter.cc
++++ chromium-68.0.3440.17/services/audio/public/cpp/audio_system_to_service_adapter.cc
+@@ -66,6 +66,8 @@ const char* GetTraceEvent(Action action)
+ return "AudioSystemToServiceAdapter::GetAssociatedOutputDeviceID";
+ case kGetInputDeviceInfo:
+ return "AudioSystemToServiceAdapter::GetInputDeviceInfo";
++ default:
++ return "Unknown";
+ }
+ NOTREACHED();
+ }
+Index: chromium-68.0.3440.17/services/network/cross_origin_read_blocking.cc
+===================================================================
+--- chromium-68.0.3440.17.orig/services/network/cross_origin_read_blocking.cc
++++ chromium-68.0.3440.17/services/network/cross_origin_read_blocking.cc
+@@ -786,6 +786,8 @@ bool CrossOriginReadBlocking::ResponseAn
+ return sniffers_.empty() && !found_blockable_content_;
+ case kBlock:
+ return false;
++ default:
++ return true;
+ }
+ }
+
+@@ -797,6 +799,8 @@ bool CrossOriginReadBlocking::ResponseAn
+ return sniffers_.empty() && found_blockable_content_;
+ case kBlock:
+ return true;
++ default:
++ return false;
+ }
+ }
+
+Index: chromium-68.0.3440.17/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
+===================================================================
+--- chromium-68.0.3440.17.orig/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
++++ chromium-68.0.3440.17/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
+@@ -1139,6 +1139,8 @@ AXTextPosition AXLayoutObject::GetTextPo
+ return kAXTextPositionSubscript;
+ case EVerticalAlign::kSuper:
+ return kAXTextPositionSuperscript;
++ default:
++ return AXNodeObject::GetTextPosition();
+ }
+ }
+
+Index: chromium-68.0.3440.17/third_party/blink/renderer/modules/webaudio/audio_param.cc
+===================================================================
+--- chromium-68.0.3440.17.orig/third_party/blink/renderer/modules/webaudio/audio_param.cc
++++ chromium-68.0.3440.17/third_party/blink/renderer/modules/webaudio/audio_param.cc
+@@ -144,6 +144,7 @@ String AudioParamHandler::GetParamName()
+ return custom_param_name_;
+ default:
+ NOTREACHED();
++ return "Unknown";
+ }
+ }
+
+Index: chromium-68.0.3440.17/ui/accessibility/platform/ax_platform_node_auralinux.cc
+===================================================================
+--- chromium-68.0.3440.17.orig/ui/accessibility/platform/ax_platform_node_auralinux.cc
++++ chromium-68.0.3440.17/ui/accessibility/platform/ax_platform_node_auralinux.cc
+@@ -1288,6 +1288,8 @@ AtkRole AXPlatformNodeAuraLinux::GetAtkR
+ case ax::mojom::Role::kPresentational:
+ case ax::mojom::Role::kUnknown:
+ return ATK_ROLE_REDUNDANT_OBJECT;
++ default:
++ return ATK_ROLE_REDUNDANT_OBJECT;
+ }
}
- class DiscardsDetailsProviderImpl : public mojom::DiscardsDetailsProvider {
++++++ chromium-vaapi.patch ++++++
++++ 645 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/chromium/chromium-vaapi.patch
++++ and /work/SRC/openSUSE:Factory/.chromium.new/chromium-vaapi.patch
++++++ chromium-vpx-aarch64.patch ++++++
From bc30e6e39c8bde9a31e1c314e6d1003ff47f2f7f Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa
Date: Fri, 13 Jul 2018 14:29:09 +0200
Subject: [PATCH] vpx_sum_squares_2d_i16_neon(): Make |s2| a uint64x1_t.
=> PATCH EDITED BY GUILLAUME TO MATCH CHROMIUM PATH
This fixes the build with at least GCC 7.3, where it was previously failing
with:
sum_squares_neon.c: In function 'vpx_sum_squares_2d_i16_neon':
sum_squares_neon.c: note: use -flax-vector-conversions to permit conversions between vectors with differing element types or numbers of subparts
s2 = vpaddl_u32(s1);
^~
sum_squares_neon.c: incompatible types when assigning to type 'int64x1_t' from type 'uint64x1_t'
s2 = vpaddl_u32(s1);
^
sum_squares_neon.c: incompatible types when assigning to type 'int64x1_t' from type 'uint64x1_t'
s2 = vadd_u64(vget_low_u64(s1), vget_high_u64(s1));
^
sum_squares_neon.c: incompatible type for argument 1 of 'vget_lane_u64'
return vget_lane_u64(s2, 0);
^~
The generated assembly was verified to remain identical with both GCC and
LLVM.
Bug: chromium:819249
Change-Id: I2778428ee1fee0a674d0d4910347c2a717de21ac
---
vpx_dsp/arm/sum_squares_neon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c b/third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c
index 8942ba83bc..cfefad9938 100644
--- a/third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c
+++ b/third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c
@@ -14,7 +14,7 @@
#include "./vpx_dsp_rtcd.h"
uint64_t vpx_sum_squares_2d_i16_neon(const int16_t *src, int stride, int size) {
- int64x1_t s2;
+ uint64x1_t s2;
if (size == 4) {
int16x4_t s[4];