diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-02-06 19:29:36 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-02-06 19:29:36 +0000 |
| commit | 8d28aa8db0c717bef863b7a7630f48cf3870ffb1 (patch) | |
| tree | ae8b6c930932585d45e586480457898519baa1ce | |
| parent | e6deb13ae02980aee974916b1e5cd188e07aff92 (diff) | |
| download | ports-8d28aa8db0c717bef863b7a7630f48cf3870ffb1.tar.gz ports-8d28aa8db0c717bef863b7a7630f48cf3870ffb1.zip | |
Notes
502 files changed, 2312 insertions, 2191 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 493c918e6762..d0505e6e9ae9 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 55.0.2883.87 +PORTVERSION= 56.0.2924.87 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on @@ -13,46 +13,48 @@ COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi -BUILD_DEPENDS= bash:shells/bash \ +BUILD_DEPENDS= gperf:devel/gperf \ clang39:devel/llvm39 \ + yasm:devel/yasm \ python:lang/python \ + ffmpeg>=3.2.2,1:multimedia/ffmpeg \ + bash:shells/bash \ flock:sysutils/flock \ - gperf:devel/gperf \ - yasm:devel/yasm \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib -LIB_DEPENDS= libcairo.so:graphics/cairo \ - libcups.so:print/cups \ +LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher \ + libsnappy.so:archivers/snappy \ + libFLAC.so:audio/flac \ + libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ - libdrm.so:graphics/libdrm \ - libexpat.so:textproc/expat2 \ - libFLAC.so:audio/flac \ - libfreetype.so:print/freetype2 \ - libgnome-keyring.so:security/libgnome-keyring \ - libharfbuzz.so:print/harfbuzz \ - libexif.so:graphics/libexif \ - libfontconfig.so:x11-fonts/fontconfig \ - libgcrypt.so:security/libgcrypt \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ - libnspr4.so:devel/nspr \ - libnss3.so:security/nss \ libpci.so:devel/libpci \ - libpng.so:graphics/png \ + libnspr4.so:devel/nspr \ libre2.so:devel/re2 \ - libsnappy.so:archivers/snappy \ - libspeechd.so:accessibility/speech-dispatcher \ - libspeex.so:audio/speex \ + libcairo.so:graphics/cairo \ + libdrm.so:graphics/libdrm \ + libexif.so:graphics/libexif \ + libpng.so:graphics/png \ libwebp.so:graphics/webp \ - libxml2.so:textproc/libxml2 + libavcodec.so:multimedia/ffmpeg \ + libcups.so:print/cups \ + libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz \ + libgcrypt.so:security/libgcrypt \ + libgnome-keyring.so:security/libgnome-keyring \ + libnss3.so:security/nss \ + libexpat.so:textproc/expat2 \ + libxml2.so:textproc/libxml2 \ + libfontconfig.so:x11-fonts/fontconfig -RUN_DEPENDS= droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \ - xdg-open:devel/xdg-utils +RUN_DEPENDS= xdg-open:devel/xdg-utils \ + droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf ONLY_FOR_ARCHS= i386 amd64 USES= compiler bison cpe desktop-file-utils execinfo jpeg \ @@ -63,7 +65,7 @@ CPE_PRODUCT= chrome USE_PERL5= build USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xproto xrandr xrender xscrnsaver xtst -USE_GNOME= atk glib20 gtk20 dconf libxslt libxml2 +USE_GNOME= atk glib20 gtk20 gtk30 dconf libxslt libxml2 MAKE_ARGS= -C out/${BUILDTYPE} SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome @@ -110,7 +112,7 @@ OPTIONS_GROUP= AUDIO TESTS OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO OPTIONS_GROUP_TESTS= DEBUG TEST -OPTIONS_DEFAULT= CODECS GCONF KERBEROS ALSA PULSEAUDIO +OPTIONS_DEFAULT= ALSA CODECS DRIVER GCONF KERBEROS OPTIONS_SUB= yes GCONF_USE= GNOME=gconf2 @@ -224,7 +226,7 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE} + ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE} do-configure: # GN generator bootstrapping and generating ninja files diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 4dd3bedca907..fda4e173c6e5 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1481977811 -SHA256 (chromium-55.0.2883.87.tar.xz) = e81bd3140d9c84dfee04d9a94686dfe6a20ae79475d84f17154c5536dcb81a58 -SIZE (chromium-55.0.2883.87.tar.xz) = 511249724 -SHA256 (chromium-55.0.2883.87-testdata.tar.xz) = 24ee31dfe7c665cfce5e6e826d2864292585f5b95dd5ead235d0edf89f2f38c0 -SIZE (chromium-55.0.2883.87-testdata.tar.xz) = 124466280 +TIMESTAMP = 1486036781 +SHA256 (chromium-56.0.2924.87.tar.xz) = 9aac081ffccaae6497068100477a4e6ac7086bd15ad3c3cd009b9a760b7a53e0 +SIZE (chromium-56.0.2924.87.tar.xz) = 514429808 +SHA256 (chromium-56.0.2924.87-testdata.tar.xz) = 2dea413379e4eccd351bb50cede549e9a8c4fbd897f6a8b03442c7a9b57d6b55 +SIZE (chromium-56.0.2924.87-testdata.tar.xz) = 123553884 diff --git a/www/chromium/files/extra-patch-10 b/www/chromium/files/extra-patch-10 index 08d35b9ee895..f0ea2ae78236 100644 --- a/www/chromium/files/extra-patch-10 +++ b/www/chromium/files/extra-patch-10 @@ -1,10 +1,11 @@ ---- content/renderer/devtools/v8_sampling_profiler.cc.orig 2016-10-06 04:02:19.000000000 +0300 -+++ content/renderer/devtools/v8_sampling_profiler.cc 2016-10-30 03:00:33.775227000 +0300 -@@ -22,6 +22,7 @@ - - #if defined(OS_POSIX) - #include <signal.h> -+#include <ucontext.h> - #define USE_SIGNALS - #endif - +--- third_party/skia/src/core/SkSmallAllocator.h.orig 2017-02-01 20:16:14.715097000 +0100 ++++ third_party/skia/src/core/SkSmallAllocator.h 2017-02-01 20:24:56.680605000 +0100 +@@ -20,7 +20,7 @@ + // abstract type. The complication with max_align_t is that it is defined differently for + // different builds. + namespace { +-#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC) ++#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC) || defined(__FreeBSD__) + // Use std::max_align_t for compiles that follow the standard. + #include <cstddef> + using SystemAlignment = std::max_align_t; diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index b207dec8ee74..0110971200be 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2016-12-01 23:02:04 UTC +--- BUILD.gn.orig 2017-01-26 00:49:06 UTC +++ BUILD.gn -@@ -215,7 +215,7 @@ group("both_gn_and_gyp") { +@@ -217,7 +217,7 @@ group("both_gn_and_gyp") { ] } @@ -9,7 +9,7 @@ deps += [ "//chrome", "//chrome/test:browser_tests", -@@ -274,7 +274,7 @@ group("both_gn_and_gyp") { +@@ -277,7 +277,7 @@ group("both_gn_and_gyp") { ] } @@ -18,7 +18,7 @@ # TODO(GYP): Figure out which of these should actually build on iOS, # and whether there should be other targets that are iOS-only and missing. deps += [ -@@ -316,7 +316,7 @@ group("both_gn_and_gyp") { +@@ -320,7 +320,7 @@ group("both_gn_and_gyp") { "//ui/touch_selection:ui_touch_selection_unittests", "//url/ipc:url_ipc_unittests", ] @@ -27,7 +27,7 @@ deps += [ "//ios:all" ] } -@@ -474,7 +474,7 @@ group("both_gn_and_gyp") { +@@ -488,7 +488,7 @@ group("both_gn_and_gyp") { ] } @@ -36,7 +36,7 @@ # The following are definitely linux-only. deps += [ "//chrome:manpage", -@@ -501,9 +501,16 @@ group("both_gn_and_gyp") { +@@ -515,9 +515,16 @@ group("both_gn_and_gyp") { # TODO(dpranke): add the linux_dump_symbols flag? deps += [ "//chrome:linux_symbols" ] } @@ -54,7 +54,7 @@ deps += [ "//base:base_i18n_perftests", "//base:base_perftests", -@@ -574,7 +581,7 @@ group("both_gn_and_gyp") { +@@ -588,7 +595,7 @@ group("both_gn_and_gyp") { if (enable_nacl) { deps += [ "//components/nacl/loader:nacl_loader_unittests" ] @@ -63,7 +63,7 @@ # TODO(dpranke): Figure out what platforms should actually have this. deps += [ "//components/nacl/loader:nacl_helper" ] -@@ -688,7 +695,7 @@ group("both_gn_and_gyp") { +@@ -698,7 +705,7 @@ group("both_gn_and_gyp") { deps += [ "//chrome/installer/mini_installer:next_version_mini_installer" ] } @@ -72,8 +72,8 @@ deps += [ "//breakpad:symupload($host_toolchain)" ] } -@@ -736,7 +743,7 @@ group("gn_only") { - ] +@@ -743,7 +750,7 @@ group("gn_only") { + deps += [ "//components/proximity_auth:proximity_auth_unittests" ] } - if (is_win || is_linux) { @@ -81,8 +81,8 @@ deps += [ "//mash:all", "//media/mojo/services:media_mojo_shell_unittests", -@@ -749,7 +756,7 @@ group("gn_only") { - ] +@@ -763,7 +770,7 @@ group("gn_only") { + } } - if (is_linux && !is_chromeos && !is_chromecast) { @@ -117,7 +117,7 @@ deps += [ "//testing/libfuzzer/fuzzers", "//testing/libfuzzer/tests:libfuzzer_tests", -@@ -876,7 +883,7 @@ group("gn_only") { +@@ -877,7 +884,7 @@ group("gn_only") { group("gn_mojo_targets") { testonly = true @@ -126,7 +126,7 @@ # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps = [ -@@ -901,7 +908,7 @@ group("gn_visibility") { +@@ -903,7 +910,7 @@ group("gn_visibility") { } } @@ -135,16 +135,25 @@ # This group includes all of the targets needed to build and test Blink, # including running the layout tests (see below). group("blink_tests") { -@@ -935,7 +942,7 @@ if (!is_ios) { - ] +@@ -949,7 +956,7 @@ if (!is_ios) { + data_deps += [ "//content/shell:content_shell_crash_service" ] } - if (!is_win && !is_android) { + if (!is_win && !is_android && !is_bsd) { - deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] + data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] + } + +@@ -957,7 +964,7 @@ if (!is_ios) { + data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] + } + +- if (is_linux) { ++ if (is_linux && !is_bsd) { + data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] } -@@ -961,7 +968,7 @@ group("chromium_swarm_tests") { +@@ -979,7 +986,7 @@ group("chromium_swarm_tests") { group("chromium_builder_perf") { testonly = true @@ -153,9 +162,9 @@ data_deps = [ "//cc:cc_perftests", "//chrome/test:load_library_perf_tests", -@@ -992,7 +999,7 @@ group("chromium_builder_perf") { +@@ -1009,7 +1016,7 @@ group("chromium_builder_perf") { "//chrome/installer/mini_installer:mini_installer", - "//third_party/angle/src/tests:angle_perftests", + "//chrome/test:angle_perftests", ] - } else { + } else if (!is_bsd) { diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc new file mode 100644 index 000000000000..26559e10ae19 --- /dev/null +++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -0,0 +1,14 @@ +--- ash/display/mirror_window_controller.cc.orig 2017-01-26 00:49:06 UTC ++++ ash/display/mirror_window_controller.cc +@@ -250,7 +250,11 @@ void MirrorWindowController::UpdateWindo + return info.id() == iter->first; + }) == display_info_list.end()) { + CloseAndDeleteHost(iter->second, true); ++#if defined(__llvm__) ++ mirroring_host_info_map_.erase(iter++); ++#else + iter = mirroring_host_info_map_.erase(iter); ++#endif + } else { + ++iter; + } diff --git a/www/chromium/files/patch-ash_shell.cc b/www/chromium/files/patch-ash_shell.cc new file mode 100644 index 000000000000..1f5835af023d --- /dev/null +++ b/www/chromium/files/patch-ash_shell.cc @@ -0,0 +1,11 @@ +--- ash/shell.cc.orig 2017-01-26 00:49:07 UTC ++++ ash/shell.cc +@@ -579,7 +579,7 @@ void Shell::Init(const ShellInitParams& + + immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>(); + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + NOTREACHED() << "linux desktop does not support ash."; + #endif + diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index cf41e62d65b8..e1b2c0d7292f 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/BUILD.gn 2016-10-25 21:49:35.259700000 +0300 -@@ -1051,6 +1051,35 @@ +--- base/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ base/BUILD.gn +@@ -1076,6 +1076,35 @@ component("base") { public_deps += [ "//base/allocator:unified_allocator_shim" ] } @@ -36,7 +36,7 @@ # Allow more direct string conversions on platforms with native utf8 # strings if (is_mac || is_ios || is_chromeos || is_chromecast) { -@@ -1322,7 +1351,7 @@ +@@ -1347,7 +1376,7 @@ component("base") { } # Linux. @@ -45,7 +45,7 @@ if (is_asan || is_lsan || is_msan || is_tsan) { # For llvm-sanitizer. data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ] -@@ -1347,7 +1376,7 @@ +@@ -1372,7 +1401,7 @@ component("base") { "//base/third_party/xdg_user_dirs", ] } else { @@ -54,7 +54,7 @@ sources -= [ "nix/mime_util_xdg.cc", "nix/mime_util_xdg.h", -@@ -1363,6 +1392,13 @@ +@@ -1388,6 +1417,13 @@ component("base") { } } @@ -68,7 +68,7 @@ # iOS if (is_ios) { set_sources_assignment_filter([]) -@@ -2117,6 +2153,12 @@ +@@ -2154,6 +2190,12 @@ test("base_unittests") { set_sources_assignment_filter(sources_assignment_filter) } diff --git a/www/chromium/files/patch-base__trace_event__process_memory_dump.h b/www/chromium/files/patch-base__trace_event__process_memory_dump.h index e8d451f0804d..1f65c3579f63 100644 --- a/www/chromium/files/patch-base__trace_event__process_memory_dump.h +++ b/www/chromium/files/patch-base__trace_event__process_memory_dump.h @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.h.orig 2016-05-25 15:00:55.000000000 -0400 -+++ base/trace_event/process_memory_dump.h 2016-05-27 01:46:53.167565000 -0400 -@@ -23,7 +23,7 @@ +--- base/trace_event/process_memory_dump.h.orig 2017-01-26 00:49:07 UTC ++++ base/trace_event/process_memory_dump.h +@@ -24,7 +24,7 @@ // Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the // resident memory. diff --git a/www/chromium/files/patch-base_allocator_BUILD.gn b/www/chromium/files/patch-base_allocator_BUILD.gn index db23a267392e..316bc3b4f349 100644 --- a/www/chromium/files/patch-base_allocator_BUILD.gn +++ b/www/chromium/files/patch-base_allocator_BUILD.gn @@ -1,6 +1,6 @@ ---- base/allocator/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/allocator/BUILD.gn 2016-10-13 04:07:29.886540000 +0300 -@@ -330,6 +330,9 @@ +--- base/allocator/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ base/allocator/BUILD.gn +@@ -338,6 +338,9 @@ if (use_experimental_allocator_shim) { ] } else if (is_linux && use_allocator == "none") { sources += [ "allocator_shim_default_dispatch_to_glibc.cc" ] diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc index 215e804d4825..ea29f592c045 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2016-12-01 23:02:05 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2017-01-26 00:49:07 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc @@ -3,19 +3,28 @@ // found in the LICENSE file. diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h index 14edf7910aa8..15c93d8491c2 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h +++ b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h @@ -1,11 +1,11 @@ ---- base/allocator/allocator_shim_override_libc_symbols.h.orig 2016-08-13 16:23:28.370905000 +0300 -+++ base/allocator/allocator_shim_override_libc_symbols.h 2016-08-13 16:23:33.784774000 +0300 +--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2017-01-26 00:49:07 UTC ++++ base/allocator/allocator_shim_override_libc_symbols.h @@ -10,7 +10,7 @@ #endif #define BASE_ALLOCATOR_ALLOCATOR_SHIM_OVERRIDE_LIBC_SYMBOLS_H_ - + -#include <malloc.h> +#include <stdlib.h> - + #include "base/allocator/allocator_shim_internals.h" - + diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc index 0a676221664f..1ebf6eeb5d40 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -1,5 +1,5 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/allocator/allocator_shim_unittest.cc 2016-10-25 21:48:23.218013000 +0300 +--- base/allocator/allocator_shim_unittest.cc.orig 2017-01-26 00:49:07 UTC ++++ base/allocator/allocator_shim_unittest.cc @@ -4,7 +4,6 @@ #include "base/allocator/allocator_shim.h" @@ -8,7 +8,7 @@ #include <stdlib.h> #include <string.h> -@@ -193,11 +192,13 @@ +@@ -193,11 +192,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS ASSERT_GE(zero_allocs_intercepted_by_size[2 * 23], 1u); #if !defined(OS_WIN) @@ -22,7 +22,7 @@ void* posix_memalign_ptr = nullptr; int res = posix_memalign(&posix_memalign_ptr, 256, 59); -@@ -214,12 +215,14 @@ +@@ -214,12 +215,14 @@ TEST_F(AllocatorShimTest, InterceptLibcS ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u); @@ -37,7 +37,7 @@ #endif // OS_WIN char* realloc_ptr = static_cast<char*>(realloc(nullptr, 71)); -@@ -240,8 +243,10 @@ +@@ -240,8 +243,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u); #if !defined(OS_WIN) @@ -48,7 +48,7 @@ free(posix_memalign_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(posix_memalign_ptr)], 1u); -@@ -249,8 +254,10 @@ +@@ -249,8 +254,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS free(valloc_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(valloc_ptr)], 1u); diff --git a/www/chromium/files/patch-base_debug_proc__maps__linux.cc b/www/chromium/files/patch-base_debug_proc__maps__linux.cc index b10e9fa42133..cdbf70ac7948 100644 --- a/www/chromium/files/patch-base_debug_proc__maps__linux.cc +++ b/www/chromium/files/patch-base_debug_proc__maps__linux.cc @@ -1,5 +1,5 @@ ---- base/debug/proc_maps_linux.cc.orig 2016-08-03 22:02:10.000000000 +0300 -+++ base/debug/proc_maps_linux.cc 2016-09-05 22:49:53.622055000 +0300 +--- base/debug/proc_maps_linux.cc.orig 2017-01-26 00:49:07 UTC ++++ base/debug/proc_maps_linux.cc @@ -12,7 +12,7 @@ #include "base/strings/string_split.h" #include "build/build_config.h" diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc index 8c058716798e..9c0360484132 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2016-05-11 19:02:11 UTC +--- base/debug/stack_trace_posix.cc.orig 2017-01-26 00:49:07 UTC +++ base/debug/stack_trace_posix.cc @@ -571,6 +571,10 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. diff --git a/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc b/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc index 658728ffd206..3678de187a3d 100644 --- a/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc +++ b/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc @@ -1,5 +1,5 @@ ---- base/debug/scoped_thread_heap_usage.cc.orig 2016-12-12 23:57:03 UTC -+++ base/debug/scoped_thread_heap_usage.cc +--- base/debug/thread_heap_usage_tracker.cc.orig 2017-01-26 00:49:07 UTC ++++ base/debug/thread_heap_usage_tracker.cc @@ -14,11 +14,13 @@ #include "base/threading/thread_local_storage.h" #include "build/build_config.h" diff --git a/www/chromium/files/patch-base_files_file__path__unittest.cc b/www/chromium/files/patch-base_files_file__path__unittest.cc index 9792611df0d3..61892b28d3ed 100644 --- a/www/chromium/files/patch-base_files_file__path__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/files/file_path_unittest.cc 2016-10-25 21:44:53.079388000 +0300 -@@ -1133,7 +1133,7 @@ +--- base/files/file_path_unittest.cc.orig 2017-01-26 00:49:07 UTC ++++ base/files/file_path_unittest.cc +@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_ "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, }; diff --git a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h index feb65dad5ce0..d8f64ce34b1c 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h +++ b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_kqueue.h.orig 2016-03-25 13:04:44 UTC +--- base/files/file_path_watcher_kqueue.h.orig 2017-01-26 00:49:07 UTC +++ base/files/file_path_watcher_kqueue.h @@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ @@ -9,5 +9,5 @@ +#include <sys/types.h> +#endif #include <sys/event.h> - #include <vector> + #include <memory> diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index b261921644d5..d6ce76c88149 100644 --- a/www/chromium/files/patch-base_files_file__util.h +++ b/www/chromium/files/patch-base_files_file__util.h @@ -1,6 +1,6 @@ ---- base/files/file_util.h.orig 2016-08-03 22:02:10.000000000 +0300 -+++ base/files/file_util.h 2016-09-05 23:00:09.940024000 +0300 -@@ -391,7 +391,7 @@ +--- base/files/file_util.h.orig 2017-01-26 00:49:07 UTC ++++ base/files/file_util.h +@@ -404,7 +404,7 @@ BASE_EXPORT bool VerifyPathControlledByA // the directory |path|, in the number of FilePath::CharType, or -1 on failure. BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc index 05401888b9e3..50717f7ab95b 100644 --- a/www/chromium/files/patch-base_linux__util.cc +++ b/www/chromium/files/patch-base_linux__util.cc @@ -1,6 +1,6 @@ ---- base/linux_util.cc.orig 2016-08-13 05:03:14.838982000 +0300 -+++ base/linux_util.cc 2016-08-13 05:04:48.912092000 +0300 -@@ -86,12 +86,14 @@ +--- base/linux_util.cc.orig 2017-01-26 00:49:07 UTC ++++ base/linux_util.cc +@@ -110,12 +110,14 @@ char g_linux_distro[kDistroSize] = "CrOS"; #elif defined(OS_ANDROID) "Android"; @@ -9,7 +9,7 @@ #else // if defined(OS_LINUX) "Unknown"; #endif - + std::string GetLinuxDistro() { -#if defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) diff --git a/www/chromium/files/patch-base_native__library__posix.cc b/www/chromium/files/patch-base_native__library__posix.cc index c18b9cc68523..ef6cb339305e 100644 --- a/www/chromium/files/patch-base_native__library__posix.cc +++ b/www/chromium/files/patch-base_native__library__posix.cc @@ -1,8 +1,8 @@ ---- base/native_library_posix.cc.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/native_library_posix.cc 2016-10-14 03:14:48.329757000 +0300 -@@ -35,7 +35,7 @@ - // versions. Crash here to warn developers that they're trying to rely on - // uncertain behavior. +--- base/native_library_posix.cc.orig 2017-01-26 00:49:07 UTC ++++ base/native_library_posix.cc +@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptio + // further investigation, as it might vary across versions. Crash here to + // warn developers that they're trying to rely on uncertain behavior. CHECK(!options.prefer_own_symbols); -#else +#elif !defined(OS_BSD) diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc b/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc index 9998ff836a8e..13b9d6e72ade 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc @@ -1,5 +1,5 @@ ---- base/posix/unix_domain_socket_linux.cc.orig 2016-08-03 22:02:10.000000000 +0300 -+++ base/posix/unix_domain_socket_linux.cc 2016-09-06 23:39:53.563078000 +0300 +--- base/posix/unix_domain_socket_linux.cc.orig 2017-01-26 00:49:07 UTC ++++ base/posix/unix_domain_socket_linux.cc @@ -23,6 +23,15 @@ namespace base { @@ -16,7 +16,7 @@ const size_t UnixDomainSocket::kMaxFileDescriptors = 16; #if !defined(OS_NACL_NONSFI) -@@ -40,8 +49,14 @@ +@@ -40,8 +49,14 @@ static bool CreateSocketPair(ScopedFD* o // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { @@ -31,7 +31,7 @@ } #endif // !defined(OS_NACL_NONSFI) -@@ -147,7 +162,11 @@ +@@ -147,7 +162,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFla // The PNaCl toolchain for Non-SFI binary build does not support // SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc b/www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc index b46ac6e34068..63cebeafbf75 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_linux_unittest.cc.orig 2016-03-25 13:04:44 UTC +--- base/posix/unix_domain_socket_linux_unittest.cc.orig 2017-01-26 00:49:07 UTC +++ base/posix/unix_domain_socket_linux_unittest.cc @@ -2,10 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h index 3a4500532372..933476b2bbb1 100644 --- a/www/chromium/files/patch-base_process_internal__linux.h +++ b/www/chromium/files/patch-base_process_internal__linux.h @@ -1,4 +1,4 @@ ---- base/process/internal_linux.h.orig 2016-03-25 13:04:44 UTC +--- base/process/internal_linux.h.orig 2017-01-26 00:49:07 UTC +++ base/process/internal_linux.h @@ -14,6 +14,8 @@ diff --git a/www/chromium/files/patch-base_process_launch.cc b/www/chromium/files/patch-base_process_launch.cc index 7b4ea94dffaf..074b23e61664 100644 --- a/www/chromium/files/patch-base_process_launch.cc +++ b/www/chromium/files/patch-base_process_launch.cc @@ -1,6 +1,6 @@ ---- base/process/launch.cc.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/process/launch.cc 2016-10-13 04:27:47.136877000 +0300 -@@ -15,7 +15,7 @@ +--- base/process/launch.cc.orig 2017-01-26 00:49:07 UTC ++++ base/process/launch.cc +@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = defaul LaunchOptions LaunchOptionsForTest() { LaunchOptions options; diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index 95594455c390..3f595913343c 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,6 +1,6 @@ ---- base/process/launch.h.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/process/launch.h 2016-10-13 04:27:24.908534000 +0300 -@@ -138,7 +138,7 @@ +--- base/process/launch.h.orig 2017-01-26 00:49:07 UTC ++++ base/process/launch.h +@@ -138,7 +138,7 @@ struct BASE_EXPORT LaunchOptions { // will be the same as its pid. bool new_process_group = false; @@ -9,7 +9,7 @@ // If non-zero, start the process using clone(), using flags as provided. // Unlike in clone, clone_flags may not contain a custom termination signal // that is sent to the parent when the child dies. The termination signal will -@@ -151,7 +151,7 @@ +@@ -151,7 +151,7 @@ struct BASE_EXPORT LaunchOptions { // Sets parent process death signal to SIGKILL. bool kill_on_parent_death = false; @@ -17,4 +17,4 @@ +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_POSIX) - // If non-null, a delegate to be run immediately prior to executing the new + // If not empty, launch the specified executable instead of diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc index dbd0ca9e9477..87cf64b04060 100644 --- a/www/chromium/files/patch-base_process_launch__posix.cc +++ b/www/chromium/files/patch-base_process_launch__posix.cc @@ -1,7 +1,7 @@ ---- base/process/launch_posix.cc.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/process/launch_posix.cc 2016-10-16 15:45:00.730008000 +0300 -@@ -62,6 +62,7 @@ - #include <sys/event.h> +--- base/process/launch_posix.cc.orig 2017-01-26 00:49:07 UTC ++++ base/process/launch_posix.cc +@@ -64,6 +64,7 @@ + #include "base/feature_list.h" #else extern char** environ; +#pragma weak environ diff --git a/www/chromium/files/patch-base_process_memory.h b/www/chromium/files/patch-base_process_memory.h index 681a61d35dc3..952ad87d43d4 100644 --- a/www/chromium/files/patch-base_process_memory.h +++ b/www/chromium/files/patch-base_process_memory.h @@ -1,6 +1,6 @@ ---- base/process/memory.h.orig 2016-08-03 22:02:10.000000000 +0300 -+++ base/process/memory.h 2016-09-11 01:10:36.394804000 +0300 -@@ -32,7 +32,7 @@ +--- base/process/memory.h.orig 2017-01-26 00:49:07 UTC ++++ base/process/memory.h +@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutO // Crash reporting classifies such crashes as OOM. BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size); diff --git a/www/chromium/files/patch-base_process_memory__stubs.cc b/www/chromium/files/patch-base_process_memory__stubs.cc index 7cc065ce5e23..4cddbcf83c91 100644 --- a/www/chromium/files/patch-base_process_memory__stubs.cc +++ b/www/chromium/files/patch-base_process_memory__stubs.cc @@ -1,6 +1,6 @@ ---- base/process/memory_stubs.cc.orig 2016-03-25 13:04:44 UTC +--- base/process/memory_stubs.cc.orig 2017-01-26 00:49:07 UTC +++ base/process/memory_stubs.cc -@@ -27,6 +27,8 @@ bool AdjustOOMScore(ProcessId process, i +@@ -31,6 +31,8 @@ void TerminateBecauseOutOfMemory(size_t // their respective stdlib function since those functions will return null on a // failure to allocate. @@ -9,7 +9,7 @@ bool UncheckedMalloc(size_t size, void** result) { *result = malloc(size); return *result != nullptr; -@@ -36,5 +38,6 @@ bool UncheckedCalloc(size_t num_items, s +@@ -40,5 +42,6 @@ bool UncheckedCalloc(size_t num_items, s *result = calloc(num_items, size); return *result != nullptr; } diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index 77df7a8722ac..3e0539fd9975 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/memory_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/process/memory_unittest.cc 2016-10-13 04:32:50.457987000 +0300 -@@ -82,10 +82,10 @@ +--- base/process/memory_unittest.cc.orig 2017-01-26 00:49:07 UTC ++++ base/process/memory_unittest.cc +@@ -82,10 +82,10 @@ TEST(MemoryTest, AllocatorShimWorking) { ASSERT_TRUE(base::allocator::IsAllocatorInitialized()); } @@ -13,7 +13,7 @@ BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) -@@ -439,5 +439,5 @@ +@@ -439,5 +439,5 @@ TEST_F(OutOfMemoryHandledTest, Unchecked EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); EXPECT_TRUE(value_ == NULL); } diff --git a/www/chromium/files/patch-base_process_process__handle__freebsd.cc b/www/chromium/files/patch-base_process_process__handle__freebsd.cc index d52190819e9b..67ffd9e4a576 100644 --- a/www/chromium/files/patch-base_process_process__handle__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__handle__freebsd.cc @@ -1,6 +1,6 @@ ---- base/process/process_handle_freebsd.cc.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/process/process_handle_freebsd.cc 2016-10-26 19:55:22.341492000 +0300 -@@ -16,7 +16,7 @@ +--- base/process/process_handle_freebsd.cc.orig 2017-01-26 00:49:07 UTC ++++ base/process/process_handle_freebsd.cc +@@ -16,7 +16,7 @@ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { struct kinfo_proc info; diff --git a/www/chromium/files/patch-base_process_process__info__linux.cc b/www/chromium/files/patch-base_process_process__info__linux.cc index 308a4dbd108c..2ce0f8e39d0e 100644 --- a/www/chromium/files/patch-base_process_process__info__linux.cc +++ b/www/chromium/files/patch-base_process_process__info__linux.cc @@ -1,4 +1,4 @@ ---- base/process/process_info_linux.cc.orig 2016-03-25 13:04:44 UTC +--- base/process/process_info_linux.cc.orig 2017-01-26 00:49:07 UTC +++ base/process/process_info_linux.cc @@ -11,10 +11,28 @@ #include "base/process/process_handle.h" diff --git a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc index 59e1406d88e9..9062d3cb2d03 100644 --- a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_iterator_freebsd.cc.orig 2016-03-25 13:04:44 UTC +--- base/process/process_iterator_freebsd.cc.orig 2017-01-26 00:49:07 UTC +++ base/process/process_iterator_freebsd.cc @@ -10,6 +10,10 @@ #include <sys/sysctl.h> diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 7abeb06e2a1c..ca8414ecf548 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,5 +1,5 @@ ---- base/process/process_metrics.h.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/process/process_metrics.h 2016-10-13 12:58:13.818273000 +0300 +--- base/process/process_metrics.h.orig 2017-01-26 00:49:07 UTC ++++ base/process/process_metrics.h @@ -22,6 +22,12 @@ #include "base/values.h" #include "build/build_config.h" @@ -13,7 +13,7 @@ #if defined(OS_MACOSX) #include <mach/mach.h> #include "base/process/port_provider_mac.h" -@@ -326,13 +332,17 @@ +@@ -326,13 +332,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. BASE_EXPORT int ParseProcStatCPU(const std::string& input); diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc index 7a188d5f7eeb..d18ef69e5adb 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,7 +1,7 @@ ---- base/process/process_metrics_freebsd.cc.orig 2016-03-25 13:04:44 UTC +--- base/process/process_metrics_freebsd.cc.orig 2017-01-26 00:49:07 UTC +++ base/process/process_metrics_freebsd.cc -@@ -12,6 +12,9 @@ - #include "base/macros.h" +@@ -13,6 +13,9 @@ + #include "base/memory/ptr_util.h" #include "base/sys_info.h" +#include <unistd.h> /* getpagesize() */ @@ -10,7 +10,7 @@ namespace base { ProcessMetrics::ProcessMetrics(ProcessHandle process) -@@ -121,4 +124,23 @@ size_t GetSystemCommitCharge() { +@@ -122,4 +125,23 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } diff --git a/www/chromium/files/patch-base_process_process__posix.cc b/www/chromium/files/patch-base_process_process__posix.cc index 46938b5283e2..a67e3bf1b551 100644 --- a/www/chromium/files/patch-base_process_process__posix.cc +++ b/www/chromium/files/patch-base_process_process__posix.cc @@ -1,6 +1,6 @@ ---- base/process/process_posix.cc.orig 2016-08-03 22:02:10.000000000 +0300 -+++ base/process/process_posix.cc 2016-09-11 02:18:36.481940000 +0300 -@@ -20,8 +20,18 @@ +--- base/process/process_posix.cc.orig 2017-01-26 00:49:07 UTC ++++ base/process/process_posix.cc +@@ -21,8 +21,18 @@ #include <sys/event.h> #endif @@ -19,7 +19,7 @@ #if !defined(OS_NACL_NONSFI) bool WaitpidWithTimeout(base::ProcessHandle handle, -@@ -183,13 +193,13 @@ +@@ -184,13 +194,13 @@ bool WaitForExitWithTimeoutImpl(base::Pr base::ProcessHandle parent_pid = base::GetParentProcessId(handle); base::ProcessHandle our_pid = base::GetCurrentProcessHandle(); if (parent_pid != our_pid) { @@ -36,26 +36,26 @@ } int status; -@@ -256,12 +266,16 @@ +@@ -257,12 +267,16 @@ Process Process::DeprecatedGetProcessFro return Process(handle); } --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_FREEBSD) +-#if !defined(OS_LINUX) && !defined(OS_MACOSX) ++#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) // static bool Process::CanBackgroundProcesses() { return false; } --#endif // !defined(OS_LINUX) +-#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) +#elif defined(OS_FREEBSD) +bool Process::CanBackgroundProcesses() { + return true; +} -+#endif // !defined(OS_LINUX) && !defined(OS_FREEBSD) ++#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) bool Process::IsValid() const { return process_ != kNullProcessHandle; -@@ -361,15 +375,32 @@ +@@ -365,15 +379,32 @@ bool Process::WaitForExitWithTimeout(Tim bool Process::IsProcessBackgrounded() const { // See SetProcessBackgrounded(). DCHECK(IsValid()); @@ -68,9 +68,9 @@ bool Process::SetProcessBackgrounded(bool value) { +#if !defined(OS_FREEBSD) - // Not implemented for POSIX systems other than Linux. With POSIX, if we were - // to lower the process priority we wouldn't be able to raise it back to its - // initial priority. + // Not implemented for POSIX systems other than Linux and Mac. With POSIX, if + // we were to lower the process priority we wouldn't be able to raise it back + // to its initial priority. NOTIMPLEMENTED(); return false; +#else @@ -86,5 +86,5 @@ + return result == 0; +#endif // !defined(OS_FREEBSD) } - #endif // !defined(OS_LINUX) + #endif // !defined(OS_LINUX) && !defined(OS_MACOSX) diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index ef8e0deda89d..9e4f597cadd6 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/profiler/stack_sampling_profiler_unittest.cc 2016-10-25 21:31:13.576230000 +0300 -@@ -30,7 +30,7 @@ +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2017-01-26 00:49:07 UTC ++++ base/profiler/stack_sampling_profiler_unittest.cc +@@ -31,7 +31,7 @@ #include <intrin.h> #include <malloc.h> #include <windows.h> diff --git a/www/chromium/files/patch-base_security__unittest.cc b/www/chromium/files/patch-base_security__unittest.cc index 35a3259c8149..df3c3970861d 100644 --- a/www/chromium/files/patch-base_security__unittest.cc +++ b/www/chromium/files/patch-base_security__unittest.cc @@ -1,6 +1,6 @@ ---- base/security_unittest.cc.orig 2016-05-11 19:02:11 UTC +--- base/security_unittest.cc.orig 2017-01-26 00:49:07 UTC +++ base/security_unittest.cc -@@ -73,7 +73,7 @@ bool IsTcMallocBypassed() { +@@ -74,7 +74,7 @@ bool IsTcMallocBypassed() { // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { if (!overflow_detected) { diff --git a/www/chromium/files/patch-base_sys__info__freebsd.cc b/www/chromium/files/patch-base_sys__info__freebsd.cc index 19fbf5cc2892..f65a76813ba7 100644 --- a/www/chromium/files/patch-base_sys__info__freebsd.cc +++ b/www/chromium/files/patch-base_sys__info__freebsd.cc @@ -1,5 +1,5 @@ ---- base/sys_info_freebsd.cc.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/sys_info_freebsd.cc 2016-10-13 10:20:37.344204000 +0300 +--- base/sys_info_freebsd.cc.orig 2017-01-26 00:49:07 UTC ++++ base/sys_info_freebsd.cc @@ -12,12 +12,34 @@ namespace base { @@ -39,7 +39,7 @@ NOTREACHED(); return 0; } -@@ -25,14 +47,24 @@ +@@ -25,14 +47,24 @@ int64_t SysInfo::AmountOfPhysicalMemory( } // static diff --git a/www/chromium/files/patch-base_sys__info__posix.cc b/www/chromium/files/patch-base_sys__info__posix.cc index a746e82a0496..2d278c0f2988 100644 --- a/www/chromium/files/patch-base_sys__info__posix.cc +++ b/www/chromium/files/patch-base_sys__info__posix.cc @@ -1,6 +1,6 @@ ---- base/sys_info_posix.cc.orig 2016-08-03 22:02:10.000000000 +0300 -+++ base/sys_info_posix.cc 2016-09-24 01:27:31.548122000 +0300 -@@ -30,7 +30,7 @@ +--- base/sys_info_posix.cc.orig 2017-01-26 00:49:07 UTC ++++ base/sys_info_posix.cc +@@ -35,7 +35,7 @@ namespace { @@ -9,7 +9,7 @@ int NumberOfProcessors() { // sysconf returns the number of "logical" (not "physical") processors on both // Mac and Linux. So we get the number of max available "logical" processors. -@@ -77,7 +77,7 @@ +@@ -128,7 +128,7 @@ bool GetDiskSpaceInfo(const base::FilePa namespace base { diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn index 336fb2c063cb..3404b541653a 100644 --- a/www/chromium/files/patch-base_test_BUILD.gn +++ b/www/chromium/files/patch-base_test_BUILD.gn @@ -1,6 +1,6 @@ ---- base/test/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 -+++ base/test/BUILD.gn 2016-09-02 23:56:39.647089000 +0300 -@@ -249,7 +249,7 @@ +--- base/test/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ base/test/BUILD.gn +@@ -303,7 +303,7 @@ static_library("run_all_base_unittests") ] } diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc index 360864ca880f..f06b4b301550 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2016-05-11 19:02:11 UTC +--- base/test/launcher/test_launcher.cc.orig 2017-01-26 00:49:07 UTC +++ base/test/launcher/test_launcher.cc -@@ -52,6 +52,10 @@ +@@ -59,6 +59,10 @@ #include "base/win/windows_version.h" #endif diff --git a/www/chromium/files/patch-base_test_test__file__util__posix.cc b/www/chromium/files/patch-base_test_test__file__util__posix.cc index 7ce14dbdedea..8e5366ee7598 100644 --- a/www/chromium/files/patch-base_test_test__file__util__posix.cc +++ b/www/chromium/files/patch-base_test_test__file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/test/test_file_util_posix.cc.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/test/test_file_util_posix.cc 2016-10-25 21:44:27.287523000 +0300 -@@ -79,7 +79,7 @@ +--- base/test/test_file_util_posix.cc.orig 2017-01-26 00:49:07 UTC ++++ base/test/test_file_util_posix.cc +@@ -79,7 +79,7 @@ bool DieFileDie(const FilePath& file, bo return DeleteFile(file, recurse); } diff --git a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn index e7f4ac008894..7654c0f9374c 100644 --- a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn +++ b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn @@ -1,6 +1,6 @@ ---- base/third_party/libevent/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 -+++ base/third_party/libevent/BUILD.gn 2016-10-12 18:30:43.933710000 +0300 -@@ -29,6 +29,9 @@ +--- base/third_party/libevent/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ base/third_party/libevent/BUILD.gn +@@ -29,6 +29,9 @@ static_library("libevent") { } else if (is_linux) { sources += [ "epoll.c" ] include_dirs = [ "linux" ] diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h new file mode 100644 index 000000000000..df2bdfc03169 --- /dev/null +++ b/www/chromium/files/patch-base_threading_platform__thread.h @@ -0,0 +1,11 @@ +--- base/threading/platform_thread.h.orig 2017-01-26 00:49:07 UTC ++++ base/threading/platform_thread.h +@@ -205,7 +205,7 @@ class BASE_EXPORT PlatformThread { + + static ThreadPriority GetCurrentThreadPriority(); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Toggles a specific thread's priority at runtime. This can be used to + // change the priority of a thread in a different process and will fail + // if the calling process does not have proper permissions. The diff --git a/www/chromium/files/patch-base_threading_platform__thread__linux.cc b/www/chromium/files/patch-base_threading_platform__thread__linux.cc new file mode 100644 index 000000000000..43c7bb9d0a08 --- /dev/null +++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc @@ -0,0 +1,30 @@ +--- base/threading/platform_thread_linux.cc.orig 2017-01-26 00:49:07 UTC ++++ base/threading/platform_thread_linux.cc +@@ -19,7 +19,9 @@ + + #if !defined(OS_NACL) + #include <pthread.h> ++#if !defined(OS_BSD) + #include <sys/prctl.h> ++#endif + #include <sys/resource.h> + #include <sys/time.h> + #include <sys/types.h> +@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std:: + ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); + tracked_objects::ThreadData::InitializeThreadContext(name); + +-#if !defined(OS_NACL) ++#if !defined(OS_NACL) && !defined(OS_BSD) + // On linux we can get the thread names to show up in the debugger by setting + // the process name for the LWP. We don't want to do this for the main + // thread because that would rename the process, causing tools like killall +@@ -150,7 +152,7 @@ void PlatformThread::SetName(const std:: + #endif // !defined(OS_NACL) + } + +-#if !defined(OS_NACL) ++#if !defined(OS_NACL) && !defined(OS_BSD) + // static + void PlatformThread::SetThreadPriority(PlatformThreadId thread_id, + ThreadPriority priority) { diff --git a/www/chromium/files/patch-base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__posix.cc index 99d01c1e1cc8..579b89440581 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_posix.cc.orig 2016-05-11 19:02:11 UTC +--- base/threading/platform_thread_posix.cc.orig 2017-01-26 00:49:07 UTC +++ base/threading/platform_thread_posix.cc -@@ -53,7 +53,7 @@ void* ThreadFunc(void* params) { +@@ -56,7 +56,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::ThreadRestrictions::SetSingletonAllowed(false); diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc index b673826edea7..144f57c0db4e 100644 --- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,11 +1,11 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2016-07-20 22:03:18.000000000 +0300 -+++ base/trace_event/malloc_dump_provider.cc 2016-08-14 13:06:10.819247000 +0300 -@@ -20,7 +20,7 @@ +--- base/trace_event/malloc_dump_provider.cc.orig 2017-01-26 00:49:07 UTC ++++ base/trace_event/malloc_dump_provider.cc +@@ -21,7 +21,7 @@ #if defined(OS_MACOSX) #include <malloc/malloc.h> #else -#include <malloc.h> +#include <stdlib.h> #endif - - namespace base { + #if defined(OS_WIN) + #include <windows.h> diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc index 1df8b2c829fb..b1bff142a0a8 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.cc.orig 2016-05-27 10:29:07.111255000 -0400 -+++ base/trace_event/process_memory_dump.cc 2016-05-27 10:29:28.215964000 -0400 -@@ -83,7 +83,7 @@ +--- base/trace_event/process_memory_dump.cc.orig 2017-01-26 00:49:07 UTC ++++ base/trace_event/process_memory_dump.cc +@@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentB const size_t kMaxChunkSize = 8 * 1024 * 1024; size_t max_vec_size = GetSystemPageCount(std::min(mapped_size, kMaxChunkSize), page_size); diff --git a/www/chromium/files/patch-breakpad_BUILD.gn b/www/chromium/files/patch-breakpad_BUILD.gn index 7de6b4d12b18..3b41b9afd7a8 100644 --- a/www/chromium/files/patch-breakpad_BUILD.gn +++ b/www/chromium/files/patch-breakpad_BUILD.gn @@ -1,6 +1,6 @@ ---- breakpad/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 -+++ breakpad/BUILD.gn 2016-09-03 00:07:22.742094000 +0300 -@@ -420,7 +420,7 @@ +--- breakpad/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ breakpad/BUILD.gn +@@ -468,7 +468,7 @@ if (is_mac) { } } diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index c0c10b68a6aa..3eb8fe325882 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300 -+++ build/config/BUILD.gn 2016-10-13 04:42:48.294016000 +0300 -@@ -297,7 +297,7 @@ +--- build/config/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ build/config/BUILD.gn +@@ -224,7 +224,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } @@ -9,7 +9,7 @@ # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -411,7 +411,7 @@ +@@ -338,7 +338,7 @@ config("executable_config") { ] } else if (is_ios) { configs += [ "//build/config/ios:ios_dynamic_flags" ] diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn index be45e8000366..2f6a4380eebf 100644 --- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,6 +1,6 @@ ---- build/config/BUILDCONFIG.gn.orig 2016-10-06 04:02:08.000000000 +0300 -+++ build/config/BUILDCONFIG.gn 2016-10-13 04:48:31.029743000 +0300 -@@ -134,12 +134,13 @@ +--- build/config/BUILDCONFIG.gn.orig 2017-01-26 00:49:07 UTC ++++ build/config/BUILDCONFIG.gn +@@ -134,12 +134,13 @@ declare_args() { is_debug = !is_official_build # Whether we're a traditional desktop unix. @@ -16,7 +16,7 @@ # Allows the path to a custom target toolchain to be injected as a single # argument, and set as the default toolchain. -@@ -183,8 +184,8 @@ +@@ -183,8 +184,8 @@ if (host_toolchain == "") { # TODO(dpranke): Add some sort of assert here that verifies that # no toolchain omitted host_toolchain from its toolchain_args(). @@ -27,16 +27,16 @@ # TODO(dpranke) - is_clang normally applies only to the target # build, and there is no way to indicate that you want to override # it for both the target build *and* the host build. Do we need to -@@ -220,7 +221,7 @@ +@@ -220,7 +221,7 @@ if (target_os == "android") { } else { - _default_toolchain = "//build/toolchain/android:$target_cpu" + _default_toolchain = "//build/toolchain/android:android_$target_cpu" } -} else if (target_os == "chromeos" || target_os == "linux") { +} else if (target_os == "chromeos" || target_os == "linux" || target_os == "bsd") { # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -340,8 +341,17 @@ +@@ -340,8 +341,17 @@ if (current_os == "win" || current_os == is_nacl = false is_posix = true is_win = false @@ -55,7 +55,7 @@ # ============================================================================= # SOURCES FILTERS # ============================================================================= -@@ -410,7 +420,7 @@ +@@ -410,7 +420,7 @@ if (!is_ios) { if (!is_mac && !is_ios) { sources_assignment_filter += [ "*.mm" ] } diff --git a/www/chromium/files/patch-build_config_allocator.gni b/www/chromium/files/patch-build_config_allocator.gni index 65f52aa7c4fb..519f651fce12 100644 --- a/www/chromium/files/patch-build_config_allocator.gni +++ b/www/chromium/files/patch-build_config_allocator.gni @@ -1,6 +1,6 @@ ---- build/config/allocator.gni.orig 2016-10-06 04:02:08.000000000 +0300 -+++ build/config/allocator.gni 2016-10-13 10:29:19.634367000 +0300 -@@ -44,7 +44,7 @@ +--- build/config/allocator.gni.orig 2017-01-26 00:49:07 UTC ++++ build/config/allocator.gni +@@ -44,7 +44,7 @@ assert(use_allocator == "none" || use_al assert(!is_win || use_allocator == "none", "Tcmalloc doesn't work on Windows.") assert( diff --git a/www/chromium/files/patch-build_config_clang_BUILD.gn b/www/chromium/files/patch-build_config_clang_BUILD.gn index b84af78e2743..4d41b6cba26c 100644 --- a/www/chromium/files/patch-build_config_clang_BUILD.gn +++ b/www/chromium/files/patch-build_config_clang_BUILD.gn @@ -1,16 +1,16 @@ ---- build/config/clang/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 -+++ build/config/clang/BUILD.gn 2016-09-03 01:38:15.236274000 +0300 -@@ -21,7 +21,7 @@ - "//third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib", - root_build_dir), +--- build/config/clang/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ build/config/clang/BUILD.gn +@@ -20,7 +20,7 @@ config("find_bad_constructs") { + rebase_path("${clang_base_path}/lib/libFindBadConstructs.dylib", + root_build_dir), ] - } else if (is_linux || is_android) { + } else if (is_linux || is_bsd || is_android) { cflags += [ "-Xclang", "-load", -@@ -51,7 +51,7 @@ - "check-implicit-copy-ctors", +@@ -37,7 +37,7 @@ config("find_bad_constructs") { + "find-bad-constructs", ] - if ((is_linux || is_android) && !is_chromecast) { diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 0a01f11d7b11..49daa294ccb4 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2016-12-01 23:02:05 UTC +--- build/config/compiler/BUILD.gn.orig 2017-01-26 00:49:07 UTC +++ build/config/compiler/BUILD.gn -@@ -153,7 +153,7 @@ config("compiler") { +@@ -150,7 +150,7 @@ config("compiler") { configs += [ "//build/config/win:compiler" ] } else if (is_android) { configs += [ "//build/config/android:compiler" ] @@ -9,7 +9,7 @@ configs += [ "//build/config/linux:compiler" ] } else if (is_nacl) { configs += [ "//build/config/nacl:compiler" ] -@@ -280,7 +280,7 @@ config("compiler") { +@@ -277,7 +277,7 @@ config("compiler") { # Linux/Android common flags setup. # --------------------------------- @@ -18,7 +18,7 @@ cflags += [ "-fPIC", "-pipe", # Use pipes for communicating between sub-processes. Faster. -@@ -407,14 +407,14 @@ config("compiler") { +@@ -401,14 +401,14 @@ config("compiler") { # clang-cl (used if is_win) doesn't expose this flag. # Currently disabled for nacl since its toolchain lacks this flag (too old). # TODO(zforman): Once nacl's toolchain is updated, remove check. @@ -35,7 +35,7 @@ # gnu++11 instead of c++11 is needed because some code uses typeof() (a # GNU extension). # TODO(thakis): Eventually switch this to c++11 instead, -@@ -464,7 +464,7 @@ config("compiler") { +@@ -458,7 +458,7 @@ config("compiler") { ] # Apply a lower LTO optimization level as the default is too slow. @@ -44,7 +44,7 @@ if (use_lld) { ldflags += [ "-Wl,--lto-O1" ] } else { -@@ -484,7 +484,7 @@ config("compiler") { +@@ -478,7 +478,7 @@ config("compiler") { # targeting ARM, without this flag, LTO produces a .text section that is # larger than the maximum call displacement, preventing the linker from # relocating calls (http://llvm.org/PR22999). @@ -53,7 +53,7 @@ ldflags += [ "-Wl,-plugin-opt,-function-sections" ] } } -@@ -755,7 +755,7 @@ config("compiler_codegen") { +@@ -742,7 +742,7 @@ config("compiler_codegen") { # configs -= [ "//build/config/compiler:clang_stackrealign" ] # See https://crbug.com/556393 for details of where it must be avoided. config("clang_stackrealign") { @@ -62,7 +62,7 @@ cflags = [ # Align the stack on 16-byte boundaries, http://crbug.com/418554. "-mstack-alignment=16", -@@ -790,7 +790,7 @@ config("runtime_library") { +@@ -788,7 +788,7 @@ config("runtime_library") { # smaller. if (is_win) { configs += [ "//build/config/win:runtime_library" ] @@ -71,7 +71,7 @@ configs += [ "//build/config/linux:runtime_library" ] } else if (is_ios) { configs += [ "//build/config/ios:runtime_library" ] -@@ -1050,7 +1050,7 @@ config("default_warnings") { +@@ -1038,7 +1038,7 @@ config("default_warnings") { "-Wno-nonportable-include-path", # TODO(hans): https://crbug.com/637306 @@ -80,7 +80,7 @@ ] } } -@@ -1082,7 +1082,7 @@ config("chromium_code") { +@@ -1070,7 +1070,7 @@ config("chromium_code") { ] if (!is_debug && !using_sanitizer && @@ -89,7 +89,7 @@ # _FORTIFY_SOURCE isn't really supported by Clang now, see # http://llvm.org/bugs/show_bug.cgi?id=16821. # It seems to work fine with Ubuntu 12 headers though, so use it in -@@ -1140,7 +1140,7 @@ config("no_chromium_code") { +@@ -1128,7 +1128,7 @@ config("no_chromium_code") { ] } diff --git a/www/chromium/files/patch-build_config_crypto.gni b/www/chromium/files/patch-build_config_crypto.gni index be98f4b52c03..65d4f305d133 100644 --- a/www/chromium/files/patch-build_config_crypto.gni +++ b/www/chromium/files/patch-build_config_crypto.gni @@ -1,6 +1,6 @@ ---- build/config/crypto.gni.orig 2016-08-03 22:02:10.000000000 +0300 -+++ build/config/crypto.gni 2016-09-03 01:37:11.785915000 +0300 -@@ -20,4 +20,4 @@ +--- build/config/crypto.gni.orig 2017-01-26 00:49:07 UTC ++++ build/config/crypto.gni +@@ -20,4 +20,4 @@ use_openssl_certs = is_android || is_nac # True if NSS is used for certificate handling. It is possible to use OpenSSL # for the crypto library, but NSS for the platform certificate library. diff --git a/www/chromium/files/patch-build_config_features.gni b/www/chromium/files/patch-build_config_features.gni index c30729e8f39b..6d3eaf6a0557 100644 --- a/www/chromium/files/patch-build_config_features.gni +++ b/www/chromium/files/patch-build_config_features.gni @@ -1,15 +1,6 @@ ---- build/config/features.gni.orig 2016-08-03 22:02:10.000000000 +0300 -+++ build/config/features.gni 2016-09-01 02:42:02.955488000 +0300 -@@ -22,7 +22,7 @@ - - declare_args() { - # Multicast DNS. -- enable_mdns = is_win || is_linux -+ enable_mdns = is_win || is_linux || is_bsd - - enable_extensions = !is_android && !is_ios - enable_plugins = (!is_android && !is_ios) || is_chromecast -@@ -100,13 +100,13 @@ +--- build/config/features.gni.orig 2017-01-26 00:49:07 UTC ++++ build/config/features.gni +@@ -67,13 +67,13 @@ declare_args() { # libudev usage. This currently only affects the content layer. use_udev = is_linux && !is_chromecast @@ -24,14 +15,5 @@ - use_gio = is_linux && !is_chromeos && !is_chromecast + use_gio = (is_linux || is_bsd) && !is_chromeos && !is_chromecast - # Enable basic printing support and UI. - enable_basic_printing = !is_chromeos && !is_chromecast && !is_ios -@@ -126,7 +126,7 @@ - - # Enables the use of CDMs in pepper plugins. - enable_pepper_cdms = -- enable_plugins && (is_linux || is_mac || is_win) && !is_chromecast -+ enable_plugins && (is_linux || is_bsd || is_mac || is_win) && !is_chromecast - - # The seccomp-bpf sandbox is only supported on five architectures - # currently. + # Whether or not to use external popup menu. + use_external_popup_menu = is_android || is_mac diff --git a/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn b/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn index 3c4a72ae71c6..b1f7693a964e 100644 --- a/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn +++ b/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn @@ -1,5 +1,5 @@ ---- build/config/linux/gtk2/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 -+++ build/config/linux/gtk2/BUILD.gn 2016-09-02 22:54:36.628597000 +0300 +--- build/config/linux/gtk2/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ build/config/linux/gtk2/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/linux/pkg_config.gni") diff --git a/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn b/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn index 470385175afc..b7f133279f24 100644 --- a/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn +++ b/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn @@ -1,5 +1,5 @@ ---- build/config/linux/gtk3/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 -+++ build/config/linux/gtk3/BUILD.gn 2016-09-03 01:35:58.974361000 +0300 +--- build/config/linux/gtk3/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ build/config/linux/gtk3/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/linux/pkg_config.gni") diff --git a/www/chromium/files/patch-build_config_linux_pkg-config.py b/www/chromium/files/patch-build_config_linux_pkg-config.py index ea92a757a114..7441f2c74684 100644 --- a/www/chromium/files/patch-build_config_linux_pkg-config.py +++ b/www/chromium/files/patch-build_config_linux_pkg-config.py @@ -1,6 +1,6 @@ ---- build/config/linux/pkg-config.py.orig 2016-08-03 22:02:10.000000000 +0300 -+++ build/config/linux/pkg-config.py 2016-09-04 01:43:37.226981000 +0300 -@@ -57,8 +57,12 @@ +--- build/config/linux/pkg-config.py.orig 2017-01-26 00:49:07 UTC ++++ build/config/linux/pkg-config.py +@@ -57,8 +57,12 @@ def SetConfigPath(options): print "You must specify an architecture via -a if using a sysroot." sys.exit(1) @@ -15,7 +15,7 @@ os.environ['PKG_CONFIG_LIBDIR'] = libdir return libdir -@@ -107,7 +111,7 @@ +@@ -107,7 +111,7 @@ def main(): # If this is run on non-Linux platforms, just return nothing and indicate # success. This allows us to "kind of emulate" a Linux build from other # platforms. diff --git a/www/chromium/files/patch-build_config_sanitizers_BUILD.gn b/www/chromium/files/patch-build_config_sanitizers_BUILD.gn index 8982eef7d5c1..d67a5f3089aa 100644 --- a/www/chromium/files/patch-build_config_sanitizers_BUILD.gn +++ b/www/chromium/files/patch-build_config_sanitizers_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/sanitizers/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 -+++ build/config/sanitizers/BUILD.gn 2016-09-03 00:19:39.656881000 +0300 -@@ -280,7 +280,7 @@ +--- build/config/sanitizers/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ build/config/sanitizers/BUILD.gn +@@ -405,7 +405,7 @@ config("lsan_flags") { config("msan_flags") { if (is_msan) { @@ -9,7 +9,7 @@ msan_blacklist_path = rebase_path("//tools/msan/blacklist.txt", root_build_dir) cflags = [ -@@ -293,7 +293,7 @@ +@@ -418,7 +418,7 @@ config("msan_flags") { config("tsan_flags") { if (is_tsan) { diff --git a/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni b/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni index d304c8a1b8ca..06d9149331ec 100644 --- a/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni +++ b/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni @@ -1,13 +1,14 @@ ---- build/config/sanitizers/sanitizers.gni.orig 2016-10-06 04:02:08.000000000 +0300 -+++ build/config/sanitizers/sanitizers.gni 2016-10-24 22:57:06.565590000 +0300 -@@ -53,8 +53,8 @@ +--- build/config/sanitizers/sanitizers.gni.orig 2017-01-26 00:49:07 UTC ++++ build/config/sanitizers/sanitizers.gni +@@ -54,8 +54,9 @@ declare_args() { # See http://clang.llvm.org/docs/ControlFlowIntegrity.html # # TODO(pcc): Remove this flag if/when CFI is enabled in all official builds. - is_cfi = target_os == "linux" && !is_chromeos && target_cpu == "x64" && -- is_chrome_branded && is_official_build +- is_chrome_branded && is_official_build && allow_posix_link_time_opt + is_cfi = (target_os == "linux" || target_os == "bsd") && !is_chromeos && -+ target_cpu == "x64" && is_chrome_branded && is_official_build ++ target_cpu == "x64" && is_chrome_branded && is_official_build && ++ allow_posix_link_time_opt # Enable checks for bad casts: derived cast and unrelated cast. # TODO(krasin): remove this, when we're ready to add these checks by default. diff --git a/www/chromium/files/patch-build_config_ui.gni b/www/chromium/files/patch-build_config_ui.gni index 172f267e37ab..a7e3bf4f379a 100644 --- a/www/chromium/files/patch-build_config_ui.gni +++ b/www/chromium/files/patch-build_config_ui.gni @@ -1,6 +1,6 @@ ---- build/config/ui.gni.orig 2016-10-06 04:02:08.000000000 +0300 -+++ build/config/ui.gni 2016-10-13 05:04:25.545377000 +0300 -@@ -31,7 +31,7 @@ +--- build/config/ui.gni.orig 2017-01-26 00:49:07 UTC ++++ build/config/ui.gni +@@ -31,7 +31,7 @@ declare_args() { # Indicates if Aura is enabled. Aura is a low-level windowing library, sort # of a replacement for GDI or GTK. @@ -9,7 +9,7 @@ # True means the UI is built using the "views" framework. toolkit_views = -@@ -47,7 +47,7 @@ +@@ -47,7 +47,7 @@ declare_args() { use_xkbcommon = false # Whether we should use glib, a low level C utility library. @@ -18,15 +18,13 @@ # Indicates if Wayland display server support is enabled. enable_wayland_server = is_chromeos -@@ -65,19 +65,19 @@ +@@ -62,17 +62,17 @@ declare_args() { # Use GPU accelerated cross process image transport by default on linux builds # with the Aura window manager. -ui_compositor_image_transport = use_aura && is_linux +ui_compositor_image_transport = use_aura && (is_linux || is_bsd) - use_default_render_theme = use_aura && !is_android - # Indicates if the UI toolkit depends on X11. -use_x11 = is_linux && !use_ozone +use_x11 = (is_linux || is_bsd) && !use_ozone diff --git a/www/chromium/files/patch-build_linux_libpci_BUILD.gn b/www/chromium/files/patch-build_linux_libpci_BUILD.gn index 9fc164da0d04..04196ef89bc7 100644 --- a/www/chromium/files/patch-build_linux_libpci_BUILD.gn +++ b/www/chromium/files/patch-build_linux_libpci_BUILD.gn @@ -1,5 +1,5 @@ ---- build/linux/libpci/BUILD.gn.orig 2016-10-06 04:02:08.000000000 +0300 -+++ build/linux/libpci/BUILD.gn 2016-10-29 18:17:51.990988000 +0300 +--- build/linux/libpci/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ build/linux/libpci/BUILD.gn @@ -3,20 +3,36 @@ # found in the LICENSE file. @@ -12,7 +12,10 @@ - output_h = "libpci.h" - output_cc = "libpci_loader.cc" - header = "<pci/pci.h>" -- ++declare_args() { ++ use_system_libpci = is_bsd ++} + - functions = [ - "pci_alloc", - "pci_init", @@ -21,10 +24,6 @@ - "pci_fill_info", - "pci_lookup_name", - ] -+declare_args() { -+ use_system_libpci = is_bsd -+} -+ +if (use_system_libpci) { + pkg_config("system_libpci") { + packages = [ "libpci" ] diff --git a/www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn b/www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn index 9cdbc07da1f2..1bba77868aee 100644 --- a/www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn +++ b/www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn @@ -1,5 +1,5 @@ ---- build/secondary/third_party/nss/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 -+++ build/secondary/third_party/nss/BUILD.gn 2016-09-03 00:19:12.999091000 +0300 +--- build/secondary/third_party/nss/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ build/secondary/third_party/nss/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/linux/pkg_config.gni") diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index ffe466005543..827ceba3cfa1 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,6 +1,6 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2016-12-09 05:04:14.000000000 +0000 -+++ build/toolchain/gcc_toolchain.gni 2016-12-21 23:03:46.063519000 +0000 -@@ -11,6 +11,11 @@ +--- build/toolchain/gcc_toolchain.gni.orig 2017-01-26 00:49:07 UTC ++++ build/toolchain/gcc_toolchain.gni +@@ -11,6 +11,11 @@ import("//build/toolchain/cc_wrapper.gni import("//build/toolchain/goma.gni") import("//build/toolchain/toolchain.gni") @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -482,14 +487,23 @@ +@@ -482,14 +487,23 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { @@ -20,10 +20,6 @@ - cc = "$prefix/clang" - cxx = "$prefix/clang++" - ld = cxx -- -- readelf = "${toolprefix}readelf" -- ar = "${toolprefix}ar" -- nm = "${toolprefix}nm" + if (is_bsd) { + cc = "${toolprefix}clang39" + cxx = "${toolprefix}clang++39" @@ -36,7 +32,10 @@ + cc = "$prefix/clang" + cxx = "$prefix/clang++" + ld = cxx -+ + +- readelf = "${toolprefix}readelf" +- ar = "${toolprefix}ar" +- nm = "${toolprefix}nm" + readelf = "${toolprefix}readelf" + ar = "${toolprefix}ar" + nm = "${toolprefix}nm" diff --git a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py index 9fc41eeac1b4..fe6a3c889ca1 100644 --- a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py +++ b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py @@ -1,6 +1,6 @@ ---- build/toolchain/get_concurrent_links.py.orig 2016-10-06 04:02:08.000000000 +0300 -+++ build/toolchain/get_concurrent_links.py 2016-10-13 05:28:45.448027000 +0300 -@@ -45,6 +45,14 @@ +--- build/toolchain/get_concurrent_links.py.orig 2017-01-26 00:49:07 UTC ++++ build/toolchain/get_concurrent_links.py +@@ -45,6 +45,14 @@ def _GetTotalMemoryInBytes(): return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) except Exception: return 0 diff --git a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc index 4d1d6c5b8435..62876e4a4b99 100644 --- a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc +++ b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc @@ -1,6 +1,6 @@ ---- cc/layers/scrollbar_layer_impl_base.cc.orig 2016-03-25 13:04:44 UTC +--- cc/layers/scrollbar_layer_impl_base.cc.orig 2017-01-26 00:49:07 UTC +++ cc/layers/scrollbar_layer_impl_base.cc -@@ -181,8 +181,8 @@ gfx::Rect ScrollbarLayerImplBase::Comput +@@ -174,8 +174,8 @@ gfx::Rect ScrollbarLayerImplBase::Comput int thumb_offset = TrackStart(); if (maximum > 0) { float ratio = clamped_current_pos / maximum; diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index bb65bc443f3b..77d1dbf18ace 100644 --- a/www/chromium/files/patch-cc_trees_property__tree.cc +++ b/www/chromium/files/patch-cc_trees_property__tree.cc @@ -1,6 +1,6 @@ ---- cc/trees/property_tree.cc.orig 2016-05-27 18:17:35.339678000 -0400 -+++ cc/trees/property_tree.cc 2016-05-27 18:29:09.640334000 -0400 -@@ -1488,13 +1488,13 @@ +--- cc/trees/property_tree.cc.orig 2017-01-26 00:49:07 UTC ++++ cc/trees/property_tree.cc +@@ -1113,13 +1113,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id); @@ -17,4 +17,4 @@ + return _max_offset; } - gfx::Size ScrollTree::scroll_clip_layer_bounds(int scroll_node_id) const { + void ScrollTree::OnScrollOffsetAnimated(int layer_id, diff --git a/www/chromium/files/patch-chrome_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn index 66cac7fbc3b7..34382e278d88 100644 --- a/www/chromium/files/patch-chrome_BUILD.gn +++ b/www/chromium/files/patch-chrome_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/BUILD.gn.orig 2016-08-03 22:02:10.000000000 +0300 -+++ chrome/BUILD.gn 2016-09-03 00:02:50.206193000 +0300 -@@ -86,7 +86,7 @@ +--- chrome/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ chrome/BUILD.gn +@@ -132,7 +132,7 @@ if (!is_android && !is_mac) { data = [ "$root_out_dir/resources.pak", ] @@ -9,7 +9,7 @@ data += [ "$root_out_dir/chrome_100_percent.pak", "$root_out_dir/locales/en-US.pak", -@@ -160,7 +160,7 @@ +@@ -212,7 +212,7 @@ if (!is_android && !is_mac) { sources += [ "app/chrome_exe_main_aura.cc" ] } @@ -18,7 +18,7 @@ sources += [ "app/chrome_dll_resource.h", "app/chrome_main.cc", -@@ -1461,7 +1461,7 @@ +@@ -1539,7 +1539,7 @@ if (enable_resource_whitelist_generation } } diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h index 97e4d2614dbe..8a41dfd4966f 100644 --- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,5 +1,5 @@ ---- chrome/app/chrome_command_ids.h.orig 2016-10-06 04:02:10.000000000 +0300 -+++ chrome/app/chrome_command_ids.h 2016-10-14 06:38:03.530973000 +0300 +--- chrome/app/chrome_command_ids.h.orig 2017-01-26 00:49:07 UTC ++++ chrome/app/chrome_command_ids.h @@ -75,7 +75,7 @@ #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049 #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050 diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index 3a43a67f2470..36e7245c4dc8 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,7 +1,7 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2016-05-11 19:02:13 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2017-01-26 00:49:07 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -112,7 +112,7 @@ - #include "ui/base/x/x11_util.h" +@@ -117,7 +117,7 @@ + #include "ui/base/x/x11_util.h" // nogncheck #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) @@ -9,7 +9,7 @@ #include "components/crash/content/app/breakpad_linux.h" #endif -@@ -552,7 +552,7 @@ bool ChromeMainDelegate::BasicStartupCom +@@ -560,7 +560,7 @@ bool ChromeMainDelegate::BasicStartupCom std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -18,7 +18,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -602,7 +602,7 @@ bool ChromeMainDelegate::BasicStartupCom +@@ -610,7 +610,7 @@ bool ChromeMainDelegate::BasicStartupCom std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -27,7 +27,7 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -693,7 +693,7 @@ void ChromeMainDelegate::PreSandboxStart +@@ -722,7 +722,7 @@ void ChromeMainDelegate::PreSandboxStart std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -36,7 +36,7 @@ crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); #endif -@@ -814,7 +814,7 @@ void ChromeMainDelegate::PreSandboxStart +@@ -852,7 +852,7 @@ void ChromeMainDelegate::PreSandboxStart chrome::InitializePDF(); #endif @@ -45,7 +45,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -832,7 +832,7 @@ void ChromeMainDelegate::PreSandboxStart +@@ -870,7 +870,7 @@ void ChromeMainDelegate::PreSandboxStart breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -54,7 +54,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -942,7 +942,7 @@ bool ChromeMainDelegate::DelaySandboxIni +@@ -980,7 +980,7 @@ bool ChromeMainDelegate::DelaySandboxIni #endif return process_type == switches::kRelauncherProcess; } diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.h b/www/chromium/files/patch-chrome_app_chrome__main__delegate.h index d1952c48e87c..1fd5ea7d337b 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.h +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.h @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.h.orig 2016-05-11 19:02:13 UTC +--- chrome/app/chrome_main_delegate.h.orig 2017-01-26 00:49:07 UTC +++ chrome/app/chrome_main_delegate.h -@@ -38,7 +38,7 @@ class ChromeMainDelegate : public conten +@@ -44,7 +44,7 @@ class ChromeMainDelegate : public conten const std::string& process_type) override; bool ShouldSendMachPort(const std::string& process_type) override; bool DelaySandboxInitialization(const std::string& process_type) override; diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index e18b999c2cad..5bbd201dd296 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2016-05-11 19:02:13 UTC +--- chrome/app/chromium_strings.grd.orig 2017-01-26 00:49:07 UTC +++ chrome/app/chromium_strings.grd -@@ -948,7 +948,7 @@ Signing in anyway will merge Chromium in +@@ -939,7 +939,7 @@ Signing in anyway will merge Chromium in </message> <!-- ProcessSingleton --> diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 3e0400c14f6b..13b31107923e 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,6 +1,6 @@ ---- chrome/app/generated_resources.grd.orig 2016-10-06 04:02:10.000000000 +0300 -+++ chrome/app/generated_resources.grd 2016-10-14 07:09:15.305398000 +0300 -@@ -6841,7 +6841,7 @@ +--- chrome/app/generated_resources.grd.orig 2017-01-26 00:49:07 UTC ++++ chrome/app/generated_resources.grd +@@ -6939,7 +6939,7 @@ Keep your key file in a safe place. You <message name="IDS_FLAGS_FORCE_UI_DIRECTION_RTL" desc="Name for the option to force right-to-left UI direction mode."> Right-to-left </message> @@ -9,7 +9,7 @@ <message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API."> Enable Input IME API </message> -@@ -10134,7 +10134,7 @@ +@@ -10334,7 +10334,7 @@ I don't think this site should be blocke <message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group"> Appearance </message> @@ -18,7 +18,7 @@ <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group"> Themes </message> -@@ -10142,7 +10142,7 @@ +@@ -10342,7 +10342,7 @@ I don't think this site should be blocke <message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme"> Reset to default theme </message> @@ -27,7 +27,7 @@ <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme."> Use GTK+ theme </message> -@@ -11429,7 +11429,7 @@ +@@ -11663,7 +11663,7 @@ Tell us what happened exactly before you Set as default </message> diff --git a/www/chromium/files/patch-chrome_app_resources_locale__settings.grd b/www/chromium/files/patch-chrome_app_resources_locale__settings.grd index 94b0af26831c..3cdce811008b 100644 --- a/www/chromium/files/patch-chrome_app_resources_locale__settings.grd +++ b/www/chromium/files/patch-chrome_app_resources_locale__settings.grd @@ -1,6 +1,6 @@ ---- chrome/app/resources/locale_settings.grd.orig 2016-05-11 19:02:13 UTC +--- chrome/app/resources/locale_settings.grd.orig 2017-01-26 00:49:08 UTC +++ chrome/app/resources/locale_settings.grd -@@ -156,7 +156,7 @@ +@@ -151,7 +151,7 @@ 55 </message> diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 9bb0c2d98f64..e69e780b086c 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2016-12-01 23:02:06 UTC +--- chrome/browser/BUILD.gn.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/BUILD.gn -@@ -2105,7 +2105,7 @@ split_static_library("browser") { +@@ -2142,7 +2142,7 @@ split_static_library("browser") { deps += [ "//device/udev_linux" ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/speech-dispatcher" ] } -@@ -3439,7 +3439,7 @@ split_static_library("browser") { +@@ -3507,7 +3507,7 @@ split_static_library("browser") { } } diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 56447c01a575..05f6ac5dfe80 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2016-12-01 23:02:06 UTC +--- chrome/browser/about_flags.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/about_flags.cc -@@ -766,7 +766,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -776,7 +776,7 @@ const FeatureEntry kFeatureEntries[] = { kOsLinux | kOsCrOS | kOsWin | kOsAndroid, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling, switches::kDisableSmoothScrolling)}, @@ -9,7 +9,7 @@ {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME, IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION, // Uses the system preference on Mac (a different implementation). -@@ -1771,7 +1771,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1769,7 +1769,7 @@ const FeatureEntry kFeatureEntries[] = { IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop, FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)}, #endif // ENABLE_EXTENSIONS diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc index a8387feae0c5..34970c588ab0 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,7 +1,7 @@ ---- chrome/browser/browser_process_impl.cc.orig 2016-10-06 04:02:11.000000000 +0300 -+++ chrome/browser/browser_process_impl.cc 2016-10-16 22:35:35.925144000 +0300 -@@ -161,7 +161,7 @@ - #include "chrome/browser/media/webrtc_log_uploader.h" +--- chrome/browser/browser_process_impl.cc.orig 2017-01-26 00:49:08 UTC ++++ chrome/browser/browser_process_impl.cc +@@ -165,7 +165,7 @@ + #include "chrome/browser/media/webrtc/webrtc_log_uploader.h" #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) @@ -9,7 +9,7 @@ #include "chrome/browser/memory/tab_manager.h" #endif -@@ -765,7 +765,7 @@ +@@ -771,7 +771,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_ memory::TabManager* BrowserProcessImpl::GetTabManager() { DCHECK(CalledOnValidThread()); diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h index 9c95e97cb798..2342050a2cba 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.h.orig 2016-10-06 04:02:11.000000000 +0300 -+++ chrome/browser/browser_process_impl.h 2016-10-16 22:37:41.017296000 +0300 -@@ -336,7 +336,7 @@ +--- chrome/browser/browser_process_impl.h.orig 2017-01-26 00:49:08 UTC ++++ chrome/browser/browser_process_impl.h +@@ -340,7 +340,7 @@ class BrowserProcessImpl : public Browse std::unique_ptr<ChromeDeviceClient> device_client_; 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 e19f5899e35b..f6e3225952ef 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2016-05-25 15:00:57.000000000 -0400 -+++ chrome/browser/chrome_browser_main.cc 2016-05-27 09:43:16.154885000 -0400 -@@ -173,7 +173,7 @@ +--- chrome/browser/chrome_browser_main.cc.orig 2017-01-26 00:49:08 UTC ++++ chrome/browser/chrome_browser_main.cc +@@ -181,7 +181,7 @@ #include "chrome/browser/feedback/feedback_profile_observer.h" #endif // defined(OS_ANDROID) @@ -9,7 +9,7 @@ #include "chrome/browser/first_run/upgrade_util_linux.h" #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -@@ -1109,11 +1109,11 @@ +@@ -1194,11 +1194,11 @@ int ChromeBrowserMainParts::PreCreateThr } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index 9b4a2c5f3252..887d6c5d24cb 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2016-05-21 16:00:15 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -62,12 +62,14 @@ void ChromeBrowserMainPartsLinux::PrePro +@@ -75,12 +75,14 @@ void ChromeBrowserMainPartsLinux::PrePro void ChromeBrowserMainPartsLinux::PostProfileInit() { ChromeBrowserMainPartsPosix::PostProfileInit(); @@ -16,7 +16,7 @@ bluez::DBusThreadManagerLinux::Initialize(); bluez::BluezDBusManager::Initialize( bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false); -@@ -77,7 +79,7 @@ void ChromeBrowserMainPartsLinux::PostMa +@@ -90,7 +92,7 @@ void ChromeBrowserMainPartsLinux::PostMa } void ChromeBrowserMainPartsLinux::PostDestroyThreads() { diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc index 465425556ca7..b0a50e320625 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2016-03-25 13:04:45 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -274,6 +274,11 @@ void ChromeBrowserMainPartsPosix::PostMa +@@ -275,6 +275,11 @@ void ChromeBrowserMainPartsPosix::PostMa g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_write_fd = pipefd[1]; @@ -12,7 +12,7 @@ #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS) const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; #else -@@ -282,6 +287,7 @@ void ChromeBrowserMainPartsPosix::PostMa +@@ -283,6 +288,7 @@ void ChromeBrowserMainPartsPosix::PostMa // size to avoid hitting the guard page. const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; #endif diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 617b605ad503..1e5739b93ace 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,7 +1,7 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2016-05-11 19:02:13 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -191,7 +191,7 @@ - #include "chrome/browser/chromeos/system/input_device_settings.h" +@@ -224,7 +224,7 @@ + #include "chrome/browser/ui/browser_dialogs.h" #include "chromeos/chromeos_switches.h" #include "components/user_manager/user_manager.h" -#elif defined(OS_LINUX) @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "chrome/browser/chrome_browser_main_android.h" -@@ -204,7 +204,7 @@ +@@ -236,7 +236,7 @@ #include "chrome/browser/chrome_browser_main_posix.h" #endif @@ -18,7 +18,7 @@ #include "base/debug/leak_annotations.h" #include "components/crash/content/app/breakpad_linux.h" #include "components/crash/content/browser/crash_handler_host_linux.h" -@@ -225,7 +225,7 @@ +@@ -261,7 +261,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -27,7 +27,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -502,7 +502,7 @@ bool CertMatchesFilter(const net::X509Ce +@@ -555,7 +555,7 @@ bool CertMatchesFilter(const net::X509Ce return false; } @@ -36,7 +36,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -782,7 +782,7 @@ content::BrowserMainParts* ChromeContent +@@ -883,7 +883,7 @@ content::BrowserMainParts* ChromeContent main_parts = new ChromeBrowserMainPartsMac(parameters); #elif defined(OS_CHROMEOS) main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters); @@ -45,16 +45,16 @@ main_parts = new ChromeBrowserMainPartsLinux(parameters); #elif defined(OS_ANDROID) main_parts = new ChromeBrowserMainPartsAndroid(parameters); -@@ -798,7 +798,7 @@ content::BrowserMainParts* ChromeContent +@@ -899,7 +899,7 @@ content::BrowserMainParts* ChromeContent // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1428,7 +1428,7 @@ void ChromeContentBrowserClient::AppendE +@@ -1531,7 +1531,7 @@ void ChromeContentBrowserClient::AppendE command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -62,8 +62,8 @@ +#elif defined(OS_POSIX) && !defined(OS_BSD) if (breakpad::IsCrashReporterEnabled()) { std::string switch_value; - scoped_ptr<metrics::ClientInfo> client_info = -@@ -2637,7 +2637,7 @@ void ChromeContentBrowserClient::GetAddi + std::unique_ptr<metrics::ClientInfo> client_info = +@@ -2834,7 +2834,7 @@ void ChromeContentBrowserClient::GetAddi PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path); DCHECK(!app_data_path.empty()); } diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index 56b0f44a1442..38fd5f73cbeb 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2016-05-11 19:02:13 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -272,7 +272,7 @@ class ChromeContentBrowserClient : publi +@@ -271,7 +271,7 @@ class ChromeContentBrowserClient : publi int child_process_id, content::FileDescriptorInfo* mappings, std::map<int, base::MemoryMappedFile::Region>* regions) override; diff --git a/www/chromium/files/patch-chrome_browser_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc index 5a1418d627db..b401b2683e09 100644 --- a/www/chromium/files/patch-chrome_browser_defaults.cc +++ b/www/chromium/files/patch-chrome_browser_defaults.cc @@ -1,7 +1,7 @@ ---- chrome/browser/defaults.cc.orig 2016-05-11 19:02:14 UTC +--- chrome/browser/defaults.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/defaults.cc -@@ -46,7 +46,7 @@ const bool kSyncAutoStarts = false; - const bool kShowOtherBrowsersInAboutMemory = true; +@@ -44,7 +44,7 @@ const bool kSyncAutoStarts = true; + const bool kSyncAutoStarts = false; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc index 6b89bf4ba063..78611ab40a5e 100644 --- a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc +++ b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc @@ -1,4 +1,4 @@ ---- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2016-03-25 13:04:45 UTC +--- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/diagnostics/diagnostics_writer.cc @@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool console_->SetColor(color); diff --git a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h index dd45d1664d8e..bc5fede743ac 100644 --- a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h +++ b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h @@ -1,6 +1,6 @@ ---- chrome/browser/diagnostics/diagnostics_writer.h.orig 2016-05-11 19:02:14 UTC +--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/diagnostics/diagnostics_writer.h -@@ -18,7 +18,7 @@ class DiagnosticsWriter : public Diagnos +@@ -19,7 +19,7 @@ class DiagnosticsWriter : public Diagnos public: // The type of formatting done by this writer. enum FormatType { diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 7311df998ed0..68948a635a04 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2016-05-11 19:02:14 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -736,7 +736,7 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -778,7 +778,7 @@ void ChromeDownloadManagerDelegate::OnDo target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); @@ -9,7 +9,7 @@ if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif -@@ -751,7 +751,7 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -793,7 +793,7 @@ void ChromeDownloadManagerDelegate::OnDo bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc index 66d933d29aff..5f622bf39afd 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.cc.orig 2016-04-08 16:02:07 UTC +--- chrome/browser/download/download_commands.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/download/download_commands.cc -@@ -211,7 +211,7 @@ bool DownloadCommands::IsCommandChecked( +@@ -217,7 +217,7 @@ bool DownloadCommands::IsCommandChecked( return download_item_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_item_); case ALWAYS_OPEN_TYPE: @@ -9,7 +9,7 @@ if (CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( download_item_->GetBrowserContext()); -@@ -254,7 +254,7 @@ void DownloadCommands::ExecuteCommand(Co +@@ -261,7 +261,7 @@ void DownloadCommands::ExecuteCommand(Co bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( download_item_->GetBrowserContext()); @@ -18,7 +18,7 @@ if (CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); DownloadItemModel(download_item_) -@@ -352,7 +352,7 @@ Browser* DownloadCommands::GetBrowser() +@@ -374,7 +374,7 @@ Browser* DownloadCommands::GetBrowser() return browser_displayer.browser(); } @@ -27,7 +27,7 @@ bool DownloadCommands::IsDownloadPdf() const { base::FilePath path = download_item_->GetTargetFilePath(); return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -369,7 +369,7 @@ bool DownloadCommands::CanOpenPdfInSyste +@@ -391,7 +391,7 @@ bool DownloadCommands::CanOpenPdfInSyste return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h index 52e9e612da44..9874814468d1 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2016-03-25 13:04:45 UTC +--- chrome/browser/download/download_commands.h.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/download/download_commands.h -@@ -42,7 +42,8 @@ class DownloadCommands { +@@ -43,7 +43,8 @@ class DownloadCommands { void ExecuteCommand(Command command); #if defined(OS_WIN) || defined(OS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc index 657dbd8fe0cc..9788b073e178 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.cc.orig 2016-04-08 16:02:07 UTC +--- chrome/browser/download/download_prefs.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/download/download_prefs.cc -@@ -55,7 +55,7 @@ namespace { +@@ -56,7 +56,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { @@ -9,16 +9,16 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -135,7 +135,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr +@@ -136,7 +136,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr GetDefaultDownloadDirectoryForProfile())); #endif // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) should_open_pdf_in_system_reader_ = - prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); - #endif -@@ -211,7 +211,7 @@ void DownloadPrefs::RegisterProfilePrefs + prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader) || + prefs->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally); +@@ -215,7 +215,7 @@ void DownloadPrefs::RegisterProfilePrefs default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); @@ -27,7 +27,7 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif } -@@ -288,7 +288,7 @@ bool DownloadPrefs::IsDownloadPathManage +@@ -292,7 +292,7 @@ bool DownloadPrefs::IsDownloadPathManage } bool DownloadPrefs::IsAutoOpenUsed() const { @@ -36,7 +36,7 @@ if (ShouldOpenPdfInSystemReader()) return true; #endif -@@ -302,7 +302,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBas +@@ -306,7 +306,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBas return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); @@ -45,16 +45,16 @@ if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader()) return true; #endif -@@ -335,7 +335,7 @@ void DownloadPrefs::DisableAutoOpenBased +@@ -340,7 +340,7 @@ void DownloadPrefs::DisableAutoOpenBased SaveAutoOpenState(); } -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { - if (should_open_pdf_in_system_reader_ == should_open) - return; -@@ -356,7 +356,7 @@ bool DownloadPrefs::ShouldOpenPdfInSyste + should_open_pdf_in_system_reader_ = should_open || + profile_->GetPrefs()->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally); +@@ -365,7 +365,7 @@ void DownloadPrefs::DisableAdobeVersionC #endif void DownloadPrefs::ResetAutoOpen() { diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h index 2964011eaa60..fba63d672875 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.h.orig 2016-04-08 16:02:07 UTC +--- chrome/browser/download/download_prefs.h.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/download/download_prefs.h -@@ -79,7 +79,7 @@ class DownloadPrefs { +@@ -80,7 +80,7 @@ class DownloadPrefs { // Disables auto-open based on file extension. void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name); @@ -9,12 +9,12 @@ // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. void SetShouldOpenPdfInSystemReader(bool should_open); -@@ -110,7 +110,7 @@ class DownloadPrefs { +@@ -115,7 +115,7 @@ class DownloadPrefs { AutoOpenCompareFunctor> AutoOpenSet; AutoOpenSet auto_open_; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) bool should_open_pdf_in_system_reader_; + bool disable_adobe_version_check_for_tests_; #endif - diff --git a/www/chromium/files/patch-chrome_browser_download_download__query.cc b/www/chromium/files/patch-chrome_browser_download_download__query.cc index b6ac2de45bf2..d4c3337037a3 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__query.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__query.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_query.cc.orig 2016-05-11 19:02:14 UTC +--- chrome/browser/download/download_query.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/download/download_query.cc -@@ -31,7 +31,11 @@ +@@ -27,7 +27,11 @@ #include "components/url_formatter/url_formatter.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/download_item.h" diff --git a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc index 4f5ec786cfe7..2228ce799eb2 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_shelf_context_menu.cc.orig 2016-03-25 13:04:45 UTC +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/download/download_shelf_context_menu.cc -@@ -142,7 +142,7 @@ base::string16 DownloadShelfContextMenu: +@@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu: : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; break; } diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index 527c7a8642cd..d0da69e3bfeb 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2016-10-06 04:02:11.000000000 +0300 -+++ chrome/browser/extensions/BUILD.gn 2016-10-13 05:50:49.572236000 +0300 -@@ -186,7 +186,7 @@ +--- chrome/browser/extensions/BUILD.gn.orig 2017-01-26 00:49:08 UTC ++++ chrome/browser/extensions/BUILD.gn +@@ -1024,7 +1024,7 @@ static_library("extensions") { sources -= [ "global_shortcut_listener_ozone.cc" ] } @@ -9,7 +9,7 @@ deps += [ "//build/linux:fontconfig" ] if (use_dbus) { -@@ -252,6 +252,12 @@ +@@ -1115,6 +1115,12 @@ static_library("extensions") { defines += [ "ENABLE_HOTWORDING" ] } @@ -20,5 +20,5 @@ + } + if (enable_service_discovery) { - sources += rebase_path( - gypi_values.chrome_browser_extensions_service_discovery_sources, + sources += [ + "api/gcd_private/gcd_private_api.cc", diff --git a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc index 19ff8e0cb169..8f26d7df14e1 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc @@ -1,8 +1,8 @@ ---- chrome/browser/extensions/activity_log/activity_log.cc.orig 2016-05-11 19:02:14 UTC +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc -@@ -39,7 +39,11 @@ - #include "extensions/browser/extensions_browser_client.h" +@@ -48,7 +48,11 @@ #include "extensions/common/extension.h" + #include "extensions/common/extension_messages.h" #include "extensions/common/one_shot_event.h" +#if defined(OS_BSD) +#include <re2/re2.h> diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc index b3b6cb312b5e..97f89bbfd0b6 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2016-05-11 19:02:14 UTC +--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc @@ -166,10 +166,12 @@ ImageWriterPrivateListRemovableStorageDe } diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h b/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h index ecf1bb8b0e57..0b9770088032 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h +++ b/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2016-05-11 19:02:14 UTC +--- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/extensions/api/input_ime/input_ime_api.h -@@ -27,7 +27,7 @@ +@@ -28,7 +28,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h" diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc index 59aa32401d15..6cc102962007 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/messaging/message_service.cc.orig 2016-07-22 00:06:51.000000000 -0400 -+++ chrome/browser/extensions/api/messaging/message_service.cc 2016-08-03 11:20:56.579570000 -0400 -@@ -119,7 +119,7 @@ +--- chrome/browser/extensions/api/messaging/message_service.cc.orig 2017-01-26 00:49:08 UTC ++++ chrome/browser/extensions/api/messaging/message_service.cc +@@ -119,7 +119,7 @@ MessageService::PolicyPermission Message const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -415,7 +415,7 @@ +@@ -414,7 +414,7 @@ void MessageService::OpenChannelToNative if (!source) return; @@ -18,3 +18,18 @@ content::WebContents* web_contents = content::WebContents::FromRenderFrameHost(source); ExtensionWebContentsObserver* extension_web_contents_observer = +@@ -477,12 +477,12 @@ void MessageService::OpenChannelToNative + channel->opener->IncrementLazyKeepaliveCount(); + + AddChannel(std::move(channel), receiver_port_id); +-#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) ++#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)) + const char kNativeMessagingNotSupportedError[] = + "Native Messaging is not supported on this platform."; + DispatchOnDisconnect( + source, receiver_port_id, kNativeMessagingNotSupportedError); +-#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) ++#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)) + } + + void MessageService::OpenChannelToTab(int source_process_id, diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc b/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc index 0ae188069823..0a8997ac19fd 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2016-03-25 13:04:45 UTC +--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc @@ -4,6 +4,10 @@ diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc index 0ca24c7a64d1..621f5c1f0d19 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig 2016-12-16 03:22:03.040835000 +0000 -+++ chrome/browser/extensions/api/omnibox/omnibox_api.cc 2016-12-16 03:22:24.317714000 +0000 -@@ -45,7 +45,7 @@ +--- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig 2017-01-26 00:49:08 UTC ++++ chrome/browser/extensions/api/omnibox/omnibox_api.cc +@@ -45,7 +45,7 @@ const char kBackgroundTabDisposition[] = // Pref key for omnibox.setDefaultSuggestion. const char kOmniboxDefaultSuggestion[] = "omnibox_default_suggestion"; diff --git a/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc b/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc index 1b54ff589e6a..4f94566b704c 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/bookmark_app_helper.cc.orig 2016-12-16 03:24:27.367808000 +0000 -+++ chrome/browser/extensions/bookmark_app_helper.cc 2016-12-16 03:24:51.798418000 +0000 -@@ -707,7 +707,7 @@ +--- chrome/browser/extensions/bookmark_app_helper.cc.orig 2017-01-26 00:49:08 UTC ++++ chrome/browser/extensions/bookmark_app_helper.cc +@@ -707,7 +707,7 @@ void BookmarkAppHelper::FinishInstallati #if !defined(OS_MACOSX) #if !defined(USE_ASH) web_app::ShortcutLocations creation_locations; diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc index 519d8ad9f08b..523d4a627f27 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,5 +1,5 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2016-12-01 23:02:07.000000000 +0000 -+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc 2016-12-16 19:35:19.489404000 +0000 +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2017-01-26 00:49:08 UTC ++++ chrome/browser/extensions/browser_context_keyed_service_factories.cc @@ -62,7 +62,7 @@ #include "chrome/browser/chromeos/extensions/media_player_api.h" #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -103,7 +103,7 @@ +@@ -110,7 +110,7 @@ void EnsureBrowserContextKeyedServiceFac #if defined(OS_CHROMEOS) extensions::InputImeAPI::GetFactoryInstance(); extensions::InputMethodAPI::GetFactoryInstance(); 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 a7b286bbcfaa..70f834fab40e 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,4 +1,4 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2016-12-01 23:02:07 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/extensions/external_provider_impl.cc @@ -638,7 +638,7 @@ void ExternalProviderImpl::CreateExterna Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD, 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 index 69d818483c6a..756b60aee50c 100644 --- a/www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc +++ b/www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/gpu/gl_string_manager.cc.orig 2016-04-08 16:02:07 UTC +--- chrome/browser/gpu/gl_string_manager.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/gpu/gl_string_manager.cc -@@ -28,7 +28,7 @@ GLStringManager::~GLStringManager() { +@@ -33,7 +33,7 @@ GLStringManager::~GLStringManager() { void GLStringManager::Initialize() { // On MacOSX or Windows, preliminary GPUInfo is enough. diff --git a/www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc b/www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc index 0a8b6347372b..3de56b23b1ea 100644 --- a/www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc +++ b/www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc @@ -1,4 +1,4 @@ ---- chrome/browser/gpu/gpu_feature_checker.cc.orig 2016-03-25 13:04:45 UTC +--- chrome/browser/gpu/gpu_feature_checker.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/gpu/gpu_feature_checker.cc @@ -34,7 +34,7 @@ void GPUFeatureChecker::CheckGPUFeatureA CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); diff --git a/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc b/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc index 02310b36a189..eb4e46402a3c 100644 --- a/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc +++ b/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc @@ -1,15 +1,15 @@ ---- chrome/browser/interstitials/chrome_controller_client.cc.orig 2016-04-08 16:02:07 UTC +--- chrome/browser/interstitials/chrome_controller_client.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/interstitials/chrome_controller_client.cc -@@ -55,7 +55,7 @@ void LaunchDateAndTimeSettingsOnFile() { - chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(), - sub_page); +@@ -49,7 +49,7 @@ void LaunchDateAndTimeSettingsOnFileThre + #if defined(OS_ANDROID) + chrome::android::OpenDateAndTimeSettings(); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) struct ClockCommand { - const char* pathname; - const char* argument; -@@ -138,7 +138,7 @@ void ChromeControllerClient::set_interst + const char* const pathname; + const char* const argument; +@@ -136,7 +136,7 @@ void ChromeControllerClient::set_interst bool ChromeControllerClient::CanLaunchDateAndTimeSettings() { #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc index fc79455804d1..01814d2a404a 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2016-03-25 13:04:45 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc @@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFil // Note that this initializes the delegate asynchronously, but since diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index e2c3f7d10163..5fb0f23e2dff 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2016-05-11 19:02:14 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -768,7 +768,10 @@ class MediaFileSystemRegistry::MediaFile +@@ -757,7 +757,10 @@ class MediaFileSystemRegistry::MediaFile // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index 9c3d3bb422fd..158227131ae1 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2016-12-01 23:02:07 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc @@ -344,6 +344,8 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_Android"; diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index ac6264d1e57f..c9717c56d4f7 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,7 +1,7 @@ ---- chrome/browser/memory_details.cc.orig 2016-08-03 22:02:12.000000000 +0300 -+++ chrome/browser/memory_details.cc 2016-09-30 22:07:01.106885000 +0300 -@@ -32,7 +32,7 @@ - #include "content/public/common/content_constants.h" +--- chrome/browser/memory_details.cc.orig 2017-01-26 00:49:08 UTC ++++ chrome/browser/memory_details.cc +@@ -33,7 +33,7 @@ + #include "extensions/features/features.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) @@ -9,7 +9,7 @@ #include "content/public/browser/zygote_host_linux.h" #endif -@@ -334,7 +334,7 @@ +@@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUI process.titles.push_back(title); } diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index 633557bb5824..d2e7aa532757 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2016-05-11 19:02:14 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -38,12 +38,14 @@ +@@ -42,12 +42,14 @@ #if defined(OS_LINUX) && !defined(OS_CHROMEOS) #include <gnu/libc-version.h> @@ -15,4 +15,4 @@ +#endif #if defined(USE_OZONE) || defined(USE_X11) - #include "ui/events/devices/device_data_manager.h" + #include "ui/events/devices/input_device_event_observer.h" diff --git a/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc b/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc index 4fd287394549..6858ec0a6753 100644 --- a/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc +++ b/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/async_dns_field_trial.cc.orig 2016-12-16 03:12:55.927001000 +0000 -+++ chrome/browser/net/async_dns_field_trial.cc 2016-12-16 03:13:16.445410000 +0000 -@@ -61,7 +61,7 @@ +--- chrome/browser/net/async_dns_field_trial.cc.orig 2017-01-26 00:49:08 UTC ++++ chrome/browser/net/async_dns_field_trial.cc +@@ -61,7 +61,7 @@ void HistogramPrefSource(PrefSource sour } // namespace bool ConfigureAsyncDnsFieldTrial() { diff --git a/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc b/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc index 190483c09723..a29e783a2e8f 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc @@ -1,7 +1,7 @@ ---- chrome/browser/notifications/message_center_notification_manager.cc.orig 2016-05-11 19:02:14 UTC +--- chrome/browser/notifications/message_center_notification_manager.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/notifications/message_center_notification_manager.cc -@@ -75,7 +75,7 @@ MessageCenterNotificationManager::Messag - new FullscreenNotificationBlocker(message_center))); +@@ -67,7 +67,7 @@ MessageCenterNotificationManager::Messag + base::MakeUnique<FullscreenNotificationBlocker>(message_center)); #if defined(OS_WIN) || defined(OS_MACOSX) \ - || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index e32bc8b3474c..39d62b33db29 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2016-05-11 19:02:14 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -56,7 +56,11 @@ +@@ -57,7 +57,11 @@ #include "content/public/browser/web_contents.h" #include "google_apis/gaia/gaia_urls.h" #include "net/base/url_util.h" @@ -10,5 +10,5 @@ #include "third_party/re2/src/re2/re2.h" +#endif - #if defined(OS_MACOSX) || BUILDFLAG(ANDROID_JAVA_UI) - #include "chrome/browser/password_manager/save_password_infobar_delegate.h" + #if BUILDFLAG(ANDROID_JAVA_UI) + #include "chrome/browser/android/tab_android.h" diff --git a/www/chromium/files/patch-chrome_browser_platform__util.h b/www/chromium/files/patch-chrome_browser_platform__util.h index a06c47d1bb0a..46058350d27c 100644 --- a/www/chromium/files/patch-chrome_browser_platform__util.h +++ b/www/chromium/files/patch-chrome_browser_platform__util.h @@ -1,6 +1,6 @@ ---- chrome/browser/platform_util.h.orig 2016-08-04 11:19:03.775212000 -0400 -+++ chrome/browser/platform_util.h 2016-08-04 11:19:15.839097000 -0400 -@@ -40,7 +40,7 @@ +--- chrome/browser/platform_util.h.orig 2017-01-26 00:49:08 UTC ++++ chrome/browser/platform_util.h +@@ -40,7 +40,7 @@ enum OpenOperationResult { enum OpenItemType { OPEN_FILE, OPEN_FOLDER, diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc index c876b478b8b9..b93d22a83ae8 100644 --- a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc +++ b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2016-04-08 16:02:07 UTC +--- chrome/browser/plugins/plugins_resource_service.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/plugins/plugins_resource_service.cc @@ -31,7 +31,7 @@ GURL GetPluginsServerURL() { std::string filename; diff --git a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc index 479342c467ca..fe789ab3abd4 100644 --- a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc +++ b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2016-05-11 19:02:14 UTC +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/policy/policy_prefs_browsertest.cc -@@ -174,6 +174,8 @@ class PolicyTestCase { +@@ -175,6 +175,8 @@ class PolicyTestCase { const std::string os("chromeos"); #elif defined(OS_LINUX) const std::string os("linux"); diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc index 995da03d3a6d..e4f62ae39f11 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2016-04-08 16:02:07 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -87,11 +87,11 @@ +@@ -93,11 +93,11 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" @@ -14,7 +14,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -315,7 +315,7 @@ bool DisplayProfileInUseError(const base +@@ -321,7 +321,7 @@ bool DisplayProfileInUseError(const base if (g_disable_prompt) return false; @@ -23,7 +23,7 @@ base::string16 relaunch_button_text = l10n_util::GetStringUTF16( IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); -@@ -869,7 +869,7 @@ ProcessSingleton::NotifyResult ProcessSi +@@ -855,7 +855,7 @@ ProcessSingleton::NotifyResult ProcessSi // The other process is shutting down, it's safe to start a new process. return PROCESS_NONE; } else if (strncmp(buf, kACKToken, arraysize(kACKToken) - 1) == 0) { diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl__io__data.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl__io__data.cc new file mode 100644 index 000000000000..ae716c019b04 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl__io__data.cc @@ -0,0 +1,11 @@ +--- chrome/browser/profiles/profile_impl_io_data.cc.orig 2017-01-26 00:49:08 UTC ++++ chrome/browser/profiles/profile_impl_io_data.cc +@@ -104,7 +104,7 @@ net::BackendType ChooseCacheBackendType( + } + #endif // #if !defined(OS_ANDROID) + +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + return net::CACHE_BACKEND_SIMPLE; + #else + return net::CACHE_BACKEND_BLOCKFILE; diff --git a/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc index 742da2829704..7cc595c72224 100644 --- a/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2016-12-18 00:37:45.100012000 +0100 -+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc 2016-12-18 00:42:54.851203000 +0100 -@@ -1325,7 +1325,7 @@ +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2017-01-26 00:49:08 UTC ++++ chrome/browser/renderer_context_menu/render_view_context_menu.cc +@@ -1367,7 +1367,7 @@ void RenderViewContextMenu::AppendEditab // 'Undo' and 'Redo' for text input with no suggestions and no text selected. // We make an exception for OS X as context clicking will select the closest // word. In this case both items are always shown. @@ -9,7 +9,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO, IDS_CONTENT_CONTEXT_UNDO); menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO, -@@ -1361,7 +1361,7 @@ +@@ -1403,7 +1403,7 @@ void RenderViewContextMenu::AppendLangua if (!use_spelling) return; @@ -18,7 +18,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); #else -@@ -1602,7 +1602,7 @@ +@@ -1645,7 +1645,7 @@ bool RenderViewContextMenu::IsCommandIdE case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kEnableSpellcheck); diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index 0ec2d3156f45..3457f65053d8 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,7 +1,7 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2016-05-11 19:02:14 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2017-01-26 00:49:08 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -15,7 +15,7 @@ - #include "content/public/common/webrtc_ip_handling_policy.h" +@@ -19,7 +19,7 @@ + #include "third_party/WebKit/public/public_features.h" #include "third_party/skia/include/core/SkColor.h" -#if defined(OS_LINUX) || defined(OS_ANDROID) @@ -9,8 +9,8 @@ #include "ui/gfx/font_render_params.h" #endif -@@ -27,7 +27,7 @@ - #include "ui/views/controls/textfield/textfield.h" +@@ -31,7 +31,7 @@ + #include "ui/base/cocoa/defaults_utils.h" #endif -#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -18,8 +18,8 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -95,7 +95,7 @@ void UpdateFromSystemSettings(content::R - prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0; +@@ -133,7 +133,7 @@ void UpdateFromSystemSettings(content::R + prefs->caret_blink_interval = interval.InSecondsF(); #endif -#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -27,7 +27,7 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -117,7 +117,7 @@ void UpdateFromSystemSettings(content::R +@@ -155,7 +155,7 @@ void UpdateFromSystemSettings(content::R } #endif diff --git a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn index c7466848e5d7..593541559b0c 100644 --- a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/resources/safe_browsing/BUILD.gn.orig 2016-08-03 22:02:13.000000000 +0300 -+++ chrome/browser/resources/safe_browsing/BUILD.gn 2016-09-20 02:51:43.112078000 +0300 -@@ -26,6 +26,8 @@ +--- chrome/browser/resources/safe_browsing/BUILD.gn.orig 2017-01-26 00:49:09 UTC ++++ chrome/browser/resources/safe_browsing/BUILD.gn +@@ -29,6 +29,8 @@ action("make_file_types_protobuf") { target_arch = "mac" } else if (is_linux) { target_arch = "linux" diff --git a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py index 1e23727a076d..aa7090a7a33f 100644 --- a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py +++ b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py @@ -1,6 +1,6 @@ ---- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2016-08-03 22:02:13.000000000 +0300 -+++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py 2016-09-20 02:52:27.389763000 +0300 -@@ -39,6 +39,7 @@ +--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2017-01-26 00:49:09 UTC ++++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py +@@ -50,6 +50,7 @@ def PlatformTypes(): "android": config_pb2.DownloadFileType.PLATFORM_ANDROID, "chromeos": config_pb2.DownloadFileType.PLATFORM_CHROME_OS, "linux": config_pb2.DownloadFileType.PLATFORM_LINUX, @@ -8,12 +8,12 @@ "mac": config_pb2.DownloadFileType.PLATFORM_MAC, "win": config_pb2.DownloadFileType.PLATFORM_WINDOWS, } -@@ -157,7 +158,7 @@ - 'fix for http://crbug.com/605592') +@@ -201,7 +202,7 @@ def main(): + 'Outfile must have a %d for version and %s for platform.') parser.add_option('-t', '--type', help='The platform type. One of android, chromeos, ' + - 'linux, mac, win') + 'linux, bsd, mac, win') parser.add_option('-i', '--infile', help='The ASCII DownloadFileType-proto file to read.') - parser.add_option('-o', '--outfile', + parser.add_option('-d', '--outdir', diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc index 48cab205d74b..390c2199d771 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2016-03-25 13:04:45 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc @@ -8,7 +8,12 @@ diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc index 459d9733adef..c77519f809a1 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/permission_reporter.cc.orig 2016-10-06 04:02:12.000000000 +0300 -+++ chrome/browser/safe_browsing/permission_reporter.cc 2016-10-14 06:15:01.051089000 +0300 -@@ -190,7 +190,7 @@ +--- chrome/browser/safe_browsing/permission_reporter.cc.orig 2017-01-26 00:49:09 UTC ++++ chrome/browser/safe_browsing/permission_reporter.cc +@@ -193,7 +193,7 @@ bool PermissionReporter::BuildReport(con #if defined(OS_ANDROID) report.set_platform_type(PermissionReport::ANDROID_PLATFORM); #elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc b/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc index 5c23af3d22c2..8a5b8c2d24e0 100644 --- a/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc +++ b/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc @@ -1,6 +1,6 @@ ---- chrome/browser/search/local_files_ntp_source.cc.orig 2016-05-11 19:02:15 UTC +--- chrome/browser/search/local_files_ntp_source.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/search/local_files_ntp_source.cc -@@ -19,8 +19,13 @@ +@@ -20,8 +20,13 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/url_data_source.h" diff --git a/www/chromium/files/patch-chrome_browser_speech_tts__controller__impl.cc b/www/chromium/files/patch-chrome_browser_speech_tts__controller__impl.cc new file mode 100644 index 000000000000..aaa532550f71 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_speech_tts__controller__impl.cc @@ -0,0 +1,16 @@ +--- chrome/browser/speech/tts_controller_impl.cc.orig 2017-01-26 00:49:09 UTC ++++ chrome/browser/speech/tts_controller_impl.cc +@@ -347,9 +347,13 @@ int TtsControllerImpl::QueueSize() { + } + + TtsPlatformImpl* TtsControllerImpl::GetPlatformImpl() { ++#if defined(OS_BSD) ++ return NULL; ++#else + if (!platform_impl_) + platform_impl_ = TtsPlatformImpl::GetInstance(); + return platform_impl_; ++#endif + } + + int TtsControllerImpl::GetMatchingVoice( diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index ba4b7fb79f9f..8bf4a9fb6692 100644 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2016-05-11 19:02:15 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -554,7 +554,7 @@ void ChromeSyncClient::RegisterDesktopDa +@@ -578,7 +578,7 @@ void ChromeSyncClient::RegisterDesktopDa } #endif @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD) // Dictionary sync is enabled by default. if (!disabled_types.Has(syncer::DICTIONARY)) { - sync_service->RegisterDataTypeController(new UIDataTypeController( + sync_service->RegisterDataTypeController( diff --git a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc index 6006d9827f1d..8475295ffbb6 100644 --- a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/tracing/crash_service_uploader.cc.orig 2016-05-11 19:02:15 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/tracing/crash_service_uploader.cc -@@ -150,6 +150,8 @@ void TraceCrashServiceUploader::DoUpload +@@ -156,6 +156,8 @@ void TraceCrashServiceUploader::DoUpload const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn index 641e92e0f6ae..8f51c867d601 100644 --- a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/ui/BUILD.gn.orig 2016-12-01 23:02:08 UTC +--- chrome/browser/ui/BUILD.gn.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/BUILD.gn -@@ -3024,7 +3024,7 @@ split_static_library("ui") { +@@ -3090,7 +3090,7 @@ split_static_library("ui") { ] } } diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index 1ea49137603f..ac11cfa57ac0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2016-10-06 04:02:13.000000000 +0300 -+++ chrome/browser/ui/browser_command_controller.cc 2016-10-13 05:57:01.306342000 +0300 -@@ -76,7 +76,7 @@ +--- chrome/browser/ui/browser_command_controller.cc.orig 2017-01-26 00:49:09 UTC ++++ chrome/browser/ui/browser_command_controller.cc +@@ -81,7 +81,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -216,7 +216,7 @@ +@@ -203,7 +203,7 @@ bool BrowserCommandController::IsReserve if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN) return true; @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -419,7 +419,7 @@ +@@ -406,7 +406,7 @@ void BrowserCommandController::ExecuteCo break; #endif @@ -27,7 +27,7 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = browser_->profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -812,7 +812,7 @@ +@@ -766,7 +766,7 @@ void BrowserCommandController::InitComma command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc index e3299f9eb6a2..75442686108b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2016-12-01 23:02:08 UTC +--- chrome/browser/ui/browser_view_prefs.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/browser_view_prefs.cc @@ -10,7 +10,7 @@ #include "components/prefs/pref_registry_simple.h" @@ -9,12 +9,3 @@ #include "ui/base/x/x11_util.h" // nogncheck #endif -@@ -32,7 +32,7 @@ void RegisterBrowserViewLocalPrefs(PrefR - - void RegisterBrowserViewProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, - ui::GetCustomFramePrefDefault()); - #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc index be0484a5b919..5b0c9566136a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc +++ b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2016-04-08 16:02:07 UTC +--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc -@@ -19,7 +19,7 @@ +@@ -16,7 +16,7 @@ // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding // here. diff --git a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc index 24bb5fcf48bf..7770b56aa15d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc +++ b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/input_method/input_method_engine_base.cc -@@ -35,7 +35,7 @@ +@@ -37,7 +37,7 @@ #elif defined(OS_WIN) #include "ui/events/keycodes/dom/keycode_converter.h" #include "ui/events/keycodes/keyboard_codes_win.h" diff --git a/www/chromium/files/patch-chrome_browser_ui_libgtk2ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn index d00849258fb2..8ca6e760cba7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_libgtk2ui_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn @@ -1,5 +1,5 @@ ---- chrome/browser/ui/libgtk2ui/BUILD.gn.orig 2016-08-03 22:02:13.000000000 +0300 -+++ chrome/browser/ui/libgtk2ui/BUILD.gn 2016-09-03 00:03:44.741182000 +0300 +--- chrome/browser/ui/libgtkui/BUILD.gn.orig 2017-01-26 00:49:09 UTC ++++ chrome/browser/ui/libgtkui/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc b/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc new file mode 100644 index 000000000000..1ff86de9c886 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc @@ -0,0 +1,10 @@ +--- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2017-01-26 00:49:09 UTC ++++ chrome/browser/ui/libgtkui/print_dialog_gtk.cc +@@ -348,6 +348,7 @@ void PrintDialogGtk2::ShowDialog( + // Since we only generate PDF, only show printers that support PDF. + // TODO(thestig) Add more capabilities to support? + GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( ++ GTK_PRINT_CAPABILITY_GENERATE_PS | + GTK_PRINT_CAPABILITY_GENERATE_PDF | + GTK_PRINT_CAPABILITY_PAGE_SET | + GTK_PRINT_CAPABILITY_COPIES | diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc new file mode 100644 index 000000000000..802bc7fefa8a --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2017-01-26 00:49:09 UTC ++++ chrome/browser/ui/startup/bad_flags_prompt.cc +@@ -71,7 +71,7 @@ void ShowBadFlagsPrompt(Browser* browser + // This flag gives extensions more powers. + extensions::switches::kExtensionsOnChromeURLs, + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // Speech dispatcher is buggy, it can crash and it can make Chrome freeze. + // http://crbug.com/327295 + switches::kEnableSpeechDispatcher, diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index 7febf49fda9a..6619e4a95337 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2016-12-01 23:02:08 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -91,7 +91,7 @@ +@@ -95,7 +95,7 @@ #include "components/user_manager/user_manager.h" #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc index 8747a5b389c9..69df53ebe7c8 100644 --- a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc +++ b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/toolbar/app_menu_model.cc -@@ -709,7 +709,7 @@ bool AppMenuModel::IsCommandIdVisible(in +@@ -632,7 +632,7 @@ bool AppMenuModel::IsCommandIdVisible(in case IDC_UPGRADE_DIALOG: return browser_defaults::kShowUpgradeMenuItem && UpgradeDetector::GetInstance()->notify_upgrade(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc index 2768c1e9ee38..010509e8ab67 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ #include "ui/gfx/image/image_skia.h" #include "ui/views/widget/widget.h" @@ -9,7 +9,7 @@ #include "chrome/browser/shell_integration_linux.h" #endif -@@ -58,7 +58,7 @@ void ChromeNativeAppWindowViewsAura::OnB +@@ -57,7 +57,7 @@ void ChromeNativeAppWindowViewsAura::OnB const AppWindow::CreateParams& create_params, views::Widget::InitParams* init_params, views::Widget* widget) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc index bad7a92b4b5f..046bf801e3ed 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_views_delegate.cc.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/views/chrome_views_delegate.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/views/chrome_views_delegate.cc -@@ -48,7 +48,7 @@ +@@ -57,7 +57,7 @@ #include "ui/views/widget/native_widget_aura.h" #endif @@ -9,7 +9,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -295,7 +295,7 @@ HICON ChromeViewsDelegate::GetSmallWindo +@@ -308,7 +308,7 @@ HICON ChromeViewsDelegate::GetSmallWindo return GetSmallAppIcon(); } @@ -18,7 +18,7 @@ gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64); -@@ -443,7 +443,7 @@ void ChromeViewsDelegate::OnBeforeWidget +@@ -447,7 +447,7 @@ void ChromeViewsDelegate::OnBeforeWidget #endif } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h index f34b13e2d183..d35c65823333 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -35,7 +35,7 @@ class ChromeViewsDelegate : public views +@@ -37,7 +37,7 @@ class ChromeViewsDelegate : public views #if defined(OS_WIN) HICON GetDefaultWindowIcon() const override; HICON GetSmallWindowIcon() const override; @@ -9,7 +9,7 @@ gfx::ImageSkia* GetDefaultWindowIcon() const override; #endif -@@ -48,7 +48,7 @@ class ChromeViewsDelegate : public views +@@ -50,7 +50,7 @@ class ChromeViewsDelegate : public views void OnBeforeWidgetInit( views::Widget::InitParams* params, views::internal::NativeWidgetDelegate* delegate) override; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc index 1546b959a781..af383e4487b2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2016-10-06 04:02:13.000000000 +0300 -+++ chrome/browser/ui/views/first_run_dialog.cc 2016-10-15 10:10:45.850050000 +0300 -@@ -35,8 +35,10 @@ +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2017-01-26 00:49:09 UTC ++++ chrome/browser/ui/views/first_run_dialog.cc +@@ -40,8 +40,10 @@ using views::GridLayout; namespace { void InitCrashReporterIfEnabled(bool enabled) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index d55e1ec4112d..8a9fd7325531 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -36,7 +36,7 @@ - #include "ui/native_theme/native_theme_dark_aura.h" +@@ -37,11 +37,11 @@ + #include "ash/common/wm_shell.h" // nogncheck #endif -#if defined(OS_LINUX) @@ -9,7 +9,12 @@ #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h" #endif -@@ -88,7 +88,7 @@ void BrowserFrame::InitBrowserFrame() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" + #endif + +@@ -98,7 +98,7 @@ void BrowserFrame::InitBrowserFrame() { non_client_view()->set_context_menu_controller(this); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 77e6c8fe5208..11b749117893 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,20 +1,11 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -187,7 +187,7 @@ - #include "content/public/common/mojo_shell_connection.h" +@@ -1913,7 +1913,7 @@ void BrowserView::OnThemeChanged() { #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "ui/native_theme/native_theme_dark_aura.h" - #endif - -@@ -2017,7 +2017,7 @@ void BrowserView::OnThemeChanged() { #if defined(OS_WIN) - ui::NativeThemeDarkWin::instance()->NotifyObservers(); ui::NativeThemeWin::instance()->NotifyObservers(); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - ui::NativeThemeDarkAura::instance()->NotifyObservers(); ui::NativeThemeAura::instance()->NotifyObservers(); #endif + } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index 3f0f575100ce..8000b48e9eae 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc -@@ -53,7 +53,7 @@ +@@ -38,7 +38,7 @@ #include "ui/views/window/frame_background.h" #include "ui/views/window/window_shape.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -311,7 +311,7 @@ void OpaqueBrowserFrameView::ButtonPress +@@ -292,7 +292,7 @@ void OpaqueBrowserFrameView::ButtonPress void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source, const gfx::Point& point, const ui::Event* event) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc index 58cd5617849b..b181c61ba4ca 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc @@ -20,7 +20,7 @@ namespace { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc index f60c0d4824ba..c8da5dc32394 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2016-04-08 16:02:08 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc @@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpeci return false; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index 4e338761cf84..3dc5eefd8fbc 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -88,7 +88,7 @@ void SystemMenuModelBuilder::BuildSystem +@@ -85,7 +85,7 @@ void SystemMenuModelBuilder::BuildSystem model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } @@ -9,7 +9,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR, IDS_SHOW_WINDOW_DECORATIONS_MENU); -@@ -126,7 +126,7 @@ void SystemMenuModelBuilder::BuildSystem +@@ -119,7 +119,7 @@ void SystemMenuModelBuilder::BuildSystem model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc new file mode 100644 index 000000000000..4aa73b52653d --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2017-01-26 00:49:09 UTC ++++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc +@@ -13,7 +13,7 @@ + #include "components/sessions/core/tab_restore_service.h" + #include "ui/base/l10n/l10n_util.h" + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + #include "chrome/common/pref_names.h" + #include "components/prefs/pref_service.h" + #endif +@@ -29,7 +29,7 @@ SystemMenuModelDelegate::~SystemMenuMode + } + + bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + if (command_id == IDC_USE_SYSTEM_TITLE_BAR) { + PrefService* prefs = browser_->profile()->GetPrefs(); + return !prefs->GetBoolean(prefs::kUseCustomChromeFrame); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc index c04ed621e67f..b7da41051b25 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/views/message_center/message_center_frame_view.cc @@ -15,7 +15,7 @@ namespace message_center { @@ -7,5 +7,5 @@ -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) const int kBorderWidth = 1; - SetBorder(views::Border::CreateSolidBorder( + SetBorder(views::CreateSolidBorder( kBorderWidth, message_center::kMessageCenterBorderColor)); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index d4d6c5bed77a..462f7bc75cb0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -268,7 +268,7 @@ void TabDragController::Init( +@@ -270,7 +270,7 @@ void TabDragController::Init( // synchronous on desktop Linux, so use that. // - Ash // Releasing capture on Ash cancels gestures so avoid it. @@ -9,7 +9,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y()); -@@ -618,7 +618,7 @@ TabDragController::DragBrowserToNewTabSt +@@ -620,7 +620,7 @@ TabDragController::DragBrowserToNewTabSt // that to effect the position of any windows. SetWindowPositionManaged(browser_widget->GetNativeWindow(), false); @@ -18,7 +18,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -1791,7 +1791,7 @@ gfx::NativeWindow TabDragController::Get +@@ -1819,7 +1819,7 @@ TabDragController::Liveness TabDragContr if (dragged_window) exclude.insert(dragged_window); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc index 585931ae3236..1276278d83cb 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc @@ -1,9 +1,9 @@ ---- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2016-06-06 21:05:14.000000000 +0200 -+++ chrome/browser/ui/views/tabs/tab_strip.cc 2016-06-13 22:03:03.000000000 +0200 -@@ -331,7 +331,7 @@ - : views::ImageButton(listener), +--- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2017-01-26 00:49:09 UTC ++++ chrome/browser/ui/views/tabs/tab_strip.cc +@@ -323,7 +323,7 @@ NewTabButton::NewTabButton(TabStrip* tab tab_strip_(tab_strip), destroyed_(NULL) { + set_animate_on_state_change(true); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) set_triggerable_event_flags(triggerable_event_flags() | diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc index 0f955aaf4ebf..de5b15c71834 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,56 +1,56 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2016-07-20 22:03:21.000000000 +0300 -+++ chrome/browser/ui/webui/about_ui.cc 2016-08-10 15:53:44.885419000 +0300 -@@ -73,7 +73,7 @@ +--- chrome/browser/ui/webui/about_ui.cc.orig 2017-01-26 00:49:09 UTC ++++ chrome/browser/ui/webui/about_ui.cc +@@ -75,7 +75,7 @@ #include "chrome/browser/ui/webui/theme_source.h" #endif - + -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) #include "content/public/browser/zygote_host_linux.h" #include "content/public/common/sandbox_linux.h" #endif -@@ -642,7 +642,7 @@ +@@ -644,7 +644,7 @@ class AboutDnsHandler : public base::Ref DISALLOW_COPY_AND_ASSIGN(AboutDnsHandler); }; - + -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -658,6 +658,7 @@ +@@ -660,6 +660,7 @@ std::string AboutLinuxProxyConfig() { return data; } - + +#if !defined(OS_BSD) void AboutSandboxRow(std::string* data, int name_id, bool good) { data->append("<tr><td>"); data->append(l10n_util::GetStringUTF8(name_id)); -@@ -672,6 +673,7 @@ +@@ -674,6 +675,7 @@ void AboutSandboxRow(std::string* data, } data->append("</td></tr>"); } +#endif - + std::string AboutSandbox() { std::string data; -@@ -681,6 +683,7 @@ +@@ -683,6 +685,7 @@ std::string AboutSandbox() { data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE)); data.append("</h1>"); - + +#if !defined(OS_BSD) // Get expected sandboxing status of renderers. const int status = content::ZygoteHost::GetInstance()->GetRendererSandboxStatus(); -@@ -721,6 +724,7 @@ +@@ -723,6 +726,7 @@ std::string AboutSandbox() { data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_BAD)); } data.append("</p>"); +#endif - + AppendFooter(&data); return data; -@@ -769,7 +773,7 @@ +@@ -794,7 +798,7 @@ void AboutUIHTMLSource::StartDataRequest } else if (source_name_ == chrome::kChromeUIDNSHost) { AboutDnsHandler::Start(profile(), callback); return; @@ -59,7 +59,7 @@ } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) { response = AboutLinuxProxyConfig(); #endif -@@ -778,7 +782,7 @@ +@@ -803,7 +807,7 @@ void AboutUIHTMLSource::StartDataRequest ChromeOSCreditsHandler::Start(path, callback); return; #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index a253d91eafaa..aed71a18422f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -275,7 +275,7 @@ bool IsAboutUI(const GURL& url) { +@@ -286,7 +286,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) - || url.host() == chrome::kChromeUITermsHost + || url.host_piece() == chrome::kChromeUITermsHost #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) - || url.host() == chrome::kChromeUILinuxProxyConfigHost || - url.host() == chrome::kChromeUISandboxHost + || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost || + url.host_piece() == chrome::kChromeUISandboxHost #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc index 66becbeaf2b2..29d92f0a33c7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig 2016-05-11 19:02:16 UTC +--- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/webui/extensions/extension_loader_handler.cc -@@ -25,7 +25,11 @@ +@@ -27,7 +27,11 @@ #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc index d321230278d7..ed34ee3508da 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2016-05-11 19:02:17 UTC +--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.cc -@@ -491,13 +491,13 @@ void BrowserOptionsHandler::GetLocalized +@@ -564,13 +564,13 @@ void BrowserOptionsHandler::GetLocalized { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, #endif // defined(OS_CHROMEOS) @@ -16,7 +16,7 @@ #if defined(OS_CHROMEOS) && defined(USE_ASH) { "setWallpaper", IDS_SET_WALLPAPER_BUTTON }, -@@ -738,7 +738,7 @@ void BrowserOptionsHandler::RegisterMess +@@ -813,7 +813,7 @@ void BrowserOptionsHandler::RegisterMess "requestProfilesInfo", base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Unretained(this))); @@ -25,7 +25,7 @@ web_ui()->RegisterMessageCallback( "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative, -@@ -1366,7 +1366,7 @@ void BrowserOptionsHandler::ObserveTheme +@@ -1476,7 +1476,7 @@ void BrowserOptionsHandler::ObserveTheme ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); bool is_system_theme = false; @@ -34,7 +34,7 @@ bool profile_is_supervised = profile->IsSupervised(); is_system_theme = theme_service->UsingSystemTheme(); base::FundamentalValue native_theme_enabled(!is_system_theme && -@@ -1388,7 +1388,7 @@ void BrowserOptionsHandler::ThemesReset( +@@ -1498,7 +1498,7 @@ void BrowserOptionsHandler::ThemesReset( ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h index bf9abb470a7c..f137b14f401d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2016-05-11 19:02:17 UTC +--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.h -@@ -204,7 +204,7 @@ class BrowserOptionsHandler +@@ -208,7 +208,7 @@ class BrowserOptionsHandler void ObserveThemeChanged(); void ThemesReset(const base::ListValue* args); diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc index caf13d17488d..25f49f0f91a9 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/web_app.cc.orig 2016-05-11 19:02:17 UTC +--- chrome/browser/web_applications/web_app.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/web_applications/web_app.cc -@@ -514,7 +514,7 @@ void GetIconsInfo(const WebApplicationIn +@@ -507,7 +507,7 @@ void GetIconsInfo(const WebApplicationIn } #endif diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app.h b/www/chromium/files/patch-chrome_browser_web__applications_web__app.h index 3c9be81784de..ef82c2d4a9c7 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app.h @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/web_app.h.orig 2016-05-11 19:02:17 UTC +--- chrome/browser/web_applications/web_app.h.orig 2017-01-26 00:49:09 UTC +++ chrome/browser/web_applications/web_app.h -@@ -227,7 +227,7 @@ typedef std::vector<WebApplicationInfo:: +@@ -224,7 +224,7 @@ typedef std::vector<WebApplicationInfo:: void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons); #endif diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index 9ef7bc529c4f..050e4cc58e07 100644 --- a/www/chromium/files/patch-chrome_common_BUILD.gn +++ b/www/chromium/files/patch-chrome_common_BUILD.gn @@ -1,7 +1,7 @@ ---- chrome/common/BUILD.gn.orig 2016-08-03 22:02:14.000000000 +0300 -+++ chrome/common/BUILD.gn 2016-09-27 19:17:20.410265000 +0300 -@@ -156,6 +156,13 @@ - ] +--- chrome/common/BUILD.gn.orig 2017-01-26 00:49:09 UTC ++++ chrome/common/BUILD.gn +@@ -243,6 +243,13 @@ static_library("common") { + public_deps += [ "//ppapi/shared_impl" ] } + if (is_bsd) { @@ -12,5 +12,5 @@ + } + if (enable_extensions) { - sources += rebase_path(gypi_values.chrome_common_extensions_sources, - ".", + sources += [ + "cast_messages.cc", diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 8ef25950c031..caaaf91fa4e1 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.cc.orig 2016-05-11 19:02:17 UTC +--- chrome/common/chrome_paths.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/common/chrome_paths.cc -@@ -178,7 +178,7 @@ bool PathProvider(int key, base::FilePat +@@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePat return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -9,7 +9,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -470,10 +470,12 @@ bool PathProvider(int key, base::FilePat +@@ -480,10 +480,12 @@ bool PathProvider(int key, base::FilePat if (!base::PathExists(cur)) // We don't want to create this return false; break; @@ -23,7 +23,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -540,7 +542,7 @@ bool PathProvider(int key, base::FilePat +@@ -534,7 +536,7 @@ bool PathProvider(int key, base::FilePat #endif break; @@ -32,7 +32,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if defined(GOOGLE_CHROME_BUILD) -@@ -554,6 +556,9 @@ bool PathProvider(int key, base::FilePat +@@ -548,6 +550,9 @@ bool PathProvider(int key, base::FilePat #if defined(GOOGLE_CHROME_BUILD) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); @@ -42,7 +42,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -566,7 +571,7 @@ bool PathProvider(int key, base::FilePat +@@ -560,7 +565,7 @@ bool PathProvider(int key, base::FilePat return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h index f765f38bcf26..9ccf153c2999 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths.h @@ -1,15 +1,15 @@ ---- chrome/common/chrome_paths.h.orig 2016-05-11 19:02:17 UTC +--- chrome/common/chrome_paths.h.orig 2017-01-26 00:49:09 UTC +++ chrome/common/chrome_paths.h -@@ -50,7 +50,7 @@ enum { - DIR_USER_APPLICATIONS, // ~/Applications - DIR_USER_LIBRARY, // ~/Library +@@ -49,7 +49,7 @@ enum { + // to set policies for chrome. This directory + // contains subdirectories. #endif -#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ +#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) || \ defined(OS_MACOSX) DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. -@@ -59,7 +59,7 @@ enum { +@@ -58,7 +58,7 @@ enum { // create it. #endif @@ -18,7 +18,7 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -117,7 +117,7 @@ enum { +@@ -112,7 +112,7 @@ enum { DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are // installed. diff --git a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h index 55e9c6cafb51..0836ae538ed2 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths_internal.h.orig 2016-05-11 19:02:17 UTC +--- chrome/common/chrome_paths_internal.h.orig 2017-01-26 00:49:09 UTC +++ chrome/common/chrome_paths_internal.h @@ -39,7 +39,7 @@ void GetUserCacheDirectory(const base::F // Get the path to the user's documents directory. diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 76c345ff90f7..8d79e0decf46 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2016-10-06 04:02:14.000000000 +0300 -+++ chrome/common/chrome_switches.cc 2016-10-13 06:11:21.058074000 +0300 -@@ -1277,7 +1277,7 @@ +--- chrome/common/chrome_switches.cc.orig 2017-01-26 00:49:09 UTC ++++ chrome/common/chrome_switches.cc +@@ -1263,7 +1263,7 @@ const char kAllowNaClSocketAPI[] const char kEnableWaylandServer[] = "enable-wayland-server"; #endif diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 0b39deddba1e..2e8c921caa67 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2016-10-06 04:02:14.000000000 +0300 -+++ chrome/common/chrome_switches.h 2016-10-13 06:13:55.604411000 +0300 -@@ -378,7 +378,7 @@ +--- chrome/common/chrome_switches.h.orig 2017-01-26 00:49:09 UTC ++++ chrome/common/chrome_switches.h +@@ -385,7 +385,7 @@ extern const char kAllowNaClSocketAPI[]; extern const char kEnableWaylandServer[]; #endif diff --git a/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc b/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc index 88b8a88e5a52..4a19c349076b 100644 --- a/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc +++ b/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc @@ -1,6 +1,6 @@ ---- chrome/common/extensions/chrome_extensions_client.cc.orig 2016-12-16 03:27:01.063936000 +0000 -+++ chrome/common/extensions/chrome_extensions_client.cc 2016-12-16 03:29:25.710522000 +0000 -@@ -103,7 +103,10 @@ +--- chrome/common/extensions/chrome_extensions_client.cc.orig 2017-01-26 00:49:09 UTC ++++ chrome/common/extensions/chrome_extensions_client.cc +@@ -105,7 +105,10 @@ ChromeChannelForHistogram GetChromeChann static base::LazyInstance<ChromeExtensionsClient> g_client = LAZY_INSTANCE_INITIALIZER; diff --git a/www/chromium/files/patch-chrome_common_extensions_command.cc b/www/chromium/files/patch-chrome_common_extensions_command.cc index 17956682edd5..2025c85b45fa 100644 --- a/www/chromium/files/patch-chrome_common_extensions_command.cc +++ b/www/chromium/files/patch-chrome_common_extensions_command.cc @@ -1,6 +1,6 @@ ---- chrome/common/extensions/command.cc.orig 2016-05-11 19:02:17 UTC +--- chrome/common/extensions/command.cc.orig 2017-01-26 00:49:09 UTC +++ chrome/common/extensions/command.cc -@@ -306,7 +306,7 @@ std::string Command::CommandPlatform() { +@@ -302,7 +302,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif defined(OS_CHROMEOS) return values::kKeybindingPlatformChromeOs; diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni index b6db716cf8ed..7919f707d6c4 100644 --- a/www/chromium/files/patch-chrome_common_features.gni +++ b/www/chromium/files/patch-chrome_common_features.gni @@ -1,11 +1,11 @@ ---- chrome/common/features.gni.orig 2016-10-06 04:02:14.000000000 +0300 -+++ chrome/common/features.gni 2016-10-13 06:19:10.348914000 +0300 -@@ -21,7 +21,7 @@ - enable_background = !is_ios && !is_android && !is_chromecast +--- chrome/common/features.gni.orig 2017-01-26 00:49:10 UTC ++++ chrome/common/features.gni +@@ -43,7 +43,7 @@ declare_args() { + enable_hotwording = is_chrome_branded && is_chromeos enable_one_click_signin = - is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast) + is_win || is_mac || is_bsd || (is_linux && !is_chromeos && !is_chromecast) - # Google Now is disabled to prepare for its removal. - # http://crbug.com/539674 + # Set to true to bundle all the mash related mojo services into chrome. + # Specify --mash to chrome to have chrome start the mash environment. diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index d99b19146a11..3bd99079fb4d 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2016-10-06 04:02:14.000000000 +0300 -+++ chrome/common/pref_names.cc 2016-10-14 06:57:51.856679000 +0300 -@@ -952,7 +952,7 @@ +--- chrome/common/pref_names.cc.orig 2017-01-26 00:49:10 UTC ++++ chrome/common/pref_names.cc +@@ -964,7 +964,7 @@ const char kForceSessionSync[] = "settin // only using an account that belongs to one of the domains from this pref. const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1035,7 +1035,7 @@ +@@ -1051,7 +1051,7 @@ const char kShowUpdatePromotionInfoBar[] "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1408,7 +1408,7 @@ +@@ -1438,7 +1438,7 @@ const char kDownloadDefaultDirectory[] = // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 048fc19e40f1..decc11c38faa 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2016-12-01 23:02:09 UTC +--- chrome/common/pref_names.h.orig 2017-01-26 00:49:10 UTC +++ chrome/common/pref_names.h -@@ -312,7 +312,7 @@ extern const char kForceGoogleSafeSearch +@@ -322,7 +322,7 @@ extern const char kForceGoogleSafeSearch extern const char kForceYouTubeRestrict[]; extern const char kForceSessionSync[]; extern const char kAllowedDomainsForApps[]; @@ -9,7 +9,7 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -345,7 +345,7 @@ extern const char kDefaultBrowserSetting +@@ -355,7 +355,7 @@ extern const char kDefaultBrowserSetting #if defined(OS_MACOSX) extern const char kShowUpdatePromotionInfoBar[]; #endif @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif extern const char kBackShortcutBubbleShownCount[]; -@@ -493,7 +493,7 @@ extern const char kAppWindowPlacement[]; +@@ -510,7 +510,7 @@ extern const char kAppWindowPlacement[]; extern const char kDownloadDefaultDirectory[]; extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadDirUpgraded[]; diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc index cb80bdab2845..d49e67c6211c 100644 --- a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc +++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc @@ -1,4 +1,4 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2016-05-11 19:02:17 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2017-01-26 00:49:10 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.cc @@ -14,7 +14,7 @@ #include "ppapi/proxy/ppapi_messages.h" @@ -19,8 +19,8 @@ description.face, description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD, @@ -44,7 +44,7 @@ PepperFlashFontFileHost::PepperFlashFont - skia::RefPtr<SkFontMgr> font_mgr = skia::AdoptRef(SkFontMgr::RefDefault()); - typeface_ = skia::AdoptRef( + sk_sp<SkFontMgr> font_mgr(SkFontMgr::RefDefault()); + typeface_ = sk_sp<SkTypeface>( font_mgr->matchFamilyStyle(description.face.c_str(), style)); -#endif // defined(OS_LINUX) || defined(OS_OPENBSD) +#endif // defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h index cd7fcc19d2d5..38978b4637cd 100644 --- a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h +++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h @@ -1,4 +1,4 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2016-05-11 19:02:17 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2017-01-26 00:49:10 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.h @@ -14,7 +14,7 @@ #include "ppapi/c/private/pp_private_font_charset.h" @@ -8,7 +8,7 @@ +#if defined(OS_LINUX) || defined(OS_BSD) #include "base/files/scoped_file.h" #elif defined(OS_WIN) - #include "skia/ext/refptr.h" + #include "third_party/skia/include/core/SkRefCnt.h" @@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public p uint32_t table); bool GetFontData(uint32_t table, void* buffer, size_t* length); @@ -17,4 +17,4 @@ +#if defined(OS_LINUX) || defined(OS_BSD) base::ScopedFD fd_; #elif defined(OS_WIN) - skia::RefPtr<SkTypeface> typeface_; + sk_sp<SkTypeface> typeface_; diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 8485d1a2f86e..1785a516aecc 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2016-12-01 23:02:09 UTC +--- chrome/test/BUILD.gn.orig 2017-01-26 00:49:10 UTC +++ chrome/test/BUILD.gn -@@ -179,7 +179,7 @@ static_library("test_support") { +@@ -186,7 +186,7 @@ static_library("test_support") { ] } @@ -9,7 +9,7 @@ public_deps += [ "//crypto:platform" ] } if (is_mac) { -@@ -449,7 +449,7 @@ if (!is_android) { +@@ -461,7 +461,7 @@ if (!is_android) { "$root_out_dir/test_page.css.mock-http-headers", "$root_out_dir/ui_test.pak", ] @@ -18,7 +18,7 @@ data += [ "$root_out_dir/chrome_100_percent.pak", "$root_out_dir/chrome_200_percent.pak", -@@ -458,7 +458,7 @@ if (!is_android) { +@@ -470,7 +470,7 @@ if (!is_android) { "$root_out_dir/resources.pak", ] } @@ -27,7 +27,7 @@ data += [ "$root_out_dir/libppapi_tests.so" ] } -@@ -559,7 +559,7 @@ if (!is_android) { +@@ -577,7 +577,7 @@ if (!is_android) { "base/interactive_test_utils_views.cc", ] } @@ -36,7 +36,7 @@ if (!is_chromeos) { # Desktop linux. sources -= [ -@@ -1992,7 +1992,7 @@ test("browser_tests") { +@@ -2010,14 +2010,14 @@ test("browser_tests") { sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ] deps += [ "//chrome/browser/chromeos" ] data_deps += [ "//third_party/liblouis:liblouis_test_data" ] @@ -45,16 +45,15 @@ sources += [ "../browser/ui/views/ime/ime_warning_bubble_browsertest.cc", "../browser/ui/views/ime/ime_window_browsertest.cc", -@@ -2003,7 +2003,7 @@ test("browser_tests") { - data += [ "//testing/buildbot/filters/browser-side-navigation.linux.browser_tests.filter" ] + ] } - if (is_win || is_linux) { + if (is_win || is_linux || is_bsd) { sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ] data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ] - data += [ "//testing/buildbot/filters/site-per-process.browser_tests.filter" ] -@@ -2016,7 +2016,7 @@ test("browser_tests") { + } +@@ -2029,7 +2029,7 @@ test("browser_tests") { configs += [ "//build/config/win:default_large_module_incremental_linking" ] } @@ -63,7 +62,7 @@ data_deps += [ "//components/nacl/loader:nacl_helper" ] if (enable_nacl_nonsfi) { -@@ -2124,7 +2124,7 @@ test("browser_tests") { +@@ -2136,7 +2136,7 @@ test("browser_tests") { } } @@ -72,7 +71,7 @@ # Set rpath to find the CDM adapter even in a non-component build. configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } -@@ -2347,7 +2347,7 @@ test("browser_tests") { +@@ -2363,7 +2363,7 @@ test("browser_tests") { if (toolkit_views) { sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ] } @@ -81,7 +80,7 @@ sources += [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ] } -@@ -2541,7 +2541,7 @@ test("browser_tests") { +@@ -2558,7 +2558,7 @@ test("browser_tests") { "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc", ] } @@ -90,7 +89,7 @@ sources += [ # Tests for non mobile and non CrOS (includes Linux, Win, Mac). "../browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc", -@@ -2729,7 +2729,7 @@ if (!is_android) { +@@ -2746,7 +2746,7 @@ if (!is_android) { "$root_out_dir/pyproto/", ] @@ -99,7 +98,7 @@ data += [ "$root_out_dir/chrome_100_percent.pak", "$root_out_dir/chrome_200_percent.pak", -@@ -3377,7 +3377,7 @@ test("unit_tests") { +@@ -3411,7 +3411,7 @@ test("unit_tests") { "$root_out_dir/resources.pak", ] } @@ -108,7 +107,7 @@ data += [ "$root_out_dir/chrome_200_percent.pak" ] } -@@ -4060,7 +4060,7 @@ test("unit_tests") { +@@ -4111,7 +4111,7 @@ test("unit_tests") { "//ui/wm", ] } @@ -117,16 +116,16 @@ sources += [ "../browser/password_manager/native_backend_kwallet_x_unittest.cc", "../browser/shell_integration_linux_unittest.cc", -@@ -4080,7 +4080,7 @@ test("unit_tests") { +@@ -4131,7 +4131,7 @@ test("unit_tests") { if (use_gio) { deps += [ "//build/linux/libgio" ] } - if (!is_chromeos && !use_ozone && is_linux) { + if (!is_chromeos && !use_ozone && (is_linux || is_bsd)) { - deps += [ "//chrome/browser/ui/libgtk2ui" ] - } - -@@ -4357,18 +4357,18 @@ test("unit_tests") { + if (use_gtk3) { + deps += [ "//chrome/browser/ui/libgtkui:libgtk3ui" ] + } else { +@@ -4424,18 +4424,18 @@ test("unit_tests") { "//components/os_crypt:gnome_keyring_direct", ] } @@ -148,7 +147,7 @@ ldflags = [ "-Wl,--strip-debug" ] } if (is_mac) { -@@ -4869,7 +4869,7 @@ if (safe_browsing_mode == 1 && is_mac) { +@@ -4941,7 +4941,7 @@ if (safe_browsing_mode == 1 && is_mac) { } } @@ -157,7 +156,7 @@ # TODO(609855): Make this compile on Android and run on the bots. test("chrome_app_unittests") { sources = [ -@@ -4895,7 +4895,7 @@ if (!is_android) { +@@ -4967,7 +4967,7 @@ if (!is_android) { } } diff --git a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc index 3d8c04857888..6df160f6f866 100644 --- a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc +++ b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc @@ -1,6 +1,6 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2016-05-11 19:02:17 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2017-01-26 00:49:10 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -90,6 +90,10 @@ +@@ -93,6 +93,10 @@ namespace { diff --git a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h index f43e8ff98f11..88da80693e5f 100644 --- a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h +++ b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h @@ -1,6 +1,6 @@ ---- chrome/test/base/testing_browser_process.h.orig 2016-05-11 19:02:17 UTC +--- chrome/test/base/testing_browser_process.h.orig 2017-01-26 00:49:10 UTC +++ chrome/test/base/testing_browser_process.h -@@ -104,8 +104,8 @@ class TestingBrowserProcess : public Bro +@@ -107,8 +107,8 @@ class TestingBrowserProcess : public Bro DownloadStatusUpdater* download_status_updater() override; DownloadRequestLimiter* download_request_limiter() override; diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc index 8da10e9e5da4..ae75d427af1b 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc @@ -1,4 +1,4 @@ ---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2016-03-25 13:04:46 UTC +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2017-01-26 00:49:10 UTC +++ chrome/test/chromedriver/chrome/chrome_finder.cc @@ -45,7 +45,7 @@ void GetApplicationDirs(std::vector<base installation_locations[i].Append(L"Chromium\\Application")); diff --git a/www/chromium/files/patch-chromecast_BUILD.gn b/www/chromium/files/patch-chromecast_BUILD.gn index ea5c1f16f9a9..d013abada579 100644 --- a/www/chromium/files/patch-chromecast_BUILD.gn +++ b/www/chromium/files/patch-chromecast_BUILD.gn @@ -1,8 +1,8 @@ ---- chromecast/BUILD.gn.orig 2016-08-03 22:02:15.000000000 +0300 -+++ chromecast/BUILD.gn 2016-09-03 01:38:51.775473000 +0300 -@@ -44,7 +44,7 @@ - "//ui/base:ui_base_unittests", - ] +--- chromecast/BUILD.gn.orig 2017-01-26 00:49:11 UTC ++++ chromecast/BUILD.gn +@@ -51,7 +51,7 @@ cast_test_group("cast_tests") { + tests += [ "//gpu:gpu_unittests" ] + } - if (is_linux) { + if (is_linux || is_bsd) { diff --git a/www/chromium/files/patch-chromecast_browser_BUILD.gn b/www/chromium/files/patch-chromecast_browser_BUILD.gn index e8628074f2a0..b45e89c695d2 100644 --- a/www/chromium/files/patch-chromecast_browser_BUILD.gn +++ b/www/chromium/files/patch-chromecast_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chromecast/browser/BUILD.gn.orig 2016-08-03 22:02:15.000000000 +0300 -+++ chromecast/browser/BUILD.gn 2016-09-03 01:39:34.973425000 +0300 -@@ -114,7 +114,7 @@ +--- chromecast/browser/BUILD.gn.orig 2017-01-26 00:49:11 UTC ++++ chromecast/browser/BUILD.gn +@@ -120,7 +120,7 @@ source_set("browser") { "//ui/gl", ] diff --git a/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn index 49578dba45a2..6634a76c3bc2 100644 --- a/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn +++ b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn @@ -1,6 +1,6 @@ ---- chromecast/browser/metrics/BUILD.gn.orig 2016-08-03 22:02:15.000000000 +0300 -+++ chromecast/browser/metrics/BUILD.gn 2016-09-03 01:39:05.920888000 +0300 -@@ -26,7 +26,7 @@ +--- chromecast/browser/metrics/BUILD.gn.orig 2017-01-26 00:49:11 UTC ++++ chromecast/browser/metrics/BUILD.gn +@@ -26,7 +26,7 @@ source_set("metrics") { "//content/public/common", ] diff --git a/www/chromium/files/patch-chromecast_crash_BUILD.gn b/www/chromium/files/patch-chromecast_crash_BUILD.gn index 814b56bda4f9..584f3bcf2759 100644 --- a/www/chromium/files/patch-chromecast_crash_BUILD.gn +++ b/www/chromium/files/patch-chromecast_crash_BUILD.gn @@ -1,6 +1,6 @@ ---- chromecast/crash/BUILD.gn.orig 2016-08-03 22:02:15.000000000 +0300 -+++ chromecast/crash/BUILD.gn 2016-09-03 01:38:37.198322000 +0300 -@@ -48,7 +48,7 @@ +--- chromecast/crash/BUILD.gn.orig 2017-01-26 00:49:11 UTC ++++ chromecast/crash/BUILD.gn +@@ -78,7 +78,7 @@ source_set("test_support") { ] } diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn index 9509a36bf05d..dbfa31446961 100644 --- a/www/chromium/files/patch-components_BUILD.gn +++ b/www/chromium/files/patch-components_BUILD.gn @@ -1,6 +1,6 @@ ---- components/BUILD.gn.orig 2016-12-01 23:02:10 UTC +--- components/BUILD.gn.orig 2017-01-26 00:49:11 UTC +++ components/BUILD.gn -@@ -174,8 +174,8 @@ test("components_unittests") { +@@ -168,8 +168,8 @@ test("components_unittests") { "//components/certificate_reporting:unit_tests", "//components/certificate_transparency:unit_tests", "//components/contextual_search:unit_tests", @@ -9,5 +9,5 @@ + #"//components/crash/content/app:unit_tests", + #"//components/crash/core/common:unit_tests", "//components/data_reduction_proxy/content/browser:unit_tests", - "//components/data_use_measurement/content:unit_tests", - "//components/display_compositor:unit_tests", + "//components/data_reduction_proxy/core/browser:unit_tests", + "//components/data_reduction_proxy/core/common:unit_tests", diff --git a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc index 2d95a693b397..4fe803388681 100644 --- a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc +++ b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc @@ -1,6 +1,6 @@ ---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2016-05-11 19:02:18 UTC +--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2017-01-26 00:49:11 UTC +++ components/autofill/content/renderer/password_form_conversion_utils.cc -@@ -26,7 +26,11 @@ +@@ -28,7 +28,11 @@ #include "third_party/WebKit/public/web/WebFormControlElement.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebInputElement.h" diff --git a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc index b582c3179c59..fae97a7055b0 100644 --- a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc +++ b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc @@ -1,6 +1,6 @@ ---- components/content_settings/core/browser/website_settings_registry.cc.orig 2016-10-06 04:02:16.000000000 +0300 -+++ components/content_settings/core/browser/website_settings_registry.cc 2016-10-13 13:04:35.828985000 +0300 -@@ -88,6 +88,9 @@ +--- components/content_settings/core/browser/website_settings_registry.cc.orig 2017-01-26 00:49:11 UTC ++++ components/content_settings/core/browser/website_settings_registry.cc +@@ -88,6 +88,9 @@ const WebsiteSettingsInfo* WebsiteSettin // doesn't allow the settings to be managed in the same way. See // crbug.com/642184. sync_status = WebsiteSettingsInfo::UNSYNCABLE; diff --git a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h index 0a4a11c988bb..e32baa3ae980 100644 --- a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h +++ b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h @@ -1,6 +1,6 @@ ---- components/content_settings/core/browser/website_settings_registry.h.orig 2016-10-06 04:02:16.000000000 +0300 -+++ components/content_settings/core/browser/website_settings_registry.h 2016-10-13 13:24:49.647706000 +0300 -@@ -36,10 +36,11 @@ +--- components/content_settings/core/browser/website_settings_registry.h.orig 2017-01-26 00:49:11 UTC ++++ components/content_settings/core/browser/website_settings_registry.h +@@ -36,10 +36,11 @@ class WebsiteSettingsRegistry { PLATFORM_MAC = 1 << 3, PLATFORM_ANDROID = 1 << 4, PLATFORM_IOS = 1 << 5, diff --git a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc index fd7f887e36f4..39862fcbbd5f 100644 --- a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc +++ b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc @@ -1,4 +1,4 @@ ---- components/cookie_config/cookie_store_util.cc.orig 2016-03-25 13:04:47 UTC +--- components/cookie_config/cookie_store_util.cc.orig 2017-01-26 00:49:11 UTC +++ components/cookie_config/cookie_store_util.cc @@ -11,7 +11,7 @@ diff --git a/www/chromium/files/patch-components_crash_content_app_BUILD.gn b/www/chromium/files/patch-components_crash_content_app_BUILD.gn index 80ee737af770..fd8041fc088c 100644 --- a/www/chromium/files/patch-components_crash_content_app_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_app_BUILD.gn @@ -1,8 +1,8 @@ ---- components/crash/content/app/BUILD.gn.orig 2016-08-03 22:02:16.000000000 +0300 -+++ components/crash/content/app/BUILD.gn 2016-09-18 01:39:59.921593000 +0300 -@@ -141,7 +141,7 @@ - - #'../breakpad/breakpad.gyp:breakpad_sender', TODO(GYP) +--- components/crash/content/app/BUILD.gn.orig 2017-01-26 00:49:11 UTC ++++ components/crash/content/app/BUILD.gn +@@ -145,7 +145,7 @@ source_set("app_non_mac_win") { + "//breakpad:breakpad_handler", + "//sandbox", ] - } else if (is_posix && !is_ios) { + } else if (is_posix && !is_ios && !is_bsd) { diff --git a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn index d503488ecadd..0c6ebe11be6c 100644 --- a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- components/crash/content/browser/BUILD.gn.orig 2016-08-03 22:02:16.000000000 +0300 -+++ components/crash/content/browser/BUILD.gn 2016-09-13 13:38:48.133784000 +0300 -@@ -16,7 +16,7 @@ +--- components/crash/content/browser/BUILD.gn.orig 2017-01-26 00:49:11 UTC ++++ components/crash/content/browser/BUILD.gn +@@ -16,7 +16,7 @@ source_set("browser") { deps = [ "//base", @@ -9,7 +9,7 @@ "//components/crash/content/app", "//content/public/browser", "//content/public/common", -@@ -39,7 +39,7 @@ +@@ -39,7 +39,7 @@ source_set("browser") { # This is not in the GYP build but this target includes breakpad client # headers, so add the dependency here. if (is_posix && !is_ios) { diff --git a/www/chromium/files/patch-components_drive_drive__api__util.cc b/www/chromium/files/patch-components_drive_drive__api__util.cc index 4193ff87362e..c3999538542d 100644 --- a/www/chromium/files/patch-components_drive_drive__api__util.cc +++ b/www/chromium/files/patch-components_drive_drive__api__util.cc @@ -1,4 +1,4 @@ ---- components/drive/drive_api_util.cc.orig 2016-05-11 19:02:18 UTC +--- components/drive/drive_api_util.cc.orig 2017-01-26 00:49:11 UTC +++ components/drive/drive_api_util.cc @@ -22,7 +22,11 @@ #include "google_apis/drive/drive_api_parser.h" diff --git a/www/chromium/files/patch-components_feedback_anonymizer__tool.cc b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc index 22d9349003ed..910d8b203f03 100644 --- a/www/chromium/files/patch-components_feedback_anonymizer__tool.cc +++ b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc @@ -1,6 +1,6 @@ ---- components/feedback/anonymizer_tool.cc.orig 2016-05-11 19:02:18 UTC +--- components/feedback/anonymizer_tool.cc.orig 2017-01-26 00:49:11 UTC +++ components/feedback/anonymizer_tool.cc -@@ -9,7 +9,11 @@ +@@ -10,7 +10,11 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc index a13b0eded890..e7f7e57bd1cb 100644 --- a/www/chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2016-03-25 13:04:47 UTC +--- components/flags_ui/flags_state.cc.orig 2017-01-26 00:49:11 UTC +++ components/flags_ui/flags_state.cc -@@ -450,7 +450,7 @@ int FlagsState::GetCurrentPlatform() { +@@ -544,7 +544,7 @@ int FlagsState::GetCurrentPlatform() { return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client.h b/www/chromium/files/patch-components_gcm__driver_gcm__client.h index 17062cd1c53f..2a956226585b 100644 --- a/www/chromium/files/patch-components_gcm__driver_gcm__client.h +++ b/www/chromium/files/patch-components_gcm__driver_gcm__client.h @@ -1,6 +1,6 @@ ---- components/gcm_driver/gcm_client.h.orig 2016-10-06 04:02:16.000000000 +0300 -+++ components/gcm_driver/gcm_client.h 2016-10-13 13:05:38.414560000 +0300 -@@ -80,6 +80,7 @@ +--- components/gcm_driver/gcm_client.h.orig 2017-01-26 00:49:11 UTC ++++ components/gcm_driver/gcm_client.h +@@ -80,6 +80,7 @@ class GCMClient { PLATFORM_CROS, PLATFORM_IOS, PLATFORM_ANDROID, diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc index ac4326de1ecd..ebbc9da0dcf0 100644 --- a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc +++ b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc @@ -1,6 +1,6 @@ ---- components/gcm_driver/gcm_client_impl.cc.orig 2016-10-06 04:02:16.000000000 +0300 -+++ components/gcm_driver/gcm_client_impl.cc 2016-10-13 13:07:14.340338000 +0300 -@@ -137,6 +137,9 @@ +--- components/gcm_driver/gcm_client_impl.cc.orig 2017-01-26 00:49:11 UTC ++++ components/gcm_driver/gcm_client_impl.cc +@@ -136,6 +136,9 @@ void ToCheckinProtoVersion( case GCMClient::PLATFORM_CROS: platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS; break; diff --git a/www/chromium/files/patch-components_json__schema_json__schema__validator.cc b/www/chromium/files/patch-components_json__schema_json__schema__validator.cc index 48209be953f7..d13e247ed884 100644 --- a/www/chromium/files/patch-components_json__schema_json__schema__validator.cc +++ b/www/chromium/files/patch-components_json__schema_json__schema__validator.cc @@ -1,6 +1,6 @@ ---- components/json_schema/json_schema_validator.cc.orig 2016-05-11 19:02:18 UTC +--- components/json_schema/json_schema_validator.cc.orig 2017-01-26 00:49:11 UTC +++ components/json_schema/json_schema_validator.cc -@@ -20,7 +20,11 @@ +@@ -21,7 +21,11 @@ #include "base/strings/stringprintf.h" #include "base/values.h" #include "components/json_schema/json_schema_constants.h" diff --git a/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc b/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc index 997d5d4608ba..7b98beea47c2 100644 --- a/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc +++ b/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc @@ -1,4 +1,4 @@ ---- components/keyed_service/core/dependency_graph_unittest.cc.orig 2016-03-25 13:04:47 UTC +--- components/keyed_service/core/dependency_graph_unittest.cc.orig 2017-01-26 00:49:11 UTC +++ components/keyed_service/core/dependency_graph_unittest.cc @@ -9,7 +9,11 @@ #include "components/keyed_service/core/dependency_graph.h" diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn index 5abc2d922897..39be306d4d57 100644 --- a/www/chromium/files/patch-components_metrics_BUILD.gn +++ b/www/chromium/files/patch-components_metrics_BUILD.gn @@ -1,4 +1,4 @@ ---- components/metrics/BUILD.gn.orig 2016-12-12 20:38:32 UTC +--- components/metrics/BUILD.gn.orig 2017-01-26 00:49:12 UTC +++ components/metrics/BUILD.gn @@ -107,6 +107,13 @@ static_library("metrics") { if (is_win) { diff --git a/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc b/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc index e373e37dd590..6591eaadcf9c 100644 --- a/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc +++ b/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc @@ -1,4 +1,4 @@ ---- components/metrics/drive_metrics_provider_linux.cc.orig 2016-03-25 13:04:47 UTC +--- components/metrics/drive_metrics_provider_linux.cc.orig 2017-01-26 00:49:12 UTC +++ components/metrics/drive_metrics_provider_linux.cc @@ -4,7 +4,13 @@ diff --git a/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc b/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc index f20e81298569..5a68fbd6d304 100644 --- a/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc +++ b/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc @@ -1,4 +1,4 @@ ---- components/metrics/system_memory_stats_recorder_linux.cc.orig 2016-03-25 13:04:47 UTC +--- components/metrics/system_memory_stats_recorder_linux.cc.orig 2017-01-26 00:49:12 UTC +++ components/metrics/system_memory_stats_recorder_linux.cc @@ -30,6 +30,7 @@ namespace metrics { UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50) diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js index e4883026ab7e..701a28dd5753 100644 --- a/www/chromium/files/patch-components_neterror_resources_neterror.js +++ b/www/chromium/files/patch-components_neterror_resources_neterror.js @@ -1,6 +1,6 @@ ---- components/neterror/resources/neterror.js.orig 2016-05-11 19:02:18 UTC +--- components/neterror/resources/neterror.js.orig 2017-01-26 00:49:12 UTC +++ components/neterror/resources/neterror.js -@@ -153,7 +153,7 @@ function setUpCachedButton(buttonStrings +@@ -150,7 +150,7 @@ function setUpCachedButton(buttonStrings } var primaryControlOnLeft = true; diff --git a/www/chromium/files/patch-components_os__crypt_os__crypt.h b/www/chromium/files/patch-components_os__crypt_os__crypt.h index fb867c7f9c8f..5b6f69d220f5 100644 --- a/www/chromium/files/patch-components_os__crypt_os__crypt.h +++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h @@ -1,5 +1,5 @@ ---- components/os_crypt/os_crypt.h.orig 2016-10-06 04:02:17.000000000 +0300 -+++ components/os_crypt/os_crypt.h 2016-10-13 11:41:26.429931000 +0300 +--- components/os_crypt/os_crypt.h.orig 2017-01-26 00:49:12 UTC ++++ components/os_crypt/os_crypt.h @@ -13,7 +13,7 @@ #include "base/strings/string16.h" #include "build/build_config.h" diff --git a/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc b/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc index 7398305b47d8..9b1a3a9bf06d 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/import/csv_reader.cc.orig 2016-03-25 13:04:48 UTC +--- components/password_manager/core/browser/import/csv_reader.cc.orig 2017-01-26 00:49:12 UTC +++ components/password_manager/core/browser/import/csv_reader.cc @@ -9,7 +9,11 @@ #include "base/logging.h" diff --git a/www/chromium/files/patch-components_plugins_renderer_BUILD.gn b/www/chromium/files/patch-components_plugins_renderer_BUILD.gn index 7e829ee46e02..4430da175838 100644 --- a/www/chromium/files/patch-components_plugins_renderer_BUILD.gn +++ b/www/chromium/files/patch-components_plugins_renderer_BUILD.gn @@ -1,6 +1,6 @@ ---- components/plugins/renderer/BUILD.gn.orig 2016-08-03 22:02:16.000000000 +0300 -+++ components/plugins/renderer/BUILD.gn 2016-09-26 06:14:10.664010000 +0300 -@@ -25,6 +25,7 @@ +--- components/plugins/renderer/BUILD.gn.orig 2017-01-26 00:49:12 UTC ++++ components/plugins/renderer/BUILD.gn +@@ -19,6 +19,7 @@ static_library("renderer") { } deps = [ @@ -8,7 +8,7 @@ "//content/public/child", "//content/public/common", "//content/public/renderer", -@@ -33,6 +34,5 @@ +@@ -27,6 +28,5 @@ static_library("renderer") { "//third_party/WebKit/public:blink", "//third_party/re2", "//ui/base", diff --git a/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc b/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc index aaeffeb94cc7..d02d0efc363f 100644 --- a/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc +++ b/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc @@ -1,4 +1,4 @@ ---- components/plugins/renderer/plugin_placeholder.cc.orig 2016-03-25 13:04:48 UTC +--- components/plugins/renderer/plugin_placeholder.cc.orig 2017-01-26 00:49:12 UTC +++ components/plugins/renderer/plugin_placeholder.cc @@ -11,7 +11,11 @@ #include "gin/object_template_builder.h" diff --git a/www/chromium/files/patch-components_policy_BUILD.gn b/www/chromium/files/patch-components_policy_BUILD.gn index 98c06d244126..52ae6f3688b9 100644 --- a/www/chromium/files/patch-components_policy_BUILD.gn +++ b/www/chromium/files/patch-components_policy_BUILD.gn @@ -1,11 +1,19 @@ ---- components/policy/BUILD.gn.orig 2016-08-03 22:02:16.000000000 +0300 -+++ components/policy/BUILD.gn 2016-09-03 01:58:22.866259000 +0300 -@@ -141,7 +141,7 @@ - if (is_android) { +--- components/policy/BUILD.gn.orig 2017-01-26 00:49:12 UTC ++++ components/policy/BUILD.gn +@@ -14,6 +14,7 @@ import("//tools/grit/grit_rule.gni") + gen_policy_templates_common = true + gen_policy_templates_win = is_win + gen_policy_templates_linux = is_linux ++gen_policy_templates_bsd = is_bsd + gen_policy_templates_android = is_android + gen_policy_templates_mac = is_mac + +@@ -126,7 +127,7 @@ if (enable_configuration_policy) { outputs += policy_templates_android_outputs + defines += [ "gen_policy_templates_android" ] } -- if (is_linux) { -+ if (is_linux || is_bsd) { +- if (gen_policy_templates_linux) { ++ if (gen_policy_templates_linux || gen_policy_templates_bsd) { outputs += policy_templates_linux_outputs + defines += [ "gen_policy_templates_linux" ] } - if (is_mac) { diff --git a/www/chromium/files/patch-components_policy_core_common_schema.cc b/www/chromium/files/patch-components_policy_core_common_schema.cc index 4b47fa3d917e..920d9f9abcd0 100644 --- a/www/chromium/files/patch-components_policy_core_common_schema.cc +++ b/www/chromium/files/patch-components_policy_core_common_schema.cc @@ -1,4 +1,4 @@ ---- components/policy/core/common/schema.cc.orig 2016-05-11 19:02:18 UTC +--- components/policy/core/common/schema.cc.orig 2017-01-26 00:49:12 UTC +++ components/policy/core/common/schema.cc @@ -21,7 +21,11 @@ #include "components/json_schema/json_schema_constants.h" diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json index 6f1f41cc53cd..6a414dce8243 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,6 +1,6 @@ ---- components/policy/resources/policy_templates.json.orig 2016-10-06 04:02:17.000000000 +0300 -+++ components/policy/resources/policy_templates.json 2016-10-17 00:01:03.979810000 +0300 -@@ -909,7 +909,7 @@ +--- components/policy/resources/policy_templates.json.orig 2017-01-26 00:49:12 UTC ++++ components/policy/resources/policy_templates.json +@@ -932,7 +932,7 @@ 'name': 'RemoteAccessHostMatchUsername', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -9,7 +9,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -1930,7 +1930,7 @@ +@@ -2065,7 +2065,7 @@ 'name': 'GSSAPILibraryName', 'type': 'string', 'schema': { 'type': 'string' }, @@ -18,7 +18,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -4601,7 +4601,7 @@ +@@ -4742,7 +4742,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -27,7 +27,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -5449,7 +5449,7 @@ +@@ -5627,7 +5627,7 @@ 'name': 'BackgroundModeEnabled', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -36,7 +36,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -5974,7 +5974,7 @@ +@@ -6156,7 +6156,7 @@ 'name': 'FullscreenAllowed', 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py index 01be865f8ec0..107ab2fe51f9 100644 --- a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,6 +1,6 @@ ---- components/policy/tools/generate_policy_source.py.orig 2016-08-03 22:02:16.000000000 +0300 -+++ components/policy/tools/generate_policy_source.py 2016-09-20 17:13:04.971596000 +0300 -@@ -102,7 +102,7 @@ +--- components/policy/tools/generate_policy_source.py.orig 2017-01-26 00:49:12 UTC ++++ components/policy/tools/generate_policy_source.py +@@ -102,7 +102,7 @@ class PolicyDetails: if platform.startswith('chrome.'): platform_sub = platform[7:] if platform_sub == '*': diff --git a/www/chromium/files/patch-components_storage__monitor_BUILD.gn b/www/chromium/files/patch-components_storage__monitor_BUILD.gn index 1a2fd13a18d1..1f107d4b46ae 100644 --- a/www/chromium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/chromium/files/patch-components_storage__monitor_BUILD.gn @@ -1,4 +1,4 @@ ---- components/storage_monitor/BUILD.gn.orig 2016-12-01 23:02:12 UTC +--- components/storage_monitor/BUILD.gn.orig 2017-01-26 00:49:12 UTC +++ components/storage_monitor/BUILD.gn @@ -65,6 +65,21 @@ static_library("storage_monitor") { ] diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc b/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc index 2c9a459f3900..ae1f8a307815 100644 --- a/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc +++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc @@ -1,4 +1,4 @@ ---- components/storage_monitor/storage_monitor.cc.orig 2016-12-01 23:02:12 UTC +--- components/storage_monitor/storage_monitor.cc.orig 2017-01-26 00:49:12 UTC +++ components/storage_monitor/storage_monitor.cc @@ -85,6 +85,7 @@ std::vector<StorageInfo> StorageMonitor: diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc index c329b4f9f87d..497dc7222b63 100644 --- a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc +++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc @@ -1,4 +1,4 @@ ---- components/storage_monitor/storage_monitor_freebsd.cc.orig 2016-05-20 17:18:26 UTC +--- components/storage_monitor/storage_monitor_freebsd.cc.orig 2017-01-29 22:59:23 UTC +++ components/storage_monitor/storage_monitor_freebsd.cc @@ -0,0 +1,101 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h index cd4b7fe73716..d61c0604f0dd 100644 --- a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h +++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h @@ -1,5 +1,5 @@ ---- components/storage_monitor/storage_monitor_freebsd.h.orig 2016-08-04 10:46:30.556442000 -0400 -+++ components/storage_monitor/storage_monitor_freebsd.h 2016-08-04 14:57:59.255434000 -0400 +--- components/storage_monitor/storage_monitor_freebsd.h.orig 2017-01-29 22:59:23 UTC ++++ components/storage_monitor/storage_monitor_freebsd.h @@ -0,0 +1,45 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be diff --git a/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc b/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc index eb0437e3c6fa..73fc8640d3d9 100644 --- a/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc +++ b/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc @@ -1,5 +1,5 @@ ---- components/sync/base/get_session_name_linux.cc.orig 2016-10-06 04:02:17.000000000 +0300 -+++ components/sync/base/get_session_name_linux.cc 2016-10-13 13:40:16.075193000 +0300 +--- components/sync/base/get_session_name_linux.cc.orig 2017-01-26 00:49:12 UTC ++++ components/sync/base/get_session_name_linux.cc @@ -4,7 +4,7 @@ #include "components/sync/base/get_session_name_linux.h" @@ -9,7 +9,7 @@ #include <unistd.h> // for gethostname() #include "base/linux_util.h" -@@ -13,8 +13,8 @@ +@@ -13,8 +13,8 @@ namespace syncer { namespace internal { std::string GetHostname() { diff --git a/www/chromium/files/patch-components_update__client_update__query__params.cc b/www/chromium/files/patch-components_update__client_update__query__params.cc index 6f242082134f..b5e35312e2e3 100644 --- a/www/chromium/files/patch-components_update__client_update__query__params.cc +++ b/www/chromium/files/patch-components_update__client_update__query__params.cc @@ -1,4 +1,4 @@ ---- components/update_client/update_query_params.cc.orig 2016-05-11 19:02:20 UTC +--- components/update_client/update_query_params.cc.orig 2017-01-26 00:49:13 UTC +++ components/update_client/update_query_params.cc @@ -31,6 +31,8 @@ const char kOs[] = "linux"; diff --git a/www/chromium/files/patch-components_url__formatter_url__formatter.cc b/www/chromium/files/patch-components_url__formatter_url__formatter.cc deleted file mode 100644 index 0fc915b95e99..000000000000 --- a/www/chromium/files/patch-components_url__formatter_url__formatter.cc +++ /dev/null @@ -1,33 +0,0 @@ -https://chromium.googlesource.com/chromium/src.git/+/424584b4984bde7c831f42e9fb47f1ad583a1c46%5E%21/ - ---- components/url_formatter/url_formatter.cc.orig 2016-08-03 19:02:17 UTC -+++ components/url_formatter/url_formatter.cc -@@ -429,9 +429,9 @@ void IDNSpoofChecker::SetAllowedUnicodeS - // section at - // http://www.unicode.org/Public/security/latest/xidmodifications.txt) are - // are added to the allowed set. The list has to be updated when a new -- // version of Unicode is released. The current version is 8.0.0 and ICU 58 -- // will have Unicode 9.0 data. --#if U_ICU_VERSION_MAJOR_NUM < 58 -+ // version of Unicode is released. The current version is 9.0.0 and ICU 60 -+ // will have Unicode 10.0 data. -+#if U_ICU_VERSION_MAJOR_NUM < 60 - const icu::UnicodeSet aspirational_scripts( - icu::UnicodeString( - // Unified Canadian Syllabics -@@ -445,13 +445,13 @@ void IDNSpoofChecker::SetAllowedUnicodeS - // Yi - "\\uA000-\\uA48C" - // Miao -- "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7F" -+ "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7E" - "\\U00016F8F-\\U00016F9F]", - -1, US_INV), - *status); - allowed_set.addAll(aspirational_scripts); - #else --#error "Update aspirational_scripts per Unicode 9.0" -+#error "Update aspirational_scripts per Unicode 10.0" - #endif - - // U+0338 is included in the recommended set, while U+05F4 and U+2027 are in diff --git a/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc b/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc index 31765a2908be..f65de4651414 100644 --- a/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc +++ b/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc @@ -1,7 +1,7 @@ ---- components/url_matcher/regex_set_matcher.cc.orig 2016-03-25 13:04:48 UTC +--- components/url_matcher/regex_set_matcher.cc.orig 2017-01-26 00:49:13 UTC +++ components/url_matcher/regex_set_matcher.cc @@ -10,8 +10,13 @@ - #include "base/stl_util.h" + #include "base/memory/ptr_util.h" #include "base/strings/string_util.h" #include "components/url_matcher/substring_set_matcher.h" +#if defined(OS_BSD) diff --git a/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc b/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc index 9ec695e2875c..e6c58605db3e 100644 --- a/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc +++ b/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc @@ -1,6 +1,6 @@ ---- components/url_matcher/url_matcher_factory.cc.orig 2016-05-11 19:02:20 UTC +--- components/url_matcher/url_matcher_factory.cc.orig 2017-01-26 00:49:13 UTC +++ components/url_matcher/url_matcher_factory.cc -@@ -15,7 +15,11 @@ +@@ -16,7 +16,11 @@ #include "base/values.h" #include "components/url_matcher/url_matcher_constants.h" #include "components/url_matcher/url_matcher_helpers.h" diff --git a/www/chromium/files/patch-components_variations_proto_study.proto b/www/chromium/files/patch-components_variations_proto_study.proto index 9da668a5d2c6..8000e1f9f2ed 100644 --- a/www/chromium/files/patch-components_variations_proto_study.proto +++ b/www/chromium/files/patch-components_variations_proto_study.proto @@ -1,6 +1,6 @@ ---- components/variations/proto/study.proto.orig 2016-10-06 04:02:18.000000000 +0300 -+++ components/variations/proto/study.proto 2016-10-13 13:02:20.586397000 +0300 -@@ -189,6 +189,7 @@ +--- components/variations/proto/study.proto.orig 2017-01-26 00:49:13 UTC ++++ components/variations/proto/study.proto +@@ -186,6 +186,7 @@ message Study { PLATFORM_CHROMEOS = 3; PLATFORM_ANDROID = 4; PLATFORM_IOS = 5; diff --git a/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc b/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc index 7d3e7366f66d..03cfbbe64562 100644 --- a/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc +++ b/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc @@ -1,6 +1,6 @@ ---- components/webcrypto/algorithms/test_helpers.cc.orig 2016-05-11 19:02:20 UTC +--- components/webcrypto/algorithms/test_helpers.cc.orig 2017-01-26 00:49:13 UTC +++ components/webcrypto/algorithms/test_helpers.cc -@@ -26,7 +26,11 @@ +@@ -25,7 +25,11 @@ #include "components/webcrypto/status.h" #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h" #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h" diff --git a/www/chromium/files/patch-content_app_BUILD.gn b/www/chromium/files/patch-content_app_BUILD.gn index 147079a5bb02..3567f9216db2 100644 --- a/www/chromium/files/patch-content_app_BUILD.gn +++ b/www/chromium/files/patch-content_app_BUILD.gn @@ -1,6 +1,6 @@ ---- content/app/BUILD.gn.orig 2016-10-06 04:02:18.000000000 +0300 -+++ content/app/BUILD.gn 2016-10-13 06:35:58.585406000 +0300 -@@ -66,7 +66,7 @@ +--- content/app/BUILD.gn.orig 2017-01-26 00:49:13 UTC ++++ content/app/BUILD.gn +@@ -68,7 +68,7 @@ template("implement_content_app") { ] } diff --git a/www/chromium/files/patch-content_app_content__main__runner.cc b/www/chromium/files/patch-content_app_content__main__runner.cc index c197a2277562..c04c4f6a6349 100644 --- a/www/chromium/files/patch-content_app_content__main__runner.cc +++ b/www/chromium/files/patch-content_app_content__main__runner.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner.cc.orig 2016-05-11 19:02:20 UTC +--- content/app/content_main_runner.cc.orig 2017-01-26 00:49:13 UTC +++ content/app/content_main_runner.cc -@@ -98,10 +98,10 @@ +@@ -97,10 +97,10 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -13,7 +13,7 @@ #include "content/zygote/zygote_main.h" #endif -@@ -273,7 +273,7 @@ struct MainFunction { +@@ -290,7 +290,7 @@ struct MainFunction { int (*function)(const MainFunctionParams&); }; @@ -22,16 +22,16 @@ // On platforms that use the zygote, we have a special subset of // subprocesses that are launched via the zygote. This function // fills in some process-launching bits around ZygoteMain(). -@@ -322,7 +322,7 @@ int RunZygote(const MainFunctionParams& +@@ -342,7 +342,7 @@ int RunZygote(const MainFunctionParams& NOTREACHED() << "Unknown zygote process type: " << process_type; return 1; } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - #if !defined(OS_IOS) static void RegisterMainThreadFactories() { -@@ -396,7 +396,7 @@ int RunNamedProcessTypeMain( + #if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD) +@@ -409,7 +409,7 @@ int RunNamedProcessTypeMain( } } diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index 4e74de61ca85..18db96dacbe0 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,19 +1,22 @@ ---- content/browser/BUILD.gn.orig 2016-12-01 23:02:12.000000000 +0000 -+++ content/browser/BUILD.gn 2016-12-14 14:34:21.739126000 +0000 -@@ -1399,6 +1399,12 @@ +--- content/browser/BUILD.gn.orig 2017-01-26 00:49:13 UTC ++++ content/browser/BUILD.gn +@@ -1421,10 +1421,11 @@ source_set("browser") { + "memory/memory_monitor_chromeos.cc", + "memory/memory_monitor_chromeos.h", ] - } - +- } else { +- sources += [ +- "memory/memory_monitor_linux.cc", +- "memory/memory_monitor_linux.h", ++ } ++ + if (is_bsd) { + sources -= [ + "download/quarantine_linux.cc", -+ ] -+ } -+ - if (!is_win) { - sources += [ - "file_descriptor_info_impl.cc", -@@ -1462,7 +1468,7 @@ + ] + } + +@@ -1490,7 +1491,7 @@ source_set("browser") { if (!is_ios) { defines += [ "ENABLE_SCREEN_CAPTURE=1" ] } @@ -22,7 +25,7 @@ sources += [ "media/capture/desktop_capture_device.cc", "media/capture/desktop_capture_device.h", -@@ -1629,7 +1635,7 @@ +@@ -1657,7 +1658,7 @@ source_set("browser") { } } @@ -31,7 +34,7 @@ deps += [ "//build/linux:fontconfig" ] } -@@ -1782,6 +1788,17 @@ +@@ -1807,6 +1808,17 @@ source_set("browser") { "//chromeos", "//chromeos:power_manager_proto", ] @@ -48,8 +51,8 @@ + ] } - if (use_aura) { -@@ -1899,11 +1916,11 @@ + if (enable_mojo_media) { +@@ -1930,11 +1942,11 @@ source_set("browser") { deps += [ "//third_party/flac" ] } diff --git a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h index 22f297d07c95..744e49478ee3 100644 --- a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h +++ b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h @@ -1,5 +1,5 @@ ---- content/browser/accessibility/browser_accessibility.h.orig 2016-05-25 15:01:01.000000000 -0400 -+++ content/browser/accessibility/browser_accessibility.h 2016-05-27 10:16:53.216804000 -0400 +--- content/browser/accessibility/browser_accessibility.h.orig 2017-01-26 00:49:13 UTC ++++ content/browser/accessibility/browser_accessibility.h @@ -38,7 +38,7 @@ #define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1 #endif @@ -9,12 +9,3 @@ #define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1 #endif -@@ -50,7 +50,7 @@ - class BrowserAccessibilityManager; - #if defined(OS_WIN) - class BrowserAccessibilityWin; --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11) -+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11) - class BrowserAccessibilityAuraLinux; - #endif - diff --git a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h index cc695ac82a22..72cd3111adf3 100644 --- a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h +++ b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h @@ -1,14 +1,14 @@ ---- content/browser/accessibility/browser_accessibility_manager.h.orig 2016-05-21 11:59:58 UTC +--- content/browser/accessibility/browser_accessibility_manager.h.orig 2017-01-26 00:49:13 UTC +++ content/browser/accessibility/browser_accessibility_manager.h -@@ -31,7 +31,7 @@ class BrowserAccessibilityManager; +@@ -34,7 +34,7 @@ class BrowserAccessibilityManager; class BrowserAccessibilityManagerAndroid; #elif defined(OS_WIN) class BrowserAccessibilityManagerWin; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11) +#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11) class BrowserAccessibilityManagerAuraLinux; - #endif - + #elif defined(OS_MACOSX) + class BrowserAccessibilityManagerMac; @@ -244,7 +244,7 @@ class CONTENT_EXPORT BrowserAccessibilit BrowserAccessibilityManagerAndroid* ToBrowserAccessibilityManagerAndroid(); #endif 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 574c2f933338..66adf8f98e26 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 2016-12-15 13:00:14.708308000 +0000 -+++ content/browser/browser_main_loop.cc 2016-12-15 13:05:18.516426000 +0000 -@@ -196,6 +196,10 @@ +--- content/browser/browser_main_loop.cc.orig 2017-01-26 00:49:13 UTC ++++ content/browser/browser_main_loop.cc +@@ -203,6 +203,10 @@ #include "gpu/vulkan/vulkan_implementation.h" #endif @@ -11,7 +11,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -204,7 +208,7 @@ +@@ -211,7 +215,7 @@ namespace content { namespace { @@ -20,7 +20,7 @@ void SetupSandbox(const base::CommandLine& parsed_command_line) { TRACE_EVENT0("startup", "SetupSandbox"); if (parsed_command_line.HasSwitch(switches::kNoZygote)) { -@@ -475,10 +479,15 @@ +@@ -482,10 +486,15 @@ void BrowserMainLoop::Init() { void BrowserMainLoop::EarlyInitialization() { TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); diff --git a/www/chromium/files/patch-content_browser_child__process__launcher.cc b/www/chromium/files/patch-content_browser_child__process__launcher.cc index 63e9da6bc853..a47b8f91538e 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher.cc +++ b/www/chromium/files/patch-content_browser_child__process__launcher.cc @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher.cc.orig 2016-12-12 21:01:52 UTC +--- content/browser/child_process_launcher.cc.orig 2017-01-26 00:49:13 UTC +++ content/browser/child_process_launcher.cc -@@ -258,7 +258,7 @@ void LaunchOnLauncherThread(const Notify +@@ -249,7 +249,7 @@ void LaunchOnLauncherThread(const Notify // We need to close the client end of the IPC channel to reliably detect // child termination. @@ -9,7 +9,7 @@ ZygoteHandle* zygote_handle = !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ? delegate->GetZygote() -@@ -276,7 +276,7 @@ void LaunchOnLauncherThread(const Notify +@@ -267,7 +267,7 @@ void LaunchOnLauncherThread(const Notify process = base::Process(handle); } else // Fall through to the normal posix case below when we're not zygoting. @@ -18,7 +18,7 @@ { // Convert FD mapping to FileHandleMappingVector base::FileHandleMappingVector fds_to_map = -@@ -367,7 +367,7 @@ void TerminateOnLauncherThread(ZygoteHan +@@ -358,7 +358,7 @@ void TerminateOnLauncherThread(ZygoteHan process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. #if defined(OS_POSIX) @@ -27,7 +27,7 @@ if (zygote) { // If the renderer was created via a zygote, we have to proxy the reaping // through the zygote process. -@@ -488,7 +488,7 @@ void ChildProcessLauncher::Launch( +@@ -475,7 +475,7 @@ void ChildProcessLauncher::Launch(Sandbo void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) { DCHECK(CalledOnValidThread()); @@ -36,7 +36,7 @@ if (zygote_) { termination_status_ = zygote_->GetTerminationStatus( process_.Handle(), known_dead, &exit_code_); -@@ -569,7 +569,7 @@ void ChildProcessLauncher::Notify(Zygote +@@ -549,7 +549,7 @@ void ChildProcessLauncher::Notify(Zygote mojo_child_token_, process_error_callback_); } diff --git a/www/chromium/files/patch-content_browser_device__sensors_data__fetcher__shared__memory.h b/www/chromium/files/patch-content_browser_device__sensors_data__fetcher__shared__memory.h index debb08cf2ffd..1f7c96d5c143 100644 --- a/www/chromium/files/patch-content_browser_device__sensors_data__fetcher__shared__memory.h +++ b/www/chromium/files/patch-content_browser_device__sensors_data__fetcher__shared__memory.h @@ -1,6 +1,6 @@ ---- content/browser/device_sensors/data_fetcher_shared_memory.h.orig 2016-10-06 04:02:18.000000000 +0300 -+++ content/browser/device_sensors/data_fetcher_shared_memory.h 2016-10-14 15:15:34.071484000 +0300 -@@ -45,7 +45,7 @@ +--- content/browser/device_sensors/data_fetcher_shared_memory.h.orig 2017-01-26 00:49:13 UTC ++++ content/browser/device_sensors/data_fetcher_shared_memory.h +@@ -45,7 +45,7 @@ class CONTENT_EXPORT DataFetcherSharedMe bool Start(ConsumerType consumer_type, void* buffer) override; bool Stop(ConsumerType consumer_type) override; diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc b/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc index a7d118ce785f..465303ad489e 100644 --- a/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc +++ b/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc @@ -1,6 +1,6 @@ ---- content/browser/devtools/protocol/color_picker.cc.orig 2016-07-20 22:03:24.000000000 +0300 -+++ content/browser/devtools/protocol/color_picker.cc 2016-08-18 02:35:16.268652000 +0300 -@@ -151,7 +151,7 @@ +--- content/browser/devtools/protocol/color_picker.cc.orig 2017-01-26 00:49:13 UTC ++++ content/browser/devtools/protocol/color_picker.cc +@@ -151,7 +151,7 @@ void ColorPicker::UpdateCursor() { // magnified projection only with centered hotspot. // Mac Retina requires cursor to be > 120px in order to render smoothly. diff --git a/www/chromium/files/patch-content_browser_download_base__file.cc b/www/chromium/files/patch-content_browser_download_base__file.cc index c18e4b6980c8..b6f55d137865 100644 --- a/www/chromium/files/patch-content_browser_download_base__file.cc +++ b/www/chromium/files/patch-content_browser_download_base__file.cc @@ -1,4 +1,4 @@ ---- content/browser/download/base_file.cc.orig 2016-12-12 21:09:50 UTC +--- content/browser/download/base_file.cc.orig 2017-01-26 00:49:13 UTC +++ content/browser/download/base_file.cc @@ -373,7 +373,7 @@ DownloadInterruptReason BaseFile::LogInt return reason; 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 index c0ca3352609e..6474e16759c9 100644 --- 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 @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2016-10-06 04:02:18.000000000 +0300 -+++ content/browser/gpu/gpu_data_manager_impl_private.cc 2016-10-14 17:58:04.977933000 +0300 -@@ -363,7 +363,7 @@ +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2017-01-26 00:49:13 UTC ++++ content/browser/gpu/gpu_data_manager_impl_private.cc +@@ -376,7 +376,7 @@ bool GpuDataManagerImplPrivate::GpuAcces // 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. @@ -9,7 +9,7 @@ if (reason) { *reason = "All GPU features are blacklisted."; } -@@ -486,8 +486,10 @@ +@@ -493,8 +493,10 @@ void GpuDataManagerImplPrivate::SetGLStr gpu_info.gl_renderer = gl_renderer; gpu_info.gl_version = gl_version; @@ -20,7 +20,7 @@ UpdateGpuInfo(gpu_info); UpdateGpuSwitchingManager(gpu_info); -@@ -542,10 +544,12 @@ +@@ -549,10 +551,12 @@ void GpuDataManagerImplPrivate::Initiali // Skip collecting the basic driver info if SetGpuInfo() is already called. if (IsCompleteGpuInfoAvailable()) { gpu_info = gpu_info_; @@ -33,7 +33,7 @@ } if (command_line->HasSwitch(switches::kGpuTestingVendorId) && -@@ -657,7 +661,9 @@ +@@ -664,7 +668,9 @@ void GpuDataManagerImplPrivate::UpdateGp return; bool was_info_available = IsCompleteGpuInfoAvailable(); 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 index 6235fe32c7a6..d519fea68ea4 100644 --- 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 @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2016-07-20 22:03:24.000000000 +0300 -+++ content/browser/gpu/gpu_data_manager_impl_private.h 2016-08-18 02:42:16.971805000 +0300 -@@ -154,7 +154,7 @@ +--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2017-01-26 00:49:13 UTC ++++ content/browser/gpu/gpu_data_manager_impl_private.h +@@ -154,7 +154,7 @@ class CONTENT_EXPORT GpuDataManagerImplP UnblockOtherDomainFrom3DAPIs); FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest, UnblockThisDomainFrom3DAPIs); diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc b/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc index c48819c1be8f..af37f2d0ffe4 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc @@ -1,7 +1,7 @@ ---- content/browser/gpu/gpu_internals_ui.cc.orig 2016-07-22 00:06:54.000000000 -0400 -+++ content/browser/gpu/gpu_internals_ui.cc 2016-08-03 12:29:59.399353000 -0400 -@@ -39,7 +39,7 @@ - #include "third_party/angle/src/common/version.h" +--- content/browser/gpu/gpu_internals_ui.cc.orig 2017-01-26 00:49:13 UTC ++++ content/browser/gpu/gpu_internals_ui.cc +@@ -42,7 +42,7 @@ + #include "third_party/skia/include/core/SkMilestone.h" #include "ui/gl/gpu_switching_manager.h" -#if defined(OS_LINUX) && defined(USE_X11) @@ -9,7 +9,7 @@ #include <X11/Xlib.h> #endif #if defined(OS_WIN) -@@ -47,7 +47,7 @@ +@@ -50,7 +50,7 @@ #include "ui/gfx/win/physical_size.h" #endif @@ -18,7 +18,7 @@ #include "ui/base/x/x11_util.h" // nogncheck #include "ui/gfx/x/x11_atom_cache.h" // nogncheck #endif -@@ -200,7 +200,7 @@ +@@ -206,7 +206,7 @@ base::DictionaryValue* GpuInfoAsDictiona gpu_info.gl_ws_version)); basic_info->Append(NewDescriptionValuePair("Window system binding extensions", gpu_info.gl_ws_extensions)); diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc index cde1950a4264..6744088fbaa3 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2016-07-20 22:03:24.000000000 +0300 -+++ content/browser/gpu/gpu_process_host.cc 2016-08-18 02:45:06.533983000 +0300 -@@ -968,7 +968,7 @@ +--- content/browser/gpu/gpu_process_host.cc.orig 2017-01-26 00:49:13 UTC ++++ content/browser/gpu/gpu_process_host.cc +@@ -984,7 +984,7 @@ bool GpuProcessHost::LaunchGpuProcess(gp base::CommandLine* cmd_line = new base::CommandLine(base::CommandLine::NO_PROGRAM); #else diff --git a/www/chromium/files/patch-content_browser_media_media__internals.cc b/www/chromium/files/patch-content_browser_media_media__internals.cc index 4794f3ad1570..02526c0b5c7c 100644 --- a/www/chromium/files/patch-content_browser_media_media__internals.cc +++ b/www/chromium/files/patch-content_browser_media_media__internals.cc @@ -1,6 +1,6 @@ ---- content/browser/media/media_internals.cc.orig 2016-10-06 04:02:18.000000000 +0300 -+++ content/browser/media/media_internals.cc 2016-10-13 06:53:50.938946000 +0300 -@@ -724,7 +724,7 @@ +--- content/browser/media/media_internals.cc.orig 2017-01-26 00:49:13 UTC ++++ content/browser/media/media_internals.cc +@@ -755,7 +755,7 @@ void MediaInternals::UpdateVideoCaptureD device_dict->SetString("name", descriptor.GetNameAndModel()); device_dict->Set("formats", format_list); #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ diff --git a/www/chromium/files/patch-content_browser_memory__memory__monitor.cc b/www/chromium/files/patch-content_browser_memory__memory__monitor.cc deleted file mode 100644 index 2dff03e6dcf0..000000000000 --- a/www/chromium/files/patch-content_browser_memory__memory__monitor.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- content/browser/memory/memory_monitor.cc.orig 2016-12-01 23:02:12.000000000 +0000 -+++ content/browser/memory/memory_monitor.cc 2016-12-14 18:20:00.515155000 +0000 -@@ -8,6 +8,7 @@ - - namespace content { - -+#if !defined(OS_FREEBSD) - // static - MemoryMonitorDelegate* MemoryMonitorDelegate::GetInstance() { - return base::Singleton< -@@ -21,5 +22,6 @@ - base::SystemMemoryInfoKB* mem_info) { - base::GetSystemMemoryInfo(mem_info); - } -+#endif // !defined(OS_FREEBSD) - - } // namespace content diff --git a/www/chromium/files/patch-content_browser_memory__memory__monitor__linux.cc b/www/chromium/files/patch-content_browser_memory__memory__monitor__linux.cc deleted file mode 100644 index 91d697a9baeb..000000000000 --- a/www/chromium/files/patch-content_browser_memory__memory__monitor__linux.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- content/browser/memory/memory_monitor_linux.cc.orig 2016-12-01 23:02:12.000000000 +0000 -+++ content/browser/memory/memory_monitor_linux.cc 2016-12-14 18:23:30.803202000 +0000 -@@ -11,6 +11,7 @@ - - namespace { - -+#if !defined(OS_FREEBSD) - // The number of bits to shift to convert KiB to MiB. - const int kShiftKiBtoMiB = 10; - -@@ -48,5 +49,8 @@ - std::unique_ptr<MemoryMonitor> CreateMemoryMonitor() { - return MemoryMonitorLinux::Create(MemoryMonitorDelegate::GetInstance()); - } -+#endif // !defined(OS_FREEBSD) -+ -+} - - } // namespace content diff --git a/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc b/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc new file mode 100644 index 000000000000..7f62dc82e2a4 --- /dev/null +++ b/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc @@ -0,0 +1,15 @@ +--- content/browser/memory/memory_coordinator_impl.cc.orig 2017-01-26 00:49:13 UTC ++++ content/browser/memory/memory_coordinator_impl.cc +@@ -116,8 +116,12 @@ void RecordMetricsOnStateChange(base::Me + struct MemoryCoordinatorSingletonTraits + : public base::LeakySingletonTraits<MemoryCoordinator> { + static MemoryCoordinator* New() { ++#if defined(OS_BSD) ++ return NULL; ++#else + return new MemoryCoordinatorImpl(base::ThreadTaskRunnerHandle::Get(), + CreateMemoryMonitor()); ++#endif + } + }; + diff --git a/www/chromium/files/patch-content_browser_memory_memory__monitor.cc b/www/chromium/files/patch-content_browser_memory_memory__monitor.cc new file mode 100644 index 000000000000..a3b34ec66468 --- /dev/null +++ b/www/chromium/files/patch-content_browser_memory_memory__monitor.cc @@ -0,0 +1,21 @@ +--- content/browser/memory/memory_monitor.cc.orig 2017-01-26 00:49:13 UTC ++++ content/browser/memory/memory_monitor.cc +@@ -8,6 +8,7 @@ + + namespace content { + ++#if !defined(OS_FREEBSD) + // static + MemoryMonitorDelegate* MemoryMonitorDelegate::GetInstance() { + return base::Singleton< +@@ -21,8 +22,9 @@ void MemoryMonitorDelegate::GetSystemMem + base::SystemMemoryInfoKB* mem_info) { + base::GetSystemMemoryInfo(mem_info); + } ++#endif // !defined(OS_FREEBSD) + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) && !defined(OS_FREEBSD) + // TODO(bashi,bcwhite): Remove when memory monitor for mac is available. + std::unique_ptr<MemoryMonitor> CreateMemoryMonitor() { + NOTREACHED(); 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 index c291a4ddaeb3..6436c1bf674e 100644 --- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc +++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc @@ -1,24 +1,27 @@ ---- content/browser/ppapi_plugin_process_host.cc.orig 2016-07-20 22:03:24.000000000 +0300 -+++ content/browser/ppapi_plugin_process_host.cc 2016-08-18 02:36:09.470007000 +0300 -@@ -49,7 +49,7 @@ +--- content/browser/ppapi_plugin_process_host.cc.orig 2017-01-26 00:49:13 UTC ++++ content/browser/ppapi_plugin_process_host.cc +@@ -53,9 +53,9 @@ namespace content { -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) ZygoteHandle g_ppapi_zygote; - #endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) -@@ -114,7 +114,7 @@ + // NOTE: changes to this class need to be reviewed by the security team. + class PpapiPluginSandboxedProcessLauncherDelegate +@@ -109,7 +109,7 @@ class PpapiPluginSandboxedProcessLaunche + return true; } - #elif defined(OS_POSIX) --#if !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) +-#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(); -@@ -214,7 +214,7 @@ +@@ -203,13 +203,13 @@ PpapiPluginProcessHost* PpapiPluginProce return NULL; } @@ -27,7 +30,14 @@ // static void PpapiPluginProcessHost::EarlyZygoteLaunch() { DCHECK(!g_ppapi_zygote); -@@ -377,7 +377,7 @@ + g_ppapi_zygote = CreateZygote(); + } +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + // static + void PpapiPluginProcessHost::DidCreateOutOfProcessInstance( +@@ -361,7 +361,7 @@ bool PpapiPluginProcessHost::Init(const base::CommandLine::StringType plugin_launcher = browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); 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 index 5f7225b53fbe..2c8c1f9acd41 100644 --- 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 @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2016-07-20 22:03:24.000000000 +0300 -+++ content/browser/renderer_host/render_process_host_impl.cc 2016-08-18 02:32:43.439813000 +0300 -@@ -359,7 +359,7 @@ +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2017-01-26 00:49:13 UTC ++++ content/browser/renderer_host/render_process_host_impl.cc +@@ -368,11 +368,11 @@ SiteProcessMap* GetSiteProcessMapForBrow return map; } @@ -9,16 +9,21 @@ // This static member variable holds the zygote communication information for // the renderer. ZygoteHandle g_render_zygote; -@@ -392,7 +392,7 @@ +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + // NOTE: changes to this class need to be reviewed by the security team. + class RendererSandboxedProcessLauncherDelegate +@@ -395,7 +395,7 @@ class RendererSandboxedProcessLauncherDe + return GetContentClient()->browser()->PreSpawnRenderer(policy); } - #elif defined(OS_POSIX) --#if !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) +-#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(); -@@ -514,7 +514,7 @@ +@@ -635,7 +635,7 @@ void RenderProcessHost::SetMaxRendererPr g_max_renderer_count_override = count; } @@ -27,7 +32,16 @@ // static void RenderProcessHostImpl::EarlyZygoteLaunch() { DCHECK(!g_render_zygote); -@@ -684,7 +684,7 @@ +@@ -645,7 +645,7 @@ void RenderProcessHostImpl::EarlyZygoteL + ZygoteHostImpl::GetInstance()->SetRendererSandboxStatus( + (*GetGenericZygote())->GetSandboxStatus()); + } +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + RenderProcessHostImpl::RenderProcessHostImpl( + BrowserContext* browser_context, +@@ -788,7 +788,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 590ad204e091..9da8083eb45d 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2016-10-06 04:02:18.000000000 +0300 -+++ content/browser/renderer_host/render_widget_host_view_aura.cc 2016-10-13 07:01:47.728403000 +0300 -@@ -106,7 +106,7 @@ +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2017-01-26 00:49:13 UTC ++++ content/browser/renderer_host/render_widget_host_view_aura.cc +@@ -107,7 +107,7 @@ #include "ui/gfx/gdi_util.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -2479,7 +2479,7 @@ +@@ -1961,7 +1961,7 @@ bool RenderWidgetHostViewAura::NeedsInpu } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -18,7 +18,7 @@ return NeedsInputGrab(); #endif return false; -@@ -2711,7 +2711,7 @@ +@@ -2158,7 +2158,7 @@ void RenderWidgetHostViewAura::ForwardKe if (!target_host) return; diff --git a/www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc b/www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc index c780f5ed2d9f..60e0ed22c1c7 100644 --- a/www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc +++ b/www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/tracing/tracing_controller_impl.cc.orig 2016-07-20 22:03:24.000000000 +0300 -+++ content/browser/tracing/tracing_controller_impl.cc 2016-08-18 02:46:09.991782000 +0300 -@@ -496,7 +496,7 @@ +--- content/browser/tracing/tracing_controller_impl.cc.orig 2017-01-26 00:49:13 UTC ++++ content/browser/tracing/tracing_controller_impl.cc +@@ -475,7 +475,7 @@ void TracingControllerImpl::AddTraceMess return; } 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 index 222b19f6c754..ab5313decfc7 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host__impl.cc @@ -1,15 +1,18 @@ ---- content/browser/utility_process_host_impl.cc.orig 2016-07-20 22:03:24.000000000 +0300 -+++ content/browser/utility_process_host_impl.cc 2016-08-18 02:26:27.996136000 +0300 -@@ -38,7 +38,7 @@ - #include "ipc/ipc_switches.h" +--- content/browser/utility_process_host_impl.cc.orig 2017-01-26 00:49:13 UTC ++++ content/browser/utility_process_host_impl.cc +@@ -43,9 +43,9 @@ + #include "services/service_manager/public/cpp/interface_provider.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) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) -@@ -49,7 +49,7 @@ + #if defined(OS_WIN) + #include "sandbox/win/src/sandbox_policy.h" +@@ -54,11 +54,11 @@ namespace content { @@ -18,16 +21,25 @@ namespace { ZygoteHandle g_utility_zygote; } // namespace -@@ -69,7 +69,7 @@ +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + // NOTE: changes to this class need to be reviewed by the security team. + class UtilitySandboxedProcessLauncherDelegate +@@ -73,10 +73,10 @@ class UtilitySandboxedProcessLauncherDel launch_elevated_(launch_elevated) #elif defined(OS_POSIX) - env_(env), + env_(env) -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - no_sandbox_(no_sandbox), - #endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) - ipc_fd_(host->TakeClientFileDescriptor()) -@@ -101,7 +101,7 @@ + , + no_sandbox_(no_sandbox) +-#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + #endif // OS_WIN + {} + +@@ -105,13 +105,13 @@ class UtilitySandboxedProcessLauncherDel #elif defined(OS_POSIX) @@ -36,16 +48,26 @@ ZygoteHandle* GetZygote() override { if (no_sandbox_ || !exposed_dir_.empty()) return nullptr; -@@ -123,7 +123,7 @@ + return GetGenericZygote(); + } +-#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + base::EnvironmentMap GetEnvironment() override { return env_; } + #endif // OS_WIN + +@@ -126,9 +126,9 @@ class UtilitySandboxedProcessLauncherDel bool launch_elevated_; #elif defined(OS_POSIX) base::EnvironmentMap env_; -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) bool no_sandbox_; - #endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) - base::ScopedFD ipc_fd_; -@@ -151,7 +151,7 @@ +-#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + #endif // OS_WIN + }; + +@@ -153,7 +153,7 @@ UtilityProcessHostImpl::UtilityProcessHo is_batch_mode_(false), no_sandbox_(false), run_elevated_(false), @@ -54,7 +76,7 @@ child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), #else child_flags_(ChildProcessHost::CHILD_NORMAL), -@@ -232,7 +232,7 @@ +@@ -235,13 +235,13 @@ void UtilityProcessHostImpl::SetName(con name_ = name; } @@ -63,3 +85,10 @@ // static void UtilityProcessHostImpl::EarlyZygoteLaunch() { DCHECK(!g_utility_zygote); + g_utility_zygote = CreateZygote(); + } +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + bool UtilityProcessHostImpl::StartProcess() { + if (started_) diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index 47214f449a01..4f156539005d 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300 -+++ content/common/BUILD.gn 2016-10-09 05:21:51.439131000 +0300 -@@ -179,7 +179,7 @@ +--- content/common/BUILD.gn.orig 2017-01-26 00:49:13 UTC ++++ content/common/BUILD.gn +@@ -500,7 +500,7 @@ source_set("common") { if (use_seccomp_bpf) { defines += [ "USE_SECCOMP_BPF" ] } else { @@ -9,7 +9,7 @@ sources -= [ "sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc", "sandbox_linux/bpf_cros_arm_gpu_policy_linux.h", -@@ -193,6 +193,15 @@ +@@ -514,6 +514,15 @@ source_set("common") { "sandbox_linux/bpf_utility_policy_linux.h", "sandbox_linux/sandbox_bpf_base_policy_linux.cc", "sandbox_linux/sandbox_bpf_base_policy_linux.h", diff --git a/www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc b/www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc index c9de08759266..0c4f9880515a 100644 --- a/www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc +++ b/www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc @@ -1,4 +1,4 @@ ---- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig 2016-03-25 13:04:48 UTC +--- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig 2017-01-26 00:49:13 UTC +++ content/common/sandbox_linux/sandbox_debug_handling_linux.cc @@ -7,7 +7,9 @@ #include <errno.h> diff --git a/www/chromium/files/patch-content_common_set__process__title__linux.cc b/www/chromium/files/patch-content_common_set__process__title__linux.cc index f9839285a1e3..b6a56c73e469 100644 --- a/www/chromium/files/patch-content_common_set__process__title__linux.cc +++ b/www/chromium/files/patch-content_common_set__process__title__linux.cc @@ -1,4 +1,4 @@ ---- content/common/set_process_title_linux.cc.orig 2016-03-25 13:04:48 UTC +--- content/common/set_process_title_linux.cc.orig 2017-01-26 00:49:13 UTC +++ content/common/set_process_title_linux.cc @@ -49,6 +49,8 @@ extern char** environ; diff --git a/www/chromium/files/patch-content_common_set__process__title__linux.h b/www/chromium/files/patch-content_common_set__process__title__linux.h index d0e2de386688..f3beb781cfe4 100644 --- a/www/chromium/files/patch-content_common_set__process__title__linux.h +++ b/www/chromium/files/patch-content_common_set__process__title__linux.h @@ -1,4 +1,4 @@ ---- content/common/set_process_title_linux.h.orig 2016-03-25 13:04:48 UTC +--- content/common/set_process_title_linux.h.orig 2017-01-26 00:49:13 UTC +++ content/common/set_process_title_linux.h @@ -5,6 +5,9 @@ #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_ diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn index 86bec6a06170..cee0ae1717f6 100644 --- a/www/chromium/files/patch-content_gpu_BUILD.gn +++ b/www/chromium/files/patch-content_gpu_BUILD.gn @@ -1,6 +1,6 @@ ---- content/gpu/BUILD.gn.orig 2016-10-06 04:02:19.000000000 +0300 -+++ content/gpu/BUILD.gn 2016-10-15 10:05:38.417673000 +0300 -@@ -98,6 +98,7 @@ +--- content/gpu/BUILD.gn.orig 2017-01-26 00:49:13 UTC ++++ content/gpu/BUILD.gn +@@ -96,6 +96,7 @@ target(link_target_type, "gpu_sources") if (use_x11) { deps += [ "//ui/events/platform/x11" ] diff --git a/www/chromium/files/patch-content_gpu_gpu__child__thread.cc b/www/chromium/files/patch-content_gpu_gpu__child__thread.cc index 7a75e262f186..2146462d9b25 100644 --- a/www/chromium/files/patch-content_gpu_gpu__child__thread.cc +++ b/www/chromium/files/patch-content_gpu_gpu__child__thread.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_child_thread.cc.orig 2016-10-06 04:02:19.000000000 +0300 -+++ content/gpu/gpu_child_thread.cc 2016-10-14 15:27:34.081648000 +0300 -@@ -419,6 +419,7 @@ +--- content/gpu/gpu_child_thread.cc.orig 2017-01-26 00:49:13 UTC ++++ content/gpu/gpu_child_thread.cc +@@ -383,6 +383,7 @@ void GpuChildThread::OnCollectGraphicsIn if (dead_on_arrival_) return; @@ -8,7 +8,7 @@ #if defined(OS_WIN) // GPU full info collection should only happen on un-sandboxed GPU process // or single process/in-process gpu mode on Windows. -@@ -461,6 +462,7 @@ +@@ -434,6 +435,7 @@ void GpuChildThread::OnCollectGraphicsIn base::MessageLoop::current()->QuitWhenIdle(); } #endif // OS_WIN diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 41b4eefaa8b0..5509c75ad5c5 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2016-12-01 23:02:13.000000000 +0000 -+++ content/gpu/gpu_main.cc 2016-12-13 17:52:18.210016000 +0000 -@@ -92,7 +92,7 @@ +--- content/gpu/gpu_main.cc.orig 2017-01-26 00:49:13 UTC ++++ content/gpu/gpu_main.cc +@@ -92,7 +92,7 @@ namespace content { namespace { @@ -9,7 +9,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*); #elif defined(OS_WIN) bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*); -@@ -145,7 +145,7 @@ +@@ -145,7 +145,7 @@ class ContentSandboxHelper : public gpu: bool EnsureSandboxInitialized( gpu::GpuWatchdogThread* watchdog_thread) override { @@ -18,7 +18,7 @@ return StartSandboxLinux(watchdog_thread); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -292,7 +292,7 @@ +@@ -292,7 +292,7 @@ int GpuMain(const MainFunctionParams& pa namespace { diff --git a/www/chromium/files/patch-content_gpu__in__process__gpu__thread.cc b/www/chromium/files/patch-content_gpu_in__process__gpu__thread.cc index fb760085bd73..82bae8137911 100644 --- a/www/chromium/files/patch-content_gpu__in__process__gpu__thread.cc +++ b/www/chromium/files/patch-content_gpu_in__process__gpu__thread.cc @@ -1,6 +1,6 @@ ---- content/gpu/in_process_gpu_thread.cc.orig 2016-12-18 18:45:05.278739000 +0000 -+++ content/gpu/in_process_gpu_thread.cc 2016-12-18 18:45:21.876600000 +0000 -@@ -53,8 +53,6 @@ +--- content/gpu/in_process_gpu_thread.cc.orig 2017-01-26 00:49:13 UTC ++++ content/gpu/in_process_gpu_thread.cc +@@ -53,8 +53,6 @@ void InProcessGpuThread::Init() { gpu::GPUInfo gpu_info; if (!gl::init::InitializeGLOneOff()) VLOG(1) << "gl::init::InitializeGLOneOff failed"; diff --git a/www/chromium/files/patch-content_public_common_child__process__host.h b/www/chromium/files/patch-content_public_common_child__process__host.h index 38b7fa8204a3..147c3a88c27b 100644 --- a/www/chromium/files/patch-content_public_common_child__process__host.h +++ b/www/chromium/files/patch-content_public_common_child__process__host.h @@ -1,6 +1,6 @@ ---- ./content/public/common/child_process_host.h.orig 2016-07-20 22:03:24.000000000 +0300 -+++ ./content/public/common/child_process_host.h 2016-08-18 02:52:30.173927000 +0300 -@@ -50,7 +50,7 @@ +--- content/public/common/child_process_host.h.orig 2017-01-26 00:49:13 UTC ++++ content/public/common/child_process_host.h +@@ -53,7 +53,7 @@ class CONTENT_EXPORT ChildProcessHost : // No special behavior requested. CHILD_NORMAL = 0, @@ -9,7 +9,7 @@ // Indicates that the child execed after forking may be execced from // /proc/self/exe rather than using the "real" app path. This prevents // autoupdate from confusing us if it changes the file out from under us. -@@ -59,7 +59,7 @@ +@@ -62,7 +62,7 @@ class CONTENT_EXPORT ChildProcessHost : // gdb). In this case, you'd use GetChildPath to get the real executable // file name, and then prepend the GDB command to the command line. CHILD_ALLOW_SELF = 1 << 0, diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index 90f349395319..2c8e327162bf 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2016-05-11 19:02:21 UTC +--- content/public/common/content_switches.cc.orig 2017-01-26 00:49:13 UTC +++ content/public/common/content_switches.cc -@@ -978,7 +978,7 @@ const char kDisableVaapiAcceleratedVideo +@@ -992,7 +992,7 @@ const char kDisableVaapiAcceleratedVideo "disable-vaapi-accelerated-video-encode"; #endif diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h index df8933767fbd..dbcc527347d4 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2016-05-11 19:02:21 UTC +--- content/public/common/content_switches.h.orig 2017-01-26 00:49:13 UTC +++ content/public/common/content_switches.h -@@ -284,7 +284,7 @@ CONTENT_EXPORT extern const char kDisabl +@@ -293,7 +293,7 @@ CONTENT_EXPORT extern const char kDisabl CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[]; #endif diff --git a/www/chromium/files/patch-content_public_common_renderer__preferences.h b/www/chromium/files/patch-content_public_common_renderer__preferences.h new file mode 100644 index 000000000000..88cc16610423 --- /dev/null +++ b/www/chromium/files/patch-content_public_common_renderer__preferences.h @@ -0,0 +1,11 @@ +--- content/public/common/renderer_preferences.h.orig 2017-01-26 00:49:13 UTC ++++ content/public/common/renderer_preferences.h +@@ -139,7 +139,7 @@ struct CONTENT_EXPORT RendererPreference + // Country iso of the mobile network for content detection purpose. + std::string network_contry_iso; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + std::string system_font_family_name; + #endif + diff --git a/www/chromium/files/patch-content_public_test_browser__test__base.cc b/www/chromium/files/patch-content_public_test_browser__test__base.cc index 43aa3aaf1845..38bc1b9eb609 100644 --- a/www/chromium/files/patch-content_public_test_browser__test__base.cc +++ b/www/chromium/files/patch-content_public_test_browser__test__base.cc @@ -1,4 +1,4 @@ ---- content/public/test/browser_test_base.cc.orig 2016-05-11 19:02:21 UTC +--- content/public/test/browser_test_base.cc.orig 2017-01-26 00:49:13 UTC +++ content/public/test/browser_test_base.cc @@ -6,6 +6,10 @@ diff --git a/www/chromium/files/patch-content_renderer_devtools_v8__sampling__profiler.cc b/www/chromium/files/patch-content_renderer_devtools_v8__sampling__profiler.cc deleted file mode 100644 index d7038be92971..000000000000 --- a/www/chromium/files/patch-content_renderer_devtools_v8__sampling__profiler.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- content/renderer/devtools/v8_sampling_profiler.cc.orig 2016-05-11 19:02:21 UTC -+++ content/renderer/devtools/v8_sampling_profiler.cc -@@ -544,6 +544,10 @@ void V8SamplingThread::HandleProfilerSig - state.pc = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rip, __eip)); - state.sp = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rsp, __esp)); - state.fp = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rbp, __ebp)); -+#elif defined(OS_BSD) -+ state.pc = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rip, mc_eip)); -+ state.sp = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rsp, mc_esp)); -+ state.fp = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rbp, mc_ebp)); - #else - state.pc = - reinterpret_cast<void*>(mcontext.gregs[REG_64_32(REG_RIP, REG_EIP)]); diff --git a/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc b/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc index f782c2785c06..f024294adbde 100644 --- a/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc +++ b/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc @@ -1,6 +1,6 @@ ---- content/renderer/media/webrtc/processed_local_audio_source.cc.orig 2016-07-20 22:03:24.000000000 +0300 -+++ content/renderer/media/webrtc/processed_local_audio_source.cc 2016-08-01 03:25:27.013281000 +0300 -@@ -269,8 +269,8 @@ +--- content/renderer/media/webrtc/processed_local_audio_source.cc.orig 2017-01-26 00:49:13 UTC ++++ content/renderer/media/webrtc/processed_local_audio_source.cc +@@ -269,8 +269,8 @@ void ProcessedLocalAudioSource::Capture( bool key_pressed) { #if defined(OS_WIN) || defined(OS_MACOSX) DCHECK_LE(volume, 1.0); diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index f90ce6b384af..0650a72a5dfe 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,20 @@ ---- content/renderer/render_thread_impl.cc.orig 2016-07-20 22:03:24.000000000 +0300 -+++ content/renderer/render_thread_impl.cc 2016-08-01 04:09:35.329085000 +0300 -@@ -1424,7 +1424,7 @@ +--- content/renderer/render_thread_impl.cc.orig 2017-01-26 00:49:13 UTC ++++ content/renderer/render_thread_impl.cc +@@ -206,11 +206,13 @@ + #include "content/common/external_ipc_dumper.h" + #endif + ++#if !defined(OS_BSD) + #if defined(OS_MACOSX) + #include <malloc/malloc.h> + #else + #include <malloc.h> + #endif ++#endif + + using base::ThreadRestrictions; + using blink::WebDocument; +@@ -1488,7 +1490,7 @@ media::GpuVideoAcceleratorFactories* Ren const bool enable_video_accelerator = !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); const bool enable_gpu_memory_buffer_video_frames = @@ -9,3 +23,12 @@ !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && !gpu_channel_host->gpu_info().software_rendering; +@@ -1846,6 +1848,8 @@ void RenderThreadImpl::RecordPurgeAndSus + #else + size_t malloc_usage = minfo.hblkhd + minfo.arena; + #endif ++#elif defined(OS_BSD) ++ size_t malloc_usage = 0; + #else + size_t malloc_usage = GetMallocUsage(); + #endif diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index e52b7c4ed5ad..d80b1b8ccde7 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2016-10-06 04:02:19.000000000 +0300 -+++ content/renderer/renderer_blink_platform_impl.cc 2016-10-13 07:15:18.714150000 +0300 -@@ -114,7 +114,7 @@ +--- content/renderer/renderer_blink_platform_impl.cc.orig 2017-01-26 00:49:13 UTC ++++ content/renderer/renderer_blink_platform_impl.cc +@@ -111,7 +111,7 @@ #if defined(OS_POSIX) #include "base/file_descriptor_posix.h" @@ -9,7 +9,7 @@ #include <map> #include <string> -@@ -219,7 +219,7 @@ +@@ -201,7 +201,7 @@ class RendererBlinkPlatformImpl::FileUti scoped_refptr<ThreadSafeSender> thread_safe_sender_; }; @@ -18,7 +18,7 @@ class RendererBlinkPlatformImpl::SandboxSupport : public blink::WebSandboxSupport { public: -@@ -266,7 +266,7 @@ +@@ -247,7 +247,7 @@ RendererBlinkPlatformImpl::RendererBlink renderer_scheduler_(renderer_scheduler), blink_interface_provider_( new BlinkInterfaceProviderImpl(remote_interfaces)) { @@ -27,7 +27,7 @@ if (g_sandbox_enabled && sandboxEnabled()) { sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport); } else { -@@ -297,7 +297,7 @@ +@@ -283,7 +283,7 @@ RendererBlinkPlatformImpl::~RendererBlin } void RendererBlinkPlatformImpl::Shutdown() { @@ -36,7 +36,7 @@ // SandboxSupport contains a map of WebFontFamily objects, which hold // WebCStrings, which become invalidated when blink is shut down. Hence, we // need to clear that map now, just before blink::shutdown() is called. -@@ -349,7 +349,7 @@ +@@ -331,7 +331,7 @@ blink::WebFileUtilities* RendererBlinkPl } blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() { @@ -45,7 +45,7 @@ // These platforms do not require sandbox support. return NULL; #else -@@ -602,7 +602,7 @@ +@@ -539,7 +539,7 @@ bool RendererBlinkPlatformImpl::SandboxS return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 549567adc6cd..35db8480ea8d 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,11 +1,11 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2016-05-11 19:02:22 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2017-01-26 00:49:13 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -250,7 +250,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo - class MimeRegistry; - scoped_ptr<MimeRegistry> mime_registry_; +@@ -256,7 +256,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo + class FileUtilities; + std::unique_ptr<FileUtilities> file_utilities_; -#if !defined(OS_ANDROID) && !defined(OS_WIN) +#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) class SandboxSupport; - scoped_ptr<SandboxSupport> sandbox_support_; + std::unique_ptr<SandboxSupport> sandbox_support_; #endif diff --git a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc index e8924809f260..be1e1b238bf2 100644 --- a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc +++ b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc @@ -1,4 +1,4 @@ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2016-04-08 16:02:09 UTC +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2017-01-26 00:49:13 UTC +++ content/renderer/renderer_main_platform_delegate_linux.cc @@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::Platf } diff --git a/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc b/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc new file mode 100644 index 000000000000..c53f33bf08e8 --- /dev/null +++ b/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc @@ -0,0 +1,20 @@ +--- content/renderer/webscrollbarbehavior_impl_aura.cc.orig 2017-01-26 00:49:13 UTC ++++ content/renderer/webscrollbarbehavior_impl_aura.cc +@@ -14,7 +14,7 @@ bool WebScrollbarBehaviorImpl::shouldCen + blink::WebPointerProperties::Button mouseButton, + bool shiftKeyPressed, + bool altKeyPressed) { +-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + if (mouseButton == blink::WebPointerProperties::Button::Middle) + return true; + #endif +@@ -29,7 +29,7 @@ bool WebScrollbarBehaviorImpl::shouldSna + // Disable snapback on desktop Linux to better integrate with the desktop + // behavior. Typically, Linux apps do not implement scrollbar snapback (this is + // true for at least GTK and QT apps). +-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + return false; + #endif + diff --git a/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc b/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc deleted file mode 100644 index 24bd97157802..000000000000 --- a/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/renderer/webscrollbarbehavior_impl_gtkoraura.cc.orig 2016-10-06 04:02:19.000000000 +0300 -+++ content/renderer/webscrollbarbehavior_impl_gtkoraura.cc 2016-10-13 07:18:08.506709000 +0300 -@@ -14,7 +14,7 @@ - blink::WebPointerProperties::Button mouseButton, - bool shiftKeyPressed, - bool altKeyPressed) { --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) - if (mouseButton == blink::WebPointerProperties::Button::Middle) - return true; - #endif -@@ -50,7 +50,7 @@ - // On most platforms, we should snap iff the event is outside our calculated - // rect. On Linux, however, we should not snap for events off the ends, but - // not the sides, of the rect. --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - return isHorizontal ? - (eventPoint.y < noSnapRect.y() || eventPoint.y >= noSnapRect.bottom()) : - (eventPoint.x < noSnapRect.x() || eventPoint.x >= noSnapRect.right()); diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 3ef7b969c366..fe95190ac071 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300 -+++ content/shell/BUILD.gn 2016-09-18 01:45:17.587900000 +0300 -@@ -275,7 +275,7 @@ +--- content/shell/BUILD.gn.orig 2017-01-26 00:49:13 UTC ++++ content/shell/BUILD.gn +@@ -296,7 +296,7 @@ static_library("content_shell_lib") { ] } @@ -9,7 +9,7 @@ deps += [ "//build/linux:fontconfig", "//ui/gfx:test_support", -@@ -296,7 +296,7 @@ +@@ -317,7 +317,7 @@ static_library("content_shell_lib") { deps += [ "//content/shell/android:content_shell_jni_headers" ] } @@ -18,7 +18,7 @@ deps += [ "//components/crash/content/app", "//components/crash/content/browser", -@@ -338,7 +338,7 @@ +@@ -366,7 +366,7 @@ static_library("content_shell_lib") { ] } @@ -27,7 +27,7 @@ deps += [ "//third_party/freetype2" ] } -@@ -496,7 +496,7 @@ +@@ -532,7 +532,7 @@ if (is_android) { } } diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc index 867fc33f8a92..071f52a19b26 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2016-07-20 22:03:24.000000000 +0300 -+++ content/shell/browser/shell_browser_context.cc 2016-08-01 04:13:15.131738000 +0300 -@@ -24,7 +24,7 @@ +--- content/shell/browser/shell_browser_context.cc.orig 2017-01-26 00:49:13 UTC ++++ content/shell/browser/shell_browser_context.cc +@@ -25,7 +25,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" -@@ -80,7 +80,7 @@ +@@ -97,7 +97,7 @@ void ShellBrowserContext::InitWhileIOAll #if defined(OS_WIN) CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); path_ = path_.Append(std::wstring(L"content_shell")); diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 838120c8f8a1..4ad68a31a910 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,15 +1,15 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2016-05-11 19:02:22 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2017-01-26 00:49:13 UTC +++ content/shell/browser/shell_browser_main_parts.cc -@@ -40,7 +40,7 @@ +@@ -44,7 +44,7 @@ #if defined(USE_AURA) && defined(USE_X11) - #include "ui/events/devices/x11/touch_factory_x11.h" + #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) +#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) #include "ui/base/ime/input_method_initializer.h" #endif #if defined(OS_CHROMEOS) -@@ -124,7 +124,7 @@ void ShellBrowserMainParts::PostMainMess +@@ -140,7 +140,7 @@ void ShellBrowserMainParts::PostMainMess } void ShellBrowserMainParts::PreEarlyInitialization() { diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index 24704ade8bfe..08c56095d601 100644 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ b/www/chromium/files/patch-content_test_BUILD.gn @@ -1,15 +1,15 @@ ---- content/test/BUILD.gn.orig 2016-12-01 23:02:13 UTC +--- content/test/BUILD.gn.orig 2017-01-26 00:49:13 UTC +++ content/test/BUILD.gn -@@ -661,7 +661,7 @@ test("content_browsertests") { - "../test/webui_resource_browsertest.cc", - ] +@@ -748,7 +748,7 @@ test("content_browsertests") { + } + } - if (is_android || is_linux || is_mac || is_win) { + if (is_android || is_linux || is_bsd || is_mac || is_win) { - data = [ + data += [ "$root_out_dir/content_shell.pak", "data/", -@@ -1349,7 +1349,7 @@ test("content_unittests") { +@@ -1350,7 +1350,7 @@ test("content_unittests") { sources += [ "../browser/memory/memory_monitor_linux_unittest.cc" ] } @@ -18,7 +18,7 @@ data = [ "$root_out_dir/content_shell.pak", "data/", -@@ -1534,7 +1534,7 @@ test("content_unittests") { +@@ -1540,7 +1540,7 @@ test("content_unittests") { "//ui/shell_dialogs:shell_dialogs", ] @@ -27,7 +27,7 @@ sources += [ "../browser/media/capture/desktop_capture_device_unittest.cc" ] deps += [ "//third_party/webrtc/modules/desktop_capture" ] -@@ -1570,7 +1570,7 @@ test("content_unittests") { +@@ -1576,7 +1576,7 @@ test("content_unittests") { ] } diff --git a/www/chromium/files/patch-crypto_nss__util.cc b/www/chromium/files/patch-crypto_nss__util.cc index 616e6a71f124..92d45f05fe47 100644 --- a/www/chromium/files/patch-crypto_nss__util.cc +++ b/www/chromium/files/patch-crypto_nss__util.cc @@ -1,5 +1,5 @@ ---- crypto/nss_util.cc.orig 2016-10-06 04:02:19.000000000 +0300 -+++ crypto/nss_util.cc 2016-10-13 07:19:30.151634000 +0300 +--- crypto/nss_util.cc.orig 2017-01-26 00:49:14 UTC ++++ crypto/nss_util.cc @@ -20,7 +20,7 @@ #include "base/threading/thread_task_runner_handle.h" #include "crypto/nss_util_internal.h" @@ -9,7 +9,7 @@ #include <sys/mount.h> #include <sys/param.h> #endif -@@ -150,10 +150,10 @@ +@@ -150,10 +150,10 @@ void UseLocalCacheOfNSSDatabaseIfNFS(con base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN; if (base::GetFileSystemType(database_dir, &fs_type)) db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS); diff --git a/www/chromium/files/patch-device_BUILD.gn b/www/chromium/files/patch-device_BUILD.gn index 66bdcaaffc3f..c7a22507aa4e 100644 --- a/www/chromium/files/patch-device_BUILD.gn +++ b/www/chromium/files/patch-device_BUILD.gn @@ -1,6 +1,6 @@ ---- device/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300 -+++ device/BUILD.gn 2016-09-03 02:02:55.005651000 +0300 -@@ -162,7 +162,7 @@ +--- device/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ device/BUILD.gn +@@ -184,7 +184,7 @@ test("device_unittests") { ] } diff --git a/www/chromium/files/patch-device_battery_BUILD.gn b/www/chromium/files/patch-device_battery_BUILD.gn index d619e1345600..dd53e086339f 100644 --- a/www/chromium/files/patch-device_battery_BUILD.gn +++ b/www/chromium/files/patch-device_battery_BUILD.gn @@ -1,6 +1,6 @@ ---- device/battery/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300 -+++ device/battery/BUILD.gn 2016-09-03 02:03:11.489591000 +0300 -@@ -47,7 +47,7 @@ +--- device/battery/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ device/battery/BUILD.gn +@@ -47,7 +47,7 @@ if (!is_android) { ] } diff --git a/www/chromium/files/patch-device_geolocation_BUILD.gn b/www/chromium/files/patch-device_geolocation_BUILD.gn index 682d0d88105a..e7a65f9c803d 100644 --- a/www/chromium/files/patch-device_geolocation_BUILD.gn +++ b/www/chromium/files/patch-device_geolocation_BUILD.gn @@ -1,6 +1,6 @@ ---- device/geolocation/BUILD.gn.orig 2016-10-06 04:02:19.000000000 +0300 -+++ device/geolocation/BUILD.gn 2016-10-13 13:27:05.983826000 +0300 -@@ -93,7 +93,7 @@ +--- device/geolocation/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ device/geolocation/BUILD.gn +@@ -89,7 +89,7 @@ component("geolocation") { if (is_android) { sources -= [ "wifi_data_provider_common.cc" ] } diff --git a/www/chromium/files/patch-device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-device_geolocation_location__arbitrator.cc index f38653e18902..2c5b0b4e53d6 100644 --- a/www/chromium/files/patch-device_geolocation_location__arbitrator.cc +++ b/www/chromium/files/patch-device_geolocation_location__arbitrator.cc @@ -1,4 +1,4 @@ ---- device/geolocation/location_arbitrator.cc.orig 2016-12-12 22:00:04 UTC +--- device/geolocation/location_arbitrator.cc.orig 2017-01-26 00:49:14 UTC +++ device/geolocation/location_arbitrator.cc @@ -182,7 +182,7 @@ LocationArbitrator::NewNetworkLocationPr diff --git a/www/chromium/files/patch-device_hid_BUILD.gn b/www/chromium/files/patch-device_hid_BUILD.gn index 3ae9f0f999ed..a46513622b32 100644 --- a/www/chromium/files/patch-device_hid_BUILD.gn +++ b/www/chromium/files/patch-device_hid_BUILD.gn @@ -1,6 +1,6 @@ ---- device/hid/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300 -+++ device/hid/BUILD.gn 2016-09-24 04:03:54.837948000 +0300 -@@ -57,6 +57,13 @@ +--- device/hid/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ device/hid/BUILD.gn +@@ -56,6 +56,13 @@ source_set("hid") { deps += [ "//device/udev_linux" ] } diff --git a/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h b/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h index f637914078fb..09b23fcc5b39 100644 --- a/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h +++ b/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h @@ -1,5 +1,5 @@ ---- device/media_transfer_protocol/media_transfer_protocol_manager.h.orig 2016-07-17 14:17:13.836047000 +0300 -+++ device/media_transfer_protocol/media_transfer_protocol_manager.h 2016-07-17 14:16:48.004323000 +0300 +--- device/media_transfer_protocol/media_transfer_protocol_manager.h.orig 2017-01-26 00:49:14 UTC ++++ device/media_transfer_protocol/media_transfer_protocol_manager.h @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "build/build_config.h" diff --git a/www/chromium/files/patch-device_serial_BUILD.gn b/www/chromium/files/patch-device_serial_BUILD.gn index 4644abb3961e..0a8900d46cdc 100644 --- a/www/chromium/files/patch-device_serial_BUILD.gn +++ b/www/chromium/files/patch-device_serial_BUILD.gn @@ -1,6 +1,6 @@ ---- device/serial/BUILD.gn.orig 2016-08-03 22:02:18.000000000 +0300 -+++ device/serial/BUILD.gn 2016-09-24 04:10:00.137337000 +0300 -@@ -6,7 +6,7 @@ +--- device/serial/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ device/serial/BUILD.gn +@@ -6,7 +6,7 @@ import("//build/config/features.gni") import("//mojo/public/tools/bindings/mojom.gni") # Library works only on desktop platforms. @@ -9,7 +9,7 @@ config("platform_support") { visibility = [ ":serial" ] -@@ -70,6 +70,12 @@ +@@ -55,6 +55,12 @@ static_library("serial") { if (use_udev) { deps += [ "//device/udev_linux" ] } diff --git a/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc b/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc index 3f56a6f06677..13fe8e22128c 100644 --- a/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc +++ b/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc @@ -1,6 +1,6 @@ ---- device/serial/serial_io_handler_posix.cc.orig 2016-04-08 16:02:09 UTC +--- device/serial/serial_io_handler_posix.cc.orig 2017-01-26 00:49:14 UTC +++ device/serial/serial_io_handler_posix.cc -@@ -60,7 +60,7 @@ bool BitrateToSpeedConstant(int bitrate, +@@ -61,7 +61,7 @@ bool BitrateToSpeedConstant(int bitrate, BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) diff --git a/www/chromium/files/patch-device_serial_serial__service__impl.cc b/www/chromium/files/patch-device_serial_serial__service__impl.cc deleted file mode 100644 index 13e2a9f7bf47..000000000000 --- a/www/chromium/files/patch-device_serial_serial__service__impl.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- device/serial/serial_service_impl.cc.orig 2016-05-11 19:02:22 UTC -+++ device/serial/serial_service_impl.cc -@@ -74,9 +74,14 @@ void SerialServiceImpl::Connect( - } - - SerialDeviceEnumerator* SerialServiceImpl::GetDeviceEnumerator() { -+#if defined(OS_BSD) -+ NOTIMPLEMENTED(); -+ return NULL; -+#else - if (!device_enumerator_) - device_enumerator_ = SerialDeviceEnumerator::Create(); - return device_enumerator_.get(); -+#endif - } - - bool SerialServiceImpl::IsValidPath(const mojo::String& path) { diff --git a/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc b/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc index 68b592ee80ba..e96f189de911 100644 --- a/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc +++ b/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc @@ -1,4 +1,4 @@ ---- device/time_zone_monitor/time_zone_monitor.cc.orig 2016-12-12 21:25:46 UTC +--- device/time_zone_monitor/time_zone_monitor.cc.orig 2017-01-26 00:49:14 UTC +++ device/time_zone_monitor/time_zone_monitor.cc @@ -31,7 +31,7 @@ void TimeZoneMonitor::NotifyClients() { std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault()); diff --git a/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc b/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc index 8a7af2e15490..56a67dc0ab5c 100644 --- a/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc +++ b/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,6 +1,6 @@ ---- device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2016-12-12 21:26:07 UTC +--- device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2017-01-26 00:49:14 UTC +++ device/time_zone_monitor/time_zone_monitor_linux.cc -@@ -58,6 +58,9 @@ class TimeZoneMonitorLinuxImpl +@@ -59,6 +59,9 @@ class TimeZoneMonitorLinuxImpl main_task_runner_(base::ThreadTaskRunnerHandle::Get()), file_task_runner_(file_task_runner), owner_(owner) { diff --git a/www/chromium/files/patch-device_usb_usb__context.cc b/www/chromium/files/patch-device_usb_usb__context.cc index 7cfd3c0c803e..3b2a4831bad4 100644 --- a/www/chromium/files/patch-device_usb_usb__context.cc +++ b/www/chromium/files/patch-device_usb_usb__context.cc @@ -1,4 +1,4 @@ ---- device/usb/usb_context.cc.orig 2016-03-25 13:04:49 UTC +--- device/usb/usb_context.cc.orig 2017-01-26 00:49:14 UTC +++ device/usb/usb_context.cc @@ -9,8 +9,13 @@ #include "base/macros.h" diff --git a/www/chromium/files/patch-device_usb_usb__context__unittest.cc b/www/chromium/files/patch-device_usb_usb__context__unittest.cc index ff224435eb85..f25eb3676840 100644 --- a/www/chromium/files/patch-device_usb_usb__context__unittest.cc +++ b/www/chromium/files/patch-device_usb_usb__context__unittest.cc @@ -1,4 +1,4 @@ ---- device/usb/usb_context_unittest.cc.orig 2016-03-25 13:04:49 UTC +--- device/usb/usb_context_unittest.cc.orig 2017-01-26 00:49:14 UTC +++ device/usb/usb_context_unittest.cc @@ -7,7 +7,11 @@ #include "build/build_config.h" 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 d505313d4131..14ff998e3932 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,6 +1,6 @@ ---- device/usb/usb_device_handle_impl.cc.orig 2016-05-11 19:02:22 UTC +--- device/usb/usb_device_handle_impl.cc.orig 2017-01-26 00:49:14 UTC +++ device/usb/usb_device_handle_impl.cc -@@ -24,7 +24,11 @@ +@@ -25,7 +25,11 @@ #include "device/usb/usb_error.h" #include "device/usb/usb_service.h" #include "net/base/io_buffer.h" diff --git a/www/chromium/files/patch-device_usb_usb__device__handle__impl.h b/www/chromium/files/patch-device_usb_usb__device__handle__impl.h index 26ed0621702e..3fb03aa565db 100644 --- a/www/chromium/files/patch-device_usb_usb__device__handle__impl.h +++ b/www/chromium/files/patch-device_usb_usb__device__handle__impl.h @@ -1,6 +1,6 @@ ---- device/usb/usb_device_handle_impl.h.orig 2016-05-11 19:02:22 UTC +--- device/usb/usb_device_handle_impl.h.orig 2017-01-26 00:49:14 UTC +++ device/usb/usb_device_handle_impl.h -@@ -17,7 +17,12 @@ +@@ -18,7 +18,12 @@ #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h" #include "device/usb/usb_device_handle.h" diff --git a/www/chromium/files/patch-device_usb_usb__device__impl.cc b/www/chromium/files/patch-device_usb_usb__device__impl.cc index 18ae2610adb7..23389cd0899d 100644 --- a/www/chromium/files/patch-device_usb_usb__device__impl.cc +++ b/www/chromium/files/patch-device_usb_usb__device__impl.cc @@ -1,6 +1,6 @@ ---- device/usb/usb_device_impl.cc.orig 2016-05-11 19:02:22 UTC +--- device/usb/usb_device_impl.cc.orig 2017-01-26 00:49:14 UTC +++ device/usb/usb_device_impl.cc -@@ -20,7 +20,11 @@ +@@ -22,7 +22,11 @@ #include "device/usb/usb_descriptors.h" #include "device/usb/usb_device_handle_impl.h" #include "device/usb/usb_error.h" @@ -10,5 +10,5 @@ #include "third_party/libusb/src/libusb/libusb.h" +#endif - #if defined(OS_CHROMEOS) - #include "chromeos/dbus/dbus_thread_manager.h" + 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 c97d848a21a3..61db73d2da56 100644 --- a/www/chromium/files/patch-device_usb_usb__error.cc +++ b/www/chromium/files/patch-device_usb_usb__error.cc @@ -1,4 +1,4 @@ ---- device/usb/usb_error.cc.orig 2016-03-25 13:04:49 UTC +--- device/usb/usb_error.cc.orig 2017-01-26 00:49:14 UTC +++ device/usb/usb_error.cc @@ -4,7 +4,11 @@ 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 4953aea84351..5110bdc65838 100644 --- a/www/chromium/files/patch-device_usb_usb__service__impl.cc +++ b/www/chromium/files/patch-device_usb_usb__service__impl.cc @@ -1,5 +1,5 @@ ---- device/usb/usb_service_impl.cc.orig 2016-10-06 04:02:19.000000000 +0300 -+++ device/usb/usb_service_impl.cc 2016-10-13 07:29:44.662206000 +0300 +--- device/usb/usb_service_impl.cc.orig 2017-01-26 00:49:14 UTC ++++ device/usb/usb_service_impl.cc @@ -26,7 +26,11 @@ #include "device/usb/usb_error.h" #include "device/usb/webusb_descriptors.h" @@ -13,7 +13,7 @@ #if defined(OS_WIN) #include <setupapi.h> -@@ -213,6 +217,7 @@ +@@ -213,6 +217,7 @@ UsbServiceImpl::UsbServiceImpl( } context_ = new UsbContext(platform_context); @@ -21,7 +21,7 @@ rv = libusb_hotplug_register_callback( context_->context(), static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -225,6 +230,8 @@ +@@ -225,6 +230,8 @@ UsbServiceImpl::UsbServiceImpl( } RefreshDevices(); @@ -30,7 +30,7 @@ #if defined(OS_WIN) DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); if (device_monitor) { -@@ -234,8 +241,10 @@ +@@ -234,8 +241,10 @@ UsbServiceImpl::UsbServiceImpl( } UsbServiceImpl::~UsbServiceImpl() { @@ -41,7 +41,7 @@ for (auto* platform_device : ignored_devices_) libusb_unref_device(platform_device); } -@@ -477,6 +486,7 @@ +@@ -477,6 +486,7 @@ void UsbServiceImpl::RemoveDevice(scoped device->OnDisconnect(); } @@ -49,7 +49,7 @@ // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, -@@ -514,6 +524,7 @@ +@@ -514,6 +524,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC return 0; } diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.h b/www/chromium/files/patch-device_usb_usb__service__impl.h index de86e5a41dd9..ce6bbaed0253 100644 --- a/www/chromium/files/patch-device_usb_usb__service__impl.h +++ b/www/chromium/files/patch-device_usb_usb__service__impl.h @@ -1,4 +1,4 @@ ---- device/usb/usb_service_impl.h.orig 2016-05-11 19:02:22 UTC +--- device/usb/usb_service_impl.h.orig 2017-01-26 00:49:14 UTC +++ device/usb/usb_service_impl.h @@ -15,7 +15,13 @@ #include "build/build_config.h" @@ -14,7 +14,7 @@ #if defined(OS_WIN) #include "base/scoped_observer.h" -@@ -71,11 +77,13 @@ class UsbServiceImpl : +@@ -70,11 +76,13 @@ class UsbServiceImpl : scoped_refptr<UsbDeviceImpl> device); void RemoveDevice(scoped_refptr<UsbDeviceImpl> device); @@ -28,7 +28,7 @@ // These functions release a reference to the provided platform device. void OnPlatformDeviceAdded(PlatformUsbDevice platform_device); void OnPlatformDeviceRemoved(PlatformUsbDevice platform_device); -@@ -88,7 +96,9 @@ class UsbServiceImpl : +@@ -90,7 +98,9 @@ class UsbServiceImpl : // connected instead of only when a full enumeration is requested. // TODO(reillyg): Support this on all platforms. crbug.com/411715 bool hotplug_enabled_ = false; 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 d4f75b18284b..58b5497577cd 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,6 +1,6 @@ ---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2016-05-11 19:02:22 UTC +--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2017-01-26 00:49:14 UTC +++ extensions/browser/api/declarative_webrequest/webrequest_action.cc -@@ -28,7 +28,11 @@ +@@ -29,7 +29,11 @@ #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/http/http_util.h" #include "net/url_request/url_request.h" diff --git a/www/chromium/files/patch-extensions_browser_api_networking_private_networking__private__event__router__factory.cc b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc index d20a1b8ae4a0..1ea965100688 100644 --- a/www/chromium/files/patch-extensions_browser_api_networking_private_networking__private__event__router__factory.cc +++ b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc @@ -1,5 +1,5 @@ ---- extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig 2016-12-16 19:26:17.392697000 +0000 -+++ extensions/browser/api/networking_private/networking_private_event_router_factory.cc 2016-12-16 19:29:29.232668000 +0000 +--- extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig 2017-01-26 00:49:14 UTC ++++ extensions/browser/api/networking_private/networking_private_event_router_factory.cc @@ -13,6 +13,7 @@ namespace extensions { @@ -8,7 +8,7 @@ // static NetworkingPrivateEventRouter* NetworkingPrivateEventRouterFactory::GetForProfile( -@@ -57,5 +58,6 @@ +@@ -57,5 +58,6 @@ bool NetworkingPrivateEventRouterFactory bool NetworkingPrivateEventRouterFactory::ServiceIsNULLWhileTesting() const { return true; } diff --git a/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc b/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc index c551aa4881a2..c71eed2a8d3f 100644 --- a/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc +++ b/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/serial/serial_api.cc.orig 2016-08-12 04:05:07.712438000 +0300 -+++ extensions/browser/api/serial/serial_api.cc 2016-08-12 04:06:56.974572000 +0300 -@@ -85,12 +85,13 @@ +--- extensions/browser/api/serial/serial_api.cc.orig 2017-01-26 00:49:14 UTC ++++ extensions/browser/api/serial/serial_api.cc +@@ -85,12 +85,13 @@ bool SerialGetDevicesFunction::Prepare() void SerialGetDevicesFunction::Work() { DCHECK_CURRENTLY_ON(BrowserThread::FILE); diff --git a/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc b/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc index 548c1402578e..9abb79dd187a 100644 --- a/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc +++ b/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/web_request/form_data_parser.cc.orig 2016-05-11 19:02:22 UTC +--- extensions/browser/api/web_request/form_data_parser.cc.orig 2017-01-26 00:49:14 UTC +++ extensions/browser/api/web_request/form_data_parser.cc @@ -15,7 +15,11 @@ #include "base/values.h" diff --git a/www/chromium/files/patch-extensions_common_image__util.cc b/www/chromium/files/patch-extensions_common_image__util.cc index 35efa55d4ae3..ebbe10062b74 100644 --- a/www/chromium/files/patch-extensions_common_image__util.cc +++ b/www/chromium/files/patch-extensions_common_image__util.cc @@ -1,4 +1,4 @@ ---- extensions/common/image_util.cc.orig 2016-05-11 19:02:22 UTC +--- extensions/common/image_util.cc.orig 2017-01-26 00:49:14 UTC +++ extensions/common/image_util.cc @@ -11,7 +11,11 @@ #include "base/strings/string_number_conversions.h" @@ -10,5 +10,5 @@ #include "third_party/re2/src/re2/re2.h" +#endif #include "third_party/skia/include/core/SkColor.h" + #include "third_party/skia/include/utils/SkParse.h" #include "ui/gfx/color_utils.h" - diff --git a/www/chromium/files/patch-extensions_common_stack__frame.cc b/www/chromium/files/patch-extensions_common_stack__frame.cc index 8ec9f8bcd9b7..5338f975fbd0 100644 --- a/www/chromium/files/patch-extensions_common_stack__frame.cc +++ b/www/chromium/files/patch-extensions_common_stack__frame.cc @@ -1,4 +1,4 @@ ---- extensions/common/stack_frame.cc.orig 2016-05-11 19:02:22 UTC +--- extensions/common/stack_frame.cc.orig 2017-01-26 00:49:14 UTC +++ extensions/common/stack_frame.cc @@ -7,7 +7,11 @@ #include <string> diff --git a/www/chromium/files/patch-gpu_BUILD.gn b/www/chromium/files/patch-gpu_BUILD.gn index 84053ad88efe..b052d6e2e047 100644 --- a/www/chromium/files/patch-gpu_BUILD.gn +++ b/www/chromium/files/patch-gpu_BUILD.gn @@ -1,6 +1,6 @@ ---- gpu/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 -+++ gpu/BUILD.gn 2016-09-02 23:58:15.934039000 +0300 -@@ -122,7 +122,7 @@ +--- gpu/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ gpu/BUILD.gn +@@ -93,7 +93,7 @@ test("command_buffer_gles2_tests") { libs += [ "android" ] deps += [ "//ui/android:ui_java" ] } diff --git a/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc b/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc index 5e3bc489efc1..dab811cbaa32 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc @@ -1,8 +1,8 @@ ---- gpu/command_buffer/service/program_manager.cc.orig 2016-05-11 19:02:23 UTC +--- gpu/command_buffer/service/program_manager.cc.orig 2017-01-26 00:49:14 UTC +++ gpu/command_buffer/service/program_manager.cc -@@ -29,7 +29,11 @@ - #include "gpu/command_buffer/service/gpu_switches.h" +@@ -31,7 +31,11 @@ #include "gpu/command_buffer/service/program_cache.h" + #include "gpu/command_buffer/service/progress_reporter.h" #include "gpu/command_buffer/service/shader_manager.h" +#if defined(OS_BSD) +#include <re2/re2.h> diff --git a/www/chromium/files/patch-gpu_config_BUILD.gn b/www/chromium/files/patch-gpu_config_BUILD.gn index 0298598669f4..454821f59bbe 100644 --- a/www/chromium/files/patch-gpu_config_BUILD.gn +++ b/www/chromium/files/patch-gpu_config_BUILD.gn @@ -1,6 +1,6 @@ ---- gpu/config/BUILD.gn.orig 2016-10-06 04:02:20.000000000 +0300 -+++ gpu/config/BUILD.gn 2016-10-29 18:18:32.848959000 +0300 -@@ -8,7 +8,8 @@ +--- gpu/config/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ gpu/config/BUILD.gn +@@ -8,7 +8,8 @@ import("//build/config/ui.gni") declare_args() { # Use the PCI lib to collect GPU information on Linux. @@ -10,7 +10,7 @@ (use_x11 || use_ozone) } -@@ -97,6 +98,14 @@ +@@ -97,6 +98,14 @@ source_set("config_sources") { ] } } diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc index 37b43f3f02d4..c6e7a7854994 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_control_list.cc.orig 2016-07-20 22:03:25.000000000 +0300 -+++ gpu/config/gpu_control_list.cc 2016-08-11 00:15:11.700069000 +0300 -@@ -17,7 +17,11 @@ +--- gpu/config/gpu_control_list.cc.orig 2017-01-26 00:49:14 UTC ++++ gpu/config/gpu_control_list.cc +@@ -19,7 +19,11 @@ #include "base/sys_info.h" #include "gpu/config/gpu_info.h" #include "gpu/config/gpu_util.h" @@ -9,10 +9,10 @@ +#else #include "third_party/re2/src/re2/re2.h" +#endif - + namespace gpu { namespace { -@@ -1137,7 +1141,7 @@ +@@ -1154,7 +1158,7 @@ GpuControlList::GpuControlListEntry::GLT GpuControlList::GpuControlListEntry::GetDefaultGLType() { #if defined(OS_CHROMEOS) return kGLTypeGL; @@ -21,7 +21,7 @@ return kGLTypeGL; #elif defined(OS_MACOSX) return kGLTypeGL; -@@ -1575,7 +1579,7 @@ +@@ -1606,7 +1610,7 @@ GpuControlList::OsType GpuControlList::G return kOsWin; #elif defined(OS_ANDROID) return kOsAndroid; diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc b/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc index b6b427da9ab6..afb27967e7c9 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_control_list_unittest.cc.orig 2016-05-11 19:02:23 UTC +--- gpu/config/gpu_control_list_unittest.cc.orig 2017-01-26 00:49:14 UTC +++ gpu/config/gpu_control_list_unittest.cc @@ -175,8 +175,7 @@ TEST_F(GpuControlListTest, VendorOnAllOs features = control_list->MakeDecision( diff --git a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc index 428cb20ceec2..7608cfed284d 100644 --- a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc +++ b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_info_collector.cc.orig 2016-05-11 19:02:23 UTC +--- gpu/config/gpu_info_collector.cc.orig 2017-01-26 00:49:14 UTC +++ gpu/config/gpu_info_collector.cc -@@ -167,8 +167,10 @@ CollectInfoResult CollectGraphicsInfoGL( +@@ -193,8 +193,10 @@ CollectInfoResult CollectGraphicsInfoGL( gpu_info->pixel_shader_version = glsl_version; gpu_info->vertex_shader_version = glsl_version; 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 1beca5d603e9..65a4eff8ae4a 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 2016-05-11 19:02:23 UTC +--- gpu/config/gpu_test_config.cc.orig 2017-01-26 00:49:14 UTC +++ gpu/config/gpu_test_config.cc -@@ -26,7 +26,7 @@ namespace { +@@ -24,7 +24,7 @@ namespace { GPUTestConfig::OS GetCurrentOS() { #if defined(OS_CHROMEOS) return GPUTestConfig::kOsChromeOS; @@ -9,7 +9,7 @@ return GPUTestConfig::kOsLinux; #elif defined(OS_WIN) int32_t major_version = 0; -@@ -252,6 +252,10 @@ bool GPUTestBotConfig::LoadCurrentConfig +@@ -255,6 +255,10 @@ bool GPUTestBotConfig::LoadCurrentConfig bool rt; if (gpu_info == NULL) { GPUInfo my_gpu_info; @@ -20,7 +20,7 @@ CollectInfoResult result = CollectGpuID( &my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id); if (result != kCollectInfoSuccess) { -@@ -261,6 +265,7 @@ bool GPUTestBotConfig::LoadCurrentConfig +@@ -264,6 +268,7 @@ bool GPUTestBotConfig::LoadCurrentConfig } else { rt = SetGPUInfo(my_gpu_info); } diff --git a/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn b/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn index f5f6a43af132..fa54c915c67a 100644 --- a/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn +++ b/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn @@ -1,6 +1,6 @@ ---- gpu/gles2_conform_support/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 -+++ gpu/gles2_conform_support/BUILD.gn 2016-09-02 23:59:14.071065000 +0300 -@@ -62,7 +62,7 @@ +--- gpu/gles2_conform_support/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ gpu/gles2_conform_support/BUILD.gn +@@ -60,7 +60,7 @@ executable("gles2_conform_support") { "//gpu/gles2_conform_support/egl", "//ui/gl", ] @@ -9,7 +9,7 @@ sources += [ "native/egl_native_aura.cc", "native/egl_native_x11.cc", -@@ -132,7 +132,7 @@ +@@ -413,7 +413,7 @@ if (internal_gles2_conform_tests) { # Must be done this way for warning flags to be ordered correctly. ":gles2_conform_test_warnings", ] diff --git a/www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn b/www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn index f3d752410d38..b95cde816fe6 100644 --- a/www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn +++ b/www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn @@ -1,6 +1,6 @@ ---- gpu/gles2_conform_support/native/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 -+++ gpu/gles2_conform_support/native/BUILD.gn 2016-09-02 23:58:43.787930000 +0300 -@@ -21,7 +21,7 @@ +--- gpu/gles2_conform_support/native/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ gpu/gles2_conform_support/native/BUILD.gn +@@ -20,7 +20,7 @@ source_set("native") { "//gpu/gles2_conform_support/egl", "//ui/gl", ] diff --git a/www/chromium/files/patch-gpu_ipc_client_BUILD.gn b/www/chromium/files/patch-gpu_ipc_client_BUILD.gn index 620944b9f9b4..8a994a23df35 100644 --- a/www/chromium/files/patch-gpu_ipc_client_BUILD.gn +++ b/www/chromium/files/patch-gpu_ipc_client_BUILD.gn @@ -1,6 +1,6 @@ ---- gpu/ipc/client/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 -+++ gpu/ipc/client/BUILD.gn 2016-10-10 14:54:17.518422000 +0300 -@@ -53,6 +53,7 @@ +--- gpu/ipc/client/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ gpu/ipc/client/BUILD.gn +@@ -51,6 +51,7 @@ source_set("ipc_client_sources") { configs += [ "//build/config/compiler:no_size_t_to_int_warning", "//gpu:gpu_implementation", diff --git a/www/chromium/files/patch-gpu_ipc_service_BUILD.gn b/www/chromium/files/patch-gpu_ipc_service_BUILD.gn index ad48f8fde7a3..77f7218d9b46 100644 --- a/www/chromium/files/patch-gpu_ipc_service_BUILD.gn +++ b/www/chromium/files/patch-gpu_ipc_service_BUILD.gn @@ -1,6 +1,6 @@ ---- gpu/ipc/service/BUILD.gn.orig 2016-12-13 11:53:02 UTC +--- gpu/ipc/service/BUILD.gn.orig 2017-01-26 00:49:14 UTC +++ gpu/ipc/service/BUILD.gn -@@ -102,11 +102,12 @@ target(link_target_type, "ipc_service_so +@@ -104,11 +104,12 @@ target(link_target_type, "ipc_service_so ] libs += [ "android" ] } 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 6c0ed6afeb04..4f3dc87cf4b1 100644 --- a/www/chromium/files/patch-gpu_ipc_service__gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2016-12-13 14:02:18.031408000 +0000 -+++ gpu/ipc/service/gpu_init.cc 2016-12-13 15:15:22.748312000 +0000 -@@ -75,7 +75,7 @@ +--- gpu/ipc/service/gpu_init.cc.orig 2017-01-26 00:49:14 UTC ++++ gpu/ipc/service/gpu_init.cc +@@ -75,7 +75,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI } } @@ -9,7 +9,7 @@ void CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { TRACE_EVENT0("gpu,startup", "Collect Graphics Info"); -@@ -94,7 +94,7 @@ +@@ -94,7 +94,7 @@ void CollectGraphicsInfo(gpu::GPUInfo& g break; } } @@ -18,7 +18,7 @@ #if defined(OS_LINUX) && !defined(OS_CHROMEOS) bool CanAccessNvidiaDeviceFile() { -@@ -189,7 +189,7 @@ +@@ -189,7 +189,7 @@ bool GpuInit::InitializeAndStartSandbox( // 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. base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now(); @@ -27,7 +27,7 @@ CollectGraphicsInfo(gpu_info_); if (gpu_info_.context_info_state == gpu::kCollectInfoFatalFailure) return false; -@@ -206,7 +206,7 @@ +@@ -206,7 +206,7 @@ bool GpuInit::InitializeAndStartSandbox( gpu::ApplyGpuDriverBugWorkarounds( gpu_info_, const_cast<base::CommandLine*>(&command_line)); } diff --git a/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn b/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn index 3fe5bff6cab5..ccdd6bb338c6 100644 --- a/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn +++ b/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn @@ -1,4 +1,4 @@ ---- gpu/tools/compositor_model_bench/BUILD.gn.orig 2016-12-12 22:09:19 UTC +--- gpu/tools/compositor_model_bench/BUILD.gn.orig 2017-01-26 00:49:14 UTC +++ gpu/tools/compositor_model_bench/BUILD.gn @@ -4,7 +4,7 @@ diff --git a/www/chromium/files/patch-gpu_vulkan_BUILD.gn b/www/chromium/files/patch-gpu_vulkan_BUILD.gn index ee3ff927bdab..50279a96504a 100644 --- a/www/chromium/files/patch-gpu_vulkan_BUILD.gn +++ b/www/chromium/files/patch-gpu_vulkan_BUILD.gn @@ -1,6 +1,6 @@ ---- gpu/vulkan/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 -+++ gpu/vulkan/BUILD.gn 2016-09-02 23:57:07.910753000 +0300 -@@ -13,7 +13,7 @@ +--- gpu/vulkan/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ gpu/vulkan/BUILD.gn +@@ -14,7 +14,7 @@ if (enable_vulkan) { component("vulkan") { output_name = "vulkan_wrapper" diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h index c40e63eebca4..8f3c7af1cbb6 100644 --- a/www/chromium/files/patch-ipc_ipc__channel.h +++ b/www/chromium/files/patch-ipc_ipc__channel.h @@ -1,9 +1,9 @@ ---- ipc/ipc_channel.h.orig 2016-08-13 00:25:04.291611000 +0300 -+++ ipc/ipc_channel.h 2016-08-13 00:09:06.758895000 +0300 -@@ -223,7 +223,7 @@ - static std::string GenerateVerifiedChannelID(const std::string& prefix); +--- ipc/ipc_channel.h.orig 2017-01-26 00:49:15 UTC ++++ ipc/ipc_channel.h +@@ -245,7 +245,7 @@ class IPC_EXPORT Channel : public Sender + static std::string GenerateUniqueRandomChannelID(); #endif - + -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Sandboxed processes live in a PID namespace, so when sending the IPC hello diff --git a/www/chromium/files/patch-ipc_ipc__channel__posix.cc b/www/chromium/files/patch-ipc_ipc__channel__posix.cc deleted file mode 100644 index b22538341b23..000000000000 --- a/www/chromium/files/patch-ipc_ipc__channel__posix.cc +++ /dev/null @@ -1,64 +0,0 @@ ---- ipc/ipc_channel_posix.cc.orig 2016-07-20 22:03:25.000000000 +0300 -+++ ipc/ipc_channel_posix.cc 2016-08-13 00:06:40.205716000 +0300 -@@ -183,9 +183,9 @@ - - //------------------------------------------------------------------------------ - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - int ChannelPosix::global_pid_ = 0; --#endif // OS_LINUX -+#endif // OS_LINUX || defined(OS_BSD) - - ChannelPosix::ChannelPosix(const IPC::ChannelHandle& channel_handle, - Mode mode, -@@ -613,7 +613,7 @@ - return base::PathExists(base::FilePath(channel_id)); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // static - void ChannelPosix::SetGlobalPid(int pid) { - global_pid_ = pid; -@@ -622,7 +622,7 @@ - int ChannelPosix::GetGlobalPid() { - return global_pid_; - } --#endif // OS_LINUX -+#endif // OS_LINUX || defined(OS_BSD) - - // Called by libevent when we can read from the pipe without blocking. - void ChannelPosix::OnFileCanReadWithoutBlocking(int fd) { -@@ -813,12 +813,12 @@ - return -1; - #else - int pid = base::GetCurrentProcId(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Our process may be in a sandbox with a separate PID namespace. - if (global_pid_) { - pid = global_pid_; - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - return pid; - #endif // defined(OS_NACL_NONSFI) - } -@@ -1135,7 +1135,7 @@ - return ChannelPosix::IsNamedServerInitialized(channel_id); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // static - void Channel::SetGlobalPid(int pid) { - ChannelPosix::SetGlobalPid(pid); -@@ -1143,6 +1143,6 @@ - int Channel::GetGlobalPid() { - return ChannelPosix::GetGlobalPid(); - } --#endif // OS_LINUX -+#endif // OS_LINUX || defined(OS_BSD) - - } // namespace IPC diff --git a/www/chromium/files/patch-ipc_ipc__channel__posix.h b/www/chromium/files/patch-ipc_ipc__channel__posix.h deleted file mode 100644 index e0d4690c6c55..000000000000 --- a/www/chromium/files/patch-ipc_ipc__channel__posix.h +++ /dev/null @@ -1,28 +0,0 @@ ---- ipc/ipc_channel_posix.h.orig 2016-08-13 00:22:20.959322000 +0300 -+++ ipc/ipc_channel_posix.h 2016-08-13 00:07:29.393338000 +0300 -@@ -63,10 +63,10 @@ - void CloseClientFileDescriptor(); - - static bool IsNamedServerInitialized(const std::string& channel_id); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - static void SetGlobalPid(int pid); - static int GetGlobalPid(); --#endif // OS_LINUX -+#endif // OS_LINUX || defined(OS_BSD) - - private: - bool CreatePipe(const IPC::ChannelHandle& channel_handle); -@@ -209,10 +209,10 @@ - // True if we are responsible for unlinking the unix domain socket file. - bool must_unlink_; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // If non-zero, overrides the process ID sent in the hello message. - static int global_pid_; --#endif // OS_LINUX -+#endif // OS_LINUX || defined(OS_BSD) - - DISALLOW_IMPLICIT_CONSTRUCTORS(ChannelPosix); - }; diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index f3b95c29a0b7..d0f10648b6c4 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.cc.orig 2016-05-20 21:47:31 UTC +--- ipc/ipc_message_utils.cc.orig 2017-01-26 00:49:15 UTC +++ ipc/ipc_message_utils.cc -@@ -414,7 +414,7 @@ void ParamTraits<unsigned int>::Log(cons +@@ -425,7 +425,7 @@ void ParamTraits<unsigned int>::Log(cons l->append(base::UintToString(p)); } diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index 7267337263e1..4aab541cb1d1 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/chromium/files/patch-ipc_ipc__message__utils.h @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.h.orig 2016-05-20 21:46:12 UTC +--- ipc/ipc_message_utils.h.orig 2017-01-26 00:49:15 UTC +++ ipc/ipc_message_utils.h -@@ -193,7 +193,7 @@ struct ParamTraits<unsigned int> { +@@ -210,7 +210,7 @@ struct ParamTraits<unsigned int> { // 3) Android 64 bit also has int64_t typedef'd to long. // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. diff --git a/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc b/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc index f88654f232b4..660966f4d8ab 100644 --- a/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc +++ b/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc @@ -1,6 +1,6 @@ ---- media/audio/alsa/audio_manager_alsa.cc.orig 2016-04-07 19:01:10 UTC +--- media/audio/alsa/audio_manager_alsa.cc.orig 2017-01-26 00:49:15 UTC +++ media/audio/alsa/audio_manager_alsa.cc -@@ -128,7 +128,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic +@@ -135,7 +135,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic int card = -1; // Loop through the sound cards to get ALSA device hints. @@ -10,7 +10,7 @@ void** hints = NULL; int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { -@@ -140,7 +142,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic +@@ -147,7 +149,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: " << wrapper_->StrError(error); } @@ -20,7 +20,7 @@ } void AudioManagerAlsa::GetAlsaDevicesInfo( -@@ -226,7 +230,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail +@@ -230,7 +234,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail // goes through software conversion if needed (e.g. incompatible // sample rate). // TODO(joi): Should we prefer "hw" instead? @@ -32,7 +32,7 @@ return strncmp(kDeviceTypeDesired, device_name, arraysize(kDeviceTypeDesired) - 1) == 0; -@@ -250,7 +258,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe +@@ -254,7 +262,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe // Loop through the sound cards. // Don't use snd_device_name_hint(-1,..) since there is a access violation // inside this ALSA API with libasound.so.2.0.0. @@ -42,7 +42,7 @@ int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) { -@@ -274,7 +284,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe +@@ -278,7 +288,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: " << wrapper_->StrError(error); } diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn index 04c0e993ed51..9fe0294f3122 100644 --- a/www/chromium/files/patch-media_audio_BUILD.gn +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 -+++ media/audio/BUILD.gn 2016-09-25 15:11:18.731892000 +0300 -@@ -202,7 +202,7 @@ +--- media/audio/BUILD.gn.orig 2017-01-26 00:49:15 UTC ++++ media/audio/BUILD.gn +@@ -206,7 +206,7 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } @@ -9,7 +9,7 @@ sources += [ "linux/audio_manager_linux.cc" ] } -@@ -251,10 +251,12 @@ +@@ -255,10 +255,12 @@ source_set("audio") { configs += [ ":libpulse" ] } else { # TODO(ajwong): Technically, this dl should go in the action. diff --git a/www/chromium/files/patch-media_audio_audio__manager.cc b/www/chromium/files/patch-media_audio_audio__manager.cc index ee816c3b18e5..1e20e66587e3 100644 --- a/www/chromium/files/patch-media_audio_audio__manager.cc +++ b/www/chromium/files/patch-media_audio_audio__manager.cc @@ -1,6 +1,6 @@ ---- media/audio/audio_manager.cc.orig 2016-07-20 22:03:25.000000000 +0300 -+++ media/audio/audio_manager.cc 2016-08-01 04:22:25.372043000 +0300 -@@ -92,7 +92,7 @@ +--- media/audio/audio_manager.cc.orig 2017-01-26 00:49:15 UTC ++++ media/audio/audio_manager.cc +@@ -95,7 +95,7 @@ class AudioManagerHelper : public base:: } #endif @@ -9,7 +9,7 @@ void set_app_name(const std::string& app_name) { app_name_ = app_name; } const std::string& app_name() const { return app_name_; } #endif -@@ -250,7 +250,7 @@ +@@ -253,7 +253,7 @@ class AudioManagerHelper : public base:: std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_; #endif @@ -18,7 +18,7 @@ std::string app_name_; #endif -@@ -359,7 +359,7 @@ +@@ -365,7 +365,7 @@ void AudioManager::EnableCrashKeyLogging g_helper.Pointer()->enable_crash_key_logging(); } diff --git a/www/chromium/files/patch-media_audio_audio__manager.h b/www/chromium/files/patch-media_audio_audio__manager.h index 9ffa955e6f5a..7272a8ee46ec 100644 --- a/www/chromium/files/patch-media_audio_audio__manager.h +++ b/www/chromium/files/patch-media_audio_audio__manager.h @@ -1,6 +1,6 @@ ---- media/audio/audio_manager.h.orig 2016-05-11 19:02:23 UTC +--- media/audio/audio_manager.h.orig 2017-01-26 00:49:15 UTC +++ media/audio/audio_manager.h -@@ -68,7 +68,7 @@ class MEDIA_EXPORT AudioManager { +@@ -84,7 +84,7 @@ class MEDIA_EXPORT AudioManager { // See http://crbug.com/422522 static void EnableCrashKeyLoggingForAudioThreadHangs(); diff --git a/www/chromium/files/patch-media_base_BUILD.gn b/www/chromium/files/patch-media_base_BUILD.gn index c8c23b19edbc..613a23365fee 100644 --- a/www/chromium/files/patch-media_base_BUILD.gn +++ b/www/chromium/files/patch-media_base_BUILD.gn @@ -1,6 +1,6 @@ ---- media/base/BUILD.gn.orig 2016-08-03 22:02:19.000000000 +0300 -+++ media/base/BUILD.gn 2016-09-03 01:53:50.754526000 +0300 -@@ -281,7 +281,7 @@ +--- media/base/BUILD.gn.orig 2017-01-26 00:49:15 UTC ++++ media/base/BUILD.gn +@@ -309,7 +309,7 @@ target(link_target_type, "base") { allow_circular_includes_from += [ "//media/base/android" ] } @@ -9,7 +9,7 @@ configs += [ "//build/config/linux:x11", "//build/config/linux:xext", -@@ -317,7 +317,7 @@ +@@ -345,7 +345,7 @@ target(link_target_type, "base") { deps += [ ":media_yasm" ] } diff --git a/www/chromium/files/patch-media_capture_BUILD.gn b/www/chromium/files/patch-media_capture_BUILD.gn index cd11feceaf7e..06b5a73c85e7 100644 --- a/www/chromium/files/patch-media_capture_BUILD.gn +++ b/www/chromium/files/patch-media_capture_BUILD.gn @@ -1,6 +1,6 @@ ---- media/capture/BUILD.gn.orig 2016-08-03 22:02:20.000000000 +0300 -+++ media/capture/BUILD.gn 2016-10-10 16:10:21.736539000 +0300 -@@ -114,6 +114,16 @@ +--- media/capture/BUILD.gn.orig 2017-01-26 00:49:15 UTC ++++ media/capture/BUILD.gn +@@ -127,6 +127,16 @@ component("capture") { ] } @@ -15,5 +15,5 @@ + } + if (is_win) { - public_deps += [ "//media/base/win" ] - libs = [ + deps += [ + "//media/base", # For media_switches. diff --git a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc index 02f3ff7c8e3f..2e488adc54c0 100644 --- a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc @@ -1,6 +1,6 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2016-10-06 04:02:21.000000000 +0300 -+++ media/capture/video/fake_video_capture_device_factory.cc 2016-10-13 07:39:17.908794000 +0300 -@@ -49,7 +49,7 @@ +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2017-01-26 00:49:15 UTC ++++ media/capture/video/fake_video_capture_device_factory.cc +@@ -71,7 +71,7 @@ void FakeVideoCaptureDeviceFactory::GetD for (int n = 0; n < number_of_devices_; ++n) { device_descriptors->emplace_back(base::StringPrintf("fake_device_%d", n), base::StringPrintf("/dev/video%d", n), diff --git a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc index e1e7e96cab8b..f35681f0f3a3 100644 --- a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc @@ -1,6 +1,6 @@ ---- media/capture/video/file_video_capture_device_factory.cc.orig 2016-10-06 04:02:21.000000000 +0300 -+++ media/capture/video/file_video_capture_device_factory.cc 2016-10-13 07:41:41.678945000 +0300 -@@ -49,7 +49,7 @@ +--- media/capture/video/file_video_capture_device_factory.cc.orig 2017-01-26 00:49:15 UTC ++++ media/capture/video/file_video_capture_device_factory.cc +@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetD #elif defined(OS_MACOSX) command_line_file_path.value(), kFileVideoCaptureDeviceName, VideoCaptureApi::MACOSX_AVFOUNDATION diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc new file mode 100644 index 000000000000..b82e0df36270 --- /dev/null +++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc @@ -0,0 +1,25 @@ +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2017-01-26 00:49:15 UTC ++++ media/capture/video/linux/v4l2_capture_delegate.cc +@@ -4,7 +4,9 @@ + + #include "media/capture/video/linux/v4l2_capture_delegate.h" + ++#if !defined(OS_BSD) + #include <linux/version.h> ++#endif + #include <poll.h> + #include <sys/fcntl.h> + #include <sys/ioctl.h> +@@ -20,10 +22,10 @@ + #include "media/capture/video/blob_utils.h" + #include "media/capture/video/linux/video_capture_device_linux.h" + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++// #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) + // 16 bit depth, Realsense F200. + #define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ') +-#endif ++// #endif + + // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the + // format is introduced to kernel. diff --git a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc index 8b15e5a31fe2..45188576d681 100644 --- a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc +++ b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc @@ -1,5 +1,5 @@ ---- media/capture/video/linux/video_capture_device_linux.cc.orig 2016-10-06 04:02:21.000000000 +0300 -+++ media/capture/video/linux/video_capture_device_linux.cc 2016-10-13 09:50:59.750346000 +0300 +--- media/capture/video/linux/video_capture_device_linux.cc.orig 2017-01-26 00:49:15 UTC ++++ media/capture/video/linux/video_capture_device_linux.cc @@ -21,6 +21,7 @@ namespace media { @@ -8,7 +8,7 @@ // Translates Video4Linux pixel formats to Chromium pixel formats. // static VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( -@@ -34,6 +35,7 @@ +@@ -34,6 +35,7 @@ std::list<uint32_t> VideoCaptureDeviceLi bool favour_mjpeg) { return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); } @@ -16,7 +16,7 @@ VideoCaptureDeviceLinux::VideoCaptureDeviceLinux( const VideoCaptureDeviceDescriptor& device_descriptor) -@@ -47,6 +49,7 @@ +@@ -47,6 +49,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDe v4l2_thread_.Stop(); } @@ -24,7 +24,7 @@ void VideoCaptureDeviceLinux::AllocateAndStart( const VideoCaptureParams& params, std::unique_ptr<VideoCaptureDevice::Client> client) { -@@ -70,7 +73,13 @@ +@@ -70,7 +73,13 @@ void VideoCaptureDeviceLinux::AllocateAn params.requested_format.frame_size.height(), params.requested_format.frame_rate, base::Passed(&client))); } @@ -38,9 +38,9 @@ void VideoCaptureDeviceLinux::StopAndDeAllocate() { if (!v4l2_thread_.IsRunning()) return; // Wrong state. -@@ -81,7 +90,11 @@ - - capture_impl_ = NULL; +@@ -110,7 +119,11 @@ void VideoCaptureDeviceLinux::SetPhotoOp + base::Bind(&V4L2CaptureDelegate::SetPhotoOptions, capture_impl_, + base::Passed(&settings), base::Passed(&callback))); } +#else // !defined(OS_FREEBSD) +void VideoCaptureDeviceLinux::StopAndDeAllocate() {} @@ -50,7 +50,7 @@ void VideoCaptureDeviceLinux::SetRotation(int rotation) { if (v4l2_thread_.IsRunning()) { v4l2_thread_.task_runner()->PostTask( -@@ -89,6 +102,9 @@ +@@ -118,6 +131,9 @@ void VideoCaptureDeviceLinux::SetRotatio base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation)); } } diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc index 9f44af6b64a3..beb144f4d44d 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2016-12-12 21:21:34 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2017-01-26 00:49:15 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -184,7 +184,7 @@ void VideoCaptureDeviceClient::OnIncomin +@@ -193,7 +193,7 @@ void VideoCaptureDeviceClient::OnIncomin // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc index 1f6d879508b7..a88d1e0d757a 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device_factory.cc.orig 2016-08-13 01:27:17.328942000 +0300 -+++ media/capture/video/video_capture_device_factory.cc 2016-08-13 01:16:43.725148000 +0300 -@@ -18,6 +18,10 @@ +--- media/capture/video/video_capture_device_factory.cc.orig 2017-01-26 00:49:15 UTC ++++ media/capture/video/video_capture_device_factory.cc +@@ -18,6 +18,10 @@ namespace media { std::unique_ptr<VideoCaptureDeviceFactory> VideoCaptureDeviceFactory::CreateFactory( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { @@ -11,18 +11,18 @@ const base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); // Use a Fake or File Video Device Factory if the command line flags are -@@ -36,6 +40,7 @@ +@@ -36,6 +40,7 @@ VideoCaptureDeviceFactory::CreateFactory return std::unique_ptr<VideoCaptureDeviceFactory>( CreateVideoCaptureDeviceFactory(ui_task_runner)); } +#endif } - + VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { -@@ -56,7 +61,7 @@ - callback.Run(std::move(device_names)); +@@ -55,7 +60,7 @@ void VideoCaptureDeviceFactory::Enumerat + callback.Run(std::move(device_descriptors)); } - + -#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) && \ +#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_ANDROID) && \ !defined(OS_WIN) diff --git a/www/chromium/files/patch-media_cast_BUILD.gn b/www/chromium/files/patch-media_cast_BUILD.gn index 76376818a5ee..a7731a61f341 100644 --- a/www/chromium/files/patch-media_cast_BUILD.gn +++ b/www/chromium/files/patch-media_cast_BUILD.gn @@ -1,6 +1,6 @@ ---- media/cast/BUILD.gn.orig 2016-08-03 22:02:20.000000000 +0300 -+++ media/cast/BUILD.gn 2016-09-03 01:55:19.016112000 +0300 -@@ -385,7 +385,7 @@ +--- media/cast/BUILD.gn.orig 2017-01-26 00:49:15 UTC ++++ media/cast/BUILD.gn +@@ -356,7 +356,7 @@ test("cast_unittests") { } } @@ -9,8 +9,8 @@ # This is a target for the collection of cast development tools. They are # not built/linked into the Chromium browser. group("testing_tools") { -@@ -430,7 +430,7 @@ - "//build/win:default_exe_manifest", +@@ -410,7 +410,7 @@ if (is_win || is_mac || (is_linux && !is + "//ui/gfx/geometry", ] - if (is_linux && !is_chromeos && use_x11) { @@ -18,7 +18,7 @@ sources += [ "test/linux_output_window.cc", "test/linux_output_window.h", -@@ -525,7 +525,7 @@ +@@ -513,7 +513,7 @@ if (is_win || is_mac || (is_linux && !is } } diff --git a/www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni b/www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni index 62f26d603133..fd36cc0383f0 100644 --- a/www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni +++ b/www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni @@ -1,15 +1,15 @@ ---- media/cdm/ppapi/ppapi_cdm_adapter.gni.orig 2016-08-03 22:02:20.000000000 +0300 -+++ media/cdm/ppapi/ppapi_cdm_adapter.gni 2016-09-03 01:55:54.607135000 +0300 -@@ -7,7 +7,7 @@ - # depend on media/media_cdm_adapter.gyp:cdmadapter which would in turn modify - # your target with direct_dependent_settings. +--- media/cdm/ppapi/ppapi_cdm_adapter.gni.orig 2017-01-26 00:49:15 UTC ++++ media/cdm/ppapi/ppapi_cdm_adapter.gni +@@ -5,7 +5,7 @@ + # This template defines a CDM adapter target. Just use this as you would a + # normal target and everything should work correctly. template("ppapi_cdm_adapter") { - if (is_mac || is_linux) { + if (is_mac || is_linux || is_bsd) { _target_type = "loadable_module" } else { _target_type = "shared_library" -@@ -59,7 +59,7 @@ +@@ -57,7 +57,7 @@ template("ppapi_cdm_adapter") { libs += [ "rt" ] } diff --git a/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h b/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h new file mode 100644 index 000000000000..d4377275dc31 --- /dev/null +++ b/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h @@ -0,0 +1,19 @@ +--- media/ffmpeg/ffmpeg_common.h.orig 2017-01-26 00:49:15 UTC ++++ media/ffmpeg/ffmpeg_common.h +@@ -25,7 +25,7 @@ extern "C" { + // Disable deprecated features which result in spammy compile warnings. This + // list of defines must mirror those in the 'defines' section of FFmpeg's + // BUILD.gn file or the headers below will generate different structures! +-#define FF_API_CONVERGENCE_DURATION 0 ++//#define FF_API_CONVERGENCE_DURATION 0 + // Upstream libavcodec/utils.c still uses the deprecated + // av_dup_packet(), causing deprecation warnings. + // The normal fix for such things is to disable the feature as below, +@@ -39,7 +39,6 @@ extern "C" { + MSVC_PUSH_DISABLE_WARNING(4244); + #include <libavcodec/avcodec.h> + #include <libavformat/avformat.h> +-#include <libavformat/internal.h> + #include <libavformat/avio.h> + #include <libavutil/avutil.h> + #include <libavutil/imgutils.h> diff --git a/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc b/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc new file mode 100644 index 000000000000..78486f2affaf --- /dev/null +++ b/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc @@ -0,0 +1,27 @@ +--- media/filters/ffmpeg_demuxer.cc.orig 2017-01-26 00:49:15 UTC ++++ media/filters/ffmpeg_demuxer.cc +@@ -1198,24 +1198,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone + // If no estimate is found, the stream entry will be kInfiniteDuration. + std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, + kInfiniteDuration); +- const AVFormatInternal* internal = format_context->internal; +- if (internal && internal->packet_buffer && +- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) { +- struct AVPacketList* packet_buffer = internal->packet_buffer; +- while (packet_buffer != internal->packet_buffer_end) { +- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index), +- start_time_estimates.size()); +- const AVStream* stream = +- format_context->streams[packet_buffer->pkt.stream_index]; +- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) { +- const base::TimeDelta packet_pts = +- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); +- if (packet_pts < start_time_estimates[stream->index]) +- start_time_estimates[stream->index] = packet_pts; +- } +- packet_buffer = packet_buffer->next; +- } +- } + + std::unique_ptr<MediaTracks> media_tracks(new MediaTracks()); + diff --git a/www/chromium/files/patch-media_filters_vp9__parser.h b/www/chromium/files/patch-media_filters_vp9__parser.h index 32276cb448e8..a8f4ef0a7cfc 100644 --- a/www/chromium/files/patch-media_filters_vp9__parser.h +++ b/www/chromium/files/patch-media_filters_vp9__parser.h @@ -1,5 +1,5 @@ ---- media/filters/vp9_parser.h.orig 2016-05-25 15:01:03.000000000 -0400 -+++ media/filters/vp9_parser.h 2016-05-27 11:13:20.498371000 -0400 +--- media/filters/vp9_parser.h.orig 2017-01-26 00:49:15 UTC ++++ media/filters/vp9_parser.h @@ -14,6 +14,7 @@ #include <stddef.h> diff --git a/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc b/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc index 58595e8d4011..67b3c9ab9e88 100644 --- a/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc +++ b/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc @@ -1,4 +1,4 @@ ---- media/formats/common/offset_byte_queue.cc.orig 2016-03-25 13:04:49 UTC +--- media/formats/common/offset_byte_queue.cc.orig 2017-01-26 00:49:15 UTC +++ media/formats/common/offset_byte_queue.cc @@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t off *size = tail() - offset; diff --git a/www/chromium/files/patch-media_formats_common_offset__byte__queue.h b/www/chromium/files/patch-media_formats_common_offset__byte__queue.h index 4f5847cd315d..2a5b91474fff 100644 --- a/www/chromium/files/patch-media_formats_common_offset__byte__queue.h +++ b/www/chromium/files/patch-media_formats_common_offset__byte__queue.h @@ -1,4 +1,4 @@ ---- media/formats/common/offset_byte_queue.h.orig 2016-03-25 13:04:49 UTC +--- media/formats/common/offset_byte_queue.h.orig 2017-01-26 00:49:15 UTC +++ media/formats/common/offset_byte_queue.h @@ -36,15 +36,15 @@ class MEDIA_EXPORT OffsetByteQueue { // a null |buf| and a |size| of zero. diff --git a/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc index 960e2b52c490..c566c596118f 100644 --- a/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc +++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc @@ -1,6 +1,6 @@ ---- media/formats/mp2t/es_parser_adts.cc.orig 2016-05-11 19:02:24 UTC +--- media/formats/mp2t/es_parser_adts.cc.orig 2017-01-26 00:49:15 UTC +++ media/formats/mp2t/es_parser_adts.cc -@@ -62,11 +62,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts +@@ -54,11 +54,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts const uint8_t* es; es_queue_->Peek(&es, &es_size); @@ -15,7 +15,7 @@ const uint8_t* cur_buf = &es[offset]; if (!isAdtsSyncWord(cur_buf)) continue; -@@ -104,7 +104,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts +@@ -96,7 +96,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts return true; } diff --git a/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc index bd5a0a3c2792..47f192dee041 100644 --- a/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc +++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc @@ -1,6 +1,6 @@ ---- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2016-05-11 19:02:24 UTC +--- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2017-01-26 00:49:15 UTC +++ media/formats/mp2t/es_parser_mpeg1audio.cc -@@ -110,11 +110,11 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud +@@ -109,11 +109,11 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud const uint8_t* es; es_queue_->Peek(&es, &es_size); @@ -15,7 +15,7 @@ const uint8_t* cur_buf = &es[offset]; if (cur_buf[0] != 0xff) continue; -@@ -155,7 +155,7 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud +@@ -154,7 +154,7 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud return true; } diff --git a/www/chromium/files/patch-mojo_BUILD.gn b/www/chromium/files/patch-mojo_BUILD.gn index 8688d7d4e64b..3c361a99f69b 100644 --- a/www/chromium/files/patch-mojo_BUILD.gn +++ b/www/chromium/files/patch-mojo_BUILD.gn @@ -1,4 +1,4 @@ ---- mojo/BUILD.gn.orig 2016-12-12 22:10:20 UTC +--- mojo/BUILD.gn.orig 2017-01-26 00:49:15 UTC +++ mojo/BUILD.gn @@ -12,7 +12,7 @@ group("mojo") { "//mojo/common", diff --git a/www/chromium/files/patch-mojo_edk_test_BUILD.gn b/www/chromium/files/patch-mojo_edk_test_BUILD.gn index 04d924099fc3..e1b2450ab0c8 100644 --- a/www/chromium/files/patch-mojo_edk_test_BUILD.gn +++ b/www/chromium/files/patch-mojo_edk_test_BUILD.gn @@ -1,6 +1,6 @@ ---- mojo/edk/test/BUILD.gn.orig 2016-08-03 22:02:20.000000000 +0300 -+++ mojo/edk/test/BUILD.gn 2016-09-02 23:44:49.826221000 +0300 -@@ -43,7 +43,7 @@ +--- mojo/edk/test/BUILD.gn.orig 2017-01-26 00:49:15 UTC ++++ mojo/edk/test/BUILD.gn +@@ -48,7 +48,7 @@ source_set("run_all_unittests") { "//testing/gtest", ] @@ -9,7 +9,7 @@ public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } } -@@ -63,7 +63,7 @@ +@@ -68,7 +68,7 @@ source_set("run_all_perftests") { "run_all_perftests.cc", ] diff --git a/www/chromium/files/patch-native__client__sdk_src_BUILD.gn b/www/chromium/files/patch-native__client__sdk_src_BUILD.gn index 1fd657b08cce..9a7521b5d0fb 100644 --- a/www/chromium/files/patch-native__client__sdk_src_BUILD.gn +++ b/www/chromium/files/patch-native__client__sdk_src_BUILD.gn @@ -1,6 +1,6 @@ ---- native_client_sdk/src/BUILD.gn.orig 2016-08-03 22:02:20.000000000 +0300 -+++ native_client_sdk/src/BUILD.gn 2016-09-02 23:46:03.429042000 +0300 -@@ -7,7 +7,7 @@ +--- native_client_sdk/src/BUILD.gn.orig 2017-01-26 00:49:16 UTC ++++ native_client_sdk/src/BUILD.gn +@@ -7,7 +7,7 @@ import("//build/config/features.gni") declare_args() { # Set to true if cross compiling trusted (e.g. building sel_ldr_arm on x86) # binaries is supported. @@ -9,7 +9,7 @@ # Build the nacl SDK untrusted components. This is disabled by default since # not all NaCl untrusted compilers are in goma (e.g arm-nacl-glibc) -@@ -28,7 +28,7 @@ +@@ -28,7 +28,7 @@ if (enable_nacl) { "//native_client/src/trusted/service_runtime:sel_ldr", "//native_client/src/trusted/validator/driver:ncval_new", ] diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index df612dae3ecd..fc1185f04762 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,6 +1,6 @@ ---- net/BUILD.gn.orig 2016-10-06 04:02:22.000000000 +0300 -+++ net/BUILD.gn 2016-10-18 00:25:21.260605000 +0300 -@@ -175,6 +175,11 @@ +--- net/BUILD.gn.orig 2017-01-26 00:49:16 UTC ++++ net/BUILD.gn +@@ -153,6 +153,11 @@ component("net") { ] if (is_android) { sources -= [ "base/openssl_private_key_store_android.cc" ] @@ -12,7 +12,7 @@ } } else { if (is_android) { -@@ -298,6 +303,13 @@ +@@ -278,6 +283,13 @@ component("net") { sources -= [ "disk_cache/blockfile/file_posix.cc" ] } @@ -26,7 +26,7 @@ if (is_ios || is_mac) { sources += gypi_values.net_base_mac_ios_sources } -@@ -1025,7 +1037,7 @@ +@@ -966,7 +978,7 @@ if (!is_ios && !is_android) { } } @@ -35,7 +35,7 @@ executable("cachetool") { testonly = true sources = [ -@@ -1054,7 +1066,7 @@ +@@ -995,7 +1007,7 @@ if (is_linux || is_mac) { } } @@ -44,7 +44,7 @@ static_library("epoll_server") { sources = [ "tools/epoll_server/epoll_server.cc", -@@ -1160,7 +1172,7 @@ +@@ -1098,7 +1110,7 @@ if (is_android) { } } @@ -53,7 +53,7 @@ executable("disk_cache_memory_test") { testonly = true sources = [ -@@ -1353,7 +1365,7 @@ +@@ -1276,7 +1288,7 @@ test("net_unittests") { "third_party/nist-pkits/", ] @@ -62,7 +62,7 @@ deps += [ "//third_party/pyftpdlib/", "//third_party/pywebsocket/", -@@ -1376,7 +1388,7 @@ +@@ -1299,7 +1311,7 @@ test("net_unittests") { if (is_desktop_linux) { deps += [ ":epoll_quic_tools" ] } @@ -71,7 +71,7 @@ sources += gypi_values.net_linux_test_sources deps += [ ":epoll_quic_tools", -@@ -1392,6 +1404,12 @@ +@@ -1319,6 +1331,12 @@ test("net_unittests") { sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ] } diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.h b/www/chromium/files/patch-net_base_address__tracker__linux.h index feef6a125605..40de3887d7f4 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux.h +++ b/www/chromium/files/patch-net_base_address__tracker__linux.h @@ -1,5 +1,5 @@ ---- net/base/address_tracker_linux.h.orig 2016-05-25 15:01:03.000000000 -0400 -+++ net/base/address_tracker_linux.h 2016-05-27 11:17:51.228810000 -0400 +--- net/base/address_tracker_linux.h.orig 2017-01-26 00:49:16 UTC ++++ net/base/address_tracker_linux.h @@ -6,10 +6,12 @@ #define NET_BASE_ADDRESS_TRACKER_LINUX_H_ @@ -13,7 +13,7 @@ #include <stddef.h> #include <map> -@@ -33,8 +35,11 @@ +@@ -34,8 +36,11 @@ namespace internal { class NET_EXPORT_PRIVATE AddressTrackerLinux : public base::MessageLoopForIO::Watcher { public: diff --git a/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc b/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc index 9c4f6a61ecac..bd314415c892 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc +++ b/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc @@ -1,7 +1,7 @@ ---- net/base/address_tracker_linux_unittest.cc.orig 2016-05-11 19:02:24 UTC +--- net/base/address_tracker_linux_unittest.cc.orig 2017-01-26 00:49:16 UTC +++ net/base/address_tracker_linux_unittest.cc -@@ -8,7 +8,11 @@ - #include "base/threading/simple_thread.h" +@@ -4,7 +4,11 @@ + #include "net/base/address_tracker_linux.h" +#if defined(__linux__) @@ -10,5 +10,5 @@ +#include <net/if.h> +#endif - #include <vector> - + #include <memory> + #include <unordered_set> diff --git a/www/chromium/files/patch-net_base_mime__util__unittest.cc b/www/chromium/files/patch-net_base_mime__util__unittest.cc index 3dddf3a79711..0bb7e316d013 100644 --- a/www/chromium/files/patch-net_base_mime__util__unittest.cc +++ b/www/chromium/files/patch-net_base_mime__util__unittest.cc @@ -1,6 +1,6 @@ ---- net/base/mime_util_unittest.cc.orig 2016-03-25 13:04:50 UTC +--- net/base/mime_util_unittest.cc.orig 2017-01-26 00:49:16 UTC +++ net/base/mime_util_unittest.cc -@@ -241,7 +241,7 @@ TEST(MimeUtilTest, TestGetExtensionsForM +@@ -243,7 +243,7 @@ TEST(MimeUtilTest, TestGetExtensionsForM { "MeSsAge/*", 1, "eml" }, { "image/bmp", 1, "bmp" }, { "video/*", 6, "mp4" }, diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc index c6c013b68d7f..0a66dbe5911f 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,6 +1,6 @@ ---- net/base/network_change_notifier.cc.orig 2016-10-06 04:02:22.000000000 +0300 -+++ net/base/network_change_notifier.cc 2016-10-14 20:28:12.376281000 +0300 -@@ -533,7 +533,6 @@ +--- net/base/network_change_notifier.cc.orig 2017-01-26 00:49:16 UTC ++++ net/base/network_change_notifier.cc +@@ -533,7 +533,6 @@ NetworkChangeNotifier* NetworkChangeNoti #elif defined(OS_MACOSX) return new NetworkChangeNotifierMac(); #else @@ -8,7 +8,7 @@ return NULL; #endif } -@@ -753,7 +752,7 @@ +@@ -753,7 +752,7 @@ void NetworkChangeNotifier::LogOperatorC #endif } @@ -17,7 +17,7 @@ // static const internal::AddressTrackerLinux* NetworkChangeNotifier::GetAddressTracker() { -@@ -978,7 +977,7 @@ +@@ -978,7 +977,7 @@ NetworkChangeNotifier::NetworkChangeNoti network_change_calculator_->Init(); } diff --git a/www/chromium/files/patch-net_base_network__change__notifier.h b/www/chromium/files/patch-net_base_network__change__notifier.h index a647fbfac5fd..9725f74cf198 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.h +++ b/www/chromium/files/patch-net_base_network__change__notifier.h @@ -1,6 +1,6 @@ ---- net/base/network_change_notifier.h.orig 2016-08-03 22:02:21.000000000 +0300 -+++ net/base/network_change_notifier.h 2016-09-26 03:54:03.417293000 +0300 -@@ -26,7 +26,7 @@ +--- net/base/network_change_notifier.h.orig 2017-01-26 00:49:16 UTC ++++ net/base/network_change_notifier.h +@@ -26,7 +26,7 @@ struct NetworkInterface; typedef std::vector<NetworkInterface> NetworkInterfaceList; class URLRequest; @@ -9,7 +9,7 @@ namespace internal { class AddressTrackerLinux; } -@@ -329,7 +329,7 @@ +@@ -332,7 +332,7 @@ class NET_EXPORT NetworkChangeNotifier { // a large HOSTS file. static void GetDnsConfig(DnsConfig* config); @@ -18,7 +18,7 @@ // Returns the AddressTrackerLinux if present. static const internal::AddressTrackerLinux* GetAddressTracker(); #endif -@@ -485,7 +485,7 @@ +@@ -488,7 +488,7 @@ class NET_EXPORT NetworkChangeNotifier { const NetworkChangeCalculatorParams& params = NetworkChangeCalculatorParams()); diff --git a/www/chromium/files/patch-net_base_network__interfaces__linux.cc b/www/chromium/files/patch-net_base_network__interfaces__linux.cc index 2fec83fbf0c7..7fc9a0ea3a58 100644 --- a/www/chromium/files/patch-net_base_network__interfaces__linux.cc +++ b/www/chromium/files/patch-net_base_network__interfaces__linux.cc @@ -1,8 +1,8 @@ ---- net/base/network_interfaces_linux.cc.orig 2016-05-11 19:02:24 UTC +--- net/base/network_interfaces_linux.cc.orig 2017-01-26 00:49:16 UTC +++ net/base/network_interfaces_linux.cc -@@ -4,12 +4,14 @@ +@@ -6,12 +6,14 @@ - #include "net/base/network_interfaces_linux.h" + #include <memory> +#if !defined(OS_FREEBSD) #if !defined(OS_ANDROID) @@ -15,7 +15,7 @@ #include <set> #include <sys/ioctl.h> #include <sys/types.h> -@@ -44,6 +46,7 @@ bool TryConvertNativeToNetIPAttributes(i +@@ -49,6 +51,7 @@ bool TryConvertNativeToNetIPAttributes(i // are still progressing through duplicated address detection (DAD) // and shouldn't be used by the application layer until DAD process // is completed. @@ -23,7 +23,7 @@ if (native_attributes & ( #if !defined(OS_ANDROID) IFA_F_OPTIMISTIC | IFA_F_DADFAILED | -@@ -61,6 +64,10 @@ bool TryConvertNativeToNetIPAttributes(i +@@ -66,6 +69,10 @@ bool TryConvertNativeToNetIPAttributes(i } return true; @@ -34,7 +34,7 @@ } } // namespace -@@ -79,13 +86,15 @@ NetworkChangeNotifier::ConnectionType Ge +@@ -80,13 +87,15 @@ NetworkChangeNotifier::ConnectionType Ge if (!s.is_valid()) return NetworkChangeNotifier::CONNECTION_UNKNOWN; @@ -51,7 +51,7 @@ // Test ethtool for CONNECTION_ETHERNET struct ethtool_cmd ecmd = {}; ecmd.cmd = ETHTOOL_GSET; -@@ -94,12 +103,13 @@ NetworkChangeNotifier::ConnectionType Ge +@@ -95,12 +104,13 @@ NetworkChangeNotifier::ConnectionType Ge strncpy(ifr.ifr_name, ifname.c_str(), IFNAMSIZ - 1); if (ioctl(s.get(), SIOCETHTOOL, &ifr) != -1) return NetworkChangeNotifier::CONNECTION_ETHERNET; @@ -66,7 +66,7 @@ base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0)); if (!ioctl_socket.is_valid()) return ""; -@@ -111,9 +121,11 @@ std::string GetInterfaceSSID(const std:: +@@ -112,9 +122,11 @@ std::string GetInterfaceSSID(const std:: wreq.u.essid.length = IW_ESSID_MAX_SIZE; if (ioctl(ioctl_socket.get(), SIOCGIWESSID, &wreq) != -1) return ssid; @@ -78,7 +78,7 @@ bool GetNetworkListImpl( NetworkInterfaceList* networks, int policy, -@@ -182,6 +194,7 @@ bool GetNetworkListImpl( +@@ -183,6 +195,7 @@ bool GetNetworkListImpl( return true; } @@ -86,7 +86,7 @@ std::string GetWifiSSIDFromInterfaceListInternal( const NetworkInterfaceList& interfaces, -@@ -206,12 +219,16 @@ bool GetNetworkList(NetworkInterfaceList +@@ -207,12 +220,16 @@ bool GetNetworkList(NetworkInterfaceList if (networks == NULL) return false; diff --git a/www/chromium/files/patch-net_base_network__interfaces__posix.cc b/www/chromium/files/patch-net_base_network__interfaces__posix.cc index b74d1ed8aa97..9231d12f8196 100644 --- a/www/chromium/files/patch-net_base_network__interfaces__posix.cc +++ b/www/chromium/files/patch-net_base_network__interfaces__posix.cc @@ -1,4 +1,4 @@ ---- net/base/network_interfaces_posix.cc.orig 2016-05-11 19:02:24 UTC +--- net/base/network_interfaces_posix.cc.orig 2017-01-26 00:49:16 UTC +++ net/base/network_interfaces_posix.cc @@ -20,6 +20,7 @@ namespace net { #if !defined(OS_NACL) diff --git a/www/chromium/files/patch-net_dns_address__sorter__posix.cc b/www/chromium/files/patch-net_dns_address__sorter__posix.cc index cdc2f6880222..cb1b3be7804c 100644 --- a/www/chromium/files/patch-net_dns_address__sorter__posix.cc +++ b/www/chromium/files/patch-net_dns_address__sorter__posix.cc @@ -1,6 +1,6 @@ ---- net/dns/address_sorter_posix.cc.orig 2016-05-11 19:02:24 UTC +--- net/dns/address_sorter_posix.cc.orig 2017-01-26 00:49:16 UTC +++ net/dns/address_sorter_posix.cc -@@ -11,6 +11,7 @@ +@@ -13,6 +13,7 @@ #include <sys/socket.h> // Must be included before ifaddrs.h. #include <ifaddrs.h> #include <net/if.h> diff --git a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc index 60a9ee24b5d1..38e160e3cae5 100644 --- a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc +++ b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc @@ -1,4 +1,4 @@ ---- net/dns/dns_config_service_posix_unittest.cc.orig 2016-12-12 22:12:11 UTC +--- net/dns/dns_config_service_posix_unittest.cc.orig 2017-01-26 00:49:16 UTC +++ net/dns/dns_config_service_posix_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be diff --git a/www/chromium/files/patch-net_dns_dns__reloader.cc b/www/chromium/files/patch-net_dns_dns__reloader.cc index 8fa4485f8ca5..6e4be983b0ac 100644 --- a/www/chromium/files/patch-net_dns_dns__reloader.cc +++ b/www/chromium/files/patch-net_dns_dns__reloader.cc @@ -1,4 +1,4 @@ ---- net/dns/dns_reloader.cc.orig 2016-03-25 13:04:50 UTC +--- net/dns/dns_reloader.cc.orig 2017-01-26 00:49:16 UTC +++ net/dns/dns_reloader.cc @@ -7,6 +7,10 @@ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc index 2d1b159a66a1..24482d4c7a96 100644 --- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc +++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc @@ -1,4 +1,4 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2016-05-11 19:02:24 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2017-01-26 00:49:16 UTC +++ net/http/http_auth_gssapi_posix.cc @@ -431,8 +431,8 @@ base::NativeLibrary GSSAPISharedLibrary: static const char* const kDefaultLibraryNames[] = { diff --git a/www/chromium/files/patch-net_http_http__network__session.cc b/www/chromium/files/patch-net_http_http__network__session.cc new file mode 100644 index 000000000000..cfcb720d4977 --- /dev/null +++ b/www/chromium/files/patch-net_http_http__network__session.cc @@ -0,0 +1,12 @@ +--- net/http/http_network_session.cc.orig 2017-01-26 00:49:16 UTC ++++ net/http/http_network_session.cc +@@ -17,7 +17,9 @@ + #include "base/strings/string_util.h" + #include "base/values.h" + #include "net/base/network_throttle_manager.h" ++#if defined(USE_KERBEROS) + #include "net/http/http_auth_handler_factory.h" ++#endif + #include "net/http/http_response_body_drainer.h" + #include "net/http/http_stream_factory_impl.h" + #include "net/http/url_security_manager.h" 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 22dcd0459b90..5c8b5fcc285e 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,5 +1,5 @@ ---- net/proxy/proxy_config_service_linux.cc.orig 2016-10-06 04:02:23.000000000 +0300 -+++ net/proxy/proxy_config_service_linux.cc 2016-10-13 08:05:04.653281000 +0300 +--- net/proxy/proxy_config_service_linux.cc.orig 2017-01-26 00:49:16 UTC ++++ net/proxy/proxy_config_service_linux.cc @@ -11,7 +11,14 @@ #include <limits.h> #include <stdio.h> @@ -15,7 +15,7 @@ #include <unistd.h> #include <map> -@@ -863,6 +870,7 @@ +@@ -863,6 +870,7 @@ class SettingGetterImplKDE : public Prox public: explicit SettingGetterImplKDE(base::Environment* env_var_getter) : inotify_fd_(-1), @@ -23,7 +23,7 @@ notify_delegate_(nullptr), debounce_timer_(new base::OneShotTimer()), indirect_manual_(false), -@@ -937,9 +945,10 @@ +@@ -937,9 +945,10 @@ class SettingGetterImplKDE : public Prox // and pending tasks may then be deleted without being run. // Here in the KDE version, we can safely close the file descriptor // anyway. (Not that it really matters; the process is exiting.) @@ -35,7 +35,7 @@ } bool Init(const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner, -@@ -948,9 +957,17 @@ +@@ -948,9 +957,17 @@ class SettingGetterImplKDE : public Prox // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; DCHECK_LT(inotify_fd_, 0); @@ -53,7 +53,7 @@ return false; } if (!base::SetNonBlocking(inotify_fd_)) { -@@ -974,22 +991,40 @@ +@@ -974,22 +991,40 @@ class SettingGetterImplKDE : public Prox close(inotify_fd_); inotify_fd_ = -1; } @@ -94,7 +94,7 @@ notify_delegate_ = delegate; if (!base::MessageLoopForIO::current()->WatchFileDescriptor( inotify_fd_, true, base::MessageLoopForIO::WATCH_READ, -@@ -1010,7 +1045,19 @@ +@@ -1010,7 +1045,19 @@ class SettingGetterImplKDE : public Prox void OnFileCanReadWithoutBlocking(int fd) override { DCHECK_EQ(fd, inotify_fd_); DCHECK(file_task_runner_->BelongsToCurrentThread()); @@ -114,7 +114,7 @@ } void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); } -@@ -1283,8 +1330,11 @@ +@@ -1283,8 +1330,11 @@ class SettingGetterImplKDE : public Prox void OnChangeNotification() { DCHECK_GE(inotify_fd_, 0); DCHECK(file_task_runner_->BelongsToCurrentThread()); @@ -127,7 +127,7 @@ ssize_t r; while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) { // inotify returns variable-length structures, which is why we have -@@ -1321,6 +1371,7 @@ +@@ -1321,6 +1371,7 @@ class SettingGetterImplKDE : public Prox inotify_fd_ = -1; } } @@ -135,7 +135,7 @@ if (kioslaverc_touched) { // We don't use Reset() because the timer may not yet be running. // (In that case Stop() is a no-op.) -@@ -1336,6 +1387,7 @@ +@@ -1336,6 +1387,7 @@ class SettingGetterImplKDE : public Prox std::vector<std::string> > strings_map_type; int inotify_fd_; diff --git a/www/chromium/files/patch-net_proxy_proxy__service.cc b/www/chromium/files/patch-net_proxy_proxy__service.cc index 46fc16d702e0..c3fb1bd4458f 100644 --- a/www/chromium/files/patch-net_proxy_proxy__service.cc +++ b/www/chromium/files/patch-net_proxy_proxy__service.cc @@ -1,6 +1,6 @@ ---- net/proxy/proxy_service.cc.orig 2016-07-20 22:03:27.000000000 +0300 -+++ net/proxy/proxy_service.cc 2016-08-01 04:25:47.866569000 +0300 -@@ -48,7 +48,7 @@ +--- net/proxy/proxy_service.cc.orig 2017-01-26 00:49:16 UTC ++++ net/proxy/proxy_service.cc +@@ -49,7 +49,7 @@ #elif defined(OS_MACOSX) #include "net/proxy/proxy_config_service_mac.h" #include "net/proxy/proxy_resolver_mac.h" @@ -9,7 +9,7 @@ #include "net/proxy/proxy_config_service_linux.h" #elif defined(OS_ANDROID) #include "net/proxy/proxy_config_service_android.h" -@@ -1542,7 +1542,7 @@ +@@ -1520,7 +1520,7 @@ ProxyService::CreateSystemProxyConfigSer << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return base::WrapUnique(new UnsetProxyConfigService); @@ -17,4 +17,4 @@ +#elif defined(OS_LINUX) || defined(OS_BSD) std::unique_ptr<ProxyConfigServiceLinux> linux_config_service( new ProxyConfigServiceLinux()); - + diff --git a/www/chromium/files/patch-net_socket_socks5__client__socket.cc b/www/chromium/files/patch-net_socket_socks5__client__socket.cc index a21636b1aaf0..741dabf0c01e 100644 --- a/www/chromium/files/patch-net_socket_socks5__client__socket.cc +++ b/www/chromium/files/patch-net_socket_socks5__client__socket.cc @@ -1,4 +1,4 @@ ---- net/socket/socks5_client_socket.cc.orig 2016-05-11 19:02:24 UTC +--- net/socket/socks5_client_socket.cc.orig 2017-01-26 00:49:16 UTC +++ net/socket/socks5_client_socket.cc @@ -4,6 +4,10 @@ diff --git a/www/chromium/files/patch-net_udp_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc index 00100f7bd3b4..0809ef1db0ff 100644 --- a/www/chromium/files/patch-net_udp_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/udp/udp_socket_posix.cc.orig 2016-12-16 03:54:19.436860000 +0000 -+++ net/udp/udp_socket_posix.cc 2016-12-16 03:55:18.231119000 +0000 -@@ -51,7 +51,7 @@ +--- net/socket/udp_socket_posix.cc.orig 2017-01-26 00:49:16 UTC ++++ net/socket/udp_socket_posix.cc +@@ -58,7 +58,7 @@ const int kBindRetries = 10; const int kPortStart = 1024; const int kPortEnd = 65535; @@ -9,7 +9,7 @@ // Returns IPv4 address in network order. int GetIPv4AddressFromIndex(int socket, uint32_t index, uint32_t* address) { -@@ -679,7 +679,7 @@ +@@ -762,7 +762,7 @@ int UDPSocketPosix::SetMulticastOptions( if (multicast_interface_ != 0) { switch (addr_family_) { case AF_INET: { @@ -18,7 +18,7 @@ ip_mreqn mreq; mreq.imr_ifindex = multicast_interface_; mreq.imr_address.s_addr = htonl(INADDR_ANY); -@@ -754,7 +754,7 @@ +@@ -837,7 +837,7 @@ int UDPSocketPosix::JoinGroup(const IPAd if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; diff --git a/www/chromium/files/patch-net_tools_get_server_time_get__server__time.cc b/www/chromium/files/patch-net_tools_get__server__time_get__server__time.cc index 6ef1bb95ac5d..853d3d7af75d 100644 --- a/www/chromium/files/patch-net_tools_get_server_time_get__server__time.cc +++ b/www/chromium/files/patch-net_tools_get__server__time_get__server__time.cc @@ -1,5 +1,5 @@ ---- net/tools/get_server_time/get_server_time.cc.orig 2016-12-16 03:15:59.232489000 +0000 -+++ net/tools/get_server_time/get_server_time.cc 2016-12-16 03:16:40.661382000 +0000 +--- net/tools/get_server_time/get_server_time.cc.orig 2017-01-26 00:49:16 UTC ++++ net/tools/get_server_time/get_server_time.cc @@ -46,7 +46,7 @@ #if defined(OS_MACOSX) @@ -9,7 +9,7 @@ #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_fixed.h" #endif -@@ -142,7 +142,7 @@ +@@ -142,7 +142,7 @@ class PrintingLogObserver : public net:: std::unique_ptr<net::URLRequestContext> BuildURLRequestContext( net::NetLog* net_log) { net::URLRequestContextBuilder builder; diff --git a/www/chromium/files/patch-net_udp_udp__socket__unittest.cc b/www/chromium/files/patch-net_udp_udp__socket__unittest.cc deleted file mode 100644 index 05fc5116c72a..000000000000 --- a/www/chromium/files/patch-net_udp_udp__socket__unittest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- net/udp/udp_socket_unittest.cc.orig 2016-05-11 19:02:25 UTC -+++ net/udp/udp_socket_unittest.cc -@@ -266,7 +266,7 @@ TEST_F(UDPSocketTest, ConnectNonBlocking - } - #endif - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - // UDPSocketPrivate_Broadcast is disabled for OSX because it requires - // root permissions on OSX 10.7+. - TEST_F(UDPSocketTest, DISABLED_Broadcast) { diff --git a/www/chromium/files/patch-net_url_request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index f4c7d4564aaa..bd67df1953ef 100644 --- a/www/chromium/files/patch-net_url_request_url__request__context__builder.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2016-12-16 03:18:23.560330000 +0000 -+++ net/url_request/url_request_context_builder.cc 2016-12-16 03:19:00.302261000 +0000 -@@ -326,7 +326,7 @@ +--- net/url_request/url_request_context_builder.cc.orig 2017-01-26 00:49:16 UTC ++++ net/url_request/url_request_context_builder.cc +@@ -327,7 +327,7 @@ std::unique_ptr<URLRequestContext> URLRe if (!proxy_service_) { // TODO(willchan): Switch to using this code when // ProxyService::CreateSystemProxyConfigService()'s signature doesn't suck. diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index a8d317b11894..29a00a2f4d8d 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2016-05-11 19:02:25 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2017-01-26 00:49:16 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -121,7 +121,7 @@ std::vector<uint32_t> GetPageNumbersFrom +@@ -127,7 +127,7 @@ std::vector<uint32_t> GetPageNumbersFrom return page_numbers; } @@ -9,7 +9,7 @@ PP_Instance g_last_instance_id; -@@ -507,7 +507,7 @@ bool InitializeSDK() { +@@ -629,7 +629,7 @@ bool InitializeSDK() { config.m_v8EmbedderSlot = gin::kEmbedderPDFium; FPDF_InitLibraryWithConfig(&config); @@ -17,8 +17,17 @@ +#if defined(OS_LINUX) || defined(OS_BSD) // Font loading doesn't work in the renderer sandbox in Linux. FPDF_SetSystemFontInfo(&g_font_info); + #else +@@ -654,7 +654,7 @@ bool InitializeSDK() { + + void ShutdownSDK() { + FPDF_DestroyLibrary(); +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + delete g_font_info; #endif -@@ -620,7 +620,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl + TearDownV8(); +@@ -758,7 +758,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl IFSDK_PAUSE::user = nullptr; IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; @@ -27,7 +36,7 @@ // PreviewModeClient does not know its pp::Instance. pp::Instance* instance = client_->GetPluginInstance(); if (instance) -@@ -1330,7 +1330,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA +@@ -1510,7 +1510,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA FPDF_ClosePage(pdf_page); } @@ -36,7 +45,7 @@ g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -2688,7 +2688,7 @@ bool PDFiumEngine::ContinuePaint(int pro +@@ -2919,7 +2919,7 @@ bool PDFiumEngine::ContinuePaint(int pro DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size()); DCHECK(image_data); @@ -45,7 +54,7 @@ g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -3142,7 +3142,7 @@ void PDFiumEngine::SetCurrentPage(int in +@@ -3377,7 +3377,7 @@ void PDFiumEngine::SetCurrentPage(int in FORM_DoPageAAction(old_page, form_, FPDFPAGE_AACTION_CLOSE); } most_visible_page_ = index; diff --git a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc index 3f7401092341..e2c90bb6db51 100644 --- a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc +++ b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc @@ -1,4 +1,4 @@ ---- ppapi/proxy/file_io_resource.cc.orig 2016-05-11 19:02:25 UTC +--- ppapi/proxy/file_io_resource.cc.orig 2017-01-26 00:49:16 UTC +++ ppapi/proxy/file_io_resource.cc @@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t of diff --git a/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc b/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc index d8cbb29860cf..fc5d06848af5 100644 --- a/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc +++ b/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc @@ -1,4 +1,4 @@ ---- ppapi/shared_impl/private/net_address_private_impl.cc.orig 2016-05-11 19:02:25 UTC +--- ppapi/shared_impl/private/net_address_private_impl.cc.orig 2017-01-26 00:49:16 UTC +++ ppapi/shared_impl/private/net_address_private_impl.cc @@ -26,9 +26,12 @@ #include <arpa/inet.h> diff --git a/www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn b/www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn index 5fd3a8d4ecfa..87188395e507 100644 --- a/www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn +++ b/www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- ppapi/tests/extensions/BUILD.gn.orig 2016-10-06 04:02:23.000000000 +0300 -+++ ppapi/tests/extensions/BUILD.gn 2016-10-13 08:10:32.687869000 +0300 -@@ -20,7 +20,7 @@ +--- ppapi/tests/extensions/BUILD.gn.orig 2017-01-26 00:49:16 UTC ++++ ppapi/tests/extensions/BUILD.gn +@@ -20,7 +20,7 @@ group("extensions") { ":ppapi_tests_extensions_popup($newlib)", ":ppapi_tests_extensions_socket_permissions($newlib)", ] diff --git a/www/chromium/files/patch-printing_BUILD.gn b/www/chromium/files/patch-printing_BUILD.gn index f99aabe202bb..266028c1967c 100644 --- a/www/chromium/files/patch-printing_BUILD.gn +++ b/www/chromium/files/patch-printing_BUILD.gn @@ -1,6 +1,6 @@ ---- printing/BUILD.gn.orig 2016-10-06 04:02:23.000000000 +0300 -+++ printing/BUILD.gn 2016-10-13 08:13:38.178051000 +0300 -@@ -125,7 +125,7 @@ +--- printing/BUILD.gn.orig 2017-01-26 00:49:17 UTC ++++ printing/BUILD.gn +@@ -129,7 +129,7 @@ component("printing") { if (use_cups) { configs += [ ":cups" ] @@ -9,7 +9,7 @@ # rebase_path does not accept an empty string if (use_sysroot) { cups_sysroot = rebase_path(sysroot) -@@ -202,7 +202,7 @@ +@@ -206,7 +206,7 @@ component("printing") { "printing_context_no_system_dialog.cc", "printing_context_no_system_dialog.h", ] diff --git a/www/chromium/files/patch-printing_cups__config__helper.py b/www/chromium/files/patch-printing_cups__config__helper.py index 8f6a58894b56..1fc731bcc208 100644 --- a/www/chromium/files/patch-printing_cups__config__helper.py +++ b/www/chromium/files/patch-printing_cups__config__helper.py @@ -1,6 +1,6 @@ ---- printing/cups_config_helper.py.orig 2016-08-03 22:02:22.000000000 +0300 -+++ printing/cups_config_helper.py 2016-09-02 22:48:48.706284000 +0300 -@@ -65,7 +65,7 @@ +--- printing/cups_config_helper.py.orig 2017-01-26 00:49:17 UTC ++++ printing/cups_config_helper.py +@@ -65,7 +65,7 @@ def main(): mode = sys.argv[1] if len(sys.argv) > 2 and sys.argv[2]: sysroot = sys.argv[2] diff --git a/www/chromium/files/patch-remoting_host_BUILD.gn b/www/chromium/files/patch-remoting_host_BUILD.gn index 98bcc5396506..614e5720d9f3 100644 --- a/www/chromium/files/patch-remoting_host_BUILD.gn +++ b/www/chromium/files/patch-remoting_host_BUILD.gn @@ -1,6 +1,6 @@ ---- remoting/host/BUILD.gn.orig 2016-10-06 04:02:23.000000000 +0300 -+++ remoting/host/BUILD.gn 2016-10-13 08:18:22.564549000 +0300 -@@ -420,7 +420,7 @@ +--- remoting/host/BUILD.gn.orig 2017-01-26 00:49:17 UTC ++++ remoting/host/BUILD.gn +@@ -326,7 +326,7 @@ static_library("host") { deps += [ "//components/policy:generated" ] } @@ -9,7 +9,7 @@ libs += [ "pam" ] } -@@ -439,7 +439,7 @@ +@@ -349,7 +349,7 @@ static_library("host") { "input_injector_x11.cc", "local_input_monitor_x11.cc", ] @@ -18,8 +18,8 @@ # These will already be filtered out on non-Linux. sources -= [ "linux/unicode_to_keysym.cc", -@@ -648,7 +648,7 @@ - "win/worker_process_launcher_unittest.cc", +@@ -538,7 +538,7 @@ source_set("unit_tests") { + "touch_injector_win_unittest.cc", ] - if (!use_x11 && is_linux) { @@ -27,21 +27,21 @@ sources -= [ "linux/unicode_to_keysym_unittest.cc" ] } if (use_ozone || is_chromeos) { -@@ -1217,7 +1217,7 @@ - if (is_desktop_linux) { - deps += [ "//build/config/linux/gtk2" ] +@@ -755,7 +755,7 @@ if (enable_me2me_host) { + deps += [ "//build/config/linux/gtk2" ] + } } - if ((is_linux && !is_chromeos) || is_mac) { + if ((is_linux && !is_chromeos) || is_mac || is_bsd) { libs = [ "pam" ] } -@@ -1359,7 +1359,7 @@ +@@ -825,7 +825,7 @@ if (enable_me2me_host) { } } - -- if (is_linux) { -+ if (is_linux || is_bsd) { - copy("remoting_me2me_host_copy_script") { - sources = [ - "linux/linux_me2me_host.py", + } +- if (is_chrome_branded && enable_me2me_host && is_linux && !is_chromeos) { ++ if (is_chrome_branded && enable_me2me_host && is_linux && is_bsd && !is_chromeos) { + group("remoting_me2me_host_archive") { + deps = [ + "//remoting/host/installer/linux:remoting_me2me_host_archive", diff --git a/www/chromium/files/patch-sdch_BUILD.gn b/www/chromium/files/patch-sdch_BUILD.gn index 5e3c54857742..5ac4b474607a 100644 --- a/www/chromium/files/patch-sdch_BUILD.gn +++ b/www/chromium/files/patch-sdch_BUILD.gn @@ -1,6 +1,6 @@ ---- sdch/BUILD.gn.orig 2016-08-03 22:02:22.000000000 +0300 -+++ sdch/BUILD.gn 2016-09-13 17:24:52.015350000 +0300 -@@ -11,7 +11,7 @@ +--- sdch/BUILD.gn.orig 2017-01-26 00:49:17 UTC ++++ sdch/BUILD.gn +@@ -11,7 +11,7 @@ config("sdch_config") { # from a config and can't be on the target directly. config("sdch_warnings") { cflags = [] @@ -9,7 +9,7 @@ # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11: cflags += [ "-Wno-deprecated-declarations" ] } -@@ -61,7 +61,7 @@ +@@ -59,7 +59,7 @@ static_library("sdch") { "//third_party/zlib", ] diff --git a/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn b/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn new file mode 100644 index 000000000000..1db91982967c --- /dev/null +++ b/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn @@ -0,0 +1,11 @@ +--- services/service_manager/runner/host/BUILD.gn.orig 2017-01-26 00:49:17 UTC ++++ services/service_manager/runner/host/BUILD.gn +@@ -51,7 +51,7 @@ source_set("child_process_base") { + "//services/service_manager/runner/common", + ] + +- if (is_linux && !is_android) { ++ if (is_linux && !is_android && !is_bsd) { + sources += [ + "linux_sandbox.cc", + "linux_sandbox.h", diff --git a/www/chromium/files/patch-services_service__manager_standalone_context.cc b/www/chromium/files/patch-services_service__manager_standalone_context.cc new file mode 100644 index 000000000000..599833393aa5 --- /dev/null +++ b/www/chromium/files/patch-services_service__manager_standalone_context.cc @@ -0,0 +1,11 @@ +--- services/service_manager/standalone/context.cc.orig 2017-01-26 00:49:17 UTC ++++ services/service_manager/standalone/context.cc +@@ -208,7 +208,7 @@ void Context::Init(std::unique_ptr<InitP + tracing::mojom::StartupPerformanceDataCollectorPtr collector; + ConnectToInterface(service_manager(), source_identity, tracing_identity, + &collector); +-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + // CurrentProcessInfo::CreationTime is only defined on some platforms. + const base::Time creation_time = base::CurrentProcessInfo::CreationTime(); + collector->SetServiceManagerProcessCreationTime( diff --git a/www/chromium/files/patch-services_shell_standalone_context.cc b/www/chromium/files/patch-services_shell_standalone_context.cc deleted file mode 100644 index 671ae2b563fb..000000000000 --- a/www/chromium/files/patch-services_shell_standalone_context.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- services/shell/standalone/context.cc.orig 2016-10-06 04:02:24.000000000 +0300 -+++ services/shell/standalone/context.cc 2016-10-23 13:44:14.656275000 +0300 -@@ -198,7 +198,7 @@ - tracing_remote_interfaces->GetInterface( - tracing::mojom::StartupPerformanceDataCollector::Name_, - mojo::GetProxy(&collector).PassMessagePipe()); --#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - // CurrentProcessInfo::CreationTime is only defined on some platforms. - const base::Time creation_time = base::CurrentProcessInfo::CreationTime(); - collector->SetShellProcessCreationTime(creation_time.ToInternalValue()); diff --git a/www/chromium/files/patch-services_ui_BUILD.gn b/www/chromium/files/patch-services_ui_BUILD.gn index f5ce5e4004a4..821eb5ce8d24 100644 --- a/www/chromium/files/patch-services_ui_BUILD.gn +++ b/www/chromium/files/patch-services_ui_BUILD.gn @@ -1,6 +1,6 @@ ---- services/ui/BUILD.gn.orig 2016-12-09 05:04:22.000000000 +0000 -+++ services/ui/BUILD.gn 2016-12-19 19:02:41.332230000 +0000 -@@ -13,7 +13,6 @@ +--- services/ui/BUILD.gn.orig 2017-01-26 00:49:17 UTC ++++ services/ui/BUILD.gn +@@ -13,7 +13,6 @@ group("all") { testonly = true deps = [ ":ui", @@ -8,7 +8,7 @@ "//services/ui/test_wm", ] } -@@ -38,7 +37,6 @@ +@@ -38,7 +37,6 @@ service("ui") { data_deps = [ ":manifest", diff --git a/www/chromium/files/patch-services_ui_ime_BUILD.gn b/www/chromium/files/patch-services_ui_ime_BUILD.gn index cdc304adf77b..26226648dbcf 100644 --- a/www/chromium/files/patch-services_ui_ime_BUILD.gn +++ b/www/chromium/files/patch-services_ui_ime_BUILD.gn @@ -1,6 +1,6 @@ ---- services/ui/ime/BUILD.gn.orig 2016-12-19 15:26:06.098748000 +0000 -+++ services/ui/ime/BUILD.gn 2016-12-19 15:26:20.556851000 +0000 -@@ -49,7 +49,6 @@ +--- services/ui/ime/BUILD.gn.orig 2017-01-26 00:49:17 UTC ++++ services/ui/ime/BUILD.gn +@@ -50,7 +50,6 @@ test("mus_ime_unittests") { ":test_manifest", ":lib", "//services/ui", diff --git a/www/chromium/files/patch-skia_BUILD.gn b/www/chromium/files/patch-skia_BUILD.gn index 5f5fcda18d85..c2d845f94577 100644 --- a/www/chromium/files/patch-skia_BUILD.gn +++ b/www/chromium/files/patch-skia_BUILD.gn @@ -1,6 +1,6 @@ ---- skia/BUILD.gn.orig 2016-08-03 22:02:22.000000000 +0300 -+++ skia/BUILD.gn 2016-10-09 06:26:37.625935000 +0300 -@@ -213,7 +213,7 @@ +--- skia/BUILD.gn.orig 2017-01-26 00:49:17 UTC ++++ skia/BUILD.gn +@@ -135,7 +135,7 @@ config("skia_library_config") { } # Settings for text blitting, chosen to approximate the system browser. @@ -9,16 +9,16 @@ defines += [ "SK_GAMMA_EXPONENT=1.2", "SK_GAMMA_CONTRAST=0.2", -@@ -405,7 +405,7 @@ +@@ -363,7 +363,7 @@ component("skia") { sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ] } - if (!is_linux) { + if (!is_linux && !is_bsd) { sources -= [ - "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", + "//third_party/skia/src/ports/SkFontConfigInterface.cpp", "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", -@@ -416,14 +416,14 @@ +@@ -375,14 +375,14 @@ component("skia") { # Add the files for the SkFontMgr_Android. This is used to emulate android # fonts on linux. See content/zygote/zygote_main_linux.cc @@ -35,8 +35,8 @@ sources -= [ "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", -@@ -463,7 +463,7 @@ - "//third_party/zlib", +@@ -421,7 +421,7 @@ component("skia") { + "//base/third_party/dynamic_annotations", ] - if (is_linux) { 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 73a26dd5dfcb..a8643be7294d 100644 --- a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp +++ b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp @@ -1,6 +1,6 @@ ---- skia/ext/SkMemory_new_handler.cpp.orig 2016-04-08 16:02:10 UTC +--- skia/ext/SkMemory_new_handler.cpp.orig 2017-01-26 00:49:17 UTC +++ skia/ext/SkMemory_new_handler.cpp -@@ -62,7 +62,7 @@ static void* sk_malloc_nothrow(size_t si +@@ -68,7 +68,7 @@ static void* sk_malloc_nothrow(size_t si // TODO(b.kelemen): we should always use UncheckedMalloc but currently it // doesn't work as intended everywhere. void* result; @@ -9,7 +9,7 @@ result = malloc(size); #else // It's the responsibility of the caller to check the return value. -@@ -89,7 +89,7 @@ void* sk_calloc(size_t size) { +@@ -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; diff --git a/www/chromium/files/patch-testing_gtest_src_gtest.cc b/www/chromium/files/patch-testing_gtest_src_gtest.cc index 71cc8e2ad44d..87f05b7548f0 100644 --- a/www/chromium/files/patch-testing_gtest_src_gtest.cc +++ b/www/chromium/files/patch-testing_gtest_src_gtest.cc @@ -1,4 +1,4 @@ ---- testing/gtest/src/gtest.cc.orig 2016-05-11 19:03:10 UTC +--- testing/gtest/src/gtest.cc.orig 2017-01-26 00:50:07 UTC +++ testing/gtest/src/gtest.cc @@ -122,6 +122,10 @@ diff --git a/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp b/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp index 722bde3bc700..a003c866ba88 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp @@ -1,6 +1,6 @@ ---- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig 2016-05-11 19:02:30 UTC +--- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig 2017-01-26 00:49:27 UTC +++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp -@@ -44,6 +44,8 @@ +@@ -46,6 +46,8 @@ #if OS(WIN) #include <malloc.h> diff --git a/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn b/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn index c5d5c71589e5..f5ed0af477a4 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn +++ b/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/WebKit/Source/core/layout/BUILD.gn.orig 2016-12-15 15:07:51.031899000 +0000 -+++ third_party/WebKit/Source/core/layout/BUILD.gn 2016-12-15 15:08:04.975660000 +0000 -@@ -341,7 +341,7 @@ +--- third_party/WebKit/Source/core/layout/BUILD.gn.orig 2017-01-26 00:49:28 UTC ++++ third_party/WebKit/Source/core/layout/BUILD.gn +@@ -361,7 +361,7 @@ blink_core_sources("layout") { sources += [ "LayoutThemeFontProviderDefault.cpp" ] } diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp index cc16fbc726f4..dae6dabbb63f 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp @@ -1,6 +1,6 @@ ---- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig 2016-12-13 00:43:16 UTC +--- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig 2017-01-26 00:49:28 UTC +++ third_party/WebKit/Source/platform/fonts/FontCache.cpp -@@ -61,9 +61,9 @@ using namespace WTF; +@@ -62,9 +62,9 @@ using namespace WTF; namespace blink { diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h index d954bb977b11..8858540b8297 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h @@ -1,6 +1,15 @@ ---- third_party/WebKit/Source/platform/fonts/FontCache.h.orig 2016-12-13 00:42:58 UTC +--- third_party/WebKit/Source/platform/fonts/FontCache.h.orig 2017-01-26 00:49:28 UTC +++ third_party/WebKit/Source/platform/fonts/FontCache.h -@@ -217,7 +217,7 @@ class PLATFORM_EXPORT FontCache { +@@ -121,7 +121,7 @@ class PLATFORM_EXPORT FontCache { + #else + static const AtomicString& legacySystemFontFamily(); + #endif +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + static void setSystemFontFamily(const AtomicString&); + #endif + +@@ -231,7 +231,7 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, CString& name); diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp index 38aa09f0db8c..befb99ad30a2 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2016-12-13 00:46:20 UTC +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2017-01-26 00:49:28 UTC +++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp @@ -99,7 +99,7 @@ FontPlatformData::FontPlatformData(const m_syntheticBold(source.m_syntheticBold), diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h index 543c2e75ed2a..df2089af91f2 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2016-12-13 00:46:30 UTC +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2017-01-26 00:49:28 UTC +++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h @@ -47,9 +47,9 @@ #include "wtf/text/CString.h" @@ -12,7 +12,7 @@ #if OS(MACOSX) OBJC_CLASS NSFont; -@@ -150,7 +150,7 @@ class PLATFORM_EXPORT FontPlatformData { +@@ -149,7 +149,7 @@ class PLATFORM_EXPORT FontPlatformData { PassRefPtr<OpenTypeVerticalData> verticalData() const; PassRefPtr<SharedBuffer> openTypeTable(SkFontTableTag) const; @@ -21,7 +21,7 @@ // The returned styles are all actual styles without // FontRenderStyle::NoPreference. const FontRenderStyle& getFontRenderStyle() const { return m_style; } -@@ -178,7 +178,7 @@ class PLATFORM_EXPORT FontPlatformData { +@@ -177,7 +177,7 @@ class PLATFORM_EXPORT FontPlatformData { FontOrientation m_orientation; private: diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp index b36dc333116d..e3d8c560d313 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp @@ -1,6 +1,6 @@ ---- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig 2016-12-13 00:50:37 UTC +--- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig 2017-01-26 00:49:28 UTC +++ third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp -@@ -51,7 +51,7 @@ namespace blink { +@@ -50,7 +50,7 @@ namespace blink { const float smallCapsFontSizeMultiplier = 0.7f; const float emphasisMarkFontSizeMultiplier = 0.5f; @@ -9,7 +9,7 @@ // This is the largest VDMX table which we'll try to load and parse. static const size_t maxVDMXTableSize = 1024 * 1024; // 1 MB #endif -@@ -105,7 +105,7 @@ void SimpleFontData::platformInit() { +@@ -105,7 +105,7 @@ void SimpleFontData::platformInit(bool s int vdmxAscent = 0, vdmxDescent = 0; bool isVDMXValid = false; @@ -18,10 +18,10 @@ // Manually digging up VDMX metrics is only applicable when bytecode hinting // using FreeType. With DirectWrite or CoreText, no bytecode hinting is ever // done. This code should be pushed into FreeType (hinted font metrics). -@@ -139,7 +139,7 @@ void SimpleFontData::platformInit() { - } else { - ascent = SkScalarRoundToInt(-metrics.fAscent); - descent = SkScalarRoundToInt(metrics.fDescent); +@@ -149,7 +149,7 @@ void SimpleFontData::platformInit(bool s + ascent = SkScalarRoundToScalar(-metrics.fAscent); + descent = SkScalarRoundToScalar(metrics.fDescent); + } -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) // When subpixel positioning is enabled, if the descent is rounded down, the diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp index 1a163489cc4c..17a819a464d6 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2016-12-13 00:51:35 UTC +--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2017-01-26 00:49:28 UTC +++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp @@ -63,7 +63,7 @@ static sk_sp<SkTypeface> typefaceForFont @@ -9,7 +9,7 @@ // Android special locale for retrieving the color emoji font // based on the proposed changes in UTR #51 for introducing // an Emoji script code: -@@ -229,7 +229,7 @@ sk_sp<SkTypeface> FontCache::createTypef +@@ -230,7 +230,7 @@ sk_sp<SkTypeface> FontCache::createTypef } #endif diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp index c3e5cef85b55..12b29d266569 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig 2016-04-08 16:02:13 UTC +--- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig 2017-01-26 00:49:28 UTC +++ third_party/WebKit/Source/platform/heap/GCInfo.cpp @@ -7,6 +7,8 @@ #include "platform/heap/Handle.h" diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp index 53015bf9f805..f68b1602ea66 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig 2016-05-11 19:02:33 UTC +--- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig 2017-01-26 00:49:28 UTC +++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp @@ -6,6 +6,8 @@ diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp deleted file mode 100644 index bc03254d5b51..000000000000 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp +++ /dev/null @@ -1,53 +0,0 @@ ---- third_party/WebKit/Source/platform/text/TextBreakIterator.cpp.orig 2016-12-13 00:53:03 UTC -+++ third_party/WebKit/Source/platform/text/TextBreakIterator.cpp -@@ -28,6 +28,9 @@ - #include "wtf/StdLibExtras.h" - #include "wtf/text/CharacterNames.h" - -+#include <unicode/uchar.h> -+#include <unicode/uvernum.h> -+ - namespace blink { - - unsigned numGraphemeClusters(const String& string) { -@@ -129,6 +132,11 @@ static const unsigned char asciiLineBrea - }; - // clang-format on - -+#if U_ICU_VERSION_MAJOR_NUM >= 58 -+#define BA_LB_COUNT (U_LB_COUNT - 3) -+#else -+#define BA_LB_COUNT U_LB_COUNT -+#endif - // Line breaking table for CSS word-break: break-all. This table differs from - // asciiLineBreakTable in: - // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking -@@ -136,7 +144,7 @@ static const unsigned char asciiLineBrea - // - 1 indicates additional break opportunities. 0 indicates to fallback to - // normal line break, not "prohibit break." - // clang-format off --static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = { -+static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = { - // XX AI AL B2 BA BB BK CB CL CM CR EX GL HY ID IN IS LF NS NU OP PO PR QU SA SG SP SY ZW NL WJ H2 H3 JL JT JV CP CJ HL RI - { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX - { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI -@@ -190,7 +198,7 @@ static_assert(WTF_ARRAY_LENGTH(asciiLine - asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + - 1, - "asciiLineBreakTable should be consistent"); --static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, -+static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, - "breakAllLineBreakClassTable should be consistent"); - - static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh) { -@@ -226,8 +234,8 @@ static inline ULineBreak lineBreakProper - - static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, - ULineBreak lineBreak) { -- if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && -- lastLineBreak < U_LB_COUNT) { -+ if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && -+ lastLineBreak < BA_LB_COUNT) { - const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak]; - return tableRow[lineBreak / 8] & (1 << (lineBreak % 8)); - } diff --git a/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp b/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp index 28b2f69150fc..4c25606135a9 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig 2016-12-13 00:40:36 UTC +--- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig 2017-01-26 00:49:28 UTC +++ third_party/WebKit/Source/web/PopupMenuImpl.cpp @@ -154,7 +154,7 @@ class PopupMenuImpl::ItemIterationContex m_isInGroup(false), diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp index 34a3e293fac7..77294b393ec0 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/wtf/Assertions.cpp.orig 2016-12-13 00:15:09 UTC +--- third_party/WebKit/Source/wtf/Assertions.cpp.orig 2017-01-26 00:49:28 UTC +++ third_party/WebKit/Source/wtf/Assertions.cpp @@ -60,7 +60,7 @@ #include <windows.h> diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h index 1316811ffd7b..c2c0ac462231 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/wtf/Atomics.h.orig 2016-12-13 00:13:22 UTC +--- third_party/WebKit/Source/wtf/Atomics.h.orig 2017-01-26 00:49:28 UTC +++ third_party/WebKit/Source/wtf/Atomics.h @@ -176,7 +176,7 @@ ALWAYS_INLINE void atomicSetOneToZero(in #if defined(THREAD_SANITIZER) diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn b/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn index 481e94241ae3..7349db4a5077 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/WebKit/Source/wtf/BUILD.gn.orig 2016-12-14 18:31:06.308889000 +0000 -+++ third_party/WebKit/Source/wtf/BUILD.gn 2016-12-14 18:32:07.771435000 +0000 -@@ -286,6 +286,10 @@ +--- third_party/WebKit/Source/wtf/BUILD.gn.orig 2017-01-26 00:49:28 UTC ++++ third_party/WebKit/Source/wtf/BUILD.gn +@@ -284,6 +284,10 @@ component("wtf") { libs = [ "dl" ] } diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h index ef31c9b288a5..7095ec7658ca 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2016-12-13 00:09:55 UTC +--- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2017-01-26 00:49:28 UTC +++ third_party/WebKit/Source/wtf/ByteSwap.h @@ -60,15 +60,21 @@ ALWAYS_INLINE uint16_t bswap16(uint16_t diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h index fc1f8ed4a8ab..8214b9ece1e8 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/wtf/ContainerAnnotations.h.orig 2016-12-13 00:24:56 UTC +--- third_party/WebKit/Source/wtf/ContainerAnnotations.h.orig 2017-01-26 00:49:28 UTC +++ third_party/WebKit/Source/wtf/ContainerAnnotations.h @@ -10,7 +10,7 @@ diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp index 4ac31925c1a4..88874b77592d 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig 2016-12-13 00:19:49 UTC +--- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig 2017-01-26 00:49:28 UTC +++ third_party/WebKit/Source/wtf/ThreadingPthreads.cpp @@ -49,11 +49,15 @@ #include <objc/objc-auto.h> diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index 42b23d0b773b..6939f4bbfb6c 100644 --- a/www/chromium/files/patch-third__party_angle_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/BUILD.gn.orig 2016-10-06 04:04:51.000000000 +0300 -+++ third_party/angle/BUILD.gn 2016-10-31 01:36:29.431524000 +0200 -@@ -15,6 +15,12 @@ +--- third_party/angle/BUILD.gn.orig 2017-01-26 00:50:09 UTC ++++ third_party/angle/BUILD.gn +@@ -16,6 +16,12 @@ if (ozone_platform_gbm) { } } @@ -13,7 +13,7 @@ angle_git_is_present = exec_script("src/commit_id.py", [ "check", -@@ -350,11 +356,7 @@ +@@ -340,11 +346,7 @@ static_library("libANGLE") { if (use_x11) { sources += rebase_path(gles_gypi.libangle_gl_glx_sources, ".", "src") deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ] @@ -26,7 +26,7 @@ } if (is_mac) { sources += rebase_path(gles_gypi.libangle_gl_cgl_sources, ".", "src") -@@ -492,7 +494,7 @@ +@@ -486,7 +488,7 @@ util_gypi = exec_script("//build/gypi_to config("angle_util_config") { include_dirs = [ "util" ] diff --git a/www/chromium/files/patch-third__party_angle_build_angle__common.gni b/www/chromium/files/patch-third__party_angle_gni_angle.gni index f1f807c7bb2e..b7b40f31ac20 100644 --- a/www/chromium/files/patch-third__party_angle_build_angle__common.gni +++ b/www/chromium/files/patch-third__party_angle_gni_angle.gni @@ -1,11 +1,11 @@ ---- third_party/angle/build/angle_common.gni.orig 2016-10-06 04:04:51.000000000 +0300 -+++ third_party/angle/build/angle_common.gni 2016-10-13 08:24:01.038996000 +0300 -@@ -18,6 +18,8 @@ +--- third_party/angle/gni/angle.gni.orig 2017-01-26 00:50:09 UTC ++++ third_party/angle/gni/angle.gni +@@ -20,6 +20,8 @@ if (is_win) { import("//build/config/win/visual_studio_version.gni") } else if (is_linux && use_x11 && !is_chromeos) { angle_enable_gl = true +} else if (is_bsd) { + angle_enable_gl = true - } else if (is_mac || use_ozone) { + } else if (is_mac || ozone_platform_gbm) { angle_enable_gl = true } else if (is_android) { diff --git a/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn b/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn index 820173b8371a..3c58d500d5f5 100644 --- a/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/src/tests/BUILD.gn.orig 2016-10-06 04:04:51.000000000 +0300 -+++ third_party/angle/src/tests/BUILD.gn 2016-10-13 10:42:09.229978000 +0300 -@@ -41,7 +41,7 @@ +--- third_party/angle/src/tests/BUILD.gn.orig 2017-01-26 00:50:09 UTC ++++ third_party/angle/src/tests/BUILD.gn +@@ -41,7 +41,7 @@ test("angle_unittests") { ] } @@ -9,7 +9,7 @@ end2end_gypi = exec_script("//build/gypi_to_gn.py", [ rebase_path("angle_end2end_tests.gypi"), -@@ -82,7 +82,7 @@ +@@ -82,7 +82,7 @@ if (is_win || is_linux || is_mac || is_a "//third_party/angle:libANGLE_config", ] @@ -18,7 +18,7 @@ # Set rpath to find libEGL.so and libGLESv2.so even in a non-component build. configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } -@@ -175,7 +175,7 @@ +@@ -175,7 +175,7 @@ if (build_angle_deqp_tests) { # Ask the system headers to expose all the regular function otherwise # dEQP doesn't compile and produces warnings about implicitly defined # functions. @@ -27,7 +27,7 @@ # This has to be GNU_SOURCE as on Linux dEQP uses syscall() defines += [ "_GNU_SOURCE" ] } -@@ -198,7 +198,7 @@ +@@ -198,7 +198,7 @@ if (build_angle_deqp_tests) { ] } @@ -36,7 +36,7 @@ deqp_undefine_configs += [ "//build/config/gcc:no_exceptions" ] } -@@ -234,7 +234,7 @@ +@@ -234,7 +234,7 @@ if (build_angle_deqp_tests) { if (is_win) { sources += rebase_path(deqp_gypi.deqp_libtester_sources_win, ".", "../..") } @@ -45,7 +45,7 @@ sources += rebase_path(deqp_gypi.deqp_libtester_sources_unix, ".", "../..") } -@@ -262,7 +262,7 @@ +@@ -262,7 +262,7 @@ if (build_angle_deqp_tests) { # Taken from gpu/BUILD.gn # TODO(jmadill): this should be in a shared location @@ -54,7 +54,7 @@ libs = [ "pci" ] } } -@@ -334,7 +334,7 @@ +@@ -335,7 +335,7 @@ if (build_angle_deqp_tests) { "../../../deqp/src/data/", ] diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.gn b/www/chromium/files/patch-third__party_boringssl_BUILD.gn index af7efde3d8de..d1ea1b168a63 100644 --- a/www/chromium/files/patch-third__party_boringssl_BUILD.gn +++ b/www/chromium/files/patch-third__party_boringssl_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/boringssl/BUILD.gn.orig 2016-08-03 22:02:37.000000000 +0300 -+++ third_party/boringssl/BUILD.gn 2016-09-03 01:48:31.761556000 +0300 -@@ -83,7 +83,7 @@ +--- third_party/boringssl/BUILD.gn.orig 2017-01-26 00:49:29 UTC ++++ third_party/boringssl/BUILD.gn +@@ -83,7 +83,7 @@ if (is_win && !is_msan) { } else if (current_cpu == "x64") { if (is_mac) { sources += crypto_sources_mac_x86_64 @@ -9,7 +9,7 @@ sources += crypto_sources_linux_x86_64 } else { public_configs = [ ":no_asm_config" ] -@@ -91,14 +91,14 @@ +@@ -91,14 +91,14 @@ if (is_win && !is_msan) { } else if (current_cpu == "x86") { if (is_mac) { sources += crypto_sources_mac_x86 @@ -25,5 +25,5 @@ - } else if (current_cpu == "arm64" && (is_linux || is_android)) { + } else if (current_cpu == "arm64" && (is_linux || is_bsd || is_android)) { sources += crypto_sources_linux_aarch64 - - # TODO(davidben): Remove explicit arch flag once https://crbug.com/576858 + } else { + public_configs = [ ":no_asm_config" ] diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c index 96951ade050b..81f4d7fd21c7 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/crypto/ex_data.c.orig 2016-08-03 22:03:20.000000000 +0300 -+++ third_party/boringssl/src/crypto/ex_data.c 2016-09-17 04:02:25.959140000 +0300 -@@ -188,7 +188,9 @@ +--- third_party/boringssl/src/crypto/ex_data.c.orig 2017-01-26 00:50:08 UTC ++++ third_party/boringssl/src/crypto/ex_data.c +@@ -188,7 +188,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *a } } diff --git a/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h b/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h index 3ba9b44f8b14..7b23a2e9600d 100644 --- a/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h +++ b/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h @@ -1,4 +1,4 @@ ---- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig 2016-05-20 23:45:41 UTC +--- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig 2017-01-26 00:49:29 UTC +++ third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h @@ -334,6 +334,8 @@ class Status { */ diff --git a/www/chromium/files/patch-third__party_expat_BUILD.gn b/www/chromium/files/patch-third__party_expat_BUILD.gn index c0cbe40714c3..aba21d577cf7 100644 --- a/www/chromium/files/patch-third__party_expat_BUILD.gn +++ b/www/chromium/files/patch-third__party_expat_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/expat/BUILD.gn.orig 2016-10-06 04:02:41.000000000 +0300 -+++ third_party/expat/BUILD.gn 2016-10-13 08:30:21.841353000 +0300 -@@ -9,7 +9,7 @@ +--- third_party/expat/BUILD.gn.orig 2017-01-26 00:49:29 UTC ++++ third_party/expat/BUILD.gn +@@ -9,7 +9,7 @@ import("//testing/libfuzzer/fuzzer_test. # let's not pull it in twice. # Chromecast doesn't ship expat as a system library. # Libfuzzer and AFL need to build library from sources. diff --git a/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn b/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn index 68f4514881c1..c8cfac911c06 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn +++ b/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/BUILD.gn.orig 2016-08-03 22:03:29.000000000 +0300 -+++ third_party/ffmpeg/BUILD.gn 2016-10-10 14:53:20.790578000 +0300 -@@ -6,8 +6,13 @@ +--- third_party/ffmpeg/BUILD.gn.orig 2017-01-26 00:50:10 UTC ++++ third_party/ffmpeg/BUILD.gn +@@ -6,8 +6,13 @@ import("ffmpeg_options.gni") import("ffmpeg_generated.gni") # Path to platform configuration files. @@ -14,5 +14,5 @@ + "chromium/config/$ffmpeg_branding/linux/$ffmpeg_arch" +} - has_yasm_deps = ffmpeg_yasm_sources != [] && (current_cpu == "x86" || current_cpu == "x64") && os_config != "linux-noasm" - if (has_yasm_deps) { + has_yasm_deps = + ffmpeg_yasm_sources != [] && diff --git a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni index d2768672822c..f4112d30167d 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni +++ b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni @@ -1,191 +1,148 @@ ---- third_party/ffmpeg/ffmpeg_generated.gni.orig 2016-05-11 19:03:23 UTC +--- third_party/ffmpeg/ffmpeg_generated.gni.orig 2017-01-26 00:50:10 UTC +++ third_party/ffmpeg/ffmpeg_generated.gni @@ -12,7 +12,7 @@ ffmpeg_c_sources = [] ffmpeg_gas_sources = [] ffmpeg_yasm_sources = [] --if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { -+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { +-if ((is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm") || (is_linux && current_cpu == "arm64") || (is_linux && current_cpu == "mipsel") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) { ++if ((is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon) || ((is_linux || is_bsd) && current_cpu == "arm") || ((is_linux || is_bsd) && current_cpu == "arm64") || ((is_linux || is_bsd) && current_cpu == "mipsel") || ((is_linux || is_bsd) && current_cpu == "x64") || ((is_linux || is_bsd) && current_cpu == "x86") || (is_mac) || (is_win)) { ffmpeg_c_sources += [ "libavcodec/allcodecs.c", - "libavcodec/autorename_libavcodec_utils.c", -@@ -144,7 +144,7 @@ if ((is_android && current_cpu == "arm" + "libavcodec/autorename_libavcodec_flacdec.c", +@@ -160,7 +160,7 @@ if ((is_android && current_cpu == "arm" ] } --if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { -+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { +-if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm") || (is_linux && current_cpu == "arm64") || (is_linux && current_cpu == "mipsel") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon) || ((is_linux || is_bsd) && current_cpu == "arm") || ((is_linux || is_bsd) && current_cpu == "arm64") || ((is_linux || is_bsd) && current_cpu == "mipsel") || ((is_linux || is_bsd) && current_cpu == "x64") || ((is_linux || is_bsd) && current_cpu == "x86") || (is_mac) || (is_win)) { ffmpeg_c_sources += [ - "libavcodec/h264pred.c", - "libavcodec/hpeldsp.c", -@@ -159,13 +159,13 @@ if ((is_linux && current_cpu == "arm" && + "libavcodec/autorename_libavcodec_hpeldsp.c", + "libavcodec/autorename_libavcodec_videodsp.c", +@@ -175,7 +175,7 @@ if ((is_linux && current_cpu == "arm" && ] } --if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { -+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { - ffmpeg_c_sources += [ - "libavformat/rawdec.c", - ] - } - --if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { -+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { +-if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { ++if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux | is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { ffmpeg_c_sources += [ "libavcodec/aac_ac3_parser.c", "libavcodec/aac_parser.c", -@@ -207,7 +207,7 @@ if ((is_android && current_cpu == "arm" +@@ -212,7 +212,7 @@ if ((current_cpu == "x64" && ffmpeg_bran ] } --if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { -+if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { +-if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) { ++if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || ((is_linux || is_bsd) && current_cpu == "x64") || ((is_linux || is_bsd) && current_cpu == "x86") || (is_mac) || (is_win)) { ffmpeg_c_sources += [ "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c", "libavcodec/x86/constants.c", -@@ -218,7 +218,7 @@ if ((is_android && current_cpu == "x64" +@@ -225,7 +225,7 @@ if ((is_android && current_cpu == "x64") ] } --if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { -+if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { - ffmpeg_yasm_sources += [ - "libavcodec/x86/fft.asm", - "libavcodec/x86/vorbisdsp.asm", -@@ -228,7 +228,7 @@ if ((is_android && current_cpu == "x64" - ] - } - --if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { -+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { +-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome")) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome")) { ffmpeg_c_sources += [ "libavcodec/cabac.c", - "libavcodec/h264.c", -@@ -251,7 +251,7 @@ if ((is_linux && current_cpu == "arm" && + "libavcodec/h2645_parse.c", +@@ -257,7 +257,7 @@ if ((is_android && current_cpu == "arm" ] } --if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { -+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { +-if ((is_android && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) { ++if ((is_android && current_cpu == "arm" && arm_use_neon) || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon) || ((is_linux || is_bsd) && current_cpu == "arm")) { ffmpeg_c_sources += [ "libavcodec/arm/fft_fixed_init_arm.c", "libavcodec/arm/fft_init_arm.c", -@@ -267,7 +267,7 @@ if ((is_android && current_cpu == "arm" +@@ -276,7 +276,7 @@ if ((is_android && current_cpu == "arm" ] } --if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) { -+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) { - ffmpeg_c_sources += [ - "libavcodec/flac.c", - "libavcodec/flac_parser.c", -@@ -278,7 +278,7 @@ if ((is_linux && current_cpu == "arm" && - ] - } - --if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { -+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { - ffmpeg_c_sources += [ - "libavcodec/arm/h264pred_init_arm.c", - "libavcodec/arm/hpeldsp_init_arm.c", -@@ -298,7 +298,7 @@ if ((is_linux && current_cpu == "arm" && - ] - } - --if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) { -+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) { - ffmpeg_c_sources += [ - "libavutil/arm/float_dsp_init_neon.c", - ] -@@ -313,7 +313,7 @@ if ((is_android && current_cpu == "arm" +-if ((is_android && current_cpu == "x64") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) { ++if ((is_android && current_cpu == "x64") || ((is_linux || is_bsd) && current_cpu == "x64") || ((is_linux || is_bsd) && current_cpu == "x86") || (is_mac) || (is_win)) { + ffmpeg_yasm_sources += [ + "libavcodec/x86/fft.asm", + "libavcodec/x86/flacdsp.asm", +@@ -288,7 +288,7 @@ if ((is_android && current_cpu == "x64") ] } --if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { -+if (((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) { +-if ((is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) { ++if (((is_linux || is_bsd) && current_cpu == "x64") || ((is_linux || is_bsd) && current_cpu == "x86") || (is_mac) || (is_win)) { ffmpeg_c_sources += [ "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c", "libavcodec/x86/h264_intrapred_init.c", -@@ -333,13 +333,13 @@ if ((is_linux && current_cpu == "x64" && - ] - } - --if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) { -+if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) { - ffmpeg_c_sources += [ - "libavutil/mips/float_dsp_mips.c", +@@ -308,7 +308,7 @@ if ((is_linux && current_cpu == "x64") | ] } --if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { -+if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { +-if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { ++if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { ffmpeg_c_sources += [ "libavcodec/x86/aacpsdsp_init.c", "libavcodec/x86/dct_init.c", -@@ -348,7 +348,7 @@ if ((is_android && current_cpu == "x64" +@@ -317,7 +317,7 @@ if ((current_cpu == "x64" && ffmpeg_bran ] } --if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { -+if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { +-if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { ++if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) { ffmpeg_yasm_sources += [ "libavcodec/x86/aacpsdsp.asm", "libavcodec/x86/dct32.asm", -@@ -357,7 +357,7 @@ if ((is_android && current_cpu == "x64" +@@ -326,7 +326,7 @@ if ((current_cpu == "x64" && ffmpeg_bran ] } --if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) { -+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) { +-if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon) || ((is_linux || is_bsd) && current_cpu == "arm")) { ffmpeg_c_sources += [ - "libavcodec/arm/aacpsdsp_init_arm.c", - "libavcodec/arm/mpegaudiodsp_init_arm.c", -@@ -368,7 +368,7 @@ if ((is_android && current_cpu == "arm" + "libavcodec/arm/h264pred_init_arm.c", + "libavcodec/arm/hpeldsp_init_arm.c", +@@ -346,13 +346,13 @@ if ((is_linux && current_cpu == "arm" && ] } --if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { -+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { +-if ((is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_linux && current_cpu == "mipsel")) { ++if ((is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || ((is_linux || is_bsd) && current_cpu == "mipsel")) { ffmpeg_c_sources += [ - "libavcodec/acelp_filters.c", - "libavcodec/acelp_pitch_delay.c", -@@ -423,7 +423,7 @@ if ((is_linux && current_cpu == "arm" && + "libavutil/mips/float_dsp_mips.c", ] } --if ((is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) { -+if (((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) { +-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { ++if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ - "libavcodec/mips/h264pred_init_mips.c", - "libavcodec/mips/hpeldsp_init_mips.c", -@@ -431,7 +431,7 @@ if ((is_linux && current_cpu == "mipsel" + "libavcodec/acelp_filters.c", + "libavcodec/acelp_pitch_delay.c", +@@ -407,7 +407,7 @@ if ((is_linux && current_cpu == "arm" && ] } --if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) { -+if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) { +-if ((is_android && current_cpu == "arm64") || (is_linux && current_cpu == "arm64")) { ++if ((is_android && current_cpu == "arm64") || ((is_linux || is_bsd) && current_cpu == "arm64")) { ffmpeg_c_sources += [ "libavcodec/aarch64/fft_init_aarch64.c", "libavcodec/aarch64/vorbisdsp_init.c", -@@ -446,7 +446,7 @@ if ((is_android && current_cpu == "arm64 +@@ -422,7 +422,7 @@ if ((is_android && current_cpu == "arm64 ] } --if ((is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) { -+if (((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) { +-if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) { ++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ - "libavcodec/aarch64/h264pred_init.c", - "libavcodec/aarch64/hpeldsp_init_aarch64.c", -@@ -459,7 +459,7 @@ if ((is_linux && current_cpu == "arm64" + "libavcodec/arm/aacpsdsp_init_arm.c", + "libavcodec/arm/mpegaudiodsp_init_arm.c", +@@ -433,7 +433,7 @@ if ((is_android && current_cpu == "arm" ] } --if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { -+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) { +-if ((is_android && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm" && arm_use_neon)) { ++if ((is_android && current_cpu == "arm" && arm_use_neon) || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon)) { ffmpeg_c_sources += [ - "libavcodec/arm/flacdsp_init_arm.c", + "libavutil/arm/float_dsp_init_neon.c", ] -@@ -468,7 +468,7 @@ if ((is_linux && current_cpu == "arm" && +@@ -448,7 +448,7 @@ if ((is_android && current_cpu == "arm" ] } @@ -194,33 +151,16 @@ ffmpeg_c_sources += [ "libavcodec/arm/h264chroma_init_arm.c", "libavcodec/arm/h264dsp_init_arm.c", -@@ -479,7 +479,7 @@ if ((is_linux && current_cpu == "arm" && +@@ -459,7 +459,7 @@ if ((is_linux && current_cpu == "arm" && ] } --if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) { -+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) { - ffmpeg_c_sources += [ - "libavcodec/arm/hpeldsp_init_neon.c", - "libavcodec/arm/vp8dsp_init_neon.c", -@@ -492,14 +492,14 @@ if ((is_linux && current_cpu == "arm" && - ] - } - --if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) { -+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) { - ffmpeg_gas_sources += [ - "libavcodec/arm/aacpsdsp_neon.S", - "libavcodec/arm/sbrdsp_neon.S", - ] - } - --if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { -+if (((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) { +-if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome")) { ++if (((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome")) { ffmpeg_c_sources += [ "libavcodec/x86/h264_qpel.c", "libavcodec/x86/h264chroma_init.c", -@@ -520,7 +520,7 @@ if ((is_linux && current_cpu == "x64" && +@@ -480,7 +480,7 @@ if ((is_linux && current_cpu == "x64" && ] } @@ -229,16 +169,16 @@ ffmpeg_c_sources += [ "libavcodec/mips/aacdec_mips.c", "libavcodec/mips/aacpsdsp_mips.c", -@@ -529,7 +529,7 @@ if ((is_android && current_cpu == "mips6 +@@ -489,7 +489,7 @@ if ((is_android && current_cpu == "mips6 ] } --if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) { -+if (((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) { +-if (is_linux && current_cpu == "mipsel") { ++if ((is_linux || is_bsd) && current_cpu == "mipsel") { ffmpeg_c_sources += [ - "libavcodec/x86/flacdsp_init.c", - ] -@@ -544,7 +544,7 @@ if ((is_win && current_cpu == "x64" && f + "libavcodec/mips/h264pred_init_mips.c", + "libavcodec/mips/hpeldsp_init_mips.c", +@@ -497,7 +497,7 @@ if (is_linux && current_cpu == "mipsel") ] } @@ -247,7 +187,16 @@ ffmpeg_c_sources += [ "libavcodec/mips/h264chroma_init_mips.c", "libavcodec/mips/h264dsp_init_mips.c", -@@ -552,7 +552,7 @@ if ((is_linux && current_cpu == "mipsel" +@@ -505,7 +505,7 @@ if ((is_linux && current_cpu == "mipsel" + ] + } + +-if (is_linux && current_cpu == "arm64") { ++if ((is_linux || is_bsd) && current_cpu == "arm64") { + ffmpeg_c_sources += [ + "libavcodec/aarch64/h264pred_init.c", + "libavcodec/aarch64/hpeldsp_init_aarch64.c", +@@ -518,7 +518,7 @@ if (is_linux && current_cpu == "arm64") ] } @@ -256,7 +205,7 @@ ffmpeg_c_sources += [ "libavcodec/aarch64/imdct15_init.c", "libavcodec/aarch64/mpegaudiodsp_init.c", -@@ -563,7 +563,7 @@ if ((is_android && current_cpu == "arm64 +@@ -529,7 +529,7 @@ if ((is_android && current_cpu == "arm64 ] } @@ -265,7 +214,24 @@ ffmpeg_c_sources += [ "libavcodec/aarch64/h264chroma_init_aarch64.c", "libavcodec/aarch64/h264dsp_init_aarch64.c", -@@ -577,7 +577,7 @@ if ((is_linux && current_cpu == "arm64" +@@ -543,7 +543,7 @@ if ((is_linux && current_cpu == "arm64" + ] + } + +-if (is_linux && current_cpu == "arm" && arm_use_neon) { ++if ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon) { + ffmpeg_c_sources += [ + "libavcodec/arm/hpeldsp_init_neon.c", + "libavcodec/arm/vp8dsp_init_neon.c", +@@ -556,14 +556,14 @@ if (is_linux && current_cpu == "arm" && + ] + } + +-if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) { ++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) { + ffmpeg_gas_sources += [ + "libavcodec/arm/aacpsdsp_neon.S", + "libavcodec/arm/sbrdsp_neon.S", ] } @@ -274,7 +240,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/blockdsp_init_arm.c", "libavcodec/arm/idctdsp_init_arm.c", -@@ -601,13 +601,13 @@ if ((is_linux && current_cpu == "arm" && +@@ -587,13 +587,13 @@ if ((is_linux && current_cpu == "arm" && ] } @@ -290,7 +256,7 @@ ffmpeg_gas_sources += [ "libavcodec/arm/h264cmc_neon.S", "libavcodec/arm/h264dsp_neon.S", -@@ -622,7 +622,7 @@ if ((is_win && current_cpu == "x64" && f +@@ -608,7 +608,7 @@ if (is_win && current_cpu == "x64") { ] } @@ -299,7 +265,7 @@ ffmpeg_c_sources += [ "libavcodec/x86/blockdsp_init.c", "libavcodec/x86/fdct.c", -@@ -649,7 +649,7 @@ if ((is_linux && current_cpu == "x64" && +@@ -635,7 +635,7 @@ if ((is_linux && current_cpu == "x64" && ] } @@ -308,7 +274,7 @@ ffmpeg_c_sources += [ "libavcodec/mips/blockdsp_init_mips.c", "libavcodec/mips/h263dsp_init_mips.c", -@@ -662,7 +662,7 @@ if (is_linux && current_cpu == "mipsel" +@@ -648,7 +648,7 @@ if (is_linux && current_cpu == "mipsel" ] } diff --git a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c index 9da8be9030d5..3342c62b928f 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c +++ b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c @@ -1,5 +1,5 @@ ---- third_party/ffmpeg/libavutil/mem.c.orig 2016-08-03 22:03:29.000000000 +0300 -+++ third_party/ffmpeg/libavutil/mem.c 2016-10-11 02:40:34.765488000 +0300 +--- third_party/ffmpeg/libavutil/mem.c.orig 2017-01-26 00:50:11 UTC ++++ third_party/ffmpeg/libavutil/mem.c @@ -32,9 +32,6 @@ #include <stdint.h> #include <stdlib.h> diff --git a/www/chromium/files/patch-third__party_fontconfig_BUILD.gn b/www/chromium/files/patch-third__party_fontconfig_BUILD.gn index 7f10de8c5af2..c127a8b02ca4 100644 --- a/www/chromium/files/patch-third__party_fontconfig_BUILD.gn +++ b/www/chromium/files/patch-third__party_fontconfig_BUILD.gn @@ -1,5 +1,5 @@ ---- third_party/fontconfig/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 -+++ third_party/fontconfig/BUILD.gn 2016-09-03 01:45:52.485587000 +0300 +--- third_party/fontconfig/BUILD.gn.orig 2017-01-26 00:49:29 UTC ++++ third_party/fontconfig/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/www/chromium/files/patch-third__party_freetype2_BUILD.gn b/www/chromium/files/patch-third__party_freetype2_BUILD.gn index d2c7a7ad94e4..2211291d84c7 100644 --- a/www/chromium/files/patch-third__party_freetype2_BUILD.gn +++ b/www/chromium/files/patch-third__party_freetype2_BUILD.gn @@ -1,5 +1,5 @@ ---- third_party/freetype2/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 -+++ third_party/freetype2/BUILD.gn 2016-09-03 01:41:52.625191000 +0300 +--- third_party/freetype2/BUILD.gn.orig 2017-01-26 00:49:29 UTC ++++ third_party/freetype2/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/www/chromium/files/patch-third__party_glslang_BUILD.gn b/www/chromium/files/patch-third__party_glslang_BUILD.gn index 2377c332ade0..73ab4cd5d83e 100644 --- a/www/chromium/files/patch-third__party_glslang_BUILD.gn +++ b/www/chromium/files/patch-third__party_glslang_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/glslang/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 -+++ third_party/glslang/BUILD.gn 2016-09-03 01:42:51.603010000 +0300 -@@ -8,7 +8,7 @@ +--- third_party/glslang/BUILD.gn.orig 2017-01-26 00:49:29 UTC ++++ third_party/glslang/BUILD.gn +@@ -8,7 +8,7 @@ config("glslang_config") { include_dirs = [ "src" ] defines = [] @@ -9,7 +9,7 @@ defines += [ "GLSLANG_OSINCLUDE_UNIX" ] } else if (is_win) { defines += [ "GLSLANG_OSINCLUDE_WIN32" ] -@@ -132,7 +132,7 @@ +@@ -132,7 +132,7 @@ static_library("glslang") { "src/glslang/Public/ShaderLang.h", ] diff --git a/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn b/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn index bbd18e15440b..4d4a29faaecd 100644 --- a/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn +++ b/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn @@ -1,15 +1,15 @@ ---- third_party/harfbuzz-ng/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 -+++ third_party/harfbuzz-ng/BUILD.gn 2016-09-03 01:51:35.889144000 +0300 -@@ -48,7 +48,7 @@ +--- third_party/harfbuzz-ng/BUILD.gn.orig 2017-01-26 00:49:29 UTC ++++ third_party/harfbuzz-ng/BUILD.gn +@@ -50,7 +50,7 @@ if (use_system_harfbuzz) { - # See also chrome/browser/ui/libgtk2ui/BUILD.gn which pulls this. + # See also chrome/browser/ui/libgtkui/BUILD.gn which pulls this. config("pangoft2_link_hack") { - if (is_linux && use_pango && !is_chromeos && !is_official_build && + if ((is_linux || is_bsd) && use_pango && !is_chromeos && !is_official_build && current_cpu != "arm" && current_cpu != "mipsel" && !is_component_build) { # These symbols are referenced from libpangoft2, which will be # dynamically linked later. -@@ -186,7 +186,7 @@ +@@ -193,7 +193,7 @@ if (use_system_harfbuzz) { # in the tree, all symbols pango needs must be included, or # pango uses mixed versions of harfbuzz and leads to crash. # See crbug.com/462689. diff --git a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc index 8610fd482103..9e8e609e7733 100644 --- a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,6 +1,6 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2016-10-06 04:02:41.000000000 +0300 -+++ third_party/leveldatabase/env_chromium.cc 2016-10-13 08:33:43.174604000 +0300 -@@ -23,7 +23,11 @@ +--- third_party/leveldatabase/env_chromium.cc.orig 2017-01-26 00:49:30 UTC ++++ third_party/leveldatabase/env_chromium.cc +@@ -25,7 +25,11 @@ #include "base/trace_event/trace_event.h" #include "third_party/leveldatabase/chromium_logger.h" #include "third_party/leveldatabase/src/include/leveldb/options.h" diff --git a/www/chromium/files/patch-third__party__libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h index 64226959ced6..9599ac0775d4 100644 --- a/www/chromium/files/patch-third__party__libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h @@ -1,6 +1,6 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2016-05-27 10:36:15.803726000 -0400 -+++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h 2016-05-27 10:36:39.406818000 -0400 -@@ -56,7 +56,7 @@ +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2017-01-26 00:50:13 UTC ++++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h +@@ -56,7 +56,7 @@ template <class T> boost::once_flag Sing #include "phonenumbers/base/logging.h" #include "phonenumbers/base/thread_checker.h" diff --git a/www/chromium/files/patch-third__party__libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h index 15f189b0709f..d42440aaf680 100644 --- a/www/chromium/files/patch-third__party__libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h @@ -1,6 +1,6 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2016-05-27 10:37:19.349853000 -0400 -+++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h 2016-05-27 10:37:52.605308000 -0400 -@@ -37,7 +37,7 @@ +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2017-01-26 00:50:13 UTC ++++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h +@@ -37,7 +37,7 @@ typedef boost::mutex::scoped_lock AutoLo // Dummy lock implementation on non-POSIX platforms. If you are running on a // different platform and care about thread-safety, please compile with // -DI18N_PHONENUMBERS_USE_BOOST. diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h index 742c1ac50441..0b203e0f94c5 100644 --- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h @@ -1,5 +1,5 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2016-05-27 10:38:59.514474000 -0400 -+++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h 2016-05-27 10:40:19.234261000 -0400 +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2017-01-26 00:50:13 UTC ++++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h @@ -23,6 +23,7 @@ // user of the library know that it can't be used in a thread-safe manner when // it is not depending on Boost. diff --git a/www/chromium/files/patch-third__party_libusb_BUILD.gn b/www/chromium/files/patch-third__party_libusb_BUILD.gn index 0091eae4b1f8..8b301bc4e7bc 100644 --- a/www/chromium/files/patch-third__party_libusb_BUILD.gn +++ b/www/chromium/files/patch-third__party_libusb_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/libusb/BUILD.gn.orig 2016-10-06 04:02:41.000000000 +0300 -+++ third_party/libusb/BUILD.gn 2016-10-13 08:47:17.152284000 +0300 -@@ -6,8 +6,25 @@ +--- third_party/libusb/BUILD.gn.orig 2017-01-26 00:49:30 UTC ++++ third_party/libusb/BUILD.gn +@@ -6,8 +6,25 @@ assert(!is_android && !is_ios) import("//build/config/features.gni") @@ -28,7 +28,7 @@ } config("libusb_warnings") { -@@ -21,118 +38,119 @@ +@@ -21,118 +38,119 @@ config("libusb_warnings") { } } @@ -67,32 +67,6 @@ - ] - deps = [] - include_dirs = [ "src/libusb/os" ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ -- "//build/config/compiler:no_chromium_code", -- -- # Must be after no_chromium_code for warning flags to be ordered correctly. -- ":libusb_warnings", -- ] -- -- public_configs = [ ":libusb_config" ] -- -- if (is_posix) { -- defines = [ -- "DEFAULT_VISIBILITY=", -- "HAVE_GETTIMEOFDAY=1", -- "HAVE_POLL_H=1", -- "HAVE_SYS_TIME_H=1", -- "LIBUSB_DESCRIBE=\"1.0.16\"", -- "POLL_NFDS_TYPE=nfds_t", -- "THREADS_POSIX=1", -- ] -- } -- -- if (is_mac) { -- defines += [ -- "OS_DARWIN=1", +if (!use_system_libusb) { + static_library("libusb") { + sources = [ @@ -129,17 +103,35 @@ + ] + deps = [] + include_dirs = [ "src/libusb/os" ] -+ + +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ +- "//build/config/compiler:no_chromium_code", + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + "//build/config/compiler:no_chromium_code", -+ + +- # Must be after no_chromium_code for warning flags to be ordered correctly. +- ":libusb_warnings", +- ] +# Must be after no_chromium_code for warning flags to be ordered correctly. + ":libusb_warnings", + ] -+ + +- public_configs = [ ":libusb_config" ] + public_configs = [ ":libusb_config" ] -+ + +- if (is_posix) { +- defines = [ +- "DEFAULT_VISIBILITY=", +- "HAVE_GETTIMEOFDAY=1", +- "HAVE_POLL_H=1", +- "HAVE_SYS_TIME_H=1", +- "LIBUSB_DESCRIBE=\"1.0.16\"", +- "POLL_NFDS_TYPE=nfds_t", +- "THREADS_POSIX=1", +- ] +- } + if (is_posix) { + defines = [ + "DEFAULT_VISIBILITY=", @@ -151,7 +143,10 @@ + "THREADS_POSIX=1", + ] + } -+ + +- if (is_mac) { +- defines += [ +- "OS_DARWIN=1", + if (is_mac) { + defines += [ + "OS_DARWIN=1", @@ -250,7 +245,7 @@ "src/libusb/os/poll_windows.h", "src/libusb/os/threads_windows.c", "src/libusb/os/threads_windows.h", -@@ -142,6 +160,7 @@ +@@ -142,6 +160,7 @@ static_library("libusb") { "src/msvc/config.h", "src/msvc/inttypes.h", "src/msvc/stdint.h", diff --git a/www/chromium/files/patch-third__party_libxml_BUILD.gn b/www/chromium/files/patch-third__party_libxml_BUILD.gn index b66aa863040e..37bb5e907354 100644 --- a/www/chromium/files/patch-third__party_libxml_BUILD.gn +++ b/www/chromium/files/patch-third__party_libxml_BUILD.gn @@ -1,5 +1,5 @@ ---- third_party/libxml/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 -+++ third_party/libxml/BUILD.gn 2016-09-02 23:25:19.267995000 +0300 +--- third_party/libxml/BUILD.gn.orig 2017-01-26 00:49:30 UTC ++++ third_party/libxml/BUILD.gn @@ -4,7 +4,7 @@ # Define an "os_include" variable that points at the OS-specific generated diff --git a/www/chromium/files/patch-third__party_libxslt_BUILD.gn b/www/chromium/files/patch-third__party_libxslt_BUILD.gn index f9bc3e848b4a..e59ff9e55e50 100644 --- a/www/chromium/files/patch-third__party_libxslt_BUILD.gn +++ b/www/chromium/files/patch-third__party_libxslt_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/libxslt/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 -+++ third_party/libxslt/BUILD.gn 2016-09-03 01:40:07.403577000 +0300 -@@ -82,7 +82,7 @@ +--- third_party/libxslt/BUILD.gn.orig 2017-01-26 00:49:30 UTC ++++ third_party/libxslt/BUILD.gn +@@ -82,7 +82,7 @@ static_library("libxslt") { public_configs = [ ":libxslt_config" ] cflags = [] diff --git a/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h b/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h index 732edca0e81c..544151d01c25 100644 --- a/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h +++ b/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h @@ -1,6 +1,6 @@ ---- third_party/libyuv/include/libyuv/row.h.orig 2016-06-16 21:03:47.000000000 +0200 -+++ third_party/libyuv/include/libyuv/row.h 2016-06-26 15:14:58.000000000 +0200 -@@ -160,10 +160,14 @@ +--- third_party/libyuv/include/libyuv/row.h.orig 2017-01-26 00:50:13 UTC ++++ third_party/libyuv/include/libyuv/row.h +@@ -161,10 +161,14 @@ extern "C" { #define HAS_ARGBSHADEROW_SSE2 #define HAS_ARGBSUBTRACTROW_SSE2 #define HAS_ARGBUNATTENUATEROW_SSE2 @@ -15,26 +15,7 @@ #define HAS_RGBCOLORTABLEROW_X86 #define HAS_SOBELROW_SSE2 #define HAS_SOBELTOPLANEROW_SSE2 -@@ -173,8 +177,7 @@ - - // The following functions fail on gcc/clang 32 bit with fpic and framepointer. - // caveat: clangcl uses row_win.cc which works. --#if defined(NDEBUG) || !(defined(_DEBUG) && defined(__i386__)) || \ -- !defined(__i386__) || defined(_MSC_VER) -+#if !(defined(__i386__) && defined(__GNUC__)) - // TODO(fbarchard): fix build error on x86 debug - // https://code.google.com/p/libyuv/issues/detail?id=524 - #define HAS_I411TOARGBROW_SSSE3 -@@ -202,7 +205,7 @@ - #define HAS_COPYROW_AVX - #define HAS_H422TOARGBROW_AVX2 - #define HAS_I400TOARGBROW_AVX2 --#if !(defined(_DEBUG) && defined(__i386__)) -+#if !(defined(__i386__) && defined(__GNUC__)) - // TODO(fbarchard): fix build error on android_full_debug=1 - // https://code.google.com/p/libyuv/issues/detail?id=517 - #define HAS_I422ALPHATOARGBROW_AVX2 -@@ -215,7 +218,9 @@ +@@ -211,7 +215,9 @@ extern "C" { #define HAS_I422TORGB565ROW_AVX2 #define HAS_I422TORGBAROW_AVX2 #define HAS_I444TOARGBROW_AVX2 @@ -44,14 +25,13 @@ #define HAS_J422TOARGBROW_AVX2 #define HAS_MERGEUVROW_AVX2 #define HAS_MIRRORROW_AVX2 -@@ -238,8 +243,10 @@ +@@ -234,7 +240,9 @@ extern "C" { #define HAS_ARGBMULTIPLYROW_AVX2 #define HAS_ARGBSUBTRACTROW_AVX2 #define HAS_ARGBUNATTENUATEROW_AVX2 +#if !(defined(__i386__) && defined(__GNUC__)) #define HAS_BLENDPLANEROW_AVX2 - #endif +#endif - // The following are available for AVX2 Visual C and clangcl 32 bit: - // TODO(fbarchard): Port to gcc. + #if defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \ + defined(_MSC_VER) diff --git a/www/chromium/files/patch-third__party_mesa_BUILD.gn b/www/chromium/files/patch-third__party_mesa_BUILD.gn index 1b13828745d0..9ba3b1f30143 100644 --- a/www/chromium/files/patch-third__party_mesa_BUILD.gn +++ b/www/chromium/files/patch-third__party_mesa_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/mesa/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 -+++ third_party/mesa/BUILD.gn 2016-09-25 07:24:36.558482000 +0300 -@@ -88,6 +88,10 @@ +--- third_party/mesa/BUILD.gn.orig 2017-01-26 00:49:30 UTC ++++ third_party/mesa/BUILD.gn +@@ -90,6 +90,10 @@ config("mesa_internal_config") { defines += [ "_GNU_SOURCE" ] } @@ -11,7 +11,7 @@ if (is_win) { defines += [ # Generated files use const only if __cplusplus or __STDC__ is defined. -@@ -755,7 +759,8 @@ +@@ -757,7 +761,8 @@ loadable_module("osmesa") { ] # Required for the allocator implementation, which is not used on Mac. diff --git a/www/chromium/files/patch-third__party_minigbm_BUILD.gn b/www/chromium/files/patch-third__party_minigbm_BUILD.gn index e705ebfd1e48..3a54124aead4 100644 --- a/www/chromium/files/patch-third__party_minigbm_BUILD.gn +++ b/www/chromium/files/patch-third__party_minigbm_BUILD.gn @@ -1,5 +1,5 @@ ---- third_party/minigbm/BUILD.gn.orig 2016-08-03 22:02:38.000000000 +0300 -+++ third_party/minigbm/BUILD.gn 2016-09-03 01:40:26.605383000 +0300 +--- third_party/minigbm/BUILD.gn.orig 2017-01-26 00:49:30 UTC ++++ third_party/minigbm/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/linux/pkg_config.gni") diff --git a/www/chromium/files/patch-third__party_opus_BUILD.gn b/www/chromium/files/patch-third__party_opus_BUILD.gn index bbce2177c554..041d62bdd0e0 100644 --- a/www/chromium/files/patch-third__party_opus_BUILD.gn +++ b/www/chromium/files/patch-third__party_opus_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/opus/BUILD.gn.orig 2016-10-06 04:02:42.000000000 +0300 -+++ third_party/opus/BUILD.gn 2016-10-13 08:49:39.874353000 +0300 -@@ -14,7 +14,7 @@ +--- third_party/opus/BUILD.gn.orig 2017-01-26 00:49:30 UTC ++++ third_party/opus/BUILD.gn +@@ -14,7 +14,7 @@ use_opus_arm_optimization = current_cpu # If OPUS Run Time CPU Detections (RTCD) shall be used. # Based on the conditions in celt/arm/armcpu.c: # defined(_MSC_VER) || defined(__linux__). diff --git a/www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h b/www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h index 791ba11d624b..e4da339e2bbc 100644 --- a/www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h +++ b/www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h @@ -1,4 +1,4 @@ ---- third_party/ots/include/opentype-sanitiser.h.orig 2016-03-25 13:05:02 UTC +--- third_party/ots/include/opentype-sanitiser.h.orig 2017-01-26 00:49:30 UTC +++ third_party/ots/include/opentype-sanitiser.h @@ -22,6 +22,7 @@ typedef unsigned __int64 uint64_t; #else diff --git a/www/chromium/files/patch-third__party_pdfium_BUILD.gn b/www/chromium/files/patch-third__party_pdfium_BUILD.gn index ffdaa34a546d..d75aeea8babe 100644 --- a/www/chromium/files/patch-third__party_pdfium_BUILD.gn +++ b/www/chromium/files/patch-third__party_pdfium_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/pdfium/BUILD.gn.orig 2016-10-06 04:05:20.000000000 +0300 -+++ third_party/pdfium/BUILD.gn 2016-10-13 08:51:40.306487000 +0300 -@@ -40,7 +40,7 @@ +--- third_party/pdfium/BUILD.gn.orig 2017-01-26 00:50:14 UTC ++++ third_party/pdfium/BUILD.gn +@@ -44,7 +44,7 @@ config("pdfium_core_config") { cflags = [] configs = [ ":pdfium_common_config" ] defines = [ "V8_DEPRECATION_WARNINGS" ] diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h index 6212fefc94d4..8aaabf03ba00 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h +++ b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h @@ -1,4 +1,4 @@ ---- third_party/pdfium/core/fxcrt/fx_system.h.orig 2016-12-13 00:26:52 UTC +--- third_party/pdfium/core/fxcrt/fx_system.h.orig 2017-01-26 00:50:14 UTC +++ third_party/pdfium/core/fxcrt/fx_system.h @@ -40,7 +40,7 @@ #elif defined(_WIN64) diff --git a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp index ee5aa2b06658..d0374c22f6c4 100644 --- a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig 2016-05-27 13:33:48.718479000 -0400 -+++ third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp 2016-05-27 13:43:12.171286000 -0400 -@@ -590,11 +590,12 @@ +--- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig 2017-01-26 00:50:15 UTC ++++ third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp +@@ -458,11 +458,12 @@ v8::Local<v8::Date> CJS_Date::ToV8Date(C } double _getLocalTZA() { @@ -14,7 +14,7 @@ #if _MSC_VER >= 1900 // In gcc and in Visual Studio prior to VS 2015 'timezone' is a global // variable declared in time.h. That variable was deprecated and in VS 2015 -@@ -602,7 +603,11 @@ +@@ -470,7 +471,11 @@ double _getLocalTZA() { long timezone = 0; _get_timezone(&timezone); #endif diff --git a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp index 7075150fd373..696c9ffe241a 100644 --- a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp @@ -1,9 +1,9 @@ ---- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2016-07-20 22:04:51.000000000 +0300 -+++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp 2016-08-01 18:53:01.768097000 +0300 -@@ -62,6 +62,103 @@ +--- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2017-01-26 00:50:15 UTC ++++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp +@@ -68,6 +68,103 @@ const FX_WCHAR* const fullmonths[] = {L" L"July", L"August", L"September", L"October", L"November", L"December"}; - + +#if defined(__FreeBSD__) +/* + * cvt.c - IEEE floating point formatting routines for FreeBSD diff --git a/www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn b/www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn index f2f9b7490d57..addf901c0e1c 100644 --- a/www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn +++ b/www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/pdfium/skia/BUILD.gn.orig 2016-10-06 04:05:20.000000000 +0300 -+++ third_party/pdfium/skia/BUILD.gn 2016-10-13 08:54:45.371706000 +0300 -@@ -180,7 +180,7 @@ +--- third_party/pdfium/skia/BUILD.gn.orig 2017-01-26 00:50:15 UTC ++++ third_party/pdfium/skia/BUILD.gn +@@ -102,7 +102,7 @@ config("skia_library_config") { } # Settings for text blitting, chosen to approximate the system browser. @@ -9,7 +9,7 @@ defines += [ "SK_GAMMA_EXPONENT=1.2", "SK_GAMMA_CONTRAST=0.2", -@@ -329,7 +329,7 @@ +@@ -280,7 +280,7 @@ component("skia") { "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp", ] } @@ -18,7 +18,7 @@ sources -= [ "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", -@@ -358,7 +358,7 @@ +@@ -309,7 +309,7 @@ component("skia") { "../third_party:fx_zlib", ] diff --git a/www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h b/www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h index 599cabbcfdbf..a5c5546d9a4b 100644 --- a/www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h +++ b/www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h @@ -1,5 +1,5 @@ ---- third_party/pdfium/third_party/base/logging.h.orig 2016-05-25 15:02:25.000000000 -0400 -+++ third_party/pdfium/third_party/base/logging.h 2016-05-27 11:35:39.166720000 -0400 +--- third_party/pdfium/third_party/base/logging.h.orig 2017-01-26 00:50:15 UTC ++++ third_party/pdfium/third_party/base/logging.h @@ -10,7 +10,7 @@ #ifndef _WIN32 diff --git a/www/chromium/files/patch-third__party_sqlite_BUILD.gn b/www/chromium/files/patch-third__party_sqlite_BUILD.gn index 864bb10c6ac2..e11d2c7aa9aa 100644 --- a/www/chromium/files/patch-third__party_sqlite_BUILD.gn +++ b/www/chromium/files/patch-third__party_sqlite_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/sqlite/BUILD.gn.orig 2016-10-06 04:02:42.000000000 +0300 -+++ third_party/sqlite/BUILD.gn 2016-10-30 23:32:40.983715000 +0200 -@@ -20,7 +20,7 @@ +--- third_party/sqlite/BUILD.gn.orig 2017-01-26 00:49:30 UTC ++++ third_party/sqlite/BUILD.gn +@@ -22,7 +22,7 @@ if (!use_system_sqlite) { # sqlite3Fts3InitTok). cflags += [ "-Wno-unused-function" ] } @@ -9,7 +9,7 @@ cflags += [ # SQLite doesn"t believe in compiler warnings, # preferring testing. -@@ -177,7 +177,7 @@ +@@ -187,7 +187,7 @@ if (!use_system_sqlite) { public_configs = [ ":sqlite_export" ] } @@ -18,7 +18,7 @@ executable("sqlite_shell") { # So shell.c can find the correct sqlite3.h. include_dirs = [ "amalgamation" ] -@@ -206,7 +206,7 @@ +@@ -216,7 +216,7 @@ if (use_system_sqlite) { config("sqlite_config") { defines = [ "USE_SYSTEM_SQLITE" ] @@ -27,7 +27,7 @@ libs = [ "sqlite3" ] } else { assert(false, "extra flags to use system sqlite3 library missing") -@@ -225,7 +225,7 @@ +@@ -235,7 +235,7 @@ if (use_system_sqlite) { } } diff --git a/www/chromium/files/patch-third__party_usrsctp_BUILD.gn b/www/chromium/files/patch-third__party_usrsctp_BUILD.gn index 5f147fa94ca6..b4ad3170669f 100644 --- a/www/chromium/files/patch-third__party_usrsctp_BUILD.gn +++ b/www/chromium/files/patch-third__party_usrsctp_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/usrsctp/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300 -+++ third_party/usrsctp/BUILD.gn 2016-09-20 02:42:29.328962000 +0300 -@@ -112,6 +112,12 @@ +--- third_party/usrsctp/BUILD.gn.orig 2017-01-26 00:49:31 UTC ++++ third_party/usrsctp/BUILD.gn +@@ -112,6 +112,12 @@ static_library("usrsctp") { "__Userspace_os_Linux", "_GNU_SOURCE", ] diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index 70f875e8ff45..b79447d5fa44 100644 --- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2016-10-06 04:05:35.000000000 +0300 -+++ third_party/webrtc/BUILD.gn 2016-10-14 17:24:44.301409000 +0300 -@@ -60,6 +60,9 @@ +--- third_party/webrtc/BUILD.gn.orig 2017-01-26 00:50:17 UTC ++++ third_party/webrtc/BUILD.gn +@@ -60,6 +60,9 @@ config("common_inherited_config") { if (is_linux) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn index b39eab962833..84b2abca2604 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/base/BUILD.gn.orig 2016-08-03 22:04:03.000000000 +0300 -+++ third_party/webrtc/base/BUILD.gn 2016-09-25 15:11:54.051352000 +0300 -@@ -525,7 +525,6 @@ +--- third_party/webrtc/base/BUILD.gn.orig 2017-01-26 00:50:17 UTC ++++ third_party/webrtc/base/BUILD.gn +@@ -650,7 +650,6 @@ rtc_static_library("rtc_base") { "x11windowpicker.h", ] libs += [ diff --git a/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc b/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc index 2b7a938416ab..516620598f78 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/httpcommon.cc.orig 2016-05-11 19:04:03 UTC +--- third_party/webrtc/base/httpcommon.cc.orig 2017-01-26 00:50:17 UTC +++ third_party/webrtc/base/httpcommon.cc @@ -384,7 +384,7 @@ bool HttpDateToSeconds(const std::string gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60; diff --git a/www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h b/www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h index 20df882d6d9b..12f3b45d0941 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h +++ b/www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/ifaddrs_converter.h.orig 2016-05-11 19:04:03 UTC +--- third_party/webrtc/base/ifaddrs_converter.h.orig 2017-01-26 00:50:17 UTC +++ third_party/webrtc/base/ifaddrs_converter.h @@ -14,6 +14,8 @@ #if defined(WEBRTC_ANDROID) diff --git a/www/chromium/files/patch-third__party_webrtc_base_ipaddress.h b/www/chromium/files/patch-third__party_webrtc_base_ipaddress.h index bbb950c6fa08..73520d43ec02 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_ipaddress.h +++ b/www/chromium/files/patch-third__party_webrtc_base_ipaddress.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/ipaddress.h.orig 2016-05-11 19:04:03 UTC +--- third_party/webrtc/base/ipaddress.h.orig 2017-01-26 00:50:17 UTC +++ third_party/webrtc/base/ipaddress.h @@ -17,6 +17,10 @@ #include <arpa/inet.h> diff --git a/www/chromium/files/patch-third__party_webrtc_base_linux.cc b/www/chromium/files/patch-third__party_webrtc_base_linux.cc index 1849944495c1..b51871524bdf 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_linux.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_linux.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/linux.cc.orig 2016-05-11 19:04:03 UTC +--- third_party/webrtc/base/linux.cc.orig 2017-01-26 00:50:17 UTC +++ third_party/webrtc/base/linux.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. diff --git a/www/chromium/files/patch-third__party_webrtc_base_linux.h b/www/chromium/files/patch-third__party_webrtc_base_linux.h index 0adf4654b32d..8d1705bd183c 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_linux.h +++ b/www/chromium/files/patch-third__party_webrtc_base_linux.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/linux.h.orig 2016-05-11 19:04:03 UTC +--- third_party/webrtc/base/linux.h.orig 2017-01-26 00:50:17 UTC +++ third_party/webrtc/base/linux.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_BASE_LINUX_H_ @@ -8,7 +8,7 @@ +#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) #include <string> #include <map> - #include <vector> + #include <memory> @@ -114,5 +114,5 @@ int ReadCpuMaxFreq(); } // namespace rtc diff --git a/www/chromium/files/patch-third__party_webrtc_base_network.cc b/www/chromium/files/patch-third__party_webrtc_base_network.cc index 4c17ec114eed..d0b798cc3d39 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_network.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_network.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/base/network.cc.orig 2016-05-11 19:04:03 UTC +--- third_party/webrtc/base/network.cc.orig 2017-01-26 00:50:17 UTC +++ third_party/webrtc/base/network.cc -@@ -18,7 +18,7 @@ +@@ -14,7 +14,7 @@ // linux/if.h can't be included at the same time as the posix sys/if.h, and // it's transitively required by linux/route.h, so include that version on // linux instead of the standard posix one. @@ -9,7 +9,7 @@ #include <linux/if.h> #include <linux/route.h> #elif !defined(__native_client__) -@@ -634,7 +634,7 @@ bool BasicNetworkManager::CreateNetworks +@@ -656,7 +656,7 @@ bool BasicNetworkManager::CreateNetworks } #endif // WEBRTC_WIN @@ -18,7 +18,7 @@ bool IsDefaultRoute(const std::string& network_name) { FileStream fs; if (!fs.Open("/proc/net/route", "r", NULL)) { -@@ -677,7 +677,7 @@ bool BasicNetworkManager::IsIgnoredNetwo +@@ -699,7 +699,7 @@ bool BasicNetworkManager::IsIgnoredNetwo strncmp(network.name().c_str(), "vboxnet", 7) == 0) { return true; } diff --git a/www/chromium/files/patch-third__party_webrtc_base_network.h b/www/chromium/files/patch-third__party_webrtc_base_network.h index 1cce0be85836..7c6a919cbeaa 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_network.h +++ b/www/chromium/files/patch-third__party_webrtc_base_network.h @@ -1,7 +1,7 @@ ---- third_party/webrtc/base/network.h.orig 2016-05-11 19:04:03 UTC +--- third_party/webrtc/base/network.h.orig 2017-01-26 00:50:17 UTC +++ third_party/webrtc/base/network.h @@ -23,6 +23,10 @@ - #include "webrtc/base/scoped_ptr.h" + #include "webrtc/base/messagehandler.h" #include "webrtc/base/sigslot.h" +#if defined(WEBRTC_BSD) diff --git a/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc b/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc index 23e83006204a..cef0e4687dc6 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/base/physicalsocketserver.cc.orig 2016-10-06 04:05:35.000000000 +0300 -+++ third_party/webrtc/base/physicalsocketserver.cc 2016-10-13 12:57:59.467761000 +0300 -@@ -63,7 +63,11 @@ +--- third_party/webrtc/base/physicalsocketserver.cc.orig 2017-01-26 00:50:17 UTC ++++ third_party/webrtc/base/physicalsocketserver.cc +@@ -61,7 +61,11 @@ typedef void* SockOptArg; int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; @@ -12,7 +12,7 @@ if (ret != 0) return -1; int64_t timestamp = -@@ -276,7 +280,7 @@ +@@ -274,7 +278,7 @@ int PhysicalSocket::GetOption(Option opt socklen_t optlen = sizeof(*value); int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen); if (ret != -1 && opt == OPT_DONTFRAGMENT) { @@ -21,7 +21,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } -@@ -289,7 +293,7 @@ +@@ -287,7 +291,7 @@ int PhysicalSocket::SetOption(Option opt if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -30,7 +30,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } -@@ -571,10 +575,10 @@ +@@ -569,10 +573,10 @@ int PhysicalSocket::TranslateOption(Opti *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc b/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc index bf9ffec5a5f9..98c0d704b0df 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/platform_thread.cc.orig 2016-05-11 19:04:03 UTC +--- third_party/webrtc/base/platform_thread.cc.orig 2017-01-26 00:50:17 UTC +++ third_party/webrtc/base/platform_thread.cc @@ -12,11 +12,18 @@ diff --git a/www/chromium/files/patch-third__party_webrtc_base_stringutils.h b/www/chromium/files/patch-third__party_webrtc_base_stringutils.h index a1f775be6fec..9b04e0143581 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_stringutils.h +++ b/www/chromium/files/patch-third__party_webrtc_base_stringutils.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/stringutils.h.orig 2016-05-11 19:04:03 UTC +--- third_party/webrtc/base/stringutils.h.orig 2017-01-26 00:50:17 UTC +++ third_party/webrtc/base/stringutils.h @@ -23,11 +23,11 @@ #endif // WEBRTC_WIN diff --git a/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc b/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc index 117a7956293c..5c7d481d662d 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/systeminfo.cc.orig 2016-05-11 19:04:03 UTC +--- third_party/webrtc/base/systeminfo.cc.orig 2017-01-26 00:50:17 UTC +++ third_party/webrtc/base/systeminfo.cc @@ -20,8 +20,12 @@ #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index 03aad130fb5f..1baf427bdec6 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2016-10-06 04:05:36.000000000 +0300 -+++ third_party/webrtc/modules/audio_device/BUILD.gn 2016-10-17 00:53:40.915668000 +0300 -@@ -52,7 +52,7 @@ +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2017-01-26 00:50:17 UTC ++++ third_party/webrtc/modules/audio_device/BUILD.gn +@@ -77,7 +77,7 @@ rtc_static_library("audio_device") { ] include_dirs = [] @@ -9,7 +9,7 @@ include_dirs += [ "linux" ] } if (is_ios) { -@@ -98,7 +98,7 @@ +@@ -125,7 +125,7 @@ rtc_static_library("audio_device") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc index e3b352751cc0..ff28494b3946 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc +++ b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc @@ -1,10 +1,10 @@ ---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2016-05-11 19:04:03 UTC +--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2017-01-26 00:50:17 UTC +++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc -@@ -14,6 +14,7 @@ +@@ -13,6 +13,7 @@ #include <string.h> #include <algorithm> +#include <cstdlib> #include <iterator> + #include <utility> - #include "webrtc/base/checks.h" diff --git a/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn index efa9d983ab99..f86f84ab3302 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/video_coding/BUILD.gn.orig 2016-12-13 00:29:05 UTC +--- third_party/webrtc/modules/video_coding/BUILD.gn.orig 2017-01-26 00:50:17 UTC +++ third_party/webrtc/modules/video_coding/BUILD.gn -@@ -140,9 +140,7 @@ rtc_static_library("webrtc_h264") { +@@ -137,9 +137,7 @@ rtc_static_library("webrtc_h264") { } defines = [] @@ -9,9 +9,9 @@ - ] + deps = [] - if (is_ios) { - sources += [ "codecs/h264/h264_objc.mm" ] -@@ -161,9 +159,9 @@ rtc_static_library("webrtc_h264") { + if (rtc_use_h264) { + defines += [ "WEBRTC_USE_H264" ] +@@ -153,9 +151,9 @@ rtc_static_library("webrtc_h264") { "codecs/h264/h264_encoder_impl.h", ] deps += [ diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn index 9de1139ab87a..5c82743419fb 100644 --- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/system_wrappers/BUILD.gn.orig 2016-10-06 04:05:36.000000000 +0300 -+++ third_party/webrtc/system_wrappers/BUILD.gn 2016-10-14 17:26:56.594097000 +0300 -@@ -105,7 +105,7 @@ +--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2017-01-26 00:50:17 UTC ++++ third_party/webrtc/system_wrappers/BUILD.gn +@@ -90,7 +90,7 @@ rtc_static_library("system_wrappers") { libs += [ "log" ] } @@ -9,7 +9,7 @@ defines += [ "WEBRTC_THREAD_RR" ] if (!build_with_chromium) { -@@ -115,7 +115,7 @@ +@@ -100,7 +100,7 @@ rtc_static_library("system_wrappers") { libs += [ "rt" ] } diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc b/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc index ae133b7f60dc..5984db36c97b 100644 --- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc +++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc @@ -1,5 +1,5 @@ ---- third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc.orig 2016-10-06 04:05:36.000000000 +0300 -+++ third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc 2016-10-14 17:25:37.203869000 +0300 +--- third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc.orig 2017-01-26 00:50:17 UTC ++++ third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc @@ -12,7 +12,7 @@ #include <assert.h> diff --git a/www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h b/www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h index 37da37d82e54..3327a286de7c 100644 --- a/www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h +++ b/www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2016-05-11 19:04:03 UTC +--- third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2017-01-26 00:50:17 UTC +++ third_party/webrtc/voice_engine/voice_engine_defines.h @@ -210,7 +210,7 @@ inline int VoEChannelId(int moduleId) { #include <pthread.h> diff --git a/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn b/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn index 5b2b6dff2b39..7cf640a48954 100644 --- a/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn +++ b/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/widevine/cdm/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300 -+++ third_party/widevine/cdm/BUILD.gn 2016-09-03 01:41:31.936198000 +0300 -@@ -22,7 +22,7 @@ +--- third_party/widevine/cdm/BUILD.gn.orig 2017-01-26 00:49:31 UTC ++++ third_party/widevine/cdm/BUILD.gn +@@ -26,7 +26,7 @@ if (is_android) { widevine_cdm_version_h_file = "chromeos/$widevine_arch/widevine_cdm_version.h" widevine_cdm_binary_files = [ "chromeos/$widevine_arch/libwidevinecdm.so" ] @@ -9,16 +9,16 @@ widevine_cdm_version_h_file = "linux/$widevine_arch/widevine_cdm_version.h" widevine_cdm_binary_files = [ "linux/$widevine_arch/libwidevinecdm.so" ] } else if (is_win) { -@@ -130,7 +130,7 @@ - ":widevinecdmadapter_resources", +@@ -160,7 +160,7 @@ if ((is_chrome_branded || enable_widevin + ":widevinecdm", ] - if (is_linux) { + if (is_linux || is_bsd) { ldflags = - [ rebase_path("$root_out_dir/libwidevinecdm.so", root_build_dir) ] - } else if (is_win) { -@@ -150,7 +150,7 @@ + [ rebase_path("$root_out_dir/$widevine_cdm_path/libwidevinecdm.so", + root_build_dir) ] +@@ -183,7 +183,7 @@ if ((is_chrome_branded || enable_widevin # This target exists for tests to depend on that pulls in a runtime dependency # on the license server. source_set("widevine_test_license_server") { diff --git a/www/chromium/files/patch-third__party_yasm_BUILD.gn b/www/chromium/files/patch-third__party_yasm_BUILD.gn index ffd2e3cdb793..5c7b20bc76af 100644 --- a/www/chromium/files/patch-third__party_yasm_BUILD.gn +++ b/www/chromium/files/patch-third__party_yasm_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/yasm/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300 -+++ third_party/yasm/BUILD.gn 2016-09-05 21:50:53.007490000 +0300 -@@ -32,7 +32,12 @@ +--- third_party/yasm/BUILD.gn.orig 2017-01-26 00:49:31 UTC ++++ third_party/yasm/BUILD.gn +@@ -32,7 +32,12 @@ import("//build/config/compiler/compiler if (current_toolchain == host_toolchain) { # Various files referenced by multiple targets. yasm_gen_include_dir = "$target_gen_dir/include" diff --git a/www/chromium/files/patch-third__party_zlib_BUILD.gn b/www/chromium/files/patch-third__party_zlib_BUILD.gn index 36cc995e2a8f..a7516cba501d 100644 --- a/www/chromium/files/patch-third__party_zlib_BUILD.gn +++ b/www/chromium/files/patch-third__party_zlib_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/zlib/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300 -+++ third_party/zlib/BUILD.gn 2016-09-29 17:46:32.878236000 +0300 -@@ -115,7 +115,7 @@ +--- third_party/zlib/BUILD.gn.orig 2017-01-26 00:49:31 UTC ++++ third_party/zlib/BUILD.gn +@@ -115,7 +115,7 @@ static_library("minizip") { "contrib/minizip/iowin32.h", ] } diff --git a/www/chromium/files/patch-tools_battor__agent_BUILD.gn b/www/chromium/files/patch-tools_battor__agent_BUILD.gn index 09633e35e6f7..30679f4aaa5e 100644 --- a/www/chromium/files/patch-tools_battor__agent_BUILD.gn +++ b/www/chromium/files/patch-tools_battor__agent_BUILD.gn @@ -1,5 +1,5 @@ ---- tools/battor_agent/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300 -+++ tools/battor_agent/BUILD.gn 2016-09-01 02:14:55.585315000 +0300 +--- tools/battor_agent/BUILD.gn.orig 2017-01-26 00:49:31 UTC ++++ tools/battor_agent/BUILD.gn @@ -5,7 +5,7 @@ import("//testing/test.gni") diff --git a/www/chromium/files/patch-tools_gn_args.cc b/www/chromium/files/patch-tools_gn_args.cc index 52dd76c33592..4eaa5b60eea9 100644 --- a/www/chromium/files/patch-tools_gn_args.cc +++ b/www/chromium/files/patch-tools_gn_args.cc @@ -1,6 +1,6 @@ ---- tools/gn/args.cc.orig 2016-08-13 15:22:20.957491000 +0300 -+++ tools/gn/args.cc 2016-08-13 15:22:40.739449000 +0300 -@@ -222,6 +222,8 @@ +--- tools/gn/args.cc.orig 2017-01-26 00:49:31 UTC ++++ tools/gn/args.cc +@@ -254,6 +254,8 @@ void Args::SetSystemVarsLocked(Scope* de os = "mac"; #elif defined(OS_LINUX) os = "linux"; @@ -8,4 +8,4 @@ + os = "bsd"; #elif defined(OS_ANDROID) os = "android"; - #else + #elif defined(OS_NETBSD) diff --git a/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py b/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py index 9e3d8b4d3df5..e0eca49ad35f 100644 --- a/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py +++ b/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py @@ -1,28 +1,28 @@ ---- tools/gn/bootstrap/bootstrap.py.orig 2016-10-06 04:02:43.000000000 +0300 -+++ tools/gn/bootstrap/bootstrap.py 2016-10-31 01:50:52.450019000 +0200 -@@ -23,6 +23,7 @@ +--- tools/gn/bootstrap/bootstrap.py.orig 2017-01-26 00:49:31 UTC ++++ tools/gn/bootstrap/bootstrap.py +@@ -23,6 +23,7 @@ import os import shutil import subprocess import sys +import platform import tempfile - + BOOTSTRAP_DIR = os.path.dirname(os.path.abspath(__file__)) -@@ -31,8 +32,9 @@ - +@@ -31,8 +32,9 @@ SRC_ROOT = os.path.dirname(os.path.dirna + is_win = sys.platform.startswith('win') is_linux = sys.platform.startswith('linux') +is_bsd = platform.system().lower().endswith('bsd') is_mac = sys.platform.startswith('darwin') -is_posix = is_linux or is_mac +is_posix = is_linux or is_mac or is_bsd - + def check_call(cmd, **kwargs): logging.debug('Running: %s', ' '.join(cmd)) -@@ -594,6 +596,39 @@ +@@ -594,6 +596,39 @@ def write_gn_ninja(path, root_gen_dir, o 'base/third_party/libevent/epoll.c', ]) - + + if is_bsd: + libs.extend(['-lexecinfo', '-lkvm']) + ldflags.extend(['-pthread']) @@ -56,6 +56,6 @@ + ]) + # Suppressing warnings + cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) - + if is_mac: static_libraries['base']['sources'].extend([ diff --git a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py index d15e8130b56e..508e8c51d302 100644 --- a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py +++ b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py @@ -1,6 +1,6 @@ ---- tools/variations/fieldtrial_to_struct.py.orig 2016-12-13 00:00:14 UTC +--- tools/variations/fieldtrial_to_struct.py.orig 2017-01-26 00:49:31 UTC +++ tools/variations/fieldtrial_to_struct.py -@@ -113,7 +113,7 @@ def main(arguments): +@@ -116,7 +116,7 @@ def main(arguments): if not opts.platform: parser.error('You must specify a --platform.') diff --git a/www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h b/www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h index 63d166f7751f..7959642f6d6d 100644 --- a/www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h +++ b/www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h @@ -1,4 +1,4 @@ ---- ui/accessibility/platform/ax_platform_node.h.orig 2016-05-11 19:02:35 UTC +--- ui/accessibility/platform/ax_platform_node.h.orig 2017-01-26 00:49:31 UTC +++ ui/accessibility/platform/ax_platform_node.h @@ -22,7 +22,7 @@ #define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1 diff --git a/www/chromium/files/patch-ui_app__list_app__list__constants.cc b/www/chromium/files/patch-ui_app__list_app__list__constants.cc index 6c3ad07146dc..4b89e2717b6c 100644 --- a/www/chromium/files/patch-ui_app__list_app__list__constants.cc +++ b/www/chromium/files/patch-ui_app__list_app__list__constants.cc @@ -1,6 +1,6 @@ ---- ui/app_list/app_list_constants.cc.orig 2016-05-11 19:02:35 UTC +--- ui/app_list/app_list_constants.cc.orig 2017-01-26 00:49:31 UTC +++ ui/app_list/app_list_constants.cc -@@ -144,7 +144,7 @@ const char kSearchQueryLength[] = "Apps. +@@ -140,7 +140,7 @@ const char kSearchQueryLength[] = "Apps. const char kSearchResultDistanceFromOrigin[] = "Apps.AppListSearchResultDistanceFromOrigin"; diff --git a/www/chromium/files/patch-ui_app__list_app__list__constants.h b/www/chromium/files/patch-ui_app__list_app__list__constants.h index 6fa672330a65..a99e9c00808e 100644 --- a/www/chromium/files/patch-ui_app__list_app__list__constants.h +++ b/www/chromium/files/patch-ui_app__list_app__list__constants.h @@ -1,6 +1,6 @@ ---- ui/app_list/app_list_constants.h.orig 2016-03-25 13:05:03 UTC +--- ui/app_list/app_list_constants.h.orig 2017-01-26 00:49:31 UTC +++ ui/app_list/app_list_constants.h -@@ -92,8 +92,8 @@ APP_LIST_EXPORT extern const char kSearc +@@ -89,8 +89,8 @@ APP_LIST_EXPORT extern const char kSearc APP_LIST_EXPORT extern const char kSearchQueryLength[]; APP_LIST_EXPORT extern const char kSearchResultDistanceFromOrigin[]; diff --git a/www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc b/www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc index 07b1c137f8c9..543a726e00c1 100644 --- a/www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc +++ b/www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc @@ -1,6 +1,6 @@ ---- ui/app_list/views/app_list_item_view.cc.orig 2016-08-03 22:02:40.000000000 +0300 -+++ ui/app_list/views/app_list_item_view.cc 2016-08-19 05:58:12.763965000 +0300 -@@ -62,7 +62,7 @@ +--- ui/app_list/views/app_list_item_view.cc.orig 2017-01-26 00:49:31 UTC ++++ ui/app_list/views/app_list_item_view.cc +@@ -55,7 +55,7 @@ gfx::FontList GetFontList() { const gfx::FontList& font_list = rb.GetFontList(kItemTextFontStyle); // The font is different on each platform. The font size is adjusted on some // platforms to keep a consistent look. diff --git a/www/chromium/files/patch-ui_app__list_views_app__list__view.cc b/www/chromium/files/patch-ui_app__list_views_app__list__view.cc index ad3c02e21d36..4f8482fc85a4 100644 --- a/www/chromium/files/patch-ui_app__list_views_app__list__view.cc +++ b/www/chromium/files/patch-ui_app__list_views_app__list__view.cc @@ -1,6 +1,6 @@ ---- ui/app_list/views/app_list_view.cc.orig 2016-10-06 04:02:44.000000000 +0300 -+++ ui/app_list/views/app_list_view.cc 2016-10-13 09:16:02.654490000 +0300 -@@ -70,7 +70,7 @@ +--- ui/app_list/views/app_list_view.cc.orig 2017-01-26 00:49:31 UTC ++++ ui/app_list/views/app_list_view.cc +@@ -70,7 +70,7 @@ const int kArrowOffset = 10; // Determines whether the current environment supports shadows bubble borders. bool SupportsShadow() { @@ -9,7 +9,7 @@ // Shadows are not supported on (non-ChromeOS) Linux. return false; #endif -@@ -567,7 +567,7 @@ +@@ -538,7 +538,7 @@ void AppListView::OnBeforeBubbleWidgetIn if (!params->native_widget && delegate_ && delegate_->ForceNativeDesktop()) params->native_widget = new views::DesktopNativeWidgetAura(widget); #endif diff --git a/www/chromium/files/patch-ui_aura_BUILD.gn b/www/chromium/files/patch-ui_aura_BUILD.gn index 9578703a8faa..e6d0852a7a47 100644 --- a/www/chromium/files/patch-ui_aura_BUILD.gn +++ b/www/chromium/files/patch-ui_aura_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/aura/BUILD.gn.orig 2016-08-03 22:02:40.000000000 +0300 -+++ ui/aura/BUILD.gn 2016-09-03 00:18:30.181232000 +0300 -@@ -275,7 +275,7 @@ +--- ui/aura/BUILD.gn.orig 2017-01-26 00:49:31 UTC ++++ ui/aura/BUILD.gn +@@ -361,7 +361,7 @@ test("aura_unittests") { "//ui/gl:test_support", ] diff --git a/www/chromium/files/patch-ui_base_BUILD.gn b/www/chromium/files/patch-ui_base_BUILD.gn index 914e7ef00631..b379291b7708 100644 --- a/www/chromium/files/patch-ui_base_BUILD.gn +++ b/www/chromium/files/patch-ui_base_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/base/BUILD.gn.orig 2016-08-03 22:02:41.000000000 +0300 -+++ ui/base/BUILD.gn 2016-09-28 09:32:40.317599000 +0300 -@@ -341,7 +341,7 @@ +--- ui/base/BUILD.gn.orig 2017-01-26 00:49:31 UTC ++++ ui/base/BUILD.gn +@@ -348,7 +348,7 @@ component("base") { sources += [ "touch/touch_device_android.cc" ] } else if (is_ios) { sources += [ "touch/touch_device_ios.cc" ] @@ -9,7 +9,7 @@ sources += [ "touch/touch_device_linux.cc" ] } else { # Empty implementation for all other cases. -@@ -443,7 +443,7 @@ +@@ -450,11 +450,11 @@ component("base") { ] } @@ -18,16 +18,12 @@ sources -= [ "resource/resource_bundle_auralinux.cc" ] } -@@ -451,7 +451,7 @@ - sources -= [ "dragdrop/drag_utils_aura.cc" ] - } - - if (is_linux) { + if (is_linux || is_bsd) { deps += [ "//build/linux:fontconfig" ] } -@@ -459,7 +459,7 @@ +@@ -462,7 +462,7 @@ component("base") { configs += [ "//build/config/linux:glib" ] } @@ -36,7 +32,7 @@ if (!toolkit_views && !use_aura) { sources -= [ "dragdrop/drag_utils.cc", -@@ -794,7 +794,7 @@ +@@ -801,7 +801,7 @@ test("ui_base_unittests") { "ime/win/imm32_manager_unittest.cc", "ime/win/tsf_input_scope_unittest.cc", ] @@ -44,8 +40,8 @@ + if ((is_linux || is_bsd) && use_aura && !is_chromeos) { sources += [ "ime/input_method_auralinux_unittest.cc" ] } - if (is_mac) { -@@ -919,7 +919,7 @@ + if (use_x11) { +@@ -924,7 +924,7 @@ test("ui_base_unittests") { ] } @@ -54,7 +50,7 @@ # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak # instead of depending directly on the non-test .pak files, but depending # on ui_test_pak seems to have no effect. -@@ -932,7 +932,7 @@ +@@ -937,7 +937,7 @@ test("ui_base_unittests") { "//third_party/mesa:osmesa", ] } diff --git a/www/chromium/files/patch-ui_base_ime_BUILD.gn b/www/chromium/files/patch-ui_base_ime_BUILD.gn index ee5cb14a2a2f..673dd2f74d02 100644 --- a/www/chromium/files/patch-ui_base_ime_BUILD.gn +++ b/www/chromium/files/patch-ui_base_ime_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/base/ime/BUILD.gn.orig 2016-10-06 04:02:44.000000000 +0300 -+++ ui/base/ime/BUILD.gn 2016-10-14 18:28:15.896660000 +0300 -@@ -123,7 +123,7 @@ +--- ui/base/ime/BUILD.gn.orig 2017-01-26 00:49:31 UTC ++++ ui/base/ime/BUILD.gn +@@ -123,7 +123,7 @@ component("ime") { ":text_input_types", ] @@ -9,7 +9,7 @@ sources -= [ "input_method_auralinux.cc", "input_method_auralinux.h", -@@ -137,7 +137,7 @@ +@@ -137,7 +137,7 @@ component("ime") { ] } diff --git a/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h b/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h index 83b84484a634..205449aaa8cc 100644 --- a/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h +++ b/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h @@ -1,4 +1,4 @@ ---- ui/base/ime/ime_engine_handler_interface.h.orig 2016-04-08 16:02:15 UTC +--- ui/base/ime/ime_engine_handler_interface.h.orig 2017-01-26 00:49:31 UTC +++ ui/base/ime/ime_engine_handler_interface.h @@ -138,7 +138,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandle // Hides the input view window (from API call). diff --git a/www/chromium/files/patch-ui_base_ime_input__method__factory.cc b/www/chromium/files/patch-ui_base_ime_input__method__factory.cc index d0e4e68ce86a..a90f8a4b22fa 100644 --- a/www/chromium/files/patch-ui_base_ime_input__method__factory.cc +++ b/www/chromium/files/patch-ui_base_ime_input__method__factory.cc @@ -1,24 +1,22 @@ ---- ui/base/ime/input_method_factory.cc.orig 2016-10-06 04:02:44.000000000 +0300 -+++ ui/base/ime/input_method_factory.cc 2016-10-13 09:19:24.642495000 +0300 -@@ -14,8 +14,8 @@ +--- ui/base/ime/input_method_factory.cc.orig 2017-01-26 00:49:31 UTC ++++ ui/base/ime/input_method_factory.cc +@@ -14,7 +14,8 @@ #include "ui/base/ime/input_method_win.h" #elif defined(OS_MACOSX) #include "ui/base/ime/input_method_mac.h" --#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \ -- !defined(OS_CHROMEOS) +-#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) +#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) && \ -+ defined(USE_X11) && !defined(OS_CHROMEOS) ++ defined(USE_X11) #include "ui/base/ime/input_method_auralinux.h" #elif defined(OS_ANDROID) #include "ui/base/ime/input_method_android.h" -@@ -56,8 +56,8 @@ +@@ -55,7 +56,8 @@ std::unique_ptr<InputMethod> CreateInput return base::MakeUnique<InputMethodWin>(delegate, widget); #elif defined(OS_MACOSX) return base::MakeUnique<InputMethodMac>(delegate); --#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \ -- !defined(OS_CHROMEOS) +-#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) +#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) && \ -+ defined(USE_X11) && !defined(OS_CHROMEOS) ++ defined(USE_X11) return base::MakeUnique<InputMethodAuraLinux>(delegate); #elif defined(OS_ANDROID) return base::MakeUnique<InputMethodAndroid>(delegate); 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 8de491922807..0cc6722ba99d 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,4 +1,4 @@ ---- ui/base/ime/input_method_initializer.cc.orig 2016-03-25 13:05:03 UTC +--- ui/base/ime/input_method_initializer.cc.orig 2017-01-26 00:49:31 UTC +++ ui/base/ime/input_method_initializer.cc @@ -8,14 +8,14 @@ diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index e5c803678063..f5c6d5d704c7 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2016-07-20 22:03:45.000000000 +0300 -+++ ui/base/resource/resource_bundle.cc 2016-08-01 22:13:38.986790000 +0300 -@@ -626,7 +626,7 @@ +--- ui/base/resource/resource_bundle.cc.orig 2017-01-26 00:49:31 UTC ++++ ui/base/resource/resource_bundle.cc +@@ -651,7 +651,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,7 +9,7 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -686,7 +686,7 @@ +@@ -711,7 +711,7 @@ void ResourceBundle::InitSharedInstance( supported_scale_factors.push_back(SCALE_FACTOR_100P); } #elif defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \ diff --git a/www/chromium/files/patch-ui_base_ui__features.gni b/www/chromium/files/patch-ui_base_ui__features.gni index eb3495112483..5919a0571cc7 100644 --- a/www/chromium/files/patch-ui_base_ui__features.gni +++ b/www/chromium/files/patch-ui_base_ui__features.gni @@ -1,5 +1,5 @@ ---- ui/base/ui_features.gni.orig 2016-08-03 22:02:41.000000000 +0300 -+++ ui/base/ui_features.gni 2016-09-01 03:07:44.861869000 +0300 +--- ui/base/ui_features.gni.orig 2017-01-26 00:49:31 UTC ++++ ui/base/ui_features.gni @@ -2,4 +2,4 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc index 0871f06fedcf..3be61258ebe5 100644 --- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2016-05-11 19:02:35 UTC +--- ui/base/webui/web_ui_util.cc.orig 2017-01-26 00:49:31 UTC +++ ui/base/webui/web_ui_util.cc -@@ -164,7 +164,7 @@ std::string GetFontFamily() { +@@ -161,7 +161,7 @@ std::string GetFontFamily() { // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced // into Ozone: crbug.com/320050 diff --git a/www/chromium/files/patch-ui_compositor_BUILD.gn b/www/chromium/files/patch-ui_compositor_BUILD.gn index 1ae744465c1f..ba9bd27d0f98 100644 --- a/www/chromium/files/patch-ui_compositor_BUILD.gn +++ b/www/chromium/files/patch-ui_compositor_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/compositor/BUILD.gn.orig 2016-08-03 22:02:41.000000000 +0300 -+++ ui/compositor/BUILD.gn 2016-09-03 00:17:02.164382000 +0300 -@@ -199,7 +199,7 @@ +--- ui/compositor/BUILD.gn.orig 2017-01-26 00:49:31 UTC ++++ ui/compositor/BUILD.gn +@@ -201,7 +201,7 @@ test("compositor_unittests") { "//ui/gl", "//ui/resources", ] diff --git a/www/chromium/files/patch-ui_events_event__switches.cc b/www/chromium/files/patch-ui_events_event__switches.cc index 443a7ecefbb8..2a84fa28cdf7 100644 --- a/www/chromium/files/patch-ui_events_event__switches.cc +++ b/www/chromium/files/patch-ui_events_event__switches.cc @@ -1,4 +1,4 @@ ---- ui/events/event_switches.cc.orig 2016-03-25 13:05:03 UTC +--- ui/events/event_switches.cc.orig 2017-01-26 00:49:31 UTC +++ ui/events/event_switches.cc @@ -28,7 +28,7 @@ const char kTouchEventsDisabled[] = "dis const char kCompensateForUnstablePinchZoom[] = diff --git a/www/chromium/files/patch-ui_events_event__switches.h b/www/chromium/files/patch-ui_events_event__switches.h index 54bf7d742628..55826ecf8215 100644 --- a/www/chromium/files/patch-ui_events_event__switches.h +++ b/www/chromium/files/patch-ui_events_event__switches.h @@ -1,4 +1,4 @@ ---- ui/events/event_switches.h.orig 2016-03-25 13:05:03 UTC +--- ui/events/event_switches.h.orig 2017-01-26 00:49:31 UTC +++ ui/events/event_switches.h @@ -18,7 +18,7 @@ EVENTS_BASE_EXPORT extern const char kTo EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[]; diff --git a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc index a1418adfd1ec..625b6938cd10 100644 --- a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc +++ b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc @@ -1,4 +1,4 @@ ---- ui/events/keycodes/dom/keycode_converter.cc.orig 2016-05-11 19:02:35 UTC +--- ui/events/keycodes/dom/keycode_converter.cc.orig 2017-01-26 00:49:31 UTC +++ ui/events/keycodes/dom/keycode_converter.cc @@ -19,7 +19,7 @@ namespace { // and DOM Level 3 |code| strings. diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 2273e5eac03b..0fe075970e46 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2016-08-03 22:02:41.000000000 +0300 -+++ ui/gfx/BUILD.gn 2016-09-03 00:17:18.862703000 +0300 -@@ -360,7 +360,7 @@ +--- ui/gfx/BUILD.gn.orig 2017-01-26 00:49:31 UTC ++++ ui/gfx/BUILD.gn +@@ -371,7 +371,7 @@ component("gfx") { } # Linux. @@ -9,7 +9,7 @@ deps += [ "//build/linux:fontconfig" ] } -@@ -668,7 +668,7 @@ +@@ -549,7 +549,7 @@ static_library("test_support") { "test/ui_cocoa_test_helper.mm", ] } diff --git a/www/chromium/files/patch-ui_gfx_canvas__skia.cc b/www/chromium/files/patch-ui_gfx_canvas__skia.cc index 13d0f5599a54..a199f90b8b7a 100644 --- a/www/chromium/files/patch-ui_gfx_canvas__skia.cc +++ b/www/chromium/files/patch-ui_gfx_canvas__skia.cc @@ -1,6 +1,6 @@ ---- ui/gfx/canvas_skia.cc.orig 2016-05-11 19:02:35 UTC +--- ui/gfx/canvas_skia.cc.orig 2017-01-26 00:49:31 UTC +++ ui/gfx/canvas_skia.cc -@@ -246,7 +246,7 @@ void Canvas::DrawStringRectWithShadows(c +@@ -209,7 +209,7 @@ void Canvas::DrawStringRectWithShadows(c Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); diff --git a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc index 5883718bd381..49584eee4e1c 100644 --- a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc +++ b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc @@ -1,5 +1,5 @@ ---- ui/gfx/font_fallback_linux.cc.orig 2016-05-27 10:26:15.843855000 -0400 -+++ ui/gfx/font_fallback_linux.cc 2016-05-27 10:26:38.723265000 -0400 +--- ui/gfx/font_fallback_linux.cc.orig 2017-01-26 00:49:31 UTC ++++ ui/gfx/font_fallback_linux.cc @@ -15,6 +15,10 @@ #include "base/memory/ptr_util.h" #include "ui/gfx/font.h" diff --git a/www/chromium/files/patch-ui_gfx_font__render__params.h b/www/chromium/files/patch-ui_gfx_font__render__params.h index 5aa8fa16315b..c87dabe22d9f 100644 --- a/www/chromium/files/patch-ui_gfx_font__render__params.h +++ b/www/chromium/files/patch-ui_gfx_font__render__params.h @@ -1,6 +1,6 @@ ---- ui/gfx/font_render_params.h.orig 2016-05-27 10:24:30.925944000 -0400 -+++ ui/gfx/font_render_params.h 2016-05-27 10:24:56.069225000 -0400 -@@ -102,13 +102,13 @@ +--- ui/gfx/font_render_params.h.orig 2017-01-26 00:49:31 UTC ++++ ui/gfx/font_render_params.h +@@ -106,13 +106,13 @@ GFX_EXPORT FontRenderParams GetFontRende const FontRenderParamsQuery& query, std::string* family_out); diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc index 2262a9a77f0b..d1f2bc886ec2 100644 --- a/www/chromium/files/patch-ui_gfx_render__text.cc +++ b/www/chromium/files/patch-ui_gfx_render__text.cc @@ -1,6 +1,6 @@ ---- ui/gfx/render_text.cc.orig 2016-05-11 19:02:35 UTC +--- ui/gfx/render_text.cc.orig 2017-01-26 00:49:31 UTC +++ ui/gfx/render_text.cc -@@ -942,32 +942,33 @@ void RenderText::SetDisplayOffset(int ho +@@ -972,32 +972,33 @@ void RenderText::SetDisplayOffset(int ho const int extra_content = GetContentWidth() - display_rect_.width(); const int cursor_width = cursor_enabled_ ? 1 : 0; diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 2a75e91997b8..4032c06f6a4b 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,4 +1,4 @@ ---- ui/gl/BUILD.gn.orig 2016-12-12 22:13:27 UTC +--- ui/gl/BUILD.gn.orig 2017-01-26 00:49:31 UTC +++ ui/gl/BUILD.gn @@ -13,7 +13,7 @@ declare_args() { enable_swiftshader = is_chrome_branded && is_win 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 e0971f3db0b5..efbf0f9f622d 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,29 +1,63 @@ ---- ui/gl/sync_control_vsync_provider.cc.orig 2016-05-11 19:02:35 UTC +--- ui/gl/sync_control_vsync_provider.cc.orig 2017-01-26 00:49:32 UTC +++ ui/gl/sync_control_vsync_provider.cc @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" #include "build/build_config.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) // These constants define a reasonable range for a calculated refresh interval. // Calculating refreshes out of this range will be considered a fatal error. const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400; -@@ -38,7 +38,7 @@ SyncControlVSyncProvider::~SyncControlVS +@@ -21,17 +21,17 @@ const int64_t kMaxVsyncIntervalUs = base + // we think the latest computed interval is invalid (noisey due to + // monitor configuration change, moving a window between monitors, etc.). + const double kRelativeIntervalDifferenceThreshold = 0.05; +-#endif // defined(OS_LINUX) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) + + namespace gl { + + SyncControlVSyncProvider::SyncControlVSyncProvider() : gfx::VSyncProvider() { +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) + // 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. + last_good_interval_ = base::TimeDelta::FromSeconds(1) / 60; +-#endif // defined(OS_LINUX) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) + } + + SyncControlVSyncProvider::~SyncControlVSyncProvider() {} +@@ -39,7 +39,7 @@ SyncControlVSyncProvider::~SyncControlVS void SyncControlVSyncProvider::GetVSyncParameters( const UpdateVSyncCallback& callback) { TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters"); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) base::TimeTicks timebase; - // The actual clock used for the system time returned by glXGetSyncValuesOML -@@ -154,7 +154,7 @@ void SyncControlVSyncProvider::GetVSyncP + int64_t system_time; +@@ -129,10 +129,10 @@ void SyncControlVSyncProvider::GetVSyncP last_timebase_ = timebase; last_media_stream_counter_ = media_stream_counter; callback.Run(timebase, last_good_interval_); +-#endif // defined(OS_LINUX) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + bool SyncControlVSyncProvider::AdjustSyncValues(int64_t* system_time, + int64_t* media_stream_counter) { + // Both Intel and Mali drivers will return TRUE for GetSyncValues +@@ -192,7 +192,7 @@ bool SyncControlVSyncProvider::AdjustSyn + + return true; + } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - } - } // namespace gfx + #if defined(OS_WIN) + bool SyncControlVSyncProvider::AdjustSyncValues(int64_t* system_time, diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h index 76376fa7b548..8344229142b9 100644 --- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h +++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h @@ -1,11 +1,26 @@ ---- ui/gl/sync_control_vsync_provider.h.orig 2016-08-04 17:39:12.324777000 +0300 -+++ ui/gl/sync_control_vsync_provider.h 2016-08-04 17:39:19.973676000 +0300 -@@ -31,7 +31,7 @@ +--- ui/gl/sync_control_vsync_provider.h.orig 2017-01-26 00:49:32 UTC ++++ ui/gl/sync_control_vsync_provider.h +@@ -32,7 +32,7 @@ class GL_EXPORT SyncControlVSyncProvider virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0; private: +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) + bool AdjustSyncValues(int64_t* system_time, int64_t* media_stream_counter); + + base::TimeTicks last_timebase_; +@@ -46,11 +46,11 @@ class GL_EXPORT SyncControlVSyncProvider + // from configuration change (monitor reconfiguration, moving windows + // between monitors, suspend and resume, etc.). + std::queue<base::TimeDelta> last_computed_intervals_; +-#endif // defined(OS_LINUX) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) + -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - base::TimeTicks last_timebase_; - uint64_t last_media_stream_counter_ = 0; - base::TimeDelta last_good_interval_; + bool invalid_msc_ = false; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + DISALLOW_COPY_AND_ASSIGN(SyncControlVSyncProvider); + }; diff --git a/www/chromium/files/patch-ui_message__center_message__center__style.h b/www/chromium/files/patch-ui_message__center_message__center__style.h index a0e90ae2b687..4e42f71feaa7 100644 --- a/www/chromium/files/patch-ui_message__center_message__center__style.h +++ b/www/chromium/files/patch-ui_message__center_message__center__style.h @@ -1,6 +1,6 @@ ---- ui/message_center/message_center_style.h.orig 2016-05-11 19:02:35 UTC +--- ui/message_center/message_center_style.h.orig 2017-01-26 00:49:32 UTC +++ ui/message_center/message_center_style.h -@@ -111,7 +111,7 @@ const int kButtonHorizontalPadding = 16; +@@ -115,7 +115,7 @@ const int kButtonHorizontalPadding = 16; const int kButtonIconTopPadding = 11; // In DIPs. const int kButtonIconToTitlePadding = 16; // In DIPs. diff --git a/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc b/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc index b69a146d6c71..2aa0e7c95207 100644 --- a/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc +++ b/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc @@ -1,6 +1,6 @@ ---- ui/message_center/views/message_center_button_bar.cc.orig 2016-05-11 19:02:35 UTC +--- ui/message_center/views/message_center_button_bar.cc.orig 2017-01-26 00:49:32 UTC +++ ui/message_center/views/message_center_button_bar.cc -@@ -96,7 +96,7 @@ MessageCenterButtonBar::MessageCenterBut +@@ -95,7 +95,7 @@ MessageCenterButtonBar::MessageCenterBut const base::string16& title) : message_center_view_(message_center_view), message_center_(message_center), @@ -9,7 +9,7 @@ close_bubble_button_(NULL), #endif title_arrow_(NULL), -@@ -171,7 +171,7 @@ MessageCenterButtonBar::MessageCenterBut +@@ -170,7 +170,7 @@ MessageCenterButtonBar::MessageCenterBut IDS_MESSAGE_CENTER_SETTINGS_BUTTON_LABEL); button_container_->AddChildView(settings_button_); @@ -18,7 +18,7 @@ close_bubble_button_ = new views::ImageButton(this); close_bubble_button_->SetImage( views::Button::STATE_NORMAL, -@@ -233,7 +233,7 @@ void MessageCenterButtonBar::ViewVisibil +@@ -232,7 +232,7 @@ void MessageCenterButtonBar::ViewVisibil 0, 0); @@ -27,7 +27,7 @@ // The close-bubble button. column->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, -@@ -248,7 +248,7 @@ void MessageCenterButtonBar::ViewVisibil +@@ -247,7 +247,7 @@ void MessageCenterButtonBar::ViewVisibil layout->AddView(title_arrow_); layout->AddView(notification_label_); layout->AddView(button_container_); @@ -36,7 +36,7 @@ layout->AddView(close_bubble_button_); #endif } -@@ -295,7 +295,7 @@ void MessageCenterButtonBar::ButtonPress +@@ -297,7 +297,7 @@ void MessageCenterButtonBar::ButtonPress else message_center()->EnterQuietModeWithExpire(base::TimeDelta::FromDays(1)); quiet_mode_button_->SetToggled(message_center()->IsQuietMode()); diff --git a/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h b/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h index a427c298d82b..075d0120dd0c 100644 --- a/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h +++ b/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h @@ -1,6 +1,6 @@ ---- ui/message_center/views/message_center_button_bar.h.orig 2016-04-08 16:02:15 UTC +--- ui/message_center/views/message_center_button_bar.h.orig 2017-01-26 00:49:32 UTC +++ ui/message_center/views/message_center_button_bar.h -@@ -73,7 +73,7 @@ class MessageCenterButtonBar : public vi +@@ -74,7 +74,7 @@ class MessageCenterButtonBar : public vi // close-on-deactivation is off. This is a tentative solution. Once pkotwicz // Fixes the problem of focus-follow-mouse, close-on-deactivation will be // back and this field will be removed. See crbug.com/319516. diff --git a/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc b/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc index fb83ced1fa1a..dcf12e86019a 100644 --- a/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc +++ b/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc @@ -1,6 +1,6 @@ ---- ui/message_center/views/message_view_factory.cc.orig 2016-08-03 16:51:43.884486000 -0400 -+++ ui/message_center/views/message_view_factory.cc 2016-08-03 16:51:59.171721000 -0400 -@@ -43,7 +43,7 @@ +--- ui/message_center/views/message_view_factory.cc.orig 2017-01-26 00:49:32 UTC ++++ ui/message_center/views/message_view_factory.cc +@@ -43,7 +43,7 @@ MessageView* MessageViewFactory::Create( notification_view = new NotificationView(controller, notification); } diff --git a/www/chromium/files/patch-ui_resources_ui__resources.grd b/www/chromium/files/patch-ui_resources_ui__resources.grd index 974d89a8de59..7136628a98bd 100644 --- a/www/chromium/files/patch-ui_resources_ui__resources.grd +++ b/www/chromium/files/patch-ui_resources_ui__resources.grd @@ -1,4 +1,4 @@ ---- ui/resources/ui_resources.grd.orig 2016-05-11 19:02:35 UTC +--- ui/resources/ui_resources.grd.orig 2017-01-26 00:49:32 UTC +++ ui/resources/ui_resources.grd @@ -15,7 +15,7 @@ <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST diff --git a/www/chromium/files/patch-ui_views_BUILD.gn b/www/chromium/files/patch-ui_views_BUILD.gn index b8db1e47002b..7179e665fe79 100644 --- a/www/chromium/files/patch-ui_views_BUILD.gn +++ b/www/chromium/files/patch-ui_views_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/views/BUILD.gn.orig 2016-12-12 22:16:29 UTC +--- ui/views/BUILD.gn.orig 2017-01-26 00:49:32 UTC +++ ui/views/BUILD.gn -@@ -424,7 +424,7 @@ component("views") { +@@ -426,7 +426,7 @@ component("views") { if (use_x11 && !is_chromeos) { deps += [ "//ui/display/util" ] } @@ -9,7 +9,7 @@ sources -= [ "window/window_button_order_provider.cc" ] deps += [ "//ui/shell_dialogs" ] } else { -@@ -614,7 +614,7 @@ component("views") { +@@ -618,7 +618,7 @@ component("views") { "widget/desktop_aura/desktop_window_tree_host_ozone.cc", ] } diff --git a/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h b/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h index 2bb15b5b9389..b89bfd664161 100644 --- a/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h +++ b/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h @@ -1,4 +1,4 @@ ---- ui/views/accessibility/native_view_accessibility.h.orig 2016-03-25 13:05:04 UTC +--- ui/views/accessibility/native_view_accessibility.h.orig 2017-01-26 00:49:32 UTC +++ ui/views/accessibility/native_view_accessibility.h @@ -22,7 +22,7 @@ #define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1 diff --git a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc index 445487981064..97f3bec1e4d3 100644 --- a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/bubble/bubble_dialog_delegate.cc.orig 2016-08-03 16:59:43.426393000 -0400 -+++ ui/views/bubble/bubble_dialog_delegate.cc 2016-08-03 17:00:10.585958000 -0400 -@@ -72,7 +72,7 @@ +--- ui/views/bubble/bubble_dialog_delegate.cc.orig 2017-01-26 00:49:32 UTC ++++ ui/views/bubble/bubble_dialog_delegate.cc +@@ -73,7 +73,7 @@ Widget* BubbleDialogDelegateView::Create // the parent frame and let DWM handle compositing. If not, then we don't // want to allow the bubble to extend the frame because it will be clipped. bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled()); diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc new file mode 100644 index 000000000000..395758c64072 --- /dev/null +++ b/www/chromium/files/patch-ui_views_controls_label.cc @@ -0,0 +1,20 @@ +--- ui/views/controls/label.cc.orig 2017-01-26 00:49:32 UTC ++++ ui/views/controls/label.cc +@@ -523,7 +523,7 @@ bool Label::OnMousePressed(const ui::Mou + GetFocusManager()->SetFocusedView(this); + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + if (event.IsOnlyMiddleMouseButton() && GetFocusManager()) + GetFocusManager()->SetFocusedView(this); + #endif +@@ -687,7 +687,7 @@ bool Label::PasteSelectionClipboard() { + } + + void Label::UpdateSelectionClipboard() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + if (!obscured()) { + ui::ScopedClipboardWriter(ui::CLIPBOARD_TYPE_SELECTION) + .WriteText(GetSelectedText()); diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index d992152ea87d..bc7c34cf4c0d 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2016-12-12 22:18:59 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2017-01-26 00:49:32 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ #include "ui/base/win/osk_display_manager.h" #endif @@ -9,7 +9,7 @@ #include "base/strings/utf_string_conversions.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -157,14 +157,14 @@ ui::TextEditCommand GetCommandForKeyEven +@@ -146,14 +146,14 @@ ui::TextEditCommand GetCommandForKeyEven case ui::VKEY_BACK: if (!control) return ui::TextEditCommand::DELETE_BACKWARD; @@ -26,16 +26,16 @@ // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -596,7 +596,7 @@ bool Textfield::OnMousePressed(const ui: - OnAfterUserAction(); - } +@@ -580,7 +580,7 @@ bool Textfield::OnMousePressed(const ui: + ShowImeIfNeeded(); + } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - if (event.IsOnlyMiddleMouseButton()) { - if (GetRenderText()->IsPointInSelection(event.location())) { - OnBeforeUserAction(); -@@ -666,7 +666,7 @@ bool Textfield::OnKeyPressed(const ui::K + if (!handled && !HasFocus() && event.IsOnlyMiddleMouseButton()) + RequestFocus(); + #endif +@@ -617,7 +617,7 @@ bool Textfield::OnKeyPressed(const ui::K if (!textfield) return handled; @@ -44,7 +44,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -809,7 +809,7 @@ void Textfield::AboutToRequestFocusFromT +@@ -757,7 +757,7 @@ void Textfield::AboutToRequestFocusFromT } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -53,7 +53,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -1073,7 +1073,7 @@ void Textfield::WriteDragDataForView(Vie +@@ -1035,7 +1035,7 @@ void Textfield::WriteDragDataForView(Vie std::unique_ptr<gfx::Canvas> canvas( GetCanvasForDragImage(GetWidget(), label.size())); label.SetEnabledColor(GetTextColor()); @@ -62,12 +62,12 @@ // Desktop Linux Aura does not yet support transparency in drag images. canvas->DrawColor(GetBackgroundColor()); #endif -@@ -2024,7 +2024,7 @@ void Textfield::CreateTouchSelectionCont +@@ -1827,7 +1827,7 @@ bool Textfield::PasteSelectionClipboard( } - void Textfield::UpdateSelectionClipboard() const { + void Textfield::UpdateSelectionClipboard() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - if (performing_user_action_ && HasSelection() && - text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD) { - ui::ScopedClipboardWriter( + if (text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD) { + ui::ScopedClipboardWriter(ui::CLIPBOARD_TYPE_SELECTION) + .WriteText(GetSelectedText()); diff --git a/www/chromium/files/patch-ui_views_controls_webview_BUILD.gn b/www/chromium/files/patch-ui_views_controls_webview_BUILD.gn index d24b1e573678..35516483730c 100644 --- a/www/chromium/files/patch-ui_views_controls_webview_BUILD.gn +++ b/www/chromium/files/patch-ui_views_controls_webview_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/views/controls/webview/BUILD.gn.orig 2016-08-03 22:02:41.000000000 +0300 -+++ ui/views/controls/webview/BUILD.gn 2016-09-03 00:18:20.159623000 +0300 -@@ -39,7 +39,7 @@ +--- ui/views/controls/webview/BUILD.gn.orig 2017-01-26 00:49:32 UTC ++++ ui/views/controls/webview/BUILD.gn +@@ -39,7 +39,7 @@ component("webview") { "//ui/views", ] diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc index cf12eb5fedbb..706a5416f9ca 100644 --- a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,6 +1,6 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2016-12-16 15:15:24.020369000 +0000 -+++ ui/views/corewm/tooltip_aura.cc 2016-12-16 15:16:03.296431000 +0000 -@@ -34,7 +34,7 @@ +--- ui/views/corewm/tooltip_aura.cc.orig 2017-01-26 00:49:32 UTC ++++ ui/views/corewm/tooltip_aura.cc +@@ -34,7 +34,7 @@ const int kCursorOffsetY = 15; // TODO(varkha): Update if native widget can be transparent on Linux. bool CanUseTranslucentTooltipWidget() { diff --git a/www/chromium/files/patch-ui_views_examples_widget__example.cc b/www/chromium/files/patch-ui_views_examples_widget__example.cc index 9d5ce30c90d4..f44d9ece1663 100644 --- a/www/chromium/files/patch-ui_views_examples_widget__example.cc +++ b/www/chromium/files/patch-ui_views_examples_widget__example.cc @@ -1,6 +1,6 @@ ---- ui/views/examples/widget_example.cc.orig 2016-05-11 19:02:36 UTC +--- ui/views/examples/widget_example.cc.orig 2017-01-26 00:49:32 UTC +++ ui/views/examples/widget_example.cc -@@ -84,7 +84,7 @@ void WidgetExample::CreateExampleView(Vi +@@ -77,7 +77,7 @@ void WidgetExample::CreateExampleView(Vi BuildButton(container, "Popup widget", POPUP); BuildButton(container, "Dialog widget", DIALOG); BuildButton(container, "Modal Dialog", MODAL_DIALOG); diff --git a/www/chromium/files/patch-ui_views_selection__controller.cc b/www/chromium/files/patch-ui_views_selection__controller.cc new file mode 100644 index 000000000000..30b07ecbebc5 --- /dev/null +++ b/www/chromium/files/patch-ui_views_selection__controller.cc @@ -0,0 +1,11 @@ +--- ui/views/selection_controller.cc.orig 2017-01-26 00:49:32 UTC ++++ ui/views/selection_controller.cc +@@ -20,7 +20,7 @@ SelectionController::SelectionController + delegate_(delegate), + handles_selection_clipboard_(false) { + // On Linux, update the selection clipboard on a text selection. +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + set_handles_selection_clipboard(true); + #endif + diff --git a/www/chromium/files/patch-ui_views_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc index 9ed05e523bb8..46483c64b830 100644 --- a/www/chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/chromium/files/patch-ui_views_style_platform__style.cc @@ -1,8 +1,8 @@ ---- ui/views/style/platform_style.cc.orig 2016-08-03 22:02:41.000000000 +0300 -+++ ui/views/style/platform_style.cc 2016-09-26 05:44:41.103708000 +0300 +--- ui/views/style/platform_style.cc.orig 2017-01-26 00:49:32 UTC ++++ ui/views/style/platform_style.cc @@ -17,7 +17,7 @@ #include "ui/views/controls/focusable_border.h" - #include "ui/views/controls/scrollbar/native_scroll_bar.h" + #include "ui/views/controls/scrollbar/scroll_bar_views.h" -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) diff --git a/www/chromium/files/patch-ui_views_views__delegate.cc b/www/chromium/files/patch-ui_views_views__delegate.cc index f71869f26186..6c1dda72c56b 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.cc +++ b/www/chromium/files/patch-ui_views_views__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/views_delegate.cc.orig 2016-03-25 13:05:04 UTC +--- ui/views/views_delegate.cc.orig 2017-01-26 00:49:32 UTC +++ ui/views/views_delegate.cc -@@ -70,7 +70,7 @@ HICON ViewsDelegate::GetDefaultWindowIco +@@ -71,7 +71,7 @@ HICON ViewsDelegate::GetDefaultWindowIco bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { return false; } diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h index d823c4555267..7e21c3a634e9 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.h +++ b/www/chromium/files/patch-ui_views_views__delegate.h @@ -1,4 +1,4 @@ ---- ui/views/views_delegate.h.orig 2016-05-11 19:02:36 UTC +--- ui/views/views_delegate.h.orig 2017-01-26 00:49:32 UTC +++ ui/views/views_delegate.h @@ -141,7 +141,7 @@ class VIEWS_EXPORT ViewsDelegate { // Returns true if the window passed in is in the Windows 8 metro diff --git a/www/chromium/files/patch-ui_views_views__switches.cc b/www/chromium/files/patch-ui_views_views__switches.cc index 92e7faf8dbc7..26d55842e9c6 100644 --- a/www/chromium/files/patch-ui_views_views__switches.cc +++ b/www/chromium/files/patch-ui_views_views__switches.cc @@ -1,4 +1,4 @@ ---- ui/views/views_switches.cc.orig 2016-03-25 13:05:04 UTC +--- ui/views/views_switches.cc.orig 2017-01-26 00:49:32 UTC +++ ui/views/views_switches.cc @@ -18,7 +18,7 @@ const char kDisableViewsRectBasedTargeti "disable-views-rect-based-targeting"; diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc index 377615f7c78c..a99aafc216ac 100644 --- a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc +++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc @@ -1,6 +1,6 @@ ---- ui/views/window/custom_frame_view.cc.orig 2016-05-11 19:02:36 UTC +--- ui/views/window/custom_frame_view.cc.orig 2017-01-26 00:49:32 UTC +++ ui/views/window/custom_frame_view.cc -@@ -288,7 +288,7 @@ int CustomFrameView::NonClientTopBorderH +@@ -287,7 +287,7 @@ int CustomFrameView::NonClientTopBorderH int CustomFrameView::CaptionButtonY() const { // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc index e003992d56be..9e585e99dfb1 100644 --- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/window/dialog_delegate.cc.orig 2016-05-11 19:02:36 UTC +--- ui/views/window/dialog_delegate.cc.orig 2017-01-26 00:49:32 UTC +++ ui/views/window/dialog_delegate.cc -@@ -53,7 +53,7 @@ Widget* DialogDelegate::CreateDialogWidg +@@ -56,7 +56,7 @@ Widget::InitParams DialogDelegate::GetDi params.bounds = bounds; DialogDelegate* dialog = delegate->AsDialogDelegate(); @@ -8,4 +8,4 @@ +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // The new style doesn't support unparented dialogs on Linux desktop. if (dialog) - dialog->supports_new_style_ &= parent != NULL; + dialog->supports_custom_frame_ &= parent != NULL; diff --git a/www/chromium/files/patch-ui_webui_resources_js_cr.js b/www/chromium/files/patch-ui_webui_resources_js_cr.js index 8ca0fc0862a5..ed65d7696a4f 100644 --- a/www/chromium/files/patch-ui_webui_resources_js_cr.js +++ b/www/chromium/files/patch-ui_webui_resources_js_cr.js @@ -1,6 +1,6 @@ ---- ui/webui/resources/js/cr.js.orig 2016-05-11 19:02:36 UTC +--- ui/webui/resources/js/cr.js.orig 2017-01-26 00:49:32 UTC +++ ui/webui/resources/js/cr.js -@@ -444,6 +444,11 @@ var cr = function() { +@@ -451,6 +451,11 @@ var cr = cr || function() { get doc() { return document; }, diff --git a/www/chromium/files/patch-ui_webui_resources_js_icon.js b/www/chromium/files/patch-ui_webui_resources_js_icon.js index 5ac75395ba24..36883c0117e8 100644 --- a/www/chromium/files/patch-ui_webui_resources_js_icon.js +++ b/www/chromium/files/patch-ui_webui_resources_js_icon.js @@ -1,4 +1,4 @@ ---- ui/webui/resources/js/icon.js.orig 2016-12-12 22:24:45 UTC +--- ui/webui/resources/js/icon.js.orig 2017-01-26 00:49:32 UTC +++ ui/webui/resources/js/icon.js @@ -14,7 +14,7 @@ cr.define('cr.icon', function() { // supports SCALE_FACTOR_100P on all non-iOS platforms. diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index df35456dac14..0953dc1464bc 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2016-12-01 23:03:17.000000000 +0000 -+++ v8/BUILD.gn 2016-12-16 15:25:09.616617000 +0000 -@@ -2226,7 +2226,7 @@ +--- v8/BUILD.gn.orig 2017-01-26 00:50:20 UTC ++++ v8/BUILD.gn +@@ -2273,7 +2273,7 @@ v8_component("v8_libbase") { sources += [ "src/base/platform/platform-posix.cc" ] } @@ -9,7 +9,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -2236,6 +2236,12 @@ +@@ -2283,6 +2283,12 @@ v8_component("v8_libbase") { "dl", "rt", ] @@ -22,7 +22,7 @@ } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -2388,6 +2394,7 @@ +@@ -2420,6 +2426,7 @@ if (current_toolchain == v8_snapshot_too sources = [ "src/snapshot/mksnapshot.cc", ] diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index 63dd61d70ab1..ede89322a8c2 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,5 +1,5 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2016-10-06 04:05:41.000000000 +0300 -+++ v8/src/base/platform/platform-posix.cc 2016-10-13 09:39:34.732843000 +0300 +--- v8/src/base/platform/platform-posix.cc.orig 2017-01-26 00:50:20 UTC ++++ v8/src/base/platform/platform-posix.cc @@ -27,6 +27,10 @@ #include <sys/sysctl.h> // NOLINT, for sysctl #endif @@ -11,7 +11,7 @@ #undef MAP_TYPE #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT) -@@ -329,6 +333,12 @@ +@@ -329,6 +333,12 @@ int OS::GetCurrentThreadId() { return static_cast<int>(syscall(__NR_gettid)); #elif V8_OS_ANDROID return static_cast<int>(gettid()); diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 77f3dc8088cd..364a19e46507 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -89,8 +89,6 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/fileSystem.png %%DATADIR%%/resources/inspector/Images/forward.png %%DATADIR%%/resources/inspector/Images/frame.png -%%DATADIR%%/resources/inspector/Images/graphLabelCalloutLeft.png -%%DATADIR%%/resources/inspector/Images/graphLabelCalloutRight.png %%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg %%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg %%DATADIR%%/resources/inspector/Images/navigationControls.png @@ -140,11 +138,12 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/accessibility/accessibility_module.js %%DATADIR%%/resources/inspector/animation/animation_module.js %%DATADIR%%/resources/inspector/audits/audits_module.js +%%DATADIR%%/resources/inspector/audits2/audits2_module.js %%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js %%DATADIR%%/resources/inspector/components_lazy/components_lazy_module.js %%DATADIR%%/resources/inspector/console/console_module.js %%DATADIR%%/resources/inspector/devices/devices_module.js -%%DATADIR%%/resources/inspector/devtools.js +%%DATADIR%%/resources/inspector/devtools_compatibility.js %%DATADIR%%/resources/inspector/devtools_extension_api.js %%DATADIR%%/resources/inspector/diff/diff_module.js %%DATADIR%%/resources/inspector/elements/elements_module.js @@ -198,12 +197,10 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/sass/sass_module.js %%DATADIR%%/resources/inspector/screencast/screencast_module.js %%DATADIR%%/resources/inspector/security/security_module.js -%%DATADIR%%/resources/inspector/services/services_module.js %%DATADIR%%/resources/inspector/settings/settings_module.js %%DATADIR%%/resources/inspector/snippets/snippets_module.js %%DATADIR%%/resources/inspector/source_frame/source_frame_module.js %%DATADIR%%/resources/inspector/sources/sources_module.js -%%DATADIR%%/resources/inspector/temp_storage_shared_worker.js %%DATADIR%%/resources/inspector/terminal/terminal_module.js %%DATADIR%%/resources/inspector/text_editor/text_editor_module.js %%DATADIR%%/resources/inspector/timeline/timeline_module.js @@ -211,6 +208,7 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/toolbox.html %%DATADIR%%/resources/inspector/toolbox.js %%DATADIR%%/resources/inspector/ui_lazy/ui_lazy_module.js +%%DATADIR%%/resources/inspector/utility_shared_worker.js %%DRIVER%%bin/chromedriver share/icons/hicolor/128x128/apps/chrome.png share/icons/hicolor/22x22/apps/chrome.png |