chromium: Chromium 67.0.3396.99 -> 68.0.3440.75

8 files changed, 257 insertions, 43 deletions

diff --git a/chromium/chromium/chromium-cors-string.patch b/chromium/chromium/chromium-cors-string.patch
new file mode 100644
index 0000000..b724cd4
--- /dev/null
+++ b/chromium/chromium/chromium-cors-string.patch
@@ -0,0 +1,51 @@
+From 01d891fa0790950549c7bedb34edf869827a372e Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jose.dapena@lge.com>
+Date: Thu, 31 May 2018 17:03:37 +0000
+Subject: [PATCH] CORS legacy: add missing string include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The cors_legacy.h file includes declarations using std::string, but
+it is not declared due to missing #include <string>.
+
+Also drop unneeded declarations in .cpp file.
+
+Change-Id: I00df799f84a6c3530c2f12f1e52d24c7d9bd6bfd
+Reviewed-on: https://chromium-review.googlesource.com/1080707
+Reviewed-by: Tom Sepez <tsepez@chromium.org>
+Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
+Cr-Commit-Position: refs/heads/master@{#563282}
+---
+ services/network/public/cpp/cors/cors_legacy.cc | 2 --
+ services/network/public/cpp/cors/cors_legacy.h  | 1 +
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/services/network/public/cpp/cors/cors_legacy.cc b/services/network/public/cpp/cors/cors_legacy.cc
+index 8f32ac3be64e..f01af63619b5 100644
+--- a/services/network/public/cpp/cors/cors_legacy.cc
++++ b/services/network/public/cpp/cors/cors_legacy.cc
+@@ -5,8 +5,6 @@
+ #include "services/network/public/cpp/cors/cors_legacy.h"
+ 
+ #include <algorithm>
+-#include <string>
+-#include <vector>
+ 
+ #include "url/gurl.h"
+ #include "url/url_util.h"
+diff --git a/services/network/public/cpp/cors/cors_legacy.h b/services/network/public/cpp/cors/cors_legacy.h
+index d2cdf026ca3a..dc9295a92c47 100644
+--- a/services/network/public/cpp/cors/cors_legacy.h
++++ b/services/network/public/cpp/cors/cors_legacy.h
+@@ -5,6 +5,7 @@
+ #ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
+ #define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
+ 
++#include <string>
+ #include <vector>
+ 
+ #include "base/component_export.h"
+-- 
+2.17.1
+
diff --git a/chromium/chromium/chromium-ffmpeg-clean.sh b/chromium/chromium/chromium-ffmpeg-clean.sh
index 9f6f7cf..a523088 100755
--- a/chromium/chromium/chromium-ffmpeg-clean.sh
+++ b/chromium/chromium/chromium-ffmpeg-clean.sh
@@ -120,6 +120,7 @@ header_files="	libavcodec/x86/inline_asm.h \
 		libavcodec/mpegpicture.h \
 		libavcodec/mpegutils.h \
 		libavcodec/mpegvideo.h \
+		libavcodec/mpegvideodata.h \
 		libavcodec/mpegvideodsp.h \
 		libavcodec/mpegvideoencdsp.h \
 		libavcodec/options_table.h \
diff --git a/chromium/chromium/chromium-gcc8-r562446.patch b/chromium/chromium/chromium-gcc8-r562446.patch
new file mode 100644
index 0000000..2942a8f
--- /dev/null
+++ b/chromium/chromium/chromium-gcc8-r562446.patch
@@ -0,0 +1,65 @@
+From 56cb5f7da1025f6db869e840ed34d3b98b9ab899 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jose.dapena@lge.com>
+Date: Tue, 29 May 2018 16:04:14 +0000
+Subject: [PATCH] GCC: do not std::move unique ptr of forward declared UrlIndex
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC fails to resolve the size of UrlIndex, needed
+for moving a std::unique_ptr of UrlIndex. This is because
+moved is done on a forward-declared UrlIndex.
+
+To avoid the problem, move the call to std::move to the .cc
+file so the full declaration is available.
+
+Build error:
+../../buildtools/third_party/libc++/trunk/include/memory: In instantiation of ‘void std::__1::default_delete<_Tp>::operator()(_Tp*) const [with _Tp = bookmarks::UrlIndex]’:
+../../buildtools/third_party/libc++/trunk/include/memory:2634:22:   required from ‘void std::__1::unique_ptr<_Tp, _Dp>::reset(std::__1::unique_ptr<_Tp, _Dp>::pointer) [with _Tp = bookmarks::UrlIndex; _Dp = std::__1::default_delete<bookmarks::UrlIndex>; std::__1::unique_ptr<_Tp, _Dp>::pointer = bookmarks::UrlIndex*]’
+../../buildtools/third_party/libc++/trunk/include/memory:2588:24:   required from ‘std::__1::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp = bookmarks::UrlIndex; _Dp = std::__1::default_delete<bookmarks::UrlIndex>]’
+../../components/bookmarks/browser/bookmark_storage.h:107:76:   required from here
+../../buildtools/third_party/libc++/trunk/include/memory:2317:25: error: invalid application of ‘sizeof’ to incomplete type ‘bookmarks::UrlIndex’
+     static_assert(sizeof(_Tp) > 0,
+
+Bug: 819294
+Change-Id: I793a807c28e797aaa2e31d9c8b7e09fb6ca6b9e7
+Reviewed-on: https://chromium-review.googlesource.com/1071648
+Commit-Queue: Scott Violet <sky@chromium.org>
+Reviewed-by: Scott Violet <sky@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#562446}
+---
+ components/bookmarks/browser/bookmark_storage.cc | 4 ++++
+ components/bookmarks/browser/bookmark_storage.h  | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookmarks/browser/bookmark_storage.cc
+index 1633ba1df2a4..3ae0c62292e7 100644
+--- a/components/bookmarks/browser/bookmark_storage.cc
++++ b/components/bookmarks/browser/bookmark_storage.cc
+@@ -158,6 +158,10 @@ void BookmarkLoadDetails::CreateUrlIndex() {
+   url_index_ = std::make_unique<UrlIndex>(std::move(root_node_));
+ }
+ 
++std::unique_ptr<UrlIndex> BookmarkLoadDetails::owned_url_index() {
++  return std::move(url_index_);
++}
++
+ BookmarkPermanentNode* BookmarkLoadDetails::CreatePermanentNode(
+     BookmarkClient* client,
+     BookmarkNode::Type type) {
+diff --git a/components/bookmarks/browser/bookmark_storage.h b/components/bookmarks/browser/bookmark_storage.h
+index 08df5bb65d83..0a1b1a1b65b9 100644
+--- a/components/bookmarks/browser/bookmark_storage.h
++++ b/components/bookmarks/browser/bookmark_storage.h
+@@ -104,7 +104,7 @@ class BookmarkLoadDetails {
+   bool ids_reassigned() const { return ids_reassigned_; }
+ 
+   void CreateUrlIndex();
+-  std::unique_ptr<UrlIndex> owned_url_index() { return std::move(url_index_); }
++  std::unique_ptr<UrlIndex> owned_url_index();
+ 
+  private:
+   // Creates one of the possible permanent nodes (bookmark bar node, other node
+-- 
+2.17.1
+
diff --git a/chromium/chromium/chromium-libjpeg.patch b/chromium/chromium/chromium-libjpeg.patch
new file mode 100644
index 0000000..5354281
--- /dev/null
+++ b/chromium/chromium/chromium-libjpeg.patch
@@ -0,0 +1,62 @@
+From c6b0194f7a4d9f494b2d51f46d2c332e2e5f4050 Mon Sep 17 00:00:00 2001
+From: Daniel Bratell <bratell@opera.com>
+Date: Mon, 28 May 2018 13:13:01 +0000
+Subject: [PATCH] Use the same libjpeg in all of blink/platform
+
+The normal libjpeg renames some symbols with macros so if its
+headers are included together with libjpeg-turbo's headers
+in the same translation unit, there will be an inconsistent
+renaming of libjpeg symbols. This happened in some extreme
+jumbo configuration and resulted in confising linker errors.
+
+This patch changes an include so that jpeglib.h becomes included
+the same way everywhere.
+
+Change-Id: I7f122d0919d58371bb40dc0097a766b857b9815e
+Reviewed-on: https://chromium-review.googlesource.com/1073423
+Reviewed-by: Kentaro Hara <haraken@chromium.org>
+Commit-Queue: Daniel Bratell <bratell@opera.com>
+Cr-Commit-Position: refs/heads/master@{#562243}
+---
+ .../renderer/platform/image-encoders/image_encoder.cc | 11 +++++++++++
+ .../renderer/platform/image-encoders/image_encoder.h  |  2 --
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
+index 0c7f14c7c0e4..4c450f5d6783 100644
+--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
+@@ -4,6 +4,17 @@
+ 
+ #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
+ 
++#include "build/build_config.h"
++
++#if defined(OS_WIN)
++#include <basetsd.h>  // Included before jpeglib.h because of INT32 clash
++#endif                // OS_WIN
++#include <stdio.h>    // Needed by jpeglib.h
++
++#include "jpeglib.h"  // for JPEG_MAX_DIMENSION
++
++#include "third_party/libwebp/src/webp/encode.h"  // for WEBP_MAX_DIMENSION
++
+ namespace blink {
+ 
+ bool ImageEncoder::Encode(Vector<unsigned char>* dst,
+diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.h b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
+index 0d1460f34827..40306097d507 100644
+--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h
++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
+@@ -7,8 +7,6 @@
+ 
+ #include "third_party/blink/renderer/platform/platform_export.h"
+ #include "third_party/blink/renderer/platform/wtf/vector.h"
+-#include "third_party/libjpeg/jpeglib.h"          // for JPEG_MAX_DIMENSION
+-#include "third_party/libwebp/src/webp/encode.h"  // for WEBP_MAX_DIMENSION
+ #include "third_party/skia/include/core/SkStream.h"
+ #include "third_party/skia/include/encode/SkJpegEncoder.h"
+ #include "third_party/skia/include/encode/SkPngEncoder.h"
+-- 
+2.17.1
+
diff --git a/chromium/chromium/chromium-libwebp-shim.patch b/chromium/chromium/chromium-libwebp-shim.patch
new file mode 100644
index 0000000..cb387a4
--- /dev/null
+++ b/chromium/chromium/chromium-libwebp-shim.patch
@@ -0,0 +1,43 @@
+diff --git a/build/linux/unbundle/libwebp.gn b/build/linux/unbundle/libwebp.gn
+index ab92adecf400..12574d87be58 100644
+--- a/build/linux/unbundle/libwebp.gn
++++ b/build/linux/unbundle/libwebp.gn
+@@ -2,12 +2,34 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
++import("//build/config/linux/pkg_config.gni")
++import("//build/shim_headers.gni")
++
++pkg_config("system_libwebp") {
++  packages = [
++    "libwebp",
++    "libwebpdemux",
++    "libwebpmux",
++  ]
++}
++
++shim_headers("libwebp_shim") {
++  root_path = "src"
++  headers = [
++    "webp/decode.h",
++    "webp/demux.h",
++    "webp/encode.h",
++    "webp/mux.h",
++    "webp/mux_types.h",
++    "webp/types.h",
++  ]
++}
++
+ source_set("libwebp_webp") {
+-  libs = [
+-    "webp",
+-    "webpdemux",
+-    "webpmux",
++  deps = [
++    ":libwebp_shim",
+   ]
++  public_configs = [ ":system_libwebp" ]
+ }
+ 
+ group("libwebp") {
diff --git a/chromium/chromium/chromium-mojo-gcc8.patch b/chromium/chromium/chromium-mojo-gcc8.patch
deleted file mode 100644
index a0c13b5..0000000
--- a/chromium/chromium/chromium-mojo-gcc8.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h
---- chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix	2018-03-15 13:07:54.999428755 -0400
-+++ chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h	2018-03-15 13:08:21.270794252 -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-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h.boolfix chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h
---- chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h.boolfix	2018-03-15 13:07:09.680523296 -0400
-+++ chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h	2018-03-15 13:07:44.429684037 -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 --git a/chromium/chromium/chromium-nacl-llvm-ar.patch b/chromium/chromium/chromium-nacl-llvm-ar.patch
index 8e7e319..7fd81be 100644
--- a/chromium/chromium/chromium-nacl-llvm-ar.patch
+++ b/chromium/chromium/chromium-nacl-llvm-ar.patch
@@ -1,3 +1,16 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 76f24c9671a6..3940ee13b1a9 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1659,7 +1659,7 @@ config("thin_archive") {
+   # have a "thin archive" mode (it does accept -T, but it means truncating
+   # archive names to 16 characters, which is not what we want).
+   if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) {
+-    arflags = [ "-T" ]
++    arflags = [ "T" ]
+   }
+ }
+ 
 diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
 index b6f63d7556aa..066d4d854522 100644
 --- a/build/toolchain/gcc_toolchain.gni
@@ -17,14 +30,3 @@ index b6f63d7556aa..066d4d854522 100644
        description = "AR {{output}}"
        rspfile_content = "{{inputs}}"
        outputs = [
---- chromium-67.0.3396.62/build/config/compiler/BUILD.gn.orig	2018-05-30 16:43:03.000000000 +0800
-+++ chromium-67.0.3396.62/build/config/compiler/BUILD.gn	2018-05-31 22:10:19.140340429 +0800
-@@ -1573,7 +1573,7 @@
-     # TODO(thomasanderson): Enable on ChromeOS builds once
-     # https://crbug.com/829956 is fixed.
-     if (default_toolchain != "//build/toolchain/cros:target") {
--      arflags = [ "-T" ]
-+      arflags = [ "T" ]
-     }
-   }
- }
diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec
index 32cfe9e..e8e59c4 100644
--- a/chromium/chromium/chromium.spec
+++ b/chromium/chromium/chromium.spec
@@ -58,7 +58,7 @@
 %bcond_with fedora_compilation_flags
 
 Name:       chromium
-Version:    67.0.3396.99
+Version:    68.0.3440.75
 Release:    100%{?dist}
 Summary:    A WebKit (Blink) powered web browser
 
@@ -101,14 +101,18 @@ Patch10:    chromium-last-commit-position.patch
 # Disable non-free unrar
 Patch20:    chromium-disable-unrar.patch
 
-# Add a patch from Fedora to fix build with GCC 8
-# https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=8cfa28d
-# https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=61203bf
-Patch30:    chromium-mojo-gcc8.patch
-
 # Fix llvm-ar command usage
 Patch50:    chromium-nacl-llvm-ar.patch
 
+# Add a patch from upstream to fix build with GCC
+Patch60:    chromium-gcc8-r562446.patch
+
+# Add three patches from Gentoo to fix missing includes
+# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f1141
+Patch70:    chromium-cors-string.patch
+Patch71:    chromium-libjpeg.patch
+Patch72:    chromium-libwebp-shim.patch
+
 # I don't have time to test whether it work on other architectures
 ExclusiveArch: x86_64
 
@@ -234,8 +238,11 @@ Conflicts:     chromedriver-unstable
     courgette/third_party \
     native_client/src/third_party/dlmalloc \
     native_client/src/third_party/valgrind \
+    net/third_party/http2 \
     net/third_party/mozilla_security_manager \
     net/third_party/nss \
+    net/third_party/quic \
+    net/third_party/spdy \
     third_party/adobe \
     third_party/analytics \
     third_party/angle \
@@ -301,11 +308,11 @@ Conflicts:     chromedriver-unstable
     third_party/leveldatabase \
     third_party/libaddressinput \
     third_party/libaom \
-    third_party/libaom/source/libaom/third_party/x86inc \
     third_party/libjingle \
     third_party/libphonenumber \
     third_party/libsecret \
     third_party/libsrtp \
+    third_party/libsync \
     third_party/libudev \
 %if !%{with system_libvpx}
     third_party/libvpx \
@@ -339,17 +346,21 @@ Conflicts:     chromedriver-unstable
     third_party/pdfium/third_party/libpng16 \
     third_party/pdfium/third_party/libtiff \
     third_party/pdfium/third_party/skia_shared \
+    third_party/perfetto \
 %if !%{with system_ply}
     third_party/ply \
 %endif
     third_party/polymer \
     third_party/protobuf \
     third_party/protobuf/third_party/six \
+    third_party/pyjson5 \
     third_party/qcms \
+    third_party/rnnoise \
     third_party/s2cellid \
     third_party/sfntly \
     third_party/skia \
     third_party/skia/third_party/gif \
+    third_party/skia/third_party/skcms \
     third_party/skia/third_party/vulkan \
     third_party/smhasher \
     third_party/speech-dispatcher \
@@ -376,6 +387,7 @@ Conflicts:     chromedriver-unstable
     url/third_party/mozilla \
     v8/src/third_party/valgrind \
     v8/src/third_party/utf8-decoder \
+    v8/third_party/antlr4 \
     v8/third_party/inspector_protocol
 
 ./build/linux/unbundle/replace_gn_files.py --system-libraries \
@@ -469,7 +481,6 @@ gn_args=(
 %endif
     enable_hangout_services_extension=false
     enable_nacl=true
-    enable_webrtc=true
     fatal_linker_warnings=false
     treat_warnings_as_errors=false
     linux_use_bundled_binutils=false
@@ -615,6 +626,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Jul 26 2018 - Ting-Wei Lan <lantw44@gmail.com> - 68.0.3440.75-100
+- Update to 68.0.3440.75
+
 * Tue Jun 26 2018 - Ting-Wei Lan <lantw44@gmail.com> - 67.0.3396.99-100
 - Update to 67.0.3396.99