diff options
60 files changed, 437 insertions, 861 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 7ee81282f9f4..a0cbecb8c819 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 64.0.3282.186 -PORTREVISION= 2 +PORTVERSION= 65.0.3325.181 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -50,12 +49,13 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ + libvpx.so:multimedia/libvpx \ libopenh264.so:multimedia/openh264 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libgcrypt.so:security/libgcrypt \ - libgnome-keyring.so:security/libgnome-keyring \ + libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libxml2.so:textproc/libxml2 \ @@ -111,7 +111,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \ enable_webrtc=true \ fieldtrial_testing_like_official_build=true \ is_clang=true \ - is_official_build=true \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ @@ -119,6 +118,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_aura=true \ use_bundled_fontconfig=false \ use_custom_libcxx=false \ + use_gnome_keyring=false \ use_gtk3=true \ use_lld=true \ use_sysroot=false \ @@ -144,13 +144,13 @@ GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \ SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" -OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER GCONF KERBEROS TEST +OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS TEST CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO -OPTIONS_DEFAULT= ALSA CODECS CUPS DRIVER GCONF KERBEROS +OPTIONS_DEFAULT= ALSA CODECS CUPS DRIVER KERBEROS OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib @@ -174,19 +174,16 @@ DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_debug=true \ GN_ARGS+=is_component_build=false \ GN_BOOTSTRAP_FLAGS+=--debug \ - WANTSPACE="lots of free diskspace (~ 8.5GB)" + WANTSPACE="lots of free disk space (~ 12GB)" DEBUG_VARS_OFF= BUILDTYPE=Release \ GN_ARGS+=is_debug=false \ + GN_ARGS+=is_official_build=true \ GN_ARGS+=symbol_level=0 \ GN_ARGS+=remove_webcore_debug_symbols=true \ - WANTSPACE="a fair amount of free diskspace (~ 3.7GB)" + WANTSPACE="a fair amount of free disk space (~ 5.8GB)" DRIVER_MAKE_ARGS= chromedriver -GCONF_USE= GNOME=gconf2 -GCONF_VARS= GN_ARGS+=use_gconf=true -GCONF_VARS_OFF= GN_ARGS+=use_gconf=false - KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false @@ -223,10 +220,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new .endif -.if ${ARCH} == aarch64 -GN_ARGS+= use_vulcanize=false -.endif - .if !defined(GN_ONLY) pre-everything:: @${ECHO_MSG} @@ -252,7 +245,7 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - ffmpeg flac freetype harfbuzz-ng libdrm libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} + ffmpeg flac freetype harfbuzz-ng libdrm libvpx libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} .endif do-configure: diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 2a5b82f3895a..e6c679a2da1d 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1519947004 -SHA256 (chromium-64.0.3282.186.tar.xz) = 5fd0218759231ac00cc729235823592f6fd1e4a00ff64780a5fed7ab210f1860 -SIZE (chromium-64.0.3282.186.tar.xz) = 482247144 -SHA256 (chromium-64.0.3282.186-testdata.tar.xz) = edda88026371323a3515f6243c3ab35cc94a98527b0dd9afb057c9223987a913 -SIZE (chromium-64.0.3282.186-testdata.tar.xz) = 251883204 +TIMESTAMP = 1521889794 +SHA256 (chromium-65.0.3325.181.tar.xz) = 93666448c6b96ec83e6a35a64cff40db4eb92a154fe1db4e7dab4761d0e38687 +SIZE (chromium-65.0.3325.181.tar.xz) = 570386836 +SHA256 (chromium-65.0.3325.181-testdata.tar.xz) = 03018143ffe8c96ca2710e0c48bb19f1e122cf07394f15b73a814c2f6b2a3cdb +SIZE (chromium-65.0.3325.181-testdata.tar.xz) = 252462976 diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 3824a4367bdc..e0bfd5d880de 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,6 +1,6 @@ ---- base/process/process_metrics.h.orig 2018-02-24 16:25:08.000000000 +0100 -+++ base/process/process_metrics.h 2018-03-03 19:17:04.829273000 +0100 -@@ -103,7 +103,7 @@ +--- base/process/process_metrics.h.orig 2018-03-20 23:05:14.000000000 +0100 ++++ base/process/process_metrics.h 2018-03-24 12:20:53.523721000 +0100 +@@ -110,7 +110,7 @@ size_t image; }; @@ -9,25 +9,45 @@ // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -245,7 +245,7 @@ +@@ -120,7 +120,7 @@ + int64_t minor; + int64_t major; + }; +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + // Convert a POSIX timeval to microseconds. + BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv); +@@ -252,7 +252,7 @@ // otherwise. bool GetIOCounters(IoCounters* io_counters) const; --#if defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_BSD) // Returns the number of file descriptors currently open by the process, or // -1 on error. int GetOpenFdCount() const; -@@ -255,7 +255,7 @@ +@@ -260,16 +260,16 @@ + // Returns the soft limit of file descriptors that can be opened by the + // process, or -1 on error. int GetOpenFdSoftLimit() const; - #endif // defined(OS_LINUX) || defined(OS_AIX) +-#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_BSD) -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; -@@ -282,7 +282,7 @@ + // Minor and major page fault count as reported by /proc/[pid]/stat. + // Returns true for success. + bool GetPageFaultCounts(PageFaultCounts* counts) const; +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + // Returns total memory usage of malloc. + size_t GetMallocUsage(); +@@ -289,7 +289,7 @@ bool GetWorkingSetKBytesTotmaps(WorkingSetKBytes *ws_usage) const; #endif @@ -36,7 +56,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if defined(OS_MACOSX) -@@ -303,7 +303,7 @@ +@@ -310,7 +310,7 @@ TimeTicks last_cpu_time_; int64_t last_system_time_; @@ -45,7 +65,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -351,7 +351,7 @@ +@@ -358,7 +358,7 @@ #endif // defined(OS_POSIX) #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ @@ -54,7 +74,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -384,7 +384,7 @@ +@@ -391,7 +391,7 @@ int avail_phys = 0; #endif @@ -63,7 +83,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -399,7 +399,7 @@ +@@ -406,7 +406,7 @@ #endif #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ @@ -72,7 +92,16 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -437,7 +437,7 @@ +@@ -416,7 +416,7 @@ + int dirty = 0; + int reclaimable = 0; + #endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || +- // defined(OS_FUCHSIA) ++ // defined(OS_FUCHSIA) || defined(OS_BSD) + + #if defined(OS_CHROMEOS) + int shmem = 0; +@@ -444,7 +444,7 @@ #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) diff --git a/www/chromium/files/patch-base_trace__event_trace__log.cc b/www/chromium/files/patch-base_trace__event_trace__log.cc deleted file mode 100644 index 8acf8300ded0..000000000000 --- a/www/chromium/files/patch-base_trace__event_trace__log.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- base/trace_event/trace_log.cc.orig 2017-07-25 21:04:48.000000000 +0200 -+++ base/trace_event/trace_log.cc 2017-08-01 22:41:16.236310000 +0200 -@@ -1501,7 +1501,7 @@ - } - - // See https://crbug.com/726484 for Fuchsia. --#if !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_FUCHSIA) -+#if !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_FUCHSIA) && !defined(OS_BSD) - Time process_creation_time = CurrentProcessInfo::CreationTime(); - if (!process_creation_time.is_null()) { - TimeDelta process_uptime = Time::Now() - process_creation_time; -@@ -1509,7 +1509,7 @@ - current_thread_id, "process_uptime_seconds", - "uptime", process_uptime.InSeconds()); - } --#endif // !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_FUCHSIA) -+#endif // !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_FUCHSIA) && !defined(OS_BSD) - - if (!process_labels_.empty()) { - std::vector<base::StringPiece> labels; diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 1e141ec9363c..143285f0120b 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,5 +1,5 @@ ---- build/config/compiler/BUILD.gn.orig 2018-02-24 16:25:08.000000000 +0100 -+++ build/config/compiler/BUILD.gn 2018-03-03 19:36:38.111753000 +0100 +--- build/config/compiler/BUILD.gn.orig 2018-03-20 23:05:14.000000000 +0100 ++++ build/config/compiler/BUILD.gn 2018-03-24 12:40:43.469299000 +0100 @@ -48,7 +48,7 @@ # only two architectures that are currently checked in). Turn this off when # you are using a custom toolchain and need to control -B in cflags. @@ -9,16 +9,7 @@ (current_cpu == "x64" || current_cpu == "x86") binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", root_build_dir) -@@ -223,7 +223,7 @@ - # Linker warnings. - if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && - !(is_android && use_order_profiling) && !is_mac && !is_ios && -- current_os != "aix") { -+ current_os != "aix" && !is_bsd) { - # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 - # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 - # crbug.com/485542 -@@ -327,8 +327,6 @@ +@@ -365,8 +365,6 @@ "-Wl,-z,relro", ] if (!using_sanitizer) { @@ -27,7 +18,7 @@ # Functions interposed by the sanitizers can make ld think # that some libraries aren't needed when they actually are, # http://crbug.com/234010. As workaround, disable --as-needed. -@@ -425,7 +423,7 @@ +@@ -469,7 +467,7 @@ # TODO(hans): Remove this once Clang generates better optimized debug info by # default. https://crbug.com/765793 if (is_clang && !is_nacl && current_toolchain == host_toolchain && @@ -36,7 +27,7 @@ cflags += [ "-Xclang", "-mllvm", -@@ -622,7 +620,7 @@ +@@ -667,7 +665,7 @@ cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,7 +36,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1280,27 +1278,8 @@ +@@ -1317,27 +1315,8 @@ # TODO(hans): https://crbug.com/637306 "-Wno-address-of-packed-member", @@ -73,7 +64,7 @@ ] } else if (use_xcode_clang) { cflags += [ -@@ -1920,7 +1899,7 @@ +@@ -1952,7 +1931,7 @@ # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f cflags += [ "-gdwarf-3" ] } @@ -82,7 +73,7 @@ } if (use_debug_fission && !is_nacl) { cflags += [ "-gsplit-dwarf" ] -@@ -1934,7 +1913,7 @@ +@@ -1966,7 +1945,7 @@ # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. if (!is_mac && !is_ios && !is_nacl && target_cpu != "x86" && @@ -91,3 +82,12 @@ if (is_clang) { # This flag enables the GNU-format pubnames and pubtypes sections, # which lld needs in order to generate a correct GDB index. +@@ -2052,7 +2031,7 @@ + if (!is_win && fatal_linker_warnings && + !(is_chromeos && current_cpu == "arm") && + !(is_android && use_order_profiling) && !is_mac && !is_ios && +- current_os != "aix") { ++ current_os != "aix" && !is_bsd) { + # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 + # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 + # crbug.com/485542 diff --git a/www/chromium/files/patch-build_linux_unbundle_freetype.gn b/www/chromium/files/patch-build_linux_unbundle_freetype.gn deleted file mode 100644 index 1ad68530cecd..000000000000 --- a/www/chromium/files/patch-build_linux_unbundle_freetype.gn +++ /dev/null @@ -1,136 +0,0 @@ ---- build/linux/unbundle/freetype.gn.orig 2017-12-15 02:04:05.000000000 +0100 -+++ build/linux/unbundle/freetype.gn 2017-12-29 23:54:58.915246000 +0100 -@@ -2,124 +2,13 @@ - # 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("freetype_config") { -- packages = [ "freetype2" ] --} -- --shim_headers("freetype_shim") { -- root_path = "src/include" -- headers = [ -- # This list can easily be updated using the command below: -- # find third_party/freetype/src/include \ -- # -iname '*.h' -printf '"%p",\n' | \ -- # sed -e 's|third_party/freetype/src/include/||' | sort -u -- "freetype/config/ftconfig.h", -- "freetype/config/ftheader.h", -- "freetype/config/ftmodule.h", -- "freetype/config/ftoption.h", -- "freetype/config/ftstdlib.h", -- "freetype/freetype.h", -- "freetype/ftadvanc.h", -- "freetype/ftautoh.h", -- "freetype/ftbbox.h", -- "freetype/ftbdf.h", -- "freetype/ftbitmap.h", -- "freetype/ftbzip2.h", -- "freetype/ftcache.h", -- "freetype/ftcffdrv.h", -- "freetype/ftchapters.h", -- "freetype/ftcid.h", -- "freetype/fterrdef.h", -- "freetype/fterrors.h", -- "freetype/ftfntfmt.h", -- "freetype/ftgasp.h", -- "freetype/ftglyph.h", -- "freetype/ftgxval.h", -- "freetype/ftgzip.h", -- "freetype/ftimage.h", -- "freetype/ftincrem.h", -- "freetype/ftlcdfil.h", -- "freetype/ftlist.h", -- "freetype/ftlzw.h", -- "freetype/ftmac.h", -- "freetype/ftmm.h", -- "freetype/ftmodapi.h", -- "freetype/ftmoderr.h", -- "freetype/ftotval.h", -- "freetype/ftoutln.h", -- "freetype/ftpcfdrv.h", -- "freetype/ftpfr.h", -- "freetype/ftrender.h", -- "freetype/ftsizes.h", -- "freetype/ftsnames.h", -- "freetype/ftstroke.h", -- "freetype/ftsynth.h", -- "freetype/ftsystem.h", -- "freetype/fttrigon.h", -- "freetype/ftttdrv.h", -- "freetype/fttypes.h", -- "freetype/ftwinfnt.h", -- "freetype/internal/autohint.h", -- "freetype/internal/ftcalc.h", -- "freetype/internal/ftdebug.h", -- "freetype/internal/ftdriver.h", -- "freetype/internal/ftgloadr.h", -- "freetype/internal/fthash.h", -- "freetype/internal/ftmemory.h", -- "freetype/internal/ftobjs.h", -- "freetype/internal/ftpic.h", -- "freetype/internal/ftrfork.h", -- "freetype/internal/ftserv.h", -- "freetype/internal/ftstream.h", -- "freetype/internal/fttrace.h", -- "freetype/internal/ftvalid.h", -- "freetype/internal/internal.h", -- "freetype/internal/psaux.h", -- "freetype/internal/pshints.h", -- "freetype/internal/services/svbdf.h", -- "freetype/internal/services/svcid.h", -- "freetype/internal/services/svfntfmt.h", -- "freetype/internal/services/svgldict.h", -- "freetype/internal/services/svgxval.h", -- "freetype/internal/services/svkern.h", -- "freetype/internal/services/svmetric.h", -- "freetype/internal/services/svmm.h", -- "freetype/internal/services/svotval.h", -- "freetype/internal/services/svpfr.h", -- "freetype/internal/services/svpostnm.h", -- "freetype/internal/services/svprop.h", -- "freetype/internal/services/svpscmap.h", -- "freetype/internal/services/svpsinfo.h", -- "freetype/internal/services/svsfnt.h", -- "freetype/internal/services/svttcmap.h", -- "freetype/internal/services/svtteng.h", -- "freetype/internal/services/svttglyf.h", -- "freetype/internal/services/svwinfnt.h", -- "freetype/internal/sfnt.h", -- "freetype/internal/t1types.h", -- "freetype/internal/tttypes.h", -- "freetype/t1tables.h", -- "freetype/ttnameid.h", -- "freetype/tttables.h", -- "freetype/tttags.h", -- "freetype/ttunpat.h", -- "ft2build.h", -- ] --} -- --source_set("freetype") { -- deps = [ -- ":freetype_shim", -- ] -- public_configs = [ ":freetype_config" ] --} -- --source_set("bootstrap_freetype_for_harfbuzz") { -- deps = [ -- ":freetype_shim", -- ] -- public_configs = [ ":freetype_config" ] -+declare_args() { -+ # Blink needs a recent and properly build-configured FreeType version to -+ # support OpenType variations, color emoji and avoid security bugs. By default -+ # we ship and link such a version as part of Chrome. For distributions that -+ # prefer to keep linking to the version the system, FreeType must be newer -+ # than version 2.7.1 and have color bitmap support compiled in. WARNING: -+ # System FreeType configurations other than as described WILL INTRODUCE TEXT -+ # RENDERING AND SECURITY REGRESSIONS. -+ use_system_freetype = true - } diff --git a/www/chromium/files/patch-build_linux_unbundle_harfbuzz-ng.gn b/www/chromium/files/patch-build_linux_unbundle_harfbuzz-ng.gn deleted file mode 100644 index 2e3374947f5d..000000000000 --- a/www/chromium/files/patch-build_linux_unbundle_harfbuzz-ng.gn +++ /dev/null @@ -1,17 +0,0 @@ ---- build/linux/unbundle/harfbuzz-ng.gn.orig 2017-12-29 23:59:50.296068000 +0100 -+++ build/linux/unbundle/harfbuzz-ng.gn 2017-12-30 00:01:59.725212000 +0100 -@@ -12,6 +12,14 @@ - ] - } - -+pkg_config("harfbuzz_from_pkgconfig") { -+ visibility = [ -+ "//third_party:freetype_harfbuzz", -+ "//third_party/freetype:freetype_source", -+ ] -+ packages = [ "harfbuzz" ] -+} -+ - shim_headers("harfbuzz_shim") { - root_path = "src" - headers = [ "hb.h" ] diff --git a/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py b/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py deleted file mode 100644 index a9b3ed30e7cb..000000000000 --- a/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py +++ /dev/null @@ -1,11 +0,0 @@ ---- build/linux/unbundle/replace_gn_files.py.orig 2017-12-29 23:33:23.502737000 +0100 -+++ build/linux/unbundle/replace_gn_files.py 2017-12-29 23:34:06.066488000 +0100 -@@ -19,7 +19,7 @@ - REPLACEMENTS = { - 'ffmpeg': 'third_party/ffmpeg/BUILD.gn', - 'flac': 'third_party/flac/BUILD.gn', -- 'freetype': 'third_party/freetype/BUILD.gn', -+ 'freetype': 'build/config/freetype/freetype.gni', - 'harfbuzz-ng': 'third_party/harfbuzz-ng/BUILD.gn', - 'icu': 'third_party/icu/BUILD.gn', - 'libdrm': 'third_party/libdrm/BUILD.gn', diff --git a/www/chromium/files/patch-chrome_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn deleted file mode 100644 index f57dff18f025..000000000000 --- a/www/chromium/files/patch-chrome_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/BUILD.gn.orig 2017-12-15 02:04:06.000000000 +0100 -+++ chrome/BUILD.gn 2017-12-25 06:31:53.132995000 +0100 -@@ -152,7 +152,7 @@ - ] - - data += [ "$root_out_dir/resources.pak" ] -- if (is_linux || is_win) { -+ if (is_linux || is_bsd || is_win) { - data += [ - "$root_out_dir/chrome_100_percent.pak", - "$root_out_dir/locales/en-US.pak", diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index ddcd9d7f1b17..91c193713dba 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,24 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2017-12-15 02:04:07.000000000 +0100 -+++ chrome/browser/about_flags.cc 2017-12-24 00:29:31.459851000 +0100 -@@ -878,7 +878,7 @@ - {"Learning", kSpeculativeResourcePrefetchingLearning, - arraysize(kSpeculativeResourcePrefetchingLearning), nullptr}}; - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - const FeatureEntry::FeatureParam kPauseBackgroundTabsMinimalEngagment[] = { - {pausetabs::kFeatureName, pausetabs::kModeParamMinimal}}; - -@@ -1875,7 +1875,7 @@ - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, - switches::kDisableTranslateNewUX)}, - #endif // OS_MACOSX --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - {"translate-2016q2-ui", flag_descriptions::kTranslate2016q2UiName, - flag_descriptions::kTranslate2016q2UiDescription, - kOsCrOS | kOsWin | kOsLinux, -@@ -2407,12 +2407,12 @@ +--- chrome/browser/about_flags.cc.orig 2018-03-20 23:05:16.000000000 +0100 ++++ chrome/browser/about_flags.cc 2018-03-24 13:04:35.001279000 +0100 +@@ -2429,12 +2429,12 @@ flag_descriptions::kEnableMaterialDesignExtensionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)}, #endif // ENABLE_EXTENSIONS @@ -33,7 +15,7 @@ {"enable-origin-trials", flag_descriptions::kOriginTrialsName, flag_descriptions::kOriginTrialsDescription, kOsAll, FEATURE_VALUE_TYPE(features::kOriginTrials)}, -@@ -3008,7 +3008,7 @@ +@@ -3047,7 +3047,7 @@ flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kLeftToRightUrls)}, @@ -42,12 +24,12 @@ {"omnibox-entity-suggestions", flag_descriptions::kOmniboxEntitySuggestionsName, flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop, -@@ -3086,7 +3086,7 @@ - FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)}, - #endif // OS_ANDROID +@@ -3066,7 +3066,7 @@ + {"enable-new-app-menu-icon", flag_descriptions::kEnableNewAppMenuIconName, + flag_descriptions::kEnableNewAppMenuIconDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kAnimatedAppMenuIcon)}, +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - {pausetabs::kFeatureName, flag_descriptions::kPauseBackgroundTabsName, - flag_descriptions::kPauseBackgroundTabsDescription, kOsDesktop, - FEATURE_WITH_PARAMS_VALUE_TYPE(pausetabs::kFeature, + #if defined(OS_ANDROID) + {"enable-custom-feedback-ui", diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index 7b847539e785..6cc2d0b19350 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,16 +1,16 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2017-12-15 02:04:08.000000000 +0100 -+++ chrome/browser/chrome_browser_main.cc 2017-12-24 00:42:50.301023000 +0100 -@@ -193,7 +193,7 @@ - #include "chrome/browser/offline_pages/offline_page_info_handler.h" - #endif +--- chrome/browser/chrome_browser_main.cc.orig 2018-03-20 23:05:16.000000000 +0100 ++++ chrome/browser/chrome_browser_main.cc 2018-03-24 22:37:46.110352000 +0100 +@@ -206,7 +206,7 @@ + #include "chromeos/settings/cros_settings_names.h" + #endif // defined(OS_CHROMEOS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include "chrome/browser/first_run/upgrade_util_linux.h" #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -@@ -287,7 +287,7 @@ - #endif +@@ -244,7 +244,7 @@ + #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) @@ -18,7 +18,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #endif -@@ -719,7 +719,7 @@ +@@ -737,7 +737,7 @@ field_trial_synchronizer_ = new FieldTrialSynchronizer(); #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -27,21 +27,16 @@ metrics::DesktopSessionDurationTracker::Initialize(); #endif metrics::RendererUptimeTracker::Initialize(); -@@ -1122,11 +1122,11 @@ +@@ -1145,7 +1145,7 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_BSD) ++#if defined(OS_LINUX) // Set the product channel for crash reports. - base::debug::SetCrashKeyValue(crash_keys::kChannel, - chrome::GetChannelString()); --#endif // defined(OS_LINUX) || defined(OS_OPENBSD) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - #if defined(OS_MACOSX) - // Get the Keychain API to register for distributed notifications on the main -@@ -1327,7 +1327,7 @@ + breakpad::SetChannelCrashKey(chrome::GetChannelString()); + #endif // defined(OS_LINUX) || defined(OS_OPENBSD) +@@ -1351,7 +1351,7 @@ // Start the tab manager here so that we give the most amount of time for the // other services to start up before we start adjusting the oom priority. diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 05b8bfc46428..08ad6d0318a1 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -84,7 +84,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist - settings_private::PrefType::PREF_TYPE_BOOLEAN; +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2018-03-20 23:05:17.000000000 +0100 ++++ chrome/browser/extensions/api/settings_private/prefs_util.cc 2018-03-24 13:17:26.753666000 +0100 +@@ -102,7 +102,7 @@ + settings_api::PrefType::PREF_TYPE_BOOLEAN; (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] = - settings_private::PrefType::PREF_TYPE_BOOLEAN; + settings_api::PrefType::PREF_TYPE_BOOLEAN; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) (*s_whitelist)[::prefs::kUseCustomChromeFrame] = - settings_private::PrefType::PREF_TYPE_BOOLEAN; + settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -94,7 +94,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist +@@ -112,7 +112,7 @@ // Appearance settings. (*s_whitelist)[::prefs::kCurrentThemeID] = - settings_private::PrefType::PREF_TYPE_STRING; + settings_api::PrefType::PREF_TYPE_STRING; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) (*s_whitelist)[::prefs::kUsesSystemTheme] = - settings_private::PrefType::PREF_TYPE_BOOLEAN; + settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index f9b8ba323f33..4afa130ca4a5 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/extensions/external_provider_impl.cc -@@ -655,7 +655,7 @@ void ExternalProviderImpl::CreateExternalProviders( +--- chrome/browser/extensions/external_provider_impl.cc.orig 2018-03-20 23:05:17.000000000 +0100 ++++ chrome/browser/extensions/external_provider_impl.cc 2018-03-24 13:22:20.011401000 +0100 +@@ -689,7 +689,7 @@ Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD, oem_extension_creation_flags)); } -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) if (!profile->IsLegacySupervised()) { - provider_list->push_back(base::MakeUnique<ExternalProviderImpl>( + provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, -@@ -681,7 +681,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -717,7 +717,7 @@ bundled_extension_creation_flags)); // Define a per-user source of external extensions. -#if defined(OS_MACOSX) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) +#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) - provider_list->push_back(base::MakeUnique<ExternalProviderImpl>( - service, new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS, - ExternalPrefLoader::NONE, nullptr), + provider_list->push_back(std::make_unique<ExternalProviderImpl>( + service, + new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS, diff --git a/www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc b/www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc deleted file mode 100644 index 8cd5dbb55565..000000000000 --- a/www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/gpu/gl_string_manager.cc.orig 2017-04-19 19:06:29 UTC -+++ chrome/browser/gpu/gl_string_manager.cc -@@ -33,7 +33,7 @@ GLStringManager::~GLStringManager() { - - void GLStringManager::Initialize() { - // On MacOSX or Windows, preliminary GPUInfo is enough. --#if defined(OS_LINUX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) - // We never remove this observer from GpuDataManager. - content::GpuDataManager::GetInstance()->AddObserver(this); - diff --git a/www/chromium/files/patch-chrome_browser_vr_sample_queue.cc b/www/chromium/files/patch-chrome_browser_vr_sample_queue.cc new file mode 100644 index 000000000000..755e356aff10 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_vr_sample_queue.cc @@ -0,0 +1,11 @@ +--- chrome/browser/vr/sample_queue.cc.orig 2018-03-24 12:29:50.123017000 +0100 ++++ chrome/browser/vr/sample_queue.cc 2018-03-24 12:30:25.632912000 +0100 +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include <stdint.h> ++ + #include "chrome/browser/vr/sample_queue.h" + + namespace vr { diff --git a/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc b/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc index 9ace050311f2..36fa0854ce05 100644 --- a/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc +++ b/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc @@ -1,23 +1,11 @@ ---- chrome/service/cloud_print/print_system.cc.orig 2018-02-24 15:25:11 UTC -+++ chrome/service/cloud_print/print_system.cc -@@ -5,6 +5,7 @@ - #include "chrome/service/cloud_print/print_system.h" - - #include "base/guid.h" -+#include "build/build_config.h" - - namespace cloud_print { - -@@ -35,5 +36,12 @@ std::string PrintSystem::GenerateProxyId +--- chrome/service/cloud_print/print_system.cc.orig 2018-03-24 13:33:28.414570000 +0100 ++++ chrome/service/cloud_print/print_system.cc 2018-03-24 13:31:35.144592000 +0100 +@@ -36,7 +36,7 @@ return base::GenerateGUID(); } +-#if defined(OS_LINUX) && !defined(USE_CUPS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(USE_CUPS) -+scoped_refptr<PrintSystem> PrintSystem::CreateInstance( -+ const base::DictionaryValue*) { -+ return nullptr; -+} -+#endif -+ - } // namespace cloud_print - + scoped_refptr<PrintSystem> PrintSystem::CreateInstance( + const base::DictionaryValue*) { + return nullptr; diff --git a/www/chromium/files/patch-components_assist_ranker_ranker_example_util.cc b/www/chromium/files/patch-components_assist_ranker_ranker_example_util.cc new file mode 100644 index 000000000000..46b7fe2cda96 --- /dev/null +++ b/www/chromium/files/patch-components_assist_ranker_ranker_example_util.cc @@ -0,0 +1,11 @@ +--- components/assist_ranker/ranker_example_util.cc.orig 2018-03-24 12:31:52.824752000 +0100 ++++ components/assist_ranker/ranker_example_util.cc 2018-03-24 12:32:32.654498000 +0100 +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include <math.h> ++ + #include "components/assist_ranker/ranker_example_util.h" + #include "base/bit_cast.h" + #include "base/format_macros.h" diff --git a/www/chromium/files/patch-components_feedback_anonymizer__tool.cc b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc index 2fc696bdca66..59a7c5ffad92 100644 --- a/www/chromium/files/patch-components_feedback_anonymizer__tool.cc +++ b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc @@ -1,9 +1,9 @@ ---- components/feedback/anonymizer_tool.cc.orig 2017-04-19 19:06:32 UTC -+++ components/feedback/anonymizer_tool.cc -@@ -10,7 +10,11 @@ - #include "base/strings/string_number_conversions.h" +--- components/feedback/anonymizer_tool.cc.orig 2018-03-20 23:05:22.000000000 +0100 ++++ components/feedback/anonymizer_tool.cc 2018-03-24 13:39:35.199314000 +0100 +@@ -11,7 +11,11 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" + #include "content/public/browser/browser_thread.h" +#if defined(OS_BSD) +#include <re2/re2.h> +#else diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password_manager.cc b/www/chromium/files/patch-components_password__manager_core_browser_password_manager.cc deleted file mode 100644 index 1d04a75c5987..000000000000 --- a/www/chromium/files/patch-components_password__manager_core_browser_password_manager.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/password_manager/core/browser/password_manager.cc.orig 2018-02-24 16:25:13.000000000 +0100 -+++ components/password_manager/core/browser/password_manager.cc 2018-03-03 22:48:08.497290000 +0100 -@@ -823,7 +823,7 @@ - if (!client_->GetStoreResultFilter()->ShouldSave( - *provisional_save_manager_->submitted_form())) { - #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - // When |username_value| is empty, it's not clear whether the submitted - // credentials are really sync credentials. Don't save sync password hash - // in that case. diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password_manager_metrics_util.cc b/www/chromium/files/patch-components_password__manager_core_browser_password_manager_metrics_util.cc deleted file mode 100644 index 5c7a4b2e27be..000000000000 --- a/www/chromium/files/patch-components_password__manager_core_browser_password_manager_metrics_util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/password_manager/core/browser/password_manager_metrics_util.cc.orig 2017-09-08 15:25:36.564744000 +0200 -+++ components/password_manager/core/browser/password_manager_metrics_util.cc 2017-09-08 15:26:19.968557000 +0200 -@@ -200,7 +200,7 @@ - } - - #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - void LogSyncPasswordHashChange(SyncPasswordHashChange event) { - UMA_HISTOGRAM_ENUMERATION( - "PasswordManager.SyncPasswordHashChange", event, diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password_manager_metrics_util.h b/www/chromium/files/patch-components_password__manager_core_browser_password_manager_metrics_util.h deleted file mode 100644 index 5e4ca1cedc65..000000000000 --- a/www/chromium/files/patch-components_password__manager_core_browser_password_manager_metrics_util.h +++ /dev/null @@ -1,20 +0,0 @@ ---- components/password_manager/core/browser/password_manager_metrics_util.h.orig 2017-09-08 15:25:43.691124000 +0200 -+++ components/password_manager/core/browser/password_manager_metrics_util.h 2017-09-08 15:36:05.359582000 +0200 -@@ -227,7 +227,7 @@ - }; - - #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - enum class SyncPasswordHashChange { - SAVED_ON_CHROME_SIGNIN, - SAVED_IN_CONTENT_AREA, -@@ -332,7 +332,7 @@ - void LogSubmittedFormFrame(SubmittedFormFrame frame); - - #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - // Log a save sync password change event. - void LogSyncPasswordHashChange(SyncPasswordHashChange event); - diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password_reuse_defines.h b/www/chromium/files/patch-components_password__manager_core_browser_password_reuse_defines.h index b4b401e9ba1c..d2a4470cdc91 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password_reuse_defines.h +++ b/www/chromium/files/patch-components_password__manager_core_browser_password_reuse_defines.h @@ -1,11 +1,11 @@ ---- components/password_manager/core/browser/password_reuse_defines.h.orig 2017-09-08 16:48:55.608982000 +0200 -+++ components/password_manager/core/browser/password_reuse_defines.h 2017-09-08 16:49:07.942575000 +0200 +--- components/password_manager/core/browser/password_reuse_defines.h.orig 2018-03-20 23:05:22.000000000 +0100 ++++ components/password_manager/core/browser/password_reuse_defines.h 2018-03-24 13:50:16.794379000 +0100 @@ -6,7 +6,7 @@ #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_REUSE_DEFINES_H_ #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +- defined(OS_LINUX) || defined(OS_CHROMEOS) ++ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Enable the detection when the sync password is typed not on the sync domain. #define SYNC_PASSWORD_REUSE_DETECTION_ENABLED #endif diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password_store.cc b/www/chromium/files/patch-components_password__manager_core_browser_password_store.cc deleted file mode 100644 index 1eb5980eb8ba..000000000000 --- a/www/chromium/files/patch-components_password__manager_core_browser_password_store.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/password_manager/core/browser/password_store.cc.orig 2017-12-30 02:35:17.422703000 +0100 -+++ components/password_manager/core/browser/password_store.cc 2017-12-30 02:35:55.798169000 +0100 -@@ -274,7 +274,7 @@ - } - - #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - if (!sync_username.empty()) - hash_password_manager_.ReportIsSyncPasswordHashSavedMetric(); - #endif diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index e8e0cbfdbd31..3bdb2d203a92 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2017-12-15 02:04:16.000000000 +0100 -+++ content/browser/BUILD.gn 2017-12-30 02:42:45.654369000 +0100 -@@ -1674,11 +1674,6 @@ +--- content/browser/BUILD.gn.orig 2018-03-20 23:05:23.000000000 +0100 ++++ content/browser/BUILD.gn 2018-03-24 19:29:32.232928000 +0100 +@@ -1711,11 +1711,6 @@ "tracing/cros_tracing_agent.cc", "tracing/cros_tracing_agent.h", ] @@ -11,8 +11,8 @@ - ] } - if (is_fuchsia) { -@@ -2123,6 +2118,17 @@ + if (is_chromecast && is_linux) { +@@ -2191,6 +2186,16 @@ deps += [ "//chromeos", "//chromeos:power_manager_proto", @@ -21,7 +21,6 @@ + sources -= [ + "zygote_host/zygote_communication_linux.cc", + "zygote_host/zygote_communication_linux.h", -+ "zygote_host/zygote_handle_linux.cc", + "zygote_host/zygote_host_impl_linux.cc", + "zygote_host/zygote_host_impl_linux.h", + "../zygote/zygote_linux.cc", diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index 91ce9b1691cd..fe1340923490 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2018-02-24 16:25:14.000000000 +0100 -+++ content/browser/browser_main_loop.cc 2018-03-04 10:01:31.265940000 +0100 -@@ -206,7 +206,7 @@ +--- content/browser/browser_main_loop.cc.orig 2018-03-20 23:05:23.000000000 +0100 ++++ content/browser/browser_main_loop.cc 2018-03-24 14:03:10.531359000 +0100 +@@ -212,7 +212,7 @@ #include "base/fuchsia/default_job.h" #endif // defined(OS_FUCHSIA) @@ -9,7 +9,7 @@ #include "content/browser/sandbox_host_linux.h" #include "content/browser/zygote_host/zygote_host_impl_linux.h" -@@ -244,6 +244,11 @@ +@@ -254,6 +254,11 @@ #include "services/ui/common/image_cursors_set.h" #endif @@ -21,25 +21,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -253,7 +258,7 @@ - namespace { - - #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ -- !defined(OS_FUCHSIA) -+ !defined(OS_FUCHSIA) && !defined(OS_BSD) - void SetupSandbox(const base::CommandLine& parsed_command_line) { - TRACE_EVENT0("startup", "SetupSandbox"); - // SandboxHostLinux needs to be initialized even if the sandbox and -@@ -276,7 +281,7 @@ - generic_zygote->GetSandboxStatus()); - } - #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ -- // !defined(OS_FUCHSIA) -+ // !defined(OS_FUCHSIA) && !defined(OS_BSD) - - #if defined(USE_GLIB) - static void GLibLogHandler(const gchar* log_domain, -@@ -619,10 +624,15 @@ +@@ -655,10 +660,15 @@ TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ @@ -56,18 +38,3 @@ #endif #if defined(USE_X11) -@@ -1691,12 +1701,12 @@ - base::WrapUnique<SwapMetricsDriver::Delegate>( - new SwapMetricsDelegateUma())); - --#if !defined(OS_FUCHSIA) -+#if !defined(OS_FUCHSIA) && !defined(OS_BSD) - swap_metrics_driver_ = - SwapMetricsDriver::Create(std::move(delegate), kSwapMetricsInterval); - if (swap_metrics_driver_) - swap_metrics_driver_->Start(); --#endif // !defined(OS_FUCHSIA) -+#endif // !defined(OS_FUCHSIA) && !defined(OS_BSD) - } - - bool BrowserMainLoop::InitializeToolkit() { diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc index 473a7b712c24..49bb8b74d309 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,6 +1,16 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2017-07-25 21:04:55.000000000 +0200 -+++ content/browser/child_process_launcher_helper_linux.cc 2017-08-02 00:41:59.942814000 +0200 -@@ -66,6 +66,7 @@ +--- content/browser/child_process_launcher_helper_linux.cc.orig 2018-03-20 23:05:23.000000000 +0100 ++++ content/browser/child_process_launcher_helper_linux.cc 2018-03-24 23:20:38.539917000 +0100 +@@ -17,7 +17,9 @@ + #include "content/public/common/content_switches.h" + #include "content/public/common/result_codes.h" + #include "content/public/common/sandboxed_process_launcher_delegate.h" ++#if !defined(OS_BSD) + #include "content/public/common/zygote_handle.h" ++#endif + #include "gpu/config/gpu_switches.h" + #include "services/service_manager/sandbox/linux/sandbox_linux.h" + +@@ -70,6 +72,7 @@ int* launch_result) { *is_synchronous_launch = true; @@ -8,7 +18,7 @@ ZygoteHandle zygote_handle = base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ? nullptr -@@ -82,6 +83,7 @@ +@@ -101,6 +104,7 @@ process.zygote = zygote_handle; return process; } @@ -16,7 +26,7 @@ Process process; process.process = base::LaunchProcess(*command_line(), options); -@@ -100,10 +102,12 @@ +@@ -118,10 +122,12 @@ const ChildProcessLauncherHelper::Process& process, bool known_dead, int* exit_code) { @@ -29,7 +39,7 @@ if (known_dead) { return base::GetKnownDeadTerminationStatus( process.process.Handle(), exit_code); -@@ -122,13 +126,17 @@ +@@ -140,13 +146,17 @@ ChildProcessLauncherHelper::Process process) { process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc deleted file mode 100644 index baded2b9c450..000000000000 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ /dev/null @@ -1,45 +0,0 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2017-06-05 19:03:07 UTC -+++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -402,7 +402,7 @@ bool GpuDataManagerImplPrivate::GpuAccessAllowed( - // strings even if all features are blacklisted. If all GPU features are - // disabled, the GPU process will only initialize GL bindings, create a GL - // context, and collect full GPU info. --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) || !defined(OS_BSD) - if (reason) { - *reason = "All GPU features are blacklisted."; - } -@@ -516,8 +516,10 @@ void GpuDataManagerImplPrivate::SetGLStrings(const std - gpu_info.gl_renderer = gl_renderer; - gpu_info.gl_version = gl_version; - -+#if !defined(OS_BSD) - gpu::IdentifyActiveGPU(&gpu_info); - gpu::CollectDriverInfoGL(&gpu_info); -+#endif - - UpdateGpuInfo(gpu_info); - UpdateGpuSwitchingManager(gpu_info); -@@ -575,10 +577,12 @@ void GpuDataManagerImplPrivate::Initialize() { - // Skip collecting the basic driver info if SetGpuInfo() is already called. - if (IsCompleteGpuInfoAvailable()) { - gpu_info = gpu_info_; -+#ifndef OS_BSD - } else { - TRACE_EVENT0("startup", - "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo"); - gpu::CollectBasicGraphicsInfo(&gpu_info); -+#endif - } - - if (command_line->HasSwitch(switches::kGpuTestingVendorId) && -@@ -695,7 +699,9 @@ void GpuDataManagerImplPrivate::UpdateGpuInfo(const gp - return; - - bool was_info_available = IsCompleteGpuInfoAvailable(); -+#ifndef OS_BSD - gpu::MergeGPUInfo(&gpu_info_, gpu_info); -+#endif - if (IsCompleteGpuInfoAvailable()) { - complete_gpu_info_already_requested_ = true; - } else if (was_info_available) { diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h deleted file mode 100644 index 5bad8a9afcaf..000000000000 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2017-06-05 19:03:07 UTC -+++ content/browser/gpu/gpu_data_manager_impl_private.h -@@ -153,7 +153,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { - UnblockOtherDomainFrom3DAPIs); - FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest, - UnblockThisDomainFrom3DAPIs); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest, - SetGLStrings); - FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest, diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__feature__checker__impl.cc b/www/chromium/files/patch-content_browser_gpu_gpu__feature__checker__impl.cc deleted file mode 100644 index a2b120fac45d..000000000000 --- a/www/chromium/files/patch-content_browser_gpu_gpu__feature__checker__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/gpu/gpu_feature_checker_impl.cc.orig 2017-08-10 16:07:56.429478000 +0200 -+++ content/browser/gpu/gpu_feature_checker_impl.cc 2017-08-10 16:08:25.522586000 +0200 -@@ -39,7 +39,7 @@ - CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - - bool finalized = true; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // On Windows and Mac, so far we can always make the final WebGL blacklisting - // decision based on partial GPU info; on Linux, we need to launch the GPU - // process to collect full GPU info and make the final decision. diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc deleted file mode 100644 index c0655380b9cc..000000000000 --- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/ppapi_plugin_process_host.cc.orig 2017-07-25 21:04:55.000000000 +0200 -+++ content/browser/ppapi_plugin_process_host.cc 2017-08-02 00:58:48.228556000 +0200 -@@ -106,7 +106,7 @@ - return true; - } - --#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - ZygoteHandle GetZygote() override { - const base::CommandLine& browser_command_line = - *base::CommandLine::ForCurrentProcess(); diff --git a/www/chromium/files/patch-content_browser_renderer__host_media_in_process_video_capture_device_launcher.cc b/www/chromium/files/patch-content_browser_renderer__host_media_in_process_video_capture_device_launcher.cc deleted file mode 100644 index 9bcdf732374a..000000000000 --- a/www/chromium/files/patch-content_browser_renderer__host_media_in_process_video_capture_device_launcher.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc.orig 2017-08-02 18:58:22.340485000 +0200 -+++ content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc 2017-08-02 18:58:52.538400000 +0200 -@@ -233,7 +233,7 @@ - DCHECK(device_task_runner_->BelongsToCurrentThread()); - - std::unique_ptr<media::VideoCaptureDevice> video_capture_device; --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - video_capture_device = WebContentsVideoCaptureDevice::Create(id); - #endif - -@@ -264,7 +264,7 @@ - } - - if (desktop_id.type == DesktopMediaID::TYPE_WEB_CONTENTS) { --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - video_capture_device = WebContentsVideoCaptureDevice::Create(id); - IncrementDesktopCaptureCounter(TAB_VIDEO_CAPTURER_CREATED); - if (desktop_id.audio_share) { diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc deleted file mode 100644 index d9e78f71b485..000000000000 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2017-12-15 02:04:17.000000000 +0100 -+++ content/browser/renderer_host/render_process_host_impl.cc 2017-12-24 13:00:51.137885000 +0100 -@@ -420,7 +420,7 @@ - } - - #elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ -- !defined(OS_FUCHSIA) -+ !defined(OS_FUCHSIA) && !defined(OS_BSD) - ZygoteHandle GetZygote() override { - const base::CommandLine& browser_command_line = - *base::CommandLine::ForCurrentProcess(); diff --git a/www/chromium/files/patch-content_browser_utility__process__host__impl.cc b/www/chromium/files/patch-content_browser_utility__process__host__impl.cc deleted file mode 100644 index 7aca8a8ceef1..000000000000 --- a/www/chromium/files/patch-content_browser_utility__process__host__impl.cc +++ /dev/null @@ -1,32 +0,0 @@ ---- content/browser/utility_process_host_impl.cc.orig 2017-12-15 02:04:17.000000000 +0100 -+++ content/browser/utility_process_host_impl.cc 2017-12-24 13:10:10.983464000 +0100 -@@ -35,9 +35,9 @@ - #include "services/service_manager/sandbox/sandbox_type.h" - #include "ui/base/ui_base_switches.h" - --#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) - #include "content/public/browser/zygote_handle_linux.h" --#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) - - #if defined(OS_WIN) - #include "sandbox/win/src/sandbox_policy.h" -@@ -96,7 +96,7 @@ - - #elif defined(OS_POSIX) - --#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_FUCHSIA) -+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_FUCHSIA) && !defined(OS_BSD) - ZygoteHandle GetZygote() override { - if (service_manager::IsUnsandboxedSandboxType(sandbox_type_) || - !exposed_dir_.empty()) { -@@ -104,7 +104,7 @@ - } - return GetGenericZygote(); - } --#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_FUCHSIA) -+#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_FUCHSIA) && !defined(OS_BSD) - base::EnvironmentMap GetEnvironment() override { return env_; } - #endif // OS_WIN - diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index b91181ddc25a..41dec10672cf 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,23 +1,16 @@ ---- content/common/BUILD.gn.orig 2018-02-24 16:25:14.000000000 +0100 -+++ content/common/BUILD.gn 2018-03-04 05:26:02.504662000 +0100 -@@ -503,7 +503,7 @@ +--- content/common/BUILD.gn.orig 2018-03-20 23:05:24.000000000 +0100 ++++ content/common/BUILD.gn 2018-03-29 12:47:23.480593000 +0200 +@@ -431,6 +431,13 @@ + libs += [ "android" ] } - if (!use_seccomp_bpf) { -- if (is_linux && current_cpu != "s390x" && current_cpu != "ppc64") { -+ if (is_linux && current_cpu != "s390x" && current_cpu != "ppc64" && !is_bsd) { - sources -= [ - "sandbox_linux/bpf_base_policy_linux.cc", - "sandbox_linux/bpf_base_policy_linux.h", -@@ -519,6 +519,11 @@ - "sandbox_linux/bpf_renderer_policy_linux.h", - "sandbox_linux/bpf_utility_policy_linux.cc", - "sandbox_linux/bpf_utility_policy_linux.h", -+ ] -+ } -+ if (is_bsd) { -+ sources -= [ -+ "quarantine/quarantine_linux.cc", - ] - } - } ++ if (is_bsd) { ++ sources -= [ ++ "quarantine/quarantine_linux.cc", ++ "sandbox_init_linux.cc", ++ ] ++ } ++ + if (is_debug && !is_component_build && enable_plugins) { + # Content depends on the PPAPI message logging stuff; if this isn't here, + # some unit test binaries won't compile. This only worked in release mode diff --git a/www/chromium/files/patch-content_common_content__switches__internal.cc b/www/chromium/files/patch-content_common_content__switches__internal.cc deleted file mode 100644 index 306a28b86cd0..000000000000 --- a/www/chromium/files/patch-content_common_content__switches__internal.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/common/content_switches_internal.cc.orig 2017-12-15 02:04:17.000000000 +0100 -+++ content/common/content_switches_internal.cc 2017-12-24 13:18:56.301831000 +0100 -@@ -41,7 +41,7 @@ - #endif - - bool IsUseZoomForDSFEnabledByDefault() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - return true; - #elif defined(OS_WIN) - return base::FeatureList::IsEnabled(kUseZoomForDsfEnabledByDefault); diff --git a/www/chromium/files/patch-content_network_BUILD.gn b/www/chromium/files/patch-content_network_BUILD.gn new file mode 100644 index 000000000000..407510624222 --- /dev/null +++ b/www/chromium/files/patch-content_network_BUILD.gn @@ -0,0 +1,13 @@ +--- content/network/BUILD.gn.orig 2018-03-29 12:51:25.325665000 +0200 ++++ content/network/BUILD.gn 2018-03-29 12:56:34.023437000 +0200 +@@ -75,6 +75,10 @@ + "url_request_context_builder_mojo.cc", + ] + ++ if (is_bsd) { ++ sources -= [ "network_sandbox_hook_linux.cc" ] ++ } ++ + configs += [ "//content:content_implementation" ] + + deps = [ diff --git a/www/chromium/files/patch-content_public_common_zygote_features.gni b/www/chromium/files/patch-content_public_common_zygote_features.gni new file mode 100644 index 000000000000..55aad678596d --- /dev/null +++ b/www/chromium/files/patch-content_public_common_zygote_features.gni @@ -0,0 +1,8 @@ +--- content/public/common/zygote_features.gni.orig 2018-03-24 12:14:17.829148000 +0100 ++++ content/public/common/zygote_features.gni 2018-03-24 12:14:28.619495000 +0100 +@@ -2,4 +2,4 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-use_zygote_handle = is_posix && !is_android && !is_mac && !is_fuchsia ++use_zygote_handle = is_posix && !is_android && !is_mac && !is_fuchsia && !is_bsd diff --git a/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc b/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc index 3ba8fcde82e4..6661aae28be6 100644 --- a/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc +++ b/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc @@ -1,14 +1,13 @@ ---- device/usb/usb_device_handle_impl.cc.orig 2017-04-19 19:06:34 UTC -+++ device/usb/usb_device_handle_impl.cc +--- device/usb/usb_device_handle_impl.cc.orig 2018-03-20 23:05:25.000000000 +0100 ++++ device/usb/usb_device_handle_impl.cc 2018-03-24 17:28:45.532305000 +0100 @@ -25,7 +25,11 @@ + #include "device/usb/usb_device_impl.h" #include "device/usb/usb_error.h" #include "device/usb/usb_service.h" - #include "net/base/io_buffer.h" --#include "third_party/libusb/src/libusb/libusb.h" +#if defined(OS_FREEBSD) -+# include "libusb.h" ++#include "libusb.h" +#else -+# include "third_party/libusb/src/libusb/libusb.h" + #include "third_party/libusb/src/libusb/libusb.h" +#endif namespace device { diff --git a/www/chromium/files/patch-device_usb_usb__error.cc b/www/chromium/files/patch-device_usb_usb__error.cc index b650b7733252..13c239d676ee 100644 --- a/www/chromium/files/patch-device_usb_usb__error.cc +++ b/www/chromium/files/patch-device_usb_usb__error.cc @@ -4,7 +4,7 @@ #include "device/usb/usb_error.h" -+#if defined(__FreeBSD__) ++#if defined(OS_FREEBSD) +#include "libusb.h" +#else #include "third_party/libusb/src/libusb/libusb.h" diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.cc b/www/chromium/files/patch-device_usb_usb__service__impl.cc index b4641b98cbd3..bf899301ad01 100644 --- a/www/chromium/files/patch-device_usb_usb__service__impl.cc +++ b/www/chromium/files/patch-device_usb_usb__service__impl.cc @@ -1,19 +1,18 @@ ---- device/usb/usb_service_impl.cc.orig 2017-06-05 19:03:07 UTC -+++ device/usb/usb_service_impl.cc -@@ -25,7 +25,11 @@ +--- device/usb/usb_service_impl.cc.orig 2018-03-20 23:05:25.000000000 +0100 ++++ device/usb/usb_service_impl.cc 2018-03-24 17:34:53.453193000 +0100 +@@ -27,7 +27,11 @@ + #include "device/usb/usb_device_handle.h" #include "device/usb/usb_error.h" #include "device/usb/webusb_descriptors.h" - #include "net/base/io_buffer.h" --#include "third_party/libusb/src/libusb/libusb.h" +#if defined(OS_FREEBSD) -+# include <libusb.h> ++#include "libusb.h" +#else -+# include "third_party/libusb/src/libusb/libusb.h" + #include "third_party/libusb/src/libusb/libusb.h" +#endif #if defined(OS_WIN) #define INITGUID -@@ -231,8 +235,10 @@ UsbServiceImpl::UsbServiceImpl( +@@ -227,8 +231,10 @@ } UsbServiceImpl::~UsbServiceImpl() { @@ -24,7 +23,7 @@ for (auto* platform_device : ignored_devices_) libusb_unref_device(platform_device); } -@@ -289,6 +295,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon +@@ -285,6 +291,7 @@ context_ = std::move(context); @@ -32,7 +31,7 @@ int rv = libusb_hotplug_register_callback( context_->context(), static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -301,6 +308,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon +@@ -297,6 +304,7 @@ // This will call any enumeration callbacks queued while initializing. RefreshDevices(); @@ -40,7 +39,7 @@ #if defined(OS_WIN) DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); -@@ -500,6 +508,7 @@ void UsbServiceImpl::RemoveDevice(scoped_refptr<UsbDev +@@ -496,6 +504,7 @@ device->OnDisconnect(); } @@ -48,11 +47,11 @@ // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, -@@ -530,6 +539,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb +@@ -526,6 +535,7 @@ return 0; } +#endif // !defined(OS_FREEBSD) void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) { - DCHECK(CalledOnValidThread()); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); diff --git a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc index 1b226d273ab4..4866eea42910 100644 --- a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc +++ b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc @@ -1,9 +1,9 @@ ---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2017-04-19 19:06:34 UTC -+++ extensions/browser/api/declarative_webrequest/webrequest_action.cc -@@ -29,7 +29,11 @@ +--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2018-03-20 23:05:25.000000000 +0100 ++++ extensions/browser/api/declarative_webrequest/webrequest_action.cc 2018-03-24 17:41:04.749250000 +0100 +@@ -28,7 +28,11 @@ + #include "extensions/common/extension.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/http/http_util.h" - #include "net/url_request/url_request.h" +#if defined(OS_BSD) +#include <re2/re2.h> +#else diff --git a/www/chromium/files/patch-extensions_common_feature_switch.cc b/www/chromium/files/patch-extensions_common_feature_switch.cc index d7128180d23e..cba8db1323dc 100644 --- a/www/chromium/files/patch-extensions_common_feature_switch.cc +++ b/www/chromium/files/patch-extensions_common_feature_switch.cc @@ -1,14 +1,14 @@ ---- extensions/common/feature_switch.cc.orig 2018-02-24 16:25:15.000000000 +0100 -+++ extensions/common/feature_switch.cc 2018-03-04 02:30:07.857694000 +0100 -@@ -50,11 +50,7 @@ +--- extensions/common/feature_switch.cc.orig 2018-03-20 23:05:25.000000000 +0100 ++++ extensions/common/feature_switch.cc 2018-03-24 17:46:50.886191000 +0100 +@@ -46,11 +46,7 @@ FeatureSwitch::DEFAULT_ENABLED), load_media_router_component_extension( kLoadMediaRouterComponentExtensionFlag, -#if defined(GOOGLE_CHROME_BUILD) - FeatureSwitch::DEFAULT_ENABLED), + FeatureSwitch::DEFAULT_ENABLED) -#else -- FeatureSwitch::DEFAULT_DISABLED), +- FeatureSwitch::DEFAULT_DISABLED) -#endif // defined(GOOGLE_CHROME_BUILD) - yield_between_content_script_runs( - switches::kYieldBetweenContentScriptRuns, - kYieldBetweenContentScriptRunsFieldTrial, + { + } + diff --git a/www/chromium/files/patch-gpu_config_BUILD.gn b/www/chromium/files/patch-gpu_config_BUILD.gn index e2c5daf16a26..c7ee06e048ff 100644 --- a/www/chromium/files/patch-gpu_config_BUILD.gn +++ b/www/chromium/files/patch-gpu_config_BUILD.gn @@ -1,13 +1,14 @@ ---- gpu/config/BUILD.gn.orig 2017-06-05 19:03:08 UTC -+++ gpu/config/BUILD.gn -@@ -99,6 +99,10 @@ source_set("config_sources") { +--- gpu/config/BUILD.gn.orig 2018-03-20 23:05:26.000000000 +0100 ++++ gpu/config/BUILD.gn 2018-03-26 13:38:50.564110000 +0200 +@@ -107,6 +107,11 @@ "gpu_util.h", ] + if (is_bsd) { + sources -= [ "gpu_info_collector_linux.cc" ] ++ sources += [ "gpu_info_collector_freebsd.cc" ] + } + - sources += process_json_outputs - - configs += [ + if (is_fuchsia) { + sources += [ "gpu_info_collector_fuchsia.cc" ] + } diff --git a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc deleted file mode 100644 index 740ecf6c34c6..000000000000 --- a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- gpu/config/gpu_info_collector.cc.orig 2017-06-05 19:03:08 UTC -+++ gpu/config/gpu_info_collector.cc -@@ -194,8 +194,10 @@ CollectInfoResult CollectGraphicsInfoGL(GPUInfo* gpu_i - gpu_info->pixel_shader_version = glsl_version; - gpu_info->vertex_shader_version = glsl_version; - -+#if !defined(OS_BSD) - IdentifyActiveGPU(gpu_info); - return CollectDriverInfoGL(gpu_info); -+#endif - } - - void MergeGPUInfoGL(GPUInfo* basic_gpu_info, diff --git a/www/chromium/files/patch-gpu_config_gpu__info__collector__freebsd.cc b/www/chromium/files/patch-gpu_config_gpu__info__collector__freebsd.cc new file mode 100644 index 000000000000..501f100b0b0b --- /dev/null +++ b/www/chromium/files/patch-gpu_config_gpu__info__collector__freebsd.cc @@ -0,0 +1,31 @@ +--- gpu/config/gpu_info_collector_freebsd.cc.orig 2018-03-26 13:34:20.147630000 +0200 ++++ gpu/config/gpu_info_collector_freebsd.cc 2018-03-26 13:35:09.089367000 +0200 +@@ -0,0 +1,28 @@ ++// Copyright 2017 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "gpu/config/gpu_info_collector.h" ++ ++namespace gpu { ++ ++CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) { ++ NOTIMPLEMENTED(); ++ return kCollectInfoFatalFailure; ++} ++ ++CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) { ++ NOTIMPLEMENTED(); ++ return kCollectInfoFatalFailure; ++} ++ ++CollectInfoResult CollectDriverInfoGL(GPUInfo* gpu_info) { ++ NOTIMPLEMENTED(); ++ return kCollectInfoFatalFailure; ++} ++ ++void MergeGPUInfo(GPUInfo* basic_gpu_info, const GPUInfo& context_gpu_info) { ++ MergeGPUInfoGL(basic_gpu_info, context_gpu_info); ++} ++ ++} // namespace gpu diff --git a/www/chromium/files/patch-gpu_config_gpu__test__config.cc b/www/chromium/files/patch-gpu_config_gpu__test__config.cc index d4581bd076c2..304858ebfbc9 100644 --- a/www/chromium/files/patch-gpu_config_gpu__test__config.cc +++ b/www/chromium/files/patch-gpu_config_gpu__test__config.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_test_config.cc.orig 2017-06-05 19:03:08 UTC -+++ gpu/config/gpu_test_config.cc -@@ -24,7 +24,7 @@ namespace { +--- gpu/config/gpu_test_config.cc.orig 2018-03-20 23:05:26.000000000 +0100 ++++ gpu/config/gpu_test_config.cc 2018-03-26 13:47:37.264475000 +0200 +@@ -24,7 +24,7 @@ GPUTestConfig::OS GetCurrentOS() { #if defined(OS_CHROMEOS) return GPUTestConfig::kOsChromeOS; @@ -9,22 +9,3 @@ return GPUTestConfig::kOsLinux; #elif defined(OS_WIN) int32_t major_version = 0; -@@ -255,6 +255,10 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo - bool rt; - if (gpu_info == NULL) { - GPUInfo my_gpu_info; -+#if defined(OS_FREEBSD) -+ rt = false; -+ LOG(WARNING) << "CollectGpuID not present on FreeBSD"; -+#else - CollectInfoResult result = CollectBasicGraphicsInfo(&my_gpu_info); - if (result != kCollectInfoSuccess) { - LOG(ERROR) << "Fail to identify GPU"; -@@ -263,6 +267,7 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo - } else { - rt = SetGPUInfo(my_gpu_info); - } -+#endif - } else { - rt = SetGPUInfo(*gpu_info); - } diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index a28e139469c3..0b3973c1819f 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,20 +1,17 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2018-02-24 16:25:15.000000000 +0100 -+++ gpu/ipc/service/gpu_init.cc 2018-03-04 02:41:07.510363000 +0100 -@@ -37,7 +37,7 @@ - namespace gpu { - - namespace { --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_BSD) +--- gpu/ipc/service/gpu_init.cc.orig 2018-03-20 23:05:26.000000000 +0100 ++++ gpu/ipc/service/gpu_init.cc 2018-03-26 13:24:11.299258000 +0200 +@@ -41,7 +41,7 @@ + #if !defined(OS_MACOSX) void CollectGraphicsInfo(GPUInfo* gpu_info) { DCHECK(gpu_info); - #if defined(OS_FUCHSIA) -@@ -77,9 +77,9 @@ - } - #endif // defined(OS_FUCHSIA) +-#if defined(OS_FUCHSIA) ++#if defined(OS_FUCHSIA) || defined(OS_BSD) + // TODO(crbug.com/707031): Implement this. + NOTIMPLEMENTED(); + return; +@@ -84,7 +84,7 @@ } --#endif // defined(OS_MACOSX) -+#endif // defined(OS_MACOSX) && defined(OS_BSD) + #endif // defined(OS_MACOSX) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) @@ -30,7 +27,7 @@ if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -183,7 +183,7 @@ +@@ -179,7 +179,7 @@ sandbox_helper_->PreSandboxStartup(); bool attempted_startsandbox = false; @@ -39,21 +36,3 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -222,7 +222,7 @@ - // multiple seconds to finish, which in turn cause the GPU process to crash. - // By skipping the following code on Mac, we don't really lose anything, - // because the basic GPU information is passed down from the host process. --#if !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - CollectGraphicsInfo(&gpu_info_); - if (gpu_info_.context_info_state == gpu::kCollectInfoFatalFailure) - return false; -@@ -308,7 +308,7 @@ - return; - } - --#if !defined(OS_ANDROID) -+#if !defined(OS_ANDROID) && !defined(OS_BSD) - gpu::CollectContextGraphicsInfo(&gpu_info_); - gpu_feature_info_ = gpu::ComputeGpuFeatureInfo(gpu_info_, command_line); - #endif diff --git a/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc index a3f2404fbefe..73a6974430ef 100644 --- a/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc +++ b/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc @@ -1,24 +1,24 @@ ---- net/proxy/proxy_config_service_linux.cc.orig 2017-07-25 21:04:58.000000000 +0200 -+++ net/proxy/proxy_config_service_linux.cc 2017-08-02 14:35:59.532886000 +0200 -@@ -11,7 +11,9 @@ +--- net/proxy/proxy_config_service_linux.cc.orig 2018-03-20 23:05:28.000000000 +0100 ++++ net/proxy/proxy_config_service_linux.cc 2018-03-24 18:11:27.991396000 +0100 +@@ -6,7 +6,9 @@ + + #include <errno.h> #include <limits.h> - #include <stdio.h> - #include <stdlib.h> +#if !defined(OS_BSD) #include <sys/inotify.h> +#endif #include <unistd.h> #include <map> -@@ -855,6 +857,7 @@ +@@ -483,6 +485,7 @@ + return default_value; } - #endif // defined(USE_GIO) +#if !defined(OS_BSD) - // This is the KDE version that reads kioslaverc and simulates gconf. + // This is the KDE version that reads kioslaverc and simulates gsettings. // Doing this allows the main Delegate code, as well as the unit tests // for it, to stay the same - and the settings map fairly well besides. -@@ -1348,6 +1351,7 @@ +@@ -976,6 +979,7 @@ DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE); }; @@ -26,7 +26,7 @@ } // namespace -@@ -1549,8 +1553,10 @@ +@@ -1173,8 +1177,10 @@ case base::nix::DESKTOP_ENVIRONMENT_KDE3: case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: diff --git a/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc b/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc index c63aae5b0f98..3a8f8d1df4d0 100644 --- a/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc +++ b/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc @@ -1,23 +1,22 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2017-12-15 02:04:23.000000000 +0100 -+++ remoting/host/remoting_me2me_host.cc 2017-12-24 17:46:36.226255000 +0100 -@@ -116,14 +116,14 @@ +--- remoting/host/remoting_me2me_host.cc.orig 2018-03-20 23:05:29.000000000 +0100 ++++ remoting/host/remoting_me2me_host.cc 2018-03-24 18:19:49.996963000 +0100 +@@ -115,13 +115,13 @@ #include "base/mac/scoped_cftyperef.h" #endif // defined(OS_MACOSX) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include <gtk/gtk.h> - #include <X11/Xlib.h> - #undef Status // Xlib.h #defines this, which breaks protobuf headers. - #include <base/linux_util.h> + #include "base/linux_util.h" #include "remoting/host/audio_capturer_linux.h" #include "remoting/host/linux/certificate_watcher.h" + #include "ui/gfx/x/x11.h" -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_WIN) #include <commctrl.h> -@@ -158,11 +158,11 @@ +@@ -156,11 +156,11 @@ const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -31,7 +30,7 @@ #if defined(OS_POSIX) // The command line switch used to pass name of the unix domain socket used to -@@ -353,7 +353,7 @@ +@@ -351,7 +351,7 @@ std::unique_ptr<ChromotingHostContext> context_; @@ -40,7 +39,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif -@@ -566,10 +566,10 @@ +@@ -565,10 +565,10 @@ enable_window_capture_ = cmd_line->HasSwitch(kWindowIdSwitchName); if (enable_window_capture_) { @@ -53,7 +52,7 @@ // uint32_t is large enough to hold window IDs on all platforms. uint32_t window_id; -@@ -762,7 +762,7 @@ +@@ -761,7 +761,7 @@ DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -62,7 +61,7 @@ if (!cert_watcher_) { cert_watcher_.reset(new CertificateWatcher( base::Bind(&HostProcess::ShutdownHost, this, kSuccessExitCode), -@@ -848,7 +848,7 @@ +@@ -847,7 +847,7 @@ base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::Bind(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -71,7 +70,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> -@@ -857,7 +857,7 @@ +@@ -856,7 +856,7 @@ remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } @@ -80,7 +79,7 @@ #if defined(OS_POSIX) base::FilePath security_key_socket_name = -@@ -915,7 +915,7 @@ +@@ -914,7 +914,7 @@ // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -89,8 +88,8 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1547,7 +1547,7 @@ - host_->AddExtension(base::MakeUnique<TestEchoExtension>()); +@@ -1546,7 +1546,7 @@ + host_->AddExtension(std::make_unique<TestEchoExtension>()); // TODO(simonmorris): Get the maximum session duration from a policy. -#if defined(OS_LINUX) @@ -98,7 +97,7 @@ host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20)); #endif -@@ -1706,7 +1706,7 @@ +@@ -1705,7 +1705,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); diff --git a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc index 0c23b3cd348e..120b8421c0db 100644 --- a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc +++ b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_connection_freebsd.cc.orig 2018-03-04 05:38:54.417710000 +0100 -+++ services/device/hid/hid_connection_freebsd.cc 2018-03-04 08:44:44.849710000 +0100 -@@ -0,0 +1,280 @@ +--- services/device/hid/hid_connection_freebsd.cc.orig 2018-03-26 19:51:55.335784000 -0700 ++++ services/device/hid/hid_connection_freebsd.cc 2018-03-26 22:43:54.916775000 -0700 +@@ -0,0 +1,277 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -52,11 +52,11 @@ + base::Unretained(this))); + } + -+ void Write(scoped_refptr<net::IOBuffer> buffer, -+ size_t size, ++ void Write(scoped_refptr<base::RefCountedBytes> buffer, + WriteCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -+ char *data = buffer->data(); ++ auto data = buffer->front(); ++ size_t size = buffer->size(); + // if report id is 0, it shouldn't be included + if (data[0] == 0) { + data++; @@ -75,12 +75,12 @@ + } + + void GetFeatureReport(uint8_t report_id, -+ scoped_refptr<net::IOBufferWithSize> buffer, ++ scoped_refptr<base::RefCountedBytes> buffer, + ReadCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + struct usb_gen_descriptor ugd; + ugd.ugd_report_type = UHID_FEATURE_REPORT; -+ ugd.ugd_data = buffer->data(); ++ ugd.ugd_data = buffer->front(); + ugd.ugd_maxlen = buffer->size(); + int result = HANDLE_EINTR( + ioctl(fd_.get(), USB_GET_REPORT, &ugd)); @@ -98,21 +98,20 @@ + } + } + -+ void SendFeatureReport(scoped_refptr<net::IOBuffer> buffer, -+ size_t size, ++ void SendFeatureReport(scoped_refptr<base::RefCountedBytes> buffer, + WriteCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + struct usb_gen_descriptor ugd; + ugd.ugd_report_type = UHID_FEATURE_REPORT; -+ ugd.ugd_data = buffer->data(); -+ ugd.ugd_maxlen = size; ++ ugd.ugd_data = buffer->front(); ++ ugd.ugd_maxlen = buffer->size(); + // FreeBSD does not require report id if it's not used -+ if (buffer->data()[0] == 0) { -+ ugd.ugd_data = buffer->data() + 1; -+ ugd.ugd_maxlen = size - 1; ++ if (buffer->front()[0] == 0) { ++ ugd.ugd_data = buffer->front() + 1; ++ ugd.ugd_maxlen = buffer->size() - 1; + } else { -+ ugd.ugd_data = buffer->data(); -+ ugd.ugd_maxlen = size; ++ ugd.ugd_data = buffer->front(); ++ ugd.ugd_maxlen = buffer->size(); + } + int result = HANDLE_EINTR( + ioctl(fd_.get(), USB_SET_REPORT, &ugd)); @@ -130,8 +129,8 @@ + void OnFileCanReadWithoutBlocking() { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + -+ scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(report_buffer_size_)); -+ char* data = buffer->data(); ++ scoped_refptr<base::RefCountedBytes> buffer(new base::RefCountedBytes(report_buffer_size_)); ++ unsigned char* data = buffer->front(); + size_t length = report_buffer_size_; + if (!has_report_id_) { + // FreeBSD will not prefix the buffer with a report ID if report IDs are not @@ -210,14 +209,13 @@ + ProcessReadQueue(); +} + -+void HidConnectionFreeBSD::PlatformWrite(scoped_refptr<net::IOBuffer> buffer, -+ size_t size, ++void HidConnectionFreeBSD::PlatformWrite(scoped_refptr<base::RefCountedBytes> buffer, + WriteCallback callback) { + + blocking_task_runner_->PostTask( + FROM_HERE, + base::BindOnce(&BlockingTaskHelper::Write, base::Unretained(helper_.get()), -+ buffer, size, std::move(callback))); ++ buffer, std::move(callback))); +} + +void HidConnectionFreeBSD::PlatformGetFeatureReport(uint8_t report_id, @@ -225,8 +223,8 @@ + // The first byte of the destination buffer is the report ID being requested + // and is overwritten by the feature report. + DCHECK_GT(device_info()->max_feature_report_size(), 0u); -+ scoped_refptr<net::IOBufferWithSize> buffer( -+ new net::IOBufferWithSize(device_info()->max_feature_report_size() + 1)); ++ scoped_refptr<base::RefCountedBytes> buffer( ++ new base::RefCountedBytes(device_info()->max_feature_report_size() + 1)); + if (report_id != 0) + buffer->data()[0] = report_id; + @@ -238,17 +236,16 @@ +} + +void HidConnectionFreeBSD::PlatformSendFeatureReport( -+ scoped_refptr<net::IOBuffer> buffer, -+ size_t size, ++ scoped_refptr<base::RefCountedBytes> buffer, + WriteCallback callback) { + blocking_task_runner_->PostTask( + FROM_HERE, + base::BindOnce(&BlockingTaskHelper::SendFeatureReport, -+ base::Unretained(helper_.get()), buffer, size, std::move(callback))); ++ base::Unretained(helper_.get()), buffer, std::move(callback))); +} + +void HidConnectionFreeBSD::ProcessInputReport( -+ scoped_refptr<net::IOBuffer> buffer, ++ scoped_refptr<base::RefCountedBytes> buffer, + size_t size) { + DCHECK(thread_checker().CalledOnValidThread()); + DCHECK_GE(size, 1u); diff --git a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h index a4c54ad65cbd..2392d9d50aa7 100644 --- a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h +++ b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h @@ -1,6 +1,6 @@ ---- services/device/hid/hid_connection_freebsd.h.orig 2018-03-04 05:38:54.423072000 +0100 -+++ services/device/hid/hid_connection_freebsd.h 2018-03-04 08:36:02.866858000 +0100 -@@ -0,0 +1,76 @@ +--- services/device/hid/hid_connection_freebsd.h.orig 2018-03-26 19:51:55.337385000 -0700 ++++ services/device/hid/hid_connection_freebsd.h 2018-03-26 22:46:52.914490000 -0700 +@@ -0,0 +1,77 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -15,6 +15,8 @@ + +#include "base/files/scoped_file.h" +#include "base/macros.h" ++#include "base/memory/ptr_util.h" ++#include "base/memory/ref_counted_memory.h" +#include "base/memory/weak_ptr.h" +#include "base/sequence_checker.h" +#include "services/device/hid/hid_connection.h" @@ -45,15 +47,14 @@ + // HidConnection implementation. + void PlatformClose() override; + void PlatformRead(ReadCallback callback) override; -+ void PlatformWrite(scoped_refptr<net::IOBuffer> buffer, -+ size_t size, ++ void PlatformWrite(scoped_refptr<base::RefCountedBytes> buffer, + WriteCallback callback) override; + void PlatformGetFeatureReport(uint8_t report_id, + ReadCallback callback) override; -+ void PlatformSendFeatureReport(scoped_refptr<net::IOBuffer> buffer, -+ size_t size, ++ void PlatformSendFeatureReport(scoped_refptr<base::RefCountedBytes> buffer, + WriteCallback callback) override; -+ void ProcessInputReport(scoped_refptr<net::IOBuffer> buffer, size_t size); ++ void ProcessInputReport(scoped_refptr<base::RefCountedBytes> buffer, ++ size_t size); + void ProcessReadQueue(); + + // |helper_| lives on the sequence to which |blocking_task_runner_| posts diff --git a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp index 4a2be624e8c4..be071bc3afd3 100644 --- a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp +++ b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp @@ -1,20 +1,20 @@ ---- skia/ext/SkMemory_new_handler.cpp.orig 2017-06-05 19:03:11 UTC -+++ skia/ext/SkMemory_new_handler.cpp -@@ -68,7 +68,7 @@ static void* sk_malloc_nothrow(size_t size) { - // TODO(b.kelemen): we should always use UncheckedMalloc but currently it - // doesn't work as intended everywhere. - void* result; +--- skia/ext/SkMemory_new_handler.cpp.orig 2018-03-20 23:05:30.000000000 +0100 ++++ skia/ext/SkMemory_new_handler.cpp 2018-03-24 18:36:03.256042000 +0100 +@@ -69,7 +69,7 @@ + // TODO(b.kelemen): we should always use UncheckedMalloc but currently it + // doesn't work as intended everywhere. + void* result; -#if defined(OS_IOS) -+#if defined(OS_IOS) || defined(OS_FREEBSD) ++#if defined(OS_IOS) || defined(OS_BSD) result = malloc(size); #else // It's the responsibility of the caller to check the return value. -@@ -95,7 +95,7 @@ void* sk_calloc(size_t size) { - // TODO(b.kelemen): we should always use UncheckedCalloc but currently it - // doesn't work as intended everywhere. - void* result; +@@ -89,7 +89,7 @@ + // TODO(b.kelemen): we should always use UncheckedCalloc but currently it + // doesn't work as intended everywhere. + void* result; -#if defined(OS_IOS) -+#if defined(OS_IOS) || defined(OS_FREEBSD) ++#if defined(OS_IOS) || defined(OS_BSD) result = calloc(1, size); #else // It's the responsibility of the caller to check the return value. diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp index 43cea0e57d82..393960dc1f60 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp @@ -1,5 +1,5 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2017-09-05 21:06:52.000000000 +0200 -+++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp 2017-09-07 00:17:09.604043000 +0200 +--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2018-03-20 23:06:53.000000000 +0100 ++++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp 2018-03-24 18:42:49.216641000 +0100 @@ -25,7 +25,7 @@ #if defined(__ANDROID__) @@ -9,7 +9,7 @@ #include "Main/libX11.hpp" #endif -@@ -118,7 +118,7 @@ +@@ -119,7 +119,7 @@ // FIXME: Check if display_id is the default display } @@ -18,16 +18,25 @@ if(!libX11) { return success(HEADLESS_DISPLAY); -@@ -174,7 +174,7 @@ - if(dpy == EGL_NO_DISPLAY && name == EGL_EXTENSIONS) +@@ -176,7 +176,7 @@ { return success( + "EGL_KHR_client_get_all_proc_addresses " -#if defined(__linux__) && !defined(__ANDROID__) +#if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) "EGL_KHR_platform_gbm " "EGL_KHR_platform_x11 " #endif -@@ -1073,7 +1073,7 @@ +@@ -944,7 +944,7 @@ + + if(context) + { +- #if defined(__linux__) && !defined(__ANDROID__) ++ #if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) + egl::Display *display = context->getDisplay(); + + if(!display) +@@ -1110,7 +1110,7 @@ { TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLint *attrib_list = %p)", platform, native_display, attrib_list); diff --git a/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread.cc b/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread.cc index e7e9494949d3..e7a047315c2e 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread.cc @@ -1,5 +1,5 @@ ---- third_party/webrtc/rtc_base/platform_thread.cc.orig 2017-12-15 02:05:40.000000000 +0100 -+++ third_party/webrtc/rtc_base/platform_thread.cc 2017-12-24 19:19:48.387841000 +0100 +--- third_party/webrtc/rtc_base/platform_thread.cc.orig 2018-03-20 23:06:54.000000000 +0100 ++++ third_party/webrtc/rtc_base/platform_thread.cc 2018-03-24 18:50:14.671302000 +0100 @@ -16,7 +16,9 @@ #include "rtc_base/trace_event.h" @@ -10,19 +10,19 @@ #include <sys/syscall.h> #endif -@@ -31,8 +33,10 @@ - ret = pthread_mach_thread_np(pthread_self()); - #elif defined(WEBRTC_ANDROID) +@@ -37,8 +39,10 @@ ret = gettid(); + #elif defined(WEBRTC_FUCHSIA) + ret = zx_thread_self(); -#elif defined(WEBRTC_LINUX) +#elif defined(WEBRTC_LINUX) && !defined(__FreeBSD__) - ret = syscall(__NR_gettid); + ret = syscall(__NR_gettid); +#elif defined(__FreeBSD__) + ret = reinterpret_cast<uint64_t>(pthread_self()); #else // Default implementation for nacl and solaris. ret = reinterpret_cast<pid_t>(pthread_self()); -@@ -59,6 +63,7 @@ +@@ -65,6 +69,7 @@ } void SetCurrentThreadName(const char* name) { @@ -30,7 +30,7 @@ #if defined(WEBRTC_WIN) struct { DWORD dwType; -@@ -76,6 +81,7 @@ +@@ -82,6 +87,7 @@ prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name)); #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) pthread_setname_np(name); diff --git a/www/chromium/files/patch-third__party_webrtc_webrtc.gni b/www/chromium/files/patch-third__party_webrtc_webrtc.gni index eb5260fc2bef..0369772412e8 100644 --- a/www/chromium/files/patch-third__party_webrtc_webrtc.gni +++ b/www/chromium/files/patch-third__party_webrtc_webrtc.gni @@ -1,11 +1,11 @@ ---- third_party/webrtc/webrtc.gni.orig 2017-12-24 19:22:37.091592000 +0100 -+++ third_party/webrtc/webrtc.gni 2017-12-24 19:23:04.024283000 +0100 -@@ -199,7 +199,7 @@ +--- third_party/webrtc/webrtc.gni.orig 2018-03-20 23:06:54.000000000 +0100 ++++ third_party/webrtc/webrtc.gni 2018-03-24 18:56:59.262948000 +0100 +@@ -206,7 +206,7 @@ rtc_opus_dir = "//third_party/opus" # Desktop capturer is supported only on Windows, OSX and Linux. --rtc_desktop_capture_supported = is_win || is_mac || (is_linux && use_x11) -+rtc_desktop_capture_supported = is_win || is_mac || ((is_linux && use_x11) && !is_bsd) +-rtc_desktop_capture_supported = is_win || is_mac || (is_linux && rtc_use_x11) ++rtc_desktop_capture_supported = is_win || is_mac || ((is_linux && rtc_use_x11) && !is_bsd) ############################################################################### # Templates diff --git a/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc index 078ebbd9dfd2..d5a6d67f1227 100644 --- a/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc +++ b/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc @@ -1,5 +1,5 @@ ---- ui/base/ime/input_method_initializer.cc.orig 2017-04-19 19:06:54 UTC -+++ ui/base/ime/input_method_initializer.cc +--- ui/base/ime/input_method_initializer.cc.orig 2018-03-20 23:05:56.000000000 +0100 ++++ ui/base/ime/input_method_initializer.cc 2018-03-24 19:03:36.686236000 +0100 @@ -8,14 +8,14 @@ #if defined(OS_CHROMEOS) @@ -14,19 +14,19 @@ -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) +#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) - const ui::LinuxInputMethodContextFactory* g_linux_input_method_context_factory; + const ui::LinuxInputMethodContextFactory* + g_linux_input_method_context_factory_for_testing; #endif - -@@ -38,7 +38,7 @@ void ShutdownInputMethod() { +@@ -39,7 +39,7 @@ void InitializeInputMethodForTesting() { #if defined(OS_CHROMEOS) IMEBridge::Initialize(); -#elif defined(USE_AURA) && defined(OS_LINUX) +#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) - if (!g_linux_input_method_context_factory) - g_linux_input_method_context_factory = new FakeInputMethodContextFactory(); - const LinuxInputMethodContextFactory* factory = -@@ -54,7 +54,7 @@ void InitializeInputMethodForTesting() { + if (!g_linux_input_method_context_factory_for_testing) + g_linux_input_method_context_factory_for_testing = + new FakeInputMethodContextFactory(); +@@ -56,7 +56,7 @@ void ShutdownInputMethodForTesting() { #if defined(OS_CHROMEOS) IMEBridge::Shutdown(); @@ -34,4 +34,4 @@ +#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) const LinuxInputMethodContextFactory* factory = LinuxInputMethodContextFactory::instance(); - CHECK(!factory || factory == g_linux_input_method_context_factory) + CHECK(!factory || factory == g_linux_input_method_context_factory_for_testing) diff --git a/www/chromium/files/patch-ui_gfx_native_pixmap_handle.cc b/www/chromium/files/patch-ui_gfx_native_pixmap_handle.cc index d1d220dc190b..7a5499a5ba1b 100644 --- a/www/chromium/files/patch-ui_gfx_native_pixmap_handle.cc +++ b/www/chromium/files/patch-ui_gfx_native_pixmap_handle.cc @@ -1,15 +1,23 @@ ---- ui/gfx/native_pixmap_handle.cc.orig 2017-08-02 17:15:59.238862000 +0200 -+++ ui/gfx/native_pixmap_handle.cc 2017-08-02 17:16:22.332770000 +0200 -@@ -4,7 +4,7 @@ +--- ui/gfx/native_pixmap_handle.cc.orig 2018-03-20 23:05:56.000000000 +0100 ++++ ui/gfx/native_pixmap_handle.cc 2018-03-24 19:09:06.975980000 +0100 +@@ -4,14 +4,14 @@ #include "ui/gfx/native_pixmap_handle.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) + #include <drm_fourcc.h> #include "base/posix/eintr_wrapper.h" #endif -@@ -29,7 +29,7 @@ + namespace gfx { + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + static_assert(NativePixmapPlane::kNoModifier == DRM_FORMAT_MOD_INVALID, + "gfx::NativePixmapPlane::kNoModifier should be an alias for" + "DRM_FORMAT_MOD_INVALID"); +@@ -36,7 +36,7 @@ NativePixmapHandle::~NativePixmapHandle() {} diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc index 7f55788693be..c96e835933e9 100644 --- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc +++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc @@ -1,5 +1,5 @@ ---- ui/gl/sync_control_vsync_provider.cc.orig 2017-12-15 02:04:52.000000000 +0100 -+++ ui/gl/sync_control_vsync_provider.cc 2017-12-24 20:23:51.378230000 +0100 +--- ui/gl/sync_control_vsync_provider.cc.orig 2018-03-20 23:05:56.000000000 +0100 ++++ ui/gl/sync_control_vsync_provider.cc 2018-03-24 19:15:24.360217000 +0100 @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" #include "build/build_config.h" @@ -18,21 +18,21 @@ // On platforms where we can't get an accurate reading on the refresh // rate we fall back to the assumption that we're displaying 60 frames // per second. -@@ -39,7 +39,7 @@ - void SyncControlVSyncProvider::GetVSyncParameters( - const UpdateVSyncCallback& callback) { +@@ -48,7 +48,7 @@ + base::TimeTicks* timebase_out, + base::TimeDelta* interval_out) { TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters"); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // The actual clock used for the system time returned by glXGetSyncValuesOML // is unspecified. In practice, the clock used is likely to be either // CLOCK_REALTIME or CLOCK_MONOTONIC, so we compare the returned time to the -@@ -155,7 +155,7 @@ - last_timebase_ = timebase; - last_media_stream_counter_ = media_stream_counter; - callback.Run(timebase, last_good_interval_); +@@ -161,7 +161,7 @@ + return true; + #else + return false; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) } - } // namespace gl + bool SyncControlVSyncProvider::SupportGetVSyncParametersIfAvailable() { diff --git a/www/chromium/files/patch-v8_src_globals.h b/www/chromium/files/patch-v8_src_globals.h index 4b344dfa7bd9..c0ea55a4364e 100644 --- a/www/chromium/files/patch-v8_src_globals.h +++ b/www/chromium/files/patch-v8_src_globals.h @@ -1,14 +1,14 @@ ---- v8/src/globals.h.orig 2017-06-05 19:04:29 UTC -+++ v8/src/globals.h -@@ -184,7 +184,11 @@ const size_t kCodeRangeAreaAlignment = 256 * MB; - const size_t kMaximalCodeRangeSize = 512 * MB; - const size_t kCodeRangeAreaAlignment = 64 * KB; // OS page on PPC Linux +--- v8/src/globals.h.orig 2018-03-20 23:06:56.000000000 +0100 ++++ v8/src/globals.h 2018-03-24 19:21:33.728280000 +0100 +@@ -195,7 +195,11 @@ + constexpr size_t kMaximalCodeRangeSize = 512 * MB; + constexpr size_t kCodeRangeAreaAlignment = 64 * KB; // OS page on PPC Linux #else +#if defined(__FreeBSD__) -+const size_t kMaximalCodeRangeSize = 512 * MB; + constexpr size_t kMaximalCodeRangeSize = 512 * MB; +#else - const size_t kMaximalCodeRangeSize = 512 * MB; ++constexpr size_t kMaximalCodeRangeSize = 512 * MB; +#endif - const size_t kCodeRangeAreaAlignment = 4 * KB; // OS page. + constexpr size_t kCodeRangeAreaAlignment = 4 * KB; // OS page. #endif #if V8_OS_WIN diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 94a3ce296914..91049fb02ea9 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -192,12 +192,10 @@ bin/chrome %%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js %%DATADIR%%/resources/inspector/animation/animation_module.js %%DATADIR%%/resources/inspector/application_test_runner/application_test_runner_module.js -%%DATADIR%%/resources/inspector/audits/audits_module.js %%DATADIR%%/resources/inspector/audits2/audits2_module.js %%DATADIR%%/resources/inspector/audits2_test_runner/audits2_test_runner_module.js %%DATADIR%%/resources/inspector/audits2_worker.js %%DATADIR%%/resources/inspector/audits2_worker/audits2_worker_module.js -%%DATADIR%%/resources/inspector/audits_test_runner/audits_test_runner_module.js %%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js %%DATADIR%%/resources/inspector/changes/changes_module.js %%DATADIR%%/resources/inspector/cm/cm_module.js @@ -309,7 +307,6 @@ bin/chrome %%DEBUG%%%%DATADIR%%/libVkLayer_core_validation.so %%DEBUG%%%%DATADIR%%/libVkLayer_object_tracker.so %%DEBUG%%%%DATADIR%%/libVkLayer_parameter_validation.so -%%DEBUG%%%%DATADIR%%/libVkLayer_swapchain.so %%DEBUG%%%%DATADIR%%/libVkLayer_threading.so %%DEBUG%%%%DATADIR%%/libVkLayer_unique_objects.so %%DRIVER%%bin/chromedriver |