svn commit: r387371 - in head/www/chromium: . files
Rene Ladan
rene at FreeBSD.org
Mon May 25 09:35:31 UTC 2015
Author: rene
Date: Mon May 25 09:35:20 2015
New Revision: 387371
URL: https://svnweb.freebsd.org/changeset/ports/387371
Log:
www/chromium: update to 43.0.2357.65
There are some rough edges, e.g. gmail.com crashes with the EFF Privacy Badger
plugin installed.
Submitted by: LeFroid
Obtained from: https://github.com/Lefrid/chromium
MFH: 2015Q2
Security: http://vuxml.freebsd.org/freebsd/a9d456b4-fe4c-11e4-ad15-00262d5ed8ee.html
Added:
head/www/chromium/files/patch-base__process__memory.cc (contents, props changed)
head/www/chromium/files/patch-base__process__process_posix.cc (contents, props changed)
head/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__defaults.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__download__download_commands.h (contents, props changed)
head/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__sync__profile_sync_components_factory_impl.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__ui__browser.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__ui__exclusive_access__exclusive_access_bubble.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views_aura.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__ui__views__frame__system_menu_model_builder.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_frame_view.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc (contents, props changed)
head/www/chromium/files/patch-chrome__browser__ui__views__panels__panel_frame_view.cc (contents, props changed)
head/www/chromium/files/patch-chrome__common__extensions__command.cc (contents, props changed)
head/www/chromium/files/patch-content__renderer__devtools__v8_sampling_profiler.cc (contents, props changed)
head/www/chromium/files/patch-content__renderer__render_thread_impl.cc (contents, props changed)
head/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.h (contents, props changed)
head/www/chromium/files/patch-content__renderer__webscrollbarbehavior_impl_gtkoraura.cc (contents, props changed)
head/www/chromium/files/patch-content__shell__browser__shell_browser_context.cc (contents, props changed)
head/www/chromium/files/patch-content__shell__browser__shell_browser_main_parts.cc (contents, props changed)
head/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_egl.cc (contents, props changed)
head/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc (contents, props changed)
head/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.cc (contents, props changed)
head/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.h (contents, props changed)
head/www/chromium/files/patch-net__net_common.gypi (contents, props changed)
head/www/chromium/files/patch-ui__accessibility__accessibility.gyp (contents, props changed)
head/www/chromium/files/patch-ui__accessibility__platform__ax_platform_node.cc (contents, props changed)
head/www/chromium/files/patch-ui__app_list__app_list_menu.cc (contents, props changed)
head/www/chromium/files/patch-ui__app_list__views__app_list_view.cc (contents, props changed)
head/www/chromium/files/patch-ui__base__ime__input_method_initializer.cc (contents, props changed)
head/www/chromium/files/patch-ui__base__resource__resource_bundle.cc (contents, props changed)
head/www/chromium/files/patch-ui__base__web_ui_util.cc (contents, props changed)
head/www/chromium/files/patch-ui__events__keycodes__dom4__keycode_converter.cc (contents, props changed)
head/www/chromium/files/patch-ui__gfx__canvas_skia.cc (contents, props changed)
head/www/chromium/files/patch-ui__gl__gl_surface_glx.cc (contents, props changed)
head/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc (contents, props changed)
head/www/chromium/files/patch-ui__message_center__message_center_style.h (contents, props changed)
head/www/chromium/files/patch-ui__message_center__views__message_center_button_bar.cc (contents, props changed)
head/www/chromium/files/patch-ui__message_center__views__message_center_button_bar.h (contents, props changed)
head/www/chromium/files/patch-ui__message_center__views__message_center_view.cc (contents, props changed)
head/www/chromium/files/patch-ui__message_center__views__notification_view.cc (contents, props changed)
head/www/chromium/files/patch-ui__views__accessibility__native_view_accessibility.cc (contents, props changed)
head/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc (contents, props changed)
head/www/chromium/files/patch-ui__views__controls__menu__menu_scroll_view_container.cc (contents, props changed)
head/www/chromium/files/patch-ui__views__controls__scrollbar__base_scroll_bar.cc (contents, props changed)
head/www/chromium/files/patch-ui__views__controls__textfield__textfield.cc (contents, props changed)
head/www/chromium/files/patch-ui__views__examples__widget_example.cc (contents, props changed)
head/www/chromium/files/patch-ui__views__views_switches.cc (contents, props changed)
head/www/chromium/files/patch-ui__views__window__dialog_delegate.cc (contents, props changed)
Deleted:
head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h
head/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc
head/www/chromium/files/patch-chrome__test__perf__perf_test.cc
head/www/chromium/files/patch-chrome__tools__build__linux__sed.sh
head/www/chromium/files/patch-device__hid__hid_service.cc
head/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc
head/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc
Modified:
head/www/chromium/Makefile
head/www/chromium/distinfo
head/www/chromium/files/extra-patch-clang
head/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc
head/www/chromium/files/patch-base__process__launch.cc
head/www/chromium/files/patch-base__process__launch.h
head/www/chromium/files/patch-base__threading__platform_thread_linux.cc
head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc
head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
head/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc
head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc
head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
head/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc
head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
head/www/chromium/files/patch-content__browser__child_process_launcher.cc
head/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc
head/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc
head/www/chromium/files/patch-media__media.gyp
head/www/chromium/files/patch-net__net.gyp
head/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
head/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
head/www/chromium/pkg-plist
Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/Makefile Mon May 25 09:35:20 2015 (r387371)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 42.0.2311.135
+PORTVERSION= 43.0.2357.65
CATEGORIES= www
MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -13,7 +13,7 @@ COMMENT= Google web browser based on Web
LICENSE= BSD3CLAUSE LGPL21 MPL
LICENSE_COMB= multi
-CFLAGS+= -isystem${LOCALBASE}/include
+CFLAGS+= -isystem${LOCALBASE}/include -I${PREFIX}/include/atk-1.0
BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
bash:${PORTSDIR}/shells/bash \
@@ -62,7 +62,7 @@ CPE_VENDOR= google
CPE_PRODUCT= chrome
USE_PERL5= build
USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst
-USE_GNOME= glib20 gtk20 dconf libxslt
+USE_GNOME= atk glib20 gtk20 dconf libxslt
SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper
ALL_TARGET= chrome
INSTALLS_ICONS= yes
@@ -272,7 +272,7 @@ pre-configure:
'third_party/cld' \
'third_party/cros_system_api' \
'third_party/dom_distiller_js' \
- 'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \
+ 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
'third_party/ffmpeg' \
'third_party/gardiner_mod' \
'third_party/fips181' \
Modified: head/www/chromium/distinfo
==============================================================================
--- head/www/chromium/distinfo Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/distinfo Mon May 25 09:35:20 2015 (r387371)
@@ -1,4 +1,4 @@
-SHA256 (chromium-42.0.2311.135.tar.xz) = c269d40e653794c219fd3eca2922d881199af5acff5d0a55b3e79f3b6a5a2aa9
-SIZE (chromium-42.0.2311.135.tar.xz) = 306488116
-SHA256 (chromium-42.0.2311.135-testdata.tar.xz) = 357dd7bdb6365f4163b2d6e58e8677561a9f4d6c8e6f106ca95ac083a6eb0ef8
-SIZE (chromium-42.0.2311.135-testdata.tar.xz) = 115723572
+SHA256 (chromium-43.0.2357.65.tar.xz) = 3f8f87d982b5ee14862e49dcfa44e02009e401cb29f9758e253f9fd952c57eed
+SIZE (chromium-43.0.2357.65.tar.xz) = 309208380
+SHA256 (chromium-43.0.2357.65-testdata.tar.xz) = 4f05486ac73fc80c4c8a55d32fcdcd963f1661a0180a57899795a86957cb2150
+SIZE (chromium-43.0.2357.65-testdata.tar.xz) = 114556816
Modified: head/www/chromium/files/extra-patch-clang
==============================================================================
--- head/www/chromium/files/extra-patch-clang Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/extra-patch-clang Mon May 25 09:35:20 2015 (r387371)
@@ -86,15 +86,6 @@
EXPECT_EQ(data->run_duration_sum(), 0);
EXPECT_EQ(data->run_duration_sample(), 0);
EXPECT_EQ(data->queue_duration_sum(), 0);
-@@ -489,7 +489,7 @@
- Location location(kFunction, kFile, kLineNumber, NULL);
- // Do not delete |birth|. We don't own it.
- Births* birth = ThreadData::TallyABirthIfActive(location);
-- EXPECT_NE(reinterpret_cast<Births*>(NULL), birth);
-+ EXPECT_NE(static_cast<Births*>(NULL), birth);
-
- const unsigned int kTimePosted = 1;
- const unsigned int kStartOfRun = 5;
--- chrome/browser/sync/glue/synced_session_tracker.cc 2015-04-15 00:18:50.000000000 +0200
+++ chrome/browser/sync/glue/synced_session_tracker.cc 2015-04-18 22:02:15.000000000 +0200
@@ -260,7 +260,7 @@
@@ -224,7 +215,7 @@
--- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-04-15 00:32:17.000000000 +0200
+++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-04-18 22:13:27.000000000 +0200
-@@ -1754,7 +1754,7 @@
+@@ -961,7 +961,7 @@
const AudioEncoder* AudioCodingImpl::GetSenderInfo() const {
FATAL() << "Not implemented yet.";
@@ -233,7 +224,7 @@
}
const CodecInst* AudioCodingImpl::GetSenderCodecInst() {
-@@ -1773,7 +1773,7 @@
+@@ -980,7 +980,7 @@
const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const {
FATAL() << "Not implemented yet.";
Modified: head/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc
==============================================================================
--- head/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc Mon May 25 09:35:20 2015 (r387371)
@@ -1,8 +1,8 @@
---- base/posix/unix_domain_socket_linux.cc.orig 2014-10-10 08:54:09 UTC
-+++ base/posix/unix_domain_socket_linux.cc
-@@ -18,6 +18,15 @@
- #include "base/posix/eintr_wrapper.h"
- #include "base/stl_util.h"
+--- base/posix/unix_domain_socket_linux.cc.orig 2015-05-13 18:23:01.000000000 -0400
++++ base/posix/unix_domain_socket_linux.cc 2015-05-20 09:09:12.131544000 -0400
+@@ -21,6 +21,15 @@
+ #include <sys/uio.h>
+ #endif
+#if defined(__FreeBSD__)
+// Port over Linux ucred structure
@@ -15,8 +15,8 @@
+
const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
- // Creates a connected pair of UNIX-domain SOCK_SEQPACKET sockets, and passes
-@@ -35,7 +44,13 @@
+ #if !defined(OS_NACL_NONSFI)
+@@ -39,7 +48,13 @@
// static
bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
const int enable = 1;
@@ -28,17 +28,17 @@
return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0;
+#endif
}
+ #endif // !defined(OS_NACL_NONSFI)
- // static
-@@ -131,7 +146,11 @@
- wire_fds_len = payload_len / sizeof(int);
- }
+@@ -145,7 +160,11 @@
+ // The PNaCl toolchain for Non-SFI binary build does not support
+ // SCM_CREDENTIALS.
if (cmsg->cmsg_level == SOL_SOCKET &&
+#if defined(__FreeBSD__)
+ 1) { // XXX(rene) carpet getting full ...
+#else
cmsg->cmsg_type == SCM_CREDENTIALS) {
+#endif
- DCHECK(payload_len == sizeof(struct ucred));
- DCHECK(pid == -1);
+ DCHECK_EQ(payload_len, sizeof(struct ucred));
+ DCHECK_EQ(pid, -1);
pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid;
Modified: head/www/chromium/files/patch-base__process__launch.cc
==============================================================================
--- head/www/chromium/files/patch-base__process__launch.cc Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/patch-base__process__launch.cc Mon May 25 09:35:20 2015 (r387371)
@@ -1,6 +1,6 @@
---- base/process/launch.cc.orig 2015-04-18 22:25:46.000000000 +0200
-+++ base/process/launch.cc 2015-04-18 22:26:32.000000000 +0200
-@@ -24,10 +24,10 @@
+--- base/process/launch.cc.orig 2015-05-13 18:23:01.000000000 -0400
++++ base/process/launch.cc 2015-05-20 09:12:01.335764000 -0400
+@@ -24,11 +24,11 @@
fds_to_remap(NULL),
maximize_rlimits(NULL),
new_process_group(false)
@@ -8,6 +8,7 @@
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
, clone_flags(0)
, allow_new_privs(false)
+ , kill_on_parent_death(false)
-#endif // OS_LINUX
+#endif // OS_LINUX || OS_FREEBSD
#if defined(OS_POSIX)
Modified: head/www/chromium/files/patch-base__process__launch.h
==============================================================================
--- head/www/chromium/files/patch-base__process__launch.h Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/patch-base__process__launch.h Mon May 25 09:35:20 2015 (r387371)
@@ -1,5 +1,5 @@
---- base/process/launch.h.orig 2015-04-18 22:29:06.000000000 +0200
-+++ base/process/launch.h 2015-04-18 22:30:09.000000000 +0200
+--- base/process/launch.h.orig 2015-05-13 18:23:01.000000000 -0400
++++ base/process/launch.h 2015-05-20 09:13:38.326203000 -0400
@@ -131,7 +131,7 @@
// will be the same as its pid.
bool new_process_group;
@@ -9,10 +9,10 @@
// If non-zero, start the process using clone(), using flags as provided.
// Unlike in clone, clone_flags may not contain a custom termination signal
// that is sent to the parent when the child dies. The termination signal will
-@@ -141,7 +141,7 @@
- // By default, child processes will have the PR_SET_NO_NEW_PRIVS bit set. If
- // true, then this bit will not be set in the new child process.
- bool allow_new_privs;
+@@ -144,7 +144,7 @@
+
+ // Sets parent process death signal to SIGKILL.
+ bool kill_on_parent_death;
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_FREEBSD)
Added: head/www/chromium/files/patch-base__process__memory.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base__process__memory.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,39 @@
+--- base/process/memory.cc.orig 2015-05-21 15:20:26.547966000 -0400
++++ base/process/memory.cc 2015-05-21 15:24:31.421919000 -0400
+@@ -45,4 +45,36 @@
+
+ #endif
+
++#if defined(OS_FREEBSD)
++
++#if defined(USE_TCMALLOC)
++// Used by UncheckedMalloc. If tcmalloc is linked to the executable
++// this will be replaced by a strong symbol that actually implement
++// the semantics and don't call new handler in case the allocation fails.
++extern "C" {
++
++__attribute__((weak, visibility("default")))
++void* tc_malloc_skip_new_handler_weak(size_t size);
++
++void* tc_malloc_skip_new_handler_weak(size_t size) {
++ return malloc(size);
++}
++
++}
++#endif
++
++bool UncheckedMalloc(size_t size, void** result) {
++#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || \
++ (!defined(LIBC_GLIBC) && !defined(USE_TCMALLOC))
++ *result = malloc(size);
++#elif defined(LIBC_GLIBC) && !defined(USE_TCMALLOC)
++ *result = __libc_malloc(size);
++#elif defined(USE_TCMALLOC)
++ *result = tc_malloc_skip_new_handler_weak(size);
++#endif
++ return *result != NULL;
++}
++
++#endif // defined(OS_FREEBSD)
++
+ } // namespace base
Added: head/www/chromium/files/patch-base__process__process_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-base__process__process_posix.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,13 @@
+--- base/process/process_posix.cc.orig 2015-05-20 21:26:57.068650000 -0400
++++ base/process/process_posix.cc 2015-05-20 21:25:28.077153000 -0400
+@@ -17,6 +17,10 @@
+ #include <sys/event.h>
+ #endif
+
++#if defined(OS_BSD)
++#include <signal.h>
++#endif
++
+ namespace {
+
+ #if !defined(OS_NACL_NONSFI)
Modified: head/www/chromium/files/patch-base__threading__platform_thread_linux.cc
==============================================================================
--- head/www/chromium/files/patch-base__threading__platform_thread_linux.cc Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/patch-base__threading__platform_thread_linux.cc Mon May 25 09:35:20 2015 (r387371)
@@ -1,16 +1,16 @@
---- base/threading/platform_thread_linux.cc.orig 2014-10-10 08:54:09 UTC
-+++ base/threading/platform_thread_linux.cc
-@@ -16,7 +16,9 @@
- #include "base/tracked_objects.h"
+--- base/threading/platform_thread_linux.cc.orig 2015-05-13 18:35:44.000000000 -0400
++++ base/threading/platform_thread_linux.cc 2015-05-20 09:16:20.394597000 -0400
+@@ -15,7 +15,9 @@
#if !defined(OS_NACL)
+ #include <pthread.h>
+#if !defined(OS_BSD)
#include <sys/prctl.h>
+#endif
- #include <sys/resource.h>
- #include <sys/syscall.h>
- #include <sys/time.h>
-@@ -50,7 +52,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #endif
+@@ -74,7 +76,7 @@
ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
tracked_objects::ThreadData::InitializeThreadContext(name);
Added: head/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,13 @@
+--- cc/layers/scrollbar_layer_impl_base.cc.orig 2015-05-21 08:37:56.037399000 -0400
++++ cc/layers/scrollbar_layer_impl_base.cc 2015-05-21 08:38:18.153818000 -0400
+@@ -226,8 +226,8 @@
+ int thumb_offset = TrackStart();
+ if (maximum_ > 0) {
+ float ratio = clamped_current_pos / maximum_;
+- float max_offset = track_length - thumb_length;
+- thumb_offset += static_cast<int>(ratio * max_offset);
++ float max_offset_ = track_length - thumb_length;
++ thumb_offset += static_cast<int>(ratio * max_offset_);
+ }
+
+ float thumb_thickness_adjustment =
Added: head/www/chromium/files/patch-chrome__browser__defaults.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__defaults.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,11 @@
+--- chrome/browser/defaults.cc.orig 2015-04-14 18:31:21.000000000 -0400
++++ chrome/browser/defaults.cc 2015-04-28 10:13:50.737855000 -0400
+@@ -41,7 +41,7 @@
+ const bool kShowOtherBrowsersInAboutMemory = true;
+ #endif
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ const bool kScrollEventChangesTab = true;
+ #else
+ const bool kScrollEventChangesTab = false;
Added: head/www/chromium/files/patch-chrome__browser__download__download_commands.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__download__download_commands.h Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,12 @@
+--- chrome/browser/download/download_commands.h.orig 2015-05-21 11:39:00.521239000 -0400
++++ chrome/browser/download/download_commands.h 2015-05-21 11:39:40.015902000 -0400
+@@ -41,7 +41,8 @@
+ void ExecuteCommand(Command command);
+
+ #if defined(OS_WIN) || defined(OS_LINUX) || \
+- (defined(OS_MACOSX) && !defined(OS_IOS))
++ defined(OS_BSD) || (defined(OS_MACOSX) && \
++ !defined(OS_IOS))
+ bool IsDownloadPdf() const;
+ bool CanOpenPdfInSystemViewer() const;
+ #endif
Modified: head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc Mon May 25 09:35:20 2015 (r387371)
@@ -1,37 +1,11 @@
---- chrome/browser/download/download_shelf_context_menu.cc.orig 2015-04-18 23:29:54.000000000 +0200
-+++ chrome/browser/download/download_shelf_context_menu.cc 2015-04-18 23:31:51.000000000 +0200
-@@ -122,7 +122,7 @@
- return download_item_->GetOpenWhenComplete() ||
- download_crx_util::IsExtensionDownload(*download_item_);
- case ALWAYS_OPEN_TYPE:
--#if defined(OS_WIN) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
- (defined(OS_MACOSX) && !defined(OS_IOS))
- if (CanOpenPdfInSystemViewer()) {
- DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
-@@ -162,7 +162,7 @@
- bool is_checked = IsCommandIdChecked(ALWAYS_OPEN_TYPE);
- DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
- download_item_->GetBrowserContext());
--#if defined(OS_WIN) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
- (defined(OS_MACOSX) && !defined(OS_IOS))
- if (CanOpenPdfInSystemViewer()) {
- prefs->SetShouldOpenPdfInSystemReader(!is_checked);
-@@ -392,14 +392,14 @@
- return IsAdobeReaderDefaultPDFViewer()
- ? IDS_DOWNLOAD_MENU_ALWAYS_OPEN_PDF_IN_READER
- : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
+--- chrome/browser/download/download_shelf_context_menu.cc.orig 2015-05-13 18:23:03.000000000 -0400
++++ chrome/browser/download/download_shelf_context_menu.cc 2015-05-20 09:21:47.075399000 -0400
+@@ -143,7 +143,7 @@
+ : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
+ break;
+ }
-#elif defined(OS_MACOSX) || defined(OS_LINUX)
+#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- if (CanOpenPdfInSystemViewer())
- return IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
- #endif
- return IDS_DOWNLOAD_MENU_ALWAYS_OPEN_TYPE;
- }
-
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- bool DownloadShelfContextMenu::IsDownloadPdf() const {
- base::FilePath path = download_item_->GetTargetFilePath();
- return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
+ if (can_open_pdf_in_system_viewer) {
+ id = IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
+ break;
Modified: head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc Mon May 25 09:35:20 2015 (r387371)
@@ -1,14 +1,15 @@
---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-10-10 08:54:10 UTC
-+++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
-@@ -33,9 +33,11 @@
+--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2015-05-13 18:23:03.000000000 -0400
++++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2015-05-20 09:48:32.273240000 -0400
+@@ -37,10 +37,12 @@
// 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.
+#if !defined(OS_FREEBSD)
- CreateMTPDeviceAsyncDelegate(device_location,
+ CreateMTPDeviceAsyncDelegate(
+ device_location, read_only,
base::Bind(&MTPDeviceMapService::AddAsyncDelegate,
- base::Unretained(this), device_location));
+ base::Unretained(this), device_location, read_only));
+#endif
- mtp_device_usage_map_[device_location] = 0;
+ mtp_device_usage_map_[key] = 0;
}
Added: head/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,16 @@
+--- chrome/browser/metrics/drive_metrics_provider_linux.cc.orig 2015-05-21 11:20:27.603865000 -0400
++++ chrome/browser/metrics/drive_metrics_provider_linux.cc 2015-05-21 11:22:16.773943000 -0400
+@@ -4,7 +4,13 @@
+
+ #include "chrome/browser/metrics/drive_metrics_provider.h"
+
++#if defined(OS_BSD)
++#include <sys/types.h>
++#define MAJOR(dev) major(dev)
++#define MINOR(dev) minor(dev)
++#else
+ #include <linux/kdev_t.h> // For MAJOR()/MINOR().
++#endif
+ #include <sys/stat.h>
+ #include <string>
+
Added: head/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,11 @@
+--- chrome/browser/net/cookie_store_util.cc.orig 2015-04-14 18:31:21.000000000 -0400
++++ chrome/browser/net/cookie_store_util.cc 2015-04-28 10:11:34.004175000 -0400
+@@ -120,7 +120,7 @@
+ new ChromeCookieMonsterDelegate(profile));
+ }
+
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ namespace {
+
+ // Use the operating system's mechanisms to encrypt cookies before writing
Modified: head/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc Mon May 25 09:35:20 2015 (r387371)
@@ -1,5 +1,5 @@
---- chrome/browser/renderer_preferences_util.cc.orig 2015-01-26 10:24:50 UTC
-+++ chrome/browser/renderer_preferences_util.cc
+--- chrome/browser/renderer_preferences_util.cc.orig 2015-05-13 18:35:45.000000000 -0400
++++ chrome/browser/renderer_preferences_util.cc 2015-05-20 09:51:41.644579000 -0400
@@ -13,7 +13,7 @@
#include "content/public/common/renderer_preferences.h"
#include "third_party/skia/include/core/SkColor.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"
-@@ -71,7 +71,7 @@
+@@ -84,7 +84,7 @@
prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;
#endif
@@ -27,12 +27,12 @@
views::LinuxUI* linux_ui = views::LinuxUI::instance();
if (linux_ui) {
if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-@@ -93,7 +93,7 @@
+@@ -106,7 +106,7 @@
}
#endif
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD)
CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params,
(gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(true), NULL)));
prefs->should_antialias_text = params.antialiasing;
Added: head/www/chromium/files/patch-chrome__browser__sync__profile_sync_components_factory_impl.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__sync__profile_sync_components_factory_impl.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,11 @@
+--- chrome/browser/sync/profile_sync_components_factory_impl.cc.orig 2015-04-14 18:31:21.000000000 -0400
++++ chrome/browser/sync/profile_sync_components_factory_impl.cc 2015-04-28 10:10:08.900489000 -0400
+@@ -396,7 +396,7 @@
+ }
+ #endif
+
+-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ // Dictionary sync is enabled by default.
+ if (!disabled_types.Has(syncer::DICTIONARY)) {
+ pss->RegisterDataTypeController(
Modified: head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc Mon May 25 09:35:20 2015 (r387371)
@@ -1,6 +1,15 @@
---- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc.orig 2015-01-26 10:30:44
-+++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
-@@ -128,7 +128,7 @@
+--- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc.orig 2015-05-13 18:23:04.000000000 -0400
++++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc 2015-05-21 11:12:51.226717000 -0400
+@@ -19,7 +19,7 @@
+ #include "ui/gfx/screen.h"
+ #include "ui/views/widget/native_widget_aura.h"
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ #include "base/prefs/pref_service.h"
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/common/pref_names.h"
+@@ -137,7 +137,7 @@
}
void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
@@ -9,7 +18,7 @@
// Now that we have some minimal ui initialized, check to see if we're
// running as root and bail if we are.
DetectRunningAsRoot();
-@@ -142,7 +142,7 @@
+@@ -151,7 +151,7 @@
// after the metrics service is deleted.
}
@@ -17,4 +26,4 @@
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
void ChromeBrowserMainExtraPartsAura::DetectRunningAsRoot() {
if (getuid() == 0) {
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
Added: head/www/chromium/files/patch-chrome__browser__ui__browser.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__browser.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/browser.cc.orig 2015-04-14 18:31:21.000000000 -0400
++++ chrome/browser/ui/browser.cc 2015-04-28 10:02:57.120071000 -0400
+@@ -1284,7 +1284,7 @@
+ window_has_shown_ = true;
+
+ // CurrentProcessInfo::CreationTime() is missing on some platforms.
+-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ // Measure the latency from startup till the first browser window becomes
+ // visible.
+ static bool is_first_browser_window = true;
+@@ -1300,7 +1300,7 @@
+ base::Time::Now() - process_creation_time);
+ }
+ }
+-#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
++#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+
+ // Nothing to do for non-tabbed windows.
+ if (!is_type_tabbed())
Added: head/www/chromium/files/patch-chrome__browser__ui__exclusive_access__exclusive_access_bubble.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__exclusive_access__exclusive_access_bubble.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2015-04-14 18:31:21.000000000 -0400
++++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc 2015-04-28 10:00:47.585758000 -0400
+@@ -18,7 +18,7 @@
+
+ // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
+ // here.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ const int ExclusiveAccessBubble::kPaddingPx = 8;
+ #else
+ const int ExclusiveAccessBubble::kPaddingPx = 15;
Added: head/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig 2015-04-14 18:31:21.000000000 -0400
++++ chrome/browser/ui/toolbar/wrench_menu_model.cc 2015-04-28 09:58:56.258305000 -0400
+@@ -762,7 +762,7 @@
+ #endif
+ case IDC_UPGRADE_DIALOG:
+ return UpgradeDetector::GetInstance()->notify_upgrade();
+-#if !defined(OS_LINUX) || defined(USE_AURA)
++#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA)
+ case IDC_BOOKMARK_PAGE:
+ return !chrome::ShouldRemoveBookmarkThisPageUI(browser_->profile());
+ case IDC_BOOKMARK_ALL_TABS:
Added: head/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views_aura.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views_aura.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2015-05-20 09:55:54.547216000 -0400
++++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc 2015-05-20 09:56:51.726483000 -0400
+@@ -34,7 +34,7 @@
+ #include "ash/shell_window_ids.h"
+ #endif
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "chrome/browser/shell_integration_linux.h"
+ #endif
+
+@@ -122,7 +122,7 @@
+ const AppWindow::CreateParams& create_params,
+ views::Widget::InitParams* init_params,
+ views::Widget* widget) {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ std::string app_name = web_app::GenerateApplicationNameFromExtensionId(
+ app_window()->extension_id());
+ // Set up a custom WM_CLASS for app windows. This allows task switchers in
Added: head/www/chromium/files/patch-chrome__browser__ui__views__frame__system_menu_model_builder.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__views__frame__system_menu_model_builder.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2015-04-14 18:18:50.000000000 -0400
++++ chrome/browser/ui/views/frame/system_menu_model_builder.cc 2015-04-28 09:50:22.925763000 -0400
+@@ -65,7 +65,7 @@
+ model->AddSeparator(ui::NORMAL_SEPARATOR);
+ model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
+ }
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ model->AddSeparator(ui::NORMAL_SEPARATOR);
+ model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
+ IDS_SHOW_WINDOW_DECORATIONS_MENU);
+@@ -103,7 +103,7 @@
+ model->AddSeparator(ui::NORMAL_SEPARATOR);
+ model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
+ }
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ model->AddSeparator(ui::NORMAL_SEPARATOR);
+ model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE);
+ #endif
Added: head/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_frame_view.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_frame_view.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig 2015-04-28 09:47:57.763176000 -0400
++++ chrome/browser/ui/views/message_center/message_center_frame_view.cc 2015-04-28 09:48:19.225959000 -0400
+@@ -13,7 +13,7 @@
+ namespace message_center {
+
+ MessageCenterFrameView::MessageCenterFrameView() {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ const int kBorderWidth = 1;
+ SetBorder(views::Border::CreateSolidBorder(
+ kBorderWidth, message_center::kMessageCenterBorderColor));
Added: head/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/message_center/message_center_widget_delegate.cc.orig 2015-04-14 18:18:50.000000000 -0400
++++ chrome/browser/ui/views/message_center/message_center_widget_delegate.cc 2015-04-28 09:46:29.443573000 -0400
+@@ -97,7 +97,7 @@
+ // immediately after the mouse exists from the bubble, which is a really bad
+ // experience. Disable hiding until the bug around the focus is fixed.
+ // TODO(erg, pkotwicz): fix the activation issue and then remove this ifdef.
+-#if !defined(OS_LINUX)
++#if !defined(OS_LINUX) || !defined(OS_BSD)
+ if (!active) {
+ tray_->SendHideMessageCenter();
+ }
Added: head/www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/message_center/web_notification_tray.cc.orig 2015-04-28 09:44:00.558139000 -0400
++++ chrome/browser/ui/views/message_center/web_notification_tray.cc 2015-04-28 09:44:33.539806000 -0400
+@@ -31,7 +31,7 @@
+ #include "ui/strings/grit/ui_strings.h"
+ #include "ui/views/widget/widget.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/environment.h"
+ #include "base/nix/xdg_util.h"
+ #endif
+@@ -66,7 +66,7 @@
+ }
+
+ bool CanDestroyStatusIcon() {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Avoid creating multiple system tray icons on KDE4 and newer versions of KDE
+ // because the OS does not support removing system tray icons.
+ // TODO(pkotwicz): This is a hack for the sake of M40. Fix this properly.
Added: head/www/chromium/files/patch-chrome__browser__ui__views__panels__panel_frame_view.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__views__panels__panel_frame_view.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/panels/panel_frame_view.cc.orig 2015-04-28 09:42:09.840501000 -0400
++++ chrome/browser/ui/views/panels/panel_frame_view.cc 2015-04-28 09:42:33.023800000 -0400
+@@ -581,7 +581,7 @@
+ }
+
+ bool PanelFrameView::OnMouseDragged(const ui::MouseEvent& event) {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // Converting the mouse location to screen coordinates returns an incorrect
+ // location while the panel is moving. See crbug.com/353393 for more details.
+ // TODO(pkotwicz): Fix conversion to screen coordinates
Modified: head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
==============================================================================
--- head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Mon May 25 09:35:20 2015 (r387371)
@@ -1,6 +1,6 @@
--- chrome/chrome_browser_ui.gypi.orig 2014-10-10 09:15:30 UTC
+++ chrome/chrome_browser_ui.gypi
-@@ -2743,7 +2743,7 @@
+@@ -2875,7 +2875,7 @@
}],
],
}],
@@ -9,7 +9,7 @@
'dependencies': [
# gtk2 is the only component that can interact with gtk2 in our new
# world.
-@@ -2751,7 +2751,7 @@
+@@ -2883,7 +2883,7 @@
'../build/linux/system.gyp:gio',
],
}],
@@ -18,8 +18,8 @@
'sources': [ '<@(chrome_browser_ui_desktop_sources)' ],
}],
['use_aura==1', {
-@@ -2788,7 +2788,7 @@
- ['enable_printing==1', {
+@@ -2918,7 +2918,7 @@
+ ['enable_print_preview==1', {
'sources': [ '<@(chrome_browser_ui_print_preview_sources)' ],
}],
- ['OS=="linux" or OS=="android"', {
@@ -27,8 +27,12 @@
'sources': [ '<@(chrome_browser_ui_android_linux_sources)' ],
}],
['OS=="android"', {
-@@ -2907,7 +2907,7 @@
- ['desktop_linux==1', {
+@@ -3030,10 +3030,10 @@
+ }],
+ ],
+ }],
+- ['desktop_linux==1', {
++ ['desktop_linux==1 or os_bsd==1', {
'sources': [ '<@(chrome_browser_ui_desktop_linux_sources)' ],
}],
- ['OS=="linux"', { # Both desktop Linux and ChromeOS.
Added: head/www/chromium/files/patch-chrome__common__extensions__command.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__common__extensions__command.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,11 @@
+--- chrome/common/extensions/command.cc.orig 2015-04-14 18:18:50.000000000 -0400
++++ chrome/common/extensions/command.cc 2015-04-28 09:31:06.624015000 -0400
+@@ -301,7 +301,7 @@
+ return values::kKeybindingPlatformMac;
+ #elif defined(OS_CHROMEOS)
+ return values::kKeybindingPlatformChromeOs;
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ return values::kKeybindingPlatformLinux;
+ #else
+ return "";
Modified: head/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc Mon May 25 09:35:20 2015 (r387371)
@@ -5,16 +5,16 @@
}
}
-#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
++#elif defined(OS_LINUX) || defined(OS_BSD)
void GetApplicationDirs(std::vector<base::FilePath>* locations) {
locations->push_back(base::FilePath("/opt/google/chrome"));
locations->push_back(base::FilePath("/usr/local/bin"));
-@@ -91,7 +91,7 @@
+@@ -92,7 +92,7 @@
+ #elif defined(OS_MACOSX)
base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"),
base::FilePath("Chromium.app/Contents/MacOS/Chromium")
- };
-#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
- base::FilePath browser_exes_array[] = {
++#elif defined(OS_LINUX) || defined(OS_BSD)
base::FilePath("google-chrome"),
base::FilePath("chrome"),
+ base::FilePath("chromium"),
Modified: head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
==============================================================================
--- head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc Mon May 25 09:35:20 2015 (r387371)
@@ -63,7 +63,7 @@
+ int exit_code = -1;
+ if (!process.WaitForExitWithTimeout(base::TimeDelta::FromMilliseconds(3000),
+ &exit_code)) {
-+ base::KillProcess(process.Handle(), -1, false);
++ process.Terminate(-1, false);
+ base::EnsureProcessTerminated(process.Pass());
+ return StorageMonitor::EJECT_FAILURE;
+ }
Modified: head/www/chromium/files/patch-content__browser__child_process_launcher.cc
==============================================================================
--- head/www/chromium/files/patch-content__browser__child_process_launcher.cc Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/patch-content__browser__child_process_launcher.cc Mon May 25 09:35:20 2015 (r387371)
@@ -1,60 +1,6 @@
---- content/browser/child_process_launcher.cc.orig 2015-04-19 00:30:35.000000000 +0200
-+++ content/browser/child_process_launcher.cc 2015-04-19 00:43:33.000000000 +0200
-@@ -120,7 +120,7 @@
- // Notifies the client about the result of the operation.
- // Runs on the UI thread.
- void Notify(
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- bool zygote,
- #endif
- base::Process process);
-@@ -131,7 +131,7 @@
- bool background);
-
- static void TerminateInternal(
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- bool zygote,
- #endif
- base::Process process);
-@@ -144,7 +144,7 @@
- #if defined(OS_ANDROID)
- // The fd to close after creating the process.
- base::ScopedFD ipcfd_;
--#elif defined(OS_POSIX) && !defined(OS_MACOSX)
-+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- bool zygote_;
- #endif
- bool starting_;
-@@ -158,7 +158,7 @@
- client_thread_id_(BrowserThread::UI),
- termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION),
- exit_code_(RESULT_CODE_NORMAL_EXIT),
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- zygote_(false),
- #endif
- starting_(true),
-@@ -238,7 +238,7 @@
- }
-
- void ChildProcessLauncher::Context::UpdateTerminationStatus(bool known_dead) {
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- if (zygote_) {
- termination_status_ = ZygoteHostImpl::GetInstance()->
- GetTerminationStatus(process_.Handle(), known_dead, &exit_code_);
-@@ -312,7 +312,7 @@
- bool launch_elevated = delegate->ShouldLaunchElevated();
- #elif defined(OS_ANDROID)
- // Uses |ipcfd_| instead of |ipcfd| on Android.
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- base::EnvironmentMap env = delegate->GetEnvironment();
- base::ScopedFD ipcfd = delegate->TakeIpcFd();
- #elif defined(OS_POSIX)
-@@ -366,7 +366,7 @@
+--- content/browser/child_process_launcher.cc.orig 2015-05-13 18:23:06.000000000 -0400
++++ content/browser/child_process_launcher.cc 2015-05-20 11:55:38.781168000 -0400
+@@ -157,7 +157,7 @@
// We need to close the client end of the IPC channel to reliably detect
// child termination.
@@ -63,7 +9,7 @@
GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
*cmd_line, child_process_id, files_to_register.get());
if (use_zygote) {
-@@ -375,14 +375,14 @@
+@@ -166,14 +166,14 @@
process = base::Process(handle);
} else
// Fall through to the normal posix case below when we're not zygoting.
@@ -80,7 +26,7 @@
if (process_type == switches::kRendererProcess) {
const int sandbox_fd =
RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
-@@ -390,7 +390,7 @@
+@@ -181,7 +181,7 @@
sandbox_fd,
GetSandboxFD()));
}
@@ -89,53 +35,8 @@
// Actually launch the app.
base::LaunchOptions options;
-@@ -446,7 +446,7 @@
- client_thread_id, FROM_HERE,
- base::Bind(&Context::Notify,
- this_object.get(),
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- use_zygote,
- #endif
- base::Passed(&process)));
-@@ -454,7 +454,7 @@
- }
-
- void ChildProcessLauncher::Context::Notify(
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- bool zygote,
- #endif
- base::Process process) {
-@@ -467,7 +467,7 @@
- if (!process_.IsValid())
- LOG(ERROR) << "Failed to launch child process";
-
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- zygote_ = zygote;
- #endif
- if (client_) {
-@@ -493,7 +493,7 @@
- BrowserThread::PostTask(
- BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
- base::Bind(&Context::TerminateInternal,
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- zygote_,
- #endif
- base::Passed(&process_)));
-@@ -511,7 +511,7 @@
-
- // static
- void ChildProcessLauncher::Context::TerminateInternal(
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- bool zygote,
- #endif
- base::Process process) {
-@@ -525,13 +525,13 @@
- process.Terminate(RESULT_CODE_NORMAL_EXIT);
+@@ -254,13 +254,13 @@
+ process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
// On POSIX, we must additionally reap the child.
#if defined(OS_POSIX)
-#if !defined(OS_MACOSX)
@@ -150,3 +51,30 @@
base::EnsureProcessTerminated(process.Pass());
#endif // OS_POSIX
#endif // defined(OS_ANDROID)
+@@ -351,7 +351,7 @@
+
+ void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) {
+ DCHECK(CalledOnValidThread());
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ if (zygote_) {
+ termination_status_ = ZygoteHostImpl::GetInstance()->
+ GetTerminationStatus(process_.Handle(), known_dead, &exit_code_);
+@@ -359,7 +359,7 @@
+ termination_status_ =
+ base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_);
+ } else {
+-#elif defined(OS_MACOSX)
++#elif defined(OS_MACOSX) || defined(OS_BSD)
+ if (known_dead) {
+ termination_status_ =
+ base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_);
+@@ -433,7 +433,7 @@
+ starting_ = false;
+ process_ = process.Pass();
+
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ zygote_ = zygote;
+ #endif
+ if (process_.IsValid()) {
Modified: head/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc
==============================================================================
--- head/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc Mon May 25 09:35:20 2015 (r387371)
@@ -1,5 +1,5 @@
---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2014-10-10 08:54:14 UTC
-+++ content/browser/gpu/gpu_data_manager_impl_private.cc
+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2015-05-13 18:35:46.000000000 -0400
++++ content/browser/gpu/gpu_data_manager_impl_private.cc 2015-05-20 11:59:04.537631000 -0400
@@ -471,7 +471,9 @@
gpu_info.gl_renderer = gl_renderer;
gpu_info.gl_version = gl_version;
@@ -10,7 +10,7 @@
UpdateGpuInfo(gpu_info);
UpdateGpuSwitchingManager(gpu_info);
-@@ -514,10 +516,12 @@
+@@ -513,10 +515,12 @@
// Also declare the driver_vendor to be osmesa to be able to specify
// exceptions based on driver_vendor==osmesa for some blacklist rules.
gpu_info.driver_vendor = gfx::kGLImplementationOSMesaName;
@@ -23,13 +23,13 @@
}
#if defined(ARCH_CPU_X86_FAMILY)
if (!gpu_info.gpu.vendor_id || !gpu_info.gpu.device_id) {
-@@ -569,7 +573,9 @@
- if (use_swiftshader_ || ShouldUseWarp())
+@@ -575,7 +579,9 @@
return;
+ bool was_info_available = IsCompleteGpuInfoAvailable();
+#ifndef __FreeBSD__
gpu::MergeGPUInfo(&gpu_info_, gpu_info);
+#endif
- if (IsCompleteGpuInfoAvailable())
+ if (IsCompleteGpuInfoAvailable()) {
complete_gpu_info_already_requested_ = true;
-
+ } else if (was_info_available) {
Added: head/www/chromium/files/patch-content__renderer__devtools__v8_sampling_profiler.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-content__renderer__devtools__v8_sampling_profiler.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,13 @@
+--- content/renderer/devtools/v8_sampling_profiler.cc.orig 2015-05-21 09:58:46.394686000 -0400
++++ content/renderer/devtools/v8_sampling_profiler.cc 2015-05-21 10:11:21.858314000 -0400
+@@ -534,6 +534,10 @@
+ state.pc = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rip, __eip));
+ state.sp = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rsp, __esp));
+ state.fp = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rbp, __ebp));
++#elif defined(OS_FREEBSD)
++ state.pc = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rip, mc_eip));
++ state.sp = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rsp, mc_esp));
++ state.fp = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rbp, mc_ebp));
+ #else
+ state.pc =
+ reinterpret_cast<void*>(mcontext.gregs[REG_64_32(REG_RIP, REG_EIP)]);
Added: head/www/chromium/files/patch-content__renderer__render_thread_impl.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-content__renderer__render_thread_impl.cc Mon May 25 09:35:20 2015 (r387371)
@@ -0,0 +1,11 @@
+--- content/renderer/render_thread_impl.cc.orig 2015-05-13 18:35:46.000000000 -0400
++++ content/renderer/render_thread_impl.cc 2015-05-20 15:46:14.175833000 -0400
+@@ -673,7 +673,7 @@
+ static_cast<unsigned>(compositor_raster_threads_.size() + 1))
+ .c_str()));
+ raster_thread->Start();
+-#if defined(OS_ANDROID) || defined(OS_LINUX)
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+ if (!command_line.HasSwitch(
+ switches::kUseNormalPriorityForTileTaskWorkerThreads)) {
+ raster_thread->SetThreadPriority(base::ThreadPriority::BACKGROUND);
Modified: head/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc
==============================================================================
--- head/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc Mon May 25 08:45:17 2015 (r387370)
+++ head/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc Mon May 25 09:35:20 2015 (r387371)
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig 2015-01-21 20:28:17 UTC
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list