Tom Callaway
5 years ago
parent
383f5aea63
commit
89f728c8d4
@ -0,0 +1,22 @@
|
|||||||
|
--- chromium-60.0.3112.40/build/linux/unbundle/ffmpeg.gn.ffmpeg-deprecation 2017-06-25 13:24:47.390218631 +0200
|
||||||
|
+++ chromium-60.0.3112.40/build/linux/unbundle/ffmpeg.gn 2017-06-25 13:32:48.528583949 +0200
|
||||||
|
@@ -19,6 +19,12 @@
|
||||||
|
flags = [ "USE_SYSTEM_FFMPEG=true" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
+config("ffmpeg_deprecations") {
|
||||||
|
+ if (is_linux) {
|
||||||
|
+ cflags = [ "-Wno-error=deprecated-declarations" ]
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
shim_headers("ffmpeg_shim") {
|
||||||
|
root_path = "."
|
||||||
|
headers = [
|
||||||
|
@@ -33,5 +39,5 @@
|
||||||
|
":ffmpeg_features",
|
||||||
|
":ffmpeg_shim",
|
||||||
|
]
|
||||||
|
- public_configs = [ ":system_ffmpeg" ]
|
||||||
|
+ public_configs = [ ":system_ffmpeg", ":ffmpeg_deprecations" ]
|
||||||
|
}
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
diff --git a/ui/views/layout/layout_types.h b/ui/views/layout/layout_types.h
|
||||||
|
index 8f9dbf4..ba118b9 100644
|
||||||
|
--- a/ui/views/layout/layout_types.h
|
||||||
|
+++ b/ui/views/layout/layout_types.h
|
||||||
|
@@ -45,12 +45,12 @@ class VIEWS_EXPORT SizeBounds {
|
||||||
|
~SizeBounds() = default;
|
||||||
|
|
||||||
|
constexpr const base::Optional<int>& width() const { return width_; }
|
||||||
|
- constexpr void set_width(base::Optional<int> width) {
|
||||||
|
+ inline void set_width(base::Optional<int> width) {
|
||||||
|
width_ = std::move(width);
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr const base::Optional<int>& height() const { return height_; }
|
||||||
|
- constexpr void set_height(base::Optional<int> height) {
|
||||||
|
+ inline void set_height(base::Optional<int> height) {
|
||||||
|
height_ = std::move(height);
|
||||||
|
}
|
||||||
|
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/components/paint_preview/browser/paint_preview_client.cc b/components/paint_preview/browser/paint_preview_client.cc
|
||||||
|
index 38ab6be..dccf07f 100644
|
||||||
|
--- a/components/paint_preview/browser/paint_preview_client.cc
|
||||||
|
+++ b/components/paint_preview/browser/paint_preview_client.cc
|
||||||
|
@@ -78,7 +78,7 @@ PaintPreviewClient::PaintPreviewData::PaintPreviewData() = default;
|
||||||
|
PaintPreviewClient::PaintPreviewData::~PaintPreviewData() = default;
|
||||||
|
|
||||||
|
PaintPreviewClient::PaintPreviewData& PaintPreviewClient::PaintPreviewData::
|
||||||
|
-operator=(PaintPreviewData&& rhs) noexcept = default;
|
||||||
|
+operator=(PaintPreviewData&& rhs) = default;
|
||||||
|
PaintPreviewClient::PaintPreviewData::PaintPreviewData(
|
||||||
|
PaintPreviewData&& other) noexcept = default;
|
||||||
|
|
||||||
@ -0,0 +1,52 @@
|
|||||||
|
From 98e343ab369e4262511b5fce547728e3e5eefba8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hidehiko Abe <hidehiko@chromium.org>
|
||||||
|
Date: Fri, 31 Jan 2020 21:27:40 +0000
|
||||||
|
Subject: [PATCH] Use same condition for field declaration and its use.
|
||||||
|
|
||||||
|
cros_supported_configs_ is defined iff OS_CHROMEOS is defined.
|
||||||
|
However, it is used iff USE_CHROMEOS_MEDIA_ACCELERATION regardless of
|
||||||
|
OS_CHROMEOS.
|
||||||
|
This CL aligns the conditions.
|
||||||
|
|
||||||
|
BUG=1047719
|
||||||
|
TEST=Build locally.
|
||||||
|
|
||||||
|
Change-Id: I08fe8532c1778ff8c77c7a9d9cdd96ff2a83272f
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2030924
|
||||||
|
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
|
||||||
|
Reviewed-by: Miguel Casas <mcasas@chromium.org>
|
||||||
|
Commit-Queue: Miguel Casas <mcasas@chromium.org>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#737459}
|
||||||
|
---
|
||||||
|
|
||||||
|
--- a/media/mojo/services/gpu_mojo_media_client.cc
|
||||||
|
+++ b/media/mojo/services/gpu_mojo_media_client.cc
|
||||||
|
@@ -157,7 +157,7 @@ GpuMojoMediaClient::GetSupportedVideoDec
|
||||||
|
supported_config_map[VideoDecoderImplementation::kAlternate] =
|
||||||
|
*d3d11_supported_configs_;
|
||||||
|
|
||||||
|
-#elif BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
|
||||||
|
+#elif defined(OS_CHROMEOS) && BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
|
||||||
|
if (base::FeatureList::IsEnabled(kChromeosVideoDecoder)) {
|
||||||
|
if (!cros_supported_configs_) {
|
||||||
|
cros_supported_configs_ =
|
||||||
|
--- a/media/mojo/services/gpu_mojo_media_client.h
|
||||||
|
+++ b/media/mojo/services/gpu_mojo_media_client.h
|
||||||
|
@@ -74,16 +74,13 @@ class GpuMojoMediaClient : public MojoMe
|
||||||
|
#if defined(OS_CHROMEOS) && BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
|
||||||
|
// Indirectly owned by GpuChildThread.
|
||||||
|
gpu::GpuMemoryBufferFactory* const gpu_memory_buffer_factory_;
|
||||||
|
+ base::Optional<SupportedVideoDecoderConfigs> cros_supported_configs_;
|
||||||
|
#endif // defined(OS_CHROMEOS) && BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
|
||||||
|
CdmProxyFactoryCB cdm_proxy_factory_cb_;
|
||||||
|
#if defined(OS_WIN)
|
||||||
|
base::Optional<SupportedVideoDecoderConfigs> d3d11_supported_configs_;
|
||||||
|
#endif // defined(OS_WIN)
|
||||||
|
|
||||||
|
-#if defined(OS_CHROMEOS)
|
||||||
|
- base::Optional<SupportedVideoDecoderConfigs> cros_supported_configs_;
|
||||||
|
-#endif // defined(OS_CHROMEOS)
|
||||||
|
-
|
||||||
|
DISALLOW_COPY_AND_ASSIGN(GpuMojoMediaClient);
|
||||||
|
};
|
||||||
|
|
||||||
@ -0,0 +1,31 @@
|
|||||||
|
From 5b2ff215473e0526b5b24aeff4ad90d369b21c75 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Julien Isorce <julien.isorce@chromium.org>
|
||||||
|
Date: Wed, 05 Feb 2020 17:59:59 +0000
|
||||||
|
Subject: [PATCH] Fix vaapi with GLX
|
||||||
|
|
||||||
|
The signature of ui's gl::GLImageGLX has changed a little bit
|
||||||
|
since "mplement GpuMemoryBuffers for EGL and GLX":
|
||||||
|
https://chromium-review.googlesource.com/c/chromium/src/+/1984712
|
||||||
|
|
||||||
|
Bug: 1031269
|
||||||
|
Test: build with use_vaapi=true and run with --use-gl=desktop, see
|
||||||
|
Change-Id: I80b07294b9abdfa8233aaf79f7d9ec4c58117090
|
||||||
|
https: //chromium.googlesource.com/chromium/src.git/+/refs/heads/master/docs/gpu/vaapi.md#vaapi-on-linux
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036494
|
||||||
|
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
|
||||||
|
Reviewed-by: Miguel Casas <mcasas@chromium.org>
|
||||||
|
Commit-Queue: Julien Isorce <julien.isorce@chromium.org>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#738595}
|
||||||
|
---
|
||||||
|
|
||||||
|
--- a/media/gpu/vaapi/vaapi_picture_tfp.cc
|
||||||
|
+++ b/media/gpu/vaapi/vaapi_picture_tfp.cc
|
||||||
|
@@ -57,7 +57,7 @@ bool VaapiTFPPicture::Initialize() {
|
||||||
|
if (make_context_current_cb_ && !make_context_current_cb_.Run())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
- glx_image_ = new gl::GLImageGLX(size_, GL_RGB);
|
||||||
|
+ glx_image_ = new gl::GLImageGLX(size_, gfx::BufferFormat::BGRX_8888);
|
||||||
|
if (!glx_image_->Initialize(x_pixmap_)) {
|
||||||
|
// x_pixmap_ will be freed in the destructor.
|
||||||
|
DLOG(ERROR) << "Failed creating a GLX Pixmap for TFP";
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
diff -up chromium-81.0.4044.92/base/test/icu_test_util.h.missing-memory chromium-81.0.4044.92/base/test/icu_test_util.h
|
||||||
|
--- chromium-81.0.4044.92/base/test/icu_test_util.h.missing-memory 2020-04-15 07:52:11.239815139 -0400
|
||||||
|
+++ chromium-81.0.4044.92/base/test/icu_test_util.h 2020-04-15 07:52:19.982632306 -0400
|
||||||
|
@@ -5,6 +5,7 @@
|
||||||
|
#ifndef BASE_TEST_ICU_TEST_UTIL_H_
|
||||||
|
#define BASE_TEST_ICU_TEST_UTIL_H_
|
||||||
|
|
||||||
|
+#include <memory>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
#include "base/macros.h"
|
||||||
File diff suppressed because one or more lines are too long
Loading…
Reference in new issue