diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-06-23 12:52:40 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-06-23 12:52:40 +0000 |
| commit | c2b1fd7692163c05a9ec6b1c5a073ce9934d8fbb (patch) | |
| tree | 8e14d8667cba1313638d32f08c62feff81456283 | |
| parent | 9c7cec7234c23ced2936bb7bdc41dd08c872a6f1 (diff) | |
| download | ports-c2b1fd7692163c05a9ec6b1c5a073ce9934d8fbb.tar.gz ports-c2b1fd7692163c05a9ec6b1c5a073ce9934d8fbb.zip | |
MFH: r443998
www/chromium: update to 59.0.3071.104
- Use https in WWW and MASTER_SITES
- Sort ONLY_FOR_ARCHS, USES, USE_GNOME and GN_ARGS
- Put in correct place MAKE_ENV+= V=1 variable
- Use LLD linker by default for supported archs
- Fix DEBUG option
- Fix gpu_info_collector.cc warning: control may reach end of non-void function [-Wreturn-type]
- Get rid of multiple definition errors
Changelog: https://chromium.googlesource.com/chromium/src/+log/58.0.3029.110..59.0.3071.104?pretty=fuller&n=10000
Security: https://www.vuxml.org/freebsd/52f4b48b-4ac3-11e7-99aa-e8e0b747a45a.html
Security: https://www.vuxml.org/freebsd/f53dd5cc-527f-11e7-a772-e8e0b747a45a.html
Approved by: ports-secteam (feld)
Notes
Notes:
svn path=/branches/2017Q2/; revision=444178
419 files changed, 2195 insertions, 2043 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 6a5d2532cc70..c6eb773b3638 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 58.0.3029.110 +PORTVERSION= 59.0.3071.104 CATEGORIES= www -MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ +MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on MAINTAINER= chromium@FreeBSD.org @@ -57,16 +57,17 @@ LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher \ 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 \ +ONLY_FOR_ARCHS= amd64 i386 +USES= bison compiler cpe desktop-file-utils execinfo jpeg \ ninja perl5 pkgconfig python:2,build shebangfix tar:xz CPE_VENDOR= google CPE_PRODUCT= chrome +USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xproto xrandr xrender xscrnsaver xtst -USE_GNOME= atk glib20 gtk20 gtk30 dconf libxslt libxml2 +USE_GNOME= atk dconf glib20 gtk20 gtk30 libxml2 libxslt MAKE_ARGS= -C out/${BUILDTYPE} SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome @@ -78,20 +79,22 @@ INSTALLS_ICONS= yes # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. -GN_ARGS+= is_clang=true \ - clang_use_chrome_plugins=false \ +GN_ARGS+= clang_use_chrome_plugins=false \ enable_media_router=true \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ enable_webrtc=false \ fieldtrial_testing_like_official_build=true \ + is_clang=true \ toolkit_views=true \ + treat_warnings_as_errors=false \ use_allocator="none" \ use_aura=true \ use_cups=true \ use_experimental_allocator_shim=false \ - treat_warnings_as_errors=false \ + use_gtk3=true \ + use_lld=true \ use_sysroot=false \ use_system_libjpeg=true \ use_system_sqlite=false # chrome has additional patches @@ -146,17 +149,13 @@ GN_ARGS+= proprietary_codecs=false GN_ARGS+= enable_hevc_demuxing=false .endif -DEBUG_MAKE_ENV= V=1 .if ${PORT_OPTIONS:MDEBUG} BUILDTYPE= Debug GN_ARGS+= is_debug=true GN_BOOTSTRAP_FLAGS+= --debug -#GN_ARGS+= is_component_build=true +MAKE_ENV+= V=1 .else BUILDTYPE= Release -.if ${ARCH} == amd64 -GN_ARGS+= use_lld=true # harder, better, faster, stronger -.endif GN_ARGS+= is_debug=false GN_ARGS+= symbol_level=0 GN_ARGS+= remove_webcore_debug_symbols=true @@ -244,8 +243,8 @@ test regression-test: build do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1 -.for t in font_service test_ime_driver ui - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${t}.service \ +.for m in font_service test_ime_driver ui + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${m}.service \ ${STAGEDIR}${DATADIR} .endfor .for s in 22 24 48 64 128 256 @@ -274,6 +273,12 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \ ${STAGEDIR}${DATADIR} +.if ${PORT_OPTIONS:MDEBUG} + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ + ${STAGEDIR}${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ + ${STAGEDIR}${DATADIR} +.endif .if ${PORT_OPTIONS:MDRIVER} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin diff --git a/www/chromium/Makefile.tests b/www/chromium/Makefile.tests index c21315d09103..6319f4157fd1 100644 --- a/www/chromium/Makefile.tests +++ b/www/chromium/Makefile.tests @@ -4,7 +4,6 @@ TEST_TARGETS= base_unittests \ crypto_unittests \ cacheinvalidation_unittests \ gpu_unittests \ - sync_unit_tests \ printing_unittests \ sql_unittests \ content_unittests \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index d0de517a7193..f42c365eb971 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1494416961 -SHA256 (chromium-58.0.3029.110.tar.xz) = f24cef3dd2acf9dd5ccdeeca47fea42d1c1ddff32b7375dc9e0cd35a4e8d78ff -SIZE (chromium-58.0.3029.110.tar.xz) = 518167664 -SHA256 (chromium-58.0.3029.110-testdata.tar.xz) = 53ace1eaee38bc3bb11aef932851131d563a2deefb2fd9c9f1fa524b7098e472 -SIZE (chromium-58.0.3029.110-testdata.tar.xz) = 124161428 +TIMESTAMP = 1497583686 +SHA256 (chromium-59.0.3071.104.tar.xz) = a949fa166cdcdbd8419fbdb4583804613d9845130f0c851e4c647d79a4c300d0 +SIZE (chromium-59.0.3071.104.tar.xz) = 531895868 +SHA256 (chromium-59.0.3071.104-testdata.tar.xz) = 4826be59b1f29dcf25c9868d0cac296fb2c98a8f1f944e6a3d7cea275705b771 +SIZE (chromium-59.0.3071.104-testdata.tar.xz) = 124231072 diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 7ca8be9b23be..131ea9df4b6b 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2017-04-19 19:06:27 UTC +--- BUILD.gn.orig 2017-06-05 19:03:00 UTC +++ BUILD.gn -@@ -220,7 +220,7 @@ group("both_gn_and_gyp") { +@@ -95,7 +95,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//chrome", "//chrome/test:browser_tests", -@@ -277,7 +277,7 @@ group("both_gn_and_gyp") { +@@ -153,7 +153,7 @@ group("gn_all") { ] } @@ -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 += [ -@@ -322,7 +322,7 @@ group("both_gn_and_gyp") { +@@ -199,7 +199,7 @@ group("gn_all") { "//ui/touch_selection:ui_touch_selection_unittests", "//url/ipc:url_ipc_unittests", ] @@ -27,7 +27,7 @@ deps += [ "//ios:all" ] } -@@ -482,7 +482,7 @@ group("both_gn_and_gyp") { +@@ -359,7 +359,7 @@ group("gn_all") { ] } @@ -36,7 +36,7 @@ # The following are definitely linux-only. deps += [ "//chrome:manpage", -@@ -505,9 +505,16 @@ group("both_gn_and_gyp") { +@@ -382,9 +382,16 @@ group("gn_all") { # TODO(dpranke): add the linux_dump_symbols flag? deps += [ "//chrome:linux_symbols" ] } @@ -54,7 +54,7 @@ deps += [ "//base:base_i18n_perftests", "//base:base_perftests", -@@ -578,7 +585,7 @@ group("both_gn_and_gyp") { +@@ -455,7 +462,7 @@ group("gn_all") { 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" ] -@@ -684,7 +691,7 @@ group("both_gn_and_gyp") { +@@ -557,7 +564,7 @@ group("gn_all") { deps += [ "//chrome/installer/mini_installer:next_version_mini_installer" ] } @@ -72,7 +72,7 @@ deps += [ "//breakpad:symupload($host_toolchain)" ] } -@@ -728,7 +735,7 @@ group("gn_only") { +@@ -595,7 +602,7 @@ group("gn_all") { deps += [ "//components/proximity_auth:proximity_auth_unittests" ] } @@ -81,7 +81,7 @@ deps += [ "//mash:all", "//media/mojo/services:media_service_unittests", -@@ -754,7 +761,7 @@ group("gn_only") { +@@ -620,7 +627,7 @@ group("gn_all") { } } @@ -90,7 +90,7 @@ # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps += [ -@@ -794,7 +801,7 @@ group("gn_only") { +@@ -659,7 +666,7 @@ group("gn_all") { } if (target_cpu == "x86" || target_cpu == "x64") { @@ -99,7 +99,7 @@ deps += [ "//chrome/test:load_library_perf_tests" ] } deps += [ -@@ -802,7 +809,7 @@ group("gn_only") { +@@ -667,7 +674,7 @@ group("gn_all") { "//third_party/libjpeg_turbo:simd_asm", ] } @@ -108,7 +108,7 @@ deps += [ "//v8:v8_shell" ] } } -@@ -812,7 +819,7 @@ group("gn_only") { +@@ -677,7 +684,7 @@ group("gn_all") { } if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) || @@ -117,7 +117,7 @@ deps += [ "//testing/libfuzzer/fuzzers", "//testing/libfuzzer/tests:libfuzzer_tests", -@@ -844,7 +851,7 @@ group("gn_only") { +@@ -828,7 +835,7 @@ if (is_chromeos) { 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 = [ -@@ -870,7 +877,7 @@ group("gn_visibility") { +@@ -854,7 +861,7 @@ group("gn_visibility") { } } @@ -135,7 +135,7 @@ # 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) { +@@ -921,7 +928,7 @@ if (!is_ios) { data_deps += [ "//content/shell:content_shell_crash_service" ] } @@ -144,7 +144,7 @@ data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -943,7 +950,7 @@ if (!is_ios) { +@@ -929,7 +936,7 @@ if (!is_ios) { data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] } diff --git a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc index debd179f357f..fc573f16a19b 100644 --- a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,6 +1,6 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2017-04-19 19:06:27 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2017-06-05 19:03:00 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsF +@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds( const gfx::Rect& client_bounds) const { gfx::Rect window_bounds = client_bounds; diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc index b70a8c5891db..03fc836a74a3 100644 --- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2017-04-19 19:06:27 UTC +--- ash/display/mirror_window_controller.cc.orig 2017-06-05 19:03:00 UTC +++ ash/display/mirror_window_controller.cc -@@ -251,7 +251,11 @@ void MirrorWindowController::UpdateWindo +@@ -249,7 +249,11 @@ void MirrorWindowController::UpdateWindow( return info.id() == iter->first; }) == display_info_list.end()) { CloseAndDeleteHost(iter->second, true); diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 58fb5dbc601e..fe7b88425875 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,15 @@ ---- base/BUILD.gn.orig 2017-04-19 19:06:28 UTC -+++ base/BUILD.gn -@@ -1156,6 +1156,9 @@ component("base") { +--- base/BUILD.gn.orig 2017-06-05 21:03:00.000000000 +0200 ++++ base/BUILD.gn 2017-06-13 19:23:34.211227000 +0200 +@@ -1098,7 +1098,7 @@ + "base_paths_win.h", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ "base_paths_posix.cc" ] + } + } +@@ -1157,6 +1157,9 @@ deps += [ "//base/allocator:tcmalloc" ] } else if (is_linux && use_allocator == "none") { sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] @@ -10,7 +19,7 @@ } else if (is_android && use_allocator == "none") { sources += [ "allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc", -@@ -1171,6 +1174,34 @@ component("base") { +@@ -1172,6 +1175,33 @@ } } @@ -28,7 +37,6 @@ + ] + sources += [ + "files/file_path_watcher_stub.cc", -+ "process/memory_stubs.cc", + "process/process_handle_freebsd.cc", + "process/process_iterator_freebsd.cc", + "process/process_metrics_freebsd.cc", @@ -45,7 +53,7 @@ # Allow more direct string conversions on platforms with native utf8 # strings if (is_mac || is_ios || is_chromeos || is_chromecast) { -@@ -1467,7 +1498,7 @@ component("base") { +@@ -1469,7 +1499,7 @@ } # Linux. @@ -54,7 +62,7 @@ if (is_asan || is_lsan || is_msan || is_tsan) { # For llvm-sanitizer. data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ] -@@ -1492,7 +1523,7 @@ component("base") { +@@ -1494,7 +1524,7 @@ "//base/third_party/xdg_user_dirs", ] } else { @@ -63,30 +71,16 @@ sources -= [ "nix/mime_util_xdg.cc", "nix/mime_util_xdg.h", -@@ -1508,6 +1539,13 @@ component("base") { - } - } - -+ if (is_bsd) { -+ sources -= [ -+ "threading/platform_thread_linux.cc", -+ ] -+ sources += [ "threading/platform_thread_freebsd.cc" ] +@@ -2325,6 +2355,12 @@ + "trace_event/trace_event_android_unittest.cc", + ] + set_sources_assignment_filter(sources_assignment_filter) + } + - # iOS - if (is_ios) { - set_sources_assignment_filter([]) -@@ -2309,6 +2347,12 @@ test("base_unittests") { - set_sources_assignment_filter(sources_assignment_filter) - } - + if (is_bsd) { + sources -= [ + "debug/proc_maps_linux_unittest.cc", + ] -+ } -+ + } + if (is_win) { - deps += [ "//base:scoped_handle_test_dll" ] - if (current_cpu == "x64") { diff --git a/www/chromium/files/patch-base_allocator_allocator__shim.cc b/www/chromium/files/patch-base_allocator_allocator__shim.cc index 511d90c292b4..ec8cc2627508 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim.cc @@ -1,6 +1,6 @@ ---- base/allocator/allocator_shim.cc.orig 2017-04-19 19:06:28 UTC +--- base/allocator/allocator_shim.cc.orig 2017-06-05 19:03:00 UTC +++ base/allocator/allocator_shim.cc -@@ -81,7 +81,7 @@ inline const allocator::AllocatorDispatc +@@ -83,7 +83,7 @@ inline const allocator::AllocatorDispatch* GetChainHea // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully // barriered on Linux+Clang, and that causes visible perf regressons. return reinterpret_cast<const allocator::AllocatorDispatch*>( 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 3c57e6577f92..7b1ac77664ac 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,15 +1,15 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2017-04-19 19:06:28 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2017-06-05 19:03:00 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc @@ -3,19 +3,28 @@ // found in the LICENSE file. #include "base/allocator/allocator_shim.h" -- --#include <malloc.h> +#include <stdio.h> +#include <stdlib.h> +#include <malloc_np.h> +-#include <malloc.h> +- // This translation unit defines a default dispatch for the allocator shim which // routes allocations to libc functions. -// The code here is strongly inspired from tcmalloc's libc_override_glibc.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 a27e4d210171..f51926bd0edf 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -1,6 +1,6 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2017-04-19 19:06:28 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2017-06-05 19:03:00 UTC +++ base/allocator/allocator_shim_unittest.cc -@@ -289,7 +289,7 @@ TEST_F(AllocatorShimTest, InterceptLibcS +@@ -293,7 +293,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u); #endif // !OS_WIN @@ -9,7 +9,7 @@ void* memalign_ptr = memalign(128, 53); ASSERT_NE(nullptr, memalign_ptr); ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128); -@@ -302,7 +302,7 @@ TEST_F(AllocatorShimTest, InterceptLibcS +@@ -306,7 +306,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); // pvalloc rounds the size up to the next page. ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u); @@ -18,7 +18,7 @@ char* realloc_ptr = static_cast<char*>(malloc(10)); strcpy(realloc_ptr, "foobar"); -@@ -318,13 +318,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS +@@ -322,13 +322,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { free(zero_alloc_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u); diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc new file mode 100644 index 000000000000..4eb799c2d27a --- /dev/null +++ b/www/chromium/files/patch-base_debug_debugger__posix.cc @@ -0,0 +1,57 @@ +--- base/debug/debugger_posix.cc.orig 2017-06-18 01:23:49.065175000 +0200 ++++ base/debug/debugger_posix.cc 2017-06-18 01:58:29.603481000 +0200 +@@ -84,7 +84,7 @@ + KERN_PROC, + KERN_PROC_PID, + getpid() +-#if defined(OS_OPENBSD) ++#if defined(OS_BSD) + , sizeof(struct kinfo_proc), + 0 + #endif +@@ -92,33 +92,36 @@ + + // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and + // binary interfaces may change. +- struct kinfo_proc info; +- size_t info_size = sizeof(info); ++ struct kinfo_proc *info; ++ size_t info_size; + +-#if defined(OS_OPENBSD) + if (sysctl(mib, arraysize(mib), NULL, &info_size, NULL, 0) < 0) + return -1; + ++ info = (struct kinfo_proc *)malloc(info_size); ++ + mib[5] = (info_size / sizeof(struct kinfo_proc)); +-#endif + +- int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0); ++ int sysctl_result = sysctl(mib, arraysize(mib), info, &info_size, NULL, 0); + DCHECK_EQ(sysctl_result, 0); + if (sysctl_result != 0) { + is_set = true; + being_debugged = false; +- return being_debugged; ++ goto out; + } + + // This process is being debugged if the P_TRACED flag is set. + is_set = true; + #if defined(OS_FREEBSD) +- being_debugged = (info.ki_flag & P_TRACED) != 0; ++ being_debugged = (info->ki_flag & P_TRACED) != 0; + #elif defined(OS_BSD) +- being_debugged = (info.p_flag & P_TRACED) != 0; ++ being_debugged = (info->p_flag & P_TRACED) != 0; + #else +- being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; ++ being_debugged = (info->kp_proc.p_flag & P_TRACED) != 0; + #endif ++ ++out: ++ free(info); + return being_debugged; + } + diff --git a/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc b/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc index 3c59be9ba720..3e3a6eadd277 100644 --- a/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc +++ b/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc @@ -1,6 +1,6 @@ ---- base/debug/thread_heap_usage_tracker.cc.orig 2017-04-19 19:06:28 UTC +--- base/debug/thread_heap_usage_tracker.cc.orig 2017-06-05 19:03:00 UTC +++ base/debug/thread_heap_usage_tracker.cc -@@ -16,11 +16,13 @@ +@@ -16,10 +16,12 @@ #include "base/threading/thread_local_storage.h" #include "build/build_config.h" @@ -9,8 +9,7 @@ #include <malloc/malloc.h> #else #include <malloc.h> - #endif +#endif + #endif namespace base { - namespace debug { 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 167644ac3dd2..a0c6dcdd6524 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 2017-04-19 19:06:28 UTC +--- base/files/file_path_unittest.cc.orig 2017-06-05 19:03:00 UTC +++ base/files/file_path_unittest.cc -@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_ +@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, }; diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 9600826a55db..4c643ccc27c3 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 2017-04-19 19:06:28 UTC +--- base/files/file_util.h.orig 2017-06-05 19:03:00 UTC +++ base/files/file_util.h -@@ -406,7 +406,7 @@ BASE_EXPORT bool VerifyPathControlledByA +@@ -406,7 +406,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas // 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_native__library__posix.cc b/www/chromium/files/patch-base_native__library__posix.cc index b1db681350d3..1a6aca981929 100644 --- a/www/chromium/files/patch-base_native__library__posix.cc +++ b/www/chromium/files/patch-base_native__library__posix.cc @@ -1,6 +1,6 @@ ---- base/native_library_posix.cc.orig 2017-04-19 19:06:28 UTC +--- base/native_library_posix.cc.orig 2017-06-05 19:03:00 UTC +++ base/native_library_posix.cc -@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptio +@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP // 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); 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 997b59b8f1ab..cd569385306f 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,4 +1,4 @@ ---- base/posix/unix_domain_socket_linux.cc.orig 2017-04-19 19:06:28 UTC +--- base/posix/unix_domain_socket_linux.cc.orig 2017-06-05 19:03:00 UTC +++ base/posix/unix_domain_socket_linux.cc @@ -23,6 +23,15 @@ @@ -16,7 +16,7 @@ const size_t UnixDomainSocket::kMaxFileDescriptors = 16; #if !defined(OS_NACL_NONSFI) -@@ -40,8 +49,14 @@ static bool CreateSocketPair(ScopedFD* o +@@ -37,8 +46,14 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { @@ -31,7 +31,7 @@ } #endif // !defined(OS_NACL_NONSFI) -@@ -147,7 +162,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFla +@@ -144,7 +159,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, // 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_process_launch.cc b/www/chromium/files/patch-base_process_launch.cc index 2dca0a643ba2..35a223e5b8bd 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 2017-04-19 19:06:28 UTC +--- base/process/launch.cc.orig 2017-06-05 19:03:00 UTC +++ base/process/launch.cc -@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = defaul +@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default; LaunchOptions LaunchOptionsForTest() { LaunchOptions options; diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc index bb441fd052da..566b3557e930 100644 --- a/www/chromium/files/patch-base_process_memory.cc +++ b/www/chromium/files/patch-base_process_memory.cc @@ -1,6 +1,6 @@ ---- base/process/memory.cc.orig 2017-04-19 19:06:28 UTC +--- base/process/memory.cc.orig 2017-06-05 19:03:00 UTC +++ base/process/memory.cc -@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t +@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t size) { #endif // Defined in memory_mac.mm for Mac. diff --git a/www/chromium/files/patch-base_process_memory.h b/www/chromium/files/patch-base_process_memory.h index f2b7f5269afa..555b834e6244 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 2017-04-19 19:06:28 UTC +--- base/process/memory.h.orig 2017-06-05 19:03:00 UTC +++ base/process/memory.h -@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutO +@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); // 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 deleted file mode 100644 index 80d7a0cff6d6..000000000000 --- a/www/chromium/files/patch-base_process_memory__stubs.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- base/process/memory_stubs.cc.orig 2017-04-19 19:06:28 UTC -+++ base/process/memory_stubs.cc -@@ -31,6 +31,8 @@ void TerminateBecauseOutOfMemory(size_t - // their respective stdlib function since those functions will return null on a - // failure to allocate. - -+#if !defined(OS_FREEBSD) -+// FreeBSD brings it's own implementation in memory.cc -- cmt - bool UncheckedMalloc(size_t size, void** result) { - *result = malloc(size); - return *result != nullptr; -@@ -40,5 +42,6 @@ bool UncheckedCalloc(size_t num_items, s - *result = calloc(num_items, size); - return *result != nullptr; - } -+#endif - - } // namespace base diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index 41f8b29840d2..c401f8285624 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -1,7 +1,7 @@ ---- base/process/memory_unittest.cc.orig 2017-04-19 19:06:28 UTC +--- base/process/memory_unittest.cc.orig 2017-06-05 19:03:00 UTC +++ base/process/memory_unittest.cc -@@ -93,10 +93,10 @@ TEST(MemoryTest, AllocatorShimWorking) { - ASSERT_TRUE(base::allocator::IsAllocatorInitialized()); +@@ -101,10 +101,10 @@ TEST(MemoryTest, AllocatorShimWorking) { + #endif } -// OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan @@ -13,7 +13,7 @@ BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) -@@ -488,5 +488,5 @@ TEST_F(OutOfMemoryHandledTest, Unchecked +@@ -508,5 +508,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); EXPECT_TRUE(value_ == NULL); } 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 ce71cfc3fc85..1391a12e27ff 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 2017-04-19 19:06:28 UTC +--- base/process/process_info_linux.cc.orig 2017-06-05 19:03:00 UTC +++ base/process/process_info_linux.cc @@ -11,10 +11,28 @@ #include "base/process/process_handle.h" @@ -28,10 +28,10 @@ +#else int64_t start_ticks = internal::ReadProcSelfStatsAndGetFieldAsInt64(internal::VM_STARTTIME); - DCHECK(start_ticks); -@@ -22,6 +40,7 @@ const Time CurrentProcessInfo::CreationT - Time boot_time = internal::GetBootTime(); - DCHECK(!boot_time.is_null()); + if (!start_ticks) +@@ -24,6 +42,7 @@ const Time CurrentProcessInfo::CreationTime() { + if (boot_time.is_null()) + return Time(); return Time(boot_time + start_offset); +#endif } 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 2ac07ce1eae2..e9b72d6254dc 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 2017-04-19 19:06:28 UTC +--- base/process/process_iterator_freebsd.cc.orig 2017-06-05 19:03:00 UTC +++ base/process/process_iterator_freebsd.cc @@ -10,6 +10,10 @@ #include <sys/sysctl.h> @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/macros.h" #include "base/strings/string_split.h" -@@ -72,19 +76,13 @@ bool ProcessIterator::CheckForNextProces +@@ -72,19 +76,13 @@ bool ProcessIterator::CheckForNextProcess() { for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { size_t length; struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index b40a0e896d2b..1503c971bee5 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2017-04-19 19:06:28 UTC +--- base/process/process_metrics.h.orig 2017-06-05 19:03:00 UTC +++ base/process/process_metrics.h @@ -22,6 +22,12 @@ #include "base/values.h" @@ -13,7 +13,34 @@ #if defined(OS_MACOSX) #include <mach/mach.h> #include "base/process/port_provider_mac.h" -@@ -329,13 +335,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys +@@ -205,7 +211,7 @@ class BASE_EXPORT ProcessMetrics { + // otherwise. + bool GetIOCounters(IoCounters* io_counters) const; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Returns the number of file descriptors currently open by the process, or + // -1 on error. + int GetOpenFdCount() const; +@@ -213,7 +219,7 @@ class BASE_EXPORT ProcessMetrics { + // Returns the soft limit of file descriptors that can be opened by the + // process, or -1 on error. + int GetOpenFdSoftLimit() const; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + private: + #if !defined(OS_MACOSX) || defined(OS_IOS) +@@ -289,7 +295,7 @@ BASE_EXPORT void SetFdLimit(unsigned int max_descripto + #endif // defined(OS_POSIX) + + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +- defined(OS_ANDROID) ++ defined(OS_ANDROID) || defined(OS_BSD) + // Data about system-wide memory consumption. Values are in KB. Available on + // Windows, Mac, Linux, Android and Chrome OS. + // +@@ -383,13 +389,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // 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 89aa3be55bf4..264992ce9550 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2017-04-19 19:06:28 UTC +--- base/process/process_metrics_freebsd.cc.orig 2017-06-05 19:03:00 UTC +++ base/process/process_metrics_freebsd.cc @@ -13,6 +13,9 @@ #include "base/memory/ptr_util.h" @@ -10,10 +10,12 @@ namespace base { ProcessMetrics::ProcessMetrics(ProcessHandle process) -@@ -122,4 +125,23 @@ size_t GetSystemCommitCharge() { - return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); - } +@@ -120,6 +123,25 @@ size_t GetSystemCommitCharge() { + pagesize = getpagesize(); + return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); ++} ++ +int GetNumberOfThreads(ProcessHandle process) { + // Taken from FreeBSD top (usr.bin/top/machine.c) + @@ -31,6 +33,6 @@ + return 0; + + return nproc; -+} -+ + } + } // namespace base diff --git a/www/chromium/files/patch-base_process_process__posix.cc b/www/chromium/files/patch-base_process_process__posix.cc index cfaca45e5357..7ea5ddd20fc0 100644 --- a/www/chromium/files/patch-base_process_process__posix.cc +++ b/www/chromium/files/patch-base_process_process__posix.cc @@ -1,5 +1,5 @@ ---- base/process/process_posix.cc.orig 2017-04-19 19:06:28 UTC -+++ base/process/process_posix.cc +--- base/process/process_posix.cc.orig 2017-06-15 21:03:00.000000000 +0200 ++++ base/process/process_posix.cc 2017-06-19 15:25:27.760111000 +0200 @@ -21,8 +21,18 @@ #include <sys/event.h> #endif @@ -19,7 +19,7 @@ #if !defined(OS_NACL_NONSFI) bool WaitpidWithTimeout(base::ProcessHandle handle, -@@ -184,13 +194,13 @@ bool WaitForExitWithTimeoutImpl(base::Pr +@@ -184,13 +194,13 @@ base::ProcessHandle parent_pid = base::GetParentProcessId(handle); base::ProcessHandle our_pid = base::GetCurrentProcessHandle(); if (parent_pid != our_pid) { @@ -36,7 +36,7 @@ } int status; -@@ -257,12 +267,16 @@ Process Process::DeprecatedGetProcessFro +@@ -256,12 +266,16 @@ return Process(handle); } @@ -55,7 +55,7 @@ // static void Process::TerminateCurrentProcessImmediately(int exit_code) { -@@ -370,15 +384,32 @@ bool Process::WaitForExitWithTimeout(Tim +@@ -369,15 +383,31 @@ bool Process::IsProcessBackgrounded() const { // See SetProcessBackgrounded(). DCHECK(IsValid()); @@ -82,7 +82,6 @@ + int priority = value ? kBackgroundPriority : kForegroundPriority; + int result = setpriority(PRIO_PROCESS, process_, priority); + -+ DPCHECK(result == 0); + return result == 0; +#endif // !defined(OS_FREEBSD) } diff --git a/www/chromium/files/patch-base_sys__info__freebsd.cc b/www/chromium/files/patch-base_sys__info__freebsd.cc index 301080013828..e4e7c8478ebf 100644 --- a/www/chromium/files/patch-base_sys__info__freebsd.cc +++ b/www/chromium/files/patch-base_sys__info__freebsd.cc @@ -1,4 +1,4 @@ ---- base/sys_info_freebsd.cc.orig 2017-04-19 19:06:28 UTC +--- base/sys_info_freebsd.cc.orig 2017-06-05 19:03:00 UTC +++ base/sys_info_freebsd.cc @@ -12,12 +12,34 @@ @@ -39,7 +39,7 @@ NOTREACHED(); return 0; } -@@ -25,14 +47,24 @@ int64_t SysInfo::AmountOfPhysicalMemory( +@@ -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 90ecf301d369..6e94c5b787c9 100644 --- a/www/chromium/files/patch-base_sys__info__posix.cc +++ b/www/chromium/files/patch-base_sys__info__posix.cc @@ -1,4 +1,4 @@ ---- base/sys_info_posix.cc.orig 2017-04-19 19:06:28 UTC +--- base/sys_info_posix.cc.orig 2017-06-05 19:03:00 UTC +++ base/sys_info_posix.cc @@ -35,7 +35,7 @@ @@ -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. -@@ -128,7 +128,7 @@ bool GetDiskSpaceInfo(const base::FilePa +@@ -128,7 +128,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, namespace base { diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn index 2bc772bb511c..18d53d634b5f 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 2017-04-19 19:06:28 UTC +--- base/test/BUILD.gn.orig 2017-06-05 19:03:00 UTC +++ base/test/BUILD.gn -@@ -312,7 +312,7 @@ static_library("run_all_base_unittests") +@@ -314,7 +314,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 0d81c983be42..4900d326214d 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 2017-04-19 19:06:28 UTC +--- base/test/launcher/test_launcher.cc.orig 2017-06-05 19:03:00 UTC +++ base/test/launcher/test_launcher.cc -@@ -60,6 +60,10 @@ +@@ -61,6 +61,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 be8a681a71e6..7a8cfbfdb3b9 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 2017-04-19 19:06:28 UTC +--- base/test/test_file_util_posix.cc.orig 2017-06-05 19:03:00 UTC +++ base/test/test_file_util_posix.cc -@@ -79,7 +79,7 @@ bool DieFileDie(const FilePath& file, bo +@@ -79,7 +79,7 @@ bool DieFileDie(const FilePath& file, bool recurse) { return DeleteFile(file, recurse); } diff --git a/www/chromium/files/patch-base_threading_platform__thread__linux.cc b/www/chromium/files/patch-base_threading_platform__thread__linux.cc index dc0070c650a2..cd6f6ee52e8b 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_linux.cc.orig 2017-04-19 19:06:28 UTC +--- base/threading/platform_thread_linux.cc.orig 2017-06-05 19:03:01 UTC +++ base/threading/platform_thread_linux.cc @@ -19,7 +19,9 @@ @@ -10,7 +10,7 @@ #include <sys/resource.h> #include <sys/time.h> #include <sys/types.h> -@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std:: +@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std::string& name) ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); tracked_objects::ThreadData::InitializeThreadContext(name); @@ -19,7 +19,7 @@ // 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:: +@@ -150,7 +152,7 @@ void PlatformThread::SetName(const std::string& name) #endif // !defined(OS_NACL) } diff --git a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc index 468a4f224611..e6f1289f01f1 100644 --- a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc +++ b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc @@ -1,4 +1,4 @@ ---- base/threading/thread_task_runner_handle.cc.orig 2017-04-19 19:06:28 UTC +--- base/threading/thread_task_runner_handle.cc.orig 2017-06-05 19:03:01 UTC +++ base/threading/thread_task_runner_handle.cc @@ -7,6 +7,7 @@ #include <utility> @@ -16,7 +16,7 @@ // static ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting( scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) { -@@ -77,6 +79,7 @@ ScopedClosureRunner ThreadTaskRunnerHand +@@ -77,6 +79,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo base::Passed(&overriding_task_runner), base::Unretained(ttrh->task_runner_.get()))); } 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 deleted file mode 100644 index e8a0513eee80..000000000000 --- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2017-04-19 19:06:28 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 - #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 446490dd7e56..0f20b8c032ed 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 2017-04-19 19:06:28 UTC +--- base/trace_event/process_memory_dump.cc.orig 2017-06-05 19:03:01 UTC +++ base/trace_event/process_memory_dump.cc -@@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentB +@@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta 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-base_trace__event_trace__log.cc b/www/chromium/files/patch-base_trace__event_trace__log.cc new file mode 100644 index 000000000000..deaabaf448e3 --- /dev/null +++ b/www/chromium/files/patch-base_trace__event_trace__log.cc @@ -0,0 +1,20 @@ +--- base/trace_event/trace_log.cc.orig 2017-06-05 19:03:01 UTC ++++ base/trace_event/trace_log.cc +@@ -1504,7 +1504,7 @@ void TraceLog::AddMetadataEventsWhileLocked() { + process_name_); + } + +-#if !defined(OS_NACL) && !defined(OS_IOS) ++#if !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_BSD) + Time process_creation_time = CurrentProcessInfo::CreationTime(); + if (!process_creation_time.is_null()) { + TimeDelta process_uptime = Time::Now() - process_creation_time; +@@ -1512,7 +1512,7 @@ void TraceLog::AddMetadataEventsWhileLocked() { + current_thread_id, "process_uptime_seconds", + "uptime", process_uptime.InSeconds()); + } +-#endif // !defined(OS_NACL) && !defined(OS_IOS) ++#endif // !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_BSD) + + if (!process_labels_.empty()) { + std::vector<base::StringPiece> labels; diff --git a/www/chromium/files/patch-breakpad_BUILD.gn b/www/chromium/files/patch-breakpad_BUILD.gn index 9bc9d6529dba..a2b5f2b5db32 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 2017-04-19 19:06:28 UTC +--- breakpad/BUILD.gn.orig 2017-06-05 19:03:01 UTC +++ breakpad/BUILD.gn -@@ -468,7 +468,7 @@ if (is_mac) { +@@ -472,7 +472,7 @@ if (is_mac) { } } diff --git a/www/chromium/files/patch-build__overrides_pdfium.gni b/www/chromium/files/patch-build__overrides_pdfium.gni new file mode 100644 index 000000000000..639d8609fa7e --- /dev/null +++ b/www/chromium/files/patch-build__overrides_pdfium.gni @@ -0,0 +1,11 @@ +--- build_overrides/pdfium.gni.orig 2017-06-05 19:03:01 UTC ++++ build_overrides/pdfium.gni +@@ -10,7 +10,7 @@ pdf_enable_xfa_override = false + + # Build PDFium either using the bundled FreeType, or using a third-party + # FreeType, configured by the embedder in //build/config/freetype. +-pdf_bundle_freetype_override = !is_linux && !is_win ++pdf_bundle_freetype_override = false + + # Disable use of Skia backend. + pdf_use_skia_override = false diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index 2f85025c9f8b..2459ef3007d0 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 2017-04-19 19:06:28 UTC +--- build/config/BUILD.gn.orig 2017-06-05 19:03:01 UTC +++ build/config/BUILD.gn -@@ -193,7 +193,7 @@ config("debug") { +@@ -169,7 +169,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? -@@ -276,7 +276,7 @@ config("default_libs") { +@@ -258,7 +258,7 @@ config("default_libs") { "CoreText.framework", "Foundation.framework", ] @@ -18,7 +18,7 @@ libs = [ "dl", "rt", -@@ -307,7 +307,7 @@ config("executable_config") { +@@ -292,7 +292,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 841b49d3906f..098fd9cb2e86 100644 --- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- build/config/BUILDCONFIG.gn.orig 2017-04-19 19:06:28 UTC +--- build/config/BUILDCONFIG.gn.orig 2017-06-05 19:03:01 UTC +++ build/config/BUILDCONFIG.gn @@ -131,12 +131,13 @@ declare_args() { is_official_build = false @@ -36,7 +36,7 @@ # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -342,8 +343,17 @@ if (current_os == "win" || current_os == +@@ -342,8 +343,17 @@ if (current_os == "win" || current_os == "winrt_81" || is_nacl = false is_posix = true is_win = false diff --git a/www/chromium/files/patch-build_config_allocator.gni b/www/chromium/files/patch-build_config_allocator.gni index ad404179d272..d85afb9f4d85 100644 --- a/www/chromium/files/patch-build_config_allocator.gni +++ b/www/chromium/files/patch-build_config_allocator.gni @@ -1,16 +1,11 @@ ---- build/config/allocator.gni.orig 2017-04-19 19:06:28 UTC +--- build/config/allocator.gni.orig 2017-06-05 19:03:01 UTC +++ build/config/allocator.gni -@@ -45,10 +45,10 @@ assert(use_allocator == "none" || use_al - assert(!is_win || use_allocator == "none", "Tcmalloc doesn't work on Windows.") - assert(!is_mac || use_allocator == "none", "Tcmalloc doesn't work on macOS.") - --assert(!use_experimental_allocator_shim || is_linux || is_android || is_win || -- is_mac, -+assert(!use_experimental_allocator_shim || is_linux || is_android || is_win || -+ is_mac || is_bsd, - "use_experimental_allocator_shim supported only on Linux, Android, " + -- "Windows and macOS targets") -+ "Windows, macOS and BSD targets") - - if (is_win && use_experimental_allocator_shim) { - assert(!is_component_build, +@@ -18,7 +18,7 @@ if (is_android || current_cpu == "mipsel" || is_mac || + # against the debug CRT with "is_nacl=false". + if ((is_linux || is_android || is_mac || + (is_win && !is_component_build && !is_debug)) && !is_asan && !is_lsan && +- !is_tsan && !is_msan) { ++ !is_tsan && !is_msan && !is_bsd) { + _default_use_experimental_allocator_shim = true + } else { + _default_use_experimental_allocator_shim = false diff --git a/www/chromium/files/patch-build_config_clang_BUILD.gn b/www/chromium/files/patch-build_config_clang_BUILD.gn index 9a30eeb8faeb..ce0ea6dc615f 100644 --- a/www/chromium/files/patch-build_config_clang_BUILD.gn +++ b/www/chromium/files/patch-build_config_clang_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/clang/BUILD.gn.orig 2017-04-19 19:06:28 UTC +--- build/config/clang/BUILD.gn.orig 2017-06-05 19:03:01 UTC +++ build/config/clang/BUILD.gn -@@ -20,7 +20,7 @@ config("find_bad_constructs") { +@@ -19,7 +19,7 @@ config("find_bad_constructs") { rebase_path("${clang_base_path}/lib/libFindBadConstructs.dylib", root_build_dir), ] @@ -9,12 +9,12 @@ cflags += [ "-Xclang", "-load", -@@ -41,7 +41,7 @@ config("find_bad_constructs") { +@@ -40,7 +40,7 @@ config("find_bad_constructs") { "check-auto-raw-pointer", ] -- if ((is_linux || is_android) && !is_chromecast) { -+ if ((is_linux || is_bsd || is_android) && !is_chromecast) { +- if (is_linux || is_android) { ++ if (is_linux || is_bsd || is_android) { cflags += [ "-Xclang", "-plugin-arg-find-bad-constructs", diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 97095807f977..63941e8167cd 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,15 @@ ---- build/config/compiler/BUILD.gn.orig 2017-04-19 19:06:28 UTC -+++ build/config/compiler/BUILD.gn -@@ -158,7 +158,7 @@ config("compiler") { +--- build/config/compiler/BUILD.gn.orig 2017-06-05 21:03:01.000000000 +0200 ++++ build/config/compiler/BUILD.gn 2017-06-13 16:28:04.062660000 +0200 +@@ -37,7 +37,7 @@ + # only two architectures that are currently checked in). Turn this off when + # you are using a custom toolchain and need to control -B in cflags. + linux_use_bundled_binutils = +- linux_use_bundled_binutils_override && is_linux && ++ linux_use_bundled_binutils_override && (is_linux && !is_bsd) && + (current_cpu == "x64" || current_cpu == "x86") + binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", + root_build_dir) +@@ -156,7 +156,7 @@ configs += [ "//build/config/win:compiler" ] } else if (is_android) { configs += [ "//build/config/android:compiler" ] @@ -9,16 +18,34 @@ configs += [ "//build/config/linux:compiler" ] } else if (is_nacl) { configs += [ "//build/config/nacl:compiler" ] -@@ -301,7 +301,7 @@ config("compiler") { +@@ -207,7 +207,7 @@ + + # Linker warnings. + if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && +- !(is_android && use_order_profiling) && !is_mac && !is_ios) { ++ !(is_android && use_order_profiling) && !is_mac && !is_ios && !is_bsd) { + # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 + # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 + # crbug.com/485542 +@@ -304,7 +304,7 @@ # Linux/Android common flags setup. # --------------------------------- - if (is_linux || is_android) { + if (is_linux || is_bsd || is_android) { - cflags += [ - "-fPIC", - "-pipe", # Use pipes for communicating between sub-processes. Faster. -@@ -428,14 +428,14 @@ config("compiler") { + if (use_pic) { + cflags += [ "-fPIC" ] + ldflags += [ "-fPIC" ] +@@ -319,7 +319,7 @@ + "-Wl,-z,relro", + ] + if (!using_sanitizer) { +- if (!use_cfi_diag) { ++ if (!use_cfi_diag && !is_bsd) { + ldflags += [ "-Wl,-z,defs" ] + } + +@@ -429,14 +429,14 @@ # 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 +62,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, -@@ -488,7 +488,7 @@ config("compiler") { +@@ -493,7 +493,7 @@ ] # Apply a lower LTO optimization level as the default is too slow. @@ -44,7 +71,7 @@ if (use_lld) { ldflags += [ "-Wl,--lto-O1" ] } else { -@@ -508,7 +508,7 @@ config("compiler") { +@@ -513,7 +513,7 @@ # 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 +80,7 @@ ldflags += [ "-Wl,-plugin-opt,-function-sections" ] } } -@@ -776,7 +776,7 @@ config("compiler_codegen") { +@@ -781,7 +781,7 @@ # configs -= [ "//build/config/compiler:clang_stackrealign" ] # See https://crbug.com/556393 for details of where it must be avoided. config("clang_stackrealign") { @@ -62,7 +89,7 @@ cflags = [ # Align the stack on 16-byte boundaries, http://crbug.com/418554. "-mstack-alignment=16", -@@ -830,7 +830,7 @@ config("runtime_library") { +@@ -835,7 +835,7 @@ # smaller. if (is_win) { configs += [ "//build/config/win:runtime_library" ] @@ -71,16 +98,16 @@ configs += [ "//build/config/linux:runtime_library" ] } else if (is_ios) { configs += [ "//build/config/ios:runtime_library" ] -@@ -1087,7 +1087,7 @@ config("default_warnings") { +@@ -1097,7 +1097,7 @@ + "-Wno-address-of-packed-member", - # use_xcode_clang only refers to the iOS toolchain, host binaries use - # chromium's clang always. -- if (!is_nacl && (!use_xcode_clang || current_toolchain == host_toolchain)) { -+ if (!is_nacl && !is_bsd && (!use_xcode_clang || current_toolchain == host_toolchain)) { - # Flags NaCl (Clang 3.7) and Xcode 7.3 (Clang clang-703.0.31) do not - # recognize. - cflags += [ -@@ -1144,7 +1144,7 @@ config("chromium_code") { + # TODO(hans): https://crbug.com/681136 +- "-Wno-unused-lambda-capture", ++ # "-Wno-unused-lambda-capture", + + # TODO(thakis ): https://crbug.com/683349 + "-Wno-user-defined-warnings", +@@ -1137,7 +1137,7 @@ ] if (!is_debug && !using_sanitizer && @@ -89,7 +116,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 -@@ -1203,7 +1203,7 @@ config("no_chromium_code") { +@@ -1196,7 +1196,7 @@ ] } @@ -98,3 +125,12 @@ cflags_cc += [ # Don't warn about hash_map in third-party code. "-Wno-deprecated", +@@ -1644,7 +1644,7 @@ + "-g2", + ] + } else { +- cflags = [ "-g2" ] ++ cflags = [ "-g0" ] + } + if (use_debug_fission) { + cflags += [ "-gsplit-dwarf" ] diff --git a/www/chromium/files/patch-build_config_crypto.gni b/www/chromium/files/patch-build_config_crypto.gni index 29f38a66cf20..aed07e7239dc 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 2017-04-19 19:06:28 UTC +--- build/config/crypto.gni.orig 2017-06-05 19:03:01 UTC +++ build/config/crypto.gni -@@ -20,4 +20,4 @@ use_openssl_certs = is_android || is_nac +@@ -20,4 +20,4 @@ use_openssl_certs = is_android || is_nacl # 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 bb7ef35cb8c8..abd2ce501bfa 100644 --- a/www/chromium/files/patch-build_config_features.gni +++ b/www/chromium/files/patch-build_config_features.gni @@ -1,8 +1,11 @@ ---- build/config/features.gni.orig 2017-04-19 19:06:28 UTC +--- build/config/features.gni.orig 2017-06-05 19:03:01 UTC +++ build/config/features.gni -@@ -60,13 +60,13 @@ declare_args() { +@@ -58,15 +58,15 @@ declare_args() { + fieldtrial_testing_like_official_build = is_chrome_branded + # libudev usage. This currently only affects the content layer. - use_udev = is_linux && !is_chromecast +- use_udev = is_linux && !is_chromecast ++ use_udev = is_linux && !is_chromecast && !is_bsd - use_dbus = is_linux && !is_chromecast + use_dbus = (is_linux || is_bsd) && !is_chromecast @@ -14,6 +17,6 @@ - use_gio = is_linux && !is_chromeos && !is_chromecast + use_gio = (is_linux || is_bsd) && !is_chromeos && !is_chromecast - - # 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_freetype_BUILD.gn b/www/chromium/files/patch-build_config_freetype_BUILD.gn new file mode 100644 index 000000000000..53452cab0e04 --- /dev/null +++ b/www/chromium/files/patch-build_config_freetype_BUILD.gn @@ -0,0 +1,11 @@ +--- build/config/freetype/BUILD.gn.orig 2017-06-05 19:03:01 UTC ++++ build/config/freetype/BUILD.gn +@@ -9,7 +9,7 @@ group("freetype") { + public_deps = [ + "//third_party/freetype", + ] +- } else if (is_linux) { ++ } else if (is_linux || is_bsd) { + public_configs = [ "//build/linux:freetype_from_pkgconfig" ] + } + } diff --git a/www/chromium/files/patch-build_config_sanitizers_BUILD.gn b/www/chromium/files/patch-build_config_sanitizers_BUILD.gn index e385f3ee575c..56efe1f7ec82 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 2017-04-19 19:06:28 UTC +--- build/config/sanitizers/BUILD.gn.orig 2017-06-05 19:03:01 UTC +++ build/config/sanitizers/BUILD.gn -@@ -428,7 +428,7 @@ config("lsan_flags") { +@@ -438,7 +438,7 @@ config("lsan_flags") { config("msan_flags") { if (is_msan) { @@ -9,7 +9,7 @@ if (!defined(msan_blacklist_path)) { msan_blacklist_path = rebase_path("//tools/msan/blacklist.txt", root_build_dir) -@@ -443,7 +443,7 @@ config("msan_flags") { +@@ -453,7 +453,7 @@ config("msan_flags") { config("tsan_flags") { if (is_tsan) { diff --git a/www/chromium/files/patch-build_config_ui.gni b/www/chromium/files/patch-build_config_ui.gni index 47d20b7a4045..c3816df22883 100644 --- a/www/chromium/files/patch-build_config_ui.gni +++ b/www/chromium/files/patch-build_config_ui.gni @@ -1,4 +1,4 @@ ---- build/config/ui.gni.orig 2017-04-19 19:06:28 UTC +--- build/config/ui.gni.orig 2017-06-05 19:03:01 UTC +++ build/config/ui.gni @@ -31,10 +31,10 @@ declare_args() { @@ -10,15 +10,11 @@ # Whether we should use glib, a low level C utility library. - use_glib = is_linux + use_glib = is_linux || is_bsd + } - # Indicates if Wayland display server support is enabled. - enable_wayland_server = is_chromeos -@@ -55,17 +55,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) + declare_args() { +@@ -48,14 +48,14 @@ declare_args() { + # These variables depend on other variables and can't be set externally. # Indicates if the UI toolkit depends on X11. -use_x11 = is_linux && !use_ozone diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index 9c4b56c87139..26555538a4b1 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,8 +1,8 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2017-04-19 19:06:28 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2017-06-05 19:03:01 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -12,6 +12,11 @@ import("//build/toolchain/clang_static_a - import("//build/toolchain/goma.gni") - import("//build/toolchain/toolchain.gni") +@@ -19,6 +19,11 @@ analyzer_wrapper = + rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py", + root_build_dir) + " --mode=clang" +declare_args() { + extra_cxxflags = "" @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -483,10 +488,22 @@ template("clang_toolchain") { +@@ -548,13 +553,22 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { @@ -20,6 +20,9 @@ - cc = "$prefix/clang" - cxx = "$prefix/clang++" - ld = cxx +- readelf = "${toolprefix}readelf" +- ar = "${prefix}/llvm-ar" +- nm = "${toolprefix}nm" + if (is_bsd) { + cc = "${toolprefix}clang39" + cxx = "${toolprefix}clang++39" @@ -33,20 +36,9 @@ + cxx = "$prefix/clang++" + ld = cxx + readelf = "${toolprefix}readelf" -+ ar = "${toolprefix}ar" ++ ar = "${prefix}/llvm-ar" + nm = "${toolprefix}nm" + } - if (use_clang_static_analyzer) { - # Static analysis isn't supported under GOMA. See crbug.com/687245 -@@ -507,10 +524,6 @@ template("clang_toolchain") { - root_build_dir) - } - -- readelf = "${toolprefix}readelf" -- ar = "${toolprefix}ar" -- nm = "${toolprefix}nm" -- - forward_variables_from(invoker, [ "strip" ]) - - toolchain_args = { + forward_variables_from(invoker, + [ 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 de6cc4a4734d..481776ba30d1 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 2017-04-19 19:06:28 UTC +--- cc/layers/scrollbar_layer_impl_base.cc.orig 2017-06-05 19:03:01 UTC +++ cc/layers/scrollbar_layer_impl_base.cc -@@ -174,8 +174,8 @@ gfx::Rect ScrollbarLayerImplBase::Comput +@@ -175,8 +175,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect 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 3aeb9ed21a0b..549b1400f3a2 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 2017-04-19 19:06:28 UTC +--- cc/trees/property_tree.cc.orig 2017-06-05 19:03:01 UTC +++ cc/trees/property_tree.cc -@@ -1229,13 +1229,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO +@@ -1256,13 +1256,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id); diff --git a/www/chromium/files/patch-chrome_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn index c2b3e915e634..3f15b7cd8d62 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 2017-04-19 19:06:28 UTC +--- chrome/BUILD.gn.orig 2017-06-05 19:03:01 UTC +++ chrome/BUILD.gn -@@ -142,7 +142,7 @@ if (!is_android && !is_mac) { +@@ -143,7 +143,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", -@@ -223,7 +223,7 @@ if (!is_android && !is_mac) { +@@ -225,7 +225,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", -@@ -1647,7 +1647,7 @@ if (enable_resource_whitelist_generation +@@ -1655,7 +1655,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 804bba997477..e18cc4fc4e8d 100644 --- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,6 +1,6 @@ ---- chrome/app/chrome_command_ids.h.orig 2017-04-19 19:06:28 UTC +--- chrome/app/chrome_command_ids.h.orig 2017-06-05 19:03:01 UTC +++ chrome/app/chrome_command_ids.h -@@ -71,7 +71,7 @@ +@@ -67,7 +67,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.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index a3195d190da7..50542f52cbce 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main.cc.orig 2017-05-09 19:02:41 UTC +--- chrome/app/chrome_main.cc.orig 2017-06-05 19:03:01 UTC +++ chrome/app/chrome_main.cc -@@ -97,14 +97,14 @@ int ChromeMain(int argc, const char** ar +@@ -97,14 +97,14 @@ int ChromeMain(int argc, const char** argv) { ALLOW_UNUSED_LOCAL(command_line); #endif @@ -15,5 +15,5 @@ -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) + #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) version_info::Channel channel = chrome::GetChannel(); 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 80cc63aa457c..34838cfa256c 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2017-04-19 19:06:28 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2017-06-05 19:03:01 UTC +++ chrome/app/chrome_main_delegate.cc @@ -89,7 +89,7 @@ #include "chrome/app/chrome_crash_reporter_client.h" @@ -23,8 +23,8 @@ #include "base/environment.h" #endif -@@ -163,7 +163,7 @@ base::LazyInstance<ChromeContentBrowserC - LAZY_INSTANCE_INITIALIZER; +@@ -164,7 +164,7 @@ base::LazyInstance<ChromeContentBrowserClient>::Destru + g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER; #endif -#if defined(OS_POSIX) @@ -32,7 +32,7 @@ base::LazyInstance<ChromeCrashReporterClient>::Leaky g_chrome_crash_client = LAZY_INSTANCE_INITIALIZER; #endif -@@ -280,7 +280,7 @@ static void AdjustLinuxOOMScore(const st +@@ -284,7 +284,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -41,7 +41,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -332,7 +332,7 @@ void HandleHelpSwitches(const base::Comm +@@ -336,7 +336,7 @@ void HandleHelpSwitches(const base::CommandLine& comma } #endif @@ -50,7 +50,7 @@ void SIGTERMProfilingShutdown(int signal) { Profiling::Stop(); struct sigaction sigact; -@@ -399,7 +399,7 @@ void InitializeUserDataDir(base::Command +@@ -403,7 +403,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -59,7 +59,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -592,7 +592,7 @@ bool ChromeMainDelegate::BasicStartupCom +@@ -596,7 +596,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -68,7 +68,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -642,7 +642,7 @@ bool ChromeMainDelegate::BasicStartupCom +@@ -646,7 +646,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -77,7 +77,7 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -754,7 +754,7 @@ void ChromeMainDelegate::PreSandboxStart +@@ -758,7 +758,7 @@ void ChromeMainDelegate::PreSandboxStartup() { std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -86,7 +86,7 @@ crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); #endif -@@ -884,7 +884,7 @@ void ChromeMainDelegate::PreSandboxStart +@@ -888,7 +888,7 @@ void ChromeMainDelegate::PreSandboxStartup() { chrome::InitializePDF(); #endif @@ -95,7 +95,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -899,7 +899,7 @@ void ChromeMainDelegate::PreSandboxStart +@@ -903,7 +903,7 @@ void ChromeMainDelegate::PreSandboxStartup() { breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -104,7 +104,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -1005,7 +1005,7 @@ bool ChromeMainDelegate::DelaySandboxIni +@@ -1009,7 +1009,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization( #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 0d28e5dde319..b228ed3e49d3 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 2017-04-19 19:06:28 UTC +--- chrome/app/chrome_main_delegate.h.orig 2017-06-05 19:03:01 UTC +++ chrome/app/chrome_main_delegate.h -@@ -42,7 +42,7 @@ class ChromeMainDelegate : public conten +@@ -42,7 +42,7 @@ class ChromeMainDelegate : public content::ContentMain 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 9982377229a0..9bff618297a0 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 2017-04-19 19:06:28 UTC +--- chrome/app/chromium_strings.grd.orig 2017-06-05 19:03:01 UTC +++ chrome/app/chromium_strings.grd -@@ -891,7 +891,7 @@ Signing in anyway will merge Chromium in +@@ -886,7 +886,7 @@ Signing in anyway will merge Chromium information like </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 0cb8a466abf0..3ef8cb8f9bd5 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,15 +1,6 @@ ---- chrome/app/generated_resources.grd.orig 2017-04-19 19:06:28 UTC +--- chrome/app/generated_resources.grd.orig 2017-06-05 19:03:01 UTC +++ chrome/app/generated_resources.grd -@@ -6535,7 +6535,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> -- <if expr="is_win or is_linux"> -+ <if expr="is_win or is_linux or is_bsd"> - <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> -@@ -9629,7 +9629,7 @@ I don't think this site should be blocke +@@ -8084,7 +8084,7 @@ I don't think this site should be blocked! <message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group"> Appearance </message> @@ -18,7 +9,7 @@ <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group"> Themes </message> -@@ -9637,7 +9637,7 @@ I don't think this site should be blocke +@@ -8092,7 +8092,7 @@ I don't think this site should be blocked! <message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme"> Reset to default theme </message> @@ -27,7 +18,7 @@ <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme."> Use GTK+ theme </message> -@@ -10903,7 +10903,7 @@ Tell us what happened exactly before you +@@ -9347,7 +9347,7 @@ Tell us what happened exactly before you got the profi Set as default </message> diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd index 28c90998e4b4..779dc37c8493 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2017-04-19 19:06:28 UTC +--- chrome/app/google_chrome_strings.grd.orig 2017-06-05 19:03:01 UTC +++ chrome/app/google_chrome_strings.grd -@@ -892,7 +892,7 @@ Signing in anyway will merge Chrome info +@@ -887,7 +887,7 @@ Signing in anyway will merge Chrome information like b </message> <!-- ProcessSingleton --> diff --git a/www/chromium/files/patch-chrome_app_mash_mash__runner.cc b/www/chromium/files/patch-chrome_app_mash_mash__runner.cc index 29251db2112a..f548004d682e 100644 --- a/www/chromium/files/patch-chrome_app_mash_mash__runner.cc +++ b/www/chromium/files/patch-chrome_app_mash_mash__runner.cc @@ -1,6 +1,6 @@ ---- chrome/app/mash/mash_runner.cc.orig 2017-04-19 19:06:28 UTC +--- chrome/app/mash/mash_runner.cc.orig 2017-06-05 19:03:01 UTC +++ chrome/app/mash/mash_runner.cc -@@ -263,7 +263,7 @@ int MashMain() { +@@ -302,7 +302,7 @@ int MashMain() { // TODO(sky): wire this up correctly. service_manager::InitializeLogging(); diff --git a/www/chromium/files/patch-chrome_app_resources_locale__settings.grd b/www/chromium/files/patch-chrome_app_resources_locale__settings.grd deleted file mode 100644 index 367c458bb099..000000000000 --- a/www/chromium/files/patch-chrome_app_resources_locale__settings.grd +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/app/resources/locale_settings.grd.orig 2017-04-19 19:06:29 UTC -+++ chrome/app/resources/locale_settings.grd -@@ -151,7 +151,7 @@ - 55 - </message> - -- <if expr="is_win or is_linux or chromeos"> -+ <if expr="is_win or is_linux or chromeos or is_bsd"> - <!-- The width of the ash/ChromeOS system tray menu in pixels. --> - <message name="IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS" use_name_for_id="true"> - 300 diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index 8a79a339e266..af278e84813f 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2017-04-19 19:06:29 UTC +--- chrome/app/settings_strings.grdp.orig 2017-06-05 19:03:01 UTC +++ chrome/app/settings_strings.grdp -@@ -240,7 +240,7 @@ +@@ -278,7 +278,7 @@ <message name="IDS_SETTINGS_THEMES" desc="Name of the control which allows the user to get a theme for the browser."> Themes </message> @@ -9,7 +9,7 @@ <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux"> GTK+ </message> -@@ -254,7 +254,7 @@ +@@ -292,7 +292,7 @@ Use Classic </message> </if> diff --git a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc index ed25b0f4cac3..92e2227dce8e 100644 --- a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc +++ b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc @@ -1,4 +1,4 @@ ---- chrome/app/shutdown_signal_handlers_posix.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/app/shutdown_signal_handlers_posix.cc.orig 2017-06-05 19:03:01 UTC +++ chrome/app/shutdown_signal_handlers_posix.cc @@ -183,6 +183,11 @@ void InstallShutdownSignalHandlers( g_pipe_pid = getpid(); @@ -12,11 +12,11 @@ #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS) const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; #else -@@ -191,6 +196,7 @@ void InstallShutdownSignalHandlers( +@@ -190,6 +195,7 @@ void InstallShutdownSignalHandlers( + // shadow stacks) bloat the stack frames, so we need to increase the stack // size to avoid hitting the guard page. const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; - #endif +#endif + #endif ShutdownDetector* detector = new ShutdownDetector( g_shutdown_pipe_read_fd, shutdown_callback, task_runner); - // PlatformThread does not delete its delegate. diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 5d12d9948e31..a7d89d1e2977 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 2017-04-19 19:06:29 UTC -+++ chrome/browser/BUILD.gn -@@ -2219,7 +2219,7 @@ split_static_library("browser") { +--- chrome/browser/BUILD.gn.orig 2017-06-15 21:03:01.000000000 +0200 ++++ chrome/browser/BUILD.gn 2017-06-18 05:06:25.091310000 +0200 +@@ -2296,7 +2296,7 @@ deps += [ "//device/udev_linux" ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/speech-dispatcher" ] } -@@ -3606,7 +3606,7 @@ split_static_library("browser") { +@@ -3721,7 +3721,7 @@ } } @@ -18,3 +18,21 @@ if (use_aura) { deps += [ "//build/linux:fontconfig" ] if (use_dbus) { +@@ -3734,7 +3734,7 @@ + } + } + +- if (is_linux || is_win || is_mac) { ++ if (is_linux || is_win || is_mac || is_bsd) { + sources += [ + "payments/chrome_payment_request_delegate.cc", + "payments/chrome_payment_request_delegate.h", +@@ -3744,7 +3744,7 @@ + deps += [ "//components/payments/content" ] + } + +- if (is_linux || is_win) { ++ if (is_linux || is_win || is_bsd) { + sources += [ + "renderer_context_menu/spelling_options_submenu_observer.cc", + "renderer_context_menu/spelling_options_submenu_observer.h", diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 9a4ca2ae1c84..f781c07ce9e3 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,34 +1,32 @@ ---- chrome/browser/about_flags.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/about_flags.cc.orig 2017-06-05 19:03:01 UTC +++ chrome/browser/about_flags.cc -@@ -856,7 +856,7 @@ const FeatureEntry kFeatureEntries[] = { - kOsLinux | kOsCrOS | kOsWin | kOsAndroid, - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling, - switches::kDisableSmoothScrolling)}, --#if defined(USE_AURA) || defined(OS_LINUX) -+#if defined(USE_AURA) || defined(OS_LINUX) || defined(OS_BSD) - {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME, - IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION, - // Uses the system preference on Mac (a different implementation). -@@ -1374,11 +1374,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1588,12 +1588,12 @@ const FeatureEntry kFeatureEntries[] = { ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, switches::kDisableTranslateNewUX)}, #endif // OS_MACOSX -#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD) - {"translate-2016q2-ui", IDS_FLAGS_TRANSLATE_2016Q2_UI_NAME, - IDS_FLAGS_TRANSLATE_2016Q2_UI_DESCRIPTION, kOsCrOS | kOsWin | kOsLinux, + {"translate-2016q2-ui", flag_descriptions::kTranslate2016q2UiName, + flag_descriptions::kTranslate2016q2UiDescription, + kOsCrOS | kOsWin | kOsLinux, FEATURE_VALUE_TYPE(translate::kTranslateUI2016Q2)}, -#endif // OS_LINUX || OS_WIN || OS_CHROMEOS +#endif // OS_LINUX || OS_WIN || OS_CHROMEOS || OS_BSD - {"translate-lang-by-ulp", IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_NAME, - IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_DESCRIPTION, kOsAll, + {"translate-lang-by-ulp", flag_descriptions::kTranslateLanguageByUlpName, + flag_descriptions::kTranslateLanguageByUlpDescription, kOsAll, FEATURE_VALUE_TYPE(translate::kTranslateLanguageByULP)}, -@@ -1802,7 +1802,7 @@ const FeatureEntry kFeatureEntries[] = { - IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop, +@@ -2071,12 +2071,12 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableMaterialDesignExtensionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)}, #endif // ENABLE_EXTENSIONS -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - {"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME, - IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, kOsWin | kOsLinux, + {"enable-input-ime-api", flag_descriptions::kEnableInputImeApiName, + flag_descriptions::kEnableInputImeApiDescription, kOsWin | kOsLinux, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, + switches::kDisableInputImeAPI)}, +-#endif // OS_WIN || OS_LINUX ++#endif // OS_WIN || OS_LINUX || OS_BSD + {"enable-origin-trials", flag_descriptions::kOriginTrialsName, + flag_descriptions::kOriginTrialsDescription, kOsAll, + FEATURE_VALUE_TYPE(features::kOriginTrials)}, diff --git a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc index 809ef024c745..06f200bab0a7 100644 --- a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,6 +1,6 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2017-05-02 19:02:47 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2017-06-05 19:03:01 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -93,7 +93,7 @@ void QueueTask(std::unique_ptr<AfterStar +@@ -99,7 +99,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); 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 b5a9b406b9b6..518fe761c057 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/browser_process_impl.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/browser_process_impl.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/browser_process_impl.cc @@ -171,7 +171,7 @@ #include "chrome/browser/media/webrtc/webrtc_log_uploader.h" @@ -9,7 +9,7 @@ #include "chrome/browser/memory/tab_manager.h" #endif -@@ -789,7 +789,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_ +@@ -810,7 +810,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_driver() { 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 aab065842384..3e96886b6a57 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 2017-04-19 19:06:29 UTC +--- chrome/browser/browser_process_impl.h.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/browser_process_impl.h -@@ -342,7 +342,7 @@ class BrowserProcessImpl : public Browse +@@ -343,7 +343,7 @@ class BrowserProcessImpl : public BrowserProcess, std::unique_ptr<ChromeDeviceClient> device_client_; diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index 979666f08c0c..94932ffe67fa 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/browser_resources.grd.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/browser_resources.grd.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/browser_resources.grd -@@ -383,7 +383,7 @@ +@@ -404,7 +404,7 @@ <include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesearch.js" type="BINDATA" /> <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" /> </if> 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 793212ae4929..71825275763a 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,7 +1,7 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -181,7 +181,7 @@ - #include "chrome/browser/lifetime/application_lifetime.h" +@@ -183,7 +183,7 @@ + #include "chrome/browser/feedback/feedback_profile_observer.h" #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #include "chrome/browser/first_run/upgrade_util_linux.h" #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -@@ -276,7 +276,7 @@ +@@ -274,7 +274,7 @@ #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -18,20 +18,19 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #endif -@@ -479,10 +479,10 @@ void RegisterComponentsForUpdate() { +@@ -477,9 +477,9 @@ void RegisterComponentsForUpdate() { #if !defined(OS_ANDROID) RegisterPepperFlashComponent(cus); -#if !defined(OS_CHROMEOS) +#if !defined(OS_CHROMEOS) && !defined(OS_BSD) - RegisterSwiftShaderComponent(cus); RegisterWidevineCdmComponent(cus); -#endif // !defined(OS_CHROMEOS) +#endif // !defined(OS_CHROMEOS) && !defined(OS_BSD) #endif // !defined(OS_ANDROID) #if !defined(DISABLE_NACL) && !defined(OS_ANDROID) -@@ -764,7 +764,7 @@ void ChromeBrowserMainParts::SetupFieldT +@@ -761,7 +761,7 @@ void ChromeBrowserMainParts::SetupFieldTrials() { field_trial_synchronizer_ = new FieldTrialSynchronizer(); #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -39,8 +38,8 @@ + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) metrics::DesktopSessionDurationTracker::Initialize(); #endif - -@@ -1194,11 +1194,11 @@ int ChromeBrowserMainParts::PreCreateThr + metrics::RendererUptimeTracker::Initialize(); +@@ -1191,11 +1191,11 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) @@ -54,7 +53,7 @@ // Initialize tracking synchronizer system. tracking_synchronizer_ = new metrics::TrackingSynchronizer( -@@ -1387,7 +1387,7 @@ void ChromeBrowserMainParts::PreBrowserS +@@ -1374,7 +1374,7 @@ void ChromeBrowserMainParts::PreBrowserStart() { // Start the tab manager here so that we give the most amount of time for the // other services to start up before we start adjusting the oom priority. diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index 0cbc57b8466a..4f69e8b88b40 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 2017-04-19 19:06:29 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -77,12 +77,14 @@ void ChromeBrowserMainPartsLinux::PrePro +@@ -77,12 +77,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { void ChromeBrowserMainPartsLinux::PostProfileInit() { ChromeBrowserMainPartsPosix::PostProfileInit(); @@ -16,7 +16,7 @@ bluez::DBusThreadManagerLinux::Initialize(); bluez::BluezDBusManager::Initialize( bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false); -@@ -92,7 +94,7 @@ void ChromeBrowserMainPartsLinux::PostMa +@@ -92,7 +94,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS } 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 ee7a9e57bb2d..39a217d83346 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 2017-04-19 19:06:29 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -134,7 +134,7 @@ void ChromeBrowserMainPartsPosix::PostMa +@@ -134,7 +134,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() { #if defined(OS_CHROMEOS) NOTREACHED(); // Should not ever happen on ChromeOS. 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 5afc8b648405..eb8e8ff12cdf 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,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2017-04-19 19:06:29 UTC -+++ chrome/browser/chrome_content_browser_client.cc -@@ -244,7 +244,7 @@ +--- chrome/browser/chrome_content_browser_client.cc.orig 2017-06-15 21:03:01.000000000 +0200 ++++ chrome/browser/chrome_content_browser_client.cc 2017-06-18 04:59:41.793684000 +0200 +@@ -249,7 +249,7 @@ #include "mash/public/interfaces/launchable.mojom.h" #include "services/service_manager/public/cpp/interface_factory.h" #include "services/service_manager/public/interfaces/interface_provider_spec.mojom.h" @@ -9,16 +9,16 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "chrome/browser/android/app_hooks.h" -@@ -265,7 +265,7 @@ +@@ -266,7 +266,7 @@ + #include "chrome/browser/payments/payment_request_factory.h" + #endif + +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) #include "chrome/browser/webshare/share_service_impl.h" #endif --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - #include "base/debug/leak_annotations.h" - #include "components/crash/content/app/breakpad_linux.h" - #include "components/crash/content/browser/crash_handler_host_linux.h" -@@ -289,7 +289,7 @@ +@@ -294,7 +294,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 -@@ -700,7 +700,7 @@ bool CertMatchesFilter(const net::X509Ce +@@ -711,7 +711,7 @@ return false; } @@ -36,7 +36,16 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -1023,7 +1023,7 @@ content::BrowserMainParts* ChromeContent +@@ -761,7 +761,7 @@ + + return -1; + } +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + void SetApplicationLocaleOnIOThread(const std::string& locale) { + DCHECK_CURRENTLY_ON(BrowserThread::IO); +@@ -1038,7 +1038,7 @@ main_parts = new ChromeBrowserMainPartsMac(parameters); #elif defined(OS_CHROMEOS) main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters); @@ -45,7 +54,7 @@ main_parts = new ChromeBrowserMainPartsLinux(parameters); #elif defined(OS_ANDROID) main_parts = new ChromeBrowserMainPartsAndroid(parameters); -@@ -1039,7 +1039,7 @@ content::BrowserMainParts* ChromeContent +@@ -1054,7 +1054,7 @@ // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -54,7 +63,7 @@ main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1680,7 +1680,7 @@ void ChromeContentBrowserClient::AppendE +@@ -1704,7 +1704,7 @@ command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -63,7 +72,7 @@ if (breakpad::IsCrashReporterEnabled()) { std::string switch_value; std::unique_ptr<metrics::ClientInfo> client_info = -@@ -2972,7 +2972,7 @@ void ChromeContentBrowserClient::GetAddi +@@ -2982,7 +2982,7 @@ } } @@ -72,7 +81,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3001,7 +3001,7 @@ void ChromeContentBrowserClient::GetAddi +@@ -3011,7 +3011,7 @@ } #endif // defined(OS_ANDROID) } @@ -81,12 +90,12 @@ #if defined(OS_WIN) base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( -@@ -3193,6 +3193,8 @@ void ChromeContentBrowserClient::Registe - base::Bind(&ForwardShareServiceRequest, - web_contents->GetJavaInterfaces()->GetWeakPtr())); +@@ -3219,7 +3219,7 @@ + } + #endif + +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + if (!ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) { + registry->AddInterface(base::Bind(&ShareServiceImpl::Create)); } -+#elif defined(OS_BSD) -+ NOTREACHED(); - #else - if (AreExperimentalWebPlatformFeaturesEnabled() && - base::FeatureList::IsEnabled(features::kWebPayments)) { 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 6767afaa862c..9cf932cc03f3 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 2017-04-19 19:06:29 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -270,12 +270,12 @@ class ChromeContentBrowserClient : publi +@@ -271,12 +271,12 @@ class ChromeContentBrowserClient : public content::Con content::RenderFrameHost* render_frame_host, blink::WebPageVisibilityState* visibility_state) override; 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 f3c2b2ca59eb..6d9ed48a481d 100644 --- a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc +++ b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/diagnostics/diagnostics_writer.cc -@@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool +@@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool success, console_->SetColor(color); console_->Write(base::ASCIIToUTF16(result)); } 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 f882fdc84433..3958b67b58f6 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 2017-04-19 19:06:29 UTC +--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/diagnostics/diagnostics_writer.h -@@ -19,7 +19,7 @@ class DiagnosticsWriter : public Diagnos +@@ -19,7 +19,7 @@ class DiagnosticsWriter : public DiagnosticsModel::Obs 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 472e818b082c..a70b608f7d18 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 2017-04-19 19:06:29 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -777,7 +777,7 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -828,7 +828,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe 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 -@@ -792,7 +792,7 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -842,7 +842,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe 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 60d885a1b817..bd4a290c0dbc 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 2017-04-19 19:06:29 UTC +--- chrome/browser/download/download_commands.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/download/download_commands.cc -@@ -219,7 +219,7 @@ bool DownloadCommands::IsCommandChecked( +@@ -219,7 +219,7 @@ bool DownloadCommands::IsCommandChecked(Command comman 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()); -@@ -263,7 +263,7 @@ void DownloadCommands::ExecuteCommand(Co +@@ -263,7 +263,7 @@ void DownloadCommands::ExecuteCommand(Command command) 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_) -@@ -376,7 +376,7 @@ Browser* DownloadCommands::GetBrowser() +@@ -376,7 +376,7 @@ Browser* DownloadCommands::GetBrowser() const { 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")); -@@ -393,7 +393,7 @@ bool DownloadCommands::CanOpenPdfInSyste +@@ -393,7 +393,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); 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 e5fa2f1199a7..2a7b8210bb2c 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/download/download_prefs.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/download/download_prefs.cc @@ -56,7 +56,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and @@ -9,7 +9,7 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -136,7 +136,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr +@@ -136,7 +136,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi GetDefaultDownloadDirectoryForProfile())); #endif // defined(OS_CHROMEOS) @@ -18,7 +18,7 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -213,7 +213,7 @@ void DownloadPrefs::RegisterProfilePrefs +@@ -213,7 +213,7 @@ void DownloadPrefs::RegisterProfilePrefs( default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); @@ -27,7 +27,7 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif } -@@ -290,7 +290,7 @@ bool DownloadPrefs::IsDownloadPathManage +@@ -290,7 +290,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { } bool DownloadPrefs::IsAutoOpenUsed() const { @@ -36,7 +36,7 @@ if (ShouldOpenPdfInSystemReader()) return true; #endif -@@ -304,7 +304,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBas +@@ -304,7 +304,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); @@ -45,7 +45,7 @@ if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader()) return true; #endif -@@ -338,7 +338,7 @@ void DownloadPrefs::DisableAutoOpenBased +@@ -338,7 +338,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension( SaveAutoOpenState(); } @@ -54,7 +54,7 @@ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -359,7 +359,7 @@ bool DownloadPrefs::ShouldOpenPdfInSyste +@@ -359,7 +359,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons #endif void DownloadPrefs::ResetAutoOpen() { 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 e06e08c55e23..d8d342fddee0 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 2017-04-19 19:06:29 UTC +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/download/download_shelf_context_menu.cc -@@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu: +@@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; break; } diff --git a/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc b/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc index 63c55461db09..01d364277b4f 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_status_updater.cc.orig 2017-05-02 19:02:47 UTC +--- chrome/browser/download/download_status_updater.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/download/download_status_updater.cc @@ -13,7 +13,7 @@ #include "base/memory/ptr_util.h" @@ -9,7 +9,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUp +@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUpdated( #if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_WIN)) void DownloadStatusUpdater::UpdateAppIconDownloadProgress( content::DownloadItem* download) { diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index c929a836848c..9bee1e493bc8 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 2017-05-02 19:02:47 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1040,7 +1040,7 @@ static_library("extensions") { +@@ -1033,7 +1033,7 @@ static_library("extensions") { sources -= [ "global_shortcut_listener_ozone.cc" ] } @@ -9,7 +9,7 @@ deps += [ "//build/linux:fontconfig" ] if (use_dbus) { -@@ -1100,7 +1100,7 @@ static_library("extensions") { +@@ -1095,7 +1095,7 @@ static_library("extensions") { ] } @@ -18,16 +18,16 @@ sources += [ "api/input_ime/input_ime_api.cc", "api/input_ime/input_ime_api.h", -@@ -1133,6 +1133,12 @@ static_library("extensions") { - defines += [ "ENABLE_HOTWORDING" ] - } +@@ -1126,6 +1126,12 @@ static_library("extensions") { + if (enable_hotwording) { + defines += [ "ENABLE_HOTWORDING" ] ++ } ++ + if (is_bsd) { + sources -= [ + "api/image_writer_private/removable_storage_provider_linux.cc", + ] -+ } -+ + } + if (enable_service_discovery) { - sources += [ - "api/mdns/dns_sd_delegate.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 7de12bcb95d0..6e77c6f548b7 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,6 +1,6 @@ ---- chrome/browser/extensions/activity_log/activity_log.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc -@@ -48,7 +48,11 @@ +@@ -50,7 +50,11 @@ #include "extensions/common/extension.h" #include "extensions/common/extension_messages.h" #include "extensions/common/one_shot_event.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 ea797b94f446..47e9a49d5fc9 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,6 +1,6 @@ ---- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc -@@ -167,10 +167,12 @@ ImageWriterPrivateListRemovableStorageDe +@@ -167,10 +167,12 @@ ImageWriterPrivateListRemovableStorageDevicesFunction: } bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunAsync() { 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 03706ca1408a..88c496d7db78 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 2017-04-19 19:06:29 UTC +--- chrome/browser/extensions/api/messaging/message_service.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/extensions/api/messaging/message_service.cc -@@ -106,7 +106,7 @@ MessageService::PolicyPermission Message +@@ -105,7 +105,7 @@ MessageService::PolicyPermission MessageService::IsNat 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[] = -@@ -383,7 +383,7 @@ void MessageService::OpenChannelToNative +@@ -383,7 +383,7 @@ void MessageService::OpenChannelToNativeApp( if (!source) return; @@ -18,7 +18,7 @@ content::WebContents* web_contents = content::WebContents::FromRenderFrameHost(source); ExtensionWebContentsObserver* extension_web_contents_observer = -@@ -446,12 +446,12 @@ void MessageService::OpenChannelToNative +@@ -446,12 +446,12 @@ void MessageService::OpenChannelToNativeApp( channel->opener->IncrementLazyKeepaliveCount(); AddChannel(std::move(channel), receiver_port_id); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 9c87dd54d20a..05b8bfc46428 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -83,7 +83,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -84,7 +84,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist settings_private::PrefType::PREF_TYPE_BOOLEAN; (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] = settings_private::PrefType::PREF_TYPE_BOOLEAN; @@ -9,7 +9,7 @@ (*s_whitelist)[::prefs::kUseCustomChromeFrame] = settings_private::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -93,7 +93,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -94,7 +94,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist // Appearance settings. (*s_whitelist)[::prefs::kCurrentThemeID] = settings_private::PrefType::PREF_TYPE_STRING; diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__audio__private_webrtc__audio__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__audio__private_webrtc__audio__private__api.cc new file mode 100644 index 000000000000..10bbfa51cfa9 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__audio__private_webrtc__audio__private__api.cc @@ -0,0 +1,13 @@ +--- chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc.orig 2017-06-05 19:03:02 UTC ++++ chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc +@@ -563,7 +563,10 @@ bool WebrtcAudioPrivateSetAudioExperimentsFunction::Ru + return false; + } + ++#if BUILDFLAG(ENABLE_WEBRTC) ++ // To workaround side effect of having 'enable_webrtc=false' + host->SetEchoCanceller3(*params->audio_experiments.enable_aec3); ++#endif + } + + SendResponse(true); 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 9a5eb095cbb4..59f781693e6f 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 2017-04-19 19:06:29 UTC +--- chrome/browser/extensions/bookmark_app_helper.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/extensions/bookmark_app_helper.cc -@@ -721,7 +721,7 @@ void BookmarkAppHelper::FinishInstallati +@@ -721,7 +721,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten #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 48760247711e..b8487ad434b4 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,4 +1,4 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2017-05-02 19:02:47 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc @@ -63,7 +63,7 @@ #include "chrome/browser/chromeos/extensions/media_player_api.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -107,7 +107,7 @@ void EnsureBrowserContextKeyedServiceFac +@@ -107,7 +107,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() #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 253b102ee206..f9b8ba323f33 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,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -638,7 +638,7 @@ void ExternalProviderImpl::CreateExterna +@@ -655,7 +655,7 @@ void ExternalProviderImpl::CreateExternalProviders( Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD, oem_extension_creation_flags)); } @@ -9,7 +9,7 @@ if (!profile->IsLegacySupervised()) { provider_list->push_back(base::MakeUnique<ExternalProviderImpl>( service, -@@ -664,7 +664,7 @@ void ExternalProviderImpl::CreateExterna +@@ -681,7 +681,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc new file mode 100644 index 000000000000..08734e1c5d76 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -0,0 +1,19 @@ +--- chrome/browser/flag_descriptions.cc.orig 2017-06-05 19:03:02 UTC ++++ chrome/browser/flag_descriptions.cc +@@ -1598,14 +1598,14 @@ const char kForceUiDirectionLtr[] = "Left-to-right"; + + const char kForceUiDirectionRtl[] = "Right-to-left"; + +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + + const char kEnableInputImeApiName[] = "Enable Input IME API"; + + const char kEnableInputImeApiDescription[] = + "Enable the use of chrome.input.ime API."; + +-#endif // defined(OS_WIN) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + + const char kEnableGroupedHistoryName[] = "Group history by domain"; + diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h new file mode 100644 index 000000000000..ad0807412561 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -0,0 +1,20 @@ +--- chrome/browser/flag_descriptions.h.orig 2017-06-05 19:03:02 UTC ++++ chrome/browser/flag_descriptions.h +@@ -1754,7 +1754,7 @@ extern const char kForceUiDirectionLtr[]; + // Name for the option to force right-to-left UI direction mode. + extern const char kForceUiDirectionRtl[]; + +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + + // Name of the flag to enable che chrome.input.ime API. + extern const char kEnableInputImeApiName[]; +@@ -1762,7 +1762,7 @@ extern const char kEnableInputImeApiName[]; + // Description of the flag to enable the chrome.input.ime API. + extern const char kEnableInputImeApiDescription[]; + +-#endif // defined(OS_WIN) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + + // Enables grouping websites by domain on chrome://history. + extern const char kEnableGroupedHistoryName[]; 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 0a8e0dd378e4..a2aca14337cb 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,6 +1,6 @@ ---- chrome/browser/interstitials/chrome_controller_client.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/interstitials/chrome_controller_client.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/interstitials/chrome_controller_client.cc -@@ -46,7 +46,7 @@ void LaunchDateAndTimeSettingsOnFileThre +@@ -46,7 +46,7 @@ void LaunchDateAndTimeSettingsOnFileThread() { #if defined(OS_ANDROID) chrome::android::OpenDateAndTimeSettings(); @@ -9,7 +9,7 @@ struct ClockCommand { const char* const pathname; const char* const argument; -@@ -131,7 +131,7 @@ ChromeControllerClient::~ChromeControlle +@@ -131,7 +131,7 @@ ChromeControllerClient::~ChromeControllerClient() {} 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 b768a3c18f5c..f12c6abe6d66 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,6 +1,6 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc -@@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFil +@@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( // Note that this initializes the delegate asynchronously, but since // the delegate will only be used from the IO thread, it is guaranteed // to be created before use of it expects it to be there. 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 0806713aab5b..b222bbb0bdac 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 2017-04-19 19:06:29 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -758,7 +758,10 @@ class MediaFileSystemRegistry::MediaFile +@@ -758,7 +758,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // 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_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index 760e08c52aed..0ff492b40442 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,4 +1,4 @@ ---- chrome/browser/memory_details.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/memory_details.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/memory_details.cc @@ -35,7 +35,7 @@ #include "extensions/features/features.h" @@ -9,7 +9,7 @@ #include "content/public/browser/zygote_host_linux.h" #endif -@@ -337,7 +337,7 @@ void MemoryDetails::CollectChildInfoOnUI +@@ -344,7 +344,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { process.titles.push_back(title); } diff --git a/www/chromium/files/patch-chrome_browser_memory__details__linux.cc b/www/chromium/files/patch-chrome_browser_memory__details__linux.cc new file mode 100644 index 000000000000..e7bc28cd3b78 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_memory__details__linux.cc @@ -0,0 +1,14 @@ +--- chrome/browser/memory_details_linux.cc.orig 2017-06-05 19:03:02 UTC ++++ chrome/browser/memory_details_linux.cc +@@ -71,9 +71,10 @@ ProcessData GetProcessDataMemoryInformation( + std::unique_ptr<base::ProcessMetrics> metrics( + base::ProcessMetrics::CreateProcessMetrics(pid)); + metrics->GetWorkingSetKBytes(&pmi.working_set); ++#if !defined(OS_BSD) + pmi.num_open_fds = metrics->GetOpenFdCount(); + pmi.open_fds_soft_limit = metrics->GetOpenFdSoftLimit(); +- ++#endif + process_data.processes.push_back(pmi); + } + return process_data; 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 ddb052046e13..643b452c56cf 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 2017-04-19 19:06:29 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -42,12 +42,14 @@ +@@ -39,12 +39,14 @@ #if defined(OS_LINUX) && !defined(OS_CHROMEOS) #include <gnu/libc-version.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 d3bfbb0e9470..28e794fa6eb1 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 2017-04-19 19:06:29 UTC +--- chrome/browser/net/async_dns_field_trial.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/net/async_dns_field_trial.cc -@@ -61,7 +61,7 @@ void HistogramPrefSource(PrefSource sour +@@ -61,7 +61,7 @@ void HistogramPrefSource(PrefSource source, bool enabl } // 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 d96e823d99d0..8ab783c9e90e 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,6 +1,6 @@ ---- chrome/browser/notifications/message_center_notification_manager.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/notifications/message_center_notification_manager.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/notifications/message_center_notification_manager.cc -@@ -63,7 +63,7 @@ MessageCenterNotificationManager::Messag +@@ -62,7 +62,7 @@ MessageCenterNotificationManager::MessageCenterNotific base::MakeUnique<FullscreenNotificationBlocker>(message_center)); #if defined(OS_WIN) || defined(OS_MACOSX) \ 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 beef5efc4513..2f74947dfa9e 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,14 +1,14 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -62,7 +62,11 @@ +@@ -63,7 +63,11 @@ + #include "extensions/features/features.h" + #include "google_apis/gaia/gaia_urls.h" #include "net/base/url_util.h" - #include "net/http/transport_security_state.h" - #include "net/url_request/url_request_context.h" +#if defined(OS_BSD) +#include <re2/re2.h> +#else #include "third_party/re2/src/re2/re2.h" +#endif - #if defined(OS_ANDROID) - #include "chrome/browser/android/tab_android.h" + #if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE) + #include "chrome/browser/browser_process.h" 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 713560d6b343..fd931902f164 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,9 +1,9 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/plugins/plugins_resource_service.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/plugins/plugins_resource_service.cc -@@ -31,7 +31,7 @@ GURL GetPluginsServerURL() { - std::string filename; - #if defined(OS_WIN) +@@ -59,7 +59,7 @@ GURL GetPluginsServerURL() { filename = "plugins_win.json"; + #elif defined(OS_CHROMEOS) + filename = "plugins_chromeos.json"; -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) filename = "plugins_linux.json"; 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 1b61eb9a6382..02457cbf914e 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 2017-04-19 19:06:29 UTC +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/policy/policy_prefs_browsertest.cc -@@ -180,6 +180,8 @@ class PolicyTestCase { +@@ -181,6 +181,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 f6752e3b9774..91f3b0a5351f 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,4 +1,4 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/process_singleton_posix.cc @@ -93,11 +93,11 @@ #include "net/base/network_interfaces.h" @@ -14,7 +14,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -321,7 +321,7 @@ bool DisplayProfileInUseError(const base +@@ -322,7 +322,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo 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); -@@ -855,7 +855,7 @@ ProcessSingleton::NotifyResult ProcessSi +@@ -866,7 +866,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif // 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 index ab79228c1947..eaee8d6ff23d 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl_io_data.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/profiles/profile_impl_io_data.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/profiles/profile_impl_io_data.cc -@@ -103,7 +103,7 @@ net::BackendType ChooseCacheBackendType( +@@ -100,7 +100,7 @@ net::BackendType ChooseCacheBackendType() { } #endif // #if !defined(OS_ANDROID) 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 139aab791594..18dfbfec1b3f 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 2017-04-19 19:06:29 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1390,7 +1390,7 @@ void RenderViewContextMenu::AppendEditab +@@ -1376,7 +1376,7 @@ void RenderViewContextMenu::AppendEditableItems() { // '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, -@@ -1428,7 +1428,7 @@ void RenderViewContextMenu::AppendLangua +@@ -1414,7 +1414,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { if (!use_spelling) return; @@ -18,7 +18,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); #else -@@ -1666,7 +1666,7 @@ bool RenderViewContextMenu::IsCommandIdE +@@ -1648,7 +1648,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) 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 e7ba7369bb9d..7f72ec7b56ee 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2017-04-19 19:06:29 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/renderer_preferences_util.cc @@ -20,7 +20,7 @@ #include "third_party/WebKit/public/public_features.h" @@ -18,7 +18,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -134,7 +134,7 @@ void UpdateFromSystemSettings(content::R +@@ -134,7 +134,7 @@ void UpdateFromSystemSettings(content::RendererPrefere prefs->caret_blink_interval = interval.InSecondsF(); #endif @@ -27,7 +27,7 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -156,7 +156,7 @@ void UpdateFromSystemSettings(content::R +@@ -156,7 +156,7 @@ void UpdateFromSystemSettings(content::RendererPrefere } #endif 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 45859bff41f8..d63c069e1058 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,4 +1,4 @@ ---- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2017-06-05 19:03:02 UTC +++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py @@ -31,6 +31,7 @@ def PlatformTypes(): "android": download_file_types_pb2.DownloadFileType.PLATFORM_ANDROID, @@ -8,7 +8,7 @@ "mac": download_file_types_pb2.DownloadFileType.PLATFORM_MAC, "win": download_file_types_pb2.DownloadFileType.PLATFORM_WINDOWS, } -@@ -169,7 +170,7 @@ class DownloadFileTypeProtoGenerator(Bin +@@ -169,7 +170,7 @@ class DownloadFileTypeProtoGenerator(BinaryProtoGenera 'Outfile must have a %d for version and %s for platform.') parser.add_option('-t', '--type', help='The platform type. One of android, chromeos, ' + diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html new file mode 100644 index 000000000000..11fe4b5f3a78 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -0,0 +1,29 @@ +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2017-06-05 19:03:02 UTC ++++ chrome/browser/resources/settings/appearance_page/appearance_page.html +@@ -72,7 +72,7 @@ + aria-label="$i18n{themes}" + aria-describedby="themesSecondary"></button> + </div> +-<if expr="not is_linux or chromeos"> ++<if expr="not is_posix or chromeos"> + <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> + <div class="secondary-action"> + <paper-button id="useDefault" on-tap="onUseDefaultTap_" +@@ -82,7 +82,7 @@ + </div> + </template> + </if> +-<if expr="is_linux and not chromeos"> ++<if expr="is_posix and not chromeos"> + <div class="secondary-action" hidden="[[!showThemesSecondary_( + prefs.extensions.theme.id.value, useSystemTheme_)]]"> + <template is="dom-if" if="[[showUseClassic_( +@@ -150,7 +150,7 @@ + </settings-toggle-button> + </div> + <div class$="settings-box [[getFirst_(pageVisibility.bookmarksBar)]]"> +-<if expr="is_linux and not chromeos"> ++<if expr="is_posix and not chromeos"> + <settings-toggle-button class="start" + pref="{{prefs.browser.custom_chrome_frame}}" + label="$i18n{showWindowDecorations}" diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index 84cc4858abe8..b3a37b548402 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -720,7 +720,7 @@ void IncidentReportingService::OnEnviron +@@ -720,7 +720,7 @@ void IncidentReportingService::OnEnvironmentDataCollec environment_collection_pending_ = false; // CurrentProcessInfo::CreationTime() is missing on some platforms. 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 34f7084f45cf..9f2d83681516 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 2017-04-19 19:06:30 UTC +--- chrome/browser/safe_browsing/permission_reporter.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/safe_browsing/permission_reporter.cc -@@ -188,7 +188,7 @@ bool PermissionReporter::BuildReport(con +@@ -188,7 +188,7 @@ bool PermissionReporter::BuildReport(const PermissionR #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_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index fcfd327ffbe6..e519c941b718 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,8 +1,8 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -639,7 +639,7 @@ void ChromeSyncClient::RegisterDesktopDa +@@ -653,7 +653,7 @@ void ChromeSyncClient::RegisterDesktopDataTypes( } - #endif + #endif // BUILDFLAG(ENABLE_APP_LIST) -#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc index 8d63165160d3..c0fa17d035af 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/task_manager/sampling/task_group.cc @@ -28,9 +28,9 @@ const int kBackgroundRefreshTypesMask = #if defined(OS_WIN) @@ -37,7 +37,7 @@ base::Bind(&TaskGroup::OnProcessPriorityDone, weak_ptr_factory_.GetWeakPtr()))); worker_thread_sampler_.swap(sampler); -@@ -333,14 +333,14 @@ void TaskGroup::OnIdleWakeupsRefreshDone +@@ -333,14 +333,14 @@ void TaskGroup::OnIdleWakeupsRefreshDone(int idle_wake OnBackgroundRefreshTypeFinished(REFRESH_TYPE_IDLE_WAKEUPS); } diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index a53900a2ed69..8984c6713b5b 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc @@ -36,9 +36,9 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, @@ -24,7 +24,7 @@ on_process_priority_callback_(on_process_priority) { DCHECK(blocking_pool_runner.get()); -@@ -80,7 +80,7 @@ void TaskGroupSampler::Refresh(int64_t r +@@ -80,7 +80,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) on_memory_refresh_callback_); } @@ -33,7 +33,7 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS, refresh_flags)) { base::PostTaskAndReplyWithResult( -@@ -89,7 +89,7 @@ void TaskGroupSampler::Refresh(int64_t r +@@ -89,7 +89,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) base::Bind(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this), on_idle_wakeups_callback_); } diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h index cfb03a01b44a..083a3bb398d3 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.h -@@ -45,9 +45,9 @@ class TaskGroupSampler : public base::Re +@@ -45,9 +45,9 @@ class TaskGroupSampler : public base::RefCountedThread using OnCpuRefreshCallback = base::Callback<void(double)>; using OnMemoryRefreshCallback = base::Callback<void(MemoryUsageStats)>; using OnIdleWakeupsCallback = base::Callback<void(int)>; @@ -12,7 +12,7 @@ using OnProcessPriorityCallback = base::Callback<void(bool)>; TaskGroupSampler( -@@ -56,9 +56,9 @@ class TaskGroupSampler : public base::Re +@@ -56,9 +56,9 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback& on_cpu_refresh, const OnMemoryRefreshCallback& on_memory_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, @@ -24,7 +24,7 @@ const OnProcessPriorityCallback& on_process_priority); // Refreshes the expensive process' stats (CPU usage, memory usage, and idle -@@ -73,9 +73,9 @@ class TaskGroupSampler : public base::Re +@@ -73,9 +73,9 @@ class TaskGroupSampler : public base::RefCountedThread double RefreshCpuUsage(); MemoryUsageStats RefreshMemoryUsage(); int RefreshIdleWakeupsPerSecond(); @@ -36,7 +36,7 @@ bool RefreshProcessPriority(); // The process that holds the handle that we own so that we can use it for -@@ -93,9 +93,9 @@ class TaskGroupSampler : public base::Re +@@ -93,9 +93,9 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback on_cpu_refresh_callback_; const OnMemoryRefreshCallback on_memory_refresh_callback_; const OnIdleWakeupsCallback on_idle_wakeups_callback_; diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index bd8bfc45a89b..af206cbfba03 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -180,11 +180,11 @@ void TaskManagerImpl::GetUSERHandles(Tas +@@ -180,11 +180,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { 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 9c927bb94b0f..f6595eb2684f 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 2017-04-19 19:06:30 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/tracing/crash_service_uploader.cc -@@ -157,6 +157,8 @@ void TraceCrashServiceUploader::DoUpload +@@ -157,6 +157,8 @@ void TraceCrashServiceUploader::DoUploadOnFileThread( 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 cd892fb19cd7..e6fe0f7fd049 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 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/BUILD.gn.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/BUILD.gn -@@ -3135,7 +3135,7 @@ split_static_library("ui") { +@@ -3170,7 +3170,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 59c1d4f68cf5..18d80fcd4f95 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,4 +1,4 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -80,7 +80,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" @@ -9,16 +9,16 @@ #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -190,7 +190,7 @@ bool BrowserCommandController::IsReserve - if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN) - return true; +@@ -209,7 +209,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( + #endif + } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -395,7 +395,7 @@ void BrowserCommandController::ExecuteCo +@@ -413,7 +413,7 @@ void BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -27,7 +27,7 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -755,7 +755,7 @@ void BrowserCommandController::InitComma +@@ -766,7 +766,7 @@ void BrowserCommandController::InitCommandState() { 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_input__method_input__method__engine.h b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h index 9061fbec5176..7422f066c1f0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h +++ b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/input_method/input_method_engine.h.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/input_method/input_method_engine.h.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/input_method/input_method_engine.h -@@ -27,7 +27,7 @@ class InputMethodEngine : public InputMe +@@ -27,7 +27,7 @@ class InputMethodEngine : public InputMethodEngineBase // ui::IMEEngineHandlerInterface: bool IsActive() const override; 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 index 1a55f41b305b..3bf1a0a4851c 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -72,7 +72,7 @@ void ShowBadFlagsPrompt(Browser* browser +@@ -72,7 +72,7 @@ void ShowBadFlagsPrompt(Browser* browser) { // This flag gives extensions more powers. extensions::switches::kExtensionsOnChromeURLs, 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 7cf4e11b87f1..2ee47ecce2c2 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 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -96,7 +96,7 @@ +@@ -94,7 +94,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,15 +9,14 @@ #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -@@ -668,9 +668,11 @@ bool StartupBrowserCreator::ProcessCmdLi +@@ -666,8 +666,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( } #endif // OS_CHROMEOS +#if 0 /* XXX */ #if defined(TOOLKIT_VIEWS) && defined(USE_X11) ui::TouchFactory::SetTouchDeviceListFromCommandLine(); - #endif +#endif + #endif #if defined(OS_MACOSX) - if (web_app::MaybeRebuildShortcut(command_line)) diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index 38719ce500bb..f5285da6dd88 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -245,7 +245,7 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -258,7 +258,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -8,4 +8,4 @@ + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents); #endif - // --- Feature tab helpers behind flags --- + diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index a16ae9956f24..f25adb71292a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -454,13 +454,13 @@ base::string16 TaskManagerTableModel::Ge +@@ -454,13 +454,13 @@ base::string16 TaskManagerTableModel::GetText(int row, ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); @@ -16,7 +16,7 @@ case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: { return stringifier_->GetMemoryStateText( -@@ -623,7 +623,7 @@ int TaskManagerTableModel::CompareValues +@@ -623,7 +623,7 @@ int TaskManagerTableModel::CompareValues(int row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } @@ -25,7 +25,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -631,7 +631,7 @@ int TaskManagerTableModel::CompareValues +@@ -631,7 +631,7 @@ int TaskManagerTableModel::CompareValues(int row1, observed_task_manager()->GetOpenFdCount(tasks_[row2]); return ValueCompare(proc1_fd_count, proc2_fd_count); } @@ -34,7 +34,7 @@ default: NOTREACHED(); -@@ -799,11 +799,11 @@ void TaskManagerTableModel::UpdateRefres +@@ -799,11 +799,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; 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 699a8f7a660b..af1b89bc1dcd 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 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/toolbar/app_menu_model.cc -@@ -631,7 +631,7 @@ bool AppMenuModel::IsCommandIdVisible(in +@@ -619,7 +619,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) case IDC_UPGRADE_DIALOG: return browser_defaults::kShowUpgradeMenuItem && UpgradeDetector::GetInstance()->notify_upgrade(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index aeef0af5953d..3c6078b19378 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -54,7 +54,7 @@ const AcceleratorMapping kAcceleratorMap +@@ -54,7 +54,7 @@ const AcceleratorMapping kAcceleratorMap[] = { { ui::VKEY_S, kPlatformModifier, IDC_SAVE_PAGE }, { ui::VKEY_9, kPlatformModifier, IDC_SELECT_LAST_TAB }, { ui::VKEY_NUMPAD9, kPlatformModifier, IDC_SELECT_LAST_TAB }, @@ -9,7 +9,7 @@ { ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, { ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, { ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT }, -@@ -84,7 +84,7 @@ const AcceleratorMapping kAcceleratorMap +@@ -84,7 +84,7 @@ const AcceleratorMapping kAcceleratorMap[] = { { ui::VKEY_NUMPAD7, kPlatformModifier, IDC_SELECT_TAB_6 }, { ui::VKEY_8, kPlatformModifier, IDC_SELECT_TAB_7 }, { ui::VKEY_NUMPAD8, kPlatformModifier, IDC_SELECT_TAB_7 }, @@ -18,7 +18,7 @@ { ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 }, { ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 }, { ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1 }, -@@ -129,7 +129,7 @@ const AcceleratorMapping kAcceleratorMap +@@ -129,7 +129,7 @@ const AcceleratorMapping kAcceleratorMap[] = { #endif // !OS_MACOSX // Platform-specific key maps. 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 bd9f35a4601a..efe8e4cbffa4 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,4 +1,4 @@ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc @@ -19,7 +19,7 @@ #include "ui/gfx/image/image_skia.h" @@ -9,7 +9,7 @@ #include "chrome/browser/shell_integration_linux.h" #endif -@@ -58,7 +58,7 @@ void ChromeNativeAppWindowViewsAura::OnB +@@ -56,7 +56,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni 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__browser__main__extra__parts__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index a121f9512615..dacfafc50635 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,23 +1,24 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -26,14 +26,14 @@ +@@ -29,7 +29,7 @@ #include "ui/wm/core/wm_state.h" #endif // defined(USE_AURA) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - #include "base/command_line.h" - #include "chrome/browser/ui/simple_message_box.h" - #include "chrome/grit/chromium_strings.h" + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> +@@ -40,7 +40,7 @@ #include "chrome/grit/generated_resources.h" #include "content/public/common/content_switches.h" #include "ui/base/l10n/l10n_util.h" -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { - } -@@ -70,7 +70,7 @@ void ChromeBrowserMainExtraPartsViews::P + #if defined(OS_CHROMEOS) + #include "chrome/browser/chromeos/ash_config.h" +@@ -99,7 +99,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( IMEDriver::Register(); #endif @@ -26,7 +27,7 @@ // On the Linux desktop, we want to prevent the user from logging in as root, // so that we don't destroy the profile. Now that we have some minimal ui // initialized, check to see if we're running as root and bail if we are. -@@ -94,7 +94,7 @@ void ChromeBrowserMainExtraPartsViews::P +@@ -130,7 +130,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( base::RunLoop().RunUntilIdle(); exit(EXIT_FAILURE); 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 365fb2f890b0..50e92b9cc78e 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 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -43,7 +43,7 @@ class ChromeViewsDelegate : public views +@@ -43,7 +43,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat HICON GetSmallWindowIcon() const override; int GetAppbarAutohideEdges(HMONITOR monitor, const base::Closure& callback) 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 5e6fab177b96..01251ed892cd 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,17 +1,17 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/views/first_run_dialog.cc @@ -40,8 +40,10 @@ using views::GridLayout; namespace { void InitCrashReporterIfEnabled(bool enabled) { -+#ifndef OS_BSD ++#if !defined(OS_BSD) if (enabled) breakpad::InitCrashReporter(std::string()); +#endif } } // namespace -@@ -121,8 +123,10 @@ views::View* FirstRunDialog::CreateExtra +@@ -120,8 +122,10 @@ views::View* FirstRunDialog::CreateExtraView() { bool FirstRunDialog::Accept() { GetWidget()->Hide(); 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 288c9c90f96e..7c36498cc1d5 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,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -38,7 +38,7 @@ #include "ui/views/window/frame_background.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -292,7 +292,7 @@ void OpaqueBrowserFrameView::ButtonPress +@@ -292,7 +292,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt 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__platform__specific.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc index 55ae538f3522..fa3b1692a1fc 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc -@@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpeci +@@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpecific::IsUsingSy 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 c7bdf78d105f..5af3208d620a 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 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -84,7 +84,7 @@ void SystemMenuModelBuilder::BuildSystem +@@ -84,7 +84,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser 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); -@@ -118,7 +118,7 @@ void SystemMenuModelBuilder::BuildSystem +@@ -118,7 +118,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo 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 index e13e94089ec8..df7ddf468159 100644 --- 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 @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc @@ -13,7 +13,7 @@ #include "components/sessions/core/tab_restore_service.h" @@ -9,7 +9,7 @@ #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" #endif -@@ -29,7 +29,7 @@ SystemMenuModelDelegate::~SystemMenuMode +@@ -29,7 +29,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() { } bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const { 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 a7c9b7d262b8..3fa0bb356b4c 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 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -251,7 +251,7 @@ void TabDragController::Init( +@@ -249,7 +249,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()); -@@ -597,7 +597,7 @@ TabDragController::DragBrowserToNewTabSt +@@ -594,7 +594,7 @@ TabDragController::DragBrowserToNewTabStrip( else target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_); @@ -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. -@@ -1787,7 +1787,7 @@ TabDragController::Liveness TabDragContr +@@ -1784,7 +1784,7 @@ TabDragController::Liveness TabDragController::GetLoca 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 f682195e002b..75ab8be52560 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,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/views/tabs/tab_strip.cc -@@ -323,7 +323,7 @@ NewTabButton::NewTabButton(TabStrip* tab +@@ -323,7 +323,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, views: tab_strip_(tab_strip), destroyed_(NULL) { set_animate_on_state_change(true); 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 812135525c57..58351d044b58 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,15 +1,41 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -76,7 +76,7 @@ - #include "chrome/browser/ui/webui/theme_source.h" - #endif +@@ -420,7 +420,7 @@ std::string ChromeURLs() { + return html; + } --#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 -@@ -644,7 +644,7 @@ class AboutDnsHandler : public base::Ref +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + const char kAboutDiscardsRunCommand[] = "run"; + +@@ -539,7 +539,7 @@ std::string AboutDiscards(const std::string& path) { + output.append(base::StringPrintf("<a href='%s%s'>Discard tab now</a>", + chrome::kChromeUIDiscardsURL, + kAboutDiscardsRunCommand)); +- ++#if !defined(OS_BSD) + base::SystemMemoryInfoKB meminfo; + base::GetSystemMemoryInfo(&meminfo); + output.append("<h3>System memory information in MB</h3>"); +@@ -551,6 +551,7 @@ std::string AboutDiscards(const std::string& path) { + "Free", + base::IntToString(base::SysInfo::AmountOfAvailablePhysicalMemory() / + 1024 / 1024))); ++#endif + #if defined(OS_CHROMEOS) + int mem_allocated_kb = meminfo.active_anon + meminfo.inactive_anon; + #if defined(ARCH_CPU_ARM_FAMILY) +@@ -580,7 +581,7 @@ std::string AboutDiscards(const std::string& path) { + return output; + } + +-#endif // OS_WIN || OS_MACOSX || OS_LINUX ++#endif // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD) + + // AboutDnsHandler bounces the request back to the IO thread to collect + // the DNS information. +@@ -642,7 +643,7 @@ class AboutDnsHandler : public base::RefCountedThreadS DISALLOW_COPY_AND_ASSIGN(AboutDnsHandler); }; @@ -18,39 +44,15 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -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)); -@@ -674,6 +675,7 @@ void AboutSandboxRow(std::string* data, - } - data->append("</td></tr>"); - } -+#endif - - std::string AboutSandbox() { - std::string data; -@@ -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(); -@@ -723,6 +726,7 @@ std::string AboutSandbox() { - data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_BAD)); - } - data.append("</p>"); -+#endif - - AppendFooter(&data); - return data; -@@ -794,7 +798,7 @@ void AboutUIHTMLSource::StartDataRequest +@@ -717,14 +718,14 @@ void AboutUIHTMLSource::StartDataRequest( + } else { + response = raw_response.as_string(); + } +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + } else if (source_name_ == chrome::kChromeUIDiscardsHost) { + response = AboutDiscards(path); + #endif } else if (source_name_ == chrome::kChromeUIDNSHost) { AboutDnsHandler::Start(profile(), callback); return; @@ -59,12 +61,3 @@ } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) { response = AboutLinuxProxyConfig(); #endif -@@ -803,7 +807,7 @@ void AboutUIHTMLSource::StartDataRequest - ChromeOSCreditsHandler::Start(path, callback); - return; - #endif --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_BSD) - } else if (source_name_ == chrome::kChromeUISandboxHost) { - response = AboutSandbox(); - #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 c9b8bc61cf19..1d6b2cb0f24c 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,15 +1,22 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2017-05-02 19:02:48 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -290,7 +290,7 @@ bool IsAboutUI(const GURL& url) { +@@ -292,13 +292,13 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) - || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost || - url.host_piece() == chrome::kChromeUISandboxHost + || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif -@@ -567,7 +567,7 @@ WebUIFactoryFunction GetWebUIFactoryFunc + #if defined(OS_CHROMEOS) + || url.host_piece() == chrome::kChromeUIOSCreditsHost + #endif +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + || url.host_piece() == chrome::kChromeUIDiscardsHost + #endif + ); // NOLINT +@@ -568,7 +568,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif 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 dbd7f1e8dc29..fd21310bb4a4 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,22 +1,22 @@ ---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.cc -@@ -608,13 +608,13 @@ void BrowserOptionsHandler::GetLocalized - { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, +@@ -592,13 +592,13 @@ void BrowserOptionsHandler::GetLocalizedValues(base::D + {"syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL}, #endif // defined(OS_CHROMEOS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) - { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, - { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, - { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, + {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, + {"themesNativeButton", IDS_THEMES_GTK_BUTTON}, + {"themesSetClassic", IDS_THEMES_SET_CLASSIC}, #else - { "themes", IDS_THEMES_GROUP_NAME }, + {"themes", IDS_THEMES_GROUP_NAME}, -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // defined(OS_POSIX) && !defined(OS_CHROMEOS) - #if defined(OS_CHROMEOS) && defined(USE_ASH) - { "setWallpaper", IDS_SET_WALLPAPER_BUTTON }, -@@ -859,7 +859,7 @@ void BrowserOptionsHandler::RegisterMess + #if defined(OS_CHROMEOS) + {"setWallpaper", IDS_SET_WALLPAPER_BUTTON}, +@@ -845,7 +845,7 @@ void BrowserOptionsHandler::RegisterMessages() { "requestProfilesInfo", base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Unretained(this))); @@ -25,7 +25,7 @@ web_ui()->RegisterMessageCallback( "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative, -@@ -1519,7 +1519,7 @@ void BrowserOptionsHandler::ObserveTheme +@@ -1505,7 +1505,7 @@ void BrowserOptionsHandler::ObserveThemeChanged() { ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); bool is_system_theme = false; @@ -34,12 +34,12 @@ bool profile_is_supervised = profile->IsSupervised(); is_system_theme = theme_service->UsingSystemTheme(); base::Value native_theme_enabled(!is_system_theme && !profile_is_supervised); -@@ -1540,7 +1540,7 @@ void BrowserOptionsHandler::ThemesReset( +@@ -1526,7 +1526,7 @@ void BrowserOptionsHandler::ThemesReset(const base::Li ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) { - content::RecordAction(UserMetricsAction("Options_GtkThemeSet")); + base::RecordAction(UserMetricsAction("Options_GtkThemeSet")); Profile* profile = Profile::FromWebUI(web_ui()); 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 4187f58bb992..41e75f795832 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 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.h -@@ -210,7 +210,7 @@ class BrowserOptionsHandler +@@ -215,7 +215,7 @@ class BrowserOptionsHandler void ObserveThemeChanged(); void ThemesReset(const base::ListValue* args); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index d8d7f6adfb1d..eb3817ae7286 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc -@@ -32,7 +32,7 @@ void AppearanceHandler::RegisterMessages +@@ -32,7 +32,7 @@ void AppearanceHandler::RegisterMessages() { "useDefaultTheme", base::Bind(&AppearanceHandler::HandleUseDefaultTheme, base::Unretained(this))); @@ -9,7 +9,7 @@ web_ui()->RegisterMessageCallback( "useSystemTheme", base::Bind(&AppearanceHandler::HandleUseSystemTheme, -@@ -50,7 +50,7 @@ void AppearanceHandler::HandleUseDefault +@@ -50,7 +50,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme(); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h index 06229fdc6666..5fa324448a86 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.h -@@ -35,7 +35,7 @@ class AppearanceHandler : public Setting +@@ -35,7 +35,7 @@ class AppearanceHandler : public SettingsPageUIHandler // Changes the UI theme of the browser to the default theme. void HandleUseDefaultTheme(const base::ListValue* args); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc index 0f7a628925f4..7c2bf66a735f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc -@@ -301,7 +301,7 @@ void AddAppearanceStrings(content::WebUI - {"appearancePageTitle", IDS_SETTINGS_APPEARANCE}, - {"exampleDotCom", IDS_SETTINGS_EXAMPLE_DOT_COM}, +@@ -332,7 +332,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS}, + {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED}, {"themes", IDS_SETTINGS_THEMES}, -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -321,7 +321,7 @@ void AddAppearanceStrings(content::WebUI +@@ -350,7 +350,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP}, {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER}, #endif @@ -17,4 +17,4 @@ +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif - }; + #if defined(OS_MACOSX) 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 8d6d2298ecda..8b92939d0ac9 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,4 +1,4 @@ ---- chrome/browser/web_applications/web_app.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/browser/web_applications/web_app.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/web_applications/web_app.cc @@ -58,7 +58,7 @@ namespace { #if defined(OS_MACOSX) @@ -9,7 +9,7 @@ // Linux supports icons of any size. FreeDesktop Icon Theme Specification states // that "Minimally you should install a 48x48 icon in the hicolor theme." const int kDesiredSizes[] = {16, 32, 48, 128, 256, 512}; -@@ -501,7 +501,7 @@ void GetIconsInfo(const WebApplicationIn +@@ -501,7 +501,7 @@ void GetIconsInfo(const WebApplicationInfo& app_info, } #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 0a869662de98..d389a6909393 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 2017-04-19 19:06:30 UTC +--- chrome/browser/web_applications/web_app.h.orig 2017-06-05 19:03:03 UTC +++ chrome/browser/web_applications/web_app.h -@@ -208,7 +208,7 @@ typedef std::vector<WebApplicationInfo:: +@@ -206,7 +206,7 @@ typedef std::vector<WebApplicationInfo::IconInfo> Icon void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons); #endif diff --git a/www/chromium/files/patch-chrome_chrome__paks.gni b/www/chromium/files/patch-chrome_chrome__paks.gni index 849ca493aad9..e67ac675f2af 100644 --- a/www/chromium/files/patch-chrome_chrome__paks.gni +++ b/www/chromium/files/patch-chrome_chrome__paks.gni @@ -1,11 +1,11 @@ ---- chrome/chrome_paks.gni.orig 2017-05-09 19:02:43 UTC +--- chrome/chrome_paks.gni.orig 2017-06-05 19:03:03 UTC +++ chrome/chrome_paks.gni @@ -157,7 +157,7 @@ template("chrome_extra_paks") { "//ui/file_manager:resources", ] } -- if (is_linux) { -+ if (is_linux || is_bsd) { +- if (is_linux || is_mac) { ++ if (is_linux || is_bsd || is_mac) { sources += [ "$root_gen_dir/headless/headless_lib_resources.pak" ] deps += [ "//headless:resources" ] } diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index a28c7707e790..922b47f40b5a 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,6 +1,23 @@ ---- chrome/common/chrome_paths.cc.orig 2017-04-19 19:06:30 UTC -+++ chrome/common/chrome_paths.cc -@@ -190,7 +190,7 @@ bool PathProvider(int key, base::FilePat +--- chrome/common/chrome_paths.cc.orig 2017-06-15 21:03:02.000000000 +0200 ++++ chrome/common/chrome_paths.cc 2017-06-18 01:09:20.663411000 +0200 +@@ -51,14 +51,14 @@ + const base::FilePath::CharType kInternalNaClPluginFileName[] = + FILE_PATH_LITERAL("internal-nacl-plugin"); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // The path to the external extension <id>.json files. + // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ + const base::FilePath::CharType kFilepathSinglePrefExtensions[] = + #if defined(GOOGLE_CHROME_BUILD) + FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); + #else +- FILE_PATH_LITERAL("/usr/share/chromium/extensions"); ++ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); + #endif // defined(GOOGLE_CHROME_BUILD) + + // The path to the hint file that tells the pepper plugin loader +@@ -190,7 +190,7 @@ return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -9,7 +26,16 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -474,10 +474,12 @@ bool PathProvider(int key, base::FilePat +@@ -426,7 +426,7 @@ + break; + #endif + #if BUILDFLAG(ENABLE_SUPERVISED_USERS) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + case chrome::DIR_SUPERVISED_USERS_DEFAULT_APPS: + if (!PathService::Get(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, &cur)) + return false; +@@ -474,10 +474,12 @@ if (!base::PathExists(cur)) // We don't want to create this return false; break; @@ -23,7 +49,25 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -528,7 +530,7 @@ bool PathProvider(int key, base::FilePat +@@ -485,7 +487,7 @@ + } + #endif + #if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ +- defined(OS_MACOSX) ++ defined(OS_MACOSX) || defined(OS_BSD) + case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { + if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) + return false; +@@ -493,7 +495,7 @@ + break; + } + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { + cur = base::FilePath(kFilepathSinglePrefExtensions); + break; +@@ -528,7 +530,7 @@ #endif break; @@ -32,7 +76,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if defined(GOOGLE_CHROME_BUILD) -@@ -542,6 +544,9 @@ bool PathProvider(int key, base::FilePat +@@ -542,6 +544,9 @@ #if defined(GOOGLE_CHROME_BUILD) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); @@ -42,7 +86,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -554,7 +559,7 @@ bool PathProvider(int key, base::FilePat +@@ -554,7 +559,7 @@ return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; 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 982b4f1a3de1..dc9e1f064244 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths_internal.h.orig 2017-04-19 19:06:30 UTC +--- chrome/common/chrome_paths_internal.h.orig 2017-06-05 19:03:03 UTC +++ chrome/common/chrome_paths_internal.h -@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::F +@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi // Get the path to the user's documents directory. bool GetUserDocumentsDirectory(base::FilePath* result); diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 9c68debdfcc9..3bf36d0d3eea 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 2017-04-19 19:06:30 UTC +--- chrome/common/chrome_switches.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/common/chrome_switches.cc -@@ -1138,7 +1138,7 @@ const char kAllowNaClSocketAPI[] +@@ -1144,7 +1144,7 @@ const char kAllowNaClSocketAPI[] = "allow-n 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 83825f90af2c..27e776688c4c 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 2017-04-19 19:06:30 UTC +--- chrome/common/chrome_switches.h.orig 2017-06-05 19:03:03 UTC +++ chrome/common/chrome_switches.h -@@ -351,7 +351,7 @@ extern const char kAllowNaClSocketAPI[]; +@@ -352,7 +352,7 @@ extern const char kAllowNaClSocketAPI[]; extern const char kEnableWaylandServer[]; #endif diff --git a/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn b/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn index d721ddc239d9..3cea587cc338 100644 --- a/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn +++ b/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/common/extensions/api/BUILD.gn.orig 2017-05-02 19:02:48 UTC +--- chrome/common/extensions/api/BUILD.gn.orig 2017-06-05 19:03:03 UTC +++ chrome/common/extensions/api/BUILD.gn -@@ -116,7 +116,7 @@ if (is_chromeos) { +@@ -121,7 +121,7 @@ if (is_chromeos) { "wallpaper.json", "wallpaper_private.json", ] 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 474ebd25f2cb..a432dae92139 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,7 +1,7 @@ ---- chrome/common/extensions/chrome_extensions_client.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/common/extensions/chrome_extensions_client.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/common/extensions/chrome_extensions_client.cc -@@ -97,7 +97,10 @@ ChromeChannelForHistogram GetChromeChann - static base::LazyInstance<ChromeExtensionsClient> g_client = +@@ -97,7 +97,10 @@ ChromeChannelForHistogram GetChromeChannelForHistogram + static base::LazyInstance<ChromeExtensionsClient>::DestructorAtExit g_client = LAZY_INSTANCE_INITIALIZER; -ChromeExtensionsClient::ChromeExtensionsClient() {} diff --git a/www/chromium/files/patch-chrome_common_extensions_command.cc b/www/chromium/files/patch-chrome_common_extensions_command.cc index 90c4ceb93a7d..c9917cc7722e 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 2017-04-19 19:06:30 UTC +--- chrome/common/extensions/command.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/common/extensions/command.cc -@@ -302,7 +302,7 @@ std::string Command::CommandPlatform() { +@@ -303,7 +303,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 714d870e1646..7b4251a9c33c 100644 --- a/www/chromium/files/patch-chrome_common_features.gni +++ b/www/chromium/files/patch-chrome_common_features.gni @@ -1,7 +1,7 @@ ---- chrome/common/features.gni.orig 2017-04-19 19:06:30 UTC +--- chrome/common/features.gni.orig 2017-06-05 19:03:03 UTC +++ chrome/common/features.gni -@@ -40,7 +40,7 @@ declare_args() { - enable_hotwording = is_chrome_branded && is_chromeos +@@ -47,7 +47,7 @@ declare_args() { + is_android || is_mac || (is_desktop_linux && use_glib && use_gio) enable_one_click_signin = - is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast) diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index f1f034751677..e27126942772 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 2017-04-19 19:06:30 UTC +--- chrome/common/pref_names.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/common/pref_names.cc -@@ -1013,7 +1013,7 @@ const char kForceSessionSync[] = "settin +@@ -1009,7 +1009,7 @@ const char kForceSessionSync[] = "settings.history_rec // 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 -@@ -1100,7 +1100,7 @@ const char kShowUpdatePromotionInfoBar[] +@@ -1096,7 +1096,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"; -@@ -1476,7 +1476,7 @@ const char kDownloadDefaultDirectory[] = +@@ -1475,7 +1475,7 @@ const char kDownloadDefaultDirectory[] = "download.def // 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 584e5bfc2ec1..41399039b875 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 2017-04-19 19:06:30 UTC +--- chrome/common/pref_names.h.orig 2017-06-05 19:03:03 UTC +++ chrome/common/pref_names.h -@@ -340,7 +340,7 @@ extern const char kForceGoogleSafeSearch +@@ -337,7 +337,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[]; -@@ -373,7 +373,7 @@ extern const char kDefaultBrowserSetting +@@ -370,7 +370,7 @@ extern const char kDefaultBrowserSettingEnabled[]; #if defined(OS_MACOSX) extern const char kShowUpdatePromotionInfoBar[]; #endif @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif extern const char kBackShortcutBubbleShownCount[]; -@@ -527,7 +527,7 @@ extern const char kAppWindowPlacement[]; +@@ -529,7 +529,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_common_url__constants.cc b/www/chromium/files/patch-chrome_common_url__constants.cc index cb443e69bc86..032a819150a6 100644 --- a/www/chromium/files/patch-chrome_common_url__constants.cc +++ b/www/chromium/files/patch-chrome_common_url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.cc.orig 2017-04-19 19:06:30 UTC +--- chrome/common/url_constants.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/common/url_constants.cc -@@ -143,7 +143,7 @@ const char kChromeUIMdCupsSettingsURL[] +@@ -145,7 +145,7 @@ const char kChromeUICleanupToolURL[] = "chrome://clean const char kChromeUIMetroFlowURL[] = "chrome://make-metro/"; #endif @@ -9,7 +9,16 @@ const char kChromeUITabModalConfirmDialogURL[] = "chrome://tab-modal-confirm-dialog/"; #endif -@@ -337,7 +337,7 @@ const char kChromeOSAssetPath[] = "/usr/ +@@ -161,7 +161,7 @@ const char kChromeUICastURL[] = "chrome://cast/"; + #endif + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + const char kChromeUIDiscardsHost[] = "discards"; + const char kChromeUIDiscardsURL[] = "chrome://discards/"; + #endif +@@ -340,7 +340,7 @@ const char kChromeUICleanupToolHost[] = "cleanup"; const char kChromeUIMetroFlowHost[] = "make-metro"; #endif diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h index 69d2b1f590a9..a7fa9bcef8b2 100644 --- a/www/chromium/files/patch-chrome_common_url__constants.h +++ b/www/chromium/files/patch-chrome_common_url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.h.orig 2017-04-19 19:06:30 UTC +--- chrome/common/url_constants.h.orig 2017-06-05 19:03:03 UTC +++ chrome/common/url_constants.h -@@ -128,7 +128,7 @@ extern const char kChromeUIMdCupsSetting +@@ -131,7 +131,7 @@ extern const char kChromeUICleanupToolURL[]; extern const char kChromeUIMetroFlowURL[]; #endif @@ -9,7 +9,16 @@ extern const char kChromeUITabModalConfirmDialogURL[]; #endif -@@ -314,7 +314,7 @@ extern const char kChromeOSAssetPath[]; +@@ -146,7 +146,7 @@ extern const char kChromeUICastURL[]; + #endif + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + extern const char kChromeUIDiscardsHost[]; + extern const char kChromeUIDiscardsURL[]; + #endif +@@ -318,7 +318,7 @@ extern const char kChromeUICleanupToolHost[]; extern const char kChromeUIMetroFlowHost[]; #endif 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 09dadf16e5ee..4f930773b716 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 2017-04-19 19:06:31 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2017-06-05 19:03:03 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.cc @@ -14,7 +14,7 @@ #include "ppapi/proxy/ppapi_messages.h" @@ -9,7 +9,7 @@ #include "content/public/child/child_process_sandbox_support_linux.h" #include "content/public/common/common_sandbox_support_linux.h" #elif defined(OS_WIN) -@@ -28,7 +28,7 @@ PepperFlashFontFileHost::PepperFlashFont +@@ -28,7 +28,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost( const ppapi::proxy::SerializedFontDescription& description, PP_PrivateFontCharset charset) : ResourceHost(host->GetPpapiHost(), instance, resource) { @@ -18,7 +18,7 @@ fd_.reset(content::MatchFontWithFallback( description.face, description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD, -@@ -45,7 +45,7 @@ PepperFlashFontFileHost::PepperFlashFont +@@ -45,7 +45,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost( sk_sp<SkFontMgr> font_mgr(SkFontMgr::RefDefault()); typeface_ = sk_sp<SkTypeface>( font_mgr->matchFamilyStyle(description.face.c_str(), style)); @@ -27,7 +27,7 @@ } PepperFlashFontFileHost::~PepperFlashFontFileHost() {} -@@ -64,7 +64,7 @@ bool PepperFlashFontFileHost::GetFontDat +@@ -64,7 +64,7 @@ bool PepperFlashFontFileHost::GetFontData(uint32_t tab void* buffer, size_t* length) { bool result = false; 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 84489c5207cb..3c3263e4f493 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 2017-04-19 19:06:31 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2017-06-05 19:03:03 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.h @@ -14,7 +14,7 @@ #include "ppapi/c/private/pp_private_font_charset.h" @@ -9,7 +9,7 @@ #include "base/files/scoped_file.h" #elif defined(OS_WIN) #include "third_party/skia/include/core/SkRefCnt.h" -@@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public p +@@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public ppapi::host::Re uint32_t table); bool GetFontData(uint32_t table, void* buffer, size_t* length); diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 1cea5919557d..37faee3ea5b3 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 2017-04-19 19:06:31 UTC +--- chrome/test/BUILD.gn.orig 2017-06-05 19:03:04 UTC +++ chrome/test/BUILD.gn -@@ -190,7 +190,7 @@ static_library("test_support") { +@@ -192,7 +192,7 @@ static_library("test_support") { ] } @@ -9,7 +9,7 @@ public_deps += [ "//crypto:platform" ] } if (is_mac) { -@@ -455,7 +455,7 @@ if (!is_android) { +@@ -454,7 +454,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", -@@ -464,7 +464,7 @@ if (!is_android) { +@@ -463,7 +463,7 @@ if (!is_android) { "$root_out_dir/resources.pak", ] } @@ -27,8 +27,8 @@ data += [ "$root_out_dir/libppapi_tests.so" ] } -@@ -584,7 +584,7 @@ if (!is_android) { - "../browser/ui/views/payments/payment_sheet_view_controller_interactive_uitest.cc", +@@ -570,7 +570,7 @@ if (!is_android) { + "base/interactive_test_utils_views.cc", ] } - if (is_linux) { @@ -36,7 +36,7 @@ if (!is_chromeos) { # Desktop linux. sources -= [ -@@ -2048,14 +2048,14 @@ test("browser_tests") { +@@ -2044,14 +2044,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" ] @@ -53,7 +53,7 @@ sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ] data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ] } -@@ -2067,7 +2067,7 @@ test("browser_tests") { +@@ -2063,7 +2063,7 @@ test("browser_tests") { configs += [ "//build/config/win:default_large_module_incremental_linking" ] } @@ -62,7 +62,7 @@ data_deps += [ "//components/nacl/loader:nacl_helper" ] if (enable_nacl_nonsfi) { -@@ -2186,7 +2186,7 @@ test("browser_tests") { +@@ -2200,7 +2200,7 @@ test("browser_tests") { } } @@ -71,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" ] } -@@ -2412,7 +2412,7 @@ test("browser_tests") { +@@ -2430,7 +2430,7 @@ test("browser_tests") { if (toolkit_views) { sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ] } @@ -80,7 +80,7 @@ sources += [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ] } -@@ -2594,7 +2594,7 @@ test("browser_tests") { +@@ -2620,7 +2620,7 @@ test("browser_tests") { "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc", ] } @@ -89,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", -@@ -2772,7 +2772,7 @@ if (!is_android) { +@@ -2802,7 +2802,7 @@ if (!is_android) { "//testing/xvfb.py", ] @@ -98,7 +98,7 @@ data += [ "$root_out_dir/chrome_100_percent.pak", "$root_out_dir/chrome_200_percent.pak", -@@ -3471,7 +3471,7 @@ test("unit_tests") { +@@ -3504,7 +3504,7 @@ test("unit_tests") { "$root_out_dir/resources.pak", ] } @@ -107,7 +107,7 @@ data += [ "$root_out_dir/chrome_200_percent.pak" ] } if (is_win) { -@@ -4198,7 +4198,7 @@ test("unit_tests") { +@@ -4234,7 +4234,7 @@ test("unit_tests") { "//ui/wm", ] } @@ -116,7 +116,7 @@ sources += [ "../browser/password_manager/native_backend_kwallet_x_unittest.cc", "../browser/shell_integration_linux_unittest.cc", -@@ -4218,7 +4218,7 @@ test("unit_tests") { +@@ -4256,7 +4256,7 @@ test("unit_tests") { if (use_gio) { deps += [ "//build/linux/libgio" ] } @@ -125,7 +125,7 @@ deps += [ "//chrome/browser/ui/libgtkui" ] } -@@ -4487,18 +4487,18 @@ test("unit_tests") { +@@ -4537,18 +4537,18 @@ test("unit_tests") { "//components/os_crypt:gnome_keyring_direct", ] } @@ -147,7 +147,7 @@ ldflags = [ "-Wl,--strip-debug" ] } if (is_mac) { -@@ -4996,7 +4996,7 @@ if (safe_browsing_mode == 1 && is_mac) { +@@ -5045,7 +5045,7 @@ if (safe_browsing_mode == 1 && is_mac) { } } @@ -156,7 +156,7 @@ # TODO(609855): Make this compile on Android and run on the bots. test("chrome_app_unittests") { sources = [ -@@ -5021,7 +5021,7 @@ if (!is_android) { +@@ -5071,7 +5071,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 96e89ff7edbd..f30e23f290e1 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 2017-04-19 19:06:31 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2017-06-05 19:03:04 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -94,6 +94,10 @@ +@@ -95,6 +95,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 f52d16386a76..2e6fb6456520 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 2017-04-19 19:06:31 UTC +--- chrome/test/base/testing_browser_process.h.orig 2017-06-05 19:03:04 UTC +++ chrome/test/base/testing_browser_process.h -@@ -108,8 +108,8 @@ class TestingBrowserProcess : public Bro +@@ -108,8 +108,8 @@ class TestingBrowserProcess : public BrowserProcess { 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 c329a059d171..2024e02bc187 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,6 +1,6 @@ ---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2017-04-19 19:06:31 UTC +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2017-06-05 19:03:04 UTC +++ chrome/test/chromedriver/chrome/chrome_finder.cc -@@ -45,7 +45,7 @@ void GetApplicationDirs(std::vector<base +@@ -45,7 +45,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l installation_locations[i].Append(L"Chromium\\Application")); } } @@ -9,7 +9,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* locations) { locations->push_back(base::FilePath("/opt/google/chrome")); locations->push_back(base::FilePath("/usr/local/bin")); -@@ -95,7 +95,7 @@ bool FindChrome(base::FilePath* browser_ +@@ -95,7 +95,7 @@ bool FindChrome(base::FilePath* browser_exe) { #elif defined(OS_MACOSX) base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"), base::FilePath("Chromium.app/Contents/MacOS/Chromium") diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index 55f4ba2235e4..f5c3c02415ce 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2017-04-19 19:06:32 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2017-06-05 19:03:05 UTC +++ chromecast/browser/cast_browser_main_parts.cc @@ -70,7 +70,7 @@ #include <signal.h> @@ -9,16 +9,25 @@ #include <fontconfig/fontconfig.h> #endif -@@ -229,7 +229,7 @@ DefaultCommandLineSwitch g_default_switc - #if BUILDFLAG(IS_CAST_AUDIO_ONLY) +@@ -233,7 +233,7 @@ DefaultCommandLineSwitch g_default_switches[] = { { switches::kDisableGpu, "" }, - #endif + #endif // defined(OS_ANDROID) + #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -371,7 +371,7 @@ void CastBrowserMainParts::PostMainMessa +@@ -243,7 +243,7 @@ DefaultCommandLineSwitch g_default_switches[] = { + {switches::kEnableHardwareOverlays, "cast"}, + #endif + #endif +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + // Needed so that our call to GpuDataManager::SetGLStrings doesn't race + // against GPU process creation (which is otherwise triggered from + // BrowserThreadsStarted). The GPU process will be created as soon as a +@@ -378,7 +378,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart() } void CastBrowserMainParts::ToolkitInitialized() { diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index 49ab11392642..8ede7ca55ce6 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2017-04-19 19:06:32 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2017-06-05 19:03:05 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -298,7 +298,7 @@ void CastContentBrowserClient::AppendExt +@@ -316,7 +316,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS command_line->AppendSwitch(switches::kAllowHiddenMediaPlayback); } diff --git a/www/chromium/files/patch-chromecast_crash_BUILD.gn b/www/chromium/files/patch-chromecast_crash_BUILD.gn index 875145c37e4d..784556611b53 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 2017-04-19 19:06:32 UTC +--- chromecast/crash/BUILD.gn.orig 2017-06-05 19:03:05 UTC +++ chromecast/crash/BUILD.gn -@@ -78,7 +78,7 @@ source_set("test_support") { +@@ -79,7 +79,7 @@ source_set("test_support") { ] } diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn index 96ed75ab4434..c6b6ffc7cb17 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 2017-04-19 19:06:32 UTC +--- components/BUILD.gn.orig 2017-06-05 19:03:05 UTC +++ components/BUILD.gn -@@ -177,8 +177,8 @@ test("components_unittests") { +@@ -179,8 +179,8 @@ test("components_unittests") { "//components/certificate_reporting:unit_tests", "//components/certificate_transparency:unit_tests", "//components/contextual_search: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 b666b919c799..b3f9897015d4 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 2017-04-19 19:06:32 UTC +--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2017-06-05 19:03:05 UTC +++ components/autofill/content/renderer/password_form_conversion_utils.cc -@@ -28,7 +28,11 @@ +@@ -29,7 +29,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_autofill_core_browser_autofill__experiments.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc index b6df6559536f..be73f8b9e594 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/autofill_experiments.cc.orig 2017-04-19 19:06:32 UTC +--- components/autofill/core/browser/autofill_experiments.cc.orig 2017-06-05 19:03:05 UTC +++ components/autofill/core/browser/autofill_experiments.cc -@@ -151,7 +151,7 @@ unsigned int GetPopupMargin() { +@@ -153,7 +153,7 @@ unsigned int GetPopupMargin() { } bool OfferStoreUnmaskedCards() { 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 6dc37c2a184c..b57e011eb8f5 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 2017-04-19 19:06:32 UTC +--- components/content_settings/core/browser/website_settings_registry.cc.orig 2017-06-05 19:03:05 UTC +++ components/content_settings/core/browser/website_settings_registry.cc -@@ -88,6 +88,9 @@ const WebsiteSettingsInfo* WebsiteSettin +@@ -88,6 +88,9 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re // 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_cookie__config_cookie__store__util.cc b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc index 3aaab8566da5..b27a8e2d3590 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 2017-04-19 19:06:32 UTC +--- components/cookie_config/cookie_store_util.cc.orig 2017-06-05 19:03:05 UTC +++ components/cookie_config/cookie_store_util.cc @@ -11,7 +11,7 @@ @@ -9,7 +9,7 @@ namespace { // Use the operating system's mechanisms to encrypt cookies before writing -@@ -63,10 +63,10 @@ base::LazyInstance<CookieOSCryptoDelegat +@@ -63,10 +63,10 @@ base::LazyInstance<CookieOSCryptoDelegate>::Destructor net::CookieCryptoDelegate* GetCookieCryptoDelegate() { return g_cookie_crypto_delegate.Pointer(); } diff --git a/www/chromium/files/patch-components_filesystem_file__system__app.cc b/www/chromium/files/patch-components_filesystem_file__system__app.cc index 87a2c07af344..8114d01e7535 100644 --- a/www/chromium/files/patch-components_filesystem_file__system__app.cc +++ b/www/chromium/files/patch-components_filesystem_file__system__app.cc @@ -1,6 +1,6 @@ ---- components/filesystem/file_system_app.cc.orig 2017-05-02 19:02:50 UTC +--- components/filesystem/file_system_app.cc.orig 2017-06-05 19:03:05 UTC +++ components/filesystem/file_system_app.cc -@@ -23,7 +23,7 @@ +@@ -22,7 +22,7 @@ #elif defined(OS_ANDROID) #include "base/base_paths_android.h" #include "base/path_service.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) -@@ -75,7 +75,7 @@ base::FilePath FileSystemApp::GetUserDat +@@ -78,7 +78,7 @@ base::FilePath FileSystemApp::GetUserDataDir() { CHECK(PathService::Get(base::DIR_APP_DATA, &path)); #elif defined(OS_ANDROID) CHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &path)); 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 92b0f5ba8d2a..ad57ac48b3b6 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 2017-04-19 19:06:32 UTC +--- components/flags_ui/flags_state.cc.orig 2017-06-05 19:03:05 UTC +++ components/flags_ui/flags_state.cc -@@ -566,7 +566,7 @@ int FlagsState::GetCurrentPlatform() { +@@ -567,7 +567,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_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn index 281a7cf34871..4daefb851614 100644 --- a/www/chromium/files/patch-components_metrics_BUILD.gn +++ b/www/chromium/files/patch-components_metrics_BUILD.gn @@ -1,6 +1,6 @@ ---- components/metrics/BUILD.gn.orig 2017-04-19 19:06:32 UTC +--- components/metrics/BUILD.gn.orig 2017-06-05 19:03:05 UTC +++ components/metrics/BUILD.gn -@@ -118,6 +118,13 @@ static_library("metrics") { +@@ -121,6 +121,13 @@ static_library("metrics") { if (is_win) { sources -= [ "machine_id_provider_stub.cc" ] } @@ -14,7 +14,7 @@ } if (!is_ios) { -@@ -295,7 +302,7 @@ static_library("test_support") { +@@ -298,7 +305,7 @@ static_library("test_support") { ] } @@ -23,7 +23,7 @@ static_library("serialization") { sources = [ "serialization/metric_sample.cc", -@@ -358,7 +365,7 @@ source_set("unit_tests") { +@@ -360,7 +367,7 @@ source_set("unit_tests") { "//ui/gfx/geometry", ] 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 ec3f1524a5c3..db5d92f1d6f8 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 2017-04-19 19:06:32 UTC +--- components/metrics/system_memory_stats_recorder_linux.cc.orig 2017-06-05 19:03:05 UTC +++ components/metrics/system_memory_stats_recorder_linux.cc @@ -30,6 +30,7 @@ namespace metrics { UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50) @@ -8,7 +8,7 @@ base::SystemMemoryInfoKB memory; if (!base::GetSystemMemoryInfo(&memory)) return; -@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStats +@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) { break; } } diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js index 1b394b548d70..74a71cf2e786 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 2017-04-19 19:06:32 UTC +--- components/neterror/resources/neterror.js.orig 2017-06-05 19:03:06 UTC +++ components/neterror/resources/neterror.js -@@ -150,7 +150,7 @@ function setUpCachedButton(buttonStrings +@@ -150,7 +150,7 @@ function setUpCachedButton(buttonStrings) { } var primaryControlOnLeft = true; diff --git a/www/chromium/files/patch-components_policy_BUILD.gn b/www/chromium/files/patch-components_policy_BUILD.gn index 5859d031bb18..c80acdcd7f76 100644 --- a/www/chromium/files/patch-components_policy_BUILD.gn +++ b/www/chromium/files/patch-components_policy_BUILD.gn @@ -1,6 +1,6 @@ ---- components/policy/BUILD.gn.orig 2017-04-19 19:06:33 UTC +--- components/policy/BUILD.gn.orig 2017-06-05 19:03:06 UTC +++ components/policy/BUILD.gn -@@ -16,6 +16,7 @@ assert(!is_ios, "Policy should not be re +@@ -16,6 +16,7 @@ assert(!is_ios, "Policy should not be referenced on iO gen_policy_templates_common = true gen_policy_templates_win = is_win gen_policy_templates_linux = is_linux @@ -8,7 +8,7 @@ gen_policy_templates_android = is_android gen_policy_templates_mac = is_mac -@@ -159,7 +160,7 @@ grit("grit_policy_templates") { +@@ -169,7 +170,7 @@ grit("grit_policy_templates") { outputs += policy_templates_android_outputs defines += [ "gen_policy_templates_android" ] } 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 ee2af2905edb..93bfe1d8cfc7 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,4 +1,4 @@ ---- components/policy/resources/policy_templates.json.orig 2017-04-19 19:06:33 UTC +--- components/policy/resources/policy_templates.json.orig 2017-06-05 19:03:06 UTC +++ components/policy/resources/policy_templates.json @@ -964,7 +964,7 @@ 'name': 'RemoteAccessHostMatchUsername', @@ -18,7 +18,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -4815,7 +4815,7 @@ +@@ -4830,7 +4830,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -27,7 +27,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -5723,7 +5723,7 @@ +@@ -5738,7 +5738,7 @@ 'name': 'BackgroundModeEnabled', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -36,7 +36,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -6250,7 +6250,7 @@ +@@ -6265,7 +6265,7 @@ 'name': 'FullscreenAllowed', 'type': 'main', 'schema': { 'type': 'boolean' }, 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 4886d38b929a..56987f0d0e0a 100644 --- a/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc +++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc @@ -1,6 +1,6 @@ ---- components/storage_monitor/storage_monitor.cc.orig 2017-04-19 19:06:33 UTC +--- components/storage_monitor/storage_monitor.cc.orig 2017-06-05 19:03:06 UTC +++ components/storage_monitor/storage_monitor.cc -@@ -85,6 +85,7 @@ std::vector<StorageInfo> StorageMonitor: +@@ -85,6 +85,7 @@ std::vector<StorageInfo> StorageMonitor::GetAllAvailab void StorageMonitor::EnsureInitialized(base::Closure callback) { DCHECK(thread_checker_.CalledOnValidThread()); @@ -8,7 +8,7 @@ if (initialized_) { if (!callback.is_null()) callback.Run(); -@@ -100,6 +101,7 @@ void StorageMonitor::EnsureInitialized(b +@@ -100,6 +101,7 @@ void StorageMonitor::EnsureInitialized(base::Closure c initializing_ = true; Init(); 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 62c22bc4a71c..8542281e52cd 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,6 +1,6 @@ ---- components/storage_monitor/storage_monitor_freebsd.cc.orig 2017-04-22 13:58:19 UTC +--- components/storage_monitor/storage_monitor_freebsd.cc.orig 2017-06-11 01:51:38 UTC +++ components/storage_monitor/storage_monitor_freebsd.cc -@@ -0,0 +1,101 @@ +@@ -0,0 +1,54 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -31,53 +31,6 @@ + +namespace { + -+// udev device property constants. -+const char kBlockSubsystemKey[] = "block"; -+const char kDiskDeviceTypeKey[] = "disk"; -+const char kFsUUID[] = "ID_FS_UUID"; -+const char kLabel[] = "ID_FS_LABEL"; -+const char kModel[] = "ID_MODEL"; -+const char kModelID[] = "ID_MODEL_ID"; -+const char kRemovableSysAttr[] = "removable"; -+const char kSerialShort[] = "ID_SERIAL_SHORT"; -+const char kSizeSysAttr[] = "size"; -+const char kVendor[] = "ID_VENDOR"; -+const char kVendorID[] = "ID_VENDOR_ID"; -+ -+StorageMonitor::EjectStatus EjectPathOnFileThread( -+ const base::FilePath& path, -+ const base::FilePath& device) { -+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); -+ -+ static const char kUmountBinary[] = "/sbin/umount"; -+ std::vector<std::string> command; -+ command.push_back(kUmountBinary); -+ command.push_back(path.value()); -+ -+ base::LaunchOptions options; -+ base::Process process = base::LaunchProcess(command, options); -+ if (!process.IsValid()) -+ return StorageMonitor::EJECT_FAILURE; -+ -+ int exit_code = -1; -+ if (!process.WaitForExitWithTimeout(base::TimeDelta::FromMilliseconds(3000), -+ &exit_code)) { -+ process.Terminate(-1, false); -+ base::EnsureProcessTerminated(std::move(process)); -+ return StorageMonitor::EJECT_FAILURE; -+ } -+ -+ // TODO(gbillock): Make sure this is found in documentation -+ // somewhere. Experimentally it seems to hold that exit code -+ // 1 means device is in use. -+ if (exit_code == 1) -+ return StorageMonitor::EJECT_IN_USE; -+ if (exit_code != 0) -+ return StorageMonitor::EJECT_FAILURE; -+ -+ return StorageMonitor::EJECT_OK; -+} -+ +} // namespace + +StorageMonitorFreeBSD::StorageMonitorFreeBSD() { diff --git a/www/chromium/files/patch-components_sync_base_get__session__name.cc b/www/chromium/files/patch-components_sync_base_get__session__name.cc index 380c33d62a44..c857b222d2e4 100644 --- a/www/chromium/files/patch-components_sync_base_get__session__name.cc +++ b/www/chromium/files/patch-components_sync_base_get__session__name.cc @@ -1,4 +1,4 @@ ---- components/sync/base/get_session_name.cc.orig 2017-04-19 19:06:33 UTC +--- components/sync/base/get_session_name.cc.orig 2017-06-05 19:03:06 UTC +++ components/sync/base/get_session_name.cc @@ -15,7 +15,7 @@ @@ -9,7 +9,7 @@ #include "components/sync/base/get_session_name_linux.h" #elif defined(OS_IOS) #include "components/sync/base/get_session_name_ios.h" -@@ -51,7 +51,7 @@ std::string GetSessionNameSynchronously( +@@ -51,7 +51,7 @@ std::string GetSessionNameSynchronously() { session_name = "Chromebook"; break; } diff --git a/www/chromium/files/patch-components_tracing_child_child__memory__dump__manager__delegate__impl.cc b/www/chromium/files/patch-components_tracing_child_child__memory__dump__manager__delegate__impl.cc deleted file mode 100644 index c473b400228f..000000000000 --- a/www/chromium/files/patch-components_tracing_child_child__memory__dump__manager__delegate__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/tracing/child/child_memory_dump_manager_delegate_impl.cc.orig 2017-04-19 19:06:33 UTC -+++ components/tracing/child/child_memory_dump_manager_delegate_impl.cc -@@ -52,7 +52,7 @@ void ChildMemoryDumpManagerDelegateImpl: - base::trace_event::MemoryDumpManager::GetInstance()->Initialize( - this /* delegate */, false /* is_coordinator */); - --#if !defined(OS_LINUX) && !defined(OS_NACL) -+#if !defined(OS_LINUX) && !defined(OS_NACL) && !defined(OS_BSD) - // On linux the browser process takes care of dumping process metrics. - // The child process is not allowed to do so due to BPF sandbox. - tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess( diff --git a/www/chromium/files/patch-components_tracing_child_child__trace__message__filter.cc b/www/chromium/files/patch-components_tracing_child_child__trace__message__filter.cc new file mode 100644 index 000000000000..15b6f90bab13 --- /dev/null +++ b/www/chromium/files/patch-components_tracing_child_child__trace__message__filter.cc @@ -0,0 +1,11 @@ +--- components/tracing/child/child_trace_message_filter.cc.orig 2017-06-05 19:03:06 UTC ++++ components/tracing/child/child_trace_message_filter.cc +@@ -35,7 +35,7 @@ void ChildTraceMessageFilter::OnFilterAdded(IPC::Chann + sender_ = channel; + sender_->Send(new TracingHostMsg_ChildSupportsTracing()); + +-#if !defined(OS_LINUX) && !defined(OS_NACL) ++#if !defined(OS_LINUX) && !defined(OS_NACL) && !defined(OS_BSD) + // On linux the browser process takes care of dumping process metrics. + // The child process is not allowed to do so due to BPF sandbox. + tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess( diff --git a/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc b/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc index 0665a62829ce..94edecc7aca5 100644 --- a/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc +++ b/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc @@ -1,6 +1,6 @@ ---- components/tracing/common/process_metrics_memory_dump_provider.cc.orig 2017-04-19 19:06:33 UTC +--- components/tracing/common/process_metrics_memory_dump_provider.cc.orig 2017-06-05 19:03:06 UTC +++ components/tracing/common/process_metrics_memory_dump_provider.cc -@@ -56,7 +56,7 @@ base::LazyInstance< +@@ -57,7 +57,7 @@ base::LazyInstance< std::unique_ptr<ProcessMetricsMemoryDumpProvider>>>::Leaky g_dump_providers_map = LAZY_INSTANCE_INITIALIZER; @@ -9,7 +9,7 @@ const char kClearPeakRssCommand[] = "5"; const uint32_t kMaxLineSize = 4096; -@@ -190,13 +190,13 @@ bool GetResidentSizeFromStatmFile(int fd +@@ -191,13 +191,13 @@ bool GetResidentSizeFromStatmFile(int fd, uint64_t* re return num_scanned == 1; } @@ -25,7 +25,7 @@ // Just pass ProcessId instead of handle since they are the same in linux and // android. return base::ProcessMetrics::CreateProcessMetrics(process); -@@ -205,7 +205,7 @@ std::unique_ptr<base::ProcessMetrics> Cr +@@ -206,7 +206,7 @@ std::unique_ptr<base::ProcessMetrics> CreateProcessMet // additional information like ProcessHandle or port provider. NOTREACHED(); return std::unique_ptr<base::ProcessMetrics>(); @@ -34,7 +34,7 @@ } } // namespace -@@ -217,7 +217,7 @@ uint64_t ProcessMetricsMemoryDumpProvide +@@ -218,7 +218,7 @@ uint64_t ProcessMetricsMemoryDumpProvider::rss_bytes_f ProcessMetricsMemoryDumpProvider::FactoryFunction ProcessMetricsMemoryDumpProvider::factory_for_testing = nullptr; @@ -43,7 +43,7 @@ // static FILE* ProcessMetricsMemoryDumpProvider::proc_smaps_for_testing = nullptr; -@@ -244,7 +244,7 @@ bool ProcessMetricsMemoryDumpProvider::D +@@ -245,7 +245,7 @@ bool ProcessMetricsMemoryDumpProvider::DumpProcessMemo pmd->set_has_process_mmaps(); return res; } @@ -52,7 +52,7 @@ #if defined(OS_WIN) bool ProcessMetricsMemoryDumpProvider::DumpProcessMemoryMaps( -@@ -620,7 +620,7 @@ bool ProcessMetricsMemoryDumpProvider::D +@@ -628,7 +628,7 @@ bool ProcessMetricsMemoryDumpProvider::DumpProcessTota #if !defined(OS_IOS) peak_rss_bytes = process_metrics_->GetPeakWorkingSetSize(); @@ -61,7 +61,7 @@ if (is_rss_peak_resettable_) { std::string clear_refs_file = "/proc/" + -@@ -670,7 +670,7 @@ bool ProcessMetricsMemoryDumpProvider::D +@@ -672,7 +672,7 @@ bool ProcessMetricsMemoryDumpProvider::DumpProcessTota void ProcessMetricsMemoryDumpProvider::PollFastMemoryTotal( uint64_t* memory_total) { *memory_total = 0; @@ -70,7 +70,7 @@ int statm_fd = fast_polling_statm_fd_for_testing; if (statm_fd == -1) { if (!fast_polling_statm_fd_.is_valid()) { -@@ -698,7 +698,7 @@ void ProcessMetricsMemoryDumpProvider::P +@@ -700,7 +700,7 @@ void ProcessMetricsMemoryDumpProvider::PollFastMemoryT } void ProcessMetricsMemoryDumpProvider::SuspendFastMemoryPolling() { diff --git a/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.h b/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.h index fb1e1791c314..38489d766200 100644 --- a/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.h +++ b/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.h @@ -1,6 +1,6 @@ ---- components/tracing/common/process_metrics_memory_dump_provider.h.orig 2017-04-19 19:06:33 UTC +--- components/tracing/common/process_metrics_memory_dump_provider.h.orig 2017-06-05 19:03:06 UTC +++ components/tracing/common/process_metrics_memory_dump_provider.h -@@ -57,7 +57,7 @@ class TRACING_EXPORT ProcessMetricsMemor +@@ -57,7 +57,7 @@ class TRACING_EXPORT ProcessMetricsMemoryDumpProvider #elif defined(OS_WIN) FRIEND_TEST_ALL_PREFIXES(ProcessMetricsMemoryDumpProviderTest, TestWinModuleReading); @@ -9,7 +9,7 @@ FRIEND_TEST_ALL_PREFIXES(ProcessMetricsMemoryDumpProviderTest, DoubleRegister); #endif -@@ -70,7 +70,7 @@ class TRACING_EXPORT ProcessMetricsMemor +@@ -70,7 +70,7 @@ class TRACING_EXPORT ProcessMetricsMemoryDumpProvider static uint64_t rss_bytes_for_testing; static FactoryFunction factory_for_testing; 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 747606e34f85..e2c9a5a76e5a 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,6 +1,6 @@ ---- components/update_client/update_query_params.cc.orig 2017-04-19 19:06:33 UTC +--- components/update_client/update_query_params.cc.orig 2017-06-05 19:03:06 UTC +++ components/update_client/update_query_params.cc -@@ -34,6 +34,8 @@ const char kOs[] = +@@ -35,6 +35,8 @@ const char kOs[] = "linux"; #elif defined(OS_OPENBSD) "openbsd"; diff --git a/www/chromium/files/patch-content_app_BUILD.gn b/www/chromium/files/patch-content_app_BUILD.gn index af5c313738fd..38d76b929a54 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 2017-04-19 19:06:33 UTC +--- content/app/BUILD.gn.orig 2017-06-05 19:03:06 UTC +++ content/app/BUILD.gn -@@ -68,7 +68,7 @@ template("implement_content_app") { +@@ -67,7 +67,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 6cb01e35ea4e..6d9bb3e8dfa9 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 2017-04-19 19:06:33 UTC +--- content/app/content_main_runner.cc.orig 2017-06-05 19:03:06 UTC +++ content/app/content_main_runner.cc -@@ -92,10 +92,10 @@ +@@ -86,10 +86,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 -@@ -365,7 +365,7 @@ struct MainFunction { +@@ -312,7 +312,7 @@ struct MainFunction { int (*function)(const MainFunctionParams&); }; @@ -22,7 +22,7 @@ // 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(). -@@ -426,7 +426,7 @@ int RunZygote(const MainFunctionParams& +@@ -373,7 +373,7 @@ int RunZygote(const MainFunctionParams& main_function_ NOTREACHED() << "Unknown zygote process type: " << process_type; return 1; } @@ -31,7 +31,7 @@ static void RegisterMainThreadFactories() { #if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD) -@@ -492,7 +492,7 @@ int RunNamedProcessTypeMain( +@@ -439,7 +439,7 @@ int RunNamedProcessTypeMain( } } diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index cb60cd2ce3fd..8153a541fcc1 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2017-04-19 19:06:33 UTC +--- content/browser/BUILD.gn.orig 2017-06-05 19:03:06 UTC +++ content/browser/BUILD.gn -@@ -1464,11 +1464,6 @@ source_set("browser") { +@@ -1498,11 +1498,6 @@ source_set("browser") { "memory/memory_monitor_chromeos.cc", "memory/memory_monitor_chromeos.h", ] @@ -12,7 +12,7 @@ } if (!is_win) { -@@ -1540,7 +1535,7 @@ source_set("browser") { +@@ -1571,7 +1566,7 @@ source_set("browser") { # Desktop screen capture implementations, conditionally built depending on # the available implementations for each platform. @@ -21,7 +21,7 @@ defines += [ "ENABLE_SCREEN_CAPTURE=1" ] sources += [ "media/capture/cursor_renderer.cc", -@@ -1727,7 +1722,7 @@ source_set("browser") { +@@ -1759,7 +1754,7 @@ source_set("browser") { } } @@ -30,7 +30,7 @@ deps += [ "//build/linux:fontconfig" ] } -@@ -1880,6 +1875,17 @@ source_set("browser") { +@@ -1919,6 +1914,17 @@ source_set("browser") { "//chromeos", "//chromeos:power_manager_proto", ] @@ -47,8 +47,8 @@ + ] } - if (enable_mojo_media) { -@@ -1998,11 +2004,11 @@ source_set("browser") { + if (use_aura) { +@@ -2029,11 +2035,11 @@ source_set("browser") { ] } 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 a31b6800d819..67a5fa03e1a0 100644 --- a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h +++ b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h @@ -1,6 +1,6 @@ ---- content/browser/accessibility/browser_accessibility.h.orig 2017-04-19 19:06:33 UTC +--- content/browser/accessibility/browser_accessibility.h.orig 2017-06-05 19:03:06 UTC +++ content/browser/accessibility/browser_accessibility.h -@@ -40,7 +40,7 @@ +@@ -42,7 +42,7 @@ #define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1 #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 369d986b8455..2e7beb113c67 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,4 +1,4 @@ ---- content/browser/accessibility/browser_accessibility_manager.h.orig 2017-04-19 19:06:33 UTC +--- content/browser/accessibility/browser_accessibility_manager.h.orig 2017-06-05 19:03:06 UTC +++ content/browser/accessibility/browser_accessibility_manager.h @@ -36,7 +36,7 @@ class BrowserAccessibilityManager; class BrowserAccessibilityManagerAndroid; @@ -9,7 +9,7 @@ class BrowserAccessibilityManagerAuraLinux; #elif defined(OS_MACOSX) class BrowserAccessibilityManagerMac; -@@ -248,7 +248,7 @@ class CONTENT_EXPORT BrowserAccessibilit +@@ -251,7 +251,7 @@ class CONTENT_EXPORT BrowserAccessibilityManager : pub 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 4a82d008a8d4..63b800dbb890 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,4 +1,4 @@ ---- content/browser/browser_main_loop.cc.orig 2017-04-19 19:06:33 UTC +--- content/browser/browser_main_loop.cc.orig 2017-06-05 19:03:06 UTC +++ content/browser/browser_main_loop.cc @@ -210,6 +210,11 @@ #include "gpu/vulkan/vulkan_implementation.h" @@ -21,7 +21,7 @@ void SetupSandbox(const base::CommandLine& parsed_command_line) { TRACE_EVENT0("startup", "SetupSandbox"); if (parsed_command_line.HasSwitch(switches::kNoZygote)) { -@@ -584,10 +589,15 @@ void BrowserMainLoop::Init() { +@@ -553,10 +558,15 @@ void BrowserMainLoop::Init() { void BrowserMainLoop::EarlyInitialization() { TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc index 9c98c104da85..96dca9c34cea 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2017-04-19 19:06:33 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2017-06-05 19:03:06 UTC +++ content/browser/child_process_launcher_helper_linux.cc -@@ -67,6 +67,7 @@ ChildProcessLauncherHelper::LaunchProces +@@ -66,6 +66,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr int* launch_result) { *is_synchronous_launch = true; @@ -8,7 +8,7 @@ ZygoteHandle* zygote_handle = base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ? nullptr : delegate_->GetZygote(); -@@ -86,6 +87,7 @@ ChildProcessLauncherHelper::LaunchProces +@@ -85,6 +86,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr process.zygote = *zygote_handle; return process; } @@ -16,7 +16,7 @@ Process process; process.process = base::LaunchProcess(*command_line(), options); -@@ -105,10 +107,12 @@ base::TerminationStatus ChildProcessLaun +@@ -103,10 +105,12 @@ base::TerminationStatus ChildProcessLauncherHelper::Ge const ChildProcessLauncherHelper::Process& process, bool known_dead, int* exit_code) { @@ -29,7 +29,7 @@ if (known_dead) { return base::GetKnownDeadTerminationStatus( process.process.Handle(), exit_code); -@@ -127,13 +131,17 @@ void ChildProcessLauncherHelper::ForceNo +@@ -125,13 +129,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer ChildProcessLauncherHelper::Process process) { process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. @@ -46,4 +46,4 @@ +#endif } - // static + void ChildProcessLauncherHelper::SetProcessBackgroundedOnLauncherThread( 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 256f998fd97e..4a6f8f6d169c 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 2017-04-19 19:06:33 UTC +--- content/browser/devtools/protocol/color_picker.cc.orig 2017-06-05 19:03:06 UTC +++ content/browser/devtools/protocol/color_picker.cc -@@ -153,7 +153,7 @@ void ColorPicker::UpdateCursor() { +@@ -154,7 +154,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 7259a0375d3a..9fbb9a4edc1a 100644 --- a/www/chromium/files/patch-content_browser_download_base__file.cc +++ b/www/chromium/files/patch-content_browser_download_base__file.cc @@ -1,6 +1,6 @@ ---- content/browser/download/base_file.cc.orig 2017-04-19 19:06:33 UTC +--- content/browser/download/base_file.cc.orig 2017-06-05 19:03:06 UTC +++ content/browser/download/base_file.cc -@@ -380,7 +380,7 @@ DownloadInterruptReason BaseFile::LogInt +@@ -387,7 +387,7 @@ DownloadInterruptReason BaseFile::LogInterruptReason( return reason; } @@ -9,7 +9,7 @@ namespace { -@@ -463,7 +463,7 @@ DownloadInterruptReason BaseFile::Annota +@@ -470,7 +470,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn } return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED; } 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 a915ad82fe69..baded2b9c450 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 2017-04-19 19:06:33 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2017-06-05 19:03:07 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -396,7 +396,7 @@ bool GpuDataManagerImplPrivate::GpuAcces +@@ -402,7 +402,7 @@ bool GpuDataManagerImplPrivate::GpuAccessAllowed( // strings even if all features are blacklisted. If all GPU features are // disabled, the GPU process will only initialize GL bindings, create a GL // context, and collect full GPU info. @@ -9,7 +9,7 @@ if (reason) { *reason = "All GPU features are blacklisted."; } -@@ -513,8 +513,10 @@ void GpuDataManagerImplPrivate::SetGLStr +@@ -516,8 +516,10 @@ void GpuDataManagerImplPrivate::SetGLStrings(const std gpu_info.gl_renderer = gl_renderer; gpu_info.gl_version = gl_version; @@ -20,7 +20,7 @@ UpdateGpuInfo(gpu_info); UpdateGpuSwitchingManager(gpu_info); -@@ -572,10 +574,12 @@ void GpuDataManagerImplPrivate::Initiali +@@ -575,10 +577,12 @@ void GpuDataManagerImplPrivate::Initialize() { // 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) && -@@ -686,7 +690,9 @@ void GpuDataManagerImplPrivate::UpdateGp +@@ -695,7 +699,9 @@ void GpuDataManagerImplPrivate::UpdateGpuInfo(const gp 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 abdca9652e3a..5bad8a9afcaf 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 2017-04-19 19:06:33 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2017-06-05 19:03:07 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.h -@@ -156,7 +156,7 @@ class CONTENT_EXPORT GpuDataManagerImplP +@@ -153,7 +153,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { 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 6f216ef38b8a..1ecd5f91655e 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,4 +1,4 @@ ---- content/browser/gpu/gpu_internals_ui.cc.orig 2017-04-19 19:06:33 UTC +--- content/browser/gpu/gpu_internals_ui.cc.orig 2017-06-05 19:03:07 UTC +++ content/browser/gpu/gpu_internals_ui.cc @@ -43,7 +43,7 @@ #include "third_party/skia/include/core/SkMilestone.h" @@ -18,7 +18,7 @@ #include "ui/base/x/x11_util.h" // nogncheck #include "ui/gfx/x/x11_atom_cache.h" // nogncheck #endif -@@ -204,7 +204,7 @@ base::DictionaryValue* GpuInfoAsDictiona +@@ -206,7 +206,7 @@ base::DictionaryValue* GpuInfoAsDictionaryValue() { 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 5ed494d03a45..3c30edfa7c0b 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 2017-04-19 19:06:33 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2017-06-05 19:03:07 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -1024,7 +1024,7 @@ bool GpuProcessHost::LaunchGpuProcess(gp +@@ -965,7 +965,7 @@ bool GpuProcessHost::LaunchGpuProcess(gpu::GpuPreferen std::unique_ptr<base::CommandLine> cmd_line = base::MakeUnique<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 71a3e83cb4e0..be90730d1c07 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 2017-04-19 19:06:33 UTC +--- content/browser/media/media_internals.cc.orig 2017-06-05 19:03:07 UTC +++ content/browser/media/media_internals.cc -@@ -774,7 +774,7 @@ void MediaInternals::UpdateVideoCaptureD +@@ -776,7 +776,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit 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__coordinator__impl.cc b/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc index 7255b1f5f590..91a71ec7e551 100644 --- a/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc +++ b/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/memory/memory_coordinator_impl.cc.orig 2017-04-19 19:06:33 UTC +--- content/browser/memory/memory_coordinator_impl.cc.orig 2017-06-05 19:03:07 UTC +++ content/browser/memory/memory_coordinator_impl.cc -@@ -90,8 +90,12 @@ void MemoryCoordinatorHandleImpl::AddChi +@@ -138,8 +138,12 @@ void MemoryCoordinatorHandleImpl::AddChild( struct MemoryCoordinatorImplSingletonTraits : public base::LeakySingletonTraits<MemoryCoordinatorImpl> { static MemoryCoordinatorImpl* New() { diff --git a/www/chromium/files/patch-content_browser_memory_memory__monitor.cc b/www/chromium/files/patch-content_browser_memory_memory__monitor.cc index b8f05805dc31..6ac5abc4f252 100644 --- a/www/chromium/files/patch-content_browser_memory_memory__monitor.cc +++ b/www/chromium/files/patch-content_browser_memory_memory__monitor.cc @@ -1,4 +1,4 @@ ---- content/browser/memory/memory_monitor.cc.orig 2017-04-19 19:06:33 UTC +--- content/browser/memory/memory_monitor.cc.orig 2017-06-05 19:03:07 UTC +++ content/browser/memory/memory_monitor.cc @@ -8,6 +8,7 @@ @@ -8,7 +8,7 @@ // static MemoryMonitorDelegate* MemoryMonitorDelegate::GetInstance() { return base::Singleton< -@@ -21,8 +22,9 @@ void MemoryMonitorDelegate::GetSystemMem +@@ -21,8 +22,9 @@ void MemoryMonitorDelegate::GetSystemMemoryInfo( base::SystemMemoryInfoKB* mem_info) { base::GetSystemMemoryInfo(mem_info); } 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 0c619fa080c5..13edd13db310 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,6 +1,6 @@ ---- content/browser/ppapi_plugin_process_host.cc.orig 2017-04-19 19:06:33 UTC +--- content/browser/ppapi_plugin_process_host.cc.orig 2017-06-05 19:03:07 UTC +++ content/browser/ppapi_plugin_process_host.cc -@@ -55,9 +55,9 @@ +@@ -54,9 +54,9 @@ namespace content { @@ -12,7 +12,7 @@ // NOTE: changes to this class need to be reviewed by the security team. class PpapiPluginSandboxedProcessLauncherDelegate -@@ -111,7 +111,7 @@ class PpapiPluginSandboxedProcessLaunche +@@ -110,7 +110,7 @@ class PpapiPluginSandboxedProcessLauncherDelegate return true; } @@ -21,7 +21,7 @@ ZygoteHandle* GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); -@@ -205,13 +205,13 @@ PpapiPluginProcessHost* PpapiPluginProce +@@ -204,13 +204,13 @@ PpapiPluginProcessHost* PpapiPluginProcessHost::Create return NULL; } @@ -37,7 +37,7 @@ // static void PpapiPluginProcessHost::DidCreateOutOfProcessInstance( -@@ -363,7 +363,7 @@ bool PpapiPluginProcessHost::Init(const +@@ -362,7 +362,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn base::CommandLine::StringType plugin_launcher = browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); diff --git a/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc b/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc deleted file mode 100644 index 80794c4b03b6..000000000000 --- a/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/browser/renderer_host/media/video_capture_manager.cc.orig 2017-04-19 19:06:33 UTC -+++ content/browser/renderer_host/media/video_capture_manager.cc -@@ -645,7 +645,7 @@ VideoCaptureManager::DoStartTabCaptureOn - DCHECK(IsOnDeviceThread()); - - std::unique_ptr<VideoCaptureDevice> video_capture_device; --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - video_capture_device = WebContentsVideoCaptureDevice::Create(id); - #endif - -@@ -675,7 +675,7 @@ VideoCaptureManager::DoStartDesktopCaptu - } - - if (desktop_id.type == DesktopMediaID::TYPE_WEB_CONTENTS) { --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - video_capture_device = WebContentsVideoCaptureDevice::Create(id); - IncrementDesktopCaptureCounter(TAB_VIDEO_CAPTURER_CREATED); - if (desktop_id.audio_share) { diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc index 8a37fe2c789d..9ce91a4a5a81 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2017-04-19 19:06:33 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2017-06-05 19:03:07 UTC +++ content/browser/renderer_host/render_message_filter.cc -@@ -89,7 +89,7 @@ +@@ -84,7 +84,7 @@ #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" #endif diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h index 3eda08ad248d..e9e6a4e50189 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h @@ -1,7 +1,7 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2017-04-19 19:06:33 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2017-06-05 19:03:07 UTC +++ content/browser/renderer_host/render_message_filter.h -@@ -132,7 +132,7 @@ class CONTENT_EXPORT RenderMessageFilter - const std::list<base::ProcessHandle>& handles); +@@ -130,7 +130,7 @@ class CONTENT_EXPORT RenderMessageFilter + bool has_gpu); void OnResolveProxy(const GURL& url, IPC::Message* reply_msg); -#if defined(OS_LINUX) 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 5f249d3ac7cf..5f3d3567cb5e 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 2017-04-19 19:06:33 UTC -+++ content/browser/renderer_host/render_process_host_impl.cc -@@ -378,11 +378,11 @@ SiteProcessMap* GetSiteProcessMapForBrow +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2017-06-15 21:03:05.000000000 +0200 ++++ content/browser/renderer_host/render_process_host_impl.cc 2017-06-18 13:40:02.058069000 +0200 +@@ -381,11 +381,11 @@ return map; } @@ -14,7 +14,7 @@ // NOTE: changes to this class need to be reviewed by the security team. class RendererSandboxedProcessLauncherDelegate -@@ -405,7 +405,7 @@ class RendererSandboxedProcessLauncherDe +@@ -408,7 +408,7 @@ return GetContentClient()->browser()->PreSpawnRenderer(policy); } @@ -23,7 +23,7 @@ ZygoteHandle* GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); -@@ -655,7 +655,7 @@ void RenderProcessHost::SetMaxRendererPr +@@ -647,7 +647,7 @@ g_max_renderer_count_override = count; } @@ -32,7 +32,7 @@ // static void RenderProcessHostImpl::EarlyZygoteLaunch() { DCHECK(!g_render_zygote); -@@ -665,7 +665,7 @@ void RenderProcessHostImpl::EarlyZygoteL +@@ -657,7 +657,7 @@ ZygoteHostImpl::GetInstance()->SetRendererSandboxStatus( (*GetGenericZygote())->GetSandboxStatus()); } @@ -41,7 +41,7 @@ RenderProcessHostImpl::RenderProcessHostImpl( BrowserContext* browser_context, -@@ -813,7 +813,7 @@ bool RenderProcessHostImpl::Init() { +@@ -807,7 +807,7 @@ renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); @@ -50,3 +50,11 @@ int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; #else +@@ -1551,7 +1551,6 @@ + + --visible_widgets_; + if (visible_widgets_ == 0) { +- DCHECK(!is_process_backgrounded_); + UpdateProcessPriority(); + } + } diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index b9754b11794a..4cb3b1d5ed56 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2017-04-19 19:06:33 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2017-06-05 19:03:07 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -140,7 +140,7 @@ void GetPlatformSpecificPrefs(RendererPr +@@ -142,7 +142,7 @@ void GetPlatformSpecificPrefs(RendererPreferences* pre display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); 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 6baa618efc5d..9b17803027c7 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 2017-04-19 19:06:33 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2017-06-05 19:03:07 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -116,7 +116,7 @@ +@@ -114,7 +114,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.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 -@@ -2031,7 +2031,7 @@ bool RenderWidgetHostViewAura::NeedsInpu +@@ -2040,7 +2040,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -18,7 +18,7 @@ return NeedsInputGrab(); #endif return false; -@@ -2231,7 +2231,7 @@ void RenderWidgetHostViewAura::ForwardKe +@@ -2241,7 +2241,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEvent( if (!target_host) return; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index f40b8d12544c..8c5d9bc91d40 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2017-04-19 19:06:33 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2017-06-05 19:03:07 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -546,7 +546,7 @@ bool RenderWidgetHostViewEventHandler::C +@@ -548,7 +548,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; 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 6c766bac646d..6867b7022008 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 2017-04-19 19:06:33 UTC +--- content/browser/tracing/tracing_controller_impl.cc.orig 2017-06-05 19:03:07 UTC +++ content/browser/tracing/tracing_controller_impl.cc -@@ -476,7 +476,7 @@ void TracingControllerImpl::AddTraceMess +@@ -412,7 +412,7 @@ void TracingControllerImpl::AddTraceMessageFilter( return; } @@ -9,7 +9,7 @@ // On Linux the browser process dumps process metrics for child process due to // sandbox. tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess( -@@ -504,7 +504,7 @@ void TracingControllerImpl::RemoveTraceM +@@ -440,7 +440,7 @@ void TracingControllerImpl::RemoveTraceMessageFilter( 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 53a1355b6f89..488231f03846 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,6 +1,6 @@ ---- content/browser/utility_process_host_impl.cc.orig 2017-04-19 19:06:33 UTC +--- content/browser/utility_process_host_impl.cc.orig 2017-06-05 19:03:07 UTC +++ content/browser/utility_process_host_impl.cc -@@ -44,9 +44,9 @@ +@@ -43,9 +43,9 @@ #include "services/service_manager/public/cpp/interface_provider.h" #include "ui/base/ui_base_switches.h" @@ -12,7 +12,7 @@ #if defined(OS_WIN) #include "sandbox/win/src/sandbox_policy.h" -@@ -55,11 +55,11 @@ +@@ -54,11 +54,11 @@ namespace content { @@ -26,7 +26,7 @@ // NOTE: changes to this class need to be reviewed by the security team. class UtilitySandboxedProcessLauncherDelegate -@@ -74,10 +74,10 @@ class UtilitySandboxedProcessLauncherDel +@@ -73,10 +73,10 @@ class UtilitySandboxedProcessLauncherDelegate launch_elevated_(launch_elevated) #elif defined(OS_POSIX) env_(env) @@ -39,7 +39,7 @@ #endif // OS_WIN {} -@@ -106,13 +106,13 @@ class UtilitySandboxedProcessLauncherDel +@@ -105,13 +105,13 @@ class UtilitySandboxedProcessLauncherDelegate #elif defined(OS_POSIX) @@ -55,7 +55,7 @@ base::EnvironmentMap GetEnvironment() override { return env_; } #endif // OS_WIN -@@ -127,9 +127,9 @@ class UtilitySandboxedProcessLauncherDel +@@ -126,9 +126,9 @@ class UtilitySandboxedProcessLauncherDelegate bool launch_elevated_; #elif defined(OS_POSIX) base::EnvironmentMap env_; @@ -67,7 +67,7 @@ #endif // OS_WIN }; -@@ -154,7 +154,7 @@ UtilityProcessHostImpl::UtilityProcessHo +@@ -153,7 +153,7 @@ UtilityProcessHostImpl::UtilityProcessHostImpl( is_batch_mode_(false), no_sandbox_(false), run_elevated_(false), @@ -76,7 +76,7 @@ child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), #else child_flags_(ChildProcessHost::CHILD_NORMAL), -@@ -236,13 +236,13 @@ void UtilityProcessHostImpl::SetName(con +@@ -237,13 +237,13 @@ void UtilityProcessHostImpl::SetName(const base::strin name_ = name; } diff --git a/www/chromium/files/patch-content_child_child__process.cc b/www/chromium/files/patch-content_child_child__process.cc index 3e2c0ae2cacb..b57914e73e30 100644 --- a/www/chromium/files/patch-content_child_child__process.cc +++ b/www/chromium/files/patch-content_child_child__process.cc @@ -1,6 +1,6 @@ ---- content/child/child_process.cc.orig 2017-04-19 19:06:33 UTC +--- content/child/child_process.cc.orig 2017-06-05 19:03:07 UTC +++ content/child/child_process.cc -@@ -133,7 +133,7 @@ void ChildProcess::ReleaseProcess() { +@@ -129,7 +129,7 @@ void ChildProcess::ReleaseProcess() { main_thread_->OnProcessFinalRelease(); } diff --git a/www/chromium/files/patch-content_child_child__process.h b/www/chromium/files/patch-content_child_child__process.h index 7c9704e99204..e29e5f3dc22d 100644 --- a/www/chromium/files/patch-content_child_child__process.h +++ b/www/chromium/files/patch-content_child_child__process.h @@ -1,6 +1,6 @@ ---- content/child/child_process.h.orig 2017-04-19 19:06:33 UTC +--- content/child/child_process.h.orig 2017-06-05 19:03:07 UTC +++ content/child/child_process.h -@@ -82,7 +82,7 @@ class CONTENT_EXPORT ChildProcess { +@@ -79,7 +79,7 @@ class CONTENT_EXPORT ChildProcess { void AddRefProcess(); void ReleaseProcess(); diff --git a/www/chromium/files/patch-content_child_child__thread__impl.cc b/www/chromium/files/patch-content_child_child__thread__impl.cc index 81a97b393980..5e9d5cc7ce08 100644 --- a/www/chromium/files/patch-content_child_child__thread__impl.cc +++ b/www/chromium/files/patch-content_child_child__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/child/child_thread_impl.cc.orig 2017-04-19 19:06:33 UTC +--- content/child/child_thread_impl.cc.orig 2017-06-05 19:03:07 UTC +++ content/child/child_thread_impl.cc -@@ -699,7 +699,7 @@ std::unique_ptr<base::SharedMemory> Chil +@@ -698,7 +698,7 @@ std::unique_ptr<base::SharedMemory> ChildThreadImpl::A return base::MakeUnique<base::SharedMemory>(shared_buf, false); } diff --git a/www/chromium/files/patch-content_child_child__thread__impl.h b/www/chromium/files/patch-content_child_child__thread__impl.h index 47c1eff9899c..f2dd0261751b 100644 --- a/www/chromium/files/patch-content_child_child__thread__impl.h +++ b/www/chromium/files/patch-content_child_child__thread__impl.h @@ -1,6 +1,6 @@ ---- content/child/child_thread_impl.h.orig 2017-04-19 19:06:33 UTC +--- content/child/child_thread_impl.h.orig 2017-06-05 19:03:07 UTC +++ content/child/child_thread_impl.h -@@ -116,7 +116,7 @@ class CONTENT_EXPORT ChildThreadImpl +@@ -112,7 +112,7 @@ class CONTENT_EXPORT ChildThreadImpl static std::unique_ptr<base::SharedMemory> AllocateSharedMemory( size_t buf_size); diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index 8ff43c05c1a2..985198742dc7 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 2017-04-19 19:06:33 UTC +--- content/common/BUILD.gn.orig 2017-06-05 19:03:07 UTC +++ content/common/BUILD.gn -@@ -503,7 +503,7 @@ source_set("common") { +@@ -508,7 +508,7 @@ source_set("common") { } if (!use_seccomp_bpf) { @@ -9,7 +9,7 @@ sources -= [ "sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc", "sandbox_linux/bpf_cros_arm_gpu_policy_linux.h", -@@ -517,6 +517,16 @@ source_set("common") { +@@ -522,6 +522,16 @@ 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_child__process__messages.h b/www/chromium/files/patch-content_common_child__process__messages.h index d9d8582ae089..f23d73a42e7f 100644 --- a/www/chromium/files/patch-content_common_child__process__messages.h +++ b/www/chromium/files/patch-content_common_child__process__messages.h @@ -1,4 +1,4 @@ ---- content/common/child_process_messages.h.orig 2017-04-19 19:06:33 UTC +--- content/common/child_process_messages.h.orig 2017-06-05 19:03:07 UTC +++ content/common/child_process_messages.h @@ -26,7 +26,7 @@ #include "ui/gfx/ipc/gfx_param_traits.h" @@ -9,7 +9,7 @@ #include "base/threading/platform_thread.h" #endif -@@ -75,7 +75,7 @@ IPC_STRUCT_TRAITS_BEGIN(tracked_objects: +@@ -75,7 +75,7 @@ IPC_STRUCT_TRAITS_BEGIN(tracked_objects::ProcessDataSn IPC_STRUCT_TRAITS_MEMBER(process_id) IPC_STRUCT_TRAITS_END() @@ -18,7 +18,7 @@ IPC_ENUM_TRAITS_MAX_VALUE(base::ThreadPriority, base::ThreadPriority::REALTIME_AUDIO) #endif -@@ -171,7 +171,7 @@ IPC_SYNC_MESSAGE_CONTROL1_0(ChildProcess +@@ -171,7 +171,7 @@ IPC_SYNC_MESSAGE_CONTROL1_0(ChildProcessHostMsg_PreCac IPC_MESSAGE_CONTROL0(ChildProcessHostMsg_ReleaseCachedFonts) #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-content_common_content__switches__internal.cc b/www/chromium/files/patch-content_common_content__switches__internal.cc index 0977c854a6ea..ad1b6c325127 100644 --- a/www/chromium/files/patch-content_common_content__switches__internal.cc +++ b/www/chromium/files/patch-content_common_content__switches__internal.cc @@ -1,6 +1,6 @@ ---- content/common/content_switches_internal.cc.orig 2017-04-19 19:06:33 UTC +--- content/common/content_switches_internal.cc.orig 2017-06-05 19:03:07 UTC +++ content/common/content_switches_internal.cc -@@ -27,7 +27,7 @@ const base::Feature kUseZoomForDsfEnable +@@ -27,7 +27,7 @@ const base::Feature kUseZoomForDsfEnabledByDefault { #endif bool IsUseZoomForDSFEnabledByDefault() { 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 69c0bf655f1a..fa3980d1e458 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 2017-04-19 19:06:34 UTC +--- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig 2017-06-05 19:03:07 UTC +++ content/common/sandbox_linux/sandbox_debug_handling_linux.cc @@ -7,7 +7,9 @@ #include <errno.h> @@ -10,7 +10,7 @@ #include <unistd.h> #include "base/command_line.h" -@@ -69,12 +71,16 @@ bool SandboxDebugHandling::SetDumpableSt +@@ -69,12 +71,16 @@ bool SandboxDebugHandling::SetDumpableStatusAndHandler return true; } diff --git a/www/chromium/files/patch-content_common_view__messages.h b/www/chromium/files/patch-content_common_view__messages.h index 77344b30003d..e70a51653ac4 100644 --- a/www/chromium/files/patch-content_common_view__messages.h +++ b/www/chromium/files/patch-content_common_view__messages.h @@ -1,6 +1,6 @@ ---- content/common/view_messages.h.orig 2017-04-19 19:06:34 UTC +--- content/common/view_messages.h.orig 2017-06-05 19:03:07 UTC +++ content/common/view_messages.h -@@ -245,7 +245,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::Rendere +@@ -245,7 +245,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) IPC_STRUCT_TRAITS_MEMBER(use_video_overlay_for_embedded_encrypted_video) IPC_STRUCT_TRAITS_MEMBER(network_contry_iso) diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn index fad94ee0628b..b8bbfedfdda3 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 2017-04-19 19:06:34 UTC +--- content/gpu/BUILD.gn.orig 2017-06-05 19:03:07 UTC +++ content/gpu/BUILD.gn -@@ -98,6 +98,7 @@ target(link_target_type, "gpu_sources") +@@ -106,6 +106,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 deleted file mode 100644 index 2426bcefc074..000000000000 --- a/www/chromium/files/patch-content_gpu_gpu__child__thread.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- content/gpu/gpu_child_thread.cc.orig 2017-04-19 19:06:34 UTC -+++ content/gpu/gpu_child_thread.cc -@@ -398,6 +398,7 @@ void GpuChildThread::OnCollectGraphicsIn - } - #endif - -+#if !defined(OS_BSD) - #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. -@@ -420,6 +421,7 @@ void GpuChildThread::OnCollectGraphicsIn - base::MessageLoop::current()->QuitWhenIdle(); - } - #endif // OS_WIN -+#endif // XXX(rene) !FreeBSD - } - - void GpuChildThread::OnClean() { diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index accef8f0c411..d700d02df016 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 2017-04-19 19:06:34 UTC +--- content/gpu/gpu_main.cc.orig 2017-06-05 19:03:07 UTC +++ content/gpu/gpu_main.cc -@@ -98,7 +98,7 @@ namespace content { +@@ -96,7 +96,7 @@ namespace content { namespace { @@ -9,7 +9,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*); #elif defined(OS_WIN) bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*); -@@ -152,7 +152,7 @@ class ContentSandboxHelper : public gpu: +@@ -150,7 +150,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized( gpu::GpuWatchdogThread* watchdog_thread) override { @@ -18,7 +18,7 @@ return StartSandboxLinux(watchdog_thread); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -313,7 +313,7 @@ int GpuMain(const MainFunctionParams& pa +@@ -301,7 +301,7 @@ int GpuMain(const MainFunctionParams& parameters) { 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 13d080922412..029f893c8946 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 2017-04-19 19:06:34 UTC +--- content/gpu/in_process_gpu_thread.cc.orig 2017-06-05 19:03:07 UTC +++ content/gpu/in_process_gpu_thread.cc -@@ -54,8 +54,6 @@ void InProcessGpuThread::Init() { +@@ -55,8 +55,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 aeebc99f3111..0ec797f1c8d6 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 2017-04-19 19:06:34 UTC +--- content/public/common/child_process_host.h.orig 2017-06-05 19:03:07 UTC +++ content/public/common/child_process_host.h -@@ -54,7 +54,7 @@ class CONTENT_EXPORT ChildProcessHost : +@@ -46,7 +46,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se // 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. -@@ -63,7 +63,7 @@ class CONTENT_EXPORT ChildProcessHost : +@@ -55,7 +55,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se // 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 1eeccd159f80..914b3fea0b04 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 2017-04-19 19:06:34 UTC +--- content/public/common/content_switches.cc.orig 2017-06-05 19:03:07 UTC +++ content/public/common/content_switches.cc -@@ -1006,7 +1006,7 @@ const char kDisableVaapiAcceleratedVideo +@@ -1006,7 +1006,7 @@ const char kDisableVaapiAcceleratedVideoEncode[] = "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 d7035c6cbe4e..e52d1be3dd8c 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 2017-04-19 19:06:34 UTC +--- content/public/common/content_switches.h.orig 2017-06-05 19:03:07 UTC +++ content/public/common/content_switches.h -@@ -294,7 +294,7 @@ CONTENT_EXPORT extern const char kDisabl +@@ -294,7 +294,7 @@ CONTENT_EXPORT extern const char kDisablePanelFitting[ 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 index 4a5a14052710..971d50f4904a 100644 --- a/www/chromium/files/patch-content_public_common_renderer__preferences.h +++ b/www/chromium/files/patch-content_public_common_renderer__preferences.h @@ -1,6 +1,6 @@ ---- content/public/common/renderer_preferences.h.orig 2017-04-19 19:06:34 UTC +--- content/public/common/renderer_preferences.h.orig 2017-06-05 19:03:07 UTC +++ content/public/common/renderer_preferences.h -@@ -131,7 +131,7 @@ struct CONTENT_EXPORT RendererPreference +@@ -131,7 +131,7 @@ struct CONTENT_EXPORT RendererPreferences { // Country iso of the mobile network for content detection purpose. std::string network_contry_iso; 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 efb2042b2d60..3807a66249d4 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 2017-04-19 19:06:34 UTC +--- content/renderer/media/webrtc/processed_local_audio_source.cc.orig 2017-06-05 19:03:07 UTC +++ content/renderer/media/webrtc/processed_local_audio_source.cc -@@ -269,8 +269,8 @@ void ProcessedLocalAudioSource::Capture( +@@ -269,8 +269,8 @@ void ProcessedLocalAudioSource::Capture(const media::A 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 19d8e97b4e56..20973d0141b5 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,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2017-04-19 19:06:34 UTC +--- content/renderer/render_thread_impl.cc.orig 2017-06-05 19:03:07 UTC +++ content/renderer/render_thread_impl.cc -@@ -206,11 +206,13 @@ +@@ -210,11 +210,13 @@ #include "content/common/external_ipc_dumper.h" #endif @@ -14,7 +14,7 @@ using base::ThreadRestrictions; using blink::WebDocument; -@@ -1379,7 +1381,7 @@ media::GpuVideoAcceleratorFactories* Ren +@@ -1383,7 +1385,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_accelerator = !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); const bool enable_gpu_memory_buffer_video_frames = @@ -23,7 +23,7 @@ !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && !gpu_channel_host->gpu_info().software_rendering; -@@ -1712,6 +1714,8 @@ void RenderThreadImpl::GetRendererMemory +@@ -1726,6 +1728,8 @@ bool RenderThreadImpl::GetRendererMemoryMetrics( #else size_t malloc_usage = minfo.hblkhd + minfo.arena; #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 2311ab52faf1..6e5157ab7768 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,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2017-04-19 19:06:34 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2017-06-05 19:03:07 UTC +++ content/renderer/renderer_blink_platform_impl.cc @@ -112,7 +112,7 @@ @@ -9,7 +9,7 @@ #include <map> #include <string> -@@ -206,7 +206,7 @@ class RendererBlinkPlatformImpl::FileUti +@@ -206,7 +206,7 @@ class RendererBlinkPlatformImpl::FileUtilities : publi scoped_refptr<ThreadSafeSender> thread_safe_sender_; }; @@ -18,16 +18,16 @@ class RendererBlinkPlatformImpl::SandboxSupport : public blink::WebSandboxSupport { public: -@@ -252,7 +252,7 @@ RendererBlinkPlatformImpl::RendererBlink +@@ -251,7 +251,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( + web_scrollbar_behavior_(new WebScrollbarBehaviorImpl), renderer_scheduler_(renderer_scheduler), - blink_interface_provider_( - new BlinkInterfaceProviderImpl(remote_interfaces)) { + blink_interface_provider_(new BlinkInterfaceProviderImpl(connector)) { -#if !defined(OS_ANDROID) && !defined(OS_WIN) +#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) if (g_sandbox_enabled && sandboxEnabled()) { sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport); } else { -@@ -288,7 +288,7 @@ RendererBlinkPlatformImpl::~RendererBlin +@@ -294,7 +294,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl( } void RendererBlinkPlatformImpl::Shutdown() { @@ -36,21 +36,21 @@ // 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. -@@ -336,7 +336,7 @@ blink::WebFileUtilities* RendererBlinkPl +@@ -358,7 +358,7 @@ blink::WebFileUtilities* RendererBlinkPlatformImpl::Ge } - blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() { + blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { -#if defined(OS_ANDROID) || defined(OS_WIN) +#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD) // These platforms do not require sandbox support. return NULL; #else -@@ -543,7 +543,7 @@ bool RendererBlinkPlatformImpl::SandboxS +@@ -565,7 +565,7 @@ bool RendererBlinkPlatformImpl::SandboxSupport::LoadFo return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } -#elif defined(OS_POSIX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) - void RendererBlinkPlatformImpl::SandboxSupport::getFallbackFontForCharacter( + void RendererBlinkPlatformImpl::SandboxSupport::GetFallbackFontForCharacter( blink::WebUChar32 character, 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 1b3430ef03c6..8937c53f20a0 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,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2017-04-19 19:06:34 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2017-06-05 19:03:07 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -253,7 +253,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo +@@ -258,7 +258,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi class FileUtilities; std::unique_ptr<FileUtilities> file_utilities_; 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 7090b6bafc6a..56a8db8d3799 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,6 +1,6 @@ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2017-04-19 19:06:34 UTC +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2017-06-05 19:03:07 UTC +++ content/renderer/renderer_main_platform_delegate_linux.cc -@@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::Platf +@@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::PlatformUninitializ } bool RendererMainPlatformDelegate::EnableSandbox() { @@ -8,7 +8,7 @@ // The setuid sandbox is started in the zygote process: zygote_main_linux.cc // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox.md // -@@ -59,7 +60,7 @@ bool RendererMainPlatformDelegate::Enabl +@@ -59,7 +60,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { CHECK_EQ(errno, EPERM); } #endif // __x86_64__ diff --git a/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc b/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc index 0e068336ee75..661be8d4d4d4 100644 --- a/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc +++ b/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc @@ -1,15 +1,15 @@ ---- content/renderer/webscrollbarbehavior_impl_aura.cc.orig 2017-04-19 19:06:34 UTC +--- content/renderer/webscrollbarbehavior_impl_aura.cc.orig 2017-06-05 19:03:07 UTC +++ content/renderer/webscrollbarbehavior_impl_aura.cc -@@ -14,7 +14,7 @@ bool WebScrollbarBehaviorImpl::shouldCen - blink::WebPointerProperties::Button mouseButton, - bool shiftKeyPressed, - bool altKeyPressed) { +@@ -14,7 +14,7 @@ bool WebScrollbarBehaviorImpl::ShouldCenterOnThumb( + 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) + if (mouseButton == blink::WebPointerProperties::Button::kMiddle) return true; #endif -@@ -29,7 +29,7 @@ bool WebScrollbarBehaviorImpl::shouldSna +@@ -29,7 +29,7 @@ bool WebScrollbarBehaviorImpl::ShouldSnapBackToDragOri // 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). diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 0167eba7577f..5ca8121f9838 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 2017-04-19 19:06:34 UTC +--- content/shell/BUILD.gn.orig 2017-06-05 19:03:07 UTC +++ content/shell/BUILD.gn -@@ -295,7 +295,7 @@ static_library("content_shell_lib") { +@@ -298,7 +298,7 @@ static_library("content_shell_lib") { ] } @@ -9,7 +9,7 @@ deps += [ "//build/linux:fontconfig", "//ui/gfx:test_support", -@@ -319,7 +319,7 @@ static_library("content_shell_lib") { +@@ -322,7 +322,7 @@ static_library("content_shell_lib") { ] } @@ -18,16 +18,16 @@ deps += [ "//components/crash/content/app", "//components/crash/content/browser", -@@ -368,7 +368,7 @@ static_library("content_shell_lib") { +@@ -371,7 +371,7 @@ static_library("content_shell_lib") { ] } - if (is_linux) { + if (is_linux || is_bsd) { - deps += [ "//third_party/freetype-android:freetype" ] + deps += [ "//third_party/freetype" ] } -@@ -539,7 +539,7 @@ if (is_android) { +@@ -543,7 +543,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 0d8886b4b2a4..f8a4b60779d4 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,4 +1,4 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2017-04-19 19:06:34 UTC +--- content/shell/browser/shell_browser_context.cc.orig 2017-06-05 19:03:07 UTC +++ content/shell/browser/shell_browser_context.cc @@ -25,7 +25,7 @@ @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" -@@ -97,7 +97,7 @@ void ShellBrowserContext::InitWhileIOAll +@@ -101,7 +101,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { #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 6e6b564dd829..cbb1cb5f7dc6 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,4 +1,4 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2017-04-19 19:06:34 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2017-06-05 19:03:07 UTC +++ content/shell/browser/shell_browser_main_parts.cc @@ -46,7 +46,7 @@ #if defined(USE_AURA) && defined(USE_X11) @@ -9,7 +9,7 @@ #include "ui/base/ime/input_method_initializer.h" #endif #if defined(OS_CHROMEOS) -@@ -142,7 +142,7 @@ void ShellBrowserMainParts::PostMainMess +@@ -142,7 +142,7 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() } void ShellBrowserMainParts::PreEarlyInitialization() { diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index 968e41e4bfa4..5232b9fa78f3 100644 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ b/www/chromium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2017-04-19 19:06:34 UTC +--- content/test/BUILD.gn.orig 2017-06-05 19:03:07 UTC +++ content/test/BUILD.gn -@@ -785,7 +785,7 @@ test("content_browsertests") { +@@ -815,7 +815,7 @@ test("content_browsertests") { } } @@ -9,7 +9,7 @@ data += [ "$root_out_dir/content_shell.pak", "data/", -@@ -1425,7 +1425,7 @@ test("content_unittests") { +@@ -1442,7 +1442,7 @@ test("content_unittests") { sources += [ "../browser/memory/memory_monitor_linux_unittest.cc" ] } @@ -18,7 +18,7 @@ data = [ "$root_out_dir/content_shell.pak", "data/", -@@ -1632,7 +1632,7 @@ test("content_unittests") { +@@ -1657,7 +1657,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" ] -@@ -1670,7 +1670,7 @@ test("content_unittests") { +@@ -1695,7 +1695,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 249910cbcc3b..29c589c01226 100644 --- a/www/chromium/files/patch-crypto_nss__util.cc +++ b/www/chromium/files/patch-crypto_nss__util.cc @@ -1,4 +1,4 @@ ---- crypto/nss_util.cc.orig 2017-04-19 19:06:34 UTC +--- crypto/nss_util.cc.orig 2017-06-05 19:03:07 UTC +++ crypto/nss_util.cc @@ -20,7 +20,7 @@ #include "base/threading/thread_task_runner_handle.h" @@ -9,7 +9,7 @@ #include <sys/mount.h> #include <sys/param.h> #endif -@@ -150,10 +150,10 @@ void UseLocalCacheOfNSSDatabaseIfNFS(con +@@ -150,10 +150,10 @@ void UseLocalCacheOfNSSDatabaseIfNFS(const base::FileP 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 1feb2146b8ec..54454bb8e67a 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 2017-04-19 19:06:34 UTC -+++ device/BUILD.gn -@@ -200,7 +200,7 @@ test("device_unittests") { +--- device/BUILD.gn.orig 2017-06-15 21:03:06.000000000 +0200 ++++ device/BUILD.gn 2017-06-16 17:58:33.422808000 +0200 +@@ -206,7 +206,7 @@ ] } diff --git a/www/chromium/files/patch-device_battery_BUILD.gn b/www/chromium/files/patch-device_battery_BUILD.gn index 8c51ce4f7726..8044d3ca22dd 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 2017-04-19 19:06:34 UTC +--- device/battery/BUILD.gn.orig 2017-06-05 19:03:07 UTC +++ device/battery/BUILD.gn -@@ -47,7 +47,7 @@ if (!is_android) { +@@ -48,7 +48,7 @@ if (!is_android) { ] } diff --git a/www/chromium/files/patch-device_bluetooth_BUILD.gn b/www/chromium/files/patch-device_bluetooth_BUILD.gn index a27c4596720c..2f442e9cdf33 100644 --- a/www/chromium/files/patch-device_bluetooth_BUILD.gn +++ b/www/chromium/files/patch-device_bluetooth_BUILD.gn @@ -1,6 +1,6 @@ ---- device/bluetooth/BUILD.gn.orig 2017-04-19 19:06:34 UTC +--- device/bluetooth/BUILD.gn.orig 2017-06-05 19:03:07 UTC +++ device/bluetooth/BUILD.gn -@@ -200,7 +200,7 @@ component("bluetooth") { +@@ -202,7 +202,7 @@ component("bluetooth") { ] } diff --git a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc index 26527f14a500..e53aab806c9f 100644 --- a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,6 +1,6 @@ ---- device/gamepad/gamepad_provider.cc.orig 2017-04-19 19:06:34 UTC +--- device/gamepad/gamepad_provider.cc.orig 2017-06-05 19:03:07 UTC +++ device/gamepad/gamepad_provider.cc -@@ -153,7 +153,7 @@ void GamepadProvider::Initialize(std::un +@@ -153,7 +153,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep monitor->AddDevicesChangedObserver(this); polling_thread_.reset(new base::Thread("Gamepad polling thread")); diff --git a/www/chromium/files/patch-device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-device_geolocation_location__arbitrator.cc index b316169411bf..11518c5e88f2 100644 --- a/www/chromium/files/patch-device_geolocation_location__arbitrator.cc +++ b/www/chromium/files/patch-device_geolocation_location__arbitrator.cc @@ -1,6 +1,6 @@ ---- device/geolocation/location_arbitrator.cc.orig 2017-04-19 19:06:34 UTC +--- device/geolocation/location_arbitrator.cc.orig 2017-06-05 19:03:07 UTC +++ device/geolocation/location_arbitrator.cc -@@ -182,7 +182,7 @@ LocationArbitrator::NewNetworkLocationPr +@@ -182,7 +182,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { diff --git a/www/chromium/files/patch-device_sensors_data__fetcher__shared__memory.h b/www/chromium/files/patch-device_sensors_data__fetcher__shared__memory.h index 3e393135e0e7..bf3eebcad482 100644 --- a/www/chromium/files/patch-device_sensors_data__fetcher__shared__memory.h +++ b/www/chromium/files/patch-device_sensors_data__fetcher__shared__memory.h @@ -1,6 +1,6 @@ ---- device/sensors/data_fetcher_shared_memory.h.orig 2017-04-19 19:06:34 UTC +--- device/sensors/data_fetcher_shared_memory.h.orig 2017-06-05 19:03:07 UTC +++ device/sensors/data_fetcher_shared_memory.h -@@ -44,7 +44,7 @@ class DEVICE_SENSOR_EXPORT DataFetcherSh +@@ -44,7 +44,7 @@ class DEVICE_SENSOR_EXPORT DataFetcherSharedMemory bool Start(ConsumerType consumer_type, void* buffer) override; bool Stop(ConsumerType consumer_type) override; diff --git a/www/chromium/files/patch-device_serial_BUILD.gn b/www/chromium/files/patch-device_serial_BUILD.gn index 5e66e46f4d31..a0c73286fa1d 100644 --- a/www/chromium/files/patch-device_serial_BUILD.gn +++ b/www/chromium/files/patch-device_serial_BUILD.gn @@ -1,4 +1,4 @@ ---- device/serial/BUILD.gn.orig 2017-04-19 19:06:34 UTC +--- device/serial/BUILD.gn.orig 2017-06-05 19:03:07 UTC +++ device/serial/BUILD.gn @@ -6,7 +6,7 @@ import("//build/config/features.gni") import("//mojo/public/tools/bindings/mojom.gni") @@ -9,16 +9,16 @@ config("platform_support") { visibility = [ ":serial" ] -@@ -55,6 +55,12 @@ static_library("serial") { +@@ -54,6 +54,12 @@ static_library("serial") { + if (use_udev) { deps += [ "//device/udev_linux" ] - } ++ } + if (is_bsd) { + sources -= [ + "serial_device_enumerator_linux.cc", + "serial_device_enumerator_linux.h" + ] -+ } + } if (is_chromeos) { deps += [ - "//chromeos", 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 b515cc9b1848..d5f4c912ba32 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 2017-04-19 19:06:34 UTC +--- device/serial/serial_io_handler_posix.cc.orig 2017-06-05 19:03:07 UTC +++ device/serial/serial_io_handler_posix.cc -@@ -61,7 +61,7 @@ bool BitrateToSpeedConstant(int bitrate, +@@ -61,7 +61,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) diff --git a/www/chromium/files/patch-device_usb_BUILD.gn b/www/chromium/files/patch-device_usb_BUILD.gn new file mode 100644 index 000000000000..b48d215b1fe4 --- /dev/null +++ b/www/chromium/files/patch-device_usb_BUILD.gn @@ -0,0 +1,21 @@ +--- device/usb/BUILD.gn.orig 2017-06-16 17:45:56.630063000 +0200 ++++ device/usb/BUILD.gn 2017-06-16 17:59:22.070474000 +0200 +@@ -97,10 +97,17 @@ + libs = [ "setupapi.lib" ] + } + +- if (is_android || is_chromeos || is_linux) { ++ if (is_android || is_chromeos || (is_linux && !is_bsd)) { + sources += [ + "usb_device_handle_usbfs.cc", + "usb_device_handle_usbfs.h", ++ ] ++ } ++ ++ if (is_bsd) { ++ sources -= [ ++ "usb_device_linux.cc", ++ "usb_device_linux.h", + ] + } + diff --git a/www/chromium/files/patch-device_usb_usb__context.cc b/www/chromium/files/patch-device_usb_usb__context.cc index 1379b24fcf9c..5de6fef3bf71 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 2017-04-19 19:06:34 UTC +--- device/usb/usb_context.cc.orig 2017-06-05 19:03:07 UTC +++ device/usb/usb_context.cc @@ -9,8 +9,13 @@ #include "base/macros.h" @@ -14,7 +14,7 @@ namespace device { -@@ -58,7 +63,9 @@ void UsbContext::UsbEventHandler::Run() +@@ -58,7 +63,9 @@ void UsbContext::UsbEventHandler::Run() { void UsbContext::UsbEventHandler::Stop() { base::subtle::Release_Store(&running_, 0); 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 861a8249b284..b4641b98cbd3 100644 --- a/www/chromium/files/patch-device_usb_usb__service__impl.cc +++ b/www/chromium/files/patch-device_usb_usb__service__impl.cc @@ -1,4 +1,4 @@ ---- device/usb/usb_service_impl.cc.orig 2017-04-19 19:06:34 UTC +--- device/usb/usb_service_impl.cc.orig 2017-06-05 19:03:07 UTC +++ device/usb/usb_service_impl.cc @@ -25,7 +25,11 @@ #include "device/usb/usb_error.h" @@ -24,7 +24,7 @@ for (auto* platform_device : ignored_devices_) libusb_unref_device(platform_device); } -@@ -289,6 +295,7 @@ void UsbServiceImpl::OnUsbContext(scoped +@@ -289,6 +295,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon context_ = std::move(context); @@ -32,7 +32,7 @@ int rv = libusb_hotplug_register_callback( context_->context(), static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -301,6 +308,7 @@ void UsbServiceImpl::OnUsbContext(scoped +@@ -301,6 +308,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon // This will call any enumeration callbacks queued while initializing. RefreshDevices(); @@ -40,7 +40,7 @@ #if defined(OS_WIN) DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); -@@ -500,6 +508,7 @@ void UsbServiceImpl::RemoveDevice(scoped +@@ -500,6 +508,7 @@ void UsbServiceImpl::RemoveDevice(scoped_refptr<UsbDev device->OnDisconnect(); } @@ -48,7 +48,7 @@ // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, -@@ -530,6 +539,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC +@@ -530,6 +539,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb 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 115e64abf2d6..f0cced5c3aac 100644 --- a/www/chromium/files/patch-device_usb_usb__service__impl.h +++ b/www/chromium/files/patch-device_usb_usb__service__impl.h @@ -1,6 +1,6 @@ ---- device/usb/usb_service_impl.h.orig 2017-04-19 19:06:34 UTC +--- device/usb/usb_service_impl.h.orig 2017-06-05 19:03:07 UTC +++ device/usb/usb_service_impl.h -@@ -15,7 +15,13 @@ +@@ -15,8 +15,14 @@ #include "build/build_config.h" #include "device/usb/usb_context.h" #include "device/usb/usb_device_impl.h" @@ -10,10 +10,11 @@ +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif -+ ++ #if defined(OS_WIN) #include "base/scoped_observer.h" + #include "device/base/device_monitor_win.h" @@ -73,11 +79,13 @@ class UsbServiceImpl : scoped_refptr<UsbDeviceImpl> device); void RemoveDevice(scoped_refptr<UsbDeviceImpl> device); 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 d94b27c67d46..50781b4c63ac 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,4 +1,4 @@ ---- extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig 2017-04-19 19:06:34 UTC +--- extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig 2017-06-05 19:03:07 UTC +++ extensions/browser/api/networking_private/networking_private_event_router_factory.cc @@ -13,6 +13,7 @@ @@ -8,7 +8,7 @@ // static NetworkingPrivateEventRouter* NetworkingPrivateEventRouterFactory::GetForProfile( -@@ -57,5 +58,6 @@ bool NetworkingPrivateEventRouterFactory +@@ -57,5 +58,6 @@ bool NetworkingPrivateEventRouterFactory::ServiceIsCre 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 5b69f283de98..f6c7b0757d78 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 2017-04-19 19:06:34 UTC +--- extensions/browser/api/serial/serial_api.cc.orig 2017-06-05 19:03:07 UTC +++ extensions/browser/api/serial/serial_api.cc -@@ -86,11 +86,13 @@ bool SerialGetDevicesFunction::Prepare() +@@ -86,11 +86,13 @@ bool SerialGetDevicesFunction::Prepare() { void SerialGetDevicesFunction::Work() { DCHECK_CURRENTLY_ON(BrowserThread::FILE); diff --git a/www/chromium/files/patch-gpu_config_BUILD.gn b/www/chromium/files/patch-gpu_config_BUILD.gn index 6c0ff48a0330..e2c5daf16a26 100644 --- a/www/chromium/files/patch-gpu_config_BUILD.gn +++ b/www/chromium/files/patch-gpu_config_BUILD.gn @@ -1,27 +1,13 @@ ---- gpu/config/BUILD.gn.orig 2017-04-19 19:06:34 UTC +--- gpu/config/BUILD.gn.orig 2017-06-05 19:03:08 UTC +++ gpu/config/BUILD.gn -@@ -8,7 +8,8 @@ import("//build/config/ui.gni") +@@ -99,6 +99,10 @@ source_set("config_sources") { + "gpu_util.h", + ] - declare_args() { - # Use the PCI lib to collect GPU information on Linux. -- use_libpci = is_linux && (!is_chromecast || is_cast_desktop_build) && -+ use_libpci = (is_linux || is_bsd) && -+ (!is_chromecast || is_cast_desktop_build) && - (use_x11 || use_ozone) - } - -@@ -101,6 +102,14 @@ source_set("config_sources") { - ] - } - } -+ + if (is_bsd) { -+ sources -= [ -+ "gpu_info_collector_linux.cc", -+ "gpu_info_collector_linux.h" -+ ] ++ sources -= [ "gpu_info_collector_linux.cc" ] + } + - if (is_mac) { - libs = [ - "IOKit.framework", + sources += process_json_outputs + + configs += [ 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 6167136d871a..fb1654b0b75f 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,9 +1,9 @@ ---- gpu/config/gpu_control_list.cc.orig 2017-04-19 19:06:34 UTC +--- gpu/config/gpu_control_list.cc.orig 2017-06-05 19:03:08 UTC +++ gpu/config/gpu_control_list.cc -@@ -19,7 +19,11 @@ +@@ -11,7 +11,11 @@ + #include "base/strings/stringprintf.h" #include "base/sys_info.h" #include "gpu/config/gpu_info.h" - #include "gpu/config/gpu_util.h" +#if defined(OS_BSD) +#include <re2/re2.h> +#else @@ -12,8 +12,8 @@ namespace gpu { namespace { -@@ -1183,7 +1187,7 @@ GpuControlList::GpuControlListEntry::GLT - GpuControlList::GpuControlListEntry::GetDefaultGLType() { +@@ -206,7 +210,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( + GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if defined(OS_CHROMEOS) return kGLTypeGL; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) @@ -21,7 +21,7 @@ return kGLTypeGL; #elif defined(OS_MACOSX) return kGLTypeGL; -@@ -1642,7 +1646,7 @@ GpuControlList::OsType GpuControlList::G +@@ -621,7 +625,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { 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 deleted file mode 100644 index ee60865ae3bb..000000000000 --- a/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- gpu/config/gpu_control_list_unittest.cc.orig 2017-04-19 19:06:34 UTC -+++ gpu/config/gpu_control_list_unittest.cc -@@ -175,8 +175,7 @@ TEST_F(GpuControlListTest, VendorOnAllOs - features = control_list->MakeDecision( - GpuControlList::kOsLinux, kOsVersion, gpu_info()); - EXPECT_SINGLE_FEATURE(features, TEST_FEATURE_0); --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || \ -- defined(OS_OPENBSD) -+#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_ANDROID)) - // ControlList entries will be filtered to the current OS only upon loading. - EXPECT_TRUE(control_list->LoadList( - vendor_json, GpuControlList::kCurrentOsOnly)); 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 562c2f671330..740ecf6c34c6 100644 --- a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc +++ b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc @@ -1,10 +1,10 @@ ---- gpu/config/gpu_info_collector.cc.orig 2017-04-19 19:06:34 UTC +--- gpu/config/gpu_info_collector.cc.orig 2017-06-05 19:03:08 UTC +++ gpu/config/gpu_info_collector.cc -@@ -193,8 +193,10 @@ CollectInfoResult CollectGraphicsInfoGL( +@@ -194,8 +194,10 @@ CollectInfoResult CollectGraphicsInfoGL(GPUInfo* gpu_i gpu_info->pixel_shader_version = glsl_version; gpu_info->vertex_shader_version = glsl_version; -+#ifndef __FreeBSD__ ++#if !defined(OS_BSD) IdentifyActiveGPU(gpu_info); return CollectDriverInfoGL(gpu_info); +#endif 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 b2c8de76102f..d4581bd076c2 100644 --- a/www/chromium/files/patch-gpu_config_gpu__test__config.cc +++ b/www/chromium/files/patch-gpu_config_gpu__test__config.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_test_config.cc.orig 2017-04-19 19:06:34 UTC +--- gpu/config/gpu_test_config.cc.orig 2017-06-05 19:03:08 UTC +++ gpu/config/gpu_test_config.cc @@ -24,7 +24,7 @@ namespace { GPUTestConfig::OS GetCurrentOS() { @@ -9,7 +9,7 @@ return GPUTestConfig::kOsLinux; #elif defined(OS_WIN) int32_t major_version = 0; -@@ -255,6 +255,10 @@ bool GPUTestBotConfig::LoadCurrentConfig +@@ -255,6 +255,10 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo bool rt; if (gpu_info == NULL) { GPUInfo my_gpu_info; @@ -17,10 +17,10 @@ + rt = false; + LOG(WARNING) << "CollectGpuID not present on FreeBSD"; +#else - CollectInfoResult result = CollectGpuID( - &my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id); + CollectInfoResult result = CollectBasicGraphicsInfo(&my_gpu_info); if (result != kCollectInfoSuccess) { -@@ -264,6 +268,7 @@ bool GPUTestBotConfig::LoadCurrentConfig + LOG(ERROR) << "Fail to identify GPU"; +@@ -263,6 +267,7 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo } else { rt = SetGPUInfo(my_gpu_info); } diff --git a/www/chromium/files/patch-gpu_ipc_service_BUILD.gn b/www/chromium/files/patch-gpu_ipc_service_BUILD.gn index bc824277d143..ccd02657d8f7 100644 --- a/www/chromium/files/patch-gpu_ipc_service_BUILD.gn +++ b/www/chromium/files/patch-gpu_ipc_service_BUILD.gn @@ -1,16 +1,15 @@ ---- gpu/ipc/service/BUILD.gn.orig 2017-04-19 19:06:34 UTC +--- gpu/ipc/service/BUILD.gn.orig 2017-06-05 19:03:08 UTC +++ gpu/ipc/service/BUILD.gn -@@ -110,11 +110,12 @@ target(link_target_type, "ipc_service_so +@@ -118,8 +118,11 @@ target(link_target_type, "ipc_service_sources") { + "image_transport_surface_linux.cc", ] - libs += [ "android" ] - } -- if (is_linux) { -+ if (is_linux || is_bsd) { - sources += [ "image_transport_surface_linux.cc" ] } ++ if (is_bsd) { ++ sources += [ "image_transport_surface_linux.cc" ] ++ } if (use_x11) { - sources += [ "x_util.h" ] -+ configs += [ "//build/config/linux:x11" ] +- sources += [ "x_util.h" ] ++ sources += [ "//build/config/linux:x11" ] } if (use_ozone) { - sources += [ + deps += [ "//ui/ozone" ] 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 ef61b49902e3..ac5de3523533 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 2017-04-19 19:06:34 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2017-06-05 19:03:08 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -76,7 +76,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI +@@ -84,7 +84,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUInfo& gpu_info, } } @@ -9,16 +9,16 @@ void CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { TRACE_EVENT0("gpu,startup", "Collect Graphics Info"); -@@ -95,7 +95,7 @@ void CollectGraphicsInfo(gpu::GPUInfo& g - break; +@@ -111,7 +111,7 @@ void CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { } + #endif // defined(OS_WIN) } -#endif // defined(OS_MACOSX) +#endif // defined(OS_MACOSX) && defined(OS_BSD) #if defined(OS_LINUX) && !defined(OS_CHROMEOS) bool CanAccessNvidiaDeviceFile() { -@@ -194,7 +194,7 @@ bool GpuInit::InitializeAndStartSandbox( +@@ -218,7 +218,7 @@ bool GpuInit::InitializeAndStartSandbox(const base::Co // 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; -@@ -211,7 +211,7 @@ bool GpuInit::InitializeAndStartSandbox( +@@ -235,7 +235,7 @@ bool GpuInit::InitializeAndStartSandbox(const base::Co gpu::ApplyGpuDriverBugWorkarounds( gpu_info_, const_cast<base::CommandLine*>(&command_line)); } diff --git a/www/chromium/files/patch-gpu_vulkan_BUILD.gn b/www/chromium/files/patch-gpu_vulkan_BUILD.gn index 2dd0aa4e6971..e7d147e98f9b 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 2017-04-19 19:06:34 UTC +--- gpu/vulkan/BUILD.gn.orig 2017-06-05 19:03:08 UTC +++ gpu/vulkan/BUILD.gn -@@ -14,7 +14,7 @@ if (enable_vulkan) { +@@ -17,7 +17,7 @@ if (enable_vulkan) { component("vulkan") { output_name = "vulkan_wrapper" diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc index 90db873d4d94..825887403a65 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2017-05-09 19:02:47 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2017-06-05 19:03:08 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -171,7 +171,7 @@ void HeadlessContentBrowserClient::GetQu +@@ -172,7 +172,7 @@ void HeadlessContentBrowserClient::GetQuotaSettings( callback); } @@ -9,7 +9,7 @@ void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -182,7 +182,7 @@ void HeadlessContentBrowserClient::GetAd +@@ -183,7 +183,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped mappings->Share(kCrashDumpSignal, crash_signal_fd); #endif // defined(HEADLESS_USE_BREAKPAD) } diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h index de0fc6899969..a2211775fec7 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_content_browser_client.h.orig 2017-05-09 19:02:47 UTC +--- headless/lib/browser/headless_content_browser_client.h.orig 2017-06-05 19:03:08 UTC +++ headless/lib/browser/headless_content_browser_client.h -@@ -28,7 +28,7 @@ class HeadlessContentBrowserClient : pub +@@ -28,7 +28,7 @@ class HeadlessContentBrowserClient : public content::C content::BrowserContext* context, content::StoragePartition* partition, const storage::OptionalQuotaSettingsCallback& callback) override; diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc index 5466bfb36785..e82a960f1dfe 100644 --- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2017-05-09 19:02:47 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2017-06-05 19:03:08 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -147,7 +147,7 @@ void HeadlessContentMainDelegate::InitCr +@@ -159,7 +159,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( g_headless_crash_client.Pointer()->set_crash_dumps_dir( browser_->options()->crash_dumps_dir); @@ -9,7 +9,7 @@ if (!browser_->options()->enable_crash_reporter) { DCHECK(!breakpad::IsCrashReporterEnabled()); return; -@@ -156,7 +156,7 @@ void HeadlessContentMainDelegate::InitCr +@@ -168,7 +168,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( if (process_type != switches::kZygoteProcess) breakpad::InitCrashReporter(process_type); #endif // defined(HEADLESS_USE_BREAKPAD) @@ -18,7 +18,7 @@ } void HeadlessContentMainDelegate::PreSandboxStartup() { -@@ -170,7 +170,7 @@ void HeadlessContentMainDelegate::PreSan +@@ -182,7 +182,7 @@ void HeadlessContentMainDelegate::PreSandboxStartup() if (command_line.HasSwitch(switches::kEnableLogging)) InitLogging(command_line); #endif @@ -27,7 +27,7 @@ InitCrashReporter(command_line); #endif InitializeResourceBundle(); -@@ -202,7 +202,7 @@ int HeadlessContentMainDelegate::RunProc +@@ -214,7 +214,7 @@ int HeadlessContentMainDelegate::RunProcess( return 0; } diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h index 26af4d138e10..049e770c3470 100644 --- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h +++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.h.orig 2017-05-09 19:02:47 UTC +--- headless/lib/headless_content_main_delegate.h.orig 2017-06-05 19:03:08 UTC +++ headless/lib/headless_content_main_delegate.h -@@ -39,7 +39,7 @@ class HeadlessContentMainDelegate : publ +@@ -44,7 +44,7 @@ class HEADLESS_EXPORT HeadlessContentMainDelegate HeadlessBrowserImpl* browser() const { return browser_.get(); } diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h index ffe5b22273a5..4df0d7db85cb 100644 --- a/www/chromium/files/patch-ipc_ipc__channel.h +++ b/www/chromium/files/patch-ipc_ipc__channel.h @@ -1,6 +1,6 @@ ---- ipc/ipc_channel.h.orig 2017-04-19 19:06:35 UTC +--- ipc/ipc_channel.h.orig 2017-06-05 19:03:08 UTC +++ ipc/ipc_channel.h -@@ -246,7 +246,7 @@ class IPC_EXPORT Channel : public Sender +@@ -246,7 +246,7 @@ class IPC_EXPORT Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index ccffba65690b..46b385748f79 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 2017-04-19 19:06:35 UTC +--- ipc/ipc_message_utils.cc.orig 2017-06-05 19:03:08 UTC +++ ipc/ipc_message_utils.cc -@@ -421,7 +421,7 @@ void ParamTraits<unsigned int>::Log(cons +@@ -421,7 +421,7 @@ void ParamTraits<unsigned int>::Log(const param_type& 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 4d0604a409f0..8a0edeaec98a 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 2017-04-19 19:06:35 UTC +--- ipc/ipc_message_utils.h.orig 2017-06-05 19:03:08 UTC +++ ipc/ipc_message_utils.h -@@ -209,7 +209,7 @@ struct ParamTraits<unsigned int> { +@@ -208,7 +208,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-mash_package_mash__packaged__service.cc b/www/chromium/files/patch-mash_package_mash__packaged__service.cc index 5cc467ad6b05..769e00928448 100644 --- a/www/chromium/files/patch-mash_package_mash__packaged__service.cc +++ b/www/chromium/files/patch-mash_package_mash__packaged__service.cc @@ -1,6 +1,6 @@ ---- mash/package/mash_packaged_service.cc.orig 2017-04-19 19:06:35 UTC +--- mash/package/mash_packaged_service.cc.orig 2017-06-05 19:03:08 UTC +++ mash/package/mash_packaged_service.cc -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ #include "ash/touch_hud/mus/touch_hud_application.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "components/font_service/font_service_app.h" #endif -@@ -104,7 +104,7 @@ std::unique_ptr<service_manager::Service +@@ -106,7 +106,7 @@ std::unique_ptr<service_manager::Service> MashPackaged return base::WrapUnique(new mash::task_viewer::TaskViewer); if (name == "test_ime_driver") return base::WrapUnique(new ui::test::TestIMEApplication); 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 09239026a2d9..bffba06550ae 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 2017-04-19 19:06:35 UTC +--- media/audio/alsa/audio_manager_alsa.cc.orig 2017-06-05 19:03:08 UTC +++ media/audio/alsa/audio_manager_alsa.cc -@@ -138,7 +138,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic +@@ -138,7 +138,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType 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) { -@@ -150,7 +152,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic +@@ -150,7 +152,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: " << wrapper_->StrError(error); } @@ -20,7 +20,7 @@ } void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type, -@@ -232,7 +236,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail +@@ -232,7 +236,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( // 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; -@@ -256,7 +264,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe +@@ -256,7 +264,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( // 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++) { -@@ -280,7 +290,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe +@@ -280,7 +290,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( 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 0c873b467e77..83ed93f383a4 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 2017-04-19 19:06:35 UTC +--- media/audio/BUILD.gn.orig 2017-06-05 19:03:08 UTC +++ media/audio/BUILD.gn -@@ -212,7 +212,7 @@ source_set("audio") { +@@ -216,7 +216,7 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } @@ -9,17 +9,16 @@ sources += [ "linux/audio_manager_linux.cc" ] } -@@ -261,10 +261,12 @@ source_set("audio") { +@@ -265,9 +265,11 @@ source_set("audio") { configs += [ ":libpulse" ] } else { # TODO(ajwong): Technically, this dl should go in the action. - libs += [ "dl" ] deps += [ ":pulse_generate_stubs" ] sources += get_target_outputs(":pulse_generate_stubs") - } ++ } + if (is_linux) { + libs += [ "dl" ] -+ } + } } - configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] diff --git a/www/chromium/files/patch-media_audio_audio__manager.cc b/www/chromium/files/patch-media_audio_audio__manager.cc index 73fb1704a152..537a12accdbc 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 2017-04-19 19:06:35 UTC +--- media/audio/audio_manager.cc.orig 2017-06-05 19:03:08 UTC +++ media/audio/audio_manager.cc -@@ -93,7 +93,7 @@ class AudioManagerHelper : public base:: +@@ -93,7 +93,7 @@ class AudioManagerHelper : public base::PowerObserver } #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 -@@ -227,7 +227,7 @@ class AudioManagerHelper : public base:: +@@ -227,7 +227,7 @@ class AudioManagerHelper : public base::PowerObserver std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_; #endif @@ -18,7 +18,7 @@ std::string app_name_; #endif -@@ -342,7 +342,7 @@ void AudioManager::StartHangMonitorIfNee +@@ -340,7 +340,7 @@ void AudioManager::StartHangMonitorIfNeeded( GetHelper()->StartHangTimer(std::move(task_runner)); } diff --git a/www/chromium/files/patch-media_base_BUILD.gn b/www/chromium/files/patch-media_base_BUILD.gn index 2c8aea8fbb06..74a4d686d3bd 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 2017-04-19 19:06:35 UTC +--- media/base/BUILD.gn.orig 2017-06-05 19:03:08 UTC +++ media/base/BUILD.gn -@@ -305,7 +305,7 @@ target(link_target_type, "base") { +@@ -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", -@@ -331,7 +331,7 @@ target(link_target_type, "base") { +@@ -335,7 +335,7 @@ target(link_target_type, "base") { defines += [ "DISABLE_USER_INPUT_MONITOR" ] } diff --git a/www/chromium/files/patch-media_base_audio__latency.cc b/www/chromium/files/patch-media_base_audio__latency.cc index 08780cd5dd99..40aca19e7da4 100644 --- a/www/chromium/files/patch-media_base_audio__latency.cc +++ b/www/chromium/files/patch-media_base_audio__latency.cc @@ -1,6 +1,6 @@ ---- media/base/audio_latency.cc.orig 2017-04-19 19:06:35 UTC +--- media/base/audio_latency.cc.orig 2017-06-05 19:03:08 UTC +++ media/base/audio_latency.cc -@@ -83,7 +83,7 @@ int AudioLatency::GetRtcBufferSize(int s +@@ -83,7 +83,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in return frames_per_buffer; } diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 29406d927dca..a94e47a3e1bc 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2017-04-19 19:06:35 UTC +--- media/base/video_frame.cc.orig 2017-06-05 19:03:08 UTC +++ media/base/video_frame.cc @@ -53,7 +53,7 @@ static std::string StorageTypeToString( return "OWNED_MEMORY"; @@ -18,7 +18,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -324,7 +324,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr +@@ -324,7 +324,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva return frame; } @@ -27,7 +27,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( VideoPixelFormat format, -@@ -436,7 +436,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr +@@ -436,7 +436,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( wrapping_frame->data_[i] = frame->data(i); } @@ -36,12 +36,12 @@ // If there are any |dmabuf_fds_| plugged in, we should duplicate them. if (frame->storage_type() == STORAGE_DMABUFS) { std::vector<int> original_fds; -@@ -722,7 +722,7 @@ size_t VideoFrame::shared_memory_offset( +@@ -722,7 +722,7 @@ size_t VideoFrame::shared_memory_offset() const { return shared_memory_offset_; } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - int VideoFrame::dmabuf_fd(size_t plane) const { + int VideoFrame::DmabufFd(size_t plane) const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); DCHECK(IsValidPlane(plane, format_)); diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 3f650d9953ce..2bd9d6142dcf 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,15 +1,15 @@ ---- media/base/video_frame.h.orig 2017-04-19 19:06:35 UTC +--- media/base/video_frame.h.orig 2017-06-05 19:03:08 UTC +++ media/base/video_frame.h -@@ -62,7 +62,7 @@ class MEDIA_EXPORT VideoFrame : public b +@@ -62,7 +62,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Pixels are backed by Shared Memory. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // TODO(mcasas): Consider turning this type into STORAGE_NATIVE or another - // meaningful name and handle it appropriately in all cases. - STORAGE_DMABUFS = 5, // Each plane is stored into a DmaBuf. -@@ -186,7 +186,7 @@ class MEDIA_EXPORT VideoFrame : public b + // TODO(mcasas): Consider turning this type into STORAGE_NATIVE + // based on the idea of using this same enum value for both DMA + // buffers on Linux and CVPixelBuffers on Mac (which currently use +@@ -188,7 +188,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte uint8_t* a_data, base::TimeDelta timestamp); @@ -18,7 +18,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/Documentation/dma-buf-sharing.txt) with a // VideoFrame. The dmabuf fds are dup()ed on creation, so that the VideoFrame -@@ -336,7 +336,7 @@ class MEDIA_EXPORT VideoFrame : public b +@@ -338,7 +338,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // Returns the offset into the shared memory where the frame data begins. size_t shared_memory_offset() const; @@ -26,8 +26,8 @@ +#if defined(OS_LINUX) || defined(OS_BSD) // Returns backing DmaBuf file descriptor for given |plane|, if present, or // -1 if not. - // TODO(mcasas): Rename to DmabufFd() to comply with Style Guide. -@@ -528,7 +528,7 @@ class MEDIA_EXPORT VideoFrame : public b + int DmabufFd(size_t plane) const; +@@ -531,7 +531,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte base::SharedMemoryHandle shared_memory_handle_; size_t shared_memory_offset_; diff --git a/www/chromium/files/patch-media_capture_BUILD.gn b/www/chromium/files/patch-media_capture_BUILD.gn index c48066bb3458..df3d1fe0fbfb 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 2017-04-19 19:06:35 UTC +--- media/capture/BUILD.gn.orig 2017-06-05 19:03:08 UTC +++ media/capture/BUILD.gn -@@ -153,6 +153,16 @@ component("capture_lib") { +@@ -160,6 +160,16 @@ component("capture_lib") { ] } 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 182a4ca69954..3b9a42b60f3e 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 2017-04-19 19:06:35 UTC +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2017-06-05 19:03:08 UTC +++ media/capture/video/fake_video_capture_device_factory.cc -@@ -192,7 +192,7 @@ void FakeVideoCaptureDeviceFactory::GetD +@@ -192,7 +192,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto for (const auto& entry : devices_config_) { device_descriptors->emplace_back( base::StringPrintf("fake_device_%d", entry_index), entry.device_id, 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 48e064a8930b..bdb3be4105e6 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 2017-04-19 19:06:35 UTC +--- media/capture/video/file_video_capture_device_factory.cc.orig 2017-06-05 19:03:08 UTC +++ media/capture/video/file_video_capture_device_factory.cc -@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetD +@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceDescripto #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 index 575db560fa12..a7ded1ee5067 100644 --- 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 @@ -1,4 +1,4 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2017-04-19 19:06:35 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2017-06-05 19:03:08 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ @@ -11,9 +11,9 @@ #include <poll.h> #include <sys/fcntl.h> #include <sys/ioctl.h> -@@ -21,10 +23,10 @@ - #include "media/capture/video/blob_utils.h" - #include "media/capture/video/linux/video_capture_device_linux.h" +@@ -23,10 +25,10 @@ + + using media::mojom::MeteringMode; -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) +// #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) 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 695e2db1e623..29627ff02d06 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,4 +1,4 @@ ---- media/capture/video/linux/video_capture_device_linux.cc.orig 2017-04-19 19:06:35 UTC +--- media/capture/video/linux/video_capture_device_linux.cc.orig 2017-06-05 19:03:08 UTC +++ media/capture/video/linux/video_capture_device_linux.cc @@ -21,6 +21,7 @@ @@ -8,7 +8,7 @@ // Translates Video4Linux pixel formats to Chromium pixel formats. // static VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( -@@ -34,6 +35,7 @@ std::list<uint32_t> VideoCaptureDeviceLi +@@ -34,6 +35,7 @@ std::list<uint32_t> VideoCaptureDeviceLinux::GetListOf bool favour_mjpeg) { return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); } @@ -16,7 +16,7 @@ VideoCaptureDeviceLinux::VideoCaptureDeviceLinux( const VideoCaptureDeviceDescriptor& device_descriptor) -@@ -47,6 +49,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDe +@@ -47,6 +49,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDeviceLinux() { v4l2_thread_.Stop(); } @@ -24,7 +24,7 @@ void VideoCaptureDeviceLinux::AllocateAndStart( const VideoCaptureParams& params, std::unique_ptr<VideoCaptureDevice::Client> client) { -@@ -74,7 +77,13 @@ void VideoCaptureDeviceLinux::AllocateAn +@@ -74,7 +77,13 @@ void VideoCaptureDeviceLinux::AllocateAndStart( v4l2_thread_.task_runner()->PostTask(FROM_HERE, request); photo_requests_queue_.clear(); } @@ -38,7 +38,7 @@ void VideoCaptureDeviceLinux::StopAndDeAllocate() { if (!v4l2_thread_.IsRunning()) return; // Wrong state. -@@ -123,7 +132,11 @@ void VideoCaptureDeviceLinux::SetPhotoOp +@@ -123,7 +132,11 @@ void VideoCaptureDeviceLinux::SetPhotoOptions( } v4l2_thread_.task_runner()->PostTask(FROM_HERE, std::move(functor)); } @@ -50,7 +50,7 @@ void VideoCaptureDeviceLinux::SetRotation(int rotation) { if (v4l2_thread_.IsRunning()) { v4l2_thread_.task_runner()->PostTask( -@@ -131,6 +144,9 @@ void VideoCaptureDeviceLinux::SetRotatio +@@ -131,6 +144,9 @@ void VideoCaptureDeviceLinux::SetRotation(int rotation 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 0bd1db34f676..68743d128b59 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 2017-04-19 19:06:35 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2017-06-05 19:03:08 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -238,7 +238,7 @@ void VideoCaptureDeviceClient::OnIncomin +@@ -242,7 +242,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // 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 3e51687048e4..ad0e21f2dce7 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,4 +1,4 @@ ---- media/capture/video/video_capture_device_factory.cc.orig 2017-04-19 19:06:35 UTC +--- media/capture/video/video_capture_device_factory.cc.orig 2017-06-05 19:03:08 UTC +++ media/capture/video/video_capture_device_factory.cc @@ -18,6 +18,10 @@ namespace media { std::unique_ptr<VideoCaptureDeviceFactory> @@ -11,7 +11,7 @@ const base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); // Use a Fake or File Video Device Factory if the command line flags are -@@ -42,6 +46,7 @@ VideoCaptureDeviceFactory::CreateFactory +@@ -42,6 +46,7 @@ VideoCaptureDeviceFactory::CreateFactory( return std::unique_ptr<VideoCaptureDeviceFactory>( CreateVideoCaptureDeviceFactory(ui_task_runner)); } @@ -19,9 +19,9 @@ } VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { -@@ -61,7 +66,7 @@ void VideoCaptureDeviceFactory::Enumerat - callback.Run(std::move(device_descriptors)); - } +@@ -50,7 +55,7 @@ VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() + + VideoCaptureDeviceFactory::~VideoCaptureDeviceFactory() {} -#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) && \ +#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_ANDROID) && \ diff --git a/www/chromium/files/patch-media_cast_BUILD.gn b/www/chromium/files/patch-media_cast_BUILD.gn index 32881404d145..a6f66f17ec53 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 2017-04-19 19:06:35 UTC +--- media/cast/BUILD.gn.orig 2017-06-05 19:03:08 UTC +++ media/cast/BUILD.gn -@@ -358,7 +358,7 @@ test("cast_unittests") { +@@ -361,7 +361,7 @@ test("cast_unittests") { } } @@ -9,7 +9,7 @@ # This is a target for the collection of cast development tools. They are # not built/linked into the Chromium browser. group("testing_tools") { -@@ -412,7 +412,7 @@ if (is_win || is_mac || (is_linux && !is +@@ -415,7 +415,7 @@ if (is_win || is_mac || (is_linux && !is_chromeos)) { "//ui/gfx/geometry", ] @@ -18,7 +18,7 @@ sources += [ "test/linux_output_window.cc", "test/linux_output_window.h", -@@ -515,7 +515,7 @@ if (is_win || is_mac || (is_linux && !is +@@ -518,7 +518,7 @@ if (is_win || is_mac || (is_linux && !is_chromeos)) { } } diff --git a/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h b/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h index b1f46bea9b95..19fb8eab54ab 100644 --- a/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h +++ b/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h @@ -1,19 +1,25 @@ ---- media/ffmpeg/ffmpeg_common.h.orig 2017-04-19 19:06:35 UTC +--- media/ffmpeg/ffmpeg_common.h.orig 2017-06-05 19:03:08 UTC +++ media/ffmpeg/ffmpeg_common.h -@@ -25,7 +25,7 @@ extern "C" { +@@ -23,10 +23,12 @@ + + // Include FFmpeg header files. + extern "C" { ++#if !defined(USE_SYSTEM_FFMPEG) // 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 + #define FF_API_CONVERGENCE_DURATION 0 ++#endif // !defined(USE_SYSTEM_FFMPEG) // 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" { +@@ -40,7 +42,9 @@ extern "C" { MSVC_PUSH_DISABLE_WARNING(4244); #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> --#include <libavformat/internal.h> ++#if !defined(USE_SYSTEM_FFMPEG) + #include <libavformat/internal.h> ++#endif // !defined(USE_SYSTEM_FFMPEG) #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 index 0080af16013a..917b3104a9ab 100644 --- a/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc +++ b/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc @@ -1,27 +1,18 @@ ---- media/filters/ffmpeg_demuxer.cc.orig 2017-04-19 19:06:35 UTC +--- media/filters/ffmpeg_demuxer.cc.orig 2017-06-05 19:03:08 UTC +++ media/filters/ffmpeg_demuxer.cc -@@ -1221,24 +1221,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone +@@ -1223,6 +1223,7 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const Pipelin // 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; -- } -- } ++#if !defined(USE_SYSTEM_FFMPEG) + const AVFormatInternal* internal = format_context->internal; + if (internal && internal->packet_buffer && + format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) { +@@ -1246,6 +1247,7 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const Pipelin + packet_buffer = packet_buffer->next; + } + } ++#endif // !defined(USE_SYSTEM_FFMPEG) std::unique_ptr<MediaTracks> media_tracks(new MediaTracks()); 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 2e1dd669c948..6e26e25a24fe 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,6 +1,6 @@ ---- media/formats/common/offset_byte_queue.cc.orig 2017-04-19 19:06:35 UTC +--- media/formats/common/offset_byte_queue.cc.orig 2017-06-05 19:03:09 UTC +++ media/formats/common/offset_byte_queue.cc -@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t off +@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t offset, const uin *size = tail() - offset; } 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 965a64bf93ae..49c230e40500 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 2017-04-19 19:06:35 UTC +--- media/formats/mp2t/es_parser_adts.cc.orig 2017-06-05 19:03:09 UTC +++ media/formats/mp2t/es_parser_adts.cc -@@ -60,11 +60,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts +@@ -60,11 +60,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr 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 +@@ -104,7 +104,7 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr 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 8353d94cf59e..1dfb3b156c74 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 2017-04-19 19:06:35 UTC +--- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2017-06-05 19:03:09 UTC +++ media/formats/mp2t/es_parser_mpeg1audio.cc -@@ -109,11 +109,11 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud +@@ -109,11 +109,11 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame( 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; -@@ -154,7 +154,7 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud +@@ -154,7 +154,7 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame( return true; } diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 15c93a387568..b43115e48d03 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 2017-04-19 19:06:36 UTC +--- net/BUILD.gn.orig 2017-06-05 19:03:09 UTC +++ net/BUILD.gn -@@ -79,7 +79,7 @@ if (use_glib && use_gconf && !is_chromeo +@@ -86,7 +86,7 @@ if (use_glib && use_gconf && !is_chromeos) { net_configs += [ "//build/config/linux/gconf" ] } @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1824,6 +1824,16 @@ component("net") { +@@ -1900,6 +1900,16 @@ component("net") { sources -= [ "disk_cache/blockfile/file_posix.cc" ] } @@ -26,7 +26,7 @@ if (is_ios || is_mac) { sources += [ "base/mac/url_conversions.h", -@@ -2773,7 +2783,7 @@ if (!is_ios && !is_android) { +@@ -2854,7 +2864,7 @@ if (!is_ios && !is_android) { } } @@ -35,7 +35,7 @@ executable("cachetool") { testonly = true sources = [ -@@ -2802,7 +2812,7 @@ if (is_linux || is_mac) { +@@ -2883,7 +2893,7 @@ if (is_linux || is_mac) { } } @@ -44,7 +44,7 @@ static_library("epoll_server") { sources = [ "tools/epoll_server/epoll_server.cc", -@@ -2906,7 +2916,7 @@ if (is_android) { +@@ -2987,7 +2997,7 @@ if (is_android) { } } @@ -53,7 +53,7 @@ executable("disk_cache_memory_test") { testonly = true sources = [ -@@ -4767,7 +4777,7 @@ test("net_unittests") { +@@ -4874,7 +4884,7 @@ test("net_unittests") { "third_party/nist-pkits/", ] @@ -62,7 +62,7 @@ deps += [ "//third_party/pyftpdlib/", "//third_party/pywebsocket/", -@@ -4790,7 +4800,7 @@ test("net_unittests") { +@@ -4897,7 +4907,7 @@ test("net_unittests") { if (is_desktop_linux) { deps += [ ":epoll_quic_tools" ] } @@ -71,14 +71,14 @@ sources += [ "tools/quic/chlo_extractor_test.cc", "tools/quic/end_to_end_test.cc", -@@ -4852,6 +4862,10 @@ test("net_unittests") { - sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ] - } +@@ -4957,6 +4967,10 @@ test("net_unittests") { -+ if (is_bsd) { -+ sources -= [ "base/address_tracker_linux_unittest.cc" ] + if (is_chromeos) { + sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ] + } + - if (!is_proto_quic && v8_use_external_startup_data) { - deps += [ "//gin" ] ++ if (is_bsd) { ++ sources -= [ "base/address_tracker_linux_unittest.cc" ] } + + if (!is_proto_quic && v8_use_external_startup_data) { 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 83c743babaca..3f7f2c6ed5de 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 2017-04-19 19:06:36 UTC +--- net/base/mime_util_unittest.cc.orig 2017-06-05 19:03:09 UTC +++ net/base/mime_util_unittest.cc -@@ -250,7 +250,7 @@ TEST(MimeUtilTest, TestGetExtensionsForM +@@ -250,7 +250,7 @@ TEST(MimeUtilTest, TestGetExtensionsForMimeType) { {"message/", 0, NULL, true}, {"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 9f6c055c9ac8..aec8a8f0c524 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 2017-04-19 19:06:36 UTC +--- net/base/network_change_notifier.cc.orig 2017-06-05 19:03:09 UTC +++ net/base/network_change_notifier.cc -@@ -533,7 +533,6 @@ NetworkChangeNotifier* NetworkChangeNoti +@@ -533,7 +533,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() #elif defined(OS_MACOSX) return new NetworkChangeNotifierMac(); #else diff --git a/www/chromium/files/patch-net_dns_dns__util.cc b/www/chromium/files/patch-net_dns_dns__util.cc index cc263cb10c21..ada516cf2d7a 100644 --- a/www/chromium/files/patch-net_dns_dns__util.cc +++ b/www/chromium/files/patch-net_dns_dns__util.cc @@ -1,8 +1,8 @@ ---- net/dns/dns_util.cc.orig 2017-04-19 19:06:36 UTC +--- net/dns/dns_util.cc.orig 2017-06-05 19:03:10 UTC +++ net/dns/dns_util.cc -@@ -15,6 +15,8 @@ - #include "build/build_config.h" - #include "net/base/address_list.h" +@@ -26,6 +26,8 @@ const int kMaxLabelLength = 63; + + } // namespace +#include <sys/socket.h> + diff --git a/www/chromium/files/patch-net_dns_host__resolver__proc.cc b/www/chromium/files/patch-net_dns_host__resolver__proc.cc index 25a38246ed64..0dd1a889500a 100644 --- a/www/chromium/files/patch-net_dns_host__resolver__proc.cc +++ b/www/chromium/files/patch-net_dns_host__resolver__proc.cc @@ -1,6 +1,6 @@ ---- net/dns/host_resolver_proc.cc.orig 2017-04-19 19:06:36 UTC +--- net/dns/host_resolver_proc.cc.orig 2017-06-05 19:03:10 UTC +++ net/dns/host_resolver_proc.cc -@@ -194,7 +194,7 @@ int SystemHostResolverCall(const std::st +@@ -194,7 +194,7 @@ int SystemHostResolverCall(const std::string& host, hints.ai_socktype = SOCK_STREAM; #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 09bb69fb155d..8fb9bb44c5ec 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,6 +1,6 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2017-04-19 19:06:36 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2017-06-05 19:03:10 UTC +++ net/http/http_auth_gssapi_posix.cc -@@ -431,8 +431,8 @@ base::NativeLibrary GSSAPISharedLibrary: +@@ -431,8 +431,8 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib static const char* const kDefaultLibraryNames[] = { #if defined(OS_MACOSX) "/System/Library/Frameworks/GSS.framework/GSS" 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 1e7563581150..532f86829fdf 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,4 +1,4 @@ ---- net/proxy/proxy_config_service_linux.cc.orig 2017-04-19 19:06:36 UTC +--- net/proxy/proxy_config_service_linux.cc.orig 2017-06-05 19:03:10 UTC +++ net/proxy/proxy_config_service_linux.cc @@ -11,7 +11,14 @@ #include <limits.h> @@ -15,7 +15,7 @@ #include <unistd.h> #include <map> -@@ -863,6 +870,7 @@ class SettingGetterImplKDE : public Prox +@@ -863,6 +870,7 @@ class SettingGetterImplKDE : public ProxyConfigService public: explicit SettingGetterImplKDE(base::Environment* env_var_getter) : inotify_fd_(-1), @@ -23,7 +23,7 @@ inotify_watcher_(FROM_HERE), notify_delegate_(nullptr), debounce_timer_(new base::OneShotTimer()), -@@ -938,9 +946,10 @@ class SettingGetterImplKDE : public Prox +@@ -938,9 +946,10 @@ class SettingGetterImplKDE : public ProxyConfigService // 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, -@@ -949,9 +958,17 @@ class SettingGetterImplKDE : public Prox +@@ -949,9 +958,17 @@ class SettingGetterImplKDE : public ProxyConfigService // 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_)) { -@@ -975,22 +992,40 @@ class SettingGetterImplKDE : public Prox +@@ -975,22 +992,40 @@ class SettingGetterImplKDE : public ProxyConfigService 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, -@@ -1011,7 +1046,19 @@ class SettingGetterImplKDE : public Prox +@@ -1011,7 +1046,19 @@ class SettingGetterImplKDE : public ProxyConfigService 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(); } -@@ -1284,8 +1331,11 @@ class SettingGetterImplKDE : public Prox +@@ -1284,8 +1331,11 @@ class SettingGetterImplKDE : public ProxyConfigService 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 -@@ -1322,6 +1372,7 @@ class SettingGetterImplKDE : public Prox +@@ -1322,6 +1372,7 @@ class SettingGetterImplKDE : public ProxyConfigService 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.) -@@ -1337,6 +1388,7 @@ class SettingGetterImplKDE : public Prox +@@ -1337,6 +1388,7 @@ class SettingGetterImplKDE : public ProxyConfigService 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 759c79eb9d03..0eadd57966c0 100644 --- a/www/chromium/files/patch-net_proxy_proxy__service.cc +++ b/www/chromium/files/patch-net_proxy_proxy__service.cc @@ -1,4 +1,4 @@ ---- net/proxy/proxy_service.cc.orig 2017-04-19 19:06:36 UTC +--- net/proxy/proxy_service.cc.orig 2017-06-05 19:03:10 UTC +++ net/proxy/proxy_service.cc @@ -49,7 +49,7 @@ #elif defined(OS_MACOSX) @@ -9,7 +9,7 @@ #include "net/proxy/proxy_config_service_linux.h" #elif defined(OS_ANDROID) #include "net/proxy/proxy_config_service_android.h" -@@ -1520,7 +1520,7 @@ ProxyService::CreateSystemProxyConfigSer +@@ -1520,7 +1520,7 @@ ProxyService::CreateSystemProxyConfigService( << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return base::WrapUnique(new UnsetProxyConfigService); diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc index 2303db9bd7d0..96b22bf317e4 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_posix.cc.orig 2017-04-19 19:06:36 UTC +--- net/socket/udp_socket_posix.cc.orig 2017-06-05 19:03:10 UTC +++ net/socket/udp_socket_posix.cc -@@ -59,7 +59,7 @@ const int kBindRetries = 10; +@@ -60,7 +60,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) { -@@ -765,7 +765,7 @@ int UDPSocketPosix::SetMulticastOptions( +@@ -759,7 +759,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); -@@ -840,7 +840,7 @@ int UDPSocketPosix::JoinGroup(const IPAd +@@ -834,7 +834,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc index b2238dc7df8e..03c53de3a2c2 100644 --- a/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc +++ b/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc @@ -1,4 +1,4 @@ ---- net/tools/cert_verify_tool/verify_using_path_builder.cc.orig 2017-04-19 19:06:36 UTC +--- net/tools/cert_verify_tool/verify_using_path_builder.cc.orig 2017-06-05 19:03:10 UTC +++ net/tools/cert_verify_tool/verify_using_path_builder.cc @@ -34,7 +34,7 @@ #include "net/cert/internal/trust_store_nss.h" @@ -9,7 +9,7 @@ #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_fixed.h" #endif -@@ -185,7 +185,7 @@ void SetUpOnNetworkThread(std::unique_pt +@@ -187,7 +187,7 @@ void SetUpOnNetworkThread(std::unique_ptr<net::URLRequ // (similar to VERIFY_CERT_IO_ENABLED flag for CertVerifyProc). net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); 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 05475764b7d2..fb90d41f14d8 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,4 +1,4 @@ ---- net/tools/get_server_time/get_server_time.cc.orig 2017-04-19 19:06:36 UTC +--- net/tools/get_server_time/get_server_time.cc.orig 2017-06-05 19:03:10 UTC +++ net/tools/get_server_time/get_server_time.cc @@ -46,7 +46,7 @@ @@ -9,7 +9,7 @@ #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_fixed.h" #endif -@@ -142,7 +142,7 @@ class PrintingLogObserver : public net:: +@@ -142,7 +142,7 @@ class PrintingLogObserver : public net::NetLog::Thread std::unique_ptr<net::URLRequestContext> BuildURLRequestContext( net::NetLog* net_log) { net::URLRequestContextBuilder builder; 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 b4bdf079d4db..9b5e0a412aed 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 2017-04-19 19:06:36 UTC +--- net/url_request/url_request_context_builder.cc.orig 2017-06-05 19:03:10 UTC +++ net/url_request/url_request_context_builder.cc -@@ -327,7 +327,7 @@ std::unique_ptr<URLRequestContext> URLRe +@@ -327,7 +327,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu 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 e2376dbb721c..cb17adb67d28 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 2017-04-19 19:06:36 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2017-06-05 19:03:10 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -129,7 +129,7 @@ std::vector<uint32_t> GetPageNumbersFrom +@@ -129,7 +129,7 @@ std::vector<uint32_t> GetPageNumbersFromPrintPageNumbe return page_numbers; } @@ -27,7 +27,7 @@ delete g_font_info; #endif TearDownV8(); -@@ -772,7 +772,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl +@@ -772,7 +772,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client) IFSDK_PAUSE::user = nullptr; IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; @@ -36,7 +36,7 @@ // PreviewModeClient does not know its pp::Instance. pp::Instance* instance = client_->GetPluginInstance(); if (instance) -@@ -1513,7 +1513,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA +@@ -1516,7 +1516,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPDF( FPDF_ClosePage(pdf_page); } @@ -45,7 +45,7 @@ g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -2950,7 +2950,7 @@ bool PDFiumEngine::ContinuePaint(int pro +@@ -2953,7 +2953,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size()); DCHECK(image_data); @@ -54,7 +54,7 @@ g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -3408,7 +3408,7 @@ void PDFiumEngine::SetCurrentPage(int in +@@ -3411,7 +3411,7 @@ void PDFiumEngine::SetCurrentPage(int index) { 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 3ef9398d2555..7c9d6129908f 100644 --- a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc +++ b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc @@ -1,6 +1,6 @@ ---- ppapi/proxy/file_io_resource.cc.orig 2017-04-19 19:06:36 UTC +--- ppapi/proxy/file_io_resource.cc.orig 2017-06-05 19:03:10 UTC +++ ppapi/proxy/file_io_resource.cc -@@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t of +@@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t offset, if (check_quota_) { int64_t increase = 0; @@ -24,7 +24,7 @@ } if (increase > 0) { -@@ -319,7 +321,7 @@ int32_t FileIOResource::Write(int64_t of +@@ -319,7 +321,7 @@ int32_t FileIOResource::Write(int64_t offset, if (append) append_mode_write_amount_ += bytes_to_write; else @@ -33,7 +33,7 @@ } } return WriteValidated(offset, buffer, bytes_to_write, callback); -@@ -597,9 +599,9 @@ void FileIOResource::OnRequestWriteQuota +@@ -597,9 +599,9 @@ void FileIOResource::OnRequestWriteQuotaComplete( } else { DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted); 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 ba76213e36b1..87173d661e2b 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 2017-04-19 19:06:36 UTC +--- ppapi/shared_impl/private/net_address_private_impl.cc.orig 2017-06-05 19:03:10 UTC +++ ppapi/shared_impl/private/net_address_private_impl.cc @@ -26,9 +26,12 @@ #include <arpa/inet.h> @@ -6,8 +6,8 @@ #include <sys/types.h> +#if defined(OS_BSD) +#include <netinet/in.h> -+#endif #endif ++#endif -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-printing_BUILD.gn b/www/chromium/files/patch-printing_BUILD.gn index a9c4ad77952c..102bf80abcab 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 2017-04-19 19:06:36 UTC +--- printing/BUILD.gn.orig 2017-06-05 19:03:10 UTC +++ printing/BUILD.gn -@@ -138,7 +138,7 @@ component("printing") { +@@ -141,7 +141,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) -@@ -215,7 +215,7 @@ component("printing") { +@@ -220,7 +220,7 @@ component("printing") { "printing_context_no_system_dialog.cc", "printing_context_no_system_dialog.h", ] diff --git a/www/chromium/files/patch-remoting_host_BUILD.gn b/www/chromium/files/patch-remoting_host_BUILD.gn index 04652d6d4561..99dcedd79a01 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 2017-04-19 19:06:36 UTC +--- remoting/host/BUILD.gn.orig 2017-06-05 19:03:10 UTC +++ remoting/host/BUILD.gn -@@ -326,7 +326,7 @@ static_library("host") { +@@ -325,7 +325,7 @@ static_library("host") { deps += [ "//components/policy:generated" ] } @@ -9,7 +9,7 @@ libs += [ "pam" ] } -@@ -345,7 +345,7 @@ static_library("host") { +@@ -344,7 +344,7 @@ static_library("host") { "input_injector_x11.cc", "local_input_monitor_x11.cc", ] @@ -18,7 +18,7 @@ # These will already be filtered out on non-Linux. sources -= [ "linux/unicode_to_keysym.cc", -@@ -531,7 +531,7 @@ source_set("unit_tests") { +@@ -530,7 +530,7 @@ source_set("unit_tests") { "touch_injector_win_unittest.cc", ] diff --git a/www/chromium/files/patch-remoting_host_host__details.cc b/www/chromium/files/patch-remoting_host_host__details.cc index 1088d08495bf..27751f5bc499 100644 --- a/www/chromium/files/patch-remoting_host_host__details.cc +++ b/www/chromium/files/patch-remoting_host_host__details.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_details.cc.orig 2017-05-09 19:02:49 UTC +--- remoting/host/host_details.cc.orig 2017-06-05 19:03:10 UTC +++ remoting/host/host_details.cc -@@ -26,6 +26,8 @@ std::string GetHostOperatingSystemName() +@@ -26,6 +26,8 @@ std::string GetHostOperatingSystemName() { return "Linux"; #elif defined(OS_ANDROID) return "Android"; diff --git a/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc b/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc index 3603b479140f..12f779f6916f 100644 --- a/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc +++ b/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc @@ -1,6 +1,6 @@ ---- services/catalog/public/cpp/manifest_parsing_util.cc.orig 2017-04-19 19:06:37 UTC +--- services/catalog/public/cpp/manifest_parsing_util.cc.orig 2017-06-05 19:03:11 UTC +++ services/catalog/public/cpp/manifest_parsing_util.cc -@@ -15,7 +15,8 @@ bool IsValidPlatformName(const std::stri +@@ -15,7 +15,8 @@ bool IsValidPlatformName(const std::string& name) { return name == Store::kRequiredFilesKey_PlatformValue_Windows || name == Store::kRequiredFilesKey_PlatformValue_Linux || name == Store::kRequiredFilesKey_PlatformValue_MacOSX || @@ -10,7 +10,7 @@ } bool IsCurrentPlatform(const std::string& name) { -@@ -27,6 +28,8 @@ bool IsCurrentPlatform(const std::string +@@ -27,6 +28,8 @@ bool IsCurrentPlatform(const std::string& name) { return name == Store::kRequiredFilesKey_PlatformValue_MacOSX; #elif defined(OS_ANDROID) return name == Store::kRequiredFilesKey_PlatformValue_Android; diff --git a/www/chromium/files/patch-services_catalog_store.cc b/www/chromium/files/patch-services_catalog_store.cc index 04f61b3ae404..a1748bbade03 100644 --- a/www/chromium/files/patch-services_catalog_store.cc +++ b/www/chromium/files/patch-services_catalog_store.cc @@ -1,6 +1,6 @@ ---- services/catalog/store.cc.orig 2017-04-19 19:06:37 UTC +--- services/catalog/store.cc.orig 2017-06-05 19:03:11 UTC +++ services/catalog/store.cc -@@ -32,4 +32,6 @@ const char Store::kRequiredFilesKey_Plat +@@ -32,4 +32,6 @@ const char Store::kRequiredFilesKey_PlatformValue_Linu const char Store::kRequiredFilesKey_PlatformValue_MacOSX[] = "macosx"; // static const char Store::kRequiredFilesKey_PlatformValue_Android[] = "android"; diff --git a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc index f6e620f8e0a3..850e3e045dbb 100644 --- a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc +++ b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,4 +1,4 @@ ---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2017-04-19 19:06:37 UTC +--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2017-06-05 19:03:11 UTC +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc @@ -59,6 +59,9 @@ class TimeZoneMonitorLinuxImpl main_task_runner_(base::ThreadTaskRunnerHandle::Get()), @@ -10,7 +10,7 @@ DCHECK(main_task_runner_->RunsTasksOnCurrentThread()); file_task_runner_->PostTask( FROM_HERE, -@@ -150,6 +153,9 @@ TimeZoneMonitorLinux::TimeZoneMonitorLin +@@ -150,6 +153,9 @@ TimeZoneMonitorLinux::TimeZoneMonitorLinux( // changed. if (!getenv("TZ")) { impl_ = new TimeZoneMonitorLinuxImpl(this, file_task_runner); diff --git a/www/chromium/files/patch-content_common_set__process__title__linux.cc b/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc index fbda01a227e6..d239629196bf 100644 --- a/www/chromium/files/patch-content_common_set__process__title__linux.cc +++ b/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc @@ -1,5 +1,5 @@ ---- content/common/set_process_title_linux.cc.orig 2017-04-19 19:06:34 UTC -+++ content/common/set_process_title_linux.cc +--- services/service_manager/embedder/set_process_title_linux.cc.orig 2017-06-05 19:03:11 UTC ++++ services/service_manager/embedder/set_process_title_linux.cc @@ -49,6 +49,8 @@ extern char** environ; @@ -9,7 +9,7 @@ static char* g_orig_argv0 = NULL; void setproctitle(const char* fmt, ...) { -@@ -101,6 +103,7 @@ void setproctitle(const char* fmt, ...) +@@ -101,6 +103,7 @@ void setproctitle(const char* fmt, ...) { va_end(ap); g_main_argv[1] = NULL; } diff --git a/www/chromium/files/patch-content_common_set__process__title__linux.h b/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h index 8abe8aa10619..3c943ff284ed 100644 --- a/www/chromium/files/patch-content_common_set__process__title__linux.h +++ b/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h @@ -1,8 +1,8 @@ ---- content/common/set_process_title_linux.h.orig 2017-04-19 19:06:34 UTC -+++ content/common/set_process_title_linux.h +--- services/service_manager/embedder/set_process_title_linux.h.orig 2017-06-05 19:03:11 UTC ++++ services/service_manager/embedder/set_process_title_linux.h @@ -5,6 +5,9 @@ - #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_ - #define CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_ + #ifndef SERVICES_SERVICE_MANAGER_EMBEDDER_SET_PROCESS_TITLE_LINUX_H_ + #define SERVICES_SERVICE_MANAGER_EMBEDDER_SET_PROCESS_TITLE_LINUX_H_ +#include "build/build_config.h" + diff --git a/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc b/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc index 19d66e0fc96f..dcda6fa519fe 100644 --- a/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc +++ b/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc @@ -1,6 +1,6 @@ ---- services/service_manager/public/cpp/standalone_service/standalone_service.cc.orig 2017-04-19 19:06:37 UTC +--- services/service_manager/public/cpp/standalone_service/standalone_service.cc.orig 2017-06-05 19:03:11 UTC +++ services/service_manager/public/cpp/standalone_service/standalone_service.cc -@@ -70,6 +70,8 @@ void RunStandaloneService(const Standalo +@@ -70,6 +70,8 @@ void RunStandaloneService(const StandaloneServiceCallb *base::CommandLine::ForCurrentProcess(); if (command_line.HasSwitch(switches::kEnableSandbox)) sandbox = InitializeSandbox(); diff --git a/www/chromium/files/patch-services_ui_gpu_gpu__main.cc b/www/chromium/files/patch-services_ui_gpu_gpu__main.cc index 7a3bda519c92..4ccd06a90cfb 100644 --- a/www/chromium/files/patch-services_ui_gpu_gpu__main.cc +++ b/www/chromium/files/patch-services_ui_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- services/ui/gpu/gpu_main.cc.orig 2017-04-19 19:06:37 UTC +--- services/ui/gpu/gpu_main.cc.orig 2017-06-05 19:03:11 UTC +++ services/ui/gpu/gpu_main.cc -@@ -59,7 +59,7 @@ GpuMain::GpuMain(mojom::GpuMainRequest r +@@ -64,7 +64,7 @@ GpuMain::GpuMain(mojom::GpuMainRequest request) // runtime. thread_options.message_loop_type = ui::OzonePlatform::EnsureInstance()->GetMessageLoopTypeForGpu(); diff --git a/www/chromium/files/patch-services_ui_gpu_gpu__service.cc b/www/chromium/files/patch-services_ui_gpu_gpu__service.cc new file mode 100644 index 000000000000..791f589920b1 --- /dev/null +++ b/www/chromium/files/patch-services_ui_gpu_gpu__service.cc @@ -0,0 +1,29 @@ +--- services/ui/gpu/gpu_service.cc.orig 2017-06-05 19:03:11 UTC ++++ services/ui/gpu/gpu_service.cc +@@ -269,7 +269,7 @@ void GpuService::RequestCompleteGpuInfo( + } + UpdateGpuInfoPlatform(); + callback.Run(gpu_info_); +-#if defined(OS_WIN) ++#if defined(OS_WIN) && !defined(OS_BSD) + if (!in_host_process_) { + // The unsandboxed GPU process fulfilled its duty. Rest in peace. + base::MessageLoop::current()->QuitWhenIdle(); +@@ -305,7 +305,7 @@ void GpuService::UpdateGpuInfoPlatform() { + } + gpu::SetKeysForCrashLogging(gpu_info_); + } +-#elif defined(OS_WIN) ++#elif defined(OS_WIN) && !defined(OS_BSD) + void GpuService::UpdateGpuInfoPlatform() { + DCHECK(main_runner_->BelongsToCurrentThread()); + // GPU full info collection should only happen on un-sandboxed GPU process +@@ -353,7 +353,7 @@ void GpuService::StoreShaderToDisk(int client_id, + (*gpu_host_)->StoreShaderToDisk(client_id, key, shader); + } + +-#if defined(OS_WIN) ++#if defined(OS_WIN) && !defined(OS_BSD) + void GpuService::SendAcceleratedSurfaceCreatedChildWindow( + gpu::SurfaceHandle parent_window, + gpu::SurfaceHandle child_window) { diff --git a/www/chromium/files/patch-skia_BUILD.gn b/www/chromium/files/patch-skia_BUILD.gn index ff9f856b82fb..afeec7328ce4 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 2017-04-19 19:06:37 UTC +--- skia/BUILD.gn.orig 2017-06-05 19:03:11 UTC +++ skia/BUILD.gn -@@ -127,7 +127,7 @@ config("skia_library_config") { +@@ -125,7 +125,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", -@@ -326,7 +326,7 @@ component("skia") { +@@ -351,7 +351,7 @@ component("skia") { set_sources_assignment_filter(sources_assignment_filter) } @@ -18,16 +18,25 @@ sources += [ "//third_party/skia/src/ports/SkFontConfigInterface.cpp", "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", -@@ -335,7 +335,7 @@ component("skia") { +@@ -360,7 +360,7 @@ component("skia") { ] } - if (is_linux || is_android) { + if (is_linux || is_bsd || is_android) { sources += [ + # Retain the files for the SkFontMgr_Android on linux to emulate android + # fonts. See content/zygote/zygote_main_linux.cc +@@ -370,7 +370,7 @@ component("skia") { + ] + } + +- if (is_linux || is_android || is_win) { ++ if (is_linux || is_bsd || is_android || is_win) { + sources += [ "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", -@@ -374,7 +374,7 @@ component("skia") { +@@ -409,7 +409,7 @@ component("skia") { "//base/third_party/dynamic_annotations", ] 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 558b3fc80d47..4a2be624e8c4 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 2017-04-19 19:06:37 UTC +--- skia/ext/SkMemory_new_handler.cpp.orig 2017-06-05 19:03:11 UTC +++ skia/ext/SkMemory_new_handler.cpp -@@ -68,7 +68,7 @@ static void* sk_malloc_nothrow(size_t si +@@ -68,7 +68,7 @@ static void* sk_malloc_nothrow(size_t size) { // TODO(b.kelemen): we should always use UncheckedMalloc but currently it // doesn't work as intended everywhere. void* result; diff --git a/www/chromium/files/patch-storage_browser_quota_quota__settings.cc b/www/chromium/files/patch-storage_browser_quota_quota__settings.cc index 2a67f216c196..a970baa12ebb 100644 --- a/www/chromium/files/patch-storage_browser_quota_quota__settings.cc +++ b/www/chromium/files/patch-storage_browser_quota_quota__settings.cc @@ -1,6 +1,6 @@ ---- storage/browser/quota/quota_settings.cc.orig 2017-04-19 19:06:37 UTC +--- storage/browser/quota/quota_settings.cc.orig 2017-06-05 19:03:11 UTC +++ storage/browser/quota/quota_settings.cc -@@ -53,7 +53,7 @@ base::Optional<storage::QuotaSettings> C +@@ -78,7 +78,7 @@ base::Optional<storage::QuotaSettings> CalculateNomina 1000 * kMBytes; #elif defined(OS_CHROMEOS) 1000 * kMBytes; diff --git a/www/chromium/files/patch-testing_gtest_src_gtest.cc b/www/chromium/files/patch-testing_gtest_src_gtest.cc index e1797a903b52..777df764a47d 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 2017-04-19 19:07:41 UTC +--- testing/gtest/src/gtest.cc.orig 2017-06-05 19:04:13 UTC +++ testing/gtest/src/gtest.cc @@ -122,6 +122,10 @@ @@ -11,7 +11,7 @@ #if GTEST_HAS_EXCEPTIONS # include <stdexcept> #endif -@@ -1930,7 +1934,7 @@ bool String::CaseInsensitiveWideCStringE +@@ -1930,7 +1934,7 @@ bool String::CaseInsensitiveWideCStringEquals(const wc #if GTEST_OS_WINDOWS return _wcsicmp(lhs, rhs) == 0; 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 0e5be2c42562..434cbd51c8b1 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 2017-04-19 19:06:49 UTC +--- third_party/WebKit/Source/core/layout/BUILD.gn.orig 2017-06-05 19:03:25 UTC +++ third_party/WebKit/Source/core/layout/BUILD.gn -@@ -381,7 +381,7 @@ blink_core_sources("layout") { +@@ -452,7 +452,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 df1d1888e1fe..c1aae8865cc5 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,14 +1,14 @@ ---- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig 2017-04-19 19:06:50 UTC +--- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig 2017-06-05 19:03:26 UTC +++ third_party/WebKit/Source/platform/fonts/FontCache.cpp @@ -63,9 +63,9 @@ using namespace WTF; namespace blink { -#if !OS(WIN) && !OS(LINUX) -+#if !OS(WIN) && !OS(LINUX) && !OS(FREEBSD) && !OS(OPENBSD) - FontCache::FontCache() : m_purgePreventCount(0), m_fontManager(nullptr) {} ++#if !OS(WIN) && !OS(LINUX) && !OS(FREEBSD) + FontCache::FontCache() : purge_prevent_count_(0), font_manager_(nullptr) {} -#endif // !OS(WIN) && !OS(LINUX) -+#endif // !OS(WIN) && !OS(LINUX) && !OS(FREEBSD) && !OS(OPENBSD) ++#endif // !OS(WIN) && !OS(LINUX) && !OS(FREEBSD) typedef HashMap<unsigned, std::unique_ptr<FontPlatformData>, 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 e047af0b87b1..43756843e5a3 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,20 +1,20 @@ ---- third_party/WebKit/Source/platform/fonts/FontCache.h.orig 2017-04-19 19:06:50 UTC +--- third_party/WebKit/Source/platform/fonts/FontCache.h.orig 2017-06-05 19:03:26 UTC +++ third_party/WebKit/Source/platform/fonts/FontCache.h @@ -144,7 +144,7 @@ class PLATFORM_EXPORT FontCache { #else - static const AtomicString& legacySystemFontFamily(); + static const AtomicString& LegacySystemFontFamily(); #endif -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) - static void setSystemFontFamily(const AtomicString&); + static void SetSystemFontFamily(const AtomicString&); #endif -@@ -258,7 +258,7 @@ class PLATFORM_EXPORT FontCache { +@@ -259,7 +259,7 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, CString& name); -#if OS(ANDROID) || OS(LINUX) -+#if OS(ANDROID) || OS(LINUX) || OS(FREEBSD) || OS(OPENBSD) - static AtomicString getFamilyNameForCharacter(SkFontMgr*, ++#if OS(ANDROID) || OS(LINUX) || OS(FREEBSD) + static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, 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 0fbcbf639a3a..639c0b61a0f5 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,47 +1,47 @@ ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2017-04-19 19:06:50 UTC +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2017-06-05 19:03:26 UTC +++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp -@@ -99,7 +99,7 @@ FontPlatformData::FontPlatformData(const - m_syntheticBold(source.m_syntheticBold), - m_syntheticItalic(source.m_syntheticItalic), - m_orientation(source.m_orientation), +@@ -93,7 +93,7 @@ FontPlatformData::FontPlatformData(const FontPlatformD + synthetic_bold_(source.synthetic_bold_), + synthetic_italic_(source.synthetic_italic_), + orientation_(source.orientation_), -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) - m_style(source.m_style), + style_(source.style_), #endif - m_harfBuzzFace(nullptr), -@@ -122,7 +122,7 @@ FontPlatformData::FontPlatformData(const - m_syntheticBold(src.m_syntheticBold), - m_syntheticItalic(src.m_syntheticItalic), - m_orientation(src.m_orientation), + harf_buzz_face_(nullptr), +@@ -114,7 +114,7 @@ FontPlatformData::FontPlatformData(const FontPlatformD + synthetic_bold_(src.synthetic_bold_), + synthetic_italic_(src.synthetic_italic_), + orientation_(src.orientation_), -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) - m_style(FontRenderStyle::querySystem(m_family, - m_textSize, - m_typeface->fontStyle())), -@@ -155,7 +155,7 @@ FontPlatformData::FontPlatformData(sk_sp - m_syntheticBold(syntheticBold), - m_syntheticItalic(syntheticItalic), - m_orientation(orientation), + style_(FontRenderStyle::QuerySystem(family_, + text_size_, + typeface_->fontStyle())), +@@ -145,7 +145,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t + synthetic_bold_(synthetic_bold), + synthetic_italic_(synthetic_italic), + orientation_(orientation), -#if OS(LINUX) || OS(ANDROID) -+#if OS(LINUX) || OS(ANDROID) | OS(BSD) - m_style(FontRenderStyle::querySystem(m_family, - m_textSize, - m_typeface->fontStyle())), -@@ -200,7 +200,7 @@ const FontPlatformData& FontPlatformData - m_syntheticItalic = other.m_syntheticItalic; - m_harfBuzzFace = nullptr; - m_orientation = other.m_orientation; ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + style_(FontRenderStyle::QuerySystem(family_, + text_size_, + typeface_->fontStyle())), +@@ -188,7 +188,7 @@ const FontPlatformData& FontPlatformData::operator=( + synthetic_italic_ = other.synthetic_italic_; + harf_buzz_face_ = nullptr; + orientation_ = other.orientation_; -#if OS(LINUX) || OS(ANDROID) -+#if OS(LINUX) || OS(ANDROID) | OS(BSD) - m_style = other.m_style; ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + style_ = other.style_; #endif -@@ -226,7 +226,7 @@ bool FontPlatformData::operator==(const - m_isHashTableDeletedValue == a.m_isHashTableDeletedValue && - m_syntheticBold == a.m_syntheticBold && - m_syntheticItalic == a.m_syntheticItalic +@@ -212,7 +212,7 @@ bool FontPlatformData::operator==(const FontPlatformDa + is_hash_table_deleted_value_ == a.is_hash_table_deleted_value_ && + synthetic_bold_ == a.synthetic_bold_ && + synthetic_italic_ == a.synthetic_italic_ -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) - && m_style == a.m_style + && style_ == a.style_ #endif - && m_orientation == a.m_orientation; + && orientation_ == a.orientation_; 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 150dd3c4b14a..9b58cca11a59 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,8 +1,8 @@ ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2017-04-19 19:06:50 UTC +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2017-06-05 19:03:26 UTC +++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h @@ -47,9 +47,9 @@ - #include "wtf/text/CString.h" - #include "wtf/text/StringImpl.h" + #include "platform/wtf/text/StringImpl.h" + #include "third_party/skia/include/core/SkRefCnt.h" -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) @@ -12,21 +12,21 @@ #if OS(MACOSX) OBJC_CLASS NSFont; -@@ -151,7 +151,7 @@ class PLATFORM_EXPORT FontPlatformData { - PassRefPtr<OpenTypeVerticalData> verticalData() const; - PassRefPtr<SharedBuffer> openTypeTable(SkFontTableTag) const; +@@ -147,7 +147,7 @@ class PLATFORM_EXPORT FontPlatformData { + PassRefPtr<OpenTypeVerticalData> VerticalData() const; + PassRefPtr<SharedBuffer> OpenTypeTable(SkFontTableTag) const; -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) // The returned styles are all actual styles without // FontRenderStyle::NoPreference. - const FontRenderStyle& getFontRenderStyle() const { return m_style; } -@@ -179,7 +179,7 @@ class PLATFORM_EXPORT FontPlatformData { - FontOrientation m_orientation; + const FontRenderStyle& GetFontRenderStyle() const { return style_; } +@@ -177,7 +177,7 @@ class PLATFORM_EXPORT FontPlatformData { + FontOrientation orientation_; private: -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) - FontRenderStyle m_style; + FontRenderStyle style_; #endif 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 75a09260b554..05523d3090cb 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,24 +1,24 @@ ---- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig 2017-04-19 19:06:50 UTC +--- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig 2017-06-05 19:03:26 UTC +++ third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp @@ -50,7 +50,7 @@ namespace blink { - const float smallCapsFontSizeMultiplier = 0.7f; - const float emphasisMarkFontSizeMultiplier = 0.5f; + const float kSmallCapsFontSizeMultiplier = 0.7f; + const float kEmphasisMarkFontSizeMultiplier = 0.5f; -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) // This is the largest VDMX table which we'll try to load and parse. - static const size_t maxVDMXTableSize = 1024 * 1024; // 1 MB + static const size_t kMaxVDMXTableSize = 1024 * 1024; // 1 MB #endif -@@ -109,7 +109,7 @@ void SimpleFontData::platformInit(bool s - int vdmxAscent = 0, vdmxDescent = 0; - bool isVDMXValid = false; +@@ -105,7 +105,7 @@ void SimpleFontData::PlatformInit(bool subpixel_ascent + int vdmx_ascent = 0, vdmx_descent = 0; + bool is_vdmx_valid = false; -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) // 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). -@@ -157,7 +157,7 @@ void SimpleFontData::platformInit(bool s +@@ -154,7 +154,7 @@ void SimpleFontData::PlatformInit(bool subpixel_ascent visual_overflow_inflation_for_ascent_ = 1; if (descent < metrics.fDescent) { visual_overflow_inflation_for_descent_ = 1; 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 092388b02704..50e29336baf9 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,7 +1,7 @@ ---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2017-04-19 19:06:50 UTC +--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2017-06-05 19:03:26 UTC +++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp -@@ -68,7 +68,7 @@ AtomicString toAtomicString(const SkStri - return AtomicString::fromUTF8(str.c_str(), str.size()); +@@ -68,7 +68,7 @@ AtomicString ToAtomicString(const SkString& str) { + return AtomicString::FromUTF8(str.c_str(), str.size()); } -#if OS(ANDROID) || OS(LINUX) @@ -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: -@@ -240,7 +240,7 @@ sk_sp<SkTypeface> FontCache::createTypef +@@ -249,7 +249,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( } #endif 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 cbc8f0617453..82a80c10c81d 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,8 +1,8 @@ ---- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig 2017-04-19 19:06:50 UTC +--- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig 2017-06-05 19:03:26 UTC +++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp @@ -7,6 +7,8 @@ + #include "platform/wtf/StackUtil.h" #include "public/platform/Platform.h" - #include "wtf/StackUtil.h" +#include <pthread_np.h> + diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Assertions.cpp index f586514c6413..ead0b95c258d 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Assertions.cpp @@ -1,5 +1,5 @@ ---- third_party/WebKit/Source/wtf/Assertions.cpp.orig 2017-04-19 19:06:50 UTC -+++ third_party/WebKit/Source/wtf/Assertions.cpp +--- third_party/WebKit/Source/platform/wtf/Assertions.cpp.orig 2017-06-05 19:03:26 UTC ++++ third_party/WebKit/Source/platform/wtf/Assertions.cpp @@ -60,7 +60,7 @@ #include <windows.h> #endif diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h b/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Atomics.h index 0d6be9148ace..d7374a5b5dcf 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Atomics.h @@ -1,11 +1,11 @@ ---- third_party/WebKit/Source/wtf/Atomics.h.orig 2017-04-19 19:06:50 UTC -+++ third_party/WebKit/Source/wtf/Atomics.h -@@ -176,7 +176,7 @@ ALWAYS_INLINE void atomicSetOneToZero(in +--- third_party/WebKit/Source/platform/wtf/Atomics.h.orig 2017-06-05 19:03:26 UTC ++++ third_party/WebKit/Source/platform/wtf/Atomics.h +@@ -176,7 +176,7 @@ ALWAYS_INLINE void AtomicSetOneToZero(int volatile* pt #if defined(THREAD_SANITIZER) // The definitions below assume an LP64 data model. This is fine because // TSan is only supported on x86_64 Linux. -#if CPU(64BIT) && OS(LINUX) +#if CPU(64BIT) && (OS(LINUX) || OS(BSD)) - ALWAYS_INLINE void releaseStore(volatile int* ptr, int value) { + ALWAYS_INLINE void ReleaseStore(volatile int* ptr, int value) { __tsan_atomic32_store(ptr, value, __tsan_memory_order_release); } diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_BUILD.gn b/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_BUILD.gn new file mode 100644 index 000000000000..c29d6c47a1ff --- /dev/null +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_BUILD.gn @@ -0,0 +1,13 @@ +--- third_party/WebKit/Source/platform/wtf/BUILD.gn.orig 2017-06-05 19:03:26 UTC ++++ third_party/WebKit/Source/platform/wtf/BUILD.gn +@@ -315,6 +315,10 @@ component("platform_wtf") { + libs = [ "dl" ] + } + ++ if (is_bsd) { ++ libs = [ "execinfo" ] ++ } ++ + if (is_mac) { + libs = [ + "CoreFoundation.framework", diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ByteSwap.h b/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ByteSwap.h new file mode 100644 index 000000000000..857d27b93ac7 --- /dev/null +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ByteSwap.h @@ -0,0 +1,24 @@ +--- third_party/WebKit/Source/platform/wtf/ByteSwap.h.orig 2017-06-05 19:03:26 UTC ++++ third_party/WebKit/Source/platform/wtf/ByteSwap.h +@@ -60,15 +60,21 @@ ALWAYS_INLINE uint16_t Bswap16(uint16_t x) { + + #else + ++#ifndef Bswap64 + ALWAYS_INLINE uint64_t Bswap64(uint64_t x) { + return __builtin_bswap64(x); + } ++#endif ++#ifndef Bswap32 + ALWAYS_INLINE uint32_t Bswap32(uint32_t x) { + return __builtin_bswap32(x); + } ++#endif ++#ifndef Bswap16 + ALWAYS_INLINE uint16_t Bswap16(uint16_t x) { + return __builtin_bswap16(x); + } ++#endif + + #endif + diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h b/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ContainerAnnotations.h index 63eecc98cde7..6a2fe0ef2888 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ContainerAnnotations.h @@ -1,5 +1,5 @@ ---- third_party/WebKit/Source/wtf/ContainerAnnotations.h.orig 2017-04-19 19:06:50 UTC -+++ third_party/WebKit/Source/wtf/ContainerAnnotations.h +--- third_party/WebKit/Source/platform/wtf/ContainerAnnotations.h.orig 2017-06-05 19:03:26 UTC ++++ third_party/WebKit/Source/platform/wtf/ContainerAnnotations.h @@ -10,7 +10,7 @@ // TODO(ochang): Remove the CPU(X86_64) condition to enable this for X86 once diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_StackUtil.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_StackUtil.cpp new file mode 100644 index 000000000000..06e7a700492c --- /dev/null +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_StackUtil.cpp @@ -0,0 +1,13 @@ +--- third_party/WebKit/Source/platform/wtf/StackUtil.cpp.orig 2017-06-05 19:03:26 UTC ++++ third_party/WebKit/Source/platform/wtf/StackUtil.cpp +@@ -8,6 +8,10 @@ + #include "platform/wtf/Threading.h" + #include "platform/wtf/WTFThreadData.h" + ++#if OS(FREEBSD) ++#include <pthread_np.h> ++#endif ++ + #if OS(WIN) + #include <stddef.h> + #include <windows.h> diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ThreadingPthreads.cpp index f31ce4568783..973ba230e940 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_ThreadingPthreads.cpp @@ -1,5 +1,5 @@ ---- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig 2017-04-19 19:06:50 UTC -+++ third_party/WebKit/Source/wtf/ThreadingPthreads.cpp +--- third_party/WebKit/Source/platform/wtf/ThreadingPthreads.cpp.orig 2017-06-05 19:03:26 UTC ++++ third_party/WebKit/Source/platform/wtf/ThreadingPthreads.cpp @@ -49,11 +49,15 @@ #include <objc/objc-auto.h> #endif @@ -18,7 +18,7 @@ #include <unistd.h> #endif -@@ -66,6 +70,8 @@ ThreadIdentifier currentThreadSyscall() +@@ -66,6 +70,8 @@ ThreadIdentifier CurrentThreadSyscall() { return pthread_mach_thread_np(pthread_self()); #elif OS(LINUX) return syscall(__NR_gettid); 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 00de0c3a34a8..7f505f1a48e9 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,9 +1,9 @@ ---- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig 2017-04-19 19:06:50 UTC +--- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig 2017-06-05 19:03:26 UTC +++ third_party/WebKit/Source/web/PopupMenuImpl.cpp -@@ -154,7 +154,7 @@ class PopupMenuImpl::ItemIterationContex - m_isInGroup(false), - m_buffer(buffer) { - DCHECK(m_buffer); +@@ -155,7 +155,7 @@ class PopupMenuImpl::ItemIterationContext { + is_in_group_(false), + buffer_(buffer) { + DCHECK(buffer_); -#if OS(LINUX) +#if OS(LINUX) || OS(BSD) // On other platforms, the <option> background color is the same as the 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 deleted file mode 100644 index 3f1cf6465e60..000000000000 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn +++ /dev/null @@ -1,13 +0,0 @@ ---- third_party/WebKit/Source/wtf/BUILD.gn.orig 2017-04-19 19:06:50 UTC -+++ third_party/WebKit/Source/wtf/BUILD.gn -@@ -280,6 +280,10 @@ component("wtf") { - libs = [ "dl" ] - } - -+ if (is_bsd) { -+ libs = [ "execinfo" ] -+ } -+ - if (is_mac) { - libs = [ - "CoreFoundation.framework", 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 deleted file mode 100644 index 11317a1ac1c6..000000000000 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h +++ /dev/null @@ -1,24 +0,0 @@ ---- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2017-04-19 19:06:50 UTC -+++ third_party/WebKit/Source/wtf/ByteSwap.h -@@ -60,15 +60,21 @@ ALWAYS_INLINE uint16_t bswap16(uint16_t - - #else - -+#ifndef bswap64 - ALWAYS_INLINE uint64_t bswap64(uint64_t x) { - return __builtin_bswap64(x); - } -+#endif -+#ifndef bswap32 - ALWAYS_INLINE uint32_t bswap32(uint32_t x) { - return __builtin_bswap32(x); - } -+#endif -+#ifndef bswap16 - ALWAYS_INLINE uint16_t bswap16(uint16_t x) { - return __builtin_bswap16(x); - } -+#endif - - #endif - diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp b/www/chromium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp deleted file mode 100644 index 232a8e9cbbc2..000000000000 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- third_party/WebKit/Source/wtf/StackUtil.cpp.orig 2017-04-19 19:06:50 UTC -+++ third_party/WebKit/Source/wtf/StackUtil.cpp -@@ -8,6 +8,10 @@ - #include "wtf/Threading.h" - #include "wtf/WTFThreadData.h" - -+#if OS(FREEBSD) -+#include <pthread_np.h> -+#endif -+ - #if OS(WIN) - #include <stddef.h> - #include <windows.h> diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index 461ff42a959e..ae6d2c5b2d1b 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 2017-04-19 19:07:43 UTC +--- third_party/angle/BUILD.gn.orig 2017-06-05 19:04:15 UTC +++ third_party/angle/BUILD.gn -@@ -16,6 +16,12 @@ if (ozone_platform_gbm) { +@@ -22,6 +22,12 @@ if (ozone_platform_gbm) { } } @@ -13,7 +13,7 @@ angle_git_is_present = exec_script("src/commit_id.py", [ "check", -@@ -418,11 +424,7 @@ static_library("libANGLE") { +@@ -427,11 +433,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") -@@ -627,7 +629,7 @@ util_gypi = exec_script("//build/gypi_to +@@ -636,7 +638,7 @@ util_gypi = exec_script("//build/gypi_to_gn.py", config("angle_util_config") { include_dirs = [ "util" ] @@ -35,7 +35,7 @@ libs = [ "X11" ] } } -@@ -654,7 +656,7 @@ foreach(is_shared_library, +@@ -663,7 +665,7 @@ foreach(is_shared_library, sources += rebase_path(util_gypi.util_win32_sources, ".", "util") } 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 62bde77ad58e..24bf0748822b 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,4 +1,4 @@ ---- third_party/angle/src/tests/BUILD.gn.orig 2017-04-19 19:07:43 UTC +--- third_party/angle/src/tests/BUILD.gn.orig 2017-06-05 19:04:15 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 @@ if (is_win || is_linux || is_mac || is_a +@@ -82,7 +82,7 @@ if (is_win || is_linux || is_mac || is_android) { "//third_party/angle:libANGLE_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 671756035ef6..c1bfe5de1af6 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 2017-04-19 19:07:42 UTC +--- third_party/boringssl/src/crypto/ex_data.c.orig 2017-06-05 19:04:14 UTC +++ third_party/boringssl/src/crypto/ex_data.c -@@ -188,7 +188,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *a +@@ -188,7 +188,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int index, } } diff --git a/www/chromium/files/patch-third__party_expat_BUILD.gn b/www/chromium/files/patch-third__party_expat_BUILD.gn index 7dd3c3906595..fbeedbf42477 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 2017-04-19 19:06:51 UTC +--- third_party/expat/BUILD.gn.orig 2017-06-05 19:03:27 UTC +++ third_party/expat/BUILD.gn -@@ -9,7 +9,7 @@ import("//testing/libfuzzer/fuzzer_test. +@@ -9,7 +9,7 @@ import("//testing/libfuzzer/fuzzer_test.gni") # 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_ffmpeg__generated.gni b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni index 18de5c725e59..0f8a068ab0e7 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni +++ b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni @@ -1,4 +1,4 @@ ---- third_party/ffmpeg/ffmpeg_generated.gni.orig 2017-04-19 19:07:44 UTC +--- third_party/ffmpeg/ffmpeg_generated.gni.orig 2017-06-05 19:04:16 UTC +++ third_party/ffmpeg/ffmpeg_generated.gni @@ -12,7 +12,7 @@ ffmpeg_c_sources = [] ffmpeg_gas_sources = [] @@ -9,7 +9,7 @@ ffmpeg_c_sources += [ "libavcodec/allcodecs.c", "libavcodec/autorename_libavcodec_flacdec.c", -@@ -161,7 +161,7 @@ if ((is_android && current_cpu == "arm" +@@ -162,7 +162,7 @@ if ((is_android && current_cpu == "arm" && arm_use_neo ] } @@ -18,7 +18,7 @@ ffmpeg_c_sources += [ "libavcodec/autorename_libavcodec_hpeldsp.c", "libavcodec/autorename_libavcodec_videodsp.c", -@@ -176,7 +176,7 @@ if ((is_linux && current_cpu == "arm" && +@@ -177,7 +177,7 @@ if ((is_linux && current_cpu == "arm" && arm_use_neon) ] } @@ -27,7 +27,7 @@ ffmpeg_c_sources += [ "libavcodec/aac_ac3_parser.c", "libavcodec/aac_parser.c", -@@ -213,7 +213,7 @@ if ((current_cpu == "x64" && ffmpeg_bran +@@ -214,7 +214,7 @@ if ((current_cpu == "x64" && ffmpeg_branding == "Chrom ] } @@ -36,7 +36,7 @@ ffmpeg_c_sources += [ "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c", "libavcodec/x86/constants.c", -@@ -226,7 +226,7 @@ if ((is_android && current_cpu == "x64") +@@ -227,7 +227,7 @@ if ((is_android && current_cpu == "x64") || (is_androi ] } @@ -45,7 +45,7 @@ ffmpeg_c_sources += [ "libavcodec/cabac.c", "libavcodec/h2645_parse.c", -@@ -258,7 +258,7 @@ if ((is_android && current_cpu == "arm" +@@ -259,7 +259,7 @@ if ((is_android && current_cpu == "arm" && arm_use_neo ] } @@ -54,7 +54,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/fft_fixed_init_arm.c", "libavcodec/arm/fft_init_arm.c", -@@ -277,7 +277,7 @@ if ((is_android && current_cpu == "arm" +@@ -278,7 +278,7 @@ if ((is_android && current_cpu == "arm" && arm_use_neo ] } @@ -63,7 +63,7 @@ ffmpeg_yasm_sources += [ "libavcodec/x86/fft.asm", "libavcodec/x86/flacdsp.asm", -@@ -289,7 +289,7 @@ if ((is_android && current_cpu == "x64") +@@ -290,7 +290,7 @@ if ((is_android && current_cpu == "x64") || (is_linux ] } @@ -72,7 +72,7 @@ ffmpeg_c_sources += [ "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c", "libavcodec/x86/h264_intrapred_init.c", -@@ -309,7 +309,7 @@ if ((is_linux && current_cpu == "x64") | +@@ -312,7 +312,7 @@ if ((is_linux && current_cpu == "x64") || (is_linux && ] } @@ -81,7 +81,7 @@ ffmpeg_c_sources += [ "libavcodec/x86/aacpsdsp_init.c", "libavcodec/x86/dct_init.c", -@@ -318,7 +318,7 @@ if ((current_cpu == "x64" && ffmpeg_bran +@@ -321,7 +321,7 @@ if ((current_cpu == "x64" && ffmpeg_branding == "Chrom ] } @@ -90,7 +90,7 @@ ffmpeg_yasm_sources += [ "libavcodec/x86/aacpsdsp.asm", "libavcodec/x86/dct32.asm", -@@ -327,7 +327,7 @@ if ((current_cpu == "x64" && ffmpeg_bran +@@ -330,7 +330,7 @@ if ((current_cpu == "x64" && ffmpeg_branding == "Chrom ] } @@ -99,7 +99,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/h264pred_init_arm.c", "libavcodec/arm/hpeldsp_init_arm.c", -@@ -347,13 +347,13 @@ if ((is_linux && current_cpu == "arm" && +@@ -350,13 +350,13 @@ if ((is_linux && current_cpu == "arm" && arm_use_neon) ] } @@ -115,7 +115,7 @@ ffmpeg_c_sources += [ "libavcodec/acelp_filters.c", "libavcodec/acelp_pitch_delay.c", -@@ -408,7 +408,7 @@ if ((is_linux && current_cpu == "arm" && +@@ -411,7 +411,7 @@ if ((is_linux && current_cpu == "arm" && arm_use_neon ] } @@ -124,7 +124,7 @@ ffmpeg_c_sources += [ "libavcodec/aarch64/fft_init_aarch64.c", "libavcodec/aarch64/vorbisdsp_init.c", -@@ -423,7 +423,7 @@ if ((is_android && current_cpu == "arm64 +@@ -426,7 +426,7 @@ if ((is_android && current_cpu == "arm64") || (is_linu ] } @@ -133,7 +133,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/aacpsdsp_init_arm.c", "libavcodec/arm/mpegaudiodsp_init_arm.c", -@@ -434,7 +434,7 @@ if ((is_android && current_cpu == "arm" +@@ -437,7 +437,7 @@ if ((is_android && current_cpu == "arm" && arm_use_neo ] } @@ -142,7 +142,7 @@ ffmpeg_c_sources += [ "libavutil/arm/float_dsp_init_neon.c", ] -@@ -449,7 +449,7 @@ if ((is_android && current_cpu == "arm" +@@ -452,7 +452,7 @@ if ((is_android && current_cpu == "arm" && arm_use_neo ] } @@ -151,7 +151,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/h264chroma_init_arm.c", "libavcodec/arm/h264dsp_init_arm.c", -@@ -460,7 +460,7 @@ if ((is_linux && current_cpu == "arm" && +@@ -463,7 +463,7 @@ if ((is_linux && current_cpu == "arm" && arm_use_neon ] } @@ -160,7 +160,7 @@ ffmpeg_c_sources += [ "libavcodec/x86/h264_qpel.c", "libavcodec/x86/h264chroma_init.c", -@@ -481,7 +481,7 @@ if ((is_linux && current_cpu == "x64" && +@@ -484,7 +484,7 @@ if ((is_linux && current_cpu == "x64" && ffmpeg_brandi ] } @@ -169,7 +169,7 @@ ffmpeg_c_sources += [ "libavcodec/mips/aacdec_mips.c", "libavcodec/mips/aacpsdsp_mips.c", -@@ -490,7 +490,7 @@ if ((is_android && current_cpu == "mips6 +@@ -493,7 +493,7 @@ if ((is_android && current_cpu == "mips64el" && ffmpeg ] } @@ -178,7 +178,7 @@ ffmpeg_c_sources += [ "libavcodec/mips/h264pred_init_mips.c", "libavcodec/mips/hpeldsp_init_mips.c", -@@ -498,7 +498,7 @@ if (is_linux && current_cpu == "mipsel") +@@ -501,7 +501,7 @@ if (is_linux && current_cpu == "mipsel") { ] } @@ -187,7 +187,7 @@ ffmpeg_c_sources += [ "libavcodec/mips/h264chroma_init_mips.c", "libavcodec/mips/h264dsp_init_mips.c", -@@ -506,7 +506,7 @@ if ((is_linux && current_cpu == "mipsel" +@@ -509,7 +509,7 @@ if ((is_linux && current_cpu == "mipsel" && ffmpeg_bra ] } @@ -196,7 +196,7 @@ ffmpeg_c_sources += [ "libavcodec/aarch64/h264pred_init.c", "libavcodec/aarch64/hpeldsp_init_aarch64.c", -@@ -519,7 +519,7 @@ if (is_linux && current_cpu == "arm64") +@@ -522,7 +522,7 @@ if (is_linux && current_cpu == "arm64") { ] } @@ -205,7 +205,7 @@ ffmpeg_c_sources += [ "libavcodec/aarch64/mpegaudiodsp_init.c", ] -@@ -528,7 +528,7 @@ if ((is_android && current_cpu == "arm64 +@@ -531,7 +531,7 @@ if ((is_android && current_cpu == "arm64" && ffmpeg_br ] } @@ -214,7 +214,7 @@ ffmpeg_c_sources += [ "libavcodec/aarch64/h264chroma_init_aarch64.c", "libavcodec/aarch64/h264dsp_init_aarch64.c", -@@ -542,7 +542,7 @@ if ((is_linux && current_cpu == "arm64" +@@ -545,7 +545,7 @@ if ((is_linux && current_cpu == "arm64" && ffmpeg_bran ] } @@ -223,7 +223,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/hpeldsp_init_neon.c", "libavcodec/arm/vp8dsp_init_neon.c", -@@ -555,14 +555,14 @@ if (is_linux && current_cpu == "arm" && +@@ -558,14 +558,14 @@ if (is_linux && current_cpu == "arm" && arm_use_neon) ] } @@ -240,7 +240,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/blockdsp_init_arm.c", "libavcodec/arm/idctdsp_init_arm.c", -@@ -586,13 +586,13 @@ if ((is_linux && current_cpu == "arm" && +@@ -589,13 +589,13 @@ if ((is_linux && current_cpu == "arm" && arm_use_neon ] } @@ -256,7 +256,7 @@ ffmpeg_gas_sources += [ "libavcodec/arm/h264cmc_neon.S", "libavcodec/arm/h264dsp_neon.S", -@@ -607,7 +607,7 @@ if (is_win && current_cpu == "x64") { +@@ -610,7 +610,7 @@ if (is_win && current_cpu == "x64") { ] } @@ -265,7 +265,7 @@ ffmpeg_c_sources += [ "libavcodec/x86/blockdsp_init.c", "libavcodec/x86/fdct.c", -@@ -634,7 +634,7 @@ if ((is_linux && current_cpu == "x64" && +@@ -637,7 +637,7 @@ if ((is_linux && current_cpu == "x64" && ffmpeg_brandi ] } @@ -274,7 +274,7 @@ ffmpeg_c_sources += [ "libavcodec/mips/blockdsp_init_mips.c", "libavcodec/mips/h263dsp_init_mips.c", -@@ -647,7 +647,7 @@ if (is_linux && current_cpu == "mipsel" +@@ -650,7 +650,7 @@ if (is_linux && current_cpu == "mipsel" && ffmpeg_bran ] } 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 717835d33d65..aba5aa298571 100644 --- a/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn +++ b/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/harfbuzz-ng/BUILD.gn.orig 2017-04-19 19:06:52 UTC +--- third_party/harfbuzz-ng/BUILD.gn.orig 2017-06-05 19:03:27 UTC +++ third_party/harfbuzz-ng/BUILD.gn @@ -50,7 +50,7 @@ if (use_system_harfbuzz) { @@ -9,12 +9,12 @@ current_cpu != "arm" && current_cpu != "mipsel" && !is_component_build) { # These symbols are referenced from libpangoft2, which will be # dynamically linked later. -@@ -200,7 +200,7 @@ if (use_system_harfbuzz) { +@@ -201,7 +201,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. - 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") { - deps += [ "//build/linux:freetype2" ] + deps += [ "//build/config/freetype" ] configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] 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 4663573fab03..65aa11388ae4 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 2017-04-19 19:07:47 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2017-06-05 19:04:19 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h -@@ -56,7 +56,7 @@ template <class T> boost::once_flag Sing +@@ -56,7 +56,7 @@ template <class T> boost::once_flag Singleton<T>::flag #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 b4af7627b1ea..ff7472a6bf75 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 2017-04-19 19:07:47 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2017-06-05 19:04:19 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h -@@ -37,7 +37,7 @@ typedef boost::mutex::scoped_lock AutoLo +@@ -37,7 +37,7 @@ typedef boost::mutex::scoped_lock AutoLock; // 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_libusb_BUILD.gn b/www/chromium/files/patch-third__party_libusb_BUILD.gn index 05273d1c0de4..acdb5d772306 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 2017-04-19 19:06:52 UTC -+++ third_party/libusb/BUILD.gn -@@ -6,8 +6,25 @@ assert(!is_android && !is_ios) +--- third_party/libusb/BUILD.gn.orig 2017-06-15 21:03:21.000000000 +0200 ++++ third_party/libusb/BUILD.gn 2017-06-16 20:36:59.253682000 +0200 +@@ -6,10 +6,24 @@ import("//build/config/features.gni") @@ -8,249 +8,36 @@ - include_dirs = [ "src/libusb" ] +declare_args() { + use_system_libusb = is_bsd -+} -+ -+ + } + +if (use_system_libusb) { + config("libusb_config") { -+ defines = ["USE_SYSTEM_LIBUSB"] -+ libs = ["usb"] -+ } ++ libs = [ "usb" ] ++ } + + source_set("libusb") { + public_configs = [ ":libusb_config" ] + } +} else { -+ -+ config("libusb_config") { ++ config("libusb_config") { + include_dirs = [ "src/libusb" ] + } - } - ++} ++ config("libusb_warnings") { -@@ -21,118 +38,119 @@ config("libusb_warnings") { + visibility = [ ":*" ] + if (is_clang) { +@@ -21,6 +35,7 @@ } } --static_library("libusb") { -- sources = [ -- "src/config.h", -- "src/libusb/core.c", -- "src/libusb/descriptor.c", -- "src/libusb/hotplug.c", -- "src/libusb/hotplug.h", -- "src/libusb/interrupt.c", -- "src/libusb/interrupt.h", -- "src/libusb/io.c", -- "src/libusb/libusb.h", -- "src/libusb/libusbi.h", -- "src/libusb/os/darwin_usb.c", -- "src/libusb/os/darwin_usb.h", -- "src/libusb/os/poll_posix.c", -- "src/libusb/os/poll_posix.h", -- "src/libusb/os/poll_windows.c", -- "src/libusb/os/poll_windows.h", -- "src/libusb/os/threads_posix.c", -- "src/libusb/os/threads_posix.h", -- "src/libusb/os/threads_windows.c", -- "src/libusb/os/threads_windows.h", -- "src/libusb/os/windows_common.h", -- "src/libusb/os/windows_usb.c", -- "src/libusb/os/windows_usb.h", -- "src/libusb/strerror.c", -- "src/libusb/sync.c", -- "src/libusb/version.h", -- "src/libusb/version_nano.h", -- "src/msvc/config.h", -- "src/msvc/inttypes.h", -- "src/msvc/stdint.h", -- ] -- deps = [] -- include_dirs = [ "src/libusb/os" ] +if (!use_system_libusb) { -+ static_library("libusb") { -+ sources = [ -+ "src/config.h", -+ "src/libusb/core.c", -+ "src/libusb/descriptor.c", -+ "src/libusb/hotplug.c", -+ "src/libusb/hotplug.h", -+ "src/libusb/interrupt.c", -+ "src/libusb/interrupt.h", -+ "src/libusb/io.c", -+ "src/libusb/libusb.h", -+ "src/libusb/libusbi.h", -+ "src/libusb/os/darwin_usb.c", -+ "src/libusb/os/darwin_usb.h", -+ "src/libusb/os/poll_posix.c", -+ "src/libusb/os/poll_posix.h", -+ "src/libusb/os/poll_windows.c", -+ "src/libusb/os/poll_windows.h", -+ "src/libusb/os/threads_posix.c", -+ "src/libusb/os/threads_posix.h", -+ "src/libusb/os/threads_windows.c", -+ "src/libusb/os/threads_windows.h", -+ "src/libusb/os/windows_common.h", -+ "src/libusb/os/windows_usb.c", -+ "src/libusb/os/windows_usb.h", -+ "src/libusb/strerror.c", -+ "src/libusb/sync.c", -+ "src/libusb/version.h", -+ "src/libusb/version_nano.h", -+ "src/msvc/config.h", -+ "src/msvc/inttypes.h", -+ "src/msvc/stdint.h", -+ ] -+ 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=", -+ "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 (is_mac) { -+ defines += [ -+ "OS_DARWIN=1", - -- # Needed on OSX 10.12 to silence a deprecation warning. -+# Needed on OSX 10.12 to silence a deprecation warning. - "OBJC_SILENCE_GC_DEPRECATIONS=1", -- ] -- } else { -- sources -= [ -- "src/libusb/os/darwin_usb.c", -+ ] -+ } else { -+ sources -= [ -+ "src/libusb/os/darwin_usb.c", - "src/libusb/os/darwin_usb.h", -- ] -- } -+ ] -+ } - -- if (is_linux) { -- sources += [ -- "src/libusb/os/linux_usbfs.c", -+ if (is_linux) { -+ sources += [ -+ "src/libusb/os/linux_usbfs.c", - "src/libusb/os/linux_usbfs.h", -- ] -- defines += [ -- "OS_LINUX=1", -+ ] -+ defines += [ -+ "OS_LINUX=1", - "_GNU_SOURCE=1", -- ] -- } -+ ] -+ } - -- if (is_chromeos) { -- defines += [ "USBI_TIMERFD_AVAILABLE" ] -- } -+ if (is_chromeos) { -+ defines += [ "USBI_TIMERFD_AVAILABLE" ] -+ } - -- if (use_udev) { -- sources += [ "src/libusb/os/linux_udev.cc" ] -- defines += [ -- "HAVE_LIBUDEV=1", -- "USE_UDEV=1", -- ] -- deps += [ "//build/linux/libudev" ] -- } -+ if (use_udev) { -+ sources += [ "src/libusb/os/linux_udev.cc" ] -+ defines += [ -+ "HAVE_LIBUDEV=1", -+ "USE_UDEV=1", -+ ] -+ deps += [ "//build/linux/libudev" ] -+ } - -- if (is_linux && !use_udev) { -- sources += [ "src/libusb/os/linux_netlink.c" ] -- defines += [ "HAVE_LINUX_NETLINK_H" ] -- } -+ if (is_linux && !use_udev) { -+ sources += [ "src/libusb/os/linux_netlink.c" ] -+ defines += [ "HAVE_LINUX_NETLINK_H" ] -+ } - -- if (is_win) { -- include_dirs += [ "src/msvc" ] -- sources -= [ -- "src/libusb/os/poll_posix.c", -- "src/libusb/os/threads_posix.c", -- ] -- libs = [ "setupapi.lib" ] -- } else { -- include_dirs += [ "src" ] -- sources -= [ -- "src/libusb/os/poll_windows.c", -+ if (is_win) { -+ include_dirs += [ "src/msvc" ] -+ sources -= [ -+ "src/libusb/os/poll_posix.c", -+ "src/libusb/os/threads_posix.c", -+ ] -+ libs = [ "setupapi.lib" ] -+ } else { -+ include_dirs += [ "src" ] -+ sources -= [ -+ "src/libusb/os/poll_windows.c", - "src/libusb/os/poll_windows.h", - "src/libusb/os/threads_windows.c", - "src/libusb/os/threads_windows.h", -@@ -142,6 +160,7 @@ static_library("libusb") { - "src/msvc/config.h", - "src/msvc/inttypes.h", + static_library("libusb") { + sources = [ + "src/config.h", +@@ -144,4 +159,5 @@ "src/msvc/stdint.h", -- ] -+ ] -+ } + ] } ++} } diff --git a/www/chromium/files/patch-third__party_libxml_chromium_libxml__utils.cc b/www/chromium/files/patch-third__party_libxml_chromium_libxml__utils.cc new file mode 100644 index 000000000000..2db53c8a2cf2 --- /dev/null +++ b/www/chromium/files/patch-third__party_libxml_chromium_libxml__utils.cc @@ -0,0 +1,22 @@ +--- third_party/libxml/chromium/libxml_utils.cc.orig 2017-06-05 19:03:28 UTC ++++ third_party/libxml/chromium/libxml_utils.cc +@@ -24,8 +24,7 @@ XmlReader::~XmlReader() { + + bool XmlReader::Load(const std::string& input) { + const int kParseOptions = XML_PARSE_RECOVER | // recover on errors +- XML_PARSE_NONET | // forbid network access +- XML_PARSE_NOXXE; // no external entities ++ XML_PARSE_NONET; // forbid network access + // TODO(evanm): Verify it's OK to pass NULL for the URL and encoding. + // The libxml code allows for these, but it's unclear what effect is has. + reader_ = xmlReaderForMemory(input.data(), static_cast<int>(input.size()), +@@ -35,8 +34,7 @@ bool XmlReader::Load(const std::string& input) { + + bool XmlReader::LoadFile(const std::string& file_path) { + const int kParseOptions = XML_PARSE_RECOVER | // recover on errors +- XML_PARSE_NONET | // forbid network access +- XML_PARSE_NOXXE; // no external entities ++ XML_PARSE_NONET; // forbid network access + reader_ = xmlReaderForFile(file_path.c_str(), NULL, kParseOptions); + return reader_ != NULL; + } diff --git a/www/chromium/files/patch-third__party_mesa_BUILD.gn b/www/chromium/files/patch-third__party_mesa_BUILD.gn index 7fd1838dbff0..2e534118fc1f 100644 --- a/www/chromium/files/patch-third__party_mesa_BUILD.gn +++ b/www/chromium/files/patch-third__party_mesa_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/mesa/BUILD.gn.orig 2017-04-19 19:06:52 UTC +--- third_party/mesa/BUILD.gn.orig 2017-06-05 19:03:28 UTC +++ third_party/mesa/BUILD.gn @@ -90,6 +90,10 @@ config("mesa_internal_config") { defines += [ "_GNU_SOURCE" ] @@ -11,13 +11,3 @@ if (is_win) { defines += [ # Generated files use const only if __cplusplus or __STDC__ is defined. -@@ -757,7 +761,8 @@ loadable_module("osmesa") { - ] - - # Required for the allocator implementation, which is not used on Mac. -- if (!is_mac) { -+ # For BSD, there's no poing to include everything. -+ if (!is_mac && !is_bsd) { - deps += [ "//base" ] - } - diff --git a/www/chromium/files/patch-third__party_opus_BUILD.gn b/www/chromium/files/patch-third__party_opus_BUILD.gn index f15683ab5cb8..91a2223147d3 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 2017-04-19 19:06:52 UTC +--- third_party/opus/BUILD.gn.orig 2017-06-05 19:03:28 UTC +++ third_party/opus/BUILD.gn -@@ -14,7 +14,7 @@ use_opus_arm_optimization = current_cpu +@@ -14,7 +14,7 @@ use_opus_arm_optimization = current_cpu == "arm" # 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_pdfium_BUILD.gn b/www/chromium/files/patch-third__party_pdfium_BUILD.gn index b14844a92bb9..d1298098490a 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 2017-04-19 19:07:49 UTC +--- third_party/pdfium/BUILD.gn.orig 2017-06-05 19:04:21 UTC +++ third_party/pdfium/BUILD.gn -@@ -65,7 +65,7 @@ config("pdfium_core_config") { +@@ -75,7 +75,7 @@ config("pdfium_core_config") { cflags = [] configs = [ ":pdfium_common_config" ] defines = [ "V8_DEPRECATION_WARNINGS" ] 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 70a7add9e253..6264b9d1e2fe 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 2017-04-19 19:07:50 UTC +--- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig 2017-06-05 19:04:22 UTC +++ third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp -@@ -457,11 +457,12 @@ v8::Local<v8::Date> CJS_Date::ToV8Date(C +@@ -457,11 +457,12 @@ v8::Local<v8::Date> CJS_Date::ToV8Date(CJS_Runtime* pR } double _getLocalTZA() { 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 495f6870a690..62e17eb90ec9 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,8 +1,8 @@ ---- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2017-04-19 19:07:50 UTC +--- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2017-06-05 19:04:22 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"}; +@@ -68,6 +68,103 @@ const wchar_t* const fullmonths[] = {L"January", L"Feb + L"July", L"August", L"September", + L"October", L"November", L"December"}; +#if defined(__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 1e14e84e7998..12dcc27962d7 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 2017-04-19 19:07:50 UTC +--- third_party/pdfium/skia/BUILD.gn.orig 2017-06-05 19:04:22 UTC +++ third_party/pdfium/skia/BUILD.gn -@@ -102,7 +102,7 @@ config("skia_library_config") { +@@ -114,7 +114,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", -@@ -280,7 +280,7 @@ component("skia") { +@@ -290,7 +290,7 @@ component("skia") { "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp", ] } @@ -18,8 +18,8 @@ sources -= [ "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", -@@ -309,7 +309,7 @@ component("skia") { - "../third_party:fx_zlib", +@@ -320,7 +320,7 @@ component("skia") { + "//third_party/zlib:zlib", ] - if (is_linux) { diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index f6ec0e7531fe..483e0d2b305f 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 2017-04-19 19:07:52 UTC +--- third_party/webrtc/BUILD.gn.orig 2017-06-05 19:04:24 UTC +++ third_party/webrtc/BUILD.gn -@@ -59,6 +59,9 @@ config("common_inherited_config") { +@@ -58,6 +58,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 3af4a959006c..410fe8309171 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 2017-04-19 19:07:52 UTC +--- third_party/webrtc/base/BUILD.gn.orig 2017-06-05 19:04:24 UTC +++ third_party/webrtc/base/BUILD.gn -@@ -566,7 +566,6 @@ rtc_static_library("rtc_base") { +@@ -567,7 +567,6 @@ rtc_static_library("rtc_base") { if (use_x11) { libs += [ @@ -8,7 +8,7 @@ "rt", "Xext", "X11", -@@ -577,7 +576,6 @@ rtc_static_library("rtc_base") { +@@ -578,7 +577,6 @@ rtc_static_library("rtc_base") { if (is_linux) { libs += [ diff --git a/www/chromium/files/patch-third__party_webrtc_base_byteorder.h b/www/chromium/files/patch-third__party_webrtc_base_byteorder.h new file mode 100644 index 000000000000..72642930d08e --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_base_byteorder.h @@ -0,0 +1,11 @@ +--- third_party/webrtc/base/byteorder.h.orig 2017-06-05 19:04:24 UTC ++++ third_party/webrtc/base/byteorder.h +@@ -77,7 +77,7 @@ + #error RTC_ARCH_CPU_BIG_ENDIAN or RTC_ARCH_CPU_LITTLE_ENDIAN must be defined. + #endif // defined(RTC_ARCH_CPU_LITTLE_ENDIAN) + #elif defined(WEBRTC_POSIX) +-#include <endian.h> ++#include <sys/endian.h> + #endif + + namespace rtc { 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 3db8b5ed937c..6288d1966600 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/base/httpcommon.cc.orig 2017-04-19 19:07:52 UTC +--- third_party/webrtc/base/httpcommon.cc.orig 2017-06-05 19:04:24 UTC +++ third_party/webrtc/base/httpcommon.cc -@@ -384,7 +384,7 @@ bool HttpDateToSeconds(const std::string +@@ -384,7 +384,7 @@ bool HttpDateToSeconds(const std::string& date, time_t gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60; } // TODO: Android should support timezone, see b/2441195 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 d98bbc965c84..772641a7479e 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_network.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_network.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/network.cc.orig 2017-04-19 19:07:52 UTC +--- third_party/webrtc/base/network.cc.orig 2017-06-05 19:04:24 UTC +++ third_party/webrtc/base/network.cc @@ -14,7 +14,7 @@ // linux/if.h can't be included at the same time as the posix sys/if.h, and @@ -9,7 +9,7 @@ #include <linux/if.h> #include <linux/route.h> #elif !defined(__native_client__) -@@ -658,7 +658,7 @@ bool BasicNetworkManager::CreateNetworks +@@ -658,7 +658,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_ } #endif // WEBRTC_WIN @@ -18,7 +18,7 @@ bool IsDefaultRoute(const std::string& network_name) { FileStream fs; if (!fs.Open("/proc/net/route", "r", nullptr)) { -@@ -701,7 +701,7 @@ bool BasicNetworkManager::IsIgnoredNetwo +@@ -701,7 +701,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo strncmp(network.name().c_str(), "vboxnet", 7) == 0) { return true; } 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 a0fd729a45a7..fd745db6e776 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/physicalsocketserver.cc.orig 2017-04-19 19:07:52 UTC +--- third_party/webrtc/base/physicalsocketserver.cc.orig 2017-06-05 19:04:24 UTC +++ third_party/webrtc/base/physicalsocketserver.cc @@ -61,7 +61,11 @@ typedef void* SockOptArg; @@ -12,7 +12,7 @@ if (ret != 0) return -1; int64_t timestamp = -@@ -302,7 +306,7 @@ int PhysicalSocket::GetOption(Option opt +@@ -302,7 +306,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 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 } -@@ -315,7 +319,7 @@ int PhysicalSocket::SetOption(Option opt +@@ -315,7 +319,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { 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 } -@@ -597,10 +601,10 @@ int PhysicalSocket::TranslateOption(Opti +@@ -597,10 +601,10 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *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 bd2394f3265a..9fd6fbd17507 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,8 +1,8 @@ ---- third_party/webrtc/base/platform_thread.cc.orig 2017-04-19 19:07:52 UTC +--- third_party/webrtc/base/platform_thread.cc.orig 2017-06-05 19:04:24 UTC +++ third_party/webrtc/base/platform_thread.cc -@@ -13,11 +13,18 @@ - #include "webrtc/base/atomicops.h" - #include "webrtc/base/checks.h" +@@ -15,11 +15,18 @@ + #include "webrtc/base/timeutils.h" + #include "webrtc/base/trace_event.h" -#if defined(WEBRTC_LINUX) +#if defined(WEBRTC_LINUX) && !defined(__FreeBSD__) @@ -20,7 +20,7 @@ namespace rtc { PlatformThreadId CurrentThreadId() { -@@ -27,6 +34,8 @@ PlatformThreadId CurrentThreadId() { +@@ -29,6 +36,8 @@ PlatformThreadId CurrentThreadId() { #elif defined(WEBRTC_POSIX) #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS) ret = pthread_mach_thread_np(pthread_self()); @@ -29,7 +29,7 @@ #elif defined(WEBRTC_LINUX) ret = syscall(__NR_gettid); #elif defined(WEBRTC_ANDROID) -@@ -70,7 +79,9 @@ void SetCurrentThreadName(const char* na +@@ -72,7 +81,9 @@ void SetCurrentThreadName(const char* name) { reinterpret_cast<ULONG_PTR*>(&threadname_info)); } __except (EXCEPTION_EXECUTE_HANDLER) { } 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 a5294906b586..f812a439327c 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 2017-04-19 19:07:52 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2017-06-05 19:04:24 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -82,7 +82,7 @@ rtc_static_library("audio_device") { +@@ -74,7 +74,7 @@ rtc_static_library("audio_device") { ] include_dirs = [] @@ -9,7 +9,7 @@ include_dirs += [ "linux" ] } if (is_ios) { -@@ -130,7 +130,7 @@ rtc_static_library("audio_device") { +@@ -124,7 +124,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_video__coding_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn index 787581703a72..33d5623395ee 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 2017-04-19 19:07:53 UTC +--- third_party/webrtc/modules/video_coding/BUILD.gn.orig 2017-06-05 19:04:24 UTC +++ third_party/webrtc/modules/video_coding/BUILD.gn -@@ -154,12 +154,7 @@ rtc_static_library("webrtc_h264") { +@@ -151,12 +151,7 @@ rtc_static_library("webrtc_h264") { } defines = [] @@ -14,7 +14,7 @@ if (rtc_use_h264) { defines += [ "WEBRTC_USE_H264" ] -@@ -173,10 +168,10 @@ rtc_static_library("webrtc_h264") { +@@ -170,10 +165,10 @@ 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 2efac34c7c42..37df2d3d8b7f 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 2017-04-19 19:07:53 UTC +--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2017-06-05 19:04:24 UTC +++ third_party/webrtc/system_wrappers/BUILD.gn -@@ -87,7 +87,7 @@ rtc_static_library("system_wrappers") { +@@ -79,7 +79,7 @@ rtc_static_library("system_wrappers") { libs += [ "log" ] } @@ -9,7 +9,7 @@ defines += [ "WEBRTC_THREAD_RR" ] if (!build_with_chromium) { -@@ -97,7 +97,7 @@ rtc_static_library("system_wrappers") { +@@ -89,7 +89,7 @@ rtc_static_library("system_wrappers") { libs += [ "rt" ] } 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 3bd5319abd02..e1b2d8ccd513 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 2017-04-19 19:06:53 UTC +--- third_party/widevine/cdm/BUILD.gn.orig 2017-06-05 19:03:29 UTC +++ third_party/widevine/cdm/BUILD.gn -@@ -26,7 +26,7 @@ if (is_android) { +@@ -36,7 +36,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) { -@@ -165,7 +165,7 @@ if ((is_chrome_branded || enable_widevin +@@ -208,7 +208,7 @@ if ((is_chrome_branded || enable_widevine) && enable_p ":widevinecdm", ] -- if (is_linux) { -+ if (is_linux || is_bsd) { +- if (is_linux && !use_stub_cdm_for_chrome) { ++ if ((is_linux || is_bsd) && !use_stub_cdm_for_chrome) { ldflags = [ rebase_path("$root_out_dir/$widevine_cdm_path/libwidevinecdm.so", root_build_dir) ] -@@ -188,7 +188,7 @@ if ((is_chrome_branded || enable_widevin +@@ -231,7 +231,7 @@ if ((is_chrome_branded || enable_widevine) && enable_p # 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 11a2eabd708f..662fb72089f2 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 2017-04-19 19:06:53 UTC +--- third_party/yasm/BUILD.gn.orig 2017-06-05 19:03:29 UTC +++ third_party/yasm/BUILD.gn -@@ -32,7 +32,12 @@ import("//build/config/compiler/compiler +@@ -32,7 +32,12 @@ import("//build/config/compiler/compiler.gni") 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 f34a2225b201..7c9fefa24475 100644 --- a/www/chromium/files/patch-third__party_zlib_BUILD.gn +++ b/www/chromium/files/patch-third__party_zlib_BUILD.gn @@ -1,11 +1,11 @@ ---- third_party/zlib/BUILD.gn.orig 2017-04-19 19:06:53 UTC +--- third_party/zlib/BUILD.gn.orig 2017-06-05 19:03:29 UTC +++ third_party/zlib/BUILD.gn -@@ -115,7 +115,7 @@ static_library("minizip") { +@@ -117,7 +117,7 @@ static_library("minizip") { "contrib/minizip/iowin32.h", ] } -- if (is_mac || is_ios || is_android) { -+ if (is_mac || is_ios || is_android || is_bsd) { +- if (is_mac || is_ios || is_android || is_nacl) { ++ if (is_mac || is_ios || is_android || is_nacl || is_bsd) { # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We # use fopen, ftell, and fseek instead on these systems. defines = [ "USE_FILE32API" ] diff --git a/www/chromium/files/patch-tools_gn_args.cc b/www/chromium/files/patch-tools_gn_args.cc index 4c9ef989b180..915e8aac8460 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 2017-04-19 19:06:54 UTC +--- tools/gn/args.cc.orig 2017-06-05 19:03:29 UTC +++ tools/gn/args.cc -@@ -298,6 +298,8 @@ void Args::SetSystemVarsLocked(Scope* de +@@ -298,6 +298,8 @@ void Args::SetSystemVarsLocked(Scope* dest) const { os = "mac"; #elif defined(OS_LINUX) os = "linux"; diff --git a/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py b/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py index 35ce7170eee0..cfe99361b1c3 100644 --- a/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py +++ b/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py @@ -1,6 +1,6 @@ ---- tools/gn/bootstrap/bootstrap.py.orig 2017-04-19 19:06:54 UTC -+++ tools/gn/bootstrap/bootstrap.py -@@ -23,6 +23,7 @@ import os +--- tools/gn/bootstrap/bootstrap.py.orig 2017-06-05 21:03:29.000000000 +0200 ++++ tools/gn/bootstrap/bootstrap.py 2017-06-13 19:25:21.449012000 +0200 +@@ -23,6 +23,7 @@ import shutil import subprocess import sys @@ -8,7 +8,7 @@ import tempfile BOOTSTRAP_DIR = os.path.dirname(os.path.abspath(__file__)) -@@ -31,8 +32,9 @@ SRC_ROOT = os.path.dirname(os.path.dirna +@@ -31,8 +32,9 @@ is_win = sys.platform.startswith('win') is_linux = sys.platform.startswith('linux') @@ -19,7 +19,7 @@ def check_call(cmd, **kwargs): logging.debug('Running: %s', ' '.join(cmd)) -@@ -624,6 +626,41 @@ def write_gn_ninja(path, root_gen_dir, o +@@ -632,6 +634,40 @@ 'base/third_party/libevent/epoll.c', ]) @@ -36,19 +36,18 @@ + static_libraries['base']['sources'].extend([ + 'base/allocator/allocator_shim.cc', + 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', -+ 'base/callback_helpers.cc', + 'base/memory/shared_memory_posix.cc', ++ 'base/memory/shared_memory_tracker.cc', + 'base/nix/xdg_util.cc', -+ 'base/process/memory_stubs.cc', -+ #'base/process/internal_linux.cc', ++ 'base/process/internal_linux.cc', + 'base/process/process_handle_' + platform.system().lower() + '.cc', + 'base/process/process_iterator_' + platform.system().lower() + '.cc', -+ # 'base/process/process_linux.cc', ++ #'base/process/process_linux.cc', + 'base/process/process_metrics_'+ platform.system().lower() + '.cc', + 'base/strings/sys_string_conversions_posix.cc', + 'base/sys_info_' + platform.system().lower() + '.cc', -+ 'base/threading/platform_thread_' + platform.system().lower() + '.cc', -+ # 'base/trace_event/malloc_dump_provider.cc', ++ 'base/threading/platform_thread_linux.cc', ++ #'base/trace_event/malloc_dump_provider.cc', + ]) + static_libraries['libevent']['include_dirs'].extend([ + os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'freebsd') diff --git a/www/chromium/files/patch-tools_grit_grit__rule.gni b/www/chromium/files/patch-tools_grit_grit__rule.gni new file mode 100644 index 000000000000..a8f669be60f0 --- /dev/null +++ b/www/chromium/files/patch-tools_grit_grit__rule.gni @@ -0,0 +1,11 @@ +--- tools/grit/grit_rule.gni.orig 2017-06-05 19:03:30 UTC ++++ tools/grit/grit_rule.gni +@@ -214,7 +214,7 @@ if (current_toolchain != host_toolchain) { + "ios", + ] + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + grit_defines += [ + "-t", + "linux2", diff --git a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn index 8db977712a7c..95acbd0fb5ef 100644 --- a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn +++ b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn @@ -1,6 +1,6 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2017-04-19 19:06:54 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2017-06-05 19:03:30 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn -@@ -93,7 +93,7 @@ group("telemetry_chrome_test") { +@@ -29,7 +29,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] } 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 deleted file mode 100644 index 801c06f915bc..000000000000 --- a/www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/accessibility/platform/ax_platform_node.h.orig 2017-04-19 19:06:54 UTC -+++ ui/accessibility/platform/ax_platform_node.h -@@ -22,7 +22,7 @@ - #define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1 - #endif - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11) - #define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1 - #endif - 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 deleted file mode 100644 index 8342c354919d..000000000000 --- a/www/chromium/files/patch-ui_app__list_app__list__constants.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/app_list/app_list_constants.cc.orig 2017-04-19 19:06:54 UTC -+++ ui/app_list/app_list_constants.cc -@@ -140,7 +140,7 @@ const char kSearchQueryLength[] = "Apps. - const char kSearchResultDistanceFromOrigin[] = - "Apps.AppListSearchResultDistanceFromOrigin"; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - #if defined(GOOGLE_CHROME_BUILD) - const char kAppListWMClass[] = "chrome_app_list"; - #else // CHROMIUM_BUILD 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 deleted file mode 100644 index 0eae8007079a..000000000000 --- a/www/chromium/files/patch-ui_app__list_app__list__constants.h +++ /dev/null @@ -1,13 +0,0 @@ ---- ui/app_list/app_list_constants.h.orig 2017-04-19 19:06:54 UTC -+++ ui/app_list/app_list_constants.h -@@ -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[]; - --#if defined(OS_LINUX) --// The WM_CLASS name for the app launcher window on Linux. -+#if defined(OS_LINUX) || defined(OS_FREEBSD) -+// The WM_CLASS name for the app launcher window on Linux/FreeBSD. - APP_LIST_EXPORT extern const char kAppListWMClass[]; - #endif - 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 deleted file mode 100644 index 8fff20be1613..000000000000 --- a/www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/app_list/views/app_list_item_view.cc.orig 2017-04-19 19:06:54 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. --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && defined(OS_BSD)) && !defined(OS_CHROMEOS) - // Reducing the font size by 2 makes it the same as the Windows font size. - const int kFontSizeDelta = -2; - return font_list.DeriveWithSizeDelta(kFontSizeDelta); diff --git a/www/chromium/files/patch-ui_aura_BUILD.gn b/www/chromium/files/patch-ui_aura_BUILD.gn index 8167b4b52343..8933452455a2 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 2017-04-19 19:06:54 UTC +--- ui/aura/BUILD.gn.orig 2017-06-05 19:03:30 UTC +++ ui/aura/BUILD.gn -@@ -369,7 +369,7 @@ test("aura_unittests") { +@@ -375,7 +375,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 3b91873101eb..0b4e7fca5edb 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 2017-04-19 19:06:54 UTC +--- ui/base/BUILD.gn.orig 2017-06-05 19:03:30 UTC +++ ui/base/BUILD.gn -@@ -357,7 +357,7 @@ component("base") { +@@ -361,7 +361,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. -@@ -467,11 +467,11 @@ component("base") { +@@ -471,11 +471,11 @@ component("base") { ] } @@ -23,8 +23,8 @@ deps += [ "//build/linux:fontconfig" ] } -@@ -479,7 +479,7 @@ component("base") { - configs += [ "//build/config/linux:glib" ] +@@ -488,7 +488,7 @@ component("base") { + ] } - if (is_linux) { @@ -32,7 +32,7 @@ if (!toolkit_views && !use_aura) { sources -= [ "dragdrop/drag_utils.cc", -@@ -831,7 +831,7 @@ test("ui_base_unittests") { +@@ -844,7 +844,7 @@ test("ui_base_unittests") { "ime/win/imm32_manager_unittest.cc", "ime/win/tsf_input_scope_unittest.cc", ] @@ -41,7 +41,7 @@ sources += [ "ime/input_method_auralinux_unittest.cc" ] } if (use_x11) { -@@ -952,7 +952,7 @@ test("ui_base_unittests") { +@@ -967,7 +967,7 @@ test("ui_base_unittests") { ] } @@ -50,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. -@@ -965,7 +965,7 @@ test("ui_base_unittests") { +@@ -980,7 +980,7 @@ test("ui_base_unittests") { "//third_party/mesa:osmesa", ] } diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc index 273c33fe3acb..073cbea2009e 100644 --- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc +++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc @@ -1,4 +1,4 @@ ---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2017-04-19 19:06:54 UTC +--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2017-06-05 19:03:30 UTC +++ ui/base/dragdrop/os_exchange_data_provider_factory.cc @@ -8,7 +8,7 @@ @@ -9,7 +9,7 @@ #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" #elif defined(OS_MACOSX) #include "ui/base/dragdrop/os_exchange_data_provider_builder_mac.h" -@@ -34,7 +34,7 @@ OSExchangeDataProviderFactory::CreatePro +@@ -42,7 +42,7 @@ OSExchangeDataProviderFactory::CreateProvider() { #if defined(USE_X11) && !defined(OS_CHROMEOS) return base::MakeUnique<OSExchangeDataProviderAuraX11>(); 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 a8b2b27ab2ac..3d9782d5f0e3 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,6 +1,6 @@ ---- ui/base/ime/ime_engine_handler_interface.h.orig 2017-04-19 19:06:54 UTC +--- ui/base/ime/ime_engine_handler_interface.h.orig 2017-06-05 19:03:30 UTC +++ ui/base/ime/ime_engine_handler_interface.h -@@ -142,7 +142,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandle +@@ -142,7 +142,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface { // Hides the input view window (from API call). virtual void HideInputView() = 0; 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 658d5fad65f3..cf4f5889f88a 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,4 +1,4 @@ ---- ui/base/ime/input_method_factory.cc.orig 2017-04-19 19:06:54 UTC +--- ui/base/ime/input_method_factory.cc.orig 2017-06-05 19:03:30 UTC +++ ui/base/ime/input_method_factory.cc @@ -16,7 +16,8 @@ #include "ui/base/ime/input_method_win.h" @@ -10,7 +10,7 @@ #include "ui/base/ime/input_method_auralinux.h" #elif defined(OS_ANDROID) #include "ui/base/ime/input_method_android.h" -@@ -60,7 +61,8 @@ std::unique_ptr<InputMethod> CreateInput +@@ -60,7 +61,8 @@ std::unique_ptr<InputMethod> CreateInputMethod( return base::MakeUnique<InputMethodWin>(delegate, widget); #elif defined(OS_MACOSX) return base::MakeUnique<InputMethodMac>(delegate); 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 003e7f84f944..e5c320eaecec 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 2017-04-19 19:06:54 UTC +--- ui/base/resource/resource_bundle.cc.orig 2017-06-05 19:03:30 UTC +++ ui/base/resource/resource_bundle.cc -@@ -661,7 +661,7 @@ void ResourceBundle::ReloadFonts() { +@@ -676,7 +676,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,7 +9,7 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -719,7 +719,7 @@ void ResourceBundle::InitSharedInstance( +@@ -734,7 +734,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele 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 1438526c485e..108b66246bf1 100644 --- a/www/chromium/files/patch-ui_base_ui__features.gni +++ b/www/chromium/files/patch-ui_base_ui__features.gni @@ -1,7 +1,7 @@ ---- ui/base/ui_features.gni.orig 2017-04-19 19:06:54 UTC +--- ui/base/ui_features.gni.orig 2017-06-05 19:03:30 UTC +++ ui/base/ui_features.gni -@@ -10,4 +10,4 @@ declare_args() { - mac_views_browser = false +@@ -15,4 +15,4 @@ declare_args() { + has_native_accessibility = use_atk || is_win || is_mac } -enable_hidpi = is_mac || is_win || is_linux diff --git a/www/chromium/files/patch-ui_compositor_BUILD.gn b/www/chromium/files/patch-ui_compositor_BUILD.gn index 08800abeb8f0..262440a27e71 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 2017-04-19 19:06:54 UTC +--- ui/compositor/BUILD.gn.orig 2017-06-05 19:03:30 UTC +++ ui/compositor/BUILD.gn -@@ -205,7 +205,7 @@ test("compositor_unittests") { +@@ -214,7 +214,7 @@ test("compositor_unittests") { "//ui/gl", "//ui/resources", ] diff --git a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc index 0b88df77c8e6..bb35e4e091dc 100644 --- a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc @@ -1,6 +1,6 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2017-04-19 19:06:54 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2017-06-05 19:03:30 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -834,6 +834,8 @@ void DeviceDataManagerX11::SetDisabledKe +@@ -834,6 +834,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(int deviceid) { @@ -9,7 +9,7 @@ blocked_devices_.set(deviceid, true); // TODO(rsadam@): Support blocking touchscreen devices. std::vector<InputDevice> keyboards = GetKeyboardDevices(); -@@ -845,6 +847,7 @@ void DeviceDataManagerX11::DisableDevice +@@ -845,6 +847,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid) keyboards.erase(it); DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); } diff --git a/www/chromium/files/patch-ui_events_event__switches.cc b/www/chromium/files/patch-ui_events_event__switches.cc index 97ce603ed348..73c2ac9ce66f 100644 --- a/www/chromium/files/patch-ui_events_event__switches.cc +++ b/www/chromium/files/patch-ui_events_event__switches.cc @@ -1,6 +1,6 @@ ---- ui/events/event_switches.cc.orig 2017-04-19 19:06:54 UTC +--- ui/events/event_switches.cc.orig 2017-06-05 19:03:30 UTC +++ ui/events/event_switches.cc -@@ -17,7 +17,7 @@ const char kEnableScrollPrediction[] = " +@@ -17,7 +17,7 @@ const char kEnableScrollPrediction[] = "enable-scroll- const char kCompensateForUnstablePinchZoom[] = "compensate-for-unstable-pinch-zoom"; diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 4f5094bc0908..6f28cc948ea6 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 2017-04-19 19:06:54 UTC +--- ui/gfx/BUILD.gn.orig 2017-06-05 19:03:30 UTC +++ ui/gfx/BUILD.gn -@@ -383,7 +383,7 @@ component("gfx") { +@@ -358,7 +358,7 @@ component("gfx") { } # Linux. @@ -9,7 +9,7 @@ deps += [ "//build/linux:fontconfig" ] } -@@ -592,7 +592,7 @@ static_library("test_support") { +@@ -581,7 +581,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 bb9a49be08dd..8415264e47d0 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 2017-04-19 19:06:54 UTC +--- ui/gfx/canvas_skia.cc.orig 2017-06-05 19:03:30 UTC +++ ui/gfx/canvas_skia.cc -@@ -201,7 +201,7 @@ void Canvas::DrawStringRectWithFlags(con +@@ -200,7 +200,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); diff --git a/www/chromium/files/patch-ui_gfx_font__list.cc b/www/chromium/files/patch-ui_gfx_font__list.cc index 69cf89d0c551..c9e4f9152b4f 100644 --- a/www/chromium/files/patch-ui_gfx_font__list.cc +++ b/www/chromium/files/patch-ui_gfx_font__list.cc @@ -1,6 +1,6 @@ ---- ui/gfx/font_list.cc.orig 2017-04-19 19:06:54 UTC +--- ui/gfx/font_list.cc.orig 2017-06-05 19:03:30 UTC +++ ui/gfx/font_list.cc -@@ -24,7 +24,7 @@ base::LazyInstance<scoped_refptr<gfx::Fo +@@ -24,7 +24,7 @@ base::LazyInstance<scoped_refptr<gfx::FontListImpl>>:: bool g_default_impl_initialized = false; bool IsFontFamilyAvailable(const std::string& family, SkFontMgr* fontManager) { 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 2b2f51e42feb..8638d7fd0d77 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 2017-04-19 19:06:54 UTC +--- ui/gfx/font_render_params.h.orig 2017-06-05 19:03:30 UTC +++ ui/gfx/font_render_params.h -@@ -106,13 +106,13 @@ GFX_EXPORT FontRenderParams GetFontRende +@@ -106,13 +106,13 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( 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 46acc6092ef5..deddc3d5161b 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 2017-04-19 19:06:54 UTC +--- ui/gfx/render_text.cc.orig 2017-06-05 19:03:30 UTC +++ ui/gfx/render_text.cc -@@ -976,32 +976,33 @@ void RenderText::SetDisplayOffset(int ho +@@ -948,32 +948,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse 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 3edb9fec8900..a37b7067a4e2 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,7 +1,7 @@ ---- ui/gl/BUILD.gn.orig 2017-04-19 19:06:54 UTC +--- ui/gl/BUILD.gn.orig 2017-06-05 19:03:30 UTC +++ ui/gl/BUILD.gn -@@ -13,7 +13,7 @@ declare_args() { - enable_swiftshader = is_chrome_branded && is_win +@@ -14,7 +14,7 @@ declare_args() { + (target_cpu == "x86" || target_cpu == "x64") } -use_egl = is_win || is_android || is_linux @@ -9,9 +9,9 @@ use_glx = use_x11 || ozone_platform_x11 if (is_android) { -@@ -170,7 +170,7 @@ component("gl") { - "gl_surface_egl.h", - ] +@@ -180,7 +180,7 @@ component("gl") { + ] + } } - if (is_android || is_linux) { + if (is_android || is_linux || is_bsd) { 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 d8da75fc7617..0840b3d92b93 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,4 +1,4 @@ ---- ui/gl/sync_control_vsync_provider.cc.orig 2017-04-19 19:06:54 UTC +--- ui/gl/sync_control_vsync_provider.cc.orig 2017-06-05 19:03:30 UTC +++ ui/gl/sync_control_vsync_provider.cc @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" @@ -9,7 +9,7 @@ // 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; -@@ -26,7 +26,7 @@ const double kRelativeIntervalDifference +@@ -26,7 +26,7 @@ const double kRelativeIntervalDifferenceThreshold = 0. namespace gl { SyncControlVSyncProvider::SyncControlVSyncProvider() : gfx::VSyncProvider() { @@ -18,7 +18,7 @@ // On platforms where we can't get an accurate reading on the refresh // rate we fall back to the assumption that we're displaying 60 frames // per second. -@@ -39,7 +39,7 @@ SyncControlVSyncProvider::~SyncControlVS +@@ -39,7 +39,7 @@ SyncControlVSyncProvider::~SyncControlVSyncProvider() void SyncControlVSyncProvider::GetVSyncParameters( const UpdateVSyncCallback& callback) { TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters"); @@ -27,7 +27,7 @@ base::TimeTicks timebase; // The actual clock used for the system time returned by glXGetSyncValuesOML -@@ -155,7 +155,7 @@ void SyncControlVSyncProvider::GetVSyncP +@@ -155,7 +155,7 @@ void SyncControlVSyncProvider::GetVSyncParameters( last_timebase_ = timebase; last_media_stream_counter_ = media_stream_counter; callback.Run(timebase, last_good_interval_); 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 7abf154d16a4..9acd54781fbf 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,6 +1,6 @@ ---- ui/gl/sync_control_vsync_provider.h.orig 2017-04-19 19:06:54 UTC +--- ui/gl/sync_control_vsync_provider.h.orig 2017-06-05 19:03:30 UTC +++ ui/gl/sync_control_vsync_provider.h -@@ -31,7 +31,7 @@ class SyncControlVSyncProvider : public +@@ -39,7 +39,7 @@ class SyncControlVSyncProvider : public gfx::VSyncProv virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0; private: @@ -9,7 +9,7 @@ base::TimeTicks last_timebase_; uint64_t last_media_stream_counter_ = 0; base::TimeDelta last_good_interval_; -@@ -42,7 +42,7 @@ class SyncControlVSyncProvider : public +@@ -50,7 +50,7 @@ class SyncControlVSyncProvider : public gfx::VSyncProv // from configuration change (monitor reconfiguration, moving windows // between monitors, suspend and resume, etc.). std::queue<base::TimeDelta> last_computed_intervals_; 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 51a6c114fd47..32f8996a542c 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 2017-04-19 19:06:54 UTC +--- ui/message_center/message_center_style.h.orig 2017-06-05 19:03:30 UTC +++ ui/message_center/message_center_style.h -@@ -121,7 +121,7 @@ const int kButtonHorizontalPadding = 16; +@@ -124,7 +124,7 @@ const int kButtonHorizontalPadding = 16; // In DIPs. 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 7c285d5abd83..f5c632265072 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 2017-04-19 19:06:54 UTC +--- ui/message_center/views/message_center_button_bar.cc.orig 2017-06-05 19:03:30 UTC +++ ui/message_center/views/message_center_button_bar.cc -@@ -95,7 +95,7 @@ MessageCenterButtonBar::MessageCenterBut +@@ -95,7 +95,7 @@ MessageCenterButtonBar::MessageCenterButtonBar( 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), -@@ -170,7 +170,7 @@ MessageCenterButtonBar::MessageCenterBut +@@ -170,7 +170,7 @@ MessageCenterButtonBar::MessageCenterButtonBar( 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, -@@ -232,7 +232,7 @@ void MessageCenterButtonBar::ViewVisibil +@@ -232,7 +232,7 @@ void MessageCenterButtonBar::ViewVisibilityChanged() { 0, 0); @@ -27,7 +27,7 @@ // The close-bubble button. column->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, -@@ -247,7 +247,7 @@ void MessageCenterButtonBar::ViewVisibil +@@ -247,7 +247,7 @@ void MessageCenterButtonBar::ViewVisibilityChanged() { layout->AddView(title_arrow_); layout->AddView(notification_label_); layout->AddView(button_container_); @@ -36,7 +36,7 @@ layout->AddView(close_bubble_button_); #endif } -@@ -316,7 +316,7 @@ void MessageCenterButtonBar::ButtonPress +@@ -316,7 +316,7 @@ void MessageCenterButtonBar::ButtonPressed(views::Butt 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 35f4a1ade207..f35e77e5da87 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 2017-04-19 19:06:54 UTC +--- ui/message_center/views/message_center_button_bar.h.orig 2017-06-05 19:03:30 UTC +++ ui/message_center/views/message_center_button_bar.h -@@ -78,7 +78,7 @@ class MessageCenterButtonBar : public vi +@@ -78,7 +78,7 @@ class MessageCenterButtonBar : public views::View, // 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 e0b64bbc403d..523a0ce364eb 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 2017-04-19 19:06:54 UTC +--- ui/message_center/views/message_view_factory.cc.orig 2017-06-05 19:03:30 UTC +++ ui/message_center/views/message_view_factory.cc -@@ -43,7 +43,7 @@ MessageView* MessageViewFactory::Create( +@@ -43,7 +43,7 @@ MessageView* MessageViewFactory::Create(MessageCenterC notification_view = new NotificationView(controller, notification); } diff --git a/www/chromium/files/patch-ui_views_BUILD.gn b/www/chromium/files/patch-ui_views_BUILD.gn index e1e373e4aaf2..e4c762d2a009 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 2017-04-19 19:06:54 UTC +--- ui/views/BUILD.gn.orig 2017-06-05 19:03:30 UTC +++ ui/views/BUILD.gn -@@ -457,7 +457,7 @@ component("views") { +@@ -452,7 +452,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 { -@@ -645,7 +645,7 @@ component("views") { +@@ -640,7 +640,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 deleted file mode 100644 index 42a38a53c1aa..000000000000 --- a/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/views/accessibility/native_view_accessibility.h.orig 2017-04-19 19:06:54 UTC -+++ ui/views/accessibility/native_view_accessibility.h -@@ -27,7 +27,7 @@ - #define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1 - #endif - --#if defined(OS_LINUX) && defined(USE_X11) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11) && !defined(OS_CHROMEOS) - #define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1 - #endif - 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 c0c37f6595ef..d484e65fe1af 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 2017-04-19 19:06:54 UTC +--- ui/views/bubble/bubble_dialog_delegate.cc.orig 2017-06-05 19:03:30 UTC +++ ui/views/bubble/bubble_dialog_delegate.cc -@@ -76,7 +76,7 @@ Widget* BubbleDialogDelegateView::Create +@@ -76,7 +76,7 @@ Widget* BubbleDialogDelegateView::CreateBubble( // 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 index 47a6cd875be2..9a3e5f9998c8 100644 --- a/www/chromium/files/patch-ui_views_controls_label.cc +++ b/www/chromium/files/patch-ui_views_controls_label.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/label.cc.orig 2017-04-19 19:06:54 UTC +--- ui/views/controls/label.cc.orig 2017-06-05 19:03:30 UTC +++ ui/views/controls/label.cc -@@ -549,7 +549,7 @@ bool Label::OnMousePressed(const ui::Mou +@@ -553,7 +553,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event GetFocusManager()->SetFocusedView(this); } @@ -9,7 +9,7 @@ if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) GetFocusManager()->SetFocusedView(this); #endif -@@ -725,7 +725,7 @@ bool Label::PasteSelectionClipboard() { +@@ -729,7 +729,7 @@ bool Label::PasteSelectionClipboard() { } void Label::UpdateSelectionClipboard() { 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 675e3c0f8692..fcad26774aed 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2017-04-19 19:06:54 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2017-06-05 19:03:30 UTC +++ ui/views/controls/textfield/textfield.cc @@ -54,7 +54,7 @@ #include "ui/base/win/osk_display_manager.h" @@ -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" -@@ -153,14 +153,14 @@ ui::TextEditCommand GetCommandForKeyEven +@@ -153,14 +153,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke case ui::VKEY_BACK: if (!control) return ui::TextEditCommand::DELETE_BACKWARD; @@ -26,7 +26,7 @@ // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -606,7 +606,7 @@ bool Textfield::OnMousePressed(const ui: +@@ -607,7 +607,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e ShowImeIfNeeded(); } @@ -35,7 +35,7 @@ if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) RequestFocus(); #endif -@@ -645,7 +645,7 @@ bool Textfield::OnKeyPressed(const ui::K +@@ -646,7 +646,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -44,7 +44,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -785,7 +785,7 @@ void Textfield::AboutToRequestFocusFromT +@@ -789,7 +789,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } 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(); -@@ -1076,7 +1076,7 @@ void Textfield::WriteDragDataForView(Vie +@@ -1080,7 +1080,7 @@ void Textfield::WriteDragDataForView(View* sender, SkBitmap bitmap; float raster_scale = ScaleFactorForDragFromWidget(GetWidget()); @@ -62,7 +62,7 @@ // Desktop Linux Aura does not yet support transparency in drag images. SkColor color = GetBackgroundColor(); #else -@@ -1873,7 +1873,7 @@ bool Textfield::PasteSelectionClipboard( +@@ -1877,7 +1877,7 @@ bool Textfield::PasteSelectionClipboard() { } void Textfield::UpdateSelectionClipboard() { 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 570aa282d0ad..fff47b1fd49e 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 2017-04-19 19:06:55 UTC +--- ui/views/examples/widget_example.cc.orig 2017-06-05 19:03:30 UTC +++ ui/views/examples/widget_example.cc -@@ -77,7 +77,7 @@ void WidgetExample::CreateExampleView(Vi +@@ -77,7 +77,7 @@ void WidgetExample::CreateExampleView(View* container) 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_mus_BUILD.gn b/www/chromium/files/patch-ui_views_mus_BUILD.gn index 0b108f5ca4a7..2ef4bdf10c52 100644 --- a/www/chromium/files/patch-ui_views_mus_BUILD.gn +++ b/www/chromium/files/patch-ui_views_mus_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/views/mus/BUILD.gn.orig 2017-04-19 19:06:55 UTC +--- ui/views/mus/BUILD.gn.orig 2017-06-05 19:03:30 UTC +++ ui/views/mus/BUILD.gn -@@ -79,7 +79,7 @@ component("mus") { +@@ -77,7 +77,7 @@ component("mus") { "//ui/wm", ] diff --git a/www/chromium/files/patch-ui_views_mus_aura__init.cc b/www/chromium/files/patch-ui_views_mus_aura__init.cc index a6f0483ea51b..7fa799e88c87 100644 --- a/www/chromium/files/patch-ui_views_mus_aura__init.cc +++ b/www/chromium/files/patch-ui_views_mus_aura__init.cc @@ -1,7 +1,7 @@ ---- ui/views/mus/aura_init.cc.orig 2017-04-19 19:06:55 UTC +--- ui/views/mus/aura_init.cc.orig 2017-06-05 19:03:30 UTC +++ ui/views/mus/aura_init.cc -@@ -22,7 +22,7 @@ - #include "ui/views/mus/mus_client.h" +@@ -24,7 +24,7 @@ + #include "ui/views/style/typography_provider.h" #include "ui/views/views_delegate.h" -#if defined(OS_LINUX) @@ -9,7 +9,7 @@ #include "components/font_service/public/cpp/font_loader.h" #endif -@@ -69,7 +69,7 @@ AuraInit::AuraInit(service_manager::Conn +@@ -73,7 +73,7 @@ AuraInit::AuraInit(service_manager::Connector* connect InitializeResources(connector); // Initialize the skia font code to go ask fontconfig underneath. @@ -18,7 +18,7 @@ font_loader_ = sk_make_sp<font_service::FontLoader>(connector); SkFontConfigInterface::SetGlobal(font_loader_.get()); #endif -@@ -82,7 +82,7 @@ AuraInit::AuraInit(service_manager::Conn +@@ -86,7 +86,7 @@ AuraInit::AuraInit(service_manager::Connector* connect } AuraInit::~AuraInit() { diff --git a/www/chromium/files/patch-ui_views_selection__controller.cc b/www/chromium/files/patch-ui_views_selection__controller.cc index 0857239cd117..19120a88405b 100644 --- a/www/chromium/files/patch-ui_views_selection__controller.cc +++ b/www/chromium/files/patch-ui_views_selection__controller.cc @@ -1,6 +1,6 @@ ---- ui/views/selection_controller.cc.orig 2017-04-19 19:06:55 UTC +--- ui/views/selection_controller.cc.orig 2017-06-05 19:03:30 UTC +++ ui/views/selection_controller.cc -@@ -20,7 +20,7 @@ SelectionController::SelectionController +@@ -20,7 +20,7 @@ SelectionController::SelectionController(SelectionCont delegate_(delegate), handles_selection_clipboard_(false) { // On Linux, update the selection clipboard on a text selection. diff --git a/www/chromium/files/patch-ui_views_views__delegate.cc b/www/chromium/files/patch-ui_views_views__delegate.cc index d9ce07c7bf3c..b8a1ae92e96a 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 2017-04-19 19:06:55 UTC +--- ui/views/views_delegate.cc.orig 2017-06-05 19:03:30 UTC +++ ui/views/views_delegate.cc -@@ -71,7 +71,7 @@ HICON ViewsDelegate::GetDefaultWindowIco +@@ -85,7 +85,7 @@ HICON ViewsDelegate::GetDefaultWindowIcon() const { 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 01a5548f5aa6..36b55522a7fd 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.h +++ b/www/chromium/files/patch-ui_views_views__delegate.h @@ -1,6 +1,6 @@ ---- ui/views/views_delegate.h.orig 2017-04-19 19:06:55 UTC +--- ui/views/views_delegate.h.orig 2017-06-05 19:03:30 UTC +++ ui/views/views_delegate.h -@@ -141,7 +141,7 @@ class VIEWS_EXPORT ViewsDelegate { +@@ -161,7 +161,7 @@ class VIEWS_EXPORT ViewsDelegate { // Returns true if the window passed in is in the Windows 8 metro // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; diff --git a/www/chromium/files/patch-ui_views_views__switches.cc b/www/chromium/files/patch-ui_views_views__switches.cc index fecb628c05e9..690d24286e79 100644 --- a/www/chromium/files/patch-ui_views_views__switches.cc +++ b/www/chromium/files/patch-ui_views_views__switches.cc @@ -1,7 +1,7 @@ ---- ui/views/views_switches.cc.orig 2017-04-19 19:06:55 UTC +--- ui/views/views_switches.cc.orig 2017-06-05 19:03:30 UTC +++ ui/views/views_switches.cc -@@ -18,7 +18,7 @@ const char kDisableViewsRectBasedTargeti - "disable-views-rect-based-targeting"; +@@ -21,7 +21,7 @@ const char kDisableViewsRectBasedTargeting[] = + const char kDrawViewBoundsRects[] = "draw-view-bounds-rects"; bool IsRectBasedTargetingEnabled() { -#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) 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 76e8b978a6a5..9bff3bfa6c9e 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 2017-04-19 19:06:55 UTC +--- ui/views/window/custom_frame_view.cc.orig 2017-06-05 19:03:30 UTC +++ ui/views/window/custom_frame_view.cc -@@ -302,7 +302,7 @@ int CustomFrameView::NonClientTopBorderH +@@ -302,7 +302,7 @@ int CustomFrameView::NonClientTopBorderHeight() const 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 75ec2f453045..a483a8a79380 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 2017-04-19 19:06:55 UTC +--- ui/views/window/dialog_delegate.cc.orig 2017-06-05 19:03:30 UTC +++ ui/views/window/dialog_delegate.cc -@@ -57,7 +57,7 @@ Widget::InitParams DialogDelegate::GetDi +@@ -57,7 +57,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit params.bounds = bounds; DialogDelegate* dialog = delegate->AsDialogDelegate(); diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index fdc21e52a427..cc46065ca9fb 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,7 +1,7 @@ ---- v8/BUILD.gn.orig 2017-04-19 19:07:57 UTC +--- v8/BUILD.gn.orig 2017-06-05 19:04:29 UTC +++ v8/BUILD.gn -@@ -2336,7 +2336,7 @@ v8_component("v8_libbase") { - sources += [ "src/base/platform/platform-posix.cc" ] +@@ -2455,7 +2455,7 @@ v8_component("v8_libbase") { + ] } - if (is_linux) { @@ -9,7 +9,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -2346,6 +2346,12 @@ v8_component("v8_libbase") { +@@ -2465,6 +2465,12 @@ v8_component("v8_libbase") { "dl", "rt", ] @@ -22,7 +22,7 @@ } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -2479,6 +2485,7 @@ if (current_toolchain == v8_snapshot_too +@@ -2598,6 +2604,7 @@ if (current_toolchain == v8_snapshot_toolchain) { 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 cdef6c4ec294..de30e63c44d0 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,4 +1,4 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2017-04-19 19:07:57 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2017-06-05 19:04:29 UTC +++ v8/src/base/platform/platform-posix.cc @@ -27,6 +27,10 @@ #include <sys/sysctl.h> // NOLINT, for sysctl @@ -11,7 +11,7 @@ #undef MAP_TYPE #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT) -@@ -352,6 +356,12 @@ int OS::GetCurrentThreadId() { +@@ -354,6 +358,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/files/patch-v8_src_globals.h b/www/chromium/files/patch-v8_src_globals.h index 54aac95e5f27..9a7583ab580c 100644 --- a/www/chromium/files/patch-v8_src_globals.h +++ b/www/chromium/files/patch-v8_src_globals.h @@ -1,6 +1,6 @@ ---- v8/src/globals.h.orig 2017-04-19 19:07:57 UTC +--- v8/src/globals.h.orig 2017-06-05 19:04:29 UTC +++ v8/src/globals.h -@@ -183,7 +183,11 @@ const size_t kCodeRangeAreaAlignment = 2 +@@ -184,7 +184,11 @@ const size_t kCodeRangeAreaAlignment = 256 * MB; const size_t kMaximalCodeRangeSize = 512 * MB; const size_t kCodeRangeAreaAlignment = 64 * KB; // OS page on PPC Linux #else diff --git a/www/chromium/files/patch-v8_src_wasm_wasm-result.h b/www/chromium/files/patch-v8_src_wasm_wasm-result.h deleted file mode 100644 index e83a461c07a8..000000000000 --- a/www/chromium/files/patch-v8_src_wasm_wasm-result.h +++ /dev/null @@ -1,10 +0,0 @@ ---- v8/src/wasm/wasm-result.h.orig 2017-05-02 19:04:10 UTC -+++ v8/src/wasm/wasm-result.h -@@ -5,6 +5,7 @@ - #ifndef V8_WASM_RESULT_H_ - #define V8_WASM_RESULT_H_ - -+#include <cstdarg> - #include <memory> - - #include "src/base/compiler-specific.h" diff --git a/www/chromium/pkg-descr b/www/chromium/pkg-descr index 6255f3739d39..62c53f84f314 100644 --- a/www/chromium/pkg-descr +++ b/www/chromium/pkg-descr @@ -5,4 +5,4 @@ The Chromium website contains design documents, architecture overviews, testing information, and more to help you learn to build and work with the Chromium source code. -WWW: http://www.chromium.org/Home +WWW: https://www.chromium.org/Home diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index ae840897f668..6aa6d0e8549c 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -95,6 +95,10 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/errorWave_2x.png %%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg %%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg +%%DATADIR%%/resources/inspector/Images/largeIcons.png +%%DATADIR%%/resources/inspector/Images/largeIcons_2x.png +%%DATADIR%%/resources/inspector/Images/mediumIcons.png +%%DATADIR%%/resources/inspector/Images/mediumIcons_2x.png %%DATADIR%%/resources/inspector/Images/navigationControls.png %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png %%DATADIR%%/resources/inspector/Images/popoverArrows.png @@ -111,8 +115,6 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/resourceCSSIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIconSmall.png -%%DATADIR%%/resources/inspector/Images/resourceGlyphs.png -%%DATADIR%%/resources/inspector/Images/resourceGlyphs_2x.png %%DATADIR%%/resources/inspector/Images/resourceJSIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png @@ -124,13 +126,12 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/smallIcons.png %%DATADIR%%/resources/inspector/Images/smallIcons_2x.png %%DATADIR%%/resources/inspector/Images/speech.png -%%DATADIR%%/resources/inspector/Images/toolbarButtonGlyphs.png -%%DATADIR%%/resources/inspector/Images/toolbarButtonGlyphs_2x.png %%DATADIR%%/resources/inspector/Images/toolbarResizerVertical.png %%DATADIR%%/resources/inspector/Images/touchCursor.png %%DATADIR%%/resources/inspector/Images/touchCursor_2x.png %%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.png %%DATADIR%%/resources/inspector/Images/treeoutlineTriangles_2x.png +%%DATADIR%%/resources/inspector/Images/whatsnew.png %%DATADIR%%/resources/inspector/InspectorBackendCommands.js %%DATADIR%%/resources/inspector/SupportedCSSProperties.js %%DATADIR%%/resources/inspector/Tests.js @@ -140,6 +141,7 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/audits2_worker/audits2_worker_module.js %%DATADIR%%/resources/inspector/audits/audits_module.js %%DATADIR%%/resources/inspector/audits2/audits2_module.js +%%DATADIR%%/resources/inspector/changes/changes_module.js %%DATADIR%%/resources/inspector/cm/cm_module.js %%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js %%DATADIR%%/resources/inspector/color_picker/color_picker_module.js @@ -201,6 +203,7 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/layers/layers_module.js %%DATADIR%%/resources/inspector/network/network_module.js %%DATADIR%%/resources/inspector/network_group_lookup/network_group_lookup_module.js +%%DATADIR%%/resources/inspector/object_ui/object_ui_module.js %%DATADIR%%/resources/inspector/perf_ui/perf_ui_module.js %%DATADIR%%/resources/inspector/product_registry/product_registry_module.js %%DATADIR%%/resources/inspector/profiler/profiler_module.js @@ -222,10 +225,167 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/unit_test_runner.html %%DATADIR%%/resources/inspector/unit_test_runner.js %%DATADIR%%/resources/inspector/utility_shared_worker.js +%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js %%DATADIR%%/snapshot_blob.bin %%DATADIR%%/test_ime_driver.service %%DATADIR%%/ui.service %%DATADIR%%/views_mus_resources.pak +%%DEBUG%%%%DATADIR%%/character_data_generator +%%DEBUG%%%%DATADIR%%/libaccessibility.so +%%DEBUG%%%%DATADIR%%/libanimation.so +%%DEBUG%%%%DATADIR%%/libaura_extra.so +%%DEBUG%%%%DATADIR%%/libaura.so +%%DEBUG%%%%DATADIR%%/libbase_i18n.so +%%DEBUG%%%%DATADIR%%/libbase.so +%%DEBUG%%%%DATADIR%%/libbindings.so +%%DEBUG%%%%DATADIR%%/libblink_core.so +%%DEBUG%%%%DATADIR%%/libblink_modules.so +%%DEBUG%%%%DATADIR%%/libblink_platform.so +%%DEBUG%%%%DATADIR%%/libblink_web.so +%%DEBUG%%%%DATADIR%%/libbluetooth.so +%%DEBUG%%%%DATADIR%%/libboringssl.so +%%DEBUG%%%%DATADIR%%/libbrowser_ui_views.so +%%DEBUG%%%%DATADIR%%/libcaptive_portal.so +%%DEBUG%%%%DATADIR%%/libcapture_base.so +%%DEBUG%%%%DATADIR%%/libcapture_lib.so +%%DEBUG%%%%DATADIR%%/libcc_animation.so +%%DEBUG%%%%DATADIR%%/libcc_base.so +%%DEBUG%%%%DATADIR%%/libcc_blink.so +%%DEBUG%%%%DATADIR%%/libcc_debug.so +%%DEBUG%%%%DATADIR%%/libcc_ipc.so +%%DEBUG%%%%DATADIR%%/libcc_paint.so +%%DEBUG%%%%DATADIR%%/libcc_surfaces.so +%%DEBUG%%%%DATADIR%%/libcc.so +%%DEBUG%%%%DATADIR%%/libchromium_sqlite3.so +%%DEBUG%%%%DATADIR%%/libcloud_policy_proto_generated_compile.so +%%DEBUG%%%%DATADIR%%/libcodec.so +%%DEBUG%%%%DATADIR%%/libcolor_space.so +%%DEBUG%%%%DATADIR%%/libcommon.so +%%DEBUG%%%%DATADIR%%/libcompositor.so +%%DEBUG%%%%DATADIR%%/libcontent.so +%%DEBUG%%%%DATADIR%%/libcpp.so +%%DEBUG%%%%DATADIR%%/libcrcrypto.so +%%DEBUG%%%%DATADIR%%/libdbus.so +%%DEBUG%%%%DATADIR%%/libdevice_base.so +%%DEBUG%%%%DATADIR%%/libdevice_battery.so +%%DEBUG%%%%DATADIR%%/libdevice_event_log.so +%%DEBUG%%%%DATADIR%%/libdevice_gamepad.so +%%DEBUG%%%%DATADIR%%/libdevice_vibration.so +%%DEBUG%%%%DATADIR%%/libdevice_vr.so +%%DEBUG%%%%DATADIR%%/libdevices.so +%%DEBUG%%%%DATADIR%%/libdiscardable_memory_client.so +%%DEBUG%%%%DATADIR%%/libdiscardable_memory_common.so +%%DEBUG%%%%DATADIR%%/libdiscardable_memory_service.so +%%DEBUG%%%%DATADIR%%/libdisplay_compositor.so +%%DEBUG%%%%DATADIR%%/libdisplay_types.so +%%DEBUG%%%%DATADIR%%/libdisplay_util.so +%%DEBUG%%%%DATADIR%%/libdisplay.so +%%DEBUG%%%%DATADIR%%/libdomain_reliability.so +%%DEBUG%%%%DATADIR%%/libEGL.so +%%DEBUG%%%%DATADIR%%/libembedder.so +%%DEBUG%%%%DATADIR%%/libevents_base.so +%%DEBUG%%%%DATADIR%%/libevents_devices_x11.so +%%DEBUG%%%%DATADIR%%/libevents_ozone_layout.so +%%DEBUG%%%%DATADIR%%/libevents_x.so +%%DEBUG%%%%DATADIR%%/libevents.so +%%DEBUG%%%%DATADIR%%/libfingerprint.so +%%DEBUG%%%%DATADIR%%/libgcm.so +%%DEBUG%%%%DATADIR%%/libgeneric_sensor.so +%%DEBUG%%%%DATADIR%%/libgeolocation.so +%%DEBUG%%%%DATADIR%%/libgeometry_skia.so +%%DEBUG%%%%DATADIR%%/libgeometry.so +%%DEBUG%%%%DATADIR%%/libgesture_detection.so +%%DEBUG%%%%DATADIR%%/libgfx_ipc_color.so +%%DEBUG%%%%DATADIR%%/libgfx_ipc_geometry.so +%%DEBUG%%%%DATADIR%%/libgfx_ipc_skia.so +%%DEBUG%%%%DATADIR%%/libgfx_ipc.so +%%DEBUG%%%%DATADIR%%/libgfx_x11.so +%%DEBUG%%%%DATADIR%%/libgfx.so +%%DEBUG%%%%DATADIR%%/libgin_features.so +%%DEBUG%%%%DATADIR%%/libgin.so +%%DEBUG%%%%DATADIR%%/libgl_in_process_context.so +%%DEBUG%%%%DATADIR%%/libgl_init.so +%%DEBUG%%%%DATADIR%%/libgl_wrapper.so +%%DEBUG%%%%DATADIR%%/libgles2_c_lib.so +%%DEBUG%%%%DATADIR%%/libgles2_implementation.so +%%DEBUG%%%%DATADIR%%/libgles2_utils.so +%%DEBUG%%%%DATADIR%%/libGLESv2.so +%%DEBUG%%%%DATADIR%%/libgpu.so +%%DEBUG%%%%DATADIR%%/libgtk3ui.so +%%DEBUG%%%%DATADIR%%/libicui18n.so +%%DEBUG%%%%DATADIR%%/libicuuc.so +%%DEBUG%%%%DATADIR%%/libipc.so +%%DEBUG%%%%DATADIR%%/libjs.so +%%DEBUG%%%%DATADIR%%/libkeyboard_with_content.so +%%DEBUG%%%%DATADIR%%/libkeyboard.so +%%DEBUG%%%%DATADIR%%/libkeycodes_x11.so +%%DEBUG%%%%DATADIR%%/libkeyed_service_content.so +%%DEBUG%%%%DATADIR%%/libkeyed_service_core.so +%%DEBUG%%%%DATADIR%%/libmanager.so +%%DEBUG%%%%DATADIR%%/libmedia_blink.so +%%DEBUG%%%%DATADIR%%/libmedia_gpu.so +%%DEBUG%%%%DATADIR%%/libmedia_mojo_services.so +%%DEBUG%%%%DATADIR%%/libmedia.so +%%DEBUG%%%%DATADIR%%/libmessage_center.so +%%DEBUG%%%%DATADIR%%/libmidi.so +%%DEBUG%%%%DATADIR%%/libmojo_common_lib.so +%%DEBUG%%%%DATADIR%%/libmojo_ime_lib.so +%%DEBUG%%%%DATADIR%%/libmojo_public_system_cpp.so +%%DEBUG%%%%DATADIR%%/libmojo_public_system.so +%%DEBUG%%%%DATADIR%%/libmojo_system_impl.so +%%DEBUG%%%%DATADIR%%/libnative_theme.so +%%DEBUG%%%%DATADIR%%/libnet_with_v8.so +%%DEBUG%%%%DATADIR%%/libnet.so +%%DEBUG%%%%DATADIR%%/libonc.so +%%DEBUG%%%%DATADIR%%/libosmesa.so +%%DEBUG%%%%DATADIR%%/libplatform_wtf.so +%%DEBUG%%%%DATADIR%%/libplatform.so +%%DEBUG%%%%DATADIR%%/libpolicy_component.so +%%DEBUG%%%%DATADIR%%/libpolicy_proto.so +%%DEBUG%%%%DATADIR%%/libpower_save_blocker.so +%%DEBUG%%%%DATADIR%%/libppapi_host.so +%%DEBUG%%%%DATADIR%%/libppapi_proxy.so +%%DEBUG%%%%DATADIR%%/libppapi_shared.so +%%DEBUG%%%%DATADIR%%/libprefs.so +%%DEBUG%%%%DATADIR%%/libprinting.so +%%DEBUG%%%%DATADIR%%/libprotobuf_lite.so +%%DEBUG%%%%DATADIR%%/libproxy_config.so +%%DEBUG%%%%DATADIR%%/librange.so +%%DEBUG%%%%DATADIR%%/libsensors.so +%%DEBUG%%%%DATADIR%%/libsessions.so +%%DEBUG%%%%DATADIR%%/libshared_memory_support.so +%%DEBUG%%%%DATADIR%%/libshell_dialogs.so +%%DEBUG%%%%DATADIR%%/libskia.so +%%DEBUG%%%%DATADIR%%/libsnapshot.so +%%DEBUG%%%%DATADIR%%/libsql.so +%%DEBUG%%%%DATADIR%%/libstartup_tracing.so +%%DEBUG%%%%DATADIR%%/libstorage_browser.so +%%DEBUG%%%%DATADIR%%/libstorage_common.so +%%DEBUG%%%%DATADIR%%/libstub_window.so +%%DEBUG%%%%DATADIR%%/libsurface.so +%%DEBUG%%%%DATADIR%%/libtracing.so +%%DEBUG%%%%DATADIR%%/libui_base_ime.so +%%DEBUG%%%%DATADIR%%/libui_base_x.so +%%DEBUG%%%%DATADIR%%/libui_base.so +%%DEBUG%%%%DATADIR%%/libui_data_pack.so +%%DEBUG%%%%DATADIR%%/libui_touch_selection.so +%%DEBUG%%%%DATADIR%%/libui_views_mus_lib.so +%%DEBUG%%%%DATADIR%%/liburl_ipc.so +%%DEBUG%%%%DATADIR%%/liburl_matcher.so +%%DEBUG%%%%DATADIR%%/liburl.so +%%DEBUG%%%%DATADIR%%/libuser_manager.so +%%DEBUG%%%%DATADIR%%/libuser_prefs.so +%%DEBUG%%%%DATADIR%%/libv8_libbase.so +%%DEBUG%%%%DATADIR%%/libv8_libplatform.so +%%DEBUG%%%%DATADIR%%/libv8.so +%%DEBUG%%%%DATADIR%%/libviews.so +%%DEBUG%%%%DATADIR%%/libweb_dialogs.so +%%DEBUG%%%%DATADIR%%/libwebdata_common.so +%%DEBUG%%%%DATADIR%%/libwebview.so +%%DEBUG%%%%DATADIR%%/libwm.so +%%DEBUG%%%%DATADIR%%/libwtf.so +%%DEBUG%%%%DATADIR%%/libx11_events_platform.so +%%DEBUG%%%%DATADIR%%/libx11_window.so %%DRIVER%%bin/chromedriver share/icons/hicolor/128x128/apps/chrome.png share/icons/hicolor/22x22/apps/chrome.png |