Hello community,

here is the log from the commit of package chromium for openSUSE:Factory 
checked in at 2018-07-01 21:26:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
 and      /work/SRC/openSUSE:Factory/.chromium.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "chromium"

Sun Jul  1 21:26:35 2018 rev:190 rq:619743 version:67.0.3396.87

Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes        2018-05-29 
10:48:00.497654914 +0200
+++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes   2018-07-01 
21:28:04.796637331 +0200
@@ -1,0 +2,64 @@
+Fri Jun 15 19:51:32 UTC 2018 - tchva...@suse.com
+
+- Add patch to build under gcc8:
+  * chromium-gcc8.patch
+
+-------------------------------------------------------------------
+Wed Jun 13 09:26:43 UTC 2018 - secur...@suse.com
+
+- Chromium 67.0.3396.87:
+  * CVE-2018-6149: Out of bounds write in V8 (boo#1097452)
+
+-------------------------------------------------------------------
+Thu Jun  7 12:23:26 UTC 2018 - astie...@suse.com
+
+- Chromium 67.0.3396.79: 
+  * CVE-2018-6148: Incorrect handling of CSP header (boo#1096508)
+
+-------------------------------------------------------------------
+Fri Jun  1 17:45:46 UTC 2018 - tchva...@suse.com
+
+- Require ffmpeg >= 4.0 bsc#1095545
+
+-------------------------------------------------------------------
+Wed May 30 11:18:13 UTC 2018 - tchva...@suse.com
+
+- Update to 67.0.3396.62 bsc#1095163
+  * CVE-2018-6123: Use after free in Blink.
+  * CVE-2018-6124: Type confusion in Blink.
+  * CVE-2018-6125: Overly permissive policy in WebUSB.
+  * CVE-2018-6126: Heap buffer overflow in Skia.
+  * CVE-2018-6127: Use after free in indexedDB.
+  * CVE-2018-6128: uXSS in Chrome on iOS.
+  * CVE-2018-6129: Out of bounds memory access in WebRTC.
+  * CVE-2018-6130: Out of bounds memory access in WebRTC.
+  * CVE-2018-6131: Incorrect mutability protection in WebAssembly.
+  * CVE-2018-6132: Use of uninitialized memory in WebRTC.
+  * CVE-2018-6133: URL spoof in Omnibox.
+  * CVE-2018-6134: Referrer Policy bypass in Blink.
+  * CVE-2018-6135: UI spoofing in Blink.
+  * CVE-2018-6136: Out of bounds memory access in V8.
+  * CVE-2018-6137: Leak of visited status of page in Blink.
+  * CVE-2018-6138: Overly permissive policy in Extensions.
+  * CVE-2018-6139: Restrictions bypass in the debugger extension API.
+  * CVE-2018-6140: Restrictions bypass in the debugger extension API.
+  * CVE-2018-6141: Heap buffer overflow in Skia.
+  * CVE-2018-6142: Out of bounds memory access in V8.
+  * CVE-2018-6143: Out of bounds memory access in V8.
+  * CVE-2018-6144: Out of bounds memory access in PDFium.
+  * CVE-2018-6145: Incorrect escaping of MathML in Blink.
+  * CVE-2018-6147: Password fields not taking advantage of OS protections in 
Views.
+- Add patches to build on aarch and remove obsolete one:
+  * chromium-crashpad-aarch64-fix.patch
+  * chromium-skia-aarch64-buildfix.patch
+  * chromium-65.0.3325.162-skia-aarch64-buildfix.patch
+  * chromium-skia-neon.patch
+- Remove no longer needed gcc patch:
+  * chromium-gcc7.patch
+- Rebase patches:
+  * chromium-non-void-return.patch
+  * chromium-vaapi.patch
+  * exclude_ymp.patch
+  * fix_building_widevinecdm_with_chromium.patch
+
+-------------------------------------------------------------------

Old:
----
  chromium-65.0.3325.162-skia-aarch64-buildfix.patch
  chromium-66.0.3359.181.tar.xz
  chromium-gcc7.patch
  chromium-skia-neon.patch

New:
----
  chromium-67.0.3396.87.tar.xz
  chromium-crashpad-aarch64-fix.patch
  chromium-gcc8.patch
  chromium-skia-aarch64-buildfix.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.WwxLwr/_old  2018-07-01 21:28:12.752627010 +0200
+++ /var/tmp/diff_new_pack.WwxLwr/_new  2018-07-01 21:28:12.752627010 +0200
@@ -32,20 +32,20 @@
 %bcond_with system_libxml
 %bcond_with system_harfbuzz
 %endif
-%bcond_with system_vpx
-%bcond_with clang
 %ifarch aarch64
 %bcond_with swiftshader
 %else
 %bcond_without swiftshader
 %endif
+%bcond_with system_vpx
+%bcond_with clang
 Name:           chromium
-Version:        66.0.3359.181
+Version:        67.0.3396.87
 Release:        0
 Summary:        Google's open source browser project
 License:        BSD-3-Clause AND LGPL-2.1-or-later
 Group:          Productivity/Networking/Web/Browsers
-Url:            http://code.google.com/p/chromium/
+URL:            http://code.google.com/p/chromium/
 Source0:        
http://commondatastorage.googleapis.com/chromium-browser-official/%{rname}-%{version}.tar.xz
 # Toolchain definitions
 Source1:        BUILD.gn
@@ -68,8 +68,8 @@
 Patch6:         chromium-non-void-return.patch
 Patch7:         chromium-ffmpeg.patch
 Patch8:         chromium-drm.patch
-Patch9:         chromium-gcc7.patch
-Patch10:        chromium-sandbox-pie.patch
+Patch9:         chromium-sandbox-pie.patch
+Patch10:        chromium-gcc8.patch
 # Google seem not too keen on merging this but GPU accel is quite important
 #  https://chromium-review.googlesource.com/c/chromium/src/+/532294
 Patch100:       chromium-vaapi.patch
@@ -79,12 +79,12 @@
 # GN buildsystem related patches
 Patch200:       chromium-last-commit-position-r0.patch
 Patch201:       fix-gn-bootstrap.patch
-# PATCH-FIX-SUSE: allow codecs to be set with chromium branding
+# PATCH-FIX-SUSE: allow proprietary codecs to be set with chromium branding
 Patch202:       chromium-prop-codecs.patch
-# PATCH-FIX-UPSTREAM fedora patch to fix skia build on aarch64
-Patch300:       chromium-65.0.3325.162-skia-aarch64-buildfix.patch
-# PATCH-FIX-UPSTREAM backport commit b84682 to fix skia with GCC on aarch64 - 
https://chromium.googlesource.com/chromium/src/+/b84682f31dc99b9c90f5a04947075815697c68d9
-Patch301:       chromium-skia-neon.patch
+# PATCH-FIX-UPSTREAM: fix skia build on aarch64
+Patch300:       chromium-skia-aarch64-buildfix.patch
+# PATCH-FIX-UPSTREAM: fix crashpad build on aarch64
+Patch301:       chromium-crashpad-aarch64-fix.patch
 BuildRequires:  SDL-devel
 BuildRequires:  binutils-gold
 BuildRequires:  bison
@@ -137,7 +137,7 @@
 BuildRequires:  pkgconfig(krb5)
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavfilter)
-BuildRequires:  pkgconfig(libavformat) >= 57.41.100
+BuildRequires:  pkgconfig(libavformat) >= 58
 BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  pkgconfig(libdc1394-2)
@@ -149,10 +149,6 @@
 BuildRequires:  pkgconfig(libpci)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libssl)
-%ifnarch aarch64
-# Current tcmalloc does not support AArch64
-BuildRequires:  pkgconfig(libtcmalloc)
-%endif
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(minizip)
@@ -201,6 +197,10 @@
 Obsoletes:      chromium-ffmpegsumo
 # no 32bit supported and it takes ages to build
 ExcludeArch:    %{arm} i586 ppc ppc64 ppc64le
+%ifnarch aarch64
+# Current tcmalloc does not support AArch64
+BuildRequires:  pkgconfig(libtcmalloc)
+%endif
 %if %{with system_harfbuzz}
 BuildRequires:  pkgconfig(harfbuzz) >= 1.7.0
 %endif
@@ -284,6 +284,7 @@
     third_party/WebKit
     third_party/analytics
     third_party/angle
+    third_party/apple_apsl
     third_party/angle/src/common/third_party/base
     third_party/angle/src/common/third_party/smhasher
     third_party/angle/src/third_party/compiler
@@ -312,6 +313,8 @@
     third_party/catapult/tracing/third_party/pako
     third_party/ced
     third_party/cld_3
+    third_party/crashpad
+    third_party/crashpad/crashpad/third_party/zlib
     third_party/crc32c
     third_party/cros_system_api
     third_party/devscripts
@@ -488,9 +491,11 @@
 )
 %endif
 %if !%{with sle_bundles}
-gn_system_libraries+=( libwebp )
-gn_system_libraries+=( yasm )
-gn_system_libraries+=( zlib )
+gn_system_libraries+=(
+    libwebp
+    yasm
+    zlib
+)
 %endif
 %if %{with system_icu}
 gn_system_libraries+=( icu )
@@ -677,8 +682,8 @@
 /sbin/ldconfig %{_libdir}/chromium
 
 %files
-%license LICENSE
 %verify(not mode) %{_libexecdir}/chrome_sandbox
+%license LICENSE
 %doc AUTHORS
 %config %{_sysconfdir}/chromium
 %config(noreplace) %{_sysconfdir}/default/chromium
@@ -699,7 +704,6 @@
 %{_bindir}/chromium
 
 %files -n chromedriver
-%license LICENSE
 %{_libdir}/chromium/chromedriver
 
 %changelog

++++++ chromium-66.0.3359.181.tar.xz -> chromium-67.0.3396.87.tar.xz ++++++
/work/SRC/openSUSE:Factory/chromium/chromium-66.0.3359.181.tar.xz 
/work/SRC/openSUSE:Factory/.chromium.new/chromium-67.0.3396.87.tar.xz differ: 
char 26, line 1

++++++ chromium-crashpad-aarch64-fix.patch ++++++
--- 
chromium-67.0.3396.40.orig/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
  2018-05-14 10:28:12.305409792 +0200
+++ 
chromium-67.0.3396.40/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
       2018-05-14 10:36:54.547875861 +0200
@@ -288,7 +288,7 @@ CAPTURECONTEXT_SYMBOL2:
 #elif defined(__aarch64__)
 
   // Zero out fault_address, which is unused.
-  str x31, [x0, #0xb0]  // context->uc_mcontext.fault_address
+  str XZR, [x0, #0xb0]  // context->uc_mcontext.fault_address
 
   // Save general purpose registers in context->uc_mcontext.regs[i].
   // The original x0 can't be recovered.
++++++ chromium-gcc7.patch -> chromium-gcc8.patch ++++++
--- /work/SRC/openSUSE:Factory/chromium/chromium-gcc7.patch     2018-04-20 
17:32:42.371497702 +0200
+++ /work/SRC/openSUSE:Factory/.chromium.new/chromium-gcc8.patch        
2018-07-01 21:28:04.744637398 +0200
@@ -1,177 +1,50 @@
---- chromium-66.0.3355.0.orig/device/fido/device_response_converter.cc 
2018-03-09 12:04:44.988233476 +0100
-+++ chromium-66.0.3355.0/device/fido/device_response_converter.cc      
2018-03-09 13:08:48.566680438 +0100
-@@ -121,7 +121,7 @@
-     response.SetNumCredentials(it->second.GetUnsigned());
+diff -up 
chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix
 chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h
+--- 
chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix
     2018-05-30 04:43:17.000000000 -0400
++++ 
chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h  
   2018-05-30 12:33:03.268912315 -0400
+@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo {
+ 
+   bool is_valid() const { return handle_.is_valid(); }
+ 
+-  explicit operator bool() const { return handle_; }
++  explicit operator bool() const { return (bool) handle_; }
+ 
+   ScopedInterfaceEndpointHandle PassHandle() {
+     return std::move(handle_);
+diff -up 
chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h.boolfix
 chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h
+--- 
chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h.boolfix
      2018-05-30 04:43:17.000000000 -0400
++++ 
chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h   
   2018-05-30 12:33:03.269912294 -0400
+@@ -50,7 +50,7 @@ class AssociatedInterfaceRequest {
+   // handle.
+   bool is_pending() const { return handle_.is_valid(); }
+ 
+-  explicit operator bool() const { return handle_; }
++  explicit operator bool() const { return (bool) handle_; }
+ 
+   ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); }
+ 
+diff -up 
chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h.boolfix 
chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h
+--- chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h.boolfix 
2018-05-30 12:33:03.270912274 -0400
++++ chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h 
2018-05-30 12:34:05.156637922 -0400
+@@ -54,7 +54,7 @@ class InterfaceRequest {
+   // Indicates whether the request currently contains a valid message pipe.
+   bool is_pending() const { return handle_.is_valid(); }
+ 
+-  explicit operator bool() const { return handle_.is_valid(); }
++  explicit operator bool() const { return (bool) handle_.is_valid(); }
+ 
+   // Removes the message pipe from the request and returns it.
+   ScopedMessagePipeHandle PassMessagePipe() { return std::move(handle_); }
+--- chromium-67.0.3396.87/build/config/compiler/BUILD.gn.orig  2018-06-16 
13:57:27.583106343 +0200
++++ chromium-67.0.3396.87/build/config/compiler/BUILD.gn       2018-06-16 
14:24:26.713631391 +0200
+@@ -1325,6 +1325,11 @@
+       # comments
+       # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61638
+       cflags += [ "-Wno-comments" ]
++
++      # too many warnings
++      cflags += [ "-Wno-class-memaccess" ]
++      cflags += [ "-Wno-packed-not-aligned" ]
++      cflags += [ "-Wno-int-in-bool-context" ]
+     }
    }
  
--  return response;
-+  return std::move(response);
- }
- 
- base::Optional<AuthenticatorGetInfoResponse> ReadCTAPGetInfoResponse(
-@@ -241,7 +241,7 @@
-     response.SetPinProtocols(std::move(supported_pin_protocols));
-   }
- 
--  return response;
-+  return std::move(response);
- }
- 
- }  // namespace device
-From 4f2b52281ce1649ea8347489443965ad33262ecc Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dap...@lge.com>
-Date: Thu, 08 Mar 2018 17:46:02 +0000
-Subject: [PATCH] GCC: PlaybackImageProvider::Settings: explicitely set copy 
constructor.
-
-GCC fails to resolve the default copy constructor of the flat_map, so
-we add an explicit reference to use default copy constructor.
-
-Bug: 819294
-
-Change-Id: Ie2d69bdbe60742e9253251c965cbf0a936037871
-Reviewed-on: https://chromium-review.googlesource.com/944403
-Reviewed-by: David Reveman <reve...@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dap...@lge.com>
-Cr-Commit-Position: refs/heads/master@{#541827}
----
-
-diff --git a/cc/raster/playback_image_provider.cc 
b/cc/raster/playback_image_provider.cc
-index 557b421..b2ace4d 100644
---- a/cc/raster/playback_image_provider.cc
-+++ b/cc/raster/playback_image_provider.cc
-@@ -20,7 +20,7 @@
- PlaybackImageProvider::PlaybackImageProvider(
-     ImageDecodeCache* cache,
-     const gfx::ColorSpace& target_color_space,
--    base::Optional<Settings> settings)
-+    base::Optional<Settings>&& settings)
-     : cache_(cache),
-       target_color_space_(target_color_space),
-       settings_(std::move(settings)) {
-@@ -70,7 +70,10 @@
- }
- 
- PlaybackImageProvider::Settings::Settings() = default;
--PlaybackImageProvider::Settings::Settings(const Settings& other) = default;
-+PlaybackImageProvider::Settings::Settings(PlaybackImageProvider::Settings&&) =
-+    default;
- PlaybackImageProvider::Settings::~Settings() = default;
-+PlaybackImageProvider::Settings& PlaybackImageProvider::Settings::operator=(
-+    PlaybackImageProvider::Settings&&) = default;
- 
- }  // namespace cc
-diff --git a/cc/raster/playback_image_provider.h 
b/cc/raster/playback_image_provider.h
-index 67974f3..a33092d 100644
---- a/cc/raster/playback_image_provider.h
-+++ b/cc/raster/playback_image_provider.h
-@@ -20,8 +20,10 @@
-  public:
-   struct CC_EXPORT Settings {
-     Settings();
--    Settings(const Settings& other);
-+    Settings(const Settings&) = delete;
-+    Settings(Settings&&);
-     ~Settings();
-+    Settings& operator=(Settings&&);
- 
-     // The set of image ids to skip during raster.
-     PaintImageIdFlatSet images_to_skip;
-@@ -34,7 +36,7 @@
-   // If no settings are provided, all images are skipped during rasterization.
-   PlaybackImageProvider(ImageDecodeCache* cache,
-                         const gfx::ColorSpace& target_color_space,
--                        base::Optional<Settings> settings);
-+                        base::Optional<Settings>&& settings);
-   ~PlaybackImageProvider() override;
- 
-   PlaybackImageProvider(PlaybackImageProvider&& other);
-diff --git a/cc/raster/playback_image_provider_unittest.cc 
b/cc/raster/playback_image_provider_unittest.cc
-index 0206999..40036e8 100644
---- a/cc/raster/playback_image_provider_unittest.cc
-+++ b/cc/raster/playback_image_provider_unittest.cc
-@@ -85,7 +85,8 @@
-   settings.emplace();
-   settings->images_to_skip = {skip_image.stable_id()};
- 
--  PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings);
-+  PlaybackImageProvider provider(&cache, gfx::ColorSpace(),
-+                                 std::move(settings));
- 
-   SkIRect rect = SkIRect::MakeWH(10, 10);
-   SkMatrix matrix = SkMatrix::I();
-@@ -99,7 +100,8 @@
- 
-   base::Optional<PlaybackImageProvider::Settings> settings;
-   settings.emplace();
--  PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings);
-+  PlaybackImageProvider provider(&cache, gfx::ColorSpace(),
-+                                 std::move(settings));
- 
-   {
-     SkRect rect = SkRect::MakeWH(10, 10);
-@@ -127,7 +129,8 @@
-   settings.emplace();
-   settings->image_to_current_frame_index = image_to_frame;
- 
--  PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings);
-+  PlaybackImageProvider provider(&cache, gfx::ColorSpace(),
-+                                 std::move(settings));
- 
-   SkIRect rect = SkIRect::MakeWH(10, 10);
-   SkMatrix matrix = SkMatrix::I();
-@@ -143,7 +146,8 @@
- 
-   base::Optional<PlaybackImageProvider::Settings> settings;
-   settings.emplace();
--  PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings);
-+  PlaybackImageProvider provider(&cache, gfx::ColorSpace(),
-+                                 std::move(settings));
- 
-   {
-     SkIRect rect = SkIRect::MakeWH(10, 10);
-@@ -174,7 +178,8 @@
-   MockDecodeCache cache;
-   base::Optional<PlaybackImageProvider::Settings> settings;
-   settings.emplace();
--  PlaybackImageProvider provider(&cache, gfx::ColorSpace(), settings);
-+  PlaybackImageProvider provider(&cache, gfx::ColorSpace(),
-+                                 std::move(settings));
-   {
-     SkIRect rect = SkIRect::MakeWH(10, 10);
-     SkMatrix matrix = SkMatrix::I();
-diff -urN 
chromium-66.0.3359.45.orig/chrome/browser/supervised_user/supervised_user_url_filter.cc
 
chromium-66.0.3359.45/chrome/browser/supervised_user/supervised_user_url_filter.cc
---- 
chromium-66.0.3359.45.orig/chrome/browser/supervised_user/supervised_user_url_filter.cc
    2018-03-27 16:26:46.164296894 +0200
-+++ 
chromium-66.0.3359.45/chrome/browser/supervised_user/supervised_user_url_filter.cc
 2018-03-27 16:27:54.889425873 +0200
-@@ -368,7 +368,7 @@
- 
-   // Allow navigations to whitelisted origins (currently families.google.com).
-   static const base::NoDestructor<base::flat_set<GURL>> kWhitelistedOrigins(
--      {GURL(kFamiliesUrl).GetOrigin()});
-+      base::flat_set<GURL>({GURL(kFamiliesUrl).GetOrigin()}));
-   if (base::ContainsKey(*kWhitelistedOrigins, effective_url.GetOrigin()))
-     return ALLOW;
- 
-diff -urN 
chromium-66.0.3359.45.orig/content/browser/appcache/appcache_request_handler.cc 
chromium-66.0.3359.45/content/browser/appcache/appcache_request_handler.cc
---- 
chromium-66.0.3359.45.orig/content/browser/appcache/appcache_request_handler.cc 
   2018-03-28 14:54:42.714402259 +0200
-+++ chromium-66.0.3359.45/content/browser/appcache/appcache_request_handler.cc 
2018-03-28 15:00:14.367868004 +0200
-@@ -639,7 +639,7 @@
- 
-   SubresourceLoaderParams params;
-   params.loader_factory_info = factory_ptr.PassInterface();
--  return params;
-+  return base::Optional<SubresourceLoaderParams>(std::move(params));
- }
- 
- void AppCacheRequestHandler::MaybeCreateSubresourceLoader(
-diff -urN 
chromium-66.0.3359.45.orig/content/browser/service_worker/service_worker_controllee_request_handler.cc
 
chromium-66.0.3359.45/content/browser/service_worker/service_worker_controllee_request_handler.cc
---- 
chromium-66.0.3359.45.orig/content/browser/service_worker/service_worker_controllee_request_handler.cc
     2018-03-28 14:54:43.154409514 +0200
-+++ 
chromium-66.0.3359.45/content/browser/service_worker/service_worker_controllee_request_handler.cc
  2018-03-28 15:01:02.384658496 +0200
-@@ -271,7 +271,7 @@
-   controller_info->object_info = 
provider_host_->GetOrCreateServiceWorkerHandle(
-       provider_host_->controller());
-   params.controller_service_worker_info = std::move(controller_info);
--  return params;
-+  return base::Optional<SubresourceLoaderParams>(std::move(params));
- }
- 
- void ServiceWorkerControlleeRequestHandler::PrepareForMainResource(

++++++ chromium-non-void-return.patch ++++++
--- /var/tmp/diff_new_pack.WwxLwr/_old  2018-07-01 21:28:12.856626875 +0200
+++ /var/tmp/diff_new_pack.WwxLwr/_new  2018-07-01 21:28:12.856626875 +0200
@@ -1,8 +1,8 @@
-Index: chromium-65.0.3325.146/media/gpu/vaapi/vaapi_wrapper.cc
+Index: chromium-67.0.3396.30/media/gpu/vaapi/vaapi_wrapper.cc
 ===================================================================
---- chromium-65.0.3325.146.orig/media/gpu/vaapi/vaapi_wrapper.cc
-+++ chromium-65.0.3325.146/media/gpu/vaapi/vaapi_wrapper.cc
-@@ -350,6 +350,8 @@ static VAEntrypoint GetVaEntryPoint(Vaap
+--- chromium-67.0.3396.30.orig/media/gpu/vaapi/vaapi_wrapper.cc
++++ chromium-67.0.3396.30/media/gpu/vaapi/vaapi_wrapper.cc
+@@ -390,6 +390,8 @@ static VAEntrypoint GetVaEntryPoint(Vaap
      case VaapiWrapper::kCodecModeMax:
        NOTREACHED();
        return VAEntrypointVLD;
@@ -11,3 +11,15 @@
    }
  }
  
+Index: chromium-67.0.3396.30/chrome/browser/ui/webui/discards/discards_ui.cc
+===================================================================
+--- chromium-67.0.3396.30.orig/chrome/browser/ui/webui/discards/discards_ui.cc
++++ chromium-67.0.3396.30/chrome/browser/ui/webui/discards/discards_ui.cc
+@@ -48,6 +48,7 @@ mojom::LifecycleUnitVisibility GetLifecy
+   NOTREACHED();
+   return mojom::LifecycleUnitVisibility::VISIBLE;
+ #endif
++  return mojom::LifecycleUnitVisibility::VISIBLE;
+ }
+ 
+ class DiscardsDetailsProviderImpl : public mojom::DiscardsDetailsProvider {

++++++ chromium-skia-aarch64-buildfix.patch ++++++
--- 
chromium-67.0.3396.18.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h    
    2018-05-09 10:34:03.160808970 +0200
+++ chromium-67.0.3396.18/third_party/skia/src/opts/SkRasterPipeline_opts.h     
2018-05-09 10:34:37.172977879 +0200
@@ -653,7 +653,7 @@ SI F approx_powf(F x, F y) {
 }
 
 SI F from_half(U16 h) {
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary 
workaround for some Google3 builds.
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && 
!defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
     return vcvt_f32_f16(h);
 
 #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
@@ -673,7 +673,7 @@ SI F from_half(U16 h) {
 }
 
 SI U16 to_half(F f) {
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary 
workaround for some Google3 builds.
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && 
!defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
     return vcvt_f16_f32(f);
 
 #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
++++++ chromium-vaapi.patch ++++++
--- /var/tmp/diff_new_pack.WwxLwr/_old  2018-07-01 21:28:12.880626844 +0200
+++ /var/tmp/diff_new_pack.WwxLwr/_new  2018-07-01 21:28:12.880626844 +0200
@@ -34,11 +34,11 @@
 Signed-off-by: Daniel Charles <daniel.char...@intel.com>
 ---
 
-Index: chromium-66.0.3359.81/chrome/browser/about_flags.cc
+Index: chromium-67.0.3396.18/chrome/browser/about_flags.cc
 ===================================================================
---- chromium-66.0.3359.81.orig/chrome/browser/about_flags.cc
-+++ chromium-66.0.3359.81/chrome/browser/about_flags.cc
-@@ -1234,12 +1234,14 @@ const FeatureEntry kFeatureEntries[] = {
+--- chromium-67.0.3396.18.orig/chrome/browser/about_flags.cc
++++ chromium-67.0.3396.18/chrome/browser/about_flags.cc
+@@ -1249,12 +1249,14 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kUiPartialSwapDescription, kOsAll,
       SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
  #if BUILDFLAG(ENABLE_WEBRTC)
@@ -53,7 +53,7 @@
      {"enable-webrtc-hw-h264-encoding",
       flag_descriptions::kWebrtcHwH264EncodingName,
       flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | 
kOsCrOS,
-@@ -1553,6 +1555,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1577,6 +1579,13 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kShowTouchHudDescription, kOsCrOS,
       SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)},
  #endif  // OS_CHROMEOS
@@ -67,7 +67,7 @@
      {
          "disable-accelerated-video-decode",
          flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -1560,6 +1569,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1584,6 +1593,7 @@ const FeatureEntry kFeatureEntries[] = {
          kOsMac | kOsWin | kOsCrOS | kOsAndroid,
          SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
      },
@@ -75,7 +75,7 @@
  #if defined(OS_WIN)
      {"enable-hdr", flag_descriptions::kEnableHDRName,
       flag_descriptions::kEnableHDRDescription, kOsWin,
-@@ -2280,12 +2290,17 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2274,12 +2284,17 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kOpenVR)},
  #endif  // ENABLE_OPENVR
  #endif  // ENABLE_VR
@@ -95,10 +95,10 @@
      {"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
       flag_descriptions::kV8CacheOptionsDescription, kOsAll,
       MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
-Index: 
chromium-66.0.3359.81/chrome/browser/chromeos/login/chrome_restart_request.cc
+Index: 
chromium-67.0.3396.18/chrome/browser/chromeos/login/chrome_restart_request.cc
 ===================================================================
---- 
chromium-66.0.3359.81.orig/chrome/browser/chromeos/login/chrome_restart_request.cc
-+++ 
chromium-66.0.3359.81/chrome/browser/chromeos/login/chrome_restart_request.cc
+--- 
chromium-67.0.3396.18.orig/chrome/browser/chromeos/login/chrome_restart_request.cc
++++ 
chromium-67.0.3396.18/chrome/browser/chromeos/login/chrome_restart_request.cc
 @@ -19,6 +19,7 @@
  #include "base/sys_info.h"
  #include "base/timer/timer.h"
@@ -121,8 +121,8 @@
 +#endif
      ::switches::kDisableBlinkFeatures,
      ::switches::kDisableCastStreamingHWEncoding,
-     ::switches::kDisableDistanceFieldText,
-@@ -163,7 +169,7 @@ void DeriveCommandLine(const GURL& start
+     ::switches::kDisableGpu,
+@@ -162,7 +168,7 @@ void DeriveCommandLine(const GURL& start
      ::switches::kDisableWebGLImageChromium,
      ::switches::kEnableWebGLImageChromium,
      ::switches::kEnableWebVR,
@@ -131,10 +131,10 @@
      ::switches::kDisableWebRtcHWDecoding,
      ::switches::kDisableWebRtcHWEncoding,
  #endif
-Index: chromium-66.0.3359.81/chrome/browser/flag_descriptions.cc
+Index: chromium-67.0.3396.18/chrome/browser/flag_descriptions.cc
 ===================================================================
---- chromium-66.0.3359.81.orig/chrome/browser/flag_descriptions.cc
-+++ chromium-66.0.3359.81/chrome/browser/flag_descriptions.cc
+--- chromium-67.0.3396.18.orig/chrome/browser/flag_descriptions.cc
++++ chromium-67.0.3396.18/chrome/browser/flag_descriptions.cc
 @@ -14,6 +14,13 @@ const char kAccelerated2dCanvasDescripti
      "Enables the use of the GPU to perform 2d canvas rendering instead of "
      "using software rendering.";
@@ -149,7 +149,7 @@
  const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video 
decode";
  const char kAcceleratedVideoDecodeDescription[] =
      "Hardware-accelerated video decode where available.";
-@@ -1723,6 +1730,7 @@ const char kWebrtcEchoCanceller3Name[] =
+@@ -1731,6 +1738,7 @@ const char kWebrtcEchoCanceller3Name[] =
  const char kWebrtcEchoCanceller3Description[] =
      "Experimental WebRTC echo canceller (AEC3).";
  
@@ -157,7 +157,7 @@
  const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
  const char kWebrtcHwDecodingDescription[] =
      "Support in WebRTC for decoding video streams using platform hardware.";
-@@ -1730,6 +1738,7 @@ const char kWebrtcHwDecodingDescription[
+@@ -1738,6 +1746,7 @@ const char kWebrtcHwDecodingDescription[
  const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
  const char kWebrtcHwEncodingDescription[] =
      "Support in WebRTC for encoding video streams using platform hardware.";
@@ -165,7 +165,7 @@
  
  const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video 
encoding";
  const char kWebrtcHwH264EncodingDescription[] =
-@@ -2549,14 +2558,16 @@ const char kTabStripKeyboardFocusDescrip
+@@ -2579,14 +2588,16 @@ const char kTabStripKeyboardFocusDescrip
  
  // Chrome OS 
-------------------------------------------------------------------
  
@@ -183,10 +183,10 @@
  const char kAllowTouchpadThreeFingerClickName[] = "Touchpad 
three-finger-click";
  const char kAllowTouchpadThreeFingerClickDescription[] =
      "Enables touchpad three-finger-click as middle button.";
-Index: chromium-66.0.3359.81/chrome/browser/flag_descriptions.h
+Index: chromium-67.0.3396.18/chrome/browser/flag_descriptions.h
 ===================================================================
---- chromium-66.0.3359.81.orig/chrome/browser/flag_descriptions.h
-+++ chromium-66.0.3359.81/chrome/browser/flag_descriptions.h
+--- chromium-67.0.3396.18.orig/chrome/browser/flag_descriptions.h
++++ chromium-67.0.3396.18/chrome/browser/flag_descriptions.h
 @@ -37,6 +37,10 @@ namespace flag_descriptions {
  extern const char kAccelerated2dCanvasName[];
  extern const char kAccelerated2dCanvasDescription[];
@@ -198,7 +198,7 @@
  extern const char kAcceleratedVideoDecodeName[];
  extern const char kAcceleratedVideoDecodeDescription[];
  
-@@ -1561,13 +1565,17 @@ extern const char kPermissionPromptPersi
+@@ -1582,13 +1586,17 @@ extern const char kPermissionPromptPersi
  
  #endif  // defined(OS_MACOSX)
  
@@ -219,14 +219,14 @@
  extern const char kAllowTouchpadThreeFingerClickName[];
  extern const char kAllowTouchpadThreeFingerClickDescription[];
  
-Index: chromium-66.0.3359.81/content/browser/gpu/compositor_util.cc
+Index: chromium-67.0.3396.18/content/browser/gpu/compositor_util.cc
 ===================================================================
---- chromium-66.0.3359.81.orig/content/browser/gpu/compositor_util.cc
-+++ chromium-66.0.3359.81/content/browser/gpu/compositor_util.cc
-@@ -99,7 +99,11 @@ const GpuFeatureData GetGpuFeatureData(s
+--- chromium-67.0.3396.18.orig/content/browser/gpu/compositor_util.cc
++++ chromium-67.0.3396.18/content/browser/gpu/compositor_util.cc
+@@ -124,7 +124,11 @@ const GpuFeatureData GetGpuFeatureData(s
        {"video_decode",
-        manager->GetFeatureStatus(
-            gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
+        SafeGetFeatureStatus(manager,
+                             gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
 +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
 +       !command_line.HasSwitch(switches::kEnableAcceleratedVideo),
 +#else
@@ -235,11 +235,11 @@
         "Accelerated video decode has been disabled, either via blacklist,"
         " about:flags or the command line.",
         true},
-Index: chromium-66.0.3359.81/content/browser/gpu/gpu_process_host.cc
+Index: chromium-67.0.3396.18/content/browser/gpu/gpu_process_host.cc
 ===================================================================
---- chromium-66.0.3359.81.orig/content/browser/gpu/gpu_process_host.cc
-+++ chromium-66.0.3359.81/content/browser/gpu/gpu_process_host.cc
-@@ -132,7 +132,7 @@ static const char* const kSwitchNames[]
+--- chromium-67.0.3396.18.orig/content/browser/gpu/gpu_process_host.cc
++++ chromium-67.0.3396.18/content/browser/gpu/gpu_process_host.cc
+@@ -134,7 +134,7 @@ static const char* const kSwitchNames[]
      switches::kDisableGLExtensions,
      switches::kDisableLogging,
      switches::kDisableShaderNameHashing,
@@ -248,11 +248,11 @@
      switches::kDisableWebRtcHWEncoding,
  #endif
  #if defined(OS_WIN)
-Index: 
chromium-66.0.3359.81/content/browser/renderer_host/media/video_capture_browsertest.cc
+Index: 
chromium-67.0.3396.18/content/browser/renderer_host/media/video_capture_browsertest.cc
 ===================================================================
---- 
chromium-66.0.3359.81.orig/content/browser/renderer_host/media/video_capture_browsertest.cc
-+++ 
chromium-66.0.3359.81/content/browser/renderer_host/media/video_capture_browsertest.cc
-@@ -163,8 +163,13 @@ class VideoCaptureBrowserTest : public C
+--- 
chromium-67.0.3396.18.orig/content/browser/renderer_host/media/video_capture_browsertest.cc
++++ 
chromium-67.0.3396.18/content/browser/renderer_host/media/video_capture_browsertest.cc
+@@ -164,8 +164,13 @@ class VideoCaptureBrowserTest : public C
        base::CommandLine::ForCurrentProcess()->AppendSwitch(
            switches::kUseFakeJpegDecodeAccelerator);
      } else {
@@ -266,10 +266,10 @@
      }
    }
  
-Index: 
chromium-66.0.3359.81/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
+Index: 
chromium-67.0.3396.18/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
 ===================================================================
---- 
chromium-66.0.3359.81.orig/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
-+++ 
chromium-66.0.3359.81/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
+--- 
chromium-67.0.3396.18.orig/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
++++ 
chromium-67.0.3396.18/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
 @@ -65,15 +65,21 @@ void VideoCaptureGpuJpegDecoder::Initial
    bool is_platform_supported =
        base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -296,11 +296,11 @@
      decoder_status_ = FAILED;
      RecordInitDecodeUMA_Locked();
      return;
-Index: 
chromium-66.0.3359.81/content/browser/renderer_host/render_process_host_impl.cc
+Index: 
chromium-67.0.3396.18/content/browser/renderer_host/render_process_host_impl.cc
 ===================================================================
---- 
chromium-66.0.3359.81.orig/content/browser/renderer_host/render_process_host_impl.cc
-+++ 
chromium-66.0.3359.81/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2524,7 +2524,11 @@ void RenderProcessHostImpl::PropagateBro
+--- 
chromium-67.0.3396.18.orig/content/browser/renderer_host/render_process_host_impl.cc
++++ 
chromium-67.0.3396.18/content/browser/renderer_host/render_process_host_impl.cc
+@@ -2693,7 +2693,11 @@ void RenderProcessHostImpl::PropagateBro
      switches::kDefaultTileHeight,
      switches::kDisable2dCanvasImageChromium,
      switches::kDisableAcceleratedJpegDecoding,
@@ -309,10 +309,10 @@
 +#else
      switches::kDisableAcceleratedVideoDecode,
 +#endif
+     switches::kDisableBackgroundTasks,
      switches::kDisableBackgroundTimerThrottling,
      switches::kDisableBreakpad,
-     switches::kDisableCompositorUkmForTests,
-@@ -2658,8 +2662,10 @@ void RenderProcessHostImpl::PropagateBro
+@@ -2830,8 +2834,10 @@ void RenderProcessHostImpl::PropagateBro
      switches::kDisableMojoRenderer,
  #endif
  #if BUILDFLAG(ENABLE_WEBRTC)
@@ -323,11 +323,11 @@
      switches::kEnableWebRtcSrtpAesGcm,
      switches::kEnableWebRtcSrtpEncryptedHeaders,
      switches::kEnableWebRtcStunOrigin,
-Index: 
chromium-66.0.3359.81/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
+Index: 
chromium-67.0.3396.18/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
 ===================================================================
---- 
chromium-66.0.3359.81.orig/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
-+++ 
chromium-66.0.3359.81/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
-@@ -58,7 +58,12 @@ class WebRtcMediaRecorderTest
+--- 
chromium-67.0.3396.18.orig/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
++++ 
chromium-67.0.3396.18/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
+@@ -66,7 +66,12 @@ class MAYBE_WebRtcMediaRecorderTest
        return;
      // This flag is also used for encoding, https://crbug.com/616640.
      base::CommandLine::ForCurrentProcess()->AppendSwitch(
@@ -341,10 +341,10 @@
    }
  
   private:
-Index: chromium-66.0.3359.81/content/gpu/BUILD.gn
+Index: chromium-67.0.3396.18/content/gpu/BUILD.gn
 ===================================================================
---- chromium-66.0.3359.81.orig/content/gpu/BUILD.gn
-+++ chromium-66.0.3359.81/content/gpu/BUILD.gn
+--- chromium-67.0.3396.18.orig/content/gpu/BUILD.gn
++++ chromium-67.0.3396.18/content/gpu/BUILD.gn
 @@ -130,4 +130,8 @@ target(link_target_type, "gpu_sources")
        (!is_chromecast || is_cast_desktop_build)) {
      configs += [ "//build/config/linux/dri" ]
@@ -354,10 +354,10 @@
 +    public_configs = [ "//media/gpu:libva_config" ]
 +  }
  }
-Index: chromium-66.0.3359.81/content/gpu/gpu_main.cc
+Index: chromium-67.0.3396.18/content/gpu/gpu_main.cc
 ===================================================================
---- chromium-66.0.3359.81.orig/content/gpu/gpu_main.cc
-+++ chromium-66.0.3359.81/content/gpu/gpu_main.cc
+--- chromium-67.0.3396.18.orig/content/gpu/gpu_main.cc
++++ chromium-67.0.3396.18/content/gpu/gpu_main.cc
 @@ -286,7 +286,7 @@ int GpuMain(const MainFunctionParams& pa
  
    base::PlatformThread::SetName("CrGpuMain");
@@ -376,10 +376,10 @@
    io_thread_priority = base::ThreadPriority::DISPLAY;
  #endif
  
-Index: chromium-66.0.3359.81/content/public/browser/gpu_utils.cc
+Index: chromium-67.0.3396.18/content/public/browser/gpu_utils.cc
 ===================================================================
---- chromium-66.0.3359.81.orig/content/public/browser/gpu_utils.cc
-+++ chromium-66.0.3359.81/content/public/browser/gpu_utils.cc
+--- chromium-67.0.3396.18.orig/content/public/browser/gpu_utils.cc
++++ chromium-67.0.3396.18/content/public/browser/gpu_utils.cc
 @@ -7,6 +7,7 @@
  #include "base/command_line.h"
  #include "base/single_thread_task_runner.h"
@@ -406,10 +406,10 @@
  #if defined(OS_WIN)
    uint32_t enable_accelerated_vpx_decode_val =
        gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
-Index: chromium-66.0.3359.81/content/public/common/content_switches.cc
+Index: chromium-67.0.3396.18/content/public/common/content_switches.cc
 ===================================================================
---- chromium-66.0.3359.81.orig/content/public/common/content_switches.cc
-+++ chromium-66.0.3359.81/content/public/common/content_switches.cc
+--- chromium-67.0.3396.18.orig/content/public/common/content_switches.cc
++++ chromium-67.0.3396.18/content/public/common/content_switches.cc
 @@ -78,12 +78,21 @@ const char kDisable3DAPIs[]
  
  // Disable gpu-accelerated 2d canvas.
@@ -433,7 +433,7 @@
  // Disables hardware acceleration of video decode, where available.
  const char kDisableAcceleratedVideoDecode[] =
      "disable-accelerated-video-decode";
-@@ -859,11 +868,13 @@ const char kZygoteProcess[]
+@@ -867,11 +876,13 @@ const char kZygoteProcess[]
  // ignores this switch on its stable and beta channels.
  const char kDisableWebRtcEncryption[]      = "disable-webrtc-encryption";
  
@@ -447,10 +447,10 @@
  
  // Enables negotiation of GCM cipher suites from RFC 7714 for SRTP in WebRTC.
  // See https://tools.ietf.org/html/rfc7714 for further information.
-Index: chromium-66.0.3359.81/content/public/common/content_switches.h
+Index: chromium-67.0.3396.18/content/public/common/content_switches.h
 ===================================================================
---- chromium-66.0.3359.81.orig/content/public/common/content_switches.h
-+++ chromium-66.0.3359.81/content/public/common/content_switches.h
+--- chromium-67.0.3396.18.orig/content/public/common/content_switches.h
++++ chromium-67.0.3396.18/content/public/common/content_switches.h
 @@ -33,7 +33,11 @@ CONTENT_EXPORT extern const char kDisabl
  CONTENT_EXPORT extern const char kDisable3DAPIs[];
  CONTENT_EXPORT extern const char kDisableAccelerated2dCanvas[];
@@ -463,7 +463,7 @@
  CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[];
  CONTENT_EXPORT extern const char kDisableAcceleratedVideoEncode[];
  CONTENT_EXPORT extern const char kDisableAudioSupportForDesktopShare[];
-@@ -106,6 +110,9 @@ CONTENT_EXPORT extern const char kDisabl
+@@ -107,6 +111,9 @@ CONTENT_EXPORT extern const char kDisabl
  CONTENT_EXPORT extern const char kDomAutomationController[];
  extern const char kDisable2dCanvasClipAntialiasing[];
  CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
@@ -473,7 +473,7 @@
  CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
  CONTENT_EXPORT extern const char kEnableAutomation[];
  CONTENT_EXPORT extern const char kEnablePreferCompositingToLCDText[];
-@@ -240,8 +247,10 @@ CONTENT_EXPORT extern const char kZygote
+@@ -242,8 +249,10 @@ CONTENT_EXPORT extern const char kZygote
  
  #if BUILDFLAG(ENABLE_WEBRTC)
  CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
@@ -484,11 +484,11 @@
  CONTENT_EXPORT extern const char kEnableWebRtcSrtpAesGcm[];
  CONTENT_EXPORT extern const char kEnableWebRtcSrtpEncryptedHeaders[];
  CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[];
-Index: 
chromium-66.0.3359.81/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
+Index: 
chromium-67.0.3396.18/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
 ===================================================================
---- 
chromium-66.0.3359.81.orig/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
-+++ 
chromium-66.0.3359.81/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
-@@ -282,10 +282,18 @@ void PeerConnectionDependencyFactory::In
+--- 
chromium-67.0.3396.18.orig/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
++++ 
chromium-67.0.3396.18/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
+@@ -276,10 +276,18 @@ void PeerConnectionDependencyFactory::In
  
    const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
    if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()) {
@@ -507,13 +507,13 @@
        encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
    }
  
-Index: chromium-66.0.3359.81/content/renderer/render_thread_impl.cc
+Index: chromium-67.0.3396.18/content/renderer/render_thread_impl.cc
 ===================================================================
---- chromium-66.0.3359.81.orig/content/renderer/render_thread_impl.cc
-+++ chromium-66.0.3359.81/content/renderer/render_thread_impl.cc
-@@ -1581,7 +1581,11 @@ media::GpuVideoAcceleratorFactories* Ren
-   scoped_refptr<base::SingleThreadTaskRunner> media_task_runner =
-       GetMediaThreadTaskRunner();
+--- chromium-67.0.3396.18.orig/content/renderer/render_thread_impl.cc
++++ chromium-67.0.3396.18/content/renderer/render_thread_impl.cc
+@@ -1578,7 +1578,11 @@ media::GpuVideoAcceleratorFactories* Ren
+                              kGpuStreamIdMedia, kGpuStreamPriorityMedia);
+ 
    const bool enable_video_accelerator =
 +#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +      cmd_line->HasSwitch(switches::kEnableAcceleratedVideo) &&
@@ -523,11 +523,11 @@
        (gpu_channel_host->gpu_feature_info()
             .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
         gpu::kGpuFeatureStatusEnabled);
-Index: chromium-66.0.3359.81/gpu/config/software_rendering_list.json
+Index: chromium-67.0.3396.18/gpu/config/software_rendering_list.json
 ===================================================================
---- chromium-66.0.3359.81.orig/gpu/config/software_rendering_list.json
-+++ chromium-66.0.3359.81/gpu/config/software_rendering_list.json
-@@ -373,17 +373,6 @@
+--- chromium-67.0.3396.18.orig/gpu/config/software_rendering_list.json
++++ chromium-67.0.3396.18/gpu/config/software_rendering_list.json
+@@ -377,17 +377,6 @@
        ]
      },
      {
@@ -545,11 +545,11 @@
        "id": 50,
        "description": "Disable VMware software renderer on older Mesa",
        "cr_bugs": [145531, 332596, 571899, 629434],
-Index: chromium-66.0.3359.81/media/gpu/BUILD.gn
+Index: chromium-67.0.3396.18/media/gpu/BUILD.gn
 ===================================================================
---- chromium-66.0.3359.81.orig/media/gpu/BUILD.gn
-+++ chromium-66.0.3359.81/media/gpu/BUILD.gn
-@@ -482,6 +482,14 @@ if (use_v4l2_codec || use_vaapi || is_ma
+--- chromium-67.0.3396.18.orig/media/gpu/BUILD.gn
++++ chromium-67.0.3396.18/media/gpu/BUILD.gn
+@@ -491,6 +491,14 @@ if (use_v4l2_codec || use_vaapi || is_ma
    }
  }
  
@@ -564,7 +564,7 @@
  if (use_vaapi) {
    test("jpeg_encode_accelerator_unittest") {
      deps = [
-@@ -542,6 +550,10 @@ if (use_v4l2_codec || use_vaapi) {
+@@ -551,6 +559,10 @@ if (use_v4l2_codec || use_vaapi) {
      if (use_ozone) {
        deps += [ "//ui/ozone" ]
      }

++++++ exclude_ymp.patch ++++++
--- /var/tmp/diff_new_pack.WwxLwr/_old  2018-07-01 21:28:12.900626817 +0200
+++ /var/tmp/diff_new_pack.WwxLwr/_new  2018-07-01 21:28:12.900626817 +0200
@@ -1,5 +1,5 @@
---- a/third_party/WebKit/common/mime_util/mime_util.cc 2013-08-25 
10:12:05.428599992 +0200
-+++ b/third_party/WebKit/common/mime_util/mime_util.cc 2013-08-25 
10:12:05.428599992 +0200
+--- a/third_party/blink/common/mime_util/mime_util.cc  2013-08-25 
10:12:05.428599992 +0200
++++ b/third_party/blink/common/mime_util/mime_util.cc  2013-08-25 
10:12:05.428599992 +0200
 @@ -79,6 +79,7 @@
      "text/x-csv",
      "text/x-vcf",

++++++ fix_building_widevinecdm_with_chromium.patch ++++++
--- /var/tmp/diff_new_pack.WwxLwr/_old  2018-07-01 21:28:12.912626802 +0200
+++ /var/tmp/diff_new_pack.WwxLwr/_new  2018-07-01 21:28:12.912626802 +0200
@@ -1,9 +1,22 @@
-Minimal patch to get chromium to compile with widevine support
-
-https://bugs.gentoo.org/show_bug.cgi?id=547630
-
---- a/third_party/widevine/cdm/stub/widevine_cdm_version.h
-+++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h
+diff -urN chromium-67.0.3371.0.old/third_party/widevine/cdm/BUILD.gn 
chromium-67.0.3371.0/third_party/widevine/cdm/BUILD.gn
+--- chromium-67.0.3371.0.old/third_party/widevine/cdm/BUILD.gn 2018-03-20 
12:06:16.192778982 +0100
++++ chromium-67.0.3371.0/third_party/widevine/cdm/BUILD.gn     2018-03-20 
12:09:54.184846595 +0100
+@@ -10,12 +10,6 @@
+ import("//media/media_options.gni")
+ import("//third_party/widevine/cdm/widevine.gni")
+ 
+-# Internal Cast builds set enable_widevine=true to bring in Widevine support.
+-# TODO(xhwang): Support component updated CDM on other platforms and remove 
this
+-# assert.
+-assert(!enable_widevine || is_win || is_mac || is_chromecast,
+-       "Component updated CDM only supported on Windows and Mac for now.")
+-
+ widevine_arch = current_cpu
+ if (widevine_arch == "x86") {
+   widevine_arch = "ia32"
+diff -urN 
chromium-67.0.3371.0.old/third_party/widevine/cdm/stub/widevine_cdm_version.h 
chromium-67.0.3371.0/third_party/widevine/cdm/stub/widevine_cdm_version.h
+--- 
chromium-67.0.3371.0.old/third_party/widevine/cdm/stub/widevine_cdm_version.h   
   2018-03-20 12:06:16.192778982 +0100
++++ chromium-67.0.3371.0/third_party/widevine/cdm/stub/widevine_cdm_version.h  
2018-03-20 12:08:24.415172133 +0100
 @@ -10,6 +10,7 @@
  
  #include "third_party/widevine/cdm/widevine_cdm_common.h"


Reply via email to