Date: Thursday, April 25, 2019 @ 10:42:09 Author: tensor5 Revision: 453700
upgpkg: electron 5.0.0-1 Added: electron/trunk/chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch electron/trunk/chromium-color_utils-use-std-sqrt.patch electron/trunk/chromium-media-fix-build-with-libstdc++.patch Modified: electron/trunk/PKGBUILD electron/trunk/chromium-skia-harmony.patch electron/trunk/chromium-system-icu.patch electron/trunk/default_app-icon.patch electron/trunk/use-system-libraries-in-node.patch Deleted: electron/trunk/fix-cfi-icall-failure-with-use_system_libjpeg-true.patch electron/trunk/intersection-observer-no-tests.patch electron/trunk/only-disable-cfi-icall-when-use_system_libjpeg-true.patch ------------------------------------------------------------------+ PKGBUILD | 53 +++--- chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch | 34 ++++ chromium-color_utils-use-std-sqrt.patch | 48 ++++++ chromium-media-fix-build-with-libstdc++.patch | 48 ++++++ chromium-skia-harmony.patch | 76 ---------- chromium-system-icu.patch | 10 - default_app-icon.patch | 6 fix-cfi-icall-failure-with-use_system_libjpeg-true.patch | 52 ------ intersection-observer-no-tests.patch | 60 ------- only-disable-cfi-icall-when-use_system_libjpeg-true.patch | 34 ---- use-system-libraries-in-node.patch | 14 + 11 files changed, 181 insertions(+), 254 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-04-25 08:41:36 UTC (rev 453699) +++ PKGBUILD 2019-04-25 10:42:09 UTC (rev 453700) @@ -1,10 +1,10 @@ # Maintainer: Nicola Squartini <[email protected]> pkgname=electron -pkgver=4.1.4 -_commit=042f24c5b619f209c040ef34c2b5ca1366c41fdd -#_chromiumver=69.0.3497.128 -_chromiumver=69.0.3497.120 +pkgver=5.0.0 +_commit=7514372e7959d7e44286797a2f3688382d6a90b3 +#_chromiumver=73.0.3683.119 +_chromiumver=73.0.3683.114 pkgrel=1 pkgdesc='Build cross platform desktop apps with web technologies' arch=('x86_64') @@ -12,8 +12,9 @@ license=('MIT' 'custom') depends=('c-ares' 'ffmpeg' 'gtk3' 'http-parser' 'libevent' 'libnghttp2' 'libxslt' 'libxss' 'minizip' 'nss' 're2' 'snappy') -makedepends=('clang' 'git' 'gn' 'gperf' 'harfbuzz-icu' 'jsoncpp' 'libnotify' - 'lld' 'llvm' 'ninja' 'npm' 'pciutils' 'python2' 'wget' 'yasm') +makedepends=('clang' 'git' 'gn' 'gperf' 'harfbuzz-icu' 'java-runtime-headless' + 'jsoncpp' 'libnotify' 'lld' 'llvm' 'ninja' 'npm' 'pciutils' + 'python2' 'wget' 'yasm') optdepends=('kde-cli-tools: file deletion support (kioclient5)' 'trash-cli: file deletion support (trash-put)' "xdg-utils: open URLs with desktop's default (xdg-email, xdg-open)") @@ -23,23 +24,24 @@ 'electron.desktop' 'default_app-icon.patch' 'use-system-libraries-in-node.patch' + 'chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch' + 'chromium-color_utils-use-std-sqrt.patch' + 'chromium-media-fix-build-with-libstdc++.patch' 'chromium-skia-harmony.patch' 'chromium-system-icu.patch' - 'fix-cfi-icall-failure-with-use_system_libjpeg-true.patch' - 'intersection-observer-no-tests.patch' - 'only-disable-cfi-icall-when-use_system_libjpeg-true.patch' ) sha256sums=('SKIP' - '26ee15090b7ce50b96218ead2b721ce703271f1eea947027147073f4533ba321' + 'b8153bcb1efe620b7f5d9d74c4017771710fc4432872b1f0b73c92146e868d0c' 'SKIP' '5270db01f3f8aaa5137dec275a02caa832b7f2e37942e068cba8d28b3a29df39' - '37372e8afd7c2405a8e50bca95c98b3c78e4c9b681cbef16da9c7a84b45e41e3' - '3a81953701ac976a311db4e17999e67ab7c6de97ff63388f287d6497ef9adb9b' - 'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3' - 'c4f2d1bed9034c02b8806f00c2e8165df24de467803855904bff709ceaf11af5' - '97b421bc60a4abdf37de2d88a51b973e9f68fb44d1eccd464adfb3d9f5d71478' - 'b19870305e72288f6aef42a3b885751aea482b7bfc0b32898fe58e075d5e7c8a' - '9cae9ded6497afd15ad72d963897425ab6c7f28941bb3c3948e7996610a0d180') + 'a9f4d2af71c4399dd01047bb1205c0ca9bb5ce6bf0eeaeb57acf4c69724b668b' + 'e38b50ef16e6fc7520b1892f3b17758db14733d207cc083cfcd899954444248f' + 'f2b12ccf83a8e0adda4a87ae5c983df5e092ccf1f9a6f2e05799ce4d451dbda1' + 'b3b6f5147d519c586cbdaf3b227dd1719676fa3a65edd6f08989087afd287afa' + 'f51fe91427d8638c5551746d2ec7de99e8059dd76889cfeaee8ca3d8fed62265' + '5887f78b55c4ecbbcba5930f3f0bb7bc0117c2a41c2f761805fcf7f46f1ca2b3' + 'e2d284311f49c529ea45083438a768db390bde52949995534034d2a814beab89' + ) _system_libs=('ffmpeg' 'flac' @@ -51,7 +53,7 @@ 'libevent' 'libjpeg' # 'libpng' -# 'libvpx' + 'libvpx' 'libwebp' 'libxml' 'libxslt' @@ -91,9 +93,7 @@ sed -e "s/'am'/'apply'/" -i src/electron/script/lib/git.py echo "Running hooks..." - cd src - patch -Np1 -i ../intersection-observer-no-tests.patch - cd .. + # python2 "${srcdir}/depot_tools/gclient.py" runhooks python2 src/electron/script/apply_all_patches.py \ src/electron/patches/common/config.json cd src/electron @@ -123,10 +123,11 @@ "${_system_libs[@]}" echo "Applying local patches..." - patch -Np4 -i ../chromium-skia-harmony.patch + patch -Np1 -i ../chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch + patch -Np1 -i ../chromium-color_utils-use-std-sqrt.patch + patch -d media -Np1 -i ../../chromium-media-fix-build-with-libstdc++.patch + patch -Np0 -i ../chromium-skia-harmony.patch patch -Np1 -i ../chromium-system-icu.patch - patch -Np1 -i ../fix-cfi-icall-failure-with-use_system_libjpeg-true.patch - patch -Np1 -i ../only-disable-cfi-icall-when-use_system_libjpeg-true.patch patch -Np1 -i ../use-system-libraries-in-node.patch patch -Np1 -i ../default_app-icon.patch # Icon from .desktop file } @@ -155,6 +156,10 @@ ' gn gen out/Release \ --args="import(\"//electron/build/args/release.gn\") ${GN_EXTRA_ARGS}" + ninja -C out/Release electron + # Strip before zip to avoid + # zipfile.LargeZipFile: Filesize would require ZIP64 extensions + strip -s out/Release/electron ninja -C out/Release electron_dist_zip # ninja -C out/Release third_party/electron_node:headers } Added: chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch =================================================================== --- chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch (rev 0) +++ chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch 2019-04-25 10:42:09 UTC (rev 453700) @@ -0,0 +1,34 @@ +From 1fb4edaf534c278a0b7a3150efff8e712c1efe91 Mon Sep 17 00:00:00 2001 +From: Peng Huang <[email protected]> +Date: Tue, 19 Feb 2019 22:01:52 +0000 +Subject: [PATCH] Avoid log flooding in GLSurfacePresentationHelper + +Bug: 879929 +Change-Id: Ifb452736573e65791ed5e3f143778f576854a167 +Reviewed-on: https://chromium-review.googlesource.com/c/1477918 +Commit-Queue: Peng Huang <[email protected]> +Reviewed-by: Antoine Labour <[email protected]> +Cr-Commit-Position: refs/heads/master@{#633415} +--- + ui/gl/gl_surface_presentation_helper.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/ui/gl/gl_surface_presentation_helper.cc b/ui/gl/gl_surface_presentation_helper.cc +index 987725ca1c931..e7bcd1a5b79ff 100644 +--- a/ui/gl/gl_surface_presentation_helper.cc ++++ b/ui/gl/gl_surface_presentation_helper.cc +@@ -237,7 +237,13 @@ void GLSurfacePresentationHelper::CheckPendingFrames() { + &vsync_interval_)) { + vsync_timebase_ = base::TimeTicks(); + vsync_interval_ = base::TimeDelta(); +- LOG(ERROR) << "GetVSyncParametersIfAvailable() failed!"; ++ static unsigned int count = 0; ++ ++count; ++ // GetVSyncParametersIfAvailable() could be called and failed frequently, ++ // so we have to limit the LOG to avoid flooding the log. ++ LOG_IF(ERROR, count < 20 || !(count & 0xff)) ++ << "GetVSyncParametersIfAvailable() failed for " << count ++ << " times!"; + } + } + Added: chromium-color_utils-use-std-sqrt.patch =================================================================== --- chromium-color_utils-use-std-sqrt.patch (rev 0) +++ chromium-color_utils-use-std-sqrt.patch 2019-04-25 10:42:09 UTC (rev 453700) @@ -0,0 +1,48 @@ +From a5ba6f9bb7665040045dc0f8087407096630ad7b Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa <[email protected]> +Date: Fri, 8 Feb 2019 02:57:28 +0000 +Subject: [PATCH] color_utils: Use std::sqrt() instead of std::sqrtf() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes the build with libstdc++: + + ../../ui/gfx/color_utils.cc: In function ‘SkColor color_utils::SetDarkestColorForTesting(SkColor)’: + ../../ui/gfx/color_utils.cc:434:12: error: ‘sqrtf’ is not a member of ‘std’ + std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f; + ^~~~~ + ../../ui/gfx/color_utils.cc:434:12: note: suggested alternative: ‘sqrt’ + std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f; + ^~~~~ + sqrt + +sqrtf() is not formally part of C++14 as far as I can see even though libc++ +has it in <cmath>. Additionally, we're only dealing with floats in all parts +of the expression above, so using the float sqrt() overload should be +harmless anyway. + +Bug: 819294 +Change-Id: If6c7bf31819df97a761e6963def6d6506154c34d +Reviewed-on: https://chromium-review.googlesource.com/c/1458193 +Auto-Submit: Raphael Kubo da Costa <[email protected]> +Reviewed-by: Peter Kasting <[email protected]> +Commit-Queue: Raphael Kubo da Costa <[email protected]> +Cr-Commit-Position: refs/heads/master@{#630140} +--- + ui/gfx/color_utils.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ui/gfx/color_utils.cc b/ui/gfx/color_utils.cc +index c868cd54bac3f..92ba1407d594f 100644 +--- a/ui/gfx/color_utils.cc ++++ b/ui/gfx/color_utils.cc +@@ -431,7 +431,7 @@ SkColor SetDarkestColorForTesting(SkColor color) { + // 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; + } Added: chromium-media-fix-build-with-libstdc++.patch =================================================================== --- chromium-media-fix-build-with-libstdc++.patch (rev 0) +++ chromium-media-fix-build-with-libstdc++.patch 2019-04-25 10:42:09 UTC (rev 453700) @@ -0,0 +1,48 @@ +From d4824fb46a07f3dbecf6358020f0f0da2c586475 Mon Sep 17 00:00:00 2001 +From: Tom Anderson <[email protected]> +Date: Sat, 16 Feb 2019 05:35:55 +0000 +Subject: [PATCH] Fix build with libstdc++ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When building with libstdc++ (use_custom_libcxx=false), we get (different) build +erros when building with clang and gcc. + +clang: + base/optional.h:348:61: error: no member named 'value' in + 'std::is_constructible<media::learning::Value, const + base::Optional<media::learning::Value> &>' + +gcc: + base/optional.h:347:57: error: incomplete type + ‘std::is_constructible<media::learning::Value, + base::Optional<media::learning::Value>&>’ used in nested name specifier + +BUG=931373 + +Change-Id: I133ff4f30398202b5726c605fafee8aa916179d3 +Reviewed-on: https://chromium-review.googlesource.com/c/1475936 +Auto-Submit: Thomas Anderson <[email protected]> +Commit-Queue: Frank Liberato <[email protected]> +Reviewed-by: Frank Liberato <[email protected]> +Cr-Original-Commit-Position: refs/heads/master@{#632921} +Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src +Cr-Mirrored-Commit: 08b9fbc728043c89f21af46796bacd7324b7ce06 +--- + learning/common/value.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/learning/common/value.h b/learning/common/value.h +index 62f4953f6..ef37eebd4 100644 +--- a/learning/common/value.h ++++ b/learning/common/value.h +@@ -27,7 +27,7 @@ class COMPONENT_EXPORT(LEARNING_COMMON) Value { + public: + Value(); + template <typename T> +- explicit Value(T x) : value_(x) { ++ explicit Value(const T& x) : value_(x) { + // We want to rule out mostly pointers, since they wouldn't make much sense. + // Note that the implicit cast would likely fail anyway. + static_assert(std::is_arithmetic<T>::value || std::is_enum<T>::value, Modified: chromium-skia-harmony.patch =================================================================== --- chromium-skia-harmony.patch 2019-04-25 08:41:36 UTC (rev 453699) +++ chromium-skia-harmony.patch 2019-04-25 10:42:09 UTC (rev 453700) @@ -1,77 +1,13 @@ ---- 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.orig 2019-01-20 10:54:56.415239030 +0000 ++++ third_party/skia/src/ports/SkFontHost_FreeType.cpp 2019-01-20 10:55:05.695307733 +0000 +@@ -121,8 +121,8 @@ public: : fGetVarDesignCoordinates(nullptr) + , fGetVarAxisFlags(nullptr) , fLibrary(nullptr) - , fIsLCDSupported(false) - , fLCDExtra(0) ++ , fIsLCDSupported(true) ++ , fLCDExtra(2) { if (FT_New_Library(&gFTMemory, &fLibrary)) { return; -@@ -147,12 +145,7 @@ - } - #endif - -- // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs. -- // The default has changed over time, so this doesn't mean the same thing to all users. -- if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) { -- fIsLCDSupported = true; -- fLCDExtra = 2; //Using a filter adds one full pixel to each side. -- } -+ FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT); - } - ~FreeTypeLibrary() { - if (fLibrary) { -@@ -161,8 +153,6 @@ - } - - FT_Library library() { return fLibrary; } -- bool isLCDSupported() { return fIsLCDSupported; } -- int lcdExtra() { return fLCDExtra; } - - // 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 @@ - - private: - FT_Library fLibrary; -- bool fIsLCDSupported; -- int fLCDExtra; - - // 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 @@ - rec->fTextSize = SkIntToScalar(1 << 14); - } - -- if (isLCD(*rec)) { -- // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr. -- SkAutoMutexAcquire ama(gFTMutex); -- ref_ft_library(); -- if (!gFTLibrary->isLCDSupported()) { -- // If the runtime Freetype library doesn't support LCD, disable it here. -- rec->fMaskFormat = SkMask::kA8_Format; -- } -- unref_ft_library(); -- } -- - SkPaint::Hinting h = rec->getHinting(); - if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) { - // collapse full->normal hinting if we're not doing LCD -@@ -1115,11 +1092,11 @@ - void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) { - if (isLCD(fRec)) { - if (fLCDIsVert) { -- glyph->fHeight += gFTLibrary->lcdExtra(); -- glyph->fTop -= gFTLibrary->lcdExtra() >> 1; -+ glyph->fHeight += 2; -+ glyph->fTop -= 1; - } else { -- glyph->fWidth += gFTLibrary->lcdExtra(); -- glyph->fLeft -= gFTLibrary->lcdExtra() >> 1; -+ glyph->fWidth += 2; -+ glyph->fLeft -= 1; - } - } - } Modified: chromium-system-icu.patch =================================================================== --- chromium-system-icu.patch 2019-04-25 08:41:36 UTC (rev 453699) +++ chromium-system-icu.patch 2019-04-25 10:42:09 UTC (rev 453700) @@ -1,7 +1,7 @@ -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 +diff --git a/third_party/blink/renderer/platform/text/character_property_data.h b/third_party/blink/renderer/platform/text/character_property_data.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 +--- a/third_party/blink/renderer/platform/text/character_property_data.h ++++ b/third_party/blink/renderer/platform/text/character_property_data.h @@ -244,10 +244,12 @@ static const UChar32 kIsHangulRanges[] = { 0xD7B0, 0xD7FF, // Halfwidth Hangul Jamo @@ -15,5 +15,5 @@ + 0xFFDC, +}; - } // namespace blink - + #if !defined(USING_SYSTEM_ICU) + // Freezed trie tree, see character_property_data_generator.cc. Modified: default_app-icon.patch =================================================================== --- default_app-icon.patch 2019-04-25 08:41:36 UTC (rev 453699) +++ default_app-icon.patch 2019-04-25 10:42:09 UTC (rev 453700) @@ -1,6 +1,6 @@ --- a/electron/default_app/default_app.js +++ b/electron/default_app/default_app.js -@@ -27,7 +27,7 @@ +@@ -28,7 +28,7 @@ } if (process.platform === 'linux') { @@ -11,7 +11,7 @@ mainWindow = new BrowserWindow(options) --- a/electron/filenames.gni +++ b/electron/filenames.gni -@@ -95,7 +95,6 @@ +@@ -92,7 +92,6 @@ default_app_sources = [ "default_app/default_app.js", @@ -18,4 +18,4 @@ - "default_app/icon.png", "default_app/index.html", "default_app/main.js", - "default_app/menu.js", + "default_app/package.json", Deleted: fix-cfi-icall-failure-with-use_system_libjpeg-true.patch =================================================================== --- fix-cfi-icall-failure-with-use_system_libjpeg-true.patch 2019-04-25 08:41:36 UTC (rev 453699) +++ fix-cfi-icall-failure-with-use_system_libjpeg-true.patch 2019-04-25 10:42:09 UTC (rev 453700) @@ -1,52 +0,0 @@ -From db82db1b609f30d144d45477f55697818bcd363c Mon Sep 17 00:00:00 2001 -From: Vlad Tsyrklevich <[email protected]> -Date: Tue, 31 Jul 2018 01:03:22 +0000 -Subject: [PATCH] Fix cfi-icall failure with use_system_libjpeg=true - -JPEGImageReader::AllocateSampleArray() can call the function pointer -(*info_.mem->alloc_sarray) which can be set by the systems non-CFI -enabled libjpeg DSO when chromium is built with use_system_libjpeg=true. -Disable cfi-icall for that method. - -Bug: 866290 -Change-Id: I6d9bbf08c514d6d5f48ad34c3802c63419ed1223 -Reviewed-on: https://chromium-review.googlesource.com/1155927 -Reviewed-by: Kentaro Hara <[email protected]> -Commit-Queue: Vlad Tsyrklevich <[email protected]> -Cr-Commit-Position: refs/heads/master@{#579270} ---- - .../renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc | 2 +- - third_party/blink/renderer/platform/wtf/compiler.h | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc -index a1e440f6eed5..fd4e72ba053c 100644 ---- a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc -+++ b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc -@@ -643,7 +643,7 @@ class JPEGImageReader final { - IntSize UvSize() const { return uv_size_; } - - private: -- JSAMPARRAY AllocateSampleArray() { -+ NO_SANITIZE_CFI_ICALL JSAMPARRAY AllocateSampleArray() { - // Some output color spaces don't need the sample array: don't allocate in that - // case. - #if defined(TURBO_JPEG_RGB_SWIZZLE) -diff --git a/third_party/blink/renderer/platform/wtf/compiler.h b/third_party/blink/renderer/platform/wtf/compiler.h -index 51595afdc955..5225a70309d6 100644 ---- a/third_party/blink/renderer/platform/wtf/compiler.h -+++ b/third_party/blink/renderer/platform/wtf/compiler.h -@@ -57,8 +57,10 @@ - #if defined(__clang__) - #define NO_SANITIZE_UNRELATED_CAST \ - __attribute__((no_sanitize("cfi-unrelated-cast", "vptr"))) -+#define NO_SANITIZE_CFI_ICALL __attribute__((no_sanitize("cfi-icall"))) - #else - #define NO_SANITIZE_UNRELATED_CAST -+#define NO_SANITIZE_CFI_ICALL - #endif - - #endif /* WTF_Compiler_h */ --- -2.18.0 - Deleted: intersection-observer-no-tests.patch =================================================================== --- intersection-observer-no-tests.patch 2019-04-25 08:41:36 UTC (rev 453699) +++ intersection-observer-no-tests.patch 2019-04-25 10:42:09 UTC (rev 453700) @@ -1,60 +0,0 @@ ---- a/electron/patches/common/chromium/intersection-observer.patch -+++ b/electron/patches/common/chromium/intersection-observer.patch -@@ -8,57 +8,6 @@ - - Backports https://chromium-review.googlesource.com/c/chromium/src/+/1250121 - --diff --git a/third_party/WebKit/LayoutTests/external/wpt/intersection-observer/bounding-box.html b/third_party/WebKit/LayoutTests/external/wpt/intersection-observer/bounding-box.html --index 69052b11ce6c40c6a56fe2b723c70c49ddc36dd9..50f33f0443bb70e64bec2e2fcc930fa2b4118ed6 100644 ----- a/third_party/WebKit/LayoutTests/external/wpt/intersection-observer/bounding-box.html --+++ b/third_party/WebKit/LayoutTests/external/wpt/intersection-observer/bounding-box.html --@@ -13,7 +13,7 @@ pre, #log { -- overflow: visible; -- height: 200px; -- width: 160px; --- border: 7px solid black; --+ border: 8px solid black; -- } -- #target { -- margin: 10px; --@@ -50,12 +50,35 @@ function step0() { -- var targetBounds = clientBounds(target); -- target.style.transform = "translateY(195px)"; -- runTestCycle(step1, "target.style.transform = 'translateY(195px)'"); --- checkLastEntry(entries, 0, targetBounds.concat(0, 0, 0, 0, 8, 182, 8, 222, false)); --+ checkLastEntry(entries, 0, targetBounds.concat(0, 0, 0, 0, 8, 184, 8, 224, false)); -- } -- -- function step1() { --+ var targetBounds = clientBounds(target); --+ target.style.transform = "translateY(300px)"; --+ runTestCycle(step2, "target.style.transform = 'translateY(300px)'"); --+ checkLastEntry(entries, 1, targetBounds.concat(26, 146, 221, 224, 8, 184, 8, 224, true)); --+} --+ --+function step2() { -- var targetBounds = clientBounds(target); -- target.style.transform = ""; --- checkLastEntry(entries, 1, targetBounds.concat(25, 145, 220, 222, 8, 182, 8, 222, true)); --+ target.style.zoom = "2"; --+ runTestCycle(step3, "target.style.zoom = 2"); --+ checkLastEntry(entries, 2, targetBounds.concat(0, 0, 0, 0, 8, 184, 8, 224, false)); -- } --+ --+function step3() { --+ var targetBounds = clientBounds(target); --+ var intersectionWidth = ( --+ 176 // root width including border --+ -8 // root left border --+ -20 // target left margin * target zoom --+ ) / 2; // convert to target's zoom factor. --+ var intersectionHeight = (216 - 8 - 20) / 2; --+ var intersectionRect = [targetBounds[0], targetBounds[0] + intersectionWidth, --+ targetBounds[2], targetBounds[2] + intersectionHeight]; --+ checkLastEntry(entries, 3, targetBounds.concat(intersectionRect).concat(8, 184, 8, 224, true)); --+} --+ -- </script> - diff --git a/third_party/blink/renderer/core/intersection_observer/intersection_observation.cc b/third_party/blink/renderer/core/intersection_observer/intersection_observation.cc - index 8b355a9f0b1e567950f8b5e9525d3af3e56605c4..d44b8b4e50f2a9de0628ebfb1bfdeac0292f79b5 100644 - --- a/third_party/blink/renderer/core/intersection_observer/intersection_observation.cc Deleted: only-disable-cfi-icall-when-use_system_libjpeg-true.patch =================================================================== --- only-disable-cfi-icall-when-use_system_libjpeg-true.patch 2019-04-25 08:41:36 UTC (rev 453699) +++ only-disable-cfi-icall-when-use_system_libjpeg-true.patch 2019-04-25 10:42:09 UTC (rev 453700) @@ -1,34 +0,0 @@ -From 20f81a066ffdf6bd30fb4b696b8b3e101368e2f6 Mon Sep 17 00:00:00 2001 -From: Vlad Tsyrklevich <[email protected]> -Date: Tue, 31 Jul 2018 23:21:09 +0000 -Subject: [PATCH] Only disable cfi-icall when use_system_libjpeg=true - -Bug: 866290 -Change-Id: Ic5d175b3b854665f50781650406d599d09ee9849 -Reviewed-on: https://chromium-review.googlesource.com/1157136 -Reviewed-by: Kentaro Hara <[email protected]> -Commit-Queue: Vlad Tsyrklevich <[email protected]> -Cr-Commit-Position: refs/heads/master@{#579614} ---- - .../platform/image-decoders/jpeg/jpeg_image_decoder.cc | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc -index fd4e72ba053c..afa90d83efee 100644 ---- a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc -+++ b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc -@@ -643,7 +643,10 @@ class JPEGImageReader final { - IntSize UvSize() const { return uv_size_; } - - private: -- NO_SANITIZE_CFI_ICALL JSAMPARRAY AllocateSampleArray() { -+#if defined(USE_SYSTEM_LIBJPEG) -+ NO_SANITIZE_CFI_ICALL -+#endif -+ JSAMPARRAY AllocateSampleArray() { - // Some output color spaces don't need the sample array: don't allocate in that - // case. - #if defined(TURBO_JPEG_RGB_SWIZZLE) --- -2.18.0 - Modified: use-system-libraries-in-node.patch =================================================================== --- use-system-libraries-in-node.patch 2019-04-25 08:41:36 UTC (rev 453699) +++ use-system-libraries-in-node.patch 2019-04-25 10:42:09 UTC (rev 453700) @@ -1,7 +1,7 @@ --- a/third_party/electron_node/BUILD.gn +++ b/third_party/electron_node/BUILD.gn @@ -42,6 +42,18 @@ - node_release_urlbase = "" + node_module_version = "" } +if (is_linux) { @@ -18,19 +18,21 @@ + assert(!node_use_dtrace, "node_use_dtrace not supported in GN") assert(!node_use_etw, "node_use_etw not supported in GN") - assert(!node_use_perfctr, "node_use_perfctr not supported in GN") -@@ -128,10 +140,6 @@ + +@@ -206,12 +218,8 @@ component("node_lib") { deps = [ ":node_js2c", - "deps/cares", + "deps/histogram", - "deps/http_parser", + "deps/llhttp", - "deps/nghttp2", - "deps/zlib", + "//third_party/brotli:dec", + "//third_party/brotli:enc", "//v8:v8_libplatform", - ] - public_deps = [ -@@ -141,6 +149,21 @@ +@@ -225,6 +233,21 @@ public_configs = [ ":node_lib_config" ] include_dirs = [ "src" ] libs = []
