Last active
January 31, 2019 00:22
-
-
Save kureta/645ecf99ce085f51162a4ce77c2e1f10 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/.SRCINFO b/.SRCINFO | |
| index 8ded5e5..b929892 100644 | |
| --- a/.SRCINFO | |
| +++ b/.SRCINFO | |
| @@ -1,7 +1,7 @@ | |
| pkgbase = chromium-vaapi | |
| pkgdesc = Chromium with VA-API support to enable hardware acceleration | |
| - pkgver = 71.0.3578.98 | |
| - pkgrel = 3 | |
| + pkgver = 72.0.3626.81 | |
| + pkgrel = 1 | |
| url = https://www.chromium.org/Home | |
| install = chromium.install | |
| arch = x86_64 | |
| @@ -56,24 +56,20 @@ pkgbase = chromium-vaapi | |
| optdepends = libva-vdpau-driver-chromium: support HW acceleration on Nvidia graphics cards | |
| provides = chromium | |
| conflicts = chromium | |
| - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-71.0.3578.98.tar.xz | |
| + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-72.0.3626.81.tar.xz | |
| source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz | |
| - source = fix-nav-preload-with-third-party-cookie-blocking.patch | |
| - source = chromium-harfbuzz-r0.patch | |
| source = chromium-system-icu.patch | |
| source = chromium-widevine.patch | |
| source = chromium-skia-harmony.patch | |
| - source = cfi-vaapi-fix.patch | |
| source = chromium-vaapi-r21.patch | |
| - sha256sums = 1c56a9e30825774c83d568d194e9585625c6e90f81ee0ef09760fcedc86b9d45 | |
| + source = chromium-webrtc.patch | |
| + sha256sums = dfe89fe389008e6d2098099948d10774989d2f3e8dca6ace78ea4ec636dd8006 | |
| sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1 | |
| - sha256sums = d2c497f3400baad7d380305f4705fd1e5b9f70a8460384490a1bb78e1c2b0f23 | |
| - sha256sums = 1b370d49c43e88acfe7c0b1f9517047e927f3407bd80b4a48bba32c001f80136 | |
| - sha256sums = c4f2d1bed9034c02b8806f00c2e8165df24de467803855904bff709ceaf11af5 | |
| + sha256sums = 8673608f50f87db14b2fd9d688d1ee4f1d4b39f3b6add7a9a8984a78eb2b9deb | |
| sha256sums = d081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b | |
| - sha256sums = feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3 | |
| - sha256sums = adf301b50b5a03c98b7602c17e1f34e37260c07c88bcb7e1661122af61f50e23 | |
| - sha256sums = 7985b5b6820300beeb119b601bb9fe3d2a662daf5dc90619a0f125ea84907ce5 | |
| + sha256sums = 134550cda6f19ec7eaa8430a83621da387ad113ef8146d4a4926d628d92ac5a5 | |
| + sha256sums = 7b1bbb3c4282ed7a1dc04bfb8c01bb9a99bd447d5a8616003aa41c70136d2328 | |
| + sha256sums = 27cdb00553aebaffd405c6f78d39bf879cd7f87e3f2169e7f53cf041f2b1d999 | |
| pkgname = chromium-vaapi | |
| diff --git a/PKGBUILD b/PKGBUILD | |
| index c91f8da..4152a54 100644 | |
| --- a/PKGBUILD | |
| +++ b/PKGBUILD | |
| @@ -10,8 +10,8 @@ | |
| # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> | |
| pkgname=chromium-vaapi | |
| -pkgver=71.0.3578.98 | |
| -pkgrel=3 | |
| +pkgver=72.0.3626.81 | |
| +pkgrel=1 | |
| _launcher_ver=6 | |
| pkgdesc="Chromium with VA-API support to enable hardware acceleration" | |
| arch=('x86_64') | |
| @@ -34,22 +34,18 @@ optdepends=('pepper-flash: support for Flash content' | |
| install=chromium.install | |
| source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz | |
| chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz | |
| - fix-nav-preload-with-third-party-cookie-blocking.patch | |
| - chromium-harfbuzz-r0.patch | |
| chromium-system-icu.patch | |
| chromium-widevine.patch | |
| chromium-skia-harmony.patch | |
| - cfi-vaapi-fix.patch | |
| - chromium-vaapi-r21.patch) | |
| -sha256sums=('1c56a9e30825774c83d568d194e9585625c6e90f81ee0ef09760fcedc86b9d45' | |
| + chromium-vaapi-r21.patch | |
| + chromium-webrtc.patch) | |
| +sha256sums=('dfe89fe389008e6d2098099948d10774989d2f3e8dca6ace78ea4ec636dd8006' | |
| '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1' | |
| - 'd2c497f3400baad7d380305f4705fd1e5b9f70a8460384490a1bb78e1c2b0f23' | |
| - '1b370d49c43e88acfe7c0b1f9517047e927f3407bd80b4a48bba32c001f80136' | |
| - 'c4f2d1bed9034c02b8806f00c2e8165df24de467803855904bff709ceaf11af5' | |
| + '8673608f50f87db14b2fd9d688d1ee4f1d4b39f3b6add7a9a8984a78eb2b9deb' | |
| 'd081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b' | |
| - 'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3' | |
| - 'adf301b50b5a03c98b7602c17e1f34e37260c07c88bcb7e1661122af61f50e23' | |
| - '7985b5b6820300beeb119b601bb9fe3d2a662daf5dc90619a0f125ea84907ce5') | |
| + '134550cda6f19ec7eaa8430a83621da387ad113ef8146d4a4926d628d92ac5a5' | |
| + '7b1bbb3c4282ed7a1dc04bfb8c01bb9a99bd447d5a8616003aa41c70136d2328' | |
| + '27cdb00553aebaffd405c6f78d39bf879cd7f87e3f2169e7f53cf041f2b1d999') | |
| # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py | |
| # Keys are the names in the above script; values are the dependencies in Arch | |
| @@ -99,20 +95,16 @@ prepare() { | |
| third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \ | |
| third_party/libxml/chromium/libxml_utils.cc | |
| - # https://crbug.com/913220 | |
| - patch -Np1 -i ../fix-nav-preload-with-third-party-cookie-blocking.patch | |
| - | |
| # Load Widevine CDM if available | |
| patch -Np1 -i ../chromium-widevine.patch | |
| # https://crbug.com/skia/6663#c10 | |
| - patch -Np4 -i ../chromium-skia-harmony.patch | |
| - | |
| - # Fixes from Gentoo | |
| - patch -Np1 -i ../chromium-harfbuzz-r0.patch | |
| + patch -Np0 -i ../chromium-skia-harmony.patch | |
| # https://bugs.gentoo.org/661880#c21 | |
| - patch -Np1 -i ../chromium-system-icu.patch | |
| + patch -Np0 -i ../chromium-system-icu.patch | |
| + | |
| + patch -Np0 -i ../chromium-webrtc.patch | |
| # Remove compiler flags not supported by our system clang | |
| @@ -127,7 +119,6 @@ prepare() { | |
| ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ | |
| msg2 'Applying VA-API patches' | |
| - # patch -Np1 -i ../cfi-vaapi-fix.patch | |
| patch -Np1 -i ../chromium-vaapi-r21.patch | |
| # Remove bundled libraries for which we will use the system copies; this | |
| diff --git a/cfi-vaapi-fix.patch b/cfi-vaapi-fix.patch | |
| deleted file mode 100644 | |
| index 8d11721..0000000 | |
| --- a/cfi-vaapi-fix.patch | |
| +++ /dev/null | |
| @@ -1,30 +0,0 @@ | |
| -From 99db8d62a62610f9aed8225c47dc051b5d61b1a1 Mon Sep 17 00:00:00 2001 | |
| -From: Evangelos Foutras <evangelos@foutrelis.com> | |
| -Date: Wed, 05 Sep 2018 22:36:45 +0000 | |
| -Subject: [PATCH] Disable cfi-icall for media/gpu/vaapi/va_stubs.cc | |
| - | |
| -Similarly to pulse_stubs.cc, va_stubs.cc contains dlsym() resolved | |
| -functions which trigger cfi-icall failures. The affected builds of | |
| -Chromium do use out-of-tree patches to enable hardware-accelerated | |
| -video decode on Linux where the VA-API driver is installed, but it | |
| -would still be nice to have them work with cfi-icall enabled. | |
| - | |
| -Change-Id: Iefa27f4b95007da23423d17727826adb8825b278 | |
| -Reviewed-on: https://chromium-review.googlesource.com/1208830 | |
| -Reviewed-by: Peter Collingbourne <pcc@chromium.org> | |
| -Commit-Queue: Peter Collingbourne <pcc@chromium.org> | |
| -Cr-Commit-Position: refs/heads/master@{#589034} | |
| ---- | |
| - | |
| -diff --git a/tools/cfi/blacklist.txt b/tools/cfi/blacklist.txt | |
| -index 761574a..bffce27 100644 | |
| ---- a/tools/cfi/blacklist.txt | |
| -+++ b/tools/cfi/blacklist.txt | |
| -@@ -143,6 +143,7 @@ | |
| - | |
| - # Calls to auto-generated stubs by generate_stubs.py | |
| - src:*audio/pulse/pulse_stubs.cc | |
| -+src:*media/gpu/vaapi/va_stubs.cc | |
| - | |
| - # Calls to auto-generated stubs by generate_library_loader.py | |
| - src:*chrome/browser/speech/tts_linux.cc | |
| diff --git a/chromium-harfbuzz-r0.patch b/chromium-harfbuzz-r0.patch | |
| deleted file mode 100644 | |
| index 2d5602d..0000000 | |
| --- a/chromium-harfbuzz-r0.patch | |
| +++ /dev/null | |
| @@ -1,80 +0,0 @@ | |
| -From 7ae38170a117e909bb28e1470842b68de3501197 Mon Sep 17 00:00:00 2001 | |
| -From: Mike Gilbert <floppymaster@gmail.com> | |
| -Date: Sun, 21 Oct 2018 10:06:53 -0400 | |
| -Subject: [PATCH] blink: add 'const' modifier for harfbuzz hb_codepoint_t | |
| - pointers | |
| - | |
| -This resolves a build failure against harfbuzz 2.0. | |
| - | |
| -Based on a patch by Alexandre Fierreira. | |
| - | |
| -Bug: https://bugs.gentoo.org/669034 | |
| ---- | |
| - .../renderer/platform/fonts/shaping/harfbuzz_face.cc | 2 +- | |
| - .../renderer/platform/fonts/skia/skia_text_metrics.cc | 9 +++++++-- | |
| - .../renderer/platform/fonts/skia/skia_text_metrics.h | 2 +- | |
| - 3 files changed, 9 insertions(+), 4 deletions(-) | |
| - | |
| -diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc | |
| -index 8e7d91ca371f..e279a5876cb3 100644 | |
| ---- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc | |
| -+++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc | |
| -@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHorizontalAdvance(hb_font_t* hb_font, | |
| - static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font, | |
| - void* font_data, | |
| - unsigned count, | |
| -- hb_codepoint_t* first_glyph, | |
| -+ const hb_codepoint_t* first_glyph, | |
| - unsigned int glyph_stride, | |
| - hb_position_t* first_advance, | |
| - unsigned int advance_stride, | |
| -diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc | |
| -index 77ec6209fab9..9f9070921448 100644 | |
| ---- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc | |
| -+++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc | |
| -@@ -18,6 +18,11 @@ T* advance_by_byte_size(T* p, unsigned byte_size) { | |
| - return reinterpret_cast<T*>(reinterpret_cast<uint8_t*>(p) + byte_size); | |
| - } | |
| - | |
| -+template <class T> | |
| -+T* advance_by_byte_size_const(T* p, unsigned byte_size) { | |
| -+ return reinterpret_cast<T*>(reinterpret_cast<const uint8_t*>(p) + byte_size); | |
| -+} | |
| -+ | |
| - } // namespace | |
| - | |
| - SkiaTextMetrics::SkiaTextMetrics(const SkPaint* paint) : paint_(paint) { | |
| -@@ -39,7 +44,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(hb_codepoint_t codepoint, | |
| - } | |
| - | |
| - void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count, | |
| -- hb_codepoint_t* glyphs, | |
| -+ const hb_codepoint_t* glyphs, | |
| - unsigned glyph_stride, | |
| - hb_position_t* advances, | |
| - unsigned advance_stride) { | |
| -@@ -48,7 +53,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count, | |
| - // array that copy them to a regular array. | |
| - Vector<Glyph, 256> glyph_array(count); | |
| - for (unsigned i = 0; i < count; | |
| -- i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) { | |
| -+ i++, glyphs = advance_by_byte_size_const(glyphs, glyph_stride)) { | |
| - glyph_array[i] = *glyphs; | |
| - } | |
| - Vector<SkScalar, 256> sk_width_array(count); | |
| -diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h | |
| -index 787d8af0375a..3bc4407c641b 100644 | |
| ---- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h | |
| -+++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h | |
| -@@ -19,7 +19,7 @@ class SkiaTextMetrics final { | |
| - | |
| - void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width); | |
| - void GetGlyphWidthForHarfBuzz(unsigned count, | |
| -- hb_codepoint_t* first_glyph, | |
| -+ const hb_codepoint_t* first_glyph, | |
| - unsigned glyph_stride, | |
| - hb_position_t* first_advance, | |
| - unsigned advance_stride); | |
| --- | |
| -2.19.1 | |
| - | |
| diff --git a/chromium-skia-harmony.patch b/chromium-skia-harmony.patch | |
| index 6343f7f..9b1bb4c 100644 | |
| --- a/chromium-skia-harmony.patch | |
| +++ b/chromium-skia-harmony.patch | |
| @@ -1,15 +1,15 @@ | |
| ---- qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2017-10-10 17:42:06.956950985 +0200 | |
| -+++ qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp 2017-10-10 17:46:05.824187787 +0200 | |
| -@@ -99,8 +99,6 @@ | |
| - FreeTypeLibrary() | |
| +--- third_party/skia/src/ports/SkFontHost_FreeType.cpp 2019-01-30 04:20:41.000000000 +0300 | |
| ++++ third_party/skia/src/ports/SkFontHost_FreeType.cpp 2019-01-30 17:12:10.129780893 +0300 | |
| +@@ -121,8 +121,6 @@ | |
| : fGetVarDesignCoordinates(nullptr) | |
| + , fGetVarAxisFlags(nullptr) | |
| , fLibrary(nullptr) | |
| - , fIsLCDSupported(false) | |
| - , fLCDExtra(0) | |
| { | |
| if (FT_New_Library(&gFTMemory, &fLibrary)) { | |
| return; | |
| -@@ -147,12 +145,7 @@ | |
| +@@ -182,12 +180,7 @@ | |
| } | |
| #endif | |
| @@ -19,11 +19,11 @@ | |
| - fIsLCDSupported = true; | |
| - fLCDExtra = 2; //Using a filter adds one full pixel to each side. | |
| - } | |
| -+ FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT); | |
| ++ FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT); | |
| } | |
| ~FreeTypeLibrary() { | |
| if (fLibrary) { | |
| -@@ -161,8 +153,6 @@ | |
| +@@ -196,8 +189,6 @@ | |
| } | |
| FT_Library library() { return fLibrary; } | |
| @@ -32,7 +32,7 @@ | |
| // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1. | |
| // Prior to this there was no way to get the coordinates out of the FT_Face. | |
| -@@ -173,8 +163,6 @@ | |
| +@@ -214,8 +205,6 @@ | |
| private: | |
| FT_Library fLibrary; | |
| @@ -41,7 +41,7 @@ | |
| // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0. | |
| // The following platforms provide FreeType of at least 2.4.0. | |
| -@@ -704,17 +692,6 @@ | |
| +@@ -713,17 +702,6 @@ | |
| rec->fTextSize = SkIntToScalar(1 << 14); | |
| } | |
| @@ -56,12 +56,12 @@ | |
| - unref_ft_library(); | |
| - } | |
| - | |
| - SkPaint::Hinting h = rec->getHinting(); | |
| - if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) { | |
| + SkFontHinting h = rec->getHinting(); | |
| + if (kFull_SkFontHinting == h && !isLCD(*rec)) { | |
| // collapse full->normal hinting if we're not doing LCD | |
| -@@ -1115,11 +1092,11 @@ | |
| +@@ -1137,11 +1115,11 @@ | |
| void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) { | |
| - if (isLCD(fRec)) { | |
| + if (glyph->fMaskFormat == SkMask::kLCD16_Format) { | |
| if (fLCDIsVert) { | |
| - glyph->fHeight += gFTLibrary->lcdExtra(); | |
| - glyph->fTop -= gFTLibrary->lcdExtra() >> 1; | |
| diff --git a/chromium-system-icu.patch b/chromium-system-icu.patch | |
| index 89a7b00..93b397b 100644 | |
| --- a/chromium-system-icu.patch | |
| +++ b/chromium-system-icu.patch | |
| @@ -1,8 +1,6 @@ | |
| -diff --git a/third_party/blink/renderer/platform/text/character_property_data_generator.h b/third_party/blink/renderer/platform/text/character_property_data_generator.h | |
| -index 28fb6a9..bb4dbd7 100644 | |
| ---- a/third_party/blink/renderer/platform/text/character_property_data_generator.h | |
| -+++ b/third_party/blink/renderer/platform/text/character_property_data_generator.h | |
| -@@ -244,10 +244,12 @@ static const UChar32 kIsHangulRanges[] = { | |
| +--- third_party/blink/renderer/platform/text/character_property_data.h 2019-01-30 04:18:17.000000000 +0300 | |
| ++++ third_party/blink/renderer/platform/text/character_property_data.h 2019-01-30 17:39:34.834941728 +0300 | |
| +@@ -244,10 +244,12 @@ | |
| 0xD7B0, 0xD7FF, | |
| // Halfwidth Hangul Jamo | |
| // https://www.unicode.org/charts/nameslist/c_FF00.html | |
| @@ -12,8 +10,8 @@ index 28fb6a9..bb4dbd7 100644 | |
| -static const UChar32 kIsHangulArray[] = {}; | |
| +static const UChar32 kIsHangulArray[] = { | |
| -+ 0xFFDC, | |
| ++ 0xFFDC | |
| +}; | |
| - } // namespace blink | |
| - | |
| + #if !defined(USING_SYSTEM_ICU) | |
| + // Freezed trie tree, see character_property_data_generator.cc. | |
| diff --git a/chromium-vaapi-r21.patch b/chromium-vaapi-r21.patch | |
| index 67b9b29..abe3e1d 100644 | |
| --- a/chromium-vaapi-r21.patch | |
| +++ b/chromium-vaapi-r21.patch | |
| @@ -349,7 +349,7 @@ Signed-off-by: Daniel Charles | |
| gpu::GpuPreferences::VPX_VENDOR_MICROSOFT; | |
| --- a/content/public/common/content_switches.cc | |
| +++ b/content/public/common/content_switches.cc | |
| -@@ -64,6 +64,11 @@ const char kDisable3DAPIs[] | |
| +@@ -64,6 +64,12 @@ const char kDisable3DAPIs[] | |
| // Disable gpu-accelerated 2d canvas. | |
| const char kDisableAccelerated2dCanvas[] = "disable-accelerated-2d-canvas"; | |
| @@ -357,11 +357,12 @@ Signed-off-by: Daniel Charles | |
| +// Enables hardware acceleration of video for Linux only. VA-API driver | |
| +// is required to be present on the system installation. | |
| +const char kEnableAcceleratedVideo[] = "enable-accelerated-video"; | |
| ++const char kEnableAcceleratedMjpegDecode[] = "enable-accelerated-mjpeg-decode"; | |
| +#endif | |
| // Disables hardware acceleration of video decode, where available. | |
| const char kDisableAcceleratedVideoDecode[] = | |
| "disable-accelerated-video-decode"; | |
| -@@ -853,11 +858,13 @@ const char kWaitForDebuggerChildren[] | |
| +@@ -853,11 +859,13 @@ const char kWaitForDebuggerChildren[] | |
| // ignores this switch on its stable and beta channels. | |
| const char kDisableWebRtcEncryption[] = "disable-webrtc-encryption"; | |
| @@ -377,17 +378,18 @@ Signed-off-by: Daniel Charles | |
| // See https://tools.ietf.org/html/rfc7714 for further information. | |
| --- a/content/public/common/content_switches.h | |
| +++ b/content/public/common/content_switches.h | |
| -@@ -102,6 +102,9 @@ CONTENT_EXPORT extern const char kDisabl | |
| +@@ -102,6 +102,10 @@ CONTENT_EXPORT extern const char kDisabl | |
| CONTENT_EXPORT extern const char kDomAutomationController[]; | |
| extern const char kDisable2dCanvasClipAntialiasing[]; | |
| CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[]; | |
| +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | |
| +CONTENT_EXPORT extern const char kEnableAcceleratedVideo[]; | |
| ++CONTENT_EXPORT extern const char kEnableAcceleratedMjpegDecode[]; | |
| +#endif | |
| CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[]; | |
| CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[]; | |
| CONTENT_EXPORT extern const char kEnableAutomation[]; | |
| -@@ -239,8 +242,10 @@ CONTENT_EXPORT extern const char kValida | |
| +@@ -239,8 +243,10 @@ CONTENT_EXPORT extern const char kValida | |
| CONTENT_EXPORT extern const char kWaitForDebuggerChildren[]; | |
| CONTENT_EXPORT extern const char kDisableWebRtcEncryption[]; | |
| @@ -455,22 +457,22 @@ Signed-off-by: Daniel Charles | |
| "cr_bugs": [145531, 332596, 571899, 629434], | |
| --- a/media/gpu/BUILD.gn | |
| +++ b/media/gpu/BUILD.gn | |
| -@@ -501,6 +501,14 @@ if (use_v4l2_codec || use_vaapi || is_ma | |
| +@@ -508,6 +508,14 @@ | |
| } | |
| } | |
| - | |
| + | |
| +if (is_desktop_linux && use_vaapi) { | |
| + import("//build/config/linux/pkg_config.gni") | |
| -+ | |
| ++ | |
| + pkg_config("libva_config") { | |
| + packages = [ "libva" ] | |
| + } | |
| +} | |
| + | |
| - if (use_vaapi) { | |
| + if (use_v4l2_codec || use_vaapi) { | |
| test("jpeg_encode_accelerator_unittest") { | |
| deps = [ | |
| -@@ -571,6 +579,10 @@ if (use_v4l2_codec || use_vaapi) { | |
| +@@ -537,6 +545,10 @@ | |
| if (use_ozone) { | |
| deps += [ "//ui/ozone" ] | |
| } | |
| @@ -480,75 +482,4 @@ Signed-off-by: Daniel Charles | |
| + } | |
| } | |
| } | |
| - | |
| ---- a/media/base/media_switches.cc | |
| -+++ b/media/base/media_switches.cc | |
| -@@ -108,10 +108,15 @@ const char kUseFileForFakeAudioCapture[] | |
| - // accelerator hardware to be present. | |
| - const char kUseFakeJpegDecodeAccelerator[] = "use-fake-jpeg-decode-accelerator"; | |
| - | |
| -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | |
| -+// Enable hardware accelerated mjpeg decode on linux | |
| -+const char kEnableAcceleratedMjpegDecode[] = "enable-accelerated-mjpeg-decode"; | |
| -+#else | |
| - // Disable hardware acceleration of mjpeg decode for captured frame, where | |
| - // available. | |
| - const char kDisableAcceleratedMjpegDecode[] = | |
| - "disable-accelerated-mjpeg-decode"; | |
| -+#endif | |
| - | |
| - // When running tests on a system without the required hardware or libraries, | |
| - // this flag will cause the tests to fail. Otherwise, they silently succeed. | |
| -@@ -460,15 +465,22 @@ const base::Feature kPreloadMediaEngagem | |
| - #endif | |
| - | |
| - bool IsVideoCaptureAcceleratedJpegDecodingEnabled() { | |
| -+ | |
| -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | |
| -+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch( | |
| -+ switches::kEnableAcceleratedMjpegDecode) | |
| -+#else | |
| - if (base::CommandLine::ForCurrentProcess()->HasSwitch( | |
| -- switches::kDisableAcceleratedMjpegDecode)) { | |
| -+ switches::kDisableAcceleratedMjpegDecode) | |
| -+#endif | |
| -+ ) { | |
| - return false; | |
| - } | |
| - if (base::CommandLine::ForCurrentProcess()->HasSwitch( | |
| - switches::kUseFakeJpegDecodeAccelerator)) { | |
| - return true; | |
| - } | |
| --#if defined(OS_CHROMEOS) | |
| -+#if !defined(OS_ANDROID) && defined(OS_LINUX) | |
| - return true; | |
| - #endif | |
| - return false; | |
| ---- a/media/base/media_switches.h | |
| -+++ b/media/base/media_switches.h | |
| -@@ -64,7 +64,11 @@ MEDIA_EXPORT extern const char kUseFakeD | |
| - MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[]; | |
| - MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[]; | |
| - MEDIA_EXPORT extern const char kUseFakeJpegDecodeAccelerator[]; | |
| -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | |
| -+MEDIA_EXPORT extern const char kEnableAcceleratedMjpegDecode[]; | |
| -+#else | |
| - MEDIA_EXPORT extern const char kDisableAcceleratedMjpegDecode[]; | |
| -+#endif | |
| - | |
| - MEDIA_EXPORT extern const char kRequireAudioHardwareForTesting[]; | |
| - MEDIA_EXPORT extern const char kMuteAudio[]; | |
| ---- a/content/browser/utility_process_host.cc | |
| -+++ b/content/browser/utility_process_host.cc | |
| -@@ -304,7 +304,11 @@ bool UtilityProcessHost::StartProcess() | |
| - switches::kOverrideUseSoftwareGLForTests, | |
| - switches::kOverrideEnabledCdmInterfaceVersion, | |
| - switches::kProxyServer, | |
| -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | |
| -+ switches::kEnableAcceleratedMjpegDecode, | |
| -+#else | |
| - switches::kDisableAcceleratedMjpegDecode, | |
| -+#endif | |
| - switches::kUseFakeDeviceForMediaStream, | |
| - switches::kUseFakeJpegDecodeAccelerator, | |
| - switches::kUseFileForFakeVideoCapture, | |
| + | |
| diff --git a/chromium-webrtc.patch b/chromium-webrtc.patch | |
| new file mode 100644 | |
| index 0000000..5a86eea | |
| --- /dev/null | |
| +++ b/chromium-webrtc.patch | |
| @@ -0,0 +1,11 @@ | |
| +--- third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc 2019-01-30 04:20:37.000000000 +0300 | |
| ++++ third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc 2019-01-31 03:11:02.425512211 +0300 | |
| +@@ -15,7 +15,7 @@ | |
| + #include <X11/extensions/Xrender.h> | |
| + | |
| + #include <memory> | |
| +-#include <string> | |
| ++#include <string.h> | |
| + #include <utility> | |
| + | |
| + #include "modules/desktop_capture/desktop_frame.h" | |
| diff --git a/fix-nav-preload-with-third-party-cookie-blocking.patch b/fix-nav-preload-with-third-party-cookie-blocking.patch | |
| deleted file mode 100644 | |
| index dd5473d..0000000 | |
| --- a/fix-nav-preload-with-third-party-cookie-blocking.patch | |
| +++ /dev/null | |
| @@ -1,40 +0,0 @@ | |
| -From c0d0bacc0ae01f15c4d06405057fd35f371bcaf3 Mon Sep 17 00:00:00 2001 | |
| -From: Matt Falkenhagen <falken@chromium.org> | |
| -Date: Tue, 18 Dec 2018 08:31:08 +0000 | |
| -Subject: [PATCH] service worker: Fix nav preload with third-party cookie | |
| - blocking. | |
| - | |
| -In non-ServiceWorkerServicification, the navigation preload request | |
| -wasn't setting site_for_cookies field when converting from a URLRequest | |
| -to ResourceRequest, so StaticCookiePolicy was blocking cookie access | |
| -when third-party cookie blocking was enabled. This meant that cookies | |
| -weren't sent in the navigation preload request. | |
| - | |
| -ServiceWorkerServicification already set set_for_cookies since it just | |
| -passed the ResourceRequest on to the URLLoader for navigation preload. | |
| - | |
| -Test coverage is added as a //chrome browser test. | |
| - | |
| -Bug: 913220 | |
| -Change-Id: I03acb2c0b67d4645d3f6147b2ac9426a68935dee | |
| -Reviewed-on: https://chromium-review.googlesource.com/c/1379792 | |
| -Commit-Queue: Matt Falkenhagen <falken@chromium.org> | |
| -Reviewed-by: Tsuyoshi Horo <horo@chromium.org> | |
| -Cr-Commit-Position: refs/heads/master@{#617414} | |
| ---- | |
| - .../browser/service_worker/service_worker_fetch_dispatcher.cc | 2 +- | |
| - 1 file changed, 1 insertion(+), 1 deletion(-) | |
| - | |
| -diff --git a/content/browser/service_worker/service_worker_fetch_dispatcher.cc b/content/browser/service_worker/service_worker_fetch_dispatcher.cc | |
| -index 413842dd85..049da64651 100644 | |
| ---- a/content/browser/service_worker/service_worker_fetch_dispatcher.cc | |
| -+++ b/content/browser/service_worker/service_worker_fetch_dispatcher.cc | |
| -@@ -616,7 +616,7 @@ bool ServiceWorkerFetchDispatcher::MaybeStartNavigationPreload( | |
| - network::ResourceRequest request; | |
| - request.method = original_request->method(); | |
| - request.url = original_request->url(); | |
| -- // TODO(horo): Set site_for_cookies to support Same-site Cookies. | |
| -+ request.site_for_cookies = original_request->site_for_cookies(); | |
| - request.request_initiator = | |
| - original_request->initiator().has_value() | |
| - ? original_request->initiator() |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment