Hello community,
here is the log from the commit of package chromium for openSUSE:Factory
checked in at 2019-03-14 14:59:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Thu Mar 14 14:59:00 2019 rev:213 rq:684661 version:73.0.3683.75
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2019-03-05
12:21:40.196908254 +0100
+++ /work/SRC/openSUSE:Factory/.chromium.new.28833/chromium.changes
2019-03-14 15:00:34.375704710 +0100
@@ -1,0 +2,35 @@
+Wed Mar 13 10:19:38 UTC 2019 - Tomáš Chvátal <tchva...@suse.com>
+
+- Update to 73.0.3683.75 bsc#1129059:
+ * CVE-2019-5787: Use after free in Canvas.
+ * CVE-2019-5788: Use after free in FileAPI.
+ * CVE-2019-5789: Use after free in WebMIDI.
+ * CVE-2019-5790: Heap buffer overflow in V8.
+ * CVE-2019-5791: Type confusion in V8.
+ * CVE-2019-5792: Integer overflow in PDFium.
+ * CVE-2019-5793: Excessive permissions for private API in Extensions.
+ * CVE-2019-5794: Security UI spoofing.
+ * CVE-2019-5795: Integer overflow in PDFium.
+ * CVE-2019-5796: Race condition in Extensions.
+ * CVE-2019-5797: Race condition in DOMStorage.
+ * CVE-2019-5798: Out of bounds read in Skia.
+ * CVE-2019-5799: CSP bypass with blob URL.
+ * CVE-2019-5800: CSP bypass with blob URL.
+ * CVE-2019-5801: Incorrect Omnibox display on iOS.
+ * CVE-2019-5802: Security UI spoofing.
+ * CVE-2019-5803: CSP bypass with Javascript URLs'.
+ * CVE-2019-5804: Command line command injection on Windows.
+- Update patches:
+ * chromium-buildname.patch
+ * chromium-non-void-return.patch
+ * chromium-old-glibc.patch
+ * chromium-old-libva.patch
+ * chromium-vaapi.patch
+- Removed patches:
+ * chromium-crashpad-fix_aarch64.patch
+ * chromium-webrtc-includes.patch
+- Added patches:
+ * chromium-gcc.patch
+ * chromium-fix_crashpad.patch
+
+-------------------------------------------------------------------
Old:
----
chromium-72.0.3626.121.tar.xz
chromium-crashpad-fix_aarch64.patch
chromium-webrtc-includes.patch
New:
----
chromium-73.0.3683.75.tar.xz
chromium-fix_crashpad.patch
chromium-gcc.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.le1Pvi/_old 2019-03-14 15:00:48.923701847 +0100
+++ /var/tmp/diff_new_pack.le1Pvi/_new 2019-03-14 15:00:48.927701846 +0100
@@ -25,24 +25,28 @@
%else
%bcond_without sle_bundles
%endif
-%if 0%{?suse_version} > 1500
-%bcond_without system_libxml
+%if 0%{?suse_version} >= 1550
%bcond_without system_icu
-%bcond_with system_harfbuzz
%else
%bcond_with system_icu
+%endif
+%if 0%{?suse_version} >= 1500
+%bcond_without system_libxml
+%bcond_with system_harfbuzz
+%else
%bcond_with system_libxml
%bcond_with system_harfbuzz
%endif
-%ifarch %arm aarch64
+%ifarch %{arm} aarch64
%bcond_with swiftshader
%else
%bcond_without swiftshader
%endif
%bcond_with system_vpx
%bcond_with clang
+%bcond_with wayland
Name: chromium
-Version: 72.0.3626.121
+Version: 73.0.3683.75
Release: 0
Summary: Google's open source browser project
License: BSD-3-Clause AND LGPL-2.1-or-later
@@ -78,8 +82,9 @@
Patch13: chromium-old-libva.patch
# GCC does not support -Wno-error=header-hygiene flag
Patch14: chromium-fix_swiftshader.patch
-Patch15: chromium-webrtc-includes.patch
-Patch16: chromium-crashpad-fix_aarch64.patch
+Patch15: chromium-gcc.patch
+# Patch-FIX-UPSTREAM
https://chromium-review.googlesource.com/c/crashpad/crashpad/+/1454376
+Patch16: chromium-fix_crashpad.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/patches
@@ -103,12 +108,10 @@
BuildRequires: hicolor-icon-theme
BuildRequires: libcap-devel
BuildRequires: libdc1394
-BuildRequires: libelf-devel
BuildRequires: libgcrypt-devel
BuildRequires: libgsm-devel
BuildRequires: libjpeg-devel >= 8.1
BuildRequires: libpng-devel
-BuildRequires: libva-devel
BuildRequires: memory-constraints
BuildRequires: ncurses-devel
BuildRequires: ninja >= 1.7.2
@@ -116,7 +119,6 @@
BuildRequires: pam-devel
BuildRequires: pkgconfig
BuildRequires: python
-BuildRequires: re2-devel
BuildRequires: snappy-devel
BuildRequires: update-desktop-files
BuildRequires: util-linux
@@ -148,6 +150,7 @@
BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(libdc1394-2)
BuildRequires: pkgconfig(libdrm)
+BuildRequires: pkgconfig(libelf)
BuildRequires: pkgconfig(libevent)
BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libffi)
@@ -165,6 +168,7 @@
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(python)
+BuildRequires: pkgconfig(re2)
BuildRequires: pkgconfig(schroedinger-1.0)
BuildRequires: pkgconfig(slang)
BuildRequires: pkgconfig(sqlite3)
@@ -204,6 +208,15 @@
Obsoletes: chromium-ffmpegsumo
# no 32bit supported and it takes ages to build
ExcludeArch: %{ix86} %{arm} ppc ppc64 ppc64le s390 s390x
+%if %{with wayland}
+BuildRequires: pkgconfig(gbm)
+BuildRequires: pkgconfig(wayland-client)
+BuildRequires: pkgconfig(wayland-cursor)
+BuildRequires: pkgconfig(wayland-scanner)
+BuildRequires: pkgconfig(wayland-server)
+%else
+BuildRequires: pkgconfig(libva)
+%endif
%ifnarch aarch64
# Current tcmalloc does not support AArch64
BuildRequires: pkgconfig(libtcmalloc)
@@ -224,7 +237,7 @@
BuildRequires: pkgconfig(zlib)
%endif
%if %{with system_icu}
-BuildRequires: pkgconfig(icu-i18n) >= 62.0
+BuildRequires: pkgconfig(icu-i18n) >= 63.0
%endif
%if %{with system_vpx}
BuildRequires: pkgconfig(vpx) >= 1.6.1
@@ -232,12 +245,12 @@
%if %{with clang}
BuildRequires: clang >= 5.0.0
%else
-%if %{?suse_version} >= 1330
-BuildRequires: gcc >= 7
-BuildRequires: gcc-c++ >= 7
+%if %{?suse_version} > 1500
+BuildRequires: gcc >= 8
+BuildRequires: gcc-c++ >= 8
%else
-BuildRequires: gcc7
-BuildRequires: gcc7-c++
+BuildRequires: gcc8
+BuildRequires: gcc8-c++
%endif
%endif
@@ -281,11 +294,9 @@
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
net/third_party/uri_template
third_party/abseil-cpp
third_party/angle
@@ -367,7 +378,6 @@
third_party/metrics_proto
third_party/minigbm
third_party/modp_b64
- third_party/nasm
third_party/node
third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
third_party/openh264
@@ -399,6 +409,7 @@
third_party/skia/third_party/gif
third_party/skia/third_party/skcms
third_party/skia/third_party/vulkan
+ third_party/skia/include/third_party/vulkan/
third_party/smhasher
third_party/spirv-headers
third_party/SPIRV-Tools
@@ -427,6 +438,7 @@
third_party/woff2
third_party/zlib/google
url/third_party/mozilla
+ v8/src/third_party/siphash
v8/src/third_party/valgrind
v8/src/third_party/utf8-decoder
v8/third_party/inspector_protocol
@@ -487,9 +499,9 @@
export CXXFLAGS="${ARCH_FLAGS} -fpermissive"
export CC=gcc
export CXX=g++
-%if 0%{?suse_version} < 1330
-export CC=gcc-7
-export CXX=g++-7
+%if 0%{?suse_version} <= 1500
+export CC=gcc-8
+export CXX=g++-8
# some still call gcc/g++
mkdir -p "$HOME/bin/"
ln -sfn %{_bindir}/$CC $HOME/bin/gcc
@@ -498,7 +510,7 @@
%endif
%endif
# do not eat all memory
-%limit_build -m 2100
+%limit_build -m 2500
# Set system libraries to be used
gn_system_libraries=(
@@ -553,7 +565,7 @@
myconf_gn+=" use_cups=true"
myconf_gn+=" use_aura=true"
myconf_gn+=" use_jumbo_build=true"
-%ifarch %arm aarch64
+%ifarch %{arm} aarch64
# Limit number to avoid OOM errors
myconf_gn+=" jumbo_file_merge_limit=5"
%else
@@ -592,7 +604,11 @@
myconf_gn+=" enable_vulkan=true"
myconf_gn+=" enable_hevc_demuxing=true"
# ozone stuff
-myconf_gn+=" use_ozone=false use_xkbcommon=false"
+%if %{with wayland}
+myconf_gn+=" use_ozone=true use_xkbcommon=true use_system_minigbm=true
use_v4lplugin=true use_v4l2_codec=true use_linux_v4l2_only=true"
+%else
+myconf_gn+=" use_vaapi=true"
+%endif
myconf_gn+=" enable_mus=true"
%if %{with clang}
myconf_gn+=" is_clang=true clang_base_path=\"/usr\"
clang_use_chrome_plugins=false"
@@ -620,7 +636,7 @@
myconf_gn+=" arm_use_thumb=true"
%endif
-%ifarch %arm
+%ifarch %{arm}
# We don't need to cross compile while building on an arm system.
sed -i 's|arm-linux-gnu-||g' build/toolchain/linux/BUILD.gn
sed -i 's|arm-linux-gnueabihf-||g' build/toolchain/linux/BUILD.gn
++++++ chromium-72.0.3626.121.tar.xz -> chromium-73.0.3683.75.tar.xz ++++++
/work/SRC/openSUSE:Factory/chromium/chromium-72.0.3626.121.tar.xz
/work/SRC/openSUSE:Factory/.chromium.new.28833/chromium-73.0.3683.75.tar.xz
differ: char 25, line 1
++++++ chromium-buildname.patch ++++++
--- /var/tmp/diff_new_pack.le1Pvi/_old 2019-03-14 15:00:49.015701828 +0100
+++ /var/tmp/diff_new_pack.le1Pvi/_new 2019-03-14 15:00:49.015701828 +0100
@@ -1,5 +1,7 @@
---- chromium-60.0.3112.20.old/components/version_ui_strings.grdp
2017-06-08 16:55:00.495103433 +0200
-+++ chromium-60.0.3112.20/components/version_ui_strings.grdp 2017-06-08
16:55:36.027102220 +0200
+Index: chromium-73.0.3683.27/components/version_ui_strings.grdp
+===================================================================
+--- chromium-73.0.3683.27.orig/components/version_ui_strings.grdp
++++ chromium-73.0.3683.27/components/version_ui_strings.grdp
@@ -7,7 +7,7 @@
Official Build
</message>
++++++ chromium-fix_crashpad.patch ++++++
diff --git a/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
b/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
index 6ba52a8..8464a5a 100644
--- a/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
+++ b/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
@@ -17,6 +17,8 @@
#include <stddef.h>
#include <string.h>
+#include <limits>
+
#include "base/logging.h"
namespace crashpad {
++++++ chromium-gcc.patch ++++++
>From 2c3b57cafbbb38c13a519c9d2fda8b65691d9564 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
Date: Thu, 7 Feb 2019 22:55:37 +0000
Subject: [PATCH] allocator shim: Swap ALIGN_LINKAGE and SHIM_ALWAYS_EXPORT's
positions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This fixes the GCC build. GCC seems to be stricter with the position of the
linkage specification, so just swap the terms to prevent an error that looks
like:
In file included from ../../base/allocator/allocator_shim.cc:333:
../../base/allocator/allocator_shim_override_cpp_symbols.h:39:30: error:
expected unqualified-id before string constant
#define ALIGN_LINKAGE extern "C"
^~~
../../base/allocator/allocator_shim_override_cpp_symbols.h:99:20: note: in
expansion of macro ‘ALIGN_LINKAGE’
SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW(std::size_t size,
^~~~~~~~~~~~~
Bug: 819294
Change-Id: I0aa16ea88cead42e83796a1c86afad8b447ddc50
Reviewed-on: https://chromium-review.googlesource.com/c/1458256
Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
Reviewed-by: Thomas Anderson <thomasander...@chromium.org>
Reviewed-by: Primiano Tucci <primi...@chromium.org>
Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
Cr-Commit-Position: refs/heads/master@{#630084}
---
.../allocator_shim_override_cpp_symbols.h | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
Index:
chromium-73.0.3683.75/base/allocator/allocator_shim_override_cpp_symbols.h
===================================================================
---
chromium-73.0.3683.75.orig/base/allocator/allocator_shim_override_cpp_symbols.h
+++ chromium-73.0.3683.75/base/allocator/allocator_shim_override_cpp_symbols.h
@@ -96,57 +96,57 @@ SHIM_ALWAYS_EXPORT void operator delete[
ShimCppDelete(p);
}
-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW(std::size_t size,
+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW(std::size_t size,
ALIGN_VAL_T alignment) {
return ShimCppAlignedNew(size, static_cast<size_t>(alignment));
}
-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_NOTHROW(
+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_NOTHROW(
std::size_t size,
ALIGN_VAL_T alignment,
const std::nothrow_t&) __THROW {
return ShimCppAlignedNew(size, static_cast<size_t>(alignment));
}
-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL(void* p, ALIGN_VAL_T) __THROW {
+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL(void* p, ALIGN_VAL_T) __THROW {
ShimCppDelete(p);
}
-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_SIZED(void* p,
+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_SIZED(void* p,
std::size_t size,
ALIGN_VAL_T) __THROW {
ShimCppDelete(p);
}
-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void
+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void
ALIGN_DEL_NOTHROW(void* p, ALIGN_VAL_T, const std::nothrow_t&) __THROW {
ShimCppDelete(p);
}
-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_ARR(std::size_t size,
+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_ARR(std::size_t size,
ALIGN_VAL_T alignment) {
return ShimCppAlignedNew(size, static_cast<size_t>(alignment));
}
-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_ARR_NOTHROW(
+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_ARR_NOTHROW(
std::size_t size,
ALIGN_VAL_T alignment,
const std::nothrow_t&) __THROW {
return ShimCppAlignedNew(size, static_cast<size_t>(alignment));
}
-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_ARR(void* p,
+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_ARR(void* p,
ALIGN_VAL_T) __THROW {
ShimCppDelete(p);
}
-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_ARR_SIZED(void* p,
+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_ARR_SIZED(void* p,
std::size_t size,
ALIGN_VAL_T) __THROW
{
ShimCppDelete(p);
}
-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void
+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void
ALIGN_DEL_ARR_NOTHROW(void* p, ALIGN_VAL_T, const std::nothrow_t&) __THROW {
ShimCppDelete(p);
}
Index: chromium-73.0.3683.75/media/learning/common/labelled_example.cc
===================================================================
--- chromium-73.0.3683.75.orig/media/learning/common/labelled_example.cc
+++ chromium-73.0.3683.75/media/learning/common/labelled_example.cc
@@ -59,7 +59,8 @@ bool LabelledExample::operator<(const La
LabelledExample& LabelledExample::operator=(const LabelledExample& rhs) =
default;
-LabelledExample& LabelledExample::operator=(LabelledExample&& rhs) = default;
+LabelledExample& LabelledExample::operator=(LabelledExample&& rhs) noexcept =
+ default;
TrainingData::TrainingData() = default;
Index: chromium-73.0.3683.75/media/learning/common/labelled_example.h
===================================================================
--- chromium-73.0.3683.75.orig/media/learning/common/labelled_example.h
+++ chromium-73.0.3683.75/media/learning/common/labelled_example.h
@@ -40,7 +40,7 @@ struct COMPONENT_EXPORT(LEARNING_COMMON)
bool operator<(const LabelledExample& rhs) const;
LabelledExample& operator=(const LabelledExample& rhs);
- LabelledExample& operator=(LabelledExample&& rhs);
+ LabelledExample& operator=(LabelledExample&& rhs) noexcept;
// Observed feature values.
// Note that to interpret these values, you probably need to have the
Index: chromium-73.0.3683.75/media/learning/common/value.cc
===================================================================
--- chromium-73.0.3683.75.orig/media/learning/common/value.cc
+++ chromium-73.0.3683.75/media/learning/common/value.cc
@@ -23,6 +23,12 @@ Value::Value(const std::string& x) : val
Value::Value(const Value& other) : value_(other.value_) {}
+Value::Value(Value&& rhs) noexcept = default;
+
+Value& Value::operator=(const Value& rhs) = default;
+
+Value& Value::operator=(Value&& rhs) noexcept = default;
+
bool Value::operator==(const Value& rhs) const {
return value_ == rhs.value_;
}
Index: chromium-73.0.3683.75/media/learning/common/value.h
===================================================================
--- chromium-73.0.3683.75.orig/media/learning/common/value.h
+++ chromium-73.0.3683.75/media/learning/common/value.h
@@ -38,6 +38,10 @@ class COMPONENT_EXPORT(LEARNING_COMMON)
explicit Value(const std::string& x);
Value(const Value& other);
+ Value(Value&&) noexcept;
+
+ Value& operator=(const Value&);
+ Value& operator=(Value&&) noexcept;
bool operator==(const Value& rhs) const;
bool operator!=(const Value& rhs) const;
Index: chromium-73.0.3683.75/ui/gfx/color_utils.cc
===================================================================
--- chromium-73.0.3683.75.orig/ui/gfx/color_utils.cc
+++ chromium-73.0.3683.75/ui/gfx/color_utils.cc
@@ -431,7 +431,7 @@ SkColor SetDarkestColorForTesting(SkColo
// GetContrastRatio(kWhiteLuminance, g_luminance_midpoint). The formula
below
// can be verified by plugging it into how GetContrastRatio() operates.
g_luminance_midpoint =
- std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f;
+ std::sqrt((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f;
return previous_darkest_color;
}
Index:
chromium-73.0.3683.75/net/third_party/quic/platform/impl/quic_flags_impl.cc
===================================================================
---
chromium-73.0.3683.75.orig/net/third_party/quic/platform/impl/quic_flags_impl.cc
+++ chromium-73.0.3683.75/net/third_party/quic/platform/impl/quic_flags_impl.cc
@@ -5,6 +5,7 @@
#include "net/third_party/quic/platform/impl/quic_flags_impl.h"
#include <algorithm>
+#include <initializer_list>
#include <iostream>
#include <set>
@@ -153,9 +154,9 @@ std::string QuicFlagRegistry::GetHelp()
template <>
bool TypedQuicFlagHelper<bool>::SetFlag(const std::string& s) const {
static const base::NoDestructor<std::set<std::string>> kTrueValues(
- {"", "1", "t", "true", "y", "yes"});
+ std::initializer_list<std::string>({"", "1", "t", "true", "y", "yes"}));
static const base::NoDestructor<std::set<std::string>> kFalseValues(
- {"0", "f", "false", "n", "no"});
+ std::initializer_list<std::string>({"0", "f", "false", "n", "no"}));
if (kTrueValues->find(base::ToLowerASCII(s)) != kTrueValues->end()) {
*flag_ = true;
return true;
Index:
chromium-73.0.3683.75/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
===================================================================
---
chromium-73.0.3683.75.orig/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++
chromium-73.0.3683.75/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -1769,12 +1769,12 @@ void BaseRenderingContext2D::putImageDat
CanvasColorParams(ColorParams().ColorSpace(), PixelFormat(), kNonOpaque);
if (data_color_params.NeedsColorConversion(context_color_params) ||
PixelFormat() == kF16CanvasPixelFormat) {
- base::CheckedNumeric<size_t> data_length = data->Size().Area();
- data_length *= context_color_params.BytesPerPixel();
- if (!data_length.IsValid())
+ size_t data_length;
+ if (!base::CheckMul(data->Size().Area(),
+ context_color_params.BytesPerPixel())
+ .AssignIfValid(&data_length))
return;
- std::unique_ptr<uint8_t[]> converted_pixels(
- new uint8_t[data_length.ValueOrDie()]);
+ std::unique_ptr<uint8_t[]> converted_pixels(new uint8_t[data_length]);
if (data->ImageDataInCanvasColorSettings(
ColorParams().ColorSpace(), PixelFormat(), converted_pixels.get(),
kRGBAColorType)) {
Index:
chromium-73.0.3683.75/chrome/browser/media/router/providers/cast/cast_activity_manager.cc
===================================================================
---
chromium-73.0.3683.75.orig/chrome/browser/media/router/providers/cast/cast_activity_manager.cc
+++
chromium-73.0.3683.75/chrome/browser/media/router/providers/cast/cast_activity_manager.cc
@@ -803,7 +803,7 @@ CastActivityManager::DoLaunchSessionPara
callback(std::move(callback)) {}
CastActivityManager::DoLaunchSessionParams::DoLaunchSessionParams(
- DoLaunchSessionParams&& other) noexcept = default;
+ DoLaunchSessionParams&& other) = default;
CastActivityManager::DoLaunchSessionParams::~DoLaunchSessionParams() = default;
Index:
chromium-73.0.3683.75/chrome/browser/media/router/providers/cast/cast_activity_manager.h
===================================================================
---
chromium-73.0.3683.75.orig/chrome/browser/media/router/providers/cast/cast_activity_manager.h
+++
chromium-73.0.3683.75/chrome/browser/media/router/providers/cast/cast_activity_manager.h
@@ -295,7 +295,7 @@ class CastActivityManager : public cast_
const url::Origin& origin,
int tab_id,
mojom::MediaRouteProvider::CreateRouteCallback callback);
- DoLaunchSessionParams(DoLaunchSessionParams&& other) noexcept;
+ DoLaunchSessionParams(DoLaunchSessionParams&& other);
~DoLaunchSessionParams();
DoLaunchSessionParams& operator=(DoLaunchSessionParams&&) = delete;
Index:
chromium-73.0.3683.75/chrome/browser/ui/views/extensions/extension_popup.cc
===================================================================
---
chromium-73.0.3683.75.orig/chrome/browser/ui/views/extensions/extension_popup.cc
+++ chromium-73.0.3683.75/chrome/browser/ui/views/extensions/extension_popup.cc
@@ -8,7 +8,6 @@
#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/extensions/extension_view_host.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h"
Index:
chromium-73.0.3683.75/chrome/browser/ui/views/extensions/extension_popup.h
===================================================================
---
chromium-73.0.3683.75.orig/chrome/browser/ui/views/extensions/extension_popup.h
+++ chromium-73.0.3683.75/chrome/browser/ui/views/extensions/extension_popup.h
@@ -9,6 +9,7 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/scoped_observer.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#include "chrome/browser/ui/views/extensions/extension_view_views.h"
#include "content/public/browser/devtools_agent_host_observer.h"
Index:
chromium-73.0.3683.75/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h
===================================================================
---
chromium-73.0.3683.75.orig/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h
+++
chromium-73.0.3683.75/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h
@@ -8,6 +8,7 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observer.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
#include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h"
#include "chrome/browser/ui/views/toolbar/app_menu_observer.h"
#include "ui/views/controls/scroll_view.h"
@@ -15,7 +16,6 @@
class AppMenu;
class Browser;
class BrowserActionsContainer;
-class ToolbarActionsBar;
namespace views {
class MenuItemView;
Index: chromium-73.0.3683.75/content/public/browser/desktop_media_id.h
===================================================================
--- chromium-73.0.3683.75.orig/content/public/browser/desktop_media_id.h
+++ chromium-73.0.3683.75/content/public/browser/desktop_media_id.h
@@ -41,16 +41,16 @@ struct CONTENT_EXPORT DesktopMediaID {
static aura::Window* GetAuraWindowById(const DesktopMediaID& id);
#endif // defined(USE_AURA)
- constexpr DesktopMediaID() = default;
+ DesktopMediaID() = default;
- constexpr DesktopMediaID(Type type, Id id) : type(type), id(id) {}
+ DesktopMediaID(Type type, Id id) : type(type), id(id) {}
- constexpr DesktopMediaID(Type type,
+ DesktopMediaID(Type type,
Id id,
WebContentsMediaCaptureId web_contents_id)
: type(type), id(id), web_contents_id(web_contents_id) {}
- constexpr DesktopMediaID(Type type, Id id, bool audio_share)
+ DesktopMediaID(Type type, Id id, bool audio_share)
: type(type), id(id), audio_share(audio_share) {}
// Operators so that DesktopMediaID can be used with STL containers.
Index:
chromium-73.0.3683.75/extensions/browser/api/declarative_webrequest/webrequest_action.cc
===================================================================
---
chromium-73.0.3683.75.orig/extensions/browser/api/declarative_webrequest/webrequest_action.cc
+++
chromium-73.0.3683.75/extensions/browser/api/declarative_webrequest/webrequest_action.cc
@@ -578,7 +578,7 @@ base::Optional<EventResponseDelta> WebRe
CHECK(request_data.stage & stages());
EventResponseDelta result(extension_id, extension_install_time);
result.cancel = true;
- return result;
+ return base::make_optional(std::move(result));
}
//
@@ -613,7 +613,7 @@ base::Optional<EventResponseDelta> WebRe
return base::nullopt;
EventResponseDelta result(extension_id, extension_install_time);
result.new_url = redirect_url_;
- return result;
+ return base::make_optional(std::move(result));
}
//
@@ -642,7 +642,7 @@ WebRequestRedirectToTransparentImageActi
CHECK(request_data.stage & stages());
EventResponseDelta result(extension_id, extension_install_time);
result.new_url = GURL(kTransparentImageUrl);
- return result;
+ return base::make_optional(std::move(result));
}
//
@@ -671,7 +671,7 @@ WebRequestRedirectToEmptyDocumentAction:
CHECK(request_data.stage & stages());
EventResponseDelta result(extension_id, extension_install_time);
result.new_url = GURL(kEmptyDocumentUrl);
- return result;
+ return base::make_optional(std::move(result));
}
//
@@ -773,7 +773,7 @@ base::Optional<EventResponseDelta> WebRe
EventResponseDelta result(extension_id, extension_install_time);
result.new_url = GURL(new_url);
- return result;
+ return base::make_optional(std::move(result));
}
//
@@ -813,7 +813,7 @@ WebRequestSetRequestHeaderAction::Create
CHECK(request_data.stage & stages());
EventResponseDelta result(extension_id, extension_install_time);
result.modified_request_headers.SetHeader(name_, value_);
- return result;
+ return base::make_optional(std::move(result));
}
//
@@ -851,7 +851,7 @@ WebRequestRemoveRequestHeaderAction::Cre
CHECK(request_data.stage & stages());
EventResponseDelta result(extension_id, extension_install_time);
result.deleted_request_headers.push_back(name_);
- return result;
+ return base::make_optional(std::move(result));
}
//
@@ -900,7 +900,7 @@ WebRequestAddResponseHeaderAction::Creat
EventResponseDelta result(extension_id, extension_install_time);
result.added_response_headers.push_back(make_pair(name_, value_));
- return result;
+ return base::make_optional(std::move(result));
}
//
@@ -954,7 +954,7 @@ WebRequestRemoveResponseHeaderAction::Cr
continue;
result.deleted_response_headers.push_back(make_pair(name_, current_value));
}
- return result;
+ return base::make_optional(std::move(result));
}
//
@@ -1039,7 +1039,7 @@ base::Optional<EventResponseDelta> WebRe
EventResponseDelta result(extension_id, extension_install_time);
result.request_cookie_modifications.push_back(
request_cookie_modification_.Clone());
- return result;
+ return base::make_optional(std::move(result));
}
//
@@ -1087,7 +1087,7 @@ base::Optional<EventResponseDelta> WebRe
EventResponseDelta result(extension_id, extension_install_time);
result.response_cookie_modifications.push_back(
response_cookie_modification_.Clone());
- return result;
+ return base::make_optional(std::move(result));
}
//
@@ -1127,7 +1127,7 @@ WebRequestSendMessageToExtensionAction::
CHECK(request_data.stage & stages());
EventResponseDelta result(extension_id, extension_install_time);
result.messages_to_extension.insert(message_);
- return result;
+ return base::make_optional(std::move(result));
}
} // namespace extensions
++++++ chromium-non-void-return.patch ++++++
++++ 2188 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/chromium/chromium-non-void-return.patch
++++ and
/work/SRC/openSUSE:Factory/.chromium.new.28833/chromium-non-void-return.patch
++++++ chromium-old-glibc.patch ++++++
--- /var/tmp/diff_new_pack.le1Pvi/_old 2019-03-14 15:00:49.063701819 +0100
+++ /var/tmp/diff_new_pack.le1Pvi/_new 2019-03-14 15:00:49.063701819 +0100
@@ -1,8 +1,8 @@
-Index: chromium-70.0.3538.67/gpu/config/gpu_info.cc
+Index: chromium-73.0.3673.0/gpu/config/gpu_info.cc
===================================================================
---- chromium-70.0.3538.67.orig/gpu/config/gpu_info.cc
-+++ chromium-70.0.3538.67/gpu/config/gpu_info.cc
-@@ -98,15 +98,15 @@ GPUInfo::GPUDevice::GPUDevice()
+--- chromium-73.0.3673.0.orig/gpu/config/gpu_info.cc
++++ chromium-73.0.3673.0/gpu/config/gpu_info.cc
+@@ -112,15 +112,15 @@ GPUInfo::GPUDevice::GPUDevice()
GPUInfo::GPUDevice::GPUDevice(const GPUInfo::GPUDevice& other) = default;
@@ -21,10 +21,10 @@
GPUInfo::GPUInfo()
: optimus(false),
-Index: chromium-70.0.3538.67/components/policy/core/common/policy_map.cc
+Index: chromium-73.0.3673.0/components/policy/core/common/policy_map.cc
===================================================================
---- chromium-70.0.3538.67.orig/components/policy/core/common/policy_map.cc
-+++ chromium-70.0.3538.67/components/policy/core/common/policy_map.cc
+--- chromium-73.0.3673.0.orig/components/policy/core/common/policy_map.cc
++++ chromium-73.0.3673.0/components/policy/core/common/policy_map.cc
@@ -17,8 +17,8 @@ PolicyMap::Entry::Entry() = default;
PolicyMap::Entry::~Entry() = default;
@@ -36,10 +36,10 @@
PolicyMap::Entry PolicyMap::Entry::DeepCopy() const {
Entry copy;
-Index: chromium-70.0.3538.67/components/search_provider_logos/logo_common.cc
+Index: chromium-73.0.3673.0/components/search_provider_logos/logo_common.cc
===================================================================
---- chromium-70.0.3538.67.orig/components/search_provider_logos/logo_common.cc
-+++ chromium-70.0.3538.67/components/search_provider_logos/logo_common.cc
+--- chromium-73.0.3673.0.orig/components/search_provider_logos/logo_common.cc
++++ chromium-73.0.3673.0/components/search_provider_logos/logo_common.cc
@@ -12,24 +12,24 @@ const int64_t kMaxTimeToLiveMS = INT64_C
LogoMetadata::LogoMetadata() = default;
@@ -71,10 +71,10 @@
LogoCallbacks::~LogoCallbacks() = default;
} // namespace search_provider_logos
-Index: chromium-70.0.3538.67/components/signin/core/browser/account_info.cc
+Index: chromium-73.0.3673.0/components/signin/core/browser/account_info.cc
===================================================================
---- chromium-70.0.3538.67.orig/components/signin/core/browser/account_info.cc
-+++ chromium-70.0.3538.67/components/signin/core/browser/account_info.cc
+--- chromium-73.0.3673.0.orig/components/signin/core/browser/account_info.cc
++++ chromium-73.0.3673.0/components/signin/core/browser/account_info.cc
@@ -28,11 +28,11 @@ AccountInfo::~AccountInfo() = default;
AccountInfo::AccountInfo(const AccountInfo& other) = default;
@@ -89,10 +89,10 @@
bool AccountInfo::IsEmpty() const {
return account_id.empty() && email.empty() && gaia.empty() &&
-Index: chromium-70.0.3538.67/chrome/common/media_router/media_sink.cc
+Index: chromium-73.0.3673.0/chrome/common/media_router/media_sink.cc
===================================================================
---- chromium-70.0.3538.67.orig/chrome/common/media_router/media_sink.cc
-+++ chromium-70.0.3538.67/chrome/common/media_router/media_sink.cc
+--- chromium-73.0.3673.0.orig/chrome/common/media_router/media_sink.cc
++++ chromium-73.0.3673.0/chrome/common/media_router/media_sink.cc
@@ -19,12 +19,12 @@ MediaSink::MediaSink(const MediaSink::Id
provider_id_(provider_id) {}
@@ -106,5 +106,5 @@
-MediaSink& MediaSink::operator=(MediaSink&& other) noexcept = default;
+MediaSink& MediaSink::operator=(MediaSink&& other) = default;
- bool MediaSink::Equals(const MediaSink& other) const {
- return sink_id_ == other.sink_id_;
+ bool MediaSink::IsMaybeCloudSink() const {
+ switch (icon_type_) {
++++++ chromium-old-libva.patch ++++++
--- /var/tmp/diff_new_pack.le1Pvi/_old 2019-03-14 15:00:49.071701817 +0100
+++ /var/tmp/diff_new_pack.le1Pvi/_new 2019-03-14 15:00:49.071701817 +0100
@@ -1,8 +1,8 @@
-Index: chromium-71.0.3578.80/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc
+Index: chromium-73.0.3683.75/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc
===================================================================
---- chromium-71.0.3578.80.orig/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc
-+++ chromium-71.0.3578.80/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc
-@@ -47,6 +47,9 @@ static void ReportToUMA(VAJDADecoderFail
+--- chromium-73.0.3683.75.orig/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc
++++ chromium-73.0.3683.75/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc
+@@ -45,6 +45,9 @@ static void ReportToUMA(VAJDADecoderFail
// macro in the header file without pulling in the entire <va/va.h>.
static_assert(VA_FOURCC_YUYV == VA_FOURCC('Y', 'U', 'Y', 'V'),
"VA_FOURCC_YUYV must be equal to VA_FOURCC('Y', 'U', 'Y',
'V')");
@@ -12,3 +12,17 @@
constexpr VAImageFormat kImageFormatI420 = {.fourcc = VA_FOURCC_I420,
.byte_order = VA_LSB_FIRST,
.bits_per_pixel = 12};
+Index: chromium-73.0.3683.75/media/gpu/vaapi/vaapi_wrapper.cc
+===================================================================
+--- chromium-73.0.3683.75.orig/media/gpu/vaapi/vaapi_wrapper.cc
++++ chromium-73.0.3683.75/media/gpu/vaapi/vaapi_wrapper.cc
+@@ -278,9 +278,6 @@ bool VADisplayState::Initialize() {
+ }
+
+ bool VADisplayState::InitializeOnce() {
+- static_assert(VA_MAJOR_VERSION >= 1 && VA_MINOR_VERSION >= 1,
+- "Requires VA-API >= 1.1.0");
+-
+ switch (gl::GetGLImplementation()) {
+ case gl::kGLImplementationEGLGLES2:
+ va_display_ = vaGetDisplayDRM(drm_fd_.get());
++++++ chromium-vaapi.patch ++++++
--- /var/tmp/diff_new_pack.le1Pvi/_old 2019-03-14 15:00:49.095701813 +0100
+++ /var/tmp/diff_new_pack.le1Pvi/_new 2019-03-14 15:00:49.095701813 +0100
@@ -1,7 +1,8 @@
-diff -purN a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
---- a/chrome/browser/about_flags.cc 2018-12-05 21:13:11.000000000 +0100
-+++ b/chrome/browser/about_flags.cc 2018-12-12 18:06:59.209064675 +0100
-@@ -1714,7 +1714,7 @@ const FeatureEntry kFeatureEntries[] = {
+Index: chromium-73.0.3664.3/chrome/browser/about_flags.cc
+===================================================================
+--- chromium-73.0.3664.3.orig/chrome/browser/about_flags.cc
++++ chromium-73.0.3664.3/chrome/browser/about_flags.cc
+@@ -1636,7 +1636,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
flag_descriptions::kAcceleratedVideoDecodeDescription,
@@ -10,7 +11,7 @@
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
#if defined(OS_WIN)
-@@ -2345,12 +2345,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2255,12 +2255,12 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
#endif // ENABLE_ISOLATED_XR_SERVICE
#endif // ENABLE_VR
@@ -26,10 +27,11 @@
{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
flag_descriptions::kV8CacheOptionsDescription, kOsAll,
MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
-diff -purN a/chrome/browser/flag_descriptions.cc
b/chrome/browser/flag_descriptions.cc
---- a/chrome/browser/flag_descriptions.cc 2018-12-05 21:13:13.000000000
+0100
-+++ b/chrome/browser/flag_descriptions.cc 2018-12-12 18:06:59.209064675
+0100
-@@ -3082,7 +3082,7 @@ const char kTextSuggestionsTouchBarDescr
+Index: chromium-73.0.3664.3/chrome/browser/flag_descriptions.cc
+===================================================================
+--- chromium-73.0.3664.3.orig/chrome/browser/flag_descriptions.cc
++++ chromium-73.0.3664.3/chrome/browser/flag_descriptions.cc
+@@ -2999,7 +2999,7 @@ const char kTextSuggestionsTouchBarDescr
// Chrome OS
-------------------------------------------------------------------
@@ -38,7 +40,7 @@
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
-@@ -3687,7 +3687,7 @@ const char kWakeOnPacketsName[] = "Wake
+@@ -3570,7 +3570,7 @@ const char kWakeOnPacketsName[] = "Wake
const char kWakeOnPacketsDescription[] =
"Enables waking the device based on the receipt of some network packets.";
@@ -47,10 +49,11 @@
// Random platform combinations
-----------------------------------------------
-diff -purN a/chrome/browser/flag_descriptions.h
b/chrome/browser/flag_descriptions.h
---- a/chrome/browser/flag_descriptions.h 2018-12-05 21:13:13.000000000
+0100
-+++ b/chrome/browser/flag_descriptions.h 2018-12-12 18:06:59.209064675
+0100
-@@ -1843,13 +1843,17 @@ extern const char kPermissionPromptPersi
+Index: chromium-73.0.3664.3/chrome/browser/flag_descriptions.h
+===================================================================
+--- chromium-73.0.3664.3.orig/chrome/browser/flag_descriptions.h
++++ chromium-73.0.3664.3/chrome/browser/flag_descriptions.h
+@@ -1792,13 +1792,17 @@ extern const char kPermissionPromptPersi
#endif // defined(OS_MACOSX)
@@ -71,10 +74,11 @@
extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];
-diff -purN a/components/viz/service/main/viz_main_impl.cc
b/components/viz/service/main/viz_main_impl.cc
---- a/components/viz/service/main/viz_main_impl.cc 2018-12-05
21:13:27.000000000 +0100
-+++ b/components/viz/service/main/viz_main_impl.cc 2018-12-12
18:06:59.209064675 +0100
-@@ -41,7 +41,7 @@ std::unique_ptr<base::Thread> CreateAndS
+Index: chromium-73.0.3664.3/components/viz/service/main/viz_main_impl.cc
+===================================================================
+--- chromium-73.0.3664.3.orig/components/viz/service/main/viz_main_impl.cc
++++ chromium-73.0.3664.3/components/viz/service/main/viz_main_impl.cc
+@@ -35,7 +35,7 @@ std::unique_ptr<base::Thread> CreateAndS
// It should be possible to use |main_task_runner_| for doing IO tasks.
base::Thread::Options thread_options(base::MessageLoop::TYPE_IO, 0);
thread_options.priority = base::ThreadPriority::NORMAL;
@@ -83,9 +87,10 @@
// TODO(reveman): Remove this in favor of setting it explicitly for each
// type of process.
thread_options.priority = base::ThreadPriority::DISPLAY;
-diff -purN a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
---- a/content/gpu/BUILD.gn 2018-12-05 21:13:29.000000000 +0100
-+++ b/content/gpu/BUILD.gn 2018-12-12 18:06:59.209064675 +0100
+Index: chromium-73.0.3664.3/content/gpu/BUILD.gn
+===================================================================
+--- chromium-73.0.3664.3.orig/content/gpu/BUILD.gn
++++ chromium-73.0.3664.3/content/gpu/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//gpu/vulkan/features.gni")
@@ -111,9 +116,10 @@
+ public_configs = [ "//media/gpu:libva_config" ]
+ }
}
-diff -purN a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
---- a/content/gpu/gpu_main.cc 2018-12-05 21:13:29.000000000 +0100
-+++ b/content/gpu/gpu_main.cc 2018-12-12 18:06:59.213064704 +0100
+Index: chromium-73.0.3664.3/content/gpu/gpu_main.cc
+===================================================================
+--- chromium-73.0.3664.3.orig/content/gpu/gpu_main.cc
++++ chromium-73.0.3664.3/content/gpu/gpu_main.cc
@@ -284,7 +284,7 @@ int GpuMain(const MainFunctionParams& pa
base::PlatformThread::SetName("CrGpuMain");
@@ -132,9 +138,10 @@
io_thread_priority = base::ThreadPriority::DISPLAY;
#endif
-diff -purN a/gpu/config/software_rendering_list.json
b/gpu/config/software_rendering_list.json
---- a/gpu/config/software_rendering_list.json 2018-12-05 21:13:33.000000000
+0100
-+++ b/gpu/config/software_rendering_list.json 2018-12-12 18:06:59.213064704
+0100
+Index: chromium-73.0.3664.3/gpu/config/software_rendering_list.json
+===================================================================
+--- chromium-73.0.3664.3.orig/gpu/config/software_rendering_list.json
++++ chromium-73.0.3664.3/gpu/config/software_rendering_list.json
@@ -370,17 +370,6 @@
]
},
@@ -153,10 +160,11 @@
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
"cr_bugs": [145531, 332596, 571899, 629434],
-diff -purN a/media/base/media_switches.cc b/media/base/media_switches.cc
---- a/media/base/media_switches.cc 2018-12-05 21:13:37.000000000 +0100
-+++ b/media/base/media_switches.cc 2018-12-12 18:06:59.213064704 +0100
-@@ -496,7 +496,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
+Index: chromium-73.0.3664.3/media/base/media_switches.cc
+===================================================================
+--- chromium-73.0.3664.3.orig/media/base/media_switches.cc
++++ chromium-73.0.3664.3/media/base/media_switches.cc
+@@ -494,7 +494,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
switches::kUseFakeJpegDecodeAccelerator)) {
return true;
}
@@ -165,9 +173,10 @@
return true;
#endif
return false;
-diff -purN a/media/filters/BUILD.gn b/media/filters/BUILD.gn
---- a/media/filters/BUILD.gn 2018-12-05 21:13:37.000000000 +0100
-+++ b/media/filters/BUILD.gn 2018-12-12 18:06:59.213064704 +0100
+Index: chromium-73.0.3664.3/media/filters/BUILD.gn
+===================================================================
+--- chromium-73.0.3664.3.orig/media/filters/BUILD.gn
++++ chromium-73.0.3664.3/media/filters/BUILD.gn
@@ -5,6 +5,7 @@
import("//build/config/jumbo.gni")
import("//media/media_options.gni")
@@ -176,7 +185,7 @@
jumbo_source_set("filters") {
# Do not expand the visibility here without double-checking with OWNERS,
this
-@@ -200,7 +201,7 @@ jumbo_source_set("filters") {
+@@ -202,7 +203,7 @@ jumbo_source_set("filters") {
deps += [ "//media/base/android" ]
}
@@ -185,10 +194,11 @@
sources += [
"h264_bitstream_buffer.cc",
"h264_bitstream_buffer.h",
-diff -purN a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn
---- a/media/gpu/BUILD.gn 2018-12-05 21:13:37.000000000 +0100
-+++ b/media/gpu/BUILD.gn 2018-12-12 18:07:39.317348062 +0100
-@@ -506,6 +506,12 @@ if (use_v4l2_codec || use_vaapi || is_ma
+Index: chromium-73.0.3664.3/media/gpu/BUILD.gn
+===================================================================
+--- chromium-73.0.3664.3.orig/media/gpu/BUILD.gn
++++ chromium-73.0.3664.3/media/gpu/BUILD.gn
+@@ -504,6 +504,12 @@ if (use_v4l2_codec || use_vaapi || is_ma
}
}
@@ -201,7 +211,7 @@
if (use_v4l2_codec || use_vaapi) {
test("jpeg_encode_accelerator_unittest") {
deps = [
-@@ -576,6 +582,7 @@ if (is_chromeos || is_linux) {
+@@ -574,6 +580,7 @@ if (is_chromeos || is_linux) {
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
@@ -209,9 +219,10 @@
}
}
-diff -purN a/media/gpu/gpu_video_decode_accelerator_factory.cc
b/media/gpu/gpu_video_decode_accelerator_factory.cc
---- a/media/gpu/gpu_video_decode_accelerator_factory.cc 2018-12-05
21:13:37.000000000 +0100
-+++ b/media/gpu/gpu_video_decode_accelerator_factory.cc 2018-12-12
18:06:59.213064704 +0100
+Index: chromium-73.0.3664.3/media/gpu/gpu_video_decode_accelerator_factory.cc
+===================================================================
+--- chromium-73.0.3664.3.orig/media/gpu/gpu_video_decode_accelerator_factory.cc
++++ chromium-73.0.3664.3/media/gpu/gpu_video_decode_accelerator_factory.cc
@@ -56,6 +56,7 @@ gpu::VideoDecodeAcceleratorCapabilities
// profile (instead of calculating a superset).
// TODO(posciak,henryhsu): improve this so that we choose a superset of
@@ -220,19 +231,11 @@
VideoDecodeAccelerator::Capabilities capabilities;
#if defined(OS_WIN)
capabilities.supported_profiles =
-diff -purN a/media/gpu/vaapi/vaapi_wrapper.cc
b/media/gpu/vaapi/vaapi_wrapper.cc
---- a/media/gpu/vaapi/vaapi_wrapper.cc 2018-12-05 21:13:37.000000000 +0100
-+++ b/media/gpu/vaapi/vaapi_wrapper.cc 2018-12-12 18:06:59.213064704 +0100
-@@ -333,7 +333,7 @@ bool VADisplayState::InitializeOnce() {
- DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << "
"
- << va_vendor_string_;
-
-- if (major_version != VA_MAJOR_VERSION || minor_version != VA_MINOR_VERSION)
{
-+ if (major_version != VA_MAJOR_VERSION) {
- LOG(ERROR) << "This build of Chromium requires VA-API version "
- << VA_MAJOR_VERSION << "." << VA_MINOR_VERSION
- << ", system version: " << major_version << "." <<
minor_version;
-@@ -1000,7 +1000,11 @@ scoped_refptr<VASurface> VaapiWrapper::C
+Index: chromium-73.0.3664.3/media/gpu/vaapi/vaapi_wrapper.cc
+===================================================================
+--- chromium-73.0.3664.3.orig/media/gpu/vaapi/vaapi_wrapper.cc
++++ chromium-73.0.3664.3/media/gpu/vaapi/vaapi_wrapper.cc
+@@ -1028,7 +1028,11 @@ scoped_refptr<VASurface> VaapiWrapper::C
}
va_attrib_extbuf.num_planes = num_planes;
