Date: Sunday, April 14, 2019 @ 03:40:45 Author: tensor5 Revision: 451565
upgpkg: electron 4.1.4-1 Added: electron/trunk/intersection-observer-no-tests.patch Modified: electron/trunk/PKGBUILD --------------------------------------+ PKGBUILD | 12 ++++-- intersection-observer-no-tests.patch | 60 +++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-04-14 03:17:02 UTC (rev 451564) +++ PKGBUILD 2019-04-14 03:40:45 UTC (rev 451565) @@ -1,11 +1,11 @@ # Maintainer: Nicola Squartini <[email protected]> pkgname=electron -pkgver=4.1.1 -_commit=f005ac8d8bef44df20cf4e75f54450de8e003782 +pkgver=4.1.4 +_commit=042f24c5b619f209c040ef34c2b5ca1366c41fdd #_chromiumver=69.0.3497.128 _chromiumver=69.0.3497.120 -pkgrel=2 +pkgrel=1 pkgdesc='Build cross platform desktop apps with web technologies' arch=('x86_64') url='https://electronjs.org/' @@ -26,6 +26,7 @@ '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' @@ -37,6 +38,7 @@ 'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3' 'c4f2d1bed9034c02b8806f00c2e8165df24de467803855904bff709ceaf11af5' '97b421bc60a4abdf37de2d88a51b973e9f68fb44d1eccd464adfb3d9f5d71478' + 'b19870305e72288f6aef42a3b885751aea482b7bfc0b32898fe58e075d5e7c8a' '9cae9ded6497afd15ad72d963897425ab6c7f28941bb3c3948e7996610a0d180') _system_libs=('ffmpeg' @@ -89,7 +91,9 @@ sed -e "s/'am'/'apply'/" -i src/electron/script/lib/git.py echo "Running hooks..." - # python2 "${srcdir}/depot_tools/gclient.py" runhooks + cd src + patch -Np1 -i ../intersection-observer-no-tests.patch + cd .. python2 src/electron/script/apply_all_patches.py \ src/electron/patches/common/config.json cd src/electron Added: intersection-observer-no-tests.patch =================================================================== --- intersection-observer-no-tests.patch (rev 0) +++ intersection-observer-no-tests.patch 2019-04-14 03:40:45 UTC (rev 451565) @@ -0,0 +1,60 @@ +--- 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
