updates from extra/chromium

3 files changed, 58 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3b1ef368c781..8ded5e578e5c 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 = 1
+	pkgrel = 3
 	url = https://www.chromium.org/Home
 	install = chromium.install
 	arch = x86_64
@@ -33,20 +33,20 @@ pkgbase = chromium-vaapi
 	depends = desktop-file-utils
 	depends = hicolor-icon-theme
 	depends = libva
-	depends = flac
-	depends = ffmpeg
-	depends = fontconfig
 	depends = icu
-	depends = opus
-	depends = minizip
 	depends = libxml2
+	depends = fontconfig
 	depends = harfbuzz
-	depends = libxslt
-	depends = freetype2
-	depends = re2
-	depends = libwebp
 	depends = libjpeg
+	depends = re2
 	depends = snappy
+	depends = ffmpeg
+	depends = flac
+	depends = libwebp
+	depends = minizip
+	depends = libxslt
+	depends = freetype2
+	depends = opus
 	optdepends = pepper-flash: support for Flash content
 	optdepends = kdialog: needed for file dialogs in KDE
 	optdepends = gnome-keyring: for storing passwords in GNOME keyring
@@ -58,6 +58,7 @@ pkgbase = chromium-vaapi
 	conflicts = chromium
 	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-71.0.3578.98.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
@@ -66,6 +67,7 @@ pkgbase = chromium-vaapi
 	source = chromium-vaapi-r21.patch
 	sha256sums = 1c56a9e30825774c83d568d194e9585625c6e90f81ee0ef09760fcedc86b9d45
 	sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
+	sha256sums = d2c497f3400baad7d380305f4705fd1e5b9f70a8460384490a1bb78e1c2b0f23
 	sha256sums = 1b370d49c43e88acfe7c0b1f9517047e927f3407bd80b4a48bba32c001f80136
 	sha256sums = c4f2d1bed9034c02b8806f00c2e8165df24de467803855904bff709ceaf11af5
 	sha256sums = d081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b
diff --git a/PKGBUILD b/PKGBUILD
index 2da3b849110d..c91f8da93ad0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 
 pkgname=chromium-vaapi
 pkgver=71.0.3578.98
-pkgrel=1
+pkgrel=3
 _launcher_ver=6
 pkgdesc="Chromium with VA-API support to enable hardware acceleration"
 arch=('x86_64')
@@ -34,6 +34,7 @@ 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
@@ -42,6 +43,7 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         chromium-vaapi-r21.patch)
 sha256sums=('1c56a9e30825774c83d568d194e9585625c6e90f81ee0ef09760fcedc86b9d45'
             '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
+            'd2c497f3400baad7d380305f4705fd1e5b9f70a8460384490a1bb78e1c2b0f23'
             '1b370d49c43e88acfe7c0b1f9517047e927f3407bd80b4a48bba32c001f80136'
             'c4f2d1bed9034c02b8806f00c2e8165df24de467803855904bff709ceaf11af5'
             'd081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b'
@@ -97,6 +99,9 @@ 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
 
diff --git a/fix-nav-preload-with-third-party-cookie-blocking.patch b/fix-nav-preload-with-third-party-cookie-blocking.patch
new file mode 100644
index 000000000000..dd5473d02fce
--- /dev/null
+++ b/fix-nav-preload-with-third-party-cookie-blocking.patch
@@ -0,0 +1,40 @@
+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()