mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
www/chromium: update to 58.0.3029.81
MFH: 2017Q2 Security: https://vuxml.freebsd.org/freebsd/95a74a48-2691-11e7-9e2d-e8e0b747a45a.html
This commit is contained in:
parent
04078721f0
commit
e07f65b746
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=439776
567 changed files with 1593 additions and 1409 deletions
|
@ -2,8 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= chromium
|
||||
PORTVERSION= 57.0.2987.133
|
||||
PORTREVISION= 2
|
||||
PORTVERSION= 58.0.3029.81
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
|
||||
|
@ -21,6 +20,7 @@ BUILD_DEPENDS= gperf:devel/gperf \
|
|||
ffmpeg>=3.2.2,1:multimedia/ffmpeg \
|
||||
bash:shells/bash \
|
||||
flock:sysutils/flock \
|
||||
node:www/node \
|
||||
${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
|
||||
${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
|
||||
${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
|
||||
|
@ -90,7 +90,8 @@ GN_ARGS+= is_clang=true \
|
|||
toolkit_views=true \
|
||||
use_allocator="none" \
|
||||
use_aura=true \
|
||||
use_experimental_allocator_shim=true \
|
||||
use_cups=true \
|
||||
use_experimental_allocator_shim=false \
|
||||
treat_warnings_as_errors=false \
|
||||
use_sysroot=false \
|
||||
use_system_libjpeg=true \
|
||||
|
@ -198,16 +199,10 @@ MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \
|
|||
# TODO: move this big extra to small ones
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
|
||||
|
||||
.if ${OPSYS} == FreeBSD
|
||||
.if ${OSVERSION} < 1100000
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10
|
||||
.endif
|
||||
|
||||
# Work around base r261801
|
||||
.if ${OSVERSION} < 1100508
|
||||
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100508
|
||||
GN_ARGS+= extra_cxxflags="-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1"
|
||||
.endif
|
||||
.endif
|
||||
|
||||
pre-everything::
|
||||
@${ECHO_MSG}
|
||||
|
@ -219,9 +214,6 @@ pre-everything::
|
|||
@${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)."
|
||||
.endif
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "Make sure you have Python build with the SEM option ON"
|
||||
@${ECHO_MSG} "(default in python27-2.7.8 since r361735)"
|
||||
@${ECHO_MSG}
|
||||
|
||||
pre-configure:
|
||||
# We used to remove bundled libraries to be sure that chromium uses
|
||||
|
@ -240,6 +232,10 @@ do-configure:
|
|||
cd ${WRKSRC} && ${SETENV} ./out/${BUILDTYPE}/gn \
|
||||
gen --args='${GN_ARGS}' out/${BUILDTYPE}
|
||||
|
||||
# Setup nodejs dependency
|
||||
@${MKDIR} ${WRKSRC}/third_party/node/linux/node-linux-x64/bin
|
||||
${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/linux/node-linux-x64/bin/node
|
||||
|
||||
test regression-test: build
|
||||
.for t in ${TEST_TARGETS}
|
||||
cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
TIMESTAMP = 1490878091
|
||||
SHA256 (chromium-57.0.2987.133.tar.xz) = 70011770a7e522c92826a3af48d3fd28a46bf8042897d072d20c748cbf828cf7
|
||||
SIZE (chromium-57.0.2987.133.tar.xz) = 525240460
|
||||
SHA256 (chromium-57.0.2987.133-testdata.tar.xz) = 16188e40b7dccbbce4f20dd0a2c5dafabc98c4fd55bbbc85d1458a736e2d8084
|
||||
SIZE (chromium-57.0.2987.133-testdata.tar.xz) = 124080256
|
||||
TIMESTAMP = 1492682402
|
||||
SHA256 (chromium-58.0.3029.81.tar.xz) = 5ab61b7025a5143fa1b21713479b316ec7a98e262e79e84f9c9a9656179217cb
|
||||
SIZE (chromium-58.0.3029.81.tar.xz) = 509252204
|
||||
SHA256 (chromium-58.0.3029.81-testdata.tar.xz) = 8fa8d18c5ccfa8cbb067c4d88a0b8ed0dfd52b5d784c2cf48b91d1cb3a2fb264
|
||||
SIZE (chromium-58.0.3029.81-testdata.tar.xz) = 124158512
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- third_party/skia/src/core/SkSmallAllocator.h.orig 2017-02-01 20:16:14.715097000 +0100
|
||||
+++ third_party/skia/src/core/SkSmallAllocator.h 2017-02-01 20:24:56.680605000 +0100
|
||||
@@ -20,7 +20,7 @@
|
||||
// abstract type. The complication with max_align_t is that it is defined differently for
|
||||
// different builds.
|
||||
namespace {
|
||||
-#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC)
|
||||
+#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC) || defined(__FreeBSD__)
|
||||
// Use std::max_align_t for compiles that follow the standard.
|
||||
#include <cstddef>
|
||||
using SystemAlignment = std::max_align_t;
|
|
@ -52,6 +52,17 @@
|
|||
|
||||
EXPECT_CALL(callback_, OnError(_))
|
||||
.Times(2);
|
||||
--- third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2017-04-19 19:06:52 UTC
|
||||
+++ third_party/libjingle_xmpp/task_runner/taskrunner.cc
|
||||
@@ -95,7 +95,7 @@ void TaskRunner::InternalRunTasks(bool i
|
||||
std::vector<Task *>::iterator it;
|
||||
it = std::remove(tasks_.begin(),
|
||||
tasks_.end(),
|
||||
- reinterpret_cast<Task *>(NULL));
|
||||
+ static_cast<Task *>(NULL));
|
||||
|
||||
tasks_.erase(it, tasks_.end());
|
||||
|
||||
--- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200
|
||||
+++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200
|
||||
@@ -439,7 +439,7 @@
|
||||
|
@ -99,13 +110,3 @@
|
|||
CMapFormat::kFormat4, cmap_id) {
|
||||
}
|
||||
|
||||
--- third_party/webrtc/base/taskrunner.cc.orig 2017-03-09 21:05:29.000000000 +0100
|
||||
+++ third_party/webrtc/base/taskrunner.cc 2017-03-10 13:19:54.203141000 +0100
|
||||
@@ -96,7 +96,7 @@
|
||||
std::vector<Task *>::iterator it;
|
||||
it = std::remove(tasks_.begin(),
|
||||
tasks_.end(),
|
||||
- reinterpret_cast<Task *>(NULL));
|
||||
+ static_cast<Task *>(NULL));
|
||||
|
||||
tasks_.erase(it, tasks_.end());
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- BUILD.gn.orig 2017-03-09 20:04:26 UTC
|
||||
--- BUILD.gn.orig 2017-04-19 19:06:27 UTC
|
||||
+++ BUILD.gn
|
||||
@@ -221,7 +221,7 @@ group("both_gn_and_gyp") {
|
||||
@@ -220,7 +220,7 @@ group("both_gn_and_gyp") {
|
||||
]
|
||||
}
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
deps += [
|
||||
"//chrome",
|
||||
"//chrome/test:browser_tests",
|
||||
@@ -281,7 +281,7 @@ group("both_gn_and_gyp") {
|
||||
@@ -277,7 +277,7 @@ group("both_gn_and_gyp") {
|
||||
]
|
||||
}
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
|||
# TODO(GYP): Figure out which of these should actually build on iOS,
|
||||
# and whether there should be other targets that are iOS-only and missing.
|
||||
deps += [
|
||||
@@ -325,7 +325,7 @@ group("both_gn_and_gyp") {
|
||||
@@ -322,7 +322,7 @@ group("both_gn_and_gyp") {
|
||||
"//ui/touch_selection:ui_touch_selection_unittests",
|
||||
"//url/ipc:url_ipc_unittests",
|
||||
]
|
||||
|
@ -27,7 +27,7 @@
|
|||
deps += [ "//ios:all" ]
|
||||
}
|
||||
|
||||
@@ -495,7 +495,7 @@ group("both_gn_and_gyp") {
|
||||
@@ -482,7 +482,7 @@ group("both_gn_and_gyp") {
|
||||
]
|
||||
}
|
||||
|
||||
|
@ -36,7 +36,7 @@
|
|||
# The following are definitely linux-only.
|
||||
deps += [
|
||||
"//chrome:manpage",
|
||||
@@ -518,9 +518,16 @@ group("both_gn_and_gyp") {
|
||||
@@ -505,9 +505,16 @@ group("both_gn_and_gyp") {
|
||||
# TODO(dpranke): add the linux_dump_symbols flag?
|
||||
deps += [ "//chrome:linux_symbols" ]
|
||||
}
|
||||
|
@ -54,7 +54,7 @@
|
|||
deps += [
|
||||
"//base:base_i18n_perftests",
|
||||
"//base:base_perftests",
|
||||
@@ -592,7 +599,7 @@ group("both_gn_and_gyp") {
|
||||
@@ -578,7 +585,7 @@ group("both_gn_and_gyp") {
|
||||
if (enable_nacl) {
|
||||
deps += [ "//components/nacl/loader:nacl_loader_unittests" ]
|
||||
|
||||
|
@ -63,7 +63,7 @@
|
|||
# TODO(dpranke): Figure out what platforms should actually have this.
|
||||
deps += [ "//components/nacl/loader:nacl_helper" ]
|
||||
|
||||
@@ -700,7 +707,7 @@ group("both_gn_and_gyp") {
|
||||
@@ -684,7 +691,7 @@ group("both_gn_and_gyp") {
|
||||
deps +=
|
||||
[ "//chrome/installer/mini_installer:next_version_mini_installer" ]
|
||||
}
|
||||
|
@ -72,7 +72,7 @@
|
|||
deps += [ "//breakpad:symupload($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -745,7 +752,7 @@ group("gn_only") {
|
||||
@@ -728,7 +735,7 @@ group("gn_only") {
|
||||
deps += [ "//components/proximity_auth:proximity_auth_unittests" ]
|
||||
}
|
||||
|
||||
|
@ -81,7 +81,7 @@
|
|||
deps += [
|
||||
"//mash:all",
|
||||
"//media/mojo/services:media_service_unittests",
|
||||
@@ -771,7 +778,7 @@ group("gn_only") {
|
||||
@@ -754,7 +761,7 @@ group("gn_only") {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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 += [
|
||||
@@ -826,7 +833,7 @@ group("gn_only") {
|
||||
@@ -794,7 +801,7 @@ group("gn_only") {
|
||||
}
|
||||
|
||||
if (target_cpu == "x86" || target_cpu == "x64") {
|
||||
|
@ -99,7 +99,7 @@
|
|||
deps += [ "//chrome/test:load_library_perf_tests" ]
|
||||
}
|
||||
deps += [
|
||||
@@ -834,7 +841,7 @@ group("gn_only") {
|
||||
@@ -802,7 +809,7 @@ group("gn_only") {
|
||||
"//third_party/libjpeg_turbo:simd_asm",
|
||||
]
|
||||
}
|
||||
|
@ -108,7 +108,7 @@
|
|||
deps += [ "//v8:v8_shell" ]
|
||||
}
|
||||
}
|
||||
@@ -844,7 +851,7 @@ group("gn_only") {
|
||||
@@ -812,7 +819,7 @@ group("gn_only") {
|
||||
}
|
||||
|
||||
if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) ||
|
||||
|
@ -117,7 +117,7 @@
|
|||
deps += [
|
||||
"//testing/libfuzzer/fuzzers",
|
||||
"//testing/libfuzzer/tests:libfuzzer_tests",
|
||||
@@ -876,7 +883,7 @@ group("gn_only") {
|
||||
@@ -844,7 +851,7 @@ group("gn_only") {
|
||||
|
||||
group("gn_mojo_targets") {
|
||||
testonly = true
|
||||
|
@ -126,7 +126,7 @@
|
|||
# TODO(GYP): Figure out if any of these should be in gn_all
|
||||
# and figure out how cross-platform they are
|
||||
deps = [
|
||||
@@ -902,7 +909,7 @@ group("gn_visibility") {
|
||||
@@ -870,7 +877,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") {
|
||||
@@ -948,7 +955,7 @@ if (!is_ios) {
|
||||
@@ -935,7 +942,7 @@ if (!is_ios) {
|
||||
data_deps += [ "//content/shell:content_shell_crash_service" ]
|
||||
}
|
||||
|
||||
|
@ -144,7 +144,7 @@
|
|||
data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -956,7 +963,7 @@ if (!is_ios) {
|
||||
@@ -943,7 +950,7 @@ if (!is_ios) {
|
||||
data_deps += [ "//breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
|
@ -153,7 +153,7 @@
|
|||
data_deps += [ "//breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -978,7 +985,7 @@ group("chromium_swarm_tests") {
|
||||
@@ -979,7 +986,7 @@ group("chromium_swarm_tests") {
|
||||
group("chromium_builder_perf") {
|
||||
testonly = true
|
||||
|
||||
|
@ -162,7 +162,7 @@
|
|||
data_deps = [
|
||||
"//cc:cc_perftests",
|
||||
"//chrome/test:load_library_perf_tests",
|
||||
@@ -1008,7 +1015,7 @@ group("chromium_builder_perf") {
|
||||
@@ -1009,7 +1016,7 @@ group("chromium_builder_perf") {
|
||||
"//chrome/installer/mini_installer:mini_installer",
|
||||
"//chrome/test:angle_perftests",
|
||||
]
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- apps/ui/views/app_window_frame_view.cc.orig 2017-02-02 02:02:46 UTC
|
||||
--- apps/ui/views/app_window_frame_view.cc.orig 2017-04-19 19:06:27 UTC
|
||||
+++ apps/ui/views/app_window_frame_view.cc
|
||||
@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsF
|
||||
gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- ash/display/mirror_window_controller.cc.orig 2017-01-26 00:49:06 UTC
|
||||
--- ash/display/mirror_window_controller.cc.orig 2017-04-19 19:06:27 UTC
|
||||
+++ ash/display/mirror_window_controller.cc
|
||||
@@ -250,7 +250,11 @@ void MirrorWindowController::UpdateWindo
|
||||
@@ -251,7 +251,11 @@ void MirrorWindowController::UpdateWindo
|
||||
return info.id() == iter->first;
|
||||
}) == display_info_list.end()) {
|
||||
CloseAndDeleteHost(iter->second, true);
|
||||
|
|
|
@ -1,7 +1,17 @@
|
|||
--- base/BUILD.gn.orig 2017-03-09 20:04:26 UTC
|
||||
--- base/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/BUILD.gn
|
||||
@@ -1116,6 +1116,35 @@ component("base") {
|
||||
public_deps += [ "//base/allocator:unified_allocator_shim" ]
|
||||
@@ -1156,6 +1156,9 @@ component("base") {
|
||||
deps += [ "//base/allocator:tcmalloc" ]
|
||||
} else if (is_linux && use_allocator == "none") {
|
||||
sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
|
||||
+ } else if (is_bsd && use_allocator == "none") {
|
||||
+ # TODO move the code to "allocator_shim_default_dispatch_to_glibc.cc"
|
||||
+ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
|
||||
} else if (is_android && use_allocator == "none") {
|
||||
sources += [
|
||||
"allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc",
|
||||
@@ -1171,6 +1174,34 @@ component("base") {
|
||||
}
|
||||
}
|
||||
|
||||
+ if (is_bsd) {
|
||||
|
@ -15,11 +25,10 @@
|
|||
+ "sys_info_linux.cc",
|
||||
+ "trace_event/malloc_dump_provider.cc",
|
||||
+ "trace_event/malloc_dump_provider.h",
|
||||
+ "debug/proc_maps_linux.cc",
|
||||
+ "debug/proc_maps_linux.h",
|
||||
+ ]
|
||||
+ 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",
|
||||
|
@ -36,7 +45,7 @@
|
|||
# Allow more direct string conversions on platforms with native utf8
|
||||
# strings
|
||||
if (is_mac || is_ios || is_chromeos || is_chromecast) {
|
||||
@@ -1416,7 +1445,7 @@ component("base") {
|
||||
@@ -1467,7 +1498,7 @@ component("base") {
|
||||
}
|
||||
|
||||
# Linux.
|
||||
|
@ -45,7 +54,7 @@
|
|||
if (is_asan || is_lsan || is_msan || is_tsan) {
|
||||
# For llvm-sanitizer.
|
||||
data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ]
|
||||
@@ -1441,7 +1470,7 @@ component("base") {
|
||||
@@ -1492,7 +1523,7 @@ component("base") {
|
||||
"//base/third_party/xdg_user_dirs",
|
||||
]
|
||||
} else {
|
||||
|
@ -54,7 +63,7 @@
|
|||
sources -= [
|
||||
"nix/mime_util_xdg.cc",
|
||||
"nix/mime_util_xdg.h",
|
||||
@@ -1457,6 +1486,13 @@ component("base") {
|
||||
@@ -1508,6 +1539,13 @@ component("base") {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -68,7 +77,7 @@
|
|||
# iOS
|
||||
if (is_ios) {
|
||||
set_sources_assignment_filter([])
|
||||
@@ -2245,6 +2281,12 @@ test("base_unittests") {
|
||||
@@ -2309,6 +2347,12 @@ test("base_unittests") {
|
||||
set_sources_assignment_filter(sources_assignment_filter)
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/trace_event/process_memory_dump.h.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/trace_event/process_memory_dump.h.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/trace_event/process_memory_dump.h
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
--- base/allocator/BUILD.gn.orig 2017-01-26 00:49:07 UTC
|
||||
+++ base/allocator/BUILD.gn
|
||||
@@ -338,6 +338,9 @@ if (use_experimental_allocator_shim) {
|
||||
]
|
||||
} else if (is_linux && use_allocator == "none") {
|
||||
sources += [ "allocator_shim_default_dispatch_to_glibc.cc" ]
|
||||
+ } else if (is_bsd && use_allocator == "none") {
|
||||
+ # TODO move the code to allocator_shim_default_dispatch_to_libc.cc"
|
||||
+ sources += [ "allocator_shim_default_dispatch_to_glibc.cc" ]
|
||||
} else if (is_android && use_allocator == "none") {
|
||||
sources += [
|
||||
"allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc",
|
|
@ -1,6 +1,6 @@
|
|||
--- base/allocator/allocator_shim.cc.orig 2017-02-02 02:02:47 UTC
|
||||
--- base/allocator/allocator_shim.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/allocator/allocator_shim.cc
|
||||
@@ -89,7 +89,7 @@ inline const allocator::AllocatorDispatc
|
||||
@@ -81,7 +81,7 @@ inline const allocator::AllocatorDispatc
|
||||
// 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*>(
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc
|
||||
@@ -3,19 +3,28 @@
|
||||
// found in the LICENSE file.
|
||||
|
@ -37,32 +37,41 @@
|
|||
} // extern "C"
|
||||
|
||||
namespace {
|
||||
@@ -23,23 +32,23 @@ namespace {
|
||||
@@ -23,32 +32,32 @@ namespace {
|
||||
using base::allocator::AllocatorDispatch;
|
||||
|
||||
void* GlibcMalloc(const AllocatorDispatch*, size_t size) {
|
||||
void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) {
|
||||
- return __libc_malloc(size);
|
||||
+ return __malloc(size);
|
||||
}
|
||||
|
||||
void* GlibcCalloc(const AllocatorDispatch*, size_t n, size_t size) {
|
||||
void* GlibcCalloc(const AllocatorDispatch*,
|
||||
size_t n,
|
||||
size_t size,
|
||||
void* context) {
|
||||
- return __libc_calloc(n, size);
|
||||
+ return __calloc(n, size);
|
||||
}
|
||||
|
||||
void* GlibcRealloc(const AllocatorDispatch*, void* address, size_t size) {
|
||||
void* GlibcRealloc(const AllocatorDispatch*,
|
||||
void* address,
|
||||
size_t size,
|
||||
void* context) {
|
||||
- return __libc_realloc(address, size);
|
||||
+ return __realloc(address, size);
|
||||
}
|
||||
|
||||
void* GlibcMemalign(const AllocatorDispatch*, size_t alignment, size_t size) {
|
||||
void* GlibcMemalign(const AllocatorDispatch*,
|
||||
size_t alignment,
|
||||
size_t size,
|
||||
void* context) {
|
||||
- return __libc_memalign(alignment, size);
|
||||
+ return __memalign(alignment, size);
|
||||
}
|
||||
|
||||
void GlibcFree(const AllocatorDispatch*, void* address) {
|
||||
void GlibcFree(const AllocatorDispatch*, void* address, void* context) {
|
||||
- __libc_free(address);
|
||||
+ __free(address);
|
||||
}
|
||||
|
||||
size_t GlibcGetSizeEstimate(const AllocatorDispatch*, void* address) {
|
||||
size_t GlibcGetSizeEstimate(const AllocatorDispatch*,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/allocator/allocator_shim_override_libc_symbols.h
|
||||
@@ -10,7 +10,7 @@
|
||||
#endif
|
||||
|
|
|
@ -1,61 +1,36 @@
|
|||
--- base/allocator/allocator_shim_unittest.cc.orig 2017-03-09 20:04:26 UTC
|
||||
--- base/allocator/allocator_shim_unittest.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/allocator/allocator_shim_unittest.cc
|
||||
@@ -4,7 +4,6 @@
|
||||
@@ -289,7 +289,7 @@ TEST_F(AllocatorShimTest, InterceptLibcS
|
||||
ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u);
|
||||
#endif // !OS_WIN
|
||||
|
||||
#include "base/allocator/allocator_shim.h"
|
||||
|
||||
-#include <malloc.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
@@ -196,11 +195,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS
|
||||
ASSERT_GE(zero_allocs_intercepted_by_size[2 * 23], 1u);
|
||||
|
||||
#if !defined(OS_WIN)
|
||||
+#if !defined(OS_BSD)
|
||||
-#if !defined(OS_WIN) && !defined(OS_MACOSX)
|
||||
+#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
void* memalign_ptr = memalign(128, 53);
|
||||
ASSERT_NE(nullptr, memalign_ptr);
|
||||
ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128);
|
||||
ASSERT_GE(aligned_allocs_intercepted_by_alignment[128], 1u);
|
||||
ASSERT_GE(aligned_allocs_intercepted_by_size[53], 1u);
|
||||
+#endif
|
||||
|
||||
void* posix_memalign_ptr = nullptr;
|
||||
int res = posix_memalign(&posix_memalign_ptr, 256, 59);
|
||||
@@ -217,12 +218,14 @@ TEST_F(AllocatorShimTest, InterceptLibcS
|
||||
ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u);
|
||||
ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u);
|
||||
|
||||
+#if !defined(OS_BSD)
|
||||
void* pvalloc_ptr = pvalloc(67);
|
||||
ASSERT_NE(nullptr, pvalloc_ptr);
|
||||
ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(pvalloc_ptr) % kPageSize);
|
||||
@@ -302,7 +302,7 @@ TEST_F(AllocatorShimTest, InterceptLibcS
|
||||
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);
|
||||
+#endif
|
||||
#endif // OS_WIN
|
||||
-#endif // !OS_WIN && !OS_MACOSX
|
||||
+#endif // !OS_WIN && !OS_MACOSX && !OS_BSD
|
||||
|
||||
char* realloc_ptr = static_cast<char*>(realloc(nullptr, 71));
|
||||
@@ -243,8 +246,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS
|
||||
char* realloc_ptr = static_cast<char*>(malloc(10));
|
||||
strcpy(realloc_ptr, "foobar");
|
||||
@@ -318,13 +318,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS
|
||||
free(zero_alloc_ptr);
|
||||
ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u);
|
||||
|
||||
#if !defined(OS_WIN)
|
||||
+#if !defined(OS_BSD)
|
||||
-#if !defined(OS_WIN) && !defined(OS_MACOSX)
|
||||
+#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
free(memalign_ptr);
|
||||
ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u);
|
||||
+#endif
|
||||
|
||||
free(posix_memalign_ptr);
|
||||
ASSERT_GE(frees_intercepted_by_addr[Hash(posix_memalign_ptr)], 1u);
|
||||
@@ -252,8 +257,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS
|
||||
free(valloc_ptr);
|
||||
ASSERT_GE(frees_intercepted_by_addr[Hash(valloc_ptr)], 1u);
|
||||
|
||||
+#if !defined(OS_BSD)
|
||||
free(pvalloc_ptr);
|
||||
ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u);
|
||||
+#endif
|
||||
#endif // OS_WIN
|
||||
-#endif // !OS_WIN && !OS_MACOSX
|
||||
+#endif // !OS_WIN && !OS_MACOSX && !OS_BSD
|
||||
|
||||
free(realloc_ptr);
|
||||
#if !defined(OS_WIN)
|
||||
free(posix_memalign_ptr);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/debug/proc_maps_linux.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/debug/proc_maps_linux.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/debug/proc_maps_linux.cc
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "base/strings/string_split.h"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/debug/stack_trace_posix.cc.orig 2017-03-09 20:04:26 UTC
|
||||
--- base/debug/stack_trace_posix.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/debug/stack_trace_posix.cc
|
||||
@@ -33,7 +33,7 @@
|
||||
@@ -34,7 +34,7 @@
|
||||
#include <AvailabilityMacros.h>
|
||||
#endif
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
#include "base/debug/proc_maps_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -574,6 +574,10 @@ class SandboxSymbolizeHelper {
|
||||
@@ -575,6 +575,10 @@ class SandboxSymbolizeHelper {
|
||||
// for the modules that are loaded in the current process.
|
||||
// Returns true on success.
|
||||
bool CacheMemoryRegions() {
|
||||
|
@ -20,7 +20,7 @@
|
|||
// Reads /proc/self/maps.
|
||||
std::string contents;
|
||||
if (!ReadProcMaps(&contents)) {
|
||||
@@ -589,6 +593,7 @@ class SandboxSymbolizeHelper {
|
||||
@@ -590,6 +594,7 @@ class SandboxSymbolizeHelper {
|
||||
|
||||
is_initialized_ = true;
|
||||
return true;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/debug/thread_heap_usage_tracker.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/debug/thread_heap_usage_tracker.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/debug/thread_heap_usage_tracker.cc
|
||||
@@ -14,11 +14,13 @@
|
||||
@@ -16,11 +16,13 @@
|
||||
#include "base/threading/thread_local_storage.h"
|
||||
#include "build/build_config.h"
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/files/file_path_unittest.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/files/file_path_unittest.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/files/file_path_unittest.cc
|
||||
@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_
|
||||
"\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" },
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/files/file_path_watcher_kqueue.h.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/files/file_path_watcher_kqueue.h.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/files/file_path_watcher_kqueue.h
|
||||
@@ -5,6 +5,10 @@
|
||||
#ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/files/file_util.h.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/files/file_util.h.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/files/file_util.h
|
||||
@@ -404,7 +404,7 @@ BASE_EXPORT bool VerifyPathControlledByA
|
||||
@@ -406,7 +406,7 @@ BASE_EXPORT bool VerifyPathControlledByA
|
||||
// the directory |path|, in the number of FilePath::CharType, or -1 on failure.
|
||||
BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path);
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/linux_util.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/linux_util.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/linux_util.cc
|
||||
@@ -110,12 +110,14 @@ char g_linux_distro[kDistroSize] =
|
||||
"CrOS";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/native_library_posix.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/native_library_posix.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/native_library_posix.cc
|
||||
@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptio
|
||||
// further investigation, as it might vary across versions. Crash here to
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/posix/unix_domain_socket_linux.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/posix/unix_domain_socket_linux.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/posix/unix_domain_socket_linux.cc
|
||||
@@ -23,6 +23,15 @@
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/posix/unix_domain_socket_linux_unittest.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/posix/unix_domain_socket_linux_unittest.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/posix/unix_domain_socket_linux_unittest.cc
|
||||
@@ -2,10 +2,15 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/process/internal_linux.h.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/process/internal_linux.h.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/process/internal_linux.h
|
||||
@@ -14,6 +14,8 @@
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/process/launch.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/process/launch.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/process/launch.cc
|
||||
@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = defaul
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/process/launch.h.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/process/launch.h.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/process/launch.h
|
||||
@@ -138,7 +138,7 @@ struct BASE_EXPORT LaunchOptions {
|
||||
// will be the same as its pid.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/process/launch_posix.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/process/launch_posix.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/process/launch_posix.cc
|
||||
@@ -64,6 +64,7 @@
|
||||
#include "base/feature_list.h"
|
||||
|
|
11
www/chromium/files/patch-base_process_memory.cc
Normal file
11
www/chromium/files/patch-base_process_memory.cc
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- base/process/memory.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/process/memory.cc
|
||||
@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t
|
||||
#endif
|
||||
|
||||
// Defined in memory_mac.mm for Mac.
|
||||
-#if !defined(OS_MACOSX)
|
||||
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
|
||||
|
||||
bool UncheckedCalloc(size_t num_items, size_t size, void** result) {
|
||||
const size_t alloc_size = num_items * size;
|
|
@ -1,4 +1,4 @@
|
|||
--- base/process/memory.h.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/process/memory.h.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/process/memory.h
|
||||
@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutO
|
||||
// Crash reporting classifies such crashes as OOM.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/process/memory_stubs.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- 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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/process/memory_unittest.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/process/memory_unittest.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/process/memory_unittest.cc
|
||||
@@ -82,10 +82,10 @@ TEST(MemoryTest, AllocatorShimWorking) {
|
||||
@@ -93,10 +93,10 @@ TEST(MemoryTest, AllocatorShimWorking) {
|
||||
ASSERT_TRUE(base::allocator::IsAllocatorInitialized());
|
||||
}
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
|||
BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \
|
||||
!defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
|
||||
|
||||
@@ -439,5 +439,5 @@ TEST_F(OutOfMemoryHandledTest, Unchecked
|
||||
@@ -488,5 +488,5 @@ TEST_F(OutOfMemoryHandledTest, Unchecked
|
||||
EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));
|
||||
EXPECT_TRUE(value_ == NULL);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/process/process_handle_freebsd.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/process/process_handle_freebsd.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/process/process_handle_freebsd.cc
|
||||
@@ -16,7 +16,7 @@ namespace base {
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/process/process_info_linux.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/process/process_info_linux.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/process/process_info_linux.cc
|
||||
@@ -11,10 +11,28 @@
|
||||
#include "base/process/process_handle.h"
|
||||
|
@ -26,10 +26,10 @@
|
|||
+ return Time::FromTimeVal(proc.ki_start);
|
||||
+#endif
|
||||
+#else
|
||||
ProcessHandle pid = GetCurrentProcessHandle();
|
||||
int64_t start_ticks =
|
||||
internal::ReadProcStatsAndGetFieldAsInt64(pid, internal::VM_STARTTIME);
|
||||
@@ -23,6 +41,7 @@ const Time CurrentProcessInfo::CreationT
|
||||
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());
|
||||
return Time(boot_time + start_offset);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/process/process_iterator_freebsd.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/process/process_iterator_freebsd.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/process/process_iterator_freebsd.cc
|
||||
@@ -10,6 +10,10 @@
|
||||
#include <sys/sysctl.h>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/process/process_metrics.h.orig 2017-03-09 20:04:26 UTC
|
||||
--- base/process/process_metrics.h.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/process/process_metrics.h
|
||||
@@ -22,6 +22,12 @@
|
||||
#include "base/values.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/process/process_metrics_freebsd.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/process/process_metrics_freebsd.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/process/process_metrics_freebsd.cc
|
||||
@@ -13,6 +13,9 @@
|
||||
#include "base/memory/ptr_util.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/process/process_posix.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/process/process_posix.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/process/process_posix.cc
|
||||
@@ -21,8 +21,18 @@
|
||||
#include <sys/event.h>
|
||||
|
@ -53,9 +53,9 @@
|
|||
+}
|
||||
+#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
|
||||
|
||||
bool Process::IsValid() const {
|
||||
return process_ != kNullProcessHandle;
|
||||
@@ -365,15 +379,32 @@ bool Process::WaitForExitWithTimeout(Tim
|
||||
// static
|
||||
void Process::TerminateCurrentProcessImmediately(int exit_code) {
|
||||
@@ -370,15 +384,32 @@ bool Process::WaitForExitWithTimeout(Tim
|
||||
bool Process::IsProcessBackgrounded() const {
|
||||
// See SetProcessBackgrounded().
|
||||
DCHECK(IsValid());
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/profiler/stack_sampling_profiler_unittest.cc
|
||||
@@ -31,7 +31,7 @@
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <intrin.h>
|
||||
#include <malloc.h>
|
||||
#include <windows.h>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/security_unittest.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/security_unittest.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/security_unittest.cc
|
||||
@@ -74,7 +74,7 @@ bool IsTcMallocBypassed() {
|
||||
// FAILS_ is too clunky.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/sys_info_freebsd.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/sys_info_freebsd.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/sys_info_freebsd.cc
|
||||
@@ -12,12 +12,34 @@
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/sys_info_posix.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/sys_info_posix.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/sys_info_posix.cc
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/test/BUILD.gn.orig 2017-03-09 20:04:26 UTC
|
||||
--- base/test/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/test/BUILD.gn
|
||||
@@ -312,7 +312,7 @@ static_library("run_all_base_unittests")
|
||||
]
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/test/launcher/test_launcher.cc.orig 2017-03-09 20:04:26 UTC
|
||||
--- base/test/launcher/test_launcher.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/test/launcher/test_launcher.cc
|
||||
@@ -60,6 +60,10 @@
|
||||
#include "base/win/windows_version.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/test/test_file_util_posix.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/test/test_file_util_posix.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/test/test_file_util_posix.cc
|
||||
@@ -79,7 +79,7 @@ bool DieFileDie(const FilePath& file, bo
|
||||
return DeleteFile(file, recurse);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/third_party/libevent/BUILD.gn.orig 2017-03-09 20:04:26 UTC
|
||||
--- base/third_party/libevent/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/third_party/libevent/BUILD.gn
|
||||
@@ -50,6 +50,9 @@ static_library("libevent") {
|
||||
"linux/event-config.h",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- base/threading/platform_thread.h.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/threading/platform_thread.h.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/threading/platform_thread.h
|
||||
@@ -205,7 +205,7 @@ class BASE_EXPORT PlatformThread {
|
||||
@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformThread {
|
||||
|
||||
static ThreadPriority GetCurrentThreadPriority();
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/threading/platform_thread_linux.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/threading/platform_thread_linux.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/threading/platform_thread_linux.cc
|
||||
@@ -19,7 +19,9 @@
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/threading/platform_thread_posix.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/threading/platform_thread_posix.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/threading/platform_thread_posix.cc
|
||||
@@ -56,7 +56,7 @@ void* ThreadFunc(void* params) {
|
||||
if (!thread_params->joinable)
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
--- base/threading/thread_task_runner_handle.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/threading/thread_task_runner_handle.cc
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <utility>
|
||||
|
||||
#include "base/bind.h"
|
||||
+#include "base/callback_helpers.h"
|
||||
#include "base/lazy_instance.h"
|
||||
#include "base/logging.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
@@ -34,6 +35,7 @@ bool ThreadTaskRunnerHandle::IsSet() {
|
||||
return !!lazy_tls_ptr.Pointer()->Get();
|
||||
}
|
||||
|
||||
+#if defined(OS_BSD)
|
||||
// static
|
||||
ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting(
|
||||
scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) {
|
||||
@@ -77,6 +79,7 @@ ScopedClosureRunner ThreadTaskRunnerHand
|
||||
base::Passed(&overriding_task_runner),
|
||||
base::Unretained(ttrh->task_runner_.get())));
|
||||
}
|
||||
+#endif
|
||||
|
||||
ThreadTaskRunnerHandle::ThreadTaskRunnerHandle(
|
||||
scoped_refptr<SingleThreadTaskRunner> task_runner)
|
|
@ -1,4 +1,4 @@
|
|||
--- base/trace_event/malloc_dump_provider.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- 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)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- base/trace_event/process_memory_dump.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- base/trace_event/process_memory_dump.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ base/trace_event/process_memory_dump.cc
|
||||
@@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentB
|
||||
const size_t kMaxChunkSize = 8 * 1024 * 1024;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- breakpad/BUILD.gn.orig 2017-01-26 00:49:07 UTC
|
||||
--- breakpad/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ breakpad/BUILD.gn
|
||||
@@ -468,7 +468,7 @@ if (is_mac) {
|
||||
}
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
--- breakpad/src/common/simple_string_dictionary.h.orig 2017-04-19 19:07:40 UTC
|
||||
+++ breakpad/src/common/simple_string_dictionary.h
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
|
||||
-#include "common/basictypes.h"
|
||||
+#include "breakpad/src/common/basictypes.h"
|
||||
|
||||
namespace google_breakpad {
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- build/config/BUILD.gn.orig 2017-03-09 20:04:27 UTC
|
||||
--- build/config/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/config/BUILD.gn
|
||||
@@ -196,7 +196,7 @@ config("debug") {
|
||||
@@ -193,7 +193,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?
|
||||
@@ -279,7 +279,7 @@ config("default_libs") {
|
||||
@@ -276,7 +276,7 @@ config("default_libs") {
|
||||
"CoreText.framework",
|
||||
"Foundation.framework",
|
||||
]
|
||||
|
@ -18,7 +18,7 @@
|
|||
libs = [
|
||||
"dl",
|
||||
"rt",
|
||||
@@ -310,7 +310,7 @@ config("executable_config") {
|
||||
@@ -307,7 +307,7 @@ config("executable_config") {
|
||||
]
|
||||
} else if (is_ios) {
|
||||
configs += [ "//build/config/ios:ios_dynamic_flags" ]
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- build/config/BUILDCONFIG.gn.orig 2017-03-09 20:04:27 UTC
|
||||
--- build/config/BUILDCONFIG.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/config/BUILDCONFIG.gn
|
||||
@@ -131,12 +131,13 @@ declare_args() {
|
||||
is_official_build = false
|
||||
|
|
|
@ -1,11 +1,16 @@
|
|||
--- build/config/allocator.gni.orig 2017-01-26 00:49:07 UTC
|
||||
--- build/config/allocator.gni.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/config/allocator.gni
|
||||
@@ -44,7 +44,7 @@ assert(use_allocator == "none" || use_al
|
||||
@@ -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,
|
||||
+ !use_experimental_allocator_shim || is_linux || is_android || is_win || is_bsd,
|
||||
"use_experimental_allocator_shim supported only on Linux, Android and Windows targets")
|
||||
-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,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- build/config/clang/BUILD.gn.orig 2017-01-26 00:49:07 UTC
|
||||
--- build/config/clang/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/config/clang/BUILD.gn
|
||||
@@ -20,7 +20,7 @@ config("find_bad_constructs") {
|
||||
rebase_path("${clang_base_path}/lib/libFindBadConstructs.dylib",
|
||||
|
@ -9,8 +9,8 @@
|
|||
cflags += [
|
||||
"-Xclang",
|
||||
"-load",
|
||||
@@ -37,7 +37,7 @@ config("find_bad_constructs") {
|
||||
"find-bad-constructs",
|
||||
@@ -41,7 +41,7 @@ config("find_bad_constructs") {
|
||||
"check-auto-raw-pointer",
|
||||
]
|
||||
|
||||
- if ((is_linux || is_android) && !is_chromecast) {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- build/config/compiler/BUILD.gn.orig 2017-03-09 20:04:27 UTC
|
||||
--- build/config/compiler/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/config/compiler/BUILD.gn
|
||||
@@ -155,7 +155,7 @@ config("compiler") {
|
||||
@@ -158,7 +158,7 @@ config("compiler") {
|
||||
configs += [ "//build/config/win:compiler" ]
|
||||
} else if (is_android) {
|
||||
configs += [ "//build/config/android:compiler" ]
|
||||
|
@ -9,7 +9,7 @@
|
|||
configs += [ "//build/config/linux:compiler" ]
|
||||
} else if (is_nacl) {
|
||||
configs += [ "//build/config/nacl:compiler" ]
|
||||
@@ -282,7 +282,7 @@ config("compiler") {
|
||||
@@ -301,7 +301,7 @@ config("compiler") {
|
||||
|
||||
# Linux/Android common flags setup.
|
||||
# ---------------------------------
|
||||
|
@ -18,12 +18,12 @@
|
|||
cflags += [
|
||||
"-fPIC",
|
||||
"-pipe", # Use pipes for communicating between sub-processes. Faster.
|
||||
@@ -409,14 +409,14 @@ config("compiler") {
|
||||
@@ -428,14 +428,14 @@ config("compiler") {
|
||||
# clang-cl (used if is_win) doesn't expose this flag.
|
||||
# Currently disabled for nacl since its toolchain lacks this flag (too old).
|
||||
# TODO(zforman): Once nacl's toolchain is updated, remove check.
|
||||
- if (is_clang && is_linux) {
|
||||
+ if (is_clang && (is_linux || is_bsd)) {
|
||||
- if (is_clang && is_linux && strip_absolute_paths_from_debug_symbols) {
|
||||
+ if (is_clang && (is_linux || is_bsd) && strip_absolute_paths_from_debug_symbols) {
|
||||
absolute_path = rebase_path("//.")
|
||||
cflags += [ "-fdebug-prefix-map=$absolute_path=." ]
|
||||
}
|
||||
|
@ -35,7 +35,7 @@
|
|||
# gnu++11 instead of c++11 is needed because some code uses typeof() (a
|
||||
# GNU extension).
|
||||
# TODO(thakis): Eventually switch this to c++11 instead,
|
||||
@@ -469,7 +469,7 @@ config("compiler") {
|
||||
@@ -488,7 +488,7 @@ config("compiler") {
|
||||
]
|
||||
|
||||
# Apply a lower LTO optimization level as the default is too slow.
|
||||
|
@ -44,7 +44,7 @@
|
|||
if (use_lld) {
|
||||
ldflags += [ "-Wl,--lto-O1" ]
|
||||
} else {
|
||||
@@ -489,7 +489,7 @@ config("compiler") {
|
||||
@@ -508,7 +508,7 @@ config("compiler") {
|
||||
# targeting ARM, without this flag, LTO produces a .text section that is
|
||||
# larger than the maximum call displacement, preventing the linker from
|
||||
# relocating calls (http://llvm.org/PR22999).
|
||||
|
@ -53,7 +53,7 @@
|
|||
ldflags += [ "-Wl,-plugin-opt,-function-sections" ]
|
||||
}
|
||||
}
|
||||
@@ -757,7 +757,7 @@ config("compiler_codegen") {
|
||||
@@ -776,7 +776,7 @@ config("compiler_codegen") {
|
||||
# configs -= [ "//build/config/compiler:clang_stackrealign" ]
|
||||
# See https://crbug.com/556393 for details of where it must be avoided.
|
||||
config("clang_stackrealign") {
|
||||
|
@ -62,7 +62,7 @@
|
|||
cflags = [
|
||||
# Align the stack on 16-byte boundaries, http://crbug.com/418554.
|
||||
"-mstack-alignment=16",
|
||||
@@ -811,7 +811,7 @@ config("runtime_library") {
|
||||
@@ -830,7 +830,7 @@ config("runtime_library") {
|
||||
# smaller.
|
||||
if (is_win) {
|
||||
configs += [ "//build/config/win:runtime_library" ]
|
||||
|
@ -71,16 +71,16 @@
|
|||
configs += [ "//build/config/linux:runtime_library" ]
|
||||
} else if (is_ios) {
|
||||
configs += [ "//build/config/ios:runtime_library" ]
|
||||
@@ -1076,7 +1076,7 @@ config("default_warnings") {
|
||||
"-Wno-nonportable-include-path",
|
||||
@@ -1087,7 +1087,7 @@ config("default_warnings") {
|
||||
|
||||
# TODO(hans): https://crbug.com/637306
|
||||
- "-Wno-address-of-packed-member",
|
||||
+ # "-Wno-address-of-packed-member",
|
||||
]
|
||||
if (llvm_force_head_revision) {
|
||||
cflags += [
|
||||
@@ -1119,7 +1119,7 @@ config("chromium_code") {
|
||||
# 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") {
|
||||
]
|
||||
|
||||
if (!is_debug && !using_sanitizer &&
|
||||
|
@ -89,7 +89,7 @@
|
|||
# _FORTIFY_SOURCE isn't really supported by Clang now, see
|
||||
# http://llvm.org/bugs/show_bug.cgi?id=16821.
|
||||
# It seems to work fine with Ubuntu 12 headers though, so use it in
|
||||
@@ -1178,7 +1178,7 @@ config("no_chromium_code") {
|
||||
@@ -1203,7 +1203,7 @@ config("no_chromium_code") {
|
||||
]
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- build/config/crypto.gni.orig 2017-01-26 00:49:07 UTC
|
||||
--- build/config/crypto.gni.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/config/crypto.gni
|
||||
@@ -20,4 +20,4 @@ use_openssl_certs = is_android || is_nac
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- build/config/features.gni.orig 2017-03-09 20:04:27 UTC
|
||||
--- build/config/features.gni.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/config/features.gni
|
||||
@@ -57,13 +57,13 @@ declare_args() {
|
||||
@@ -60,13 +60,13 @@ declare_args() {
|
||||
# libudev usage. This currently only affects the content layer.
|
||||
use_udev = is_linux && !is_chromecast
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- build/config/linux/gtk2/BUILD.gn.orig 2017-03-09 20:04:27 UTC
|
||||
--- build/config/linux/gtk2/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/config/linux/gtk2/BUILD.gn
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- build/config/linux/gtk3/BUILD.gn.orig 2017-03-09 20:04:27 UTC
|
||||
--- build/config/linux/gtk3/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/config/linux/gtk3/BUILD.gn
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- build/config/linux/gtk/BUILD.gn.orig 2017-03-09 20:04:27 UTC
|
||||
--- build/config/linux/gtk/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/config/linux/gtk/BUILD.gn
|
||||
@@ -5,7 +5,7 @@
|
||||
import("//build/config/linux/gtk/gtk.gni")
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- build/config/linux/pkg-config.py.orig 2017-01-26 00:49:07 UTC
|
||||
--- build/config/linux/pkg-config.py.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/config/linux/pkg-config.py
|
||||
@@ -57,8 +57,12 @@ def SetConfigPath(options):
|
||||
print "You must specify an architecture via -a if using a sysroot."
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- build/config/sanitizers/BUILD.gn.orig 2017-03-09 20:04:27 UTC
|
||||
--- build/config/sanitizers/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/config/sanitizers/BUILD.gn
|
||||
@@ -420,7 +420,7 @@ config("lsan_flags") {
|
||||
@@ -428,7 +428,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)
|
||||
@@ -435,7 +435,7 @@ config("msan_flags") {
|
||||
@@ -443,7 +443,7 @@ config("msan_flags") {
|
||||
|
||||
config("tsan_flags") {
|
||||
if (is_tsan) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- build/config/sanitizers/sanitizers.gni.orig 2017-03-09 20:04:27 UTC
|
||||
--- build/config/sanitizers/sanitizers.gni.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/config/sanitizers/sanitizers.gni
|
||||
@@ -54,8 +54,8 @@ declare_args() {
|
||||
# See http://clang.llvm.org/docs/ControlFlowIntegrity.html
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- build/config/ui.gni.orig 2017-03-09 20:04:27 UTC
|
||||
--- build/config/ui.gni.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/config/ui.gni
|
||||
@@ -31,10 +31,10 @@ declare_args() {
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- build/linux/libpci/BUILD.gn.orig 2017-01-26 00:49:07 UTC
|
||||
--- build/linux/libpci/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/linux/libpci/BUILD.gn
|
||||
@@ -3,20 +3,36 @@
|
||||
# found in the LICENSE file.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- build/secondary/third_party/nss/BUILD.gn.orig 2017-01-26 00:49:07 UTC
|
||||
--- build/secondary/third_party/nss/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/secondary/third_party/nss/BUILD.gn
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- build/toolchain/gcc_toolchain.gni.orig 2017-01-26 00:49:07 UTC
|
||||
--- build/toolchain/gcc_toolchain.gni.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/toolchain/gcc_toolchain.gni
|
||||
@@ -11,6 +11,11 @@ import("//build/toolchain/cc_wrapper.gni
|
||||
@@ -12,6 +12,11 @@ import("//build/toolchain/clang_static_a
|
||||
import("//build/toolchain/goma.gni")
|
||||
import("//build/toolchain/toolchain.gni")
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
|||
# This template defines a toolchain for something that works like gcc
|
||||
# (including clang).
|
||||
#
|
||||
@@ -482,14 +487,23 @@ template("clang_toolchain") {
|
||||
@@ -483,10 +488,22 @@ template("clang_toolchain") {
|
||||
}
|
||||
|
||||
gcc_toolchain(target_name) {
|
||||
|
@ -32,14 +32,21 @@
|
|||
+ cc = "$prefix/clang"
|
||||
+ cxx = "$prefix/clang++"
|
||||
+ ld = cxx
|
||||
|
||||
- readelf = "${toolprefix}readelf"
|
||||
- ar = "${toolprefix}ar"
|
||||
- nm = "${toolprefix}nm"
|
||||
+ readelf = "${toolprefix}readelf"
|
||||
+ ar = "${toolprefix}ar"
|
||||
+ nm = "${toolprefix}nm"
|
||||
+ }
|
||||
|
||||
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 = {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- build/toolchain/get_concurrent_links.py.orig 2017-01-26 00:49:07 UTC
|
||||
--- build/toolchain/get_concurrent_links.py.orig 2017-04-19 19:06:28 UTC
|
||||
+++ build/toolchain/get_concurrent_links.py
|
||||
@@ -45,6 +45,14 @@ def _GetTotalMemoryInBytes():
|
||||
return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- cc/layers/scrollbar_layer_impl_base.cc.orig 2017-01-26 00:49:07 UTC
|
||||
--- cc/layers/scrollbar_layer_impl_base.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ cc/layers/scrollbar_layer_impl_base.cc
|
||||
@@ -174,8 +174,8 @@ gfx::Rect ScrollbarLayerImplBase::Comput
|
||||
int thumb_offset = TrackStart();
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- cc/trees/property_tree.cc.orig 2017-03-09 20:04:27 UTC
|
||||
--- cc/trees/property_tree.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ cc/trees/property_tree.cc
|
||||
@@ -1196,13 +1196,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO
|
||||
@@ -1229,13 +1229,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO
|
||||
|
||||
gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id);
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/BUILD.gn.orig 2017-03-09 20:04:27 UTC
|
||||
--- chrome/BUILD.gn.orig 2017-04-19 19:06:28 UTC
|
||||
+++ chrome/BUILD.gn
|
||||
@@ -143,7 +143,7 @@ if (!is_android && !is_mac) {
|
||||
@@ -142,7 +142,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",
|
||||
@@ -222,7 +222,7 @@ if (!is_android && !is_mac) {
|
||||
@@ -223,7 +223,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",
|
||||
@@ -1521,7 +1521,7 @@ if (enable_resource_whitelist_generation
|
||||
@@ -1647,7 +1647,7 @@ if (enable_resource_whitelist_generation
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/app/chrome_command_ids.h.orig 2017-01-26 00:49:07 UTC
|
||||
--- chrome/app/chrome_command_ids.h.orig 2017-04-19 19:06:28 UTC
|
||||
+++ chrome/app/chrome_command_ids.h
|
||||
@@ -75,7 +75,7 @@
|
||||
@@ -71,7 +71,7 @@
|
||||
#define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049
|
||||
#define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/app/chrome_main_delegate.cc.orig 2017-03-09 20:04:27 UTC
|
||||
--- chrome/app/chrome_main_delegate.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ chrome/app/chrome_main_delegate.cc
|
||||
@@ -89,7 +89,7 @@
|
||||
#include "chrome/app/chrome_crash_reporter_client.h"
|
||||
|
@ -95,7 +95,7 @@
|
|||
// Zygote needs to call InitCrashReporter() in RunZygote().
|
||||
if (process_type != switches::kZygoteProcess) {
|
||||
#if defined(OS_ANDROID)
|
||||
@@ -898,7 +898,7 @@ void ChromeMainDelegate::PreSandboxStart
|
||||
@@ -899,7 +899,7 @@ void ChromeMainDelegate::PreSandboxStart
|
||||
breakpad::InitCrashReporter(process_type);
|
||||
#endif // defined(OS_ANDROID)
|
||||
}
|
||||
|
@ -104,12 +104,12 @@
|
|||
|
||||
// After all the platform Breakpads have been initialized, store the command
|
||||
// line for crash reporting.
|
||||
@@ -1008,7 +1008,7 @@ bool ChromeMainDelegate::DelaySandboxIni
|
||||
@@ -1005,7 +1005,7 @@ bool ChromeMainDelegate::DelaySandboxIni
|
||||
#endif
|
||||
return process_type == switches::kRelauncherProcess;
|
||||
}
|
||||
-#elif defined(OS_POSIX) && !defined(OS_ANDROID)
|
||||
+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
void ChromeMainDelegate::ZygoteStarting(
|
||||
ScopedVector<content::ZygoteForkDelegate>* delegates) {
|
||||
std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) {
|
||||
#if defined(OS_CHROMEOS)
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
--- chrome/app/chrome_main_delegate.h.orig 2017-01-26 00:49:07 UTC
|
||||
--- chrome/app/chrome_main_delegate.h.orig 2017-04-19 19:06:28 UTC
|
||||
+++ chrome/app/chrome_main_delegate.h
|
||||
@@ -44,7 +44,7 @@ class ChromeMainDelegate : public conten
|
||||
@@ -42,7 +42,7 @@ class ChromeMainDelegate : public conten
|
||||
const std::string& process_type) override;
|
||||
bool ShouldSendMachPort(const std::string& process_type) override;
|
||||
bool DelaySandboxInitialization(const std::string& process_type) override;
|
||||
-#elif defined(OS_POSIX) && !defined(OS_ANDROID)
|
||||
+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
void ZygoteStarting(
|
||||
ScopedVector<content::ZygoteForkDelegate>* delegates) override;
|
||||
void ZygoteStarting(std::vector<std::unique_ptr<content::ZygoteForkDelegate>>*
|
||||
delegates) override;
|
||||
void ZygoteForked() override;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/app/chromium_strings.grd.orig 2017-03-09 20:04:27 UTC
|
||||
--- chrome/app/chromium_strings.grd.orig 2017-04-19 19:06:28 UTC
|
||||
+++ chrome/app/chromium_strings.grd
|
||||
@@ -887,7 +887,7 @@ Signing in anyway will merge Chromium in
|
||||
@@ -891,7 +891,7 @@ Signing in anyway will merge Chromium in
|
||||
</message>
|
||||
|
||||
<!-- ProcessSingleton -->
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/app/generated_resources.grd.orig 2017-03-09 20:04:27 UTC
|
||||
--- chrome/app/generated_resources.grd.orig 2017-04-19 19:06:28 UTC
|
||||
+++ chrome/app/generated_resources.grd
|
||||
@@ -6868,7 +6868,7 @@ Keep your key file in a safe place. You
|
||||
@@ -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>
|
||||
|
@ -9,7 +9,7 @@
|
|||
<message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API.">
|
||||
Enable Input IME API
|
||||
</message>
|
||||
@@ -10122,7 +10122,7 @@ I don't think this site should be blocke
|
||||
@@ -9629,7 +9629,7 @@ I don't think this site should be blocke
|
||||
<message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group">
|
||||
Appearance
|
||||
</message>
|
||||
|
@ -18,7 +18,7 @@
|
|||
<message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group">
|
||||
Themes
|
||||
</message>
|
||||
@@ -10130,7 +10130,7 @@ I don't think this site should be blocke
|
||||
@@ -9637,7 +9637,7 @@ I don't think this site should be blocke
|
||||
<message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme">
|
||||
Reset to default theme
|
||||
</message>
|
||||
|
@ -27,7 +27,7 @@
|
|||
<message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme.">
|
||||
Use GTK+ theme
|
||||
</message>
|
||||
@@ -11455,7 +11455,7 @@ Tell us what happened exactly before you
|
||||
@@ -10903,7 +10903,7 @@ Tell us what happened exactly before you
|
||||
Set as default
|
||||
</message>
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/app/google_chrome_strings.grd.orig 2017-03-09 20:04:27 UTC
|
||||
--- chrome/app/google_chrome_strings.grd.orig 2017-04-19 19:06:28 UTC
|
||||
+++ chrome/app/google_chrome_strings.grd
|
||||
@@ -888,7 +888,7 @@ Signing in anyway will merge Chrome info
|
||||
@@ -892,7 +892,7 @@ Signing in anyway will merge Chrome info
|
||||
</message>
|
||||
|
||||
<!-- ProcessSingleton -->
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/app/mash/mash_runner.cc.orig 2017-03-09 20:04:27 UTC
|
||||
--- chrome/app/mash/mash_runner.cc.orig 2017-04-19 19:06:28 UTC
|
||||
+++ chrome/app/mash/mash_runner.cc
|
||||
@@ -249,7 +249,7 @@ int MashMain() {
|
||||
@@ -263,7 +263,7 @@ int MashMain() {
|
||||
// TODO(sky): wire this up correctly.
|
||||
service_manager::InitializeLogging();
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/app/resources/locale_settings.grd.orig 2017-01-26 00:49:08 UTC
|
||||
--- 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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/app/settings_strings.grdp.orig 2017-03-09 20:04:27 UTC
|
||||
--- chrome/app/settings_strings.grdp.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/app/settings_strings.grdp
|
||||
@@ -225,7 +225,7 @@
|
||||
@@ -240,7 +240,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>
|
||||
@@ -239,7 +239,7 @@
|
||||
@@ -254,7 +254,7 @@
|
||||
Use Classic
|
||||
</message>
|
||||
</if>
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
--- chrome/app/shutdown_signal_handlers_posix.cc.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/app/shutdown_signal_handlers_posix.cc
|
||||
@@ -183,6 +183,11 @@ void InstallShutdownSignalHandlers(
|
||||
g_pipe_pid = getpid();
|
||||
g_shutdown_pipe_read_fd = pipefd[0];
|
||||
g_shutdown_pipe_write_fd = pipefd[1];
|
||||
+#if defined(OS_BSD)
|
||||
+ // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD,
|
||||
+ // we request the default pthread stack size by specifying 0 here.
|
||||
+ const size_t kShutdownDetectorThreadStackSize = 0;
|
||||
+#else
|
||||
#if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
|
||||
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
|
||||
#else
|
||||
@@ -191,6 +196,7 @@ void InstallShutdownSignalHandlers(
|
||||
// size to avoid hitting the guard page.
|
||||
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
|
||||
#endif
|
||||
+#endif
|
||||
ShutdownDetector* detector = new ShutdownDetector(
|
||||
g_shutdown_pipe_read_fd, shutdown_callback, task_runner);
|
||||
// PlatformThread does not delete its delegate.
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/BUILD.gn.orig 2017-03-09 20:04:27 UTC
|
||||
--- chrome/browser/BUILD.gn.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/BUILD.gn
|
||||
@@ -2177,7 +2177,7 @@ split_static_library("browser") {
|
||||
@@ -2219,7 +2219,7 @@ split_static_library("browser") {
|
||||
deps += [ "//device/udev_linux" ]
|
||||
}
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
deps += [ "//third_party/speech-dispatcher" ]
|
||||
}
|
||||
|
||||
@@ -3559,7 +3559,7 @@ split_static_library("browser") {
|
||||
@@ -3606,7 +3606,7 @@ split_static_library("browser") {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/about_flags.cc.orig 2017-03-09 20:04:27 UTC
|
||||
--- chrome/browser/about_flags.cc.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/about_flags.cc
|
||||
@@ -820,7 +820,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -856,7 +856,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
kOsLinux | kOsCrOS | kOsWin | kOsAndroid,
|
||||
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling,
|
||||
switches::kDisableSmoothScrolling)},
|
||||
|
@ -9,7 +9,7 @@
|
|||
{"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME,
|
||||
IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION,
|
||||
// Uses the system preference on Mac (a different implementation).
|
||||
@@ -1345,11 +1345,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -1374,11 +1374,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX,
|
||||
switches::kDisableTranslateNewUX)},
|
||||
#endif // OS_MACOSX
|
||||
|
@ -23,7 +23,7 @@
|
|||
{"translate-lang-by-ulp", IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_NAME,
|
||||
IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_DESCRIPTION, kOsAll,
|
||||
FEATURE_VALUE_TYPE(translate::kTranslateLanguageByULP)},
|
||||
@@ -1778,7 +1778,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -1802,7 +1802,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)},
|
||||
#endif // ENABLE_EXTENSIONS
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/browser_process_impl.cc.orig 2017-03-09 20:04:27 UTC
|
||||
--- chrome/browser/browser_process_impl.cc.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/browser_process_impl.cc
|
||||
@@ -170,7 +170,7 @@
|
||||
@@ -171,7 +171,7 @@
|
||||
#include "chrome/browser/media/webrtc/webrtc_log_uploader.h"
|
||||
#endif
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
|||
#include "chrome/browser/memory/tab_manager.h"
|
||||
#endif
|
||||
|
||||
@@ -783,7 +783,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_
|
||||
@@ -789,7 +789,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_
|
||||
|
||||
memory::TabManager* BrowserProcessImpl::GetTabManager() {
|
||||
DCHECK(CalledOnValidThread());
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/browser_process_impl.h.orig 2017-03-09 20:04:27 UTC
|
||||
--- chrome/browser/browser_process_impl.h.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/browser_process_impl.h
|
||||
@@ -341,7 +341,7 @@ class BrowserProcessImpl : public Browse
|
||||
@@ -342,7 +342,7 @@ class BrowserProcessImpl : public Browse
|
||||
|
||||
std::unique_ptr<ChromeDeviceClient> device_client_;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/browser_resources.grd.orig 2017-03-09 20:04:27 UTC
|
||||
--- chrome/browser/browser_resources.grd.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/browser_resources.grd
|
||||
@@ -384,7 +384,7 @@
|
||||
@@ -383,7 +383,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>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/chrome_browser_main.cc.orig 2017-03-09 20:04:28 UTC
|
||||
--- chrome/browser/chrome_browser_main.cc.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/chrome_browser_main.cc
|
||||
@@ -180,7 +180,7 @@
|
||||
@@ -181,7 +181,7 @@
|
||||
#include "chrome/browser/lifetime/application_lifetime.h"
|
||||
#endif // defined(OS_ANDROID)
|
||||
|
||||
|
@ -9,7 +9,38 @@
|
|||
#include "chrome/browser/first_run/upgrade_util_linux.h"
|
||||
#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
|
||||
@@ -1173,11 +1173,11 @@ int ChromeBrowserMainParts::PreCreateThr
|
||||
@@ -276,7 +276,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MACOSX) || \
|
||||
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
|
||||
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
|
||||
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
|
||||
#endif
|
||||
|
||||
@@ -479,10 +479,10 @@ 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
|
||||
field_trial_synchronizer_ = new FieldTrialSynchronizer();
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MACOSX) || \
|
||||
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
|
||||
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
|
||||
metrics::DesktopSessionDurationTracker::Initialize();
|
||||
#endif
|
||||
|
||||
@@ -1194,11 +1194,11 @@ int ChromeBrowserMainParts::PreCreateThr
|
||||
}
|
||||
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
||||
|
||||
|
@ -23,3 +54,12 @@
|
|||
|
||||
// Initialize tracking synchronizer system.
|
||||
tracking_synchronizer_ = new metrics::TrackingSynchronizer(
|
||||
@@ -1387,7 +1387,7 @@ void ChromeBrowserMainParts::PreBrowserS
|
||||
|
||||
// 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.
|
||||
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
|
||||
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
|
||||
g_browser_process->GetTabManager()->Start();
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/chrome_browser_main_linux.cc.orig 2017-01-26 00:49:08 UTC
|
||||
--- chrome/browser/chrome_browser_main_linux.cc.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/chrome_browser_main_linux.cc
|
||||
@@ -75,12 +75,14 @@ void ChromeBrowserMainPartsLinux::PrePro
|
||||
@@ -77,12 +77,14 @@ void ChromeBrowserMainPartsLinux::PrePro
|
||||
void ChromeBrowserMainPartsLinux::PostProfileInit() {
|
||||
ChromeBrowserMainPartsPosix::PostProfileInit();
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
|||
bluez::DBusThreadManagerLinux::Initialize();
|
||||
bluez::BluezDBusManager::Initialize(
|
||||
bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false);
|
||||
@@ -90,7 +92,7 @@ void ChromeBrowserMainPartsLinux::PostMa
|
||||
@@ -92,7 +94,7 @@ void ChromeBrowserMainPartsLinux::PostMa
|
||||
}
|
||||
|
||||
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
|
||||
|
|
|
@ -1,22 +1,11 @@
|
|||
--- chrome/browser/chrome_browser_main_posix.cc.orig 2017-01-26 00:49:08 UTC
|
||||
--- chrome/browser/chrome_browser_main_posix.cc.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/chrome_browser_main_posix.cc
|
||||
@@ -275,6 +275,11 @@ void ChromeBrowserMainPartsPosix::PostMa
|
||||
g_pipe_pid = getpid();
|
||||
g_shutdown_pipe_read_fd = pipefd[0];
|
||||
g_shutdown_pipe_write_fd = pipefd[1];
|
||||
+#if defined(OS_FREEBSD)
|
||||
+ // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD,
|
||||
+ // we request the default pthread stack size by specifying 0 here.
|
||||
+ const size_t kShutdownDetectorThreadStackSize = 0;
|
||||
+#else
|
||||
#if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
|
||||
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
|
||||
#else
|
||||
@@ -283,6 +288,7 @@ void ChromeBrowserMainPartsPosix::PostMa
|
||||
// size to avoid hitting the guard page.
|
||||
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
|
||||
#endif
|
||||
+#endif // OS_FREEBSD
|
||||
// TODO(viettrungluu,willchan): crbug.com/29675 - This currently leaks, so
|
||||
// if you change this, you'll probably need to change the suppression.
|
||||
if (!base::PlatformThread::CreateNonJoinable(
|
||||
@@ -134,7 +134,7 @@ void ChromeBrowserMainPartsPosix::PostMa
|
||||
void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() {
|
||||
#if defined(OS_CHROMEOS)
|
||||
NOTREACHED(); // Should not ever happen on ChromeOS.
|
||||
-#elif defined(OS_MACOSX)
|
||||
+#elif defined(OS_MACOSX) || defined(OS_BSD)
|
||||
// Not called on Mac because we load the locale files differently.
|
||||
NOTREACHED();
|
||||
#elif defined(USE_AURA)
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
--- chrome/browser/chrome_content_browser_client.cc.orig 2017-03-09 20:04:28 UTC
|
||||
--- chrome/browser/chrome_content_browser_client.cc.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -242,7 +242,7 @@
|
||||
#include "chrome/browser/ui/browser_dialogs.h"
|
||||
#include "chromeos/chromeos_switches.h"
|
||||
#include "components/user_manager/user_manager.h"
|
||||
@@ -244,7 +244,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"
|
||||
-#elif defined(OS_LINUX)
|
||||
+#elif defined(OS_LINUX) || defined(OS_BSD)
|
||||
#include "chrome/browser/chrome_browser_main_linux.h"
|
||||
#elif defined(OS_ANDROID)
|
||||
#include "chrome/browser/chrome_browser_main_android.h"
|
||||
@@ -258,7 +258,7 @@
|
||||
#include "chrome/browser/payments/payment_request_factory.h"
|
||||
#include "chrome/browser/android/app_hooks.h"
|
||||
@@ -265,7 +265,7 @@
|
||||
#include "chrome/browser/webshare/share_service_impl.h"
|
||||
#endif
|
||||
|
||||
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
||||
|
@ -18,7 +18,7 @@
|
|||
#include "base/debug/leak_annotations.h"
|
||||
#include "components/crash/content/app/breakpad_linux.h"
|
||||
#include "components/crash/content/browser/crash_handler_host_linux.h"
|
||||
@@ -281,7 +281,7 @@
|
||||
@@ -289,7 +289,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
|
||||
|
||||
@@ -576,7 +576,7 @@ bool CertMatchesFilter(const net::X509Ce
|
||||
@@ -700,7 +700,7 @@ bool CertMatchesFilter(const net::X509Ce
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -36,7 +36,7 @@
|
|||
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
|
||||
const std::string& process_type) {
|
||||
base::FilePath dumps_path;
|
||||
@@ -899,7 +899,7 @@ content::BrowserMainParts* ChromeContent
|
||||
@@ -1023,7 +1023,7 @@ content::BrowserMainParts* ChromeContent
|
||||
main_parts = new ChromeBrowserMainPartsMac(parameters);
|
||||
#elif defined(OS_CHROMEOS)
|
||||
main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters);
|
||||
|
@ -45,7 +45,7 @@
|
|||
main_parts = new ChromeBrowserMainPartsLinux(parameters);
|
||||
#elif defined(OS_ANDROID)
|
||||
main_parts = new ChromeBrowserMainPartsAndroid(parameters);
|
||||
@@ -915,7 +915,7 @@ content::BrowserMainParts* ChromeContent
|
||||
@@ -1039,7 +1039,7 @@ content::BrowserMainParts* ChromeContent
|
||||
// Construct additional browser parts. Stages are called in the order in
|
||||
// which they are added.
|
||||
#if defined(TOOLKIT_VIEWS)
|
||||
|
@ -53,8 +53,8 @@
|
|||
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
|
||||
main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
|
||||
#else
|
||||
ChromeBrowserMainExtraPartsViews* extra_parts_views =
|
||||
@@ -1552,7 +1552,7 @@ void ChromeContentBrowserClient::AppendE
|
||||
main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
|
||||
@@ -1680,7 +1680,7 @@ void ChromeContentBrowserClient::AppendE
|
||||
command_line->AppendSwitchASCII(switches::kMetricsClientID,
|
||||
client_info->client_id);
|
||||
}
|
||||
|
@ -63,7 +63,7 @@
|
|||
if (breakpad::IsCrashReporterEnabled()) {
|
||||
std::string switch_value;
|
||||
std::unique_ptr<metrics::ClientInfo> client_info =
|
||||
@@ -2808,7 +2808,7 @@ void ChromeContentBrowserClient::GetAddi
|
||||
@@ -2972,7 +2972,7 @@ void ChromeContentBrowserClient::GetAddi
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -72,7 +72,7 @@
|
|||
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
|
||||
const base::CommandLine& command_line,
|
||||
int child_process_id,
|
||||
@@ -2837,7 +2837,7 @@ void ChromeContentBrowserClient::GetAddi
|
||||
@@ -3001,7 +3001,7 @@ void ChromeContentBrowserClient::GetAddi
|
||||
}
|
||||
#endif // defined(OS_ANDROID)
|
||||
}
|
||||
|
@ -81,3 +81,12 @@
|
|||
|
||||
#if defined(OS_WIN)
|
||||
base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType(
|
||||
@@ -3193,6 +3193,8 @@ void ChromeContentBrowserClient::Registe
|
||||
base::Bind(&ForwardShareServiceRequest,
|
||||
web_contents->GetJavaInterfaces()->GetWeakPtr()));
|
||||
}
|
||||
+#elif defined(OS_BSD)
|
||||
+ NOTREACHED();
|
||||
#else
|
||||
if (AreExperimentalWebPlatformFeaturesEnabled() &&
|
||||
base::FeatureList::IsEnabled(features::kWebPayments)) {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/chrome_content_browser_client.h.orig 2017-03-09 20:04:28 UTC
|
||||
--- chrome/browser/chrome_content_browser_client.h.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/chrome_content_browser_client.h
|
||||
@@ -259,12 +259,12 @@ class ChromeContentBrowserClient : publi
|
||||
@@ -270,12 +270,12 @@ class ChromeContentBrowserClient : publi
|
||||
content::RenderFrameHost* render_frame_host,
|
||||
blink::WebPageVisibilityState* visibility_state) override;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/defaults.cc.orig 2017-01-26 00:49:08 UTC
|
||||
--- chrome/browser/defaults.cc.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/defaults.cc
|
||||
@@ -44,7 +44,7 @@ const bool kSyncAutoStarts = true;
|
||||
const bool kSyncAutoStarts = false;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2017-01-26 00:49:08 UTC
|
||||
--- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/diagnostics/diagnostics_writer.cc
|
||||
@@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool
|
||||
console_->SetColor(color);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2017-01-26 00:49:08 UTC
|
||||
--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/diagnostics/diagnostics_writer.h
|
||||
@@ -19,7 +19,7 @@ class DiagnosticsWriter : public Diagnos
|
||||
public:
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2017-03-09 20:04:28 UTC
|
||||
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
@@ -777,7 +777,7 @@ void ChromeDownloadManagerDelegate::OnDo
|
||||
target_info->is_filetype_handled_safely)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- chrome/browser/download/download_commands.cc.orig 2017-03-09 20:04:28 UTC
|
||||
--- chrome/browser/download/download_commands.cc.orig 2017-04-19 19:06:29 UTC
|
||||
+++ chrome/browser/download/download_commands.cc
|
||||
@@ -218,7 +218,7 @@ bool DownloadCommands::IsCommandChecked(
|
||||
@@ -219,7 +219,7 @@ bool DownloadCommands::IsCommandChecked(
|
||||
return download_item_->GetOpenWhenComplete() ||
|
||||
download_crx_util::IsExtensionDownload(*download_item_);
|
||||
case ALWAYS_OPEN_TYPE:
|
||||
|
@ -9,7 +9,7 @@
|
|||
if (CanOpenPdfInSystemViewer()) {
|
||||
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
|
||||
download_item_->GetBrowserContext());
|
||||
@@ -262,7 +262,7 @@ void DownloadCommands::ExecuteCommand(Co
|
||||
@@ -263,7 +263,7 @@ void DownloadCommands::ExecuteCommand(Co
|
||||
bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE);
|
||||
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
|
||||
download_item_->GetBrowserContext());
|
||||
|
@ -18,7 +18,7 @@
|
|||
if (CanOpenPdfInSystemViewer()) {
|
||||
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
|
||||
DownloadItemModel(download_item_)
|
||||
@@ -375,7 +375,7 @@ Browser* DownloadCommands::GetBrowser()
|
||||
@@ -376,7 +376,7 @@ Browser* DownloadCommands::GetBrowser()
|
||||
return browser_displayer.browser();
|
||||
}
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
|||
bool DownloadCommands::IsDownloadPdf() const {
|
||||
base::FilePath path = download_item_->GetTargetFilePath();
|
||||
return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
|
||||
@@ -392,7 +392,7 @@ bool DownloadCommands::CanOpenPdfInSyste
|
||||
@@ -393,7 +393,7 @@ bool DownloadCommands::CanOpenPdfInSyste
|
||||
return IsDownloadPdf() &&
|
||||
(IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
|
||||
: true);
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue