mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

www/chromium: update to 43.0.2357.65

Browse Source 
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
This commit is contained in:
Rene Ladan 2015-05-25 09:35:20 +00:00
parent 9d20c046fd
commit f93a363e54
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=387371
82 changed files with 1137 additions and 402 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/chromium/Makefile
View File

@ -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 WebKit
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' \

8
www/chromium/distinfo
View File

@ -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

13
www/chromium/files/extra-patch-clang
View File

@ -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.";

26
www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc
View File

@ -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;

7
www/chromium/files/patch-base__process__launch.cc
View File

@ -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)

12
www/chromium/files/patch-base__process__launch.h
View File

@ -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)

39
www/chromium/files/patch-base__process__memory.cc Normal file
View File

@ -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

13
www/chromium/files/patch-base__process__process_posix.cc Normal file
View File

@ -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)

16
www/chromium/files/patch-base__threading__platform_thread_linux.cc
View File

@ -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);

13
www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc Normal file
View File

@ -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 =

11
www/chromium/files/patch-chrome__browser__defaults.cc Normal file
View File

@ -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;

12
www/chromium/files/patch-chrome__browser__download__download_commands.h Normal file
View File

@ -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

44
www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc
View File

@ -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;

11
www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h
View File

@ -1,11 +0,0 @@
--- chrome/browser/download/download_shelf_context_menu.h.orig 2015-01-24 22:48:53 UTC
+++ chrome/browser/download/download_shelf_context_menu.h
@@ -75,7 +75,7 @@
int GetAlwaysOpenStringId() const;
-#if defined(OS_WIN) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
(defined(OS_MACOSX) && !defined(OS_IOS))
bool IsDownloadPdf() const;
bool CanOpenPdfInSystemViewer() const;

13
www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
View File

@ -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;
}

16
www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc Normal file
View File

@ -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>

11
www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Normal file
View File

@ -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

12
www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc
View File

@ -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;

11
www/chromium/files/patch-chrome__browser__sync__profile_sync_components_factory_impl.cc Normal file
View File

@ -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(

19
www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc
View File

@ -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 =

20
www/chromium/files/patch-chrome__browser__ui__browser.cc Normal file
View File

@ -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())

11
www/chromium/files/patch-chrome__browser__ui__exclusive_access__exclusive_access_bubble.cc Normal file
View File

@ -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;

11
www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc Normal file
View File

@ -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:

20
www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc
View File

@ -1,20 +0,0 @@
--- chrome/browser/ui/views/apps/chrome_native_app_window_views.cc.orig 2014-10-10 09:15:30 UTC
+++ chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
@@ -29,7 +29,7 @@
#include "ui/wm/core/easy_resize_window_targeter.h"
#include "ui/wm/core/shadow_types.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "chrome/browser/shell_integration_linux.h"
#endif
@@ -219,7 +219,7 @@
init_params.visible_on_all_workspaces =
create_params.visible_on_all_workspaces;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
// Set up a custom WM_CLASS for app windows. This allows task switchers in
// X11 environments to distinguish them from main browser windows.
init_params.wm_class_name = web_app::GetWMClassFromAppName(app_name);

20
www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views_aura.cc Normal file
View File

@ -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

20
www/chromium/files/patch-chrome__browser__ui__views__frame__system_menu_model_builder.cc Normal file
View File

@ -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

11
www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_frame_view.cc Normal file
View File

@ -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));

11
www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc Normal file
View File

@ -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();
}

20
www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc Normal file
View File

@ -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.

11
www/chromium/files/patch-chrome__browser__ui__views__panels__panel_frame_view.cc Normal file
View File

@ -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

16
www/chromium/files/patch-chrome__chrome_browser_ui.gypi
View File

@ -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.

11
www/chromium/files/patch-chrome__common__extensions__command.cc Normal file
View File

@ -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 "";

10
www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc
View File

@ -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"),

11
www/chromium/files/patch-chrome__test__perf__perf_test.cc
View File

@ -1,11 +0,0 @@
--- chrome/test/perf/perf_test.cc.orig 2014-10-10 08:54:13 UTC
+++ chrome/test/perf/perf_test.cc
@@ -352,7 +352,7 @@
AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name,
total_working_set_size, "bytes",
false /* not important */);
-#elif defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_ANDROID)
+#elif defined(OS_POSIX) && !defined(OS_NACL)
AppendResult(output,
"vm_size_final_b",
std::string(),

8
www/chromium/files/patch-chrome__tools__build__linux__sed.sh
View File

@ -1,8 +0,0 @@
--- chrome/tools/build/linux/sed.sh.orig 2014-10-10 08:54:13 UTC
+++ chrome/tools/build/linux/sed.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be

2
www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
View File

@ -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;
+ }

140
www/chromium/files/patch-content__browser__child_process_launcher.cc
View File

@ -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()) {

14
www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc
View File

@ -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) {

13
www/chromium/files/patch-content__renderer__devtools__v8_sampling_profiler.cc Normal file
View File

@ -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)]);

11
www/chromium/files/patch-content__renderer__render_thread_impl.cc Normal file
View File

@ -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);

54
www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc
View File

@ -1,6 +1,6 @@
--- content/renderer/renderer_blink_platform_impl.cc.orig 2015-01-21 20:28:17 UTC
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -96,7 +96,7 @@
--- content/renderer/renderer_blink_platform_impl.cc.orig 2015-05-13 18:35:46.000000000 -0400
+++ content/renderer/renderer_blink_platform_impl.cc 2015-05-20 15:52:34.484662000 -0400
@@ -99,7 +99,7 @@
#if defined(OS_POSIX)
#include "base/file_descriptor_posix.h"
@ -9,30 +9,48 @@
#include <map>
#include <string>
@@ -190,7 +190,7 @@
@@ -189,7 +189,7 @@
scoped_refptr<ThreadSafeSender> thread_safe_sender_;
};
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_BSD)
// WebKit doesn't use WebSandboxSupport on android so we don't need to
// implement anything here.
class RendererBlinkPlatformImpl::SandboxSupport {};
@@ -293,7 +293,7 @@
-#if !defined(OS_ANDROID) && !defined(OS_WIN)
+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
class RendererBlinkPlatformImpl::SandboxSupport
: public blink::WebSandboxSupport {
public:
@@ -216,7 +216,7 @@
std::map<int32_t, blink::WebFallbackFont> unicode_font_families_;
#endif
};
-#endif // !defined(OS_ANDROID) && !defined(OS_WIN)
+#endif // !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
//------------------------------------------------------------------------------
@@ -232,7 +232,7 @@
plugin_refresh_allowed_(true),
default_task_runner_(renderer_scheduler->DefaultTaskRunner()),
web_scrollbar_behavior_(new WebScrollbarBehaviorImpl) {
-#if !defined(OS_ANDROID) && !defined(OS_WIN)
+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
if (g_sandbox_enabled && sandboxEnabled()) {
sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
} else {
@@ -289,7 +289,7 @@
}
blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_BSD)
// WebKit doesn't use WebSandboxSupport on android.
-#if defined(OS_ANDROID) || defined(OS_WIN)
+#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD)
// These platforms do not require sandbox support.
return NULL;
#else
@@ -583,7 +583,7 @@
@@ -557,7 +557,7 @@
return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
}
-#elif defined(OS_ANDROID)
+#elif defined(OS_ANDROID) || defined(OS_BSD)
-#elif defined(OS_POSIX) && !defined(OS_ANDROID)
+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
// WebKit doesn't use WebSandboxSupport on android so we don't need to
// implement anything here. This is cleaner to support than excluding the
void RendererBlinkPlatformImpl::SandboxSupport::getFallbackFontForCharacter(
blink::WebUChar32 character,

11
www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.h Normal file
View File

@ -0,0 +1,11 @@
--- content/renderer/renderer_blink_platform_impl.h.orig 2015-05-21 10:17:35.674995000 -0400
+++ content/renderer/renderer_blink_platform_impl.h 2015-05-21 10:17:56.809792000 -0400
@@ -218,7 +218,7 @@
class MimeRegistry;
scoped_ptr<MimeRegistry> mime_registry_;
-#if !defined(OS_ANDROID) && !defined(OS_WIN)
+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
class SandboxSupport;
scoped_ptr<SandboxSupport> sandbox_support_;
#endif

20
www/chromium/files/patch-content__renderer__webscrollbarbehavior_impl_gtkoraura.cc Normal file
View File

@ -0,0 +1,20 @@
--- content/renderer/webscrollbarbehavior_impl_gtkoraura.cc.orig 2015-04-14 18:18:54.000000000 -0400
+++ content/renderer/webscrollbarbehavior_impl_gtkoraura.cc 2015-04-28 09:19:06.077932000 -0400
@@ -13,7 +13,7 @@
blink::WebScrollbarBehavior::Button mouseButton,
bool shiftKeyPressed,
bool altKeyPressed) {
-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
if (mouseButton == blink::WebScrollbarBehavior::ButtonMiddle)
return true;
#endif
@@ -49,7 +49,7 @@
// On most platforms, we should snap iff the event is outside our calculated
// rect. On Linux, however, we should not snap for events off the ends, but
// not the sides, of the rect.
-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
return isHorizontal ?
(eventPoint.y < noSnapRect.y() || eventPoint.y >= noSnapRect.bottom()) :
(eventPoint.x < noSnapRect.x() || eventPoint.x >= noSnapRect.right());

20
www/chromium/files/patch-content__shell__browser__shell_browser_context.cc Normal file
View File

@ -0,0 +1,20 @@
--- content/shell/browser/shell_browser_context.cc.orig 2015-04-28 09:16:12.316318000 -0400
+++ content/shell/browser/shell_browser_context.cc 2015-04-28 09:16:42.961522000 -0400
@@ -19,7 +19,7 @@
#if defined(OS_WIN)
#include "base/base_paths_win.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
#include "base/nix/xdg_util.h"
#elif defined(OS_MACOSX)
#include "base/base_paths_mac.h"
@@ -74,7 +74,7 @@
#if defined(OS_WIN)
CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_));
path_ = path_.Append(std::wstring(L"content_shell"));
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
scoped_ptr<base::Environment> env(base::Environment::Create());
base::FilePath config_dir(
base::nix::GetXDGDirectory(env.get(),

20
www/chromium/files/patch-content__shell__browser__shell_browser_main_parts.cc Normal file
View File

@ -0,0 +1,20 @@
--- content/shell/browser/shell_browser_main_parts.cc.orig 2015-04-14 18:18:54.000000000 -0400
+++ content/shell/browser/shell_browser_main_parts.cc 2015-04-28 09:14:47.212411000 -0400
@@ -38,7 +38,7 @@
#if defined(USE_AURA) && defined(USE_X11)
#include "ui/events/devices/x11/touch_factory_x11.h"
#endif
-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX))
#include "ui/base/ime/input_method_initializer.h"
#endif
@@ -105,7 +105,7 @@
}
void ShellBrowserMainParts::PreEarlyInitialization() {
-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX))
ui::InitializeInputMethodForTesting();
#endif
#if defined(OS_ANDROID)

11
www/chromium/files/patch-device__hid__hid_service.cc
View File

@ -1,11 +0,0 @@
--- device/hid/hid_service.cc.orig 2014-10-14 17:38:39 UTC
+++ device/hid/hid_service.cc
@@ -15,7 +15,7 @@
#include "device/hid/hid_service_linux.h"
#elif defined(OS_MACOSX)
#include "device/hid/hid_service_mac.h"
-#else
+#elif !defined(OS_BSD)
#include "device/hid/hid_service_win.h"
#endif

28
www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_egl.cc Normal file
View File

@ -0,0 +1,28 @@
--- gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc.orig 2015-05-13 18:35:46.000000000 -0400
+++ gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc 2015-05-20 15:58:33.229171000 -0400
@@ -89,7 +89,7 @@
public:
TransferThread() : base::Thread(kAsyncTransferThreadName) {
Start();
-#if defined(OS_ANDROID) || defined(OS_LINUX)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
SetPriority(base::ThreadPriority::BACKGROUND);
#endif
}
@@ -465,14 +465,14 @@
void AsyncPixelTransferDelegateEGL::WaitForTransferCompletion() {
if (state_->TransferIsInProgress()) {
-#if defined(OS_ANDROID) || defined(OS_LINUX)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
g_transfer_thread.Pointer()->SetPriority(base::ThreadPriority::DISPLAY);
#endif
state_->WaitForTransferCompletion();
DCHECK(!state_->TransferIsInProgress());
-#if defined(OS_ANDROID) || defined(OS_LINUX)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
g_transfer_thread.Pointer()->SetPriority(base::ThreadPriority::BACKGROUND);
#endif
}

11
www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc Normal file
View File

@ -0,0 +1,11 @@
--- gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc.orig 2015-05-13 18:35:46.000000000 -0400
+++ gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc 2015-05-20 16:00:07.466335000 -0400
@@ -46,7 +46,7 @@
: base::Thread(kAsyncTransferThreadName),
initialized_(false) {
Start();
-#if defined(OS_ANDROID) || defined(OS_LINUX)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
SetPriority(base::ThreadPriority::BACKGROUND);
#endif
}

19
www/chromium/files/patch-media__media.gyp
View File

@ -1,7 +1,20 @@
--- media/media.gyp.orig 2014-10-10 09:15:31 UTC
+++ media/media.gyp
@@ -690,7 +690,7 @@
'audio/openbsd/audio_manager_openbsd.h',
@@ -760,6 +760,12 @@
['exclude', '_alsa\\.(h|cc)$'],
],
}],
+ ['OS=="freebsd"', {
+ 'sources!': [
+ 'video/capture/linux/v4l2_capture_delegate.cc',
+ 'video/capture/linux/video_capture_device_factory_linux.cc',
+ ]
+ }],
['OS!="openbsd"', {
'sources!': [
'audio/openbsd/audio_manager_openbsd.cc',
@@ -771,7 +777,7 @@
'video/capture/linux/v4l2_capture_delegate_multi_plane.h',
],
}],
- ['OS=="linux"', {
@ -9,7 +22,7 @@
'conditions': [
['use_x11==1', {
'dependencies': [
@@ -998,7 +998,7 @@
@@ -1085,7 +1091,7 @@
'base/simd/convert_yuv_to_rgb_x86.cc',
],
}],

34
www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.cc Normal file
View File

@ -0,0 +1,34 @@
--- media/video/capture/linux/video_capture_device_linux.cc.orig 2015-05-21 14:00:42.807667000 -0400
+++ media/video/capture/linux/video_capture_device_linux.cc 2015-05-21 14:05:22.707732000 -0400
@@ -44,6 +44,7 @@
// Translates Video4Linux pixel formats to Chromium pixel formats.
// static
+#if !defined(OS_FREEBSD)
VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(
uint32 v4l2_fourcc) {
return V4L2CaptureDelegate::V4l2FourCcToChromiumPixelFormat(v4l2_fourcc);
@@ -55,6 +56,7 @@
bool favour_mjpeg) {
return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg);
}
+#endif
const std::string VideoCaptureDevice::Name::GetModel() const {
// |unique_id| is of the form "/dev/video2". |file_name| is "video2".
@@ -90,6 +92,7 @@
v4l2_thread_.Stop();
}
+#if !defined(OS_FREEBSD)
void VideoCaptureDeviceLinux::AllocateAndStart(
const VideoCaptureParams& params,
scoped_ptr<VideoCaptureDevice::Client> client) {
@@ -132,6 +135,7 @@
capture_impl_, rotation));
}
}
+#endif
// static
int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2(int frequency) {

18
www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.h Normal file
View File

@ -0,0 +1,18 @@
--- media/video/capture/linux/video_capture_device_linux.h.orig 2015-05-21 14:16:06.014473000 -0400
+++ media/video/capture/linux/video_capture_device_linux.h 2015-05-21 14:32:36.408695000 -0400
@@ -31,6 +31,7 @@
explicit VideoCaptureDeviceLinux(const Name& device_name);
~VideoCaptureDeviceLinux() override;
+#if !defined(OS_FREEBSD)
// VideoCaptureDevice implementation.
void AllocateAndStart(const VideoCaptureParams& params,
scoped_ptr<Client> client) override;
@@ -38,6 +39,7 @@
protected:
void SetRotation(int rotation);
+#endif
private:
static int TranslatePowerLineFrequencyToV4L2(int frequency);

11
www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc
View File

@ -1,11 +0,0 @@
--- media/video/capture/video_capture_device_factory.cc.orig 2015-04-24 22:45:15.000000000 +0200
+++ media/video/capture/video_capture_device_factory.cc 2015-04-24 22:45:36.000000000 +0200
@@ -50,7 +50,7 @@
callback.Run(device_names.Pass());
}
-#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_WIN)
+#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FREEBSD)
// static
VideoCaptureDeviceFactory*
VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory(

22
www/chromium/files/patch-net__net.gyp
View File

@ -1,27 +1,15 @@
--- net/net.gyp.orig 2014-10-10 09:15:31 UTC
+++ net/net.gyp
@@ -316,9 +316,10 @@
}],
['os_bsd==1', {
'sources!': [
+ 'base/address_tracker_linux.cc',
'base/network_change_notifier_linux.cc',
'base/network_change_notifier_netlink_linux.cc',
- 'proxy/proxy_config_service_linux.cc',
+# 'proxy/proxy_config_service_linux.cc',
],
},{
'dependencies': [
@@ -551,7 +552,7 @@
--- net/net.gyp.orig 2015-05-13 18:35:47.000000000 -0400
+++ net/net.gyp 2015-05-20 16:09:23.255544000 -0400
@@ -146,7 +146,7 @@
'<@(net_test_sources)',
],
'conditions': [
- ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and os_bsd != 1', {
'dependencies': [
'epoll_quic_tools',
'epoll_server',
'flip_in_mem_edsm_server_base',
@@ -1033,6 +1034,11 @@
@@ -659,6 +659,11 @@
'test/cert_test_util_nss.cc',
],
}],

14
www/chromium/files/patch-net__net_common.gypi Normal file
View File

@ -0,0 +1,14 @@
--- net/net_common.gypi.orig 2015-05-20 16:10:47.668198000 -0400
+++ net/net_common.gypi 2015-05-20 16:10:38.213855000 -0400
@@ -246,9 +246,10 @@
'conditions': [
['os_bsd==1', {
'sources!': [
+ 'base/address_tracker_linux.cc',
'base/network_change_notifier_linux.cc',
'base/network_change_notifier_netlink_linux.cc',
- 'proxy/proxy_config_service_linux.cc',
+# 'proxy/proxy_config_service_linux.cc',
],
},{
'dependencies': [

41
www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
View File

@ -1,5 +1,5 @@
--- net/proxy/proxy_config_service_linux.cc.orig 2015-01-21 20:05:44 UTC
+++ net/proxy/proxy_config_service_linux.cc
--- net/proxy/proxy_config_service_linux.cc.orig 2015-05-13 18:23:09.000000000 -0400
+++ net/proxy/proxy_config_service_linux.cc 2015-05-20 16:54:28.541791000 -0400
@@ -12,7 +12,13 @@
#include <limits.h>
#include <stdio.h>
@ -14,21 +14,15 @@
#include <unistd.h>
#include <map>
@@ -852,9 +858,10 @@
public base::MessagePumpLibevent::Watcher {
@@ -859,6 +865,7 @@
public:
explicit SettingGetterImplKDE(base::Environment* env_var_getter)
- : inotify_fd_(-1), notify_delegate_(NULL), indirect_manual_(false),
- auto_no_pac_(false), reversed_bypass_list_(false),
- env_var_getter_(env_var_getter), file_task_runner_(NULL) {
+ : inotify_fd_(-1), config_fd_(-1), notify_delegate_(NULL),
+ indirect_manual_(false), auto_no_pac_(false),
+ reversed_bypass_list_(false), env_var_getter_(env_var_getter),
+ file_task_runner_(NULL) {
// This has to be called on the UI thread (http://crbug.com/69057).
base::ThreadRestrictions::ScopedAllowIO allow_io;
@@ -918,9 +925,10 @@
: inotify_fd_(-1),
+ config_fd_(-1),
notify_delegate_(NULL),
debounce_timer_(new base::OneShotTimer<SettingGetterImplKDE>()),
indirect_manual_(false),
@@ -929,9 +936,10 @@
// and pending tasks may then be deleted without being run.
// Here in the KDE version, we can safely close the file descriptor
// anyway. (Not that it really matters; the process is exiting.)
@ -40,7 +34,7 @@
}
bool Init(const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner,
@@ -929,11 +937,20 @@
@@ -940,11 +948,20 @@
// This has to be called on the UI thread (http://crbug.com/69057).
base::ThreadRestrictions::ScopedAllowIO allow_io;
DCHECK(inotify_fd_ < 0);
@ -61,7 +55,7 @@
int flags = fcntl(inotify_fd_, F_GETFL);
if (fcntl(inotify_fd_, F_SETFL, flags | O_NONBLOCK) < 0) {
PLOG(ERROR) << "fcntl failed";
@@ -941,6 +958,7 @@
@@ -952,6 +969,7 @@
inotify_fd_ = -1;
return false;
}
@ -69,7 +63,7 @@
file_task_runner_ = file_task_runner;
// The initial read is done on the current thread, not
// |file_task_runner_|, since we will need to have it for
@@ -956,21 +974,39 @@
@@ -967,22 +985,40 @@
close(inotify_fd_);
inotify_fd_ = -1;
}
@ -77,6 +71,7 @@
+ close(config_fd_);
+ config_fd_ = -1;
+ }
debounce_timer_.reset();
}
bool SetUpNotifications(
@ -109,7 +104,7 @@
notify_delegate_ = delegate;
if (!base::MessageLoopForIO::current()->WatchFileDescriptor(
inotify_fd_, true, base::MessageLoopForIO::WATCH_READ,
@@ -991,7 +1027,19 @@
@@ -1003,7 +1039,19 @@
void OnFileCanReadWithoutBlocking(int fd) override {
DCHECK_EQ(fd, inotify_fd_);
DCHECK(file_task_runner_->BelongsToCurrentThread());
@ -129,7 +124,7 @@
}
void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); }
@@ -1264,8 +1312,11 @@
@@ -1276,8 +1324,11 @@
void OnChangeNotification() {
DCHECK_GE(inotify_fd_, 0);
DCHECK(file_task_runner_->BelongsToCurrentThread());
@ -142,7 +137,7 @@
ssize_t r;
while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) {
// inotify returns variable-length structures, which is why we have
@@ -1302,6 +1353,7 @@
@@ -1314,6 +1365,7 @@
inotify_fd_ = -1;
}
}
@ -150,11 +145,11 @@
if (kioslaverc_touched) {
// We don't use Reset() because the timer may not yet be running.
// (In that case Stop() is a no-op.)
@@ -1317,6 +1369,7 @@
@@ -1329,6 +1381,7 @@
std::vector<std::string> > strings_map_type;
int inotify_fd_;
+ int config_fd_;
base::MessagePumpLibevent::FileDescriptorWatcher inotify_watcher_;
ProxyConfigServiceLinux::Delegate* notify_delegate_;
base::OneShotTimer<SettingGetterImplKDE> debounce_timer_;
scoped_ptr<base::OneShotTimer<SettingGetterImplKDE> > debounce_timer_;

17
www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
View File

@ -1,5 +1,5 @@
--- third_party/WebKit/Source/core/core.gyp.orig 2015-04-19 17:00:10.000000000 +0200
+++ third_party/WebKit/Source/core/core.gyp 2015-04-19 17:12:08.000000000 +0200
--- third_party/WebKit/Source/core/core.gyp.orig 2015-05-13 18:48:59.000000000 -0400
+++ third_party/WebKit/Source/core/core.gyp 2015-05-20 17:42:49.101788000 -0400
@@ -505,13 +505,13 @@
# Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable.
'cflags': ['-Wno-uninitialized'],
@ -25,22 +25,15 @@
'link_settings': {
'ldflags': [
'<!@(pkg-config --libs-only-L ipp)',
@@ -812,13 +812,13 @@
@@ -812,7 +812,7 @@
# Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable.
'cflags': ['-Wno-uninitialized'],
}],
- ['OS != "linux"', {
+ ['OS != "linux" and os_bsd != 1', {
'sources!': [
'layout/LayoutThemeChromiumLinux.cpp',
'layout/LayoutThemeChromiumLinux.h',
],
}],
- ['OS != "linux" and OS != "android"', {
+ ['OS != "linux" and OS != "android" and os_bsd != 1', {
'sources!': [
'layout/LayoutThemeChromiumFontProviderLinux.cpp',
],
'layout/LayoutThemeLinux.cpp',
'layout/LayoutThemeLinux.h',
@@ -837,7 +837,7 @@
}],
],

20
www/chromium/files/patch-ui__accessibility__accessibility.gyp Normal file
View File

@ -0,0 +1,20 @@
--- ui/accessibility/accessibility.gyp.orig 2015-05-21 11:55:12.129587000 -0400
+++ ui/accessibility/accessibility.gyp 2015-05-21 11:55:47.115032000 -0400
@@ -63,7 +63,7 @@
'../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2'
],
}],
- ['OS=="linux" and chromeos==0 and use_x11==1', {
+ ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_x11==1', {
'dependencies': [
'../../build/linux/system.gyp:atk',
'../../build/linux/system.gyp:gconf',
@@ -76,7 +76,7 @@
],
},
}],
- ['OS!="linux" or chromeos==1 or use_x11==0', {
+ ['(OS!="linux" and os_bsd==0) or chromeos==1 or use_x11==0', {
'sources!': [
'platform/ax_platform_node_auralinux.cc',
'platform/ax_platform_node_auralinux.h',

11
www/chromium/files/patch-ui__accessibility__platform__ax_platform_node.cc Normal file
View File

@ -0,0 +1,11 @@
--- ui/accessibility/platform/ax_platform_node.cc.orig 2015-05-21 15:15:07.691444000 -0400
+++ ui/accessibility/platform/ax_platform_node.cc 2015-05-21 15:15:32.121315000 -0400
@@ -9,7 +9,7 @@
namespace ui {
-#if !defined(OS_MACOSX) && !defined(OS_WIN) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if !defined(OS_MACOSX) && !defined(OS_WIN) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) && !defined(OS_BSD)
// static
AXPlatformNode* AXPlatformNode::Create(AXPlatformNodeDelegate* delegate) {
return nullptr;

11
www/chromium/files/patch-ui__app_list__app_list_menu.cc Normal file
View File

@ -0,0 +1,11 @@
--- ui/app_list/app_list_menu.cc.orig 2015-04-28 09:03:36.585517000 -0400
+++ ui/app_list/app_list_menu.cc 2015-04-28 09:04:02.340815000 -0400
@@ -32,7 +32,7 @@
users_[i].email.empty() ? users_[i].name
: users_[i].email,
0 /* group_id */);
-#elif defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#elif defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS))
menu_model_.AddItem(SELECT_PROFILE + i, users_[i].name);
int menu_index = menu_model_.GetIndexOfCommandId(SELECT_PROFILE + i);
menu_model_.SetSublabel(menu_index, users_[i].email);

20
www/chromium/files/patch-ui__app_list__views__app_list_view.cc Normal file
View File

@ -0,0 +1,20 @@
--- ui/app_list/views/app_list_view.cc.orig 2015-04-14 18:31:23.000000000 -0400
+++ ui/app_list/views/app_list_view.cc 2015-04-28 09:00:49.202227000 -0400
@@ -76,7 +76,7 @@
::switches::kDisableDwmComposition)) {
return false;
}
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// Shadows are not supported on (non-ChromeOS) Linux.
return false;
#endif
@@ -618,7 +618,7 @@
// the taskbar for these versions of Windows.
if (base::win::GetVersion() >= base::win::VERSION_WIN7)
params->force_show_in_taskbar = true;
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
// Set up a custom WM_CLASS for the app launcher window. This allows task
// switchers in X11 environments to distinguish it from main browser windows.
params->wm_class_name = kAppListWMClass;

37
www/chromium/files/patch-ui__base__ime__input_method_initializer.cc Normal file
View File

@ -0,0 +1,37 @@
--- ui/base/ime/input_method_initializer.cc.orig 2015-04-14 18:18:59.000000000 -0400
+++ ui/base/ime/input_method_initializer.cc 2015-04-28 08:56:59.070063000 -0400
@@ -6,14 +6,14 @@
#if defined(OS_CHROMEOS)
#include "ui/base/ime/chromeos/ime_bridge.h"
-#elif defined(USE_AURA) && defined(OS_LINUX)
+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
#include "base/logging.h"
#include "ui/base/ime/linux/fake_input_method_context_factory.h"
#endif
namespace {
-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
const ui::LinuxInputMethodContextFactory* g_linux_input_method_context_factory;
#endif
@@ -36,7 +36,7 @@
void InitializeInputMethodForTesting() {
#if defined(OS_CHROMEOS)
chromeos::IMEBridge::Initialize();
-#elif defined(USE_AURA) && defined(OS_LINUX)
+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
if (!g_linux_input_method_context_factory)
g_linux_input_method_context_factory = new FakeInputMethodContextFactory();
const LinuxInputMethodContextFactory* factory =
@@ -52,7 +52,7 @@
void ShutdownInputMethodForTesting() {
#if defined(OS_CHROMEOS)
chromeos::IMEBridge::Shutdown();
-#elif defined(USE_AURA) && defined(OS_LINUX)
+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
const LinuxInputMethodContextFactory* factory =
LinuxInputMethodContextFactory::instance();
CHECK(!factory || factory == g_linux_input_method_context_factory)

11
www/chromium/files/patch-ui__base__resource__resource_bundle.cc Normal file
View File

@ -0,0 +1,11 @@
--- ui/base/resource/resource_bundle.cc.orig 2015-04-14 18:18:59.000000000 -0400
+++ ui/base/resource/resource_bundle.cc 2015-04-28 08:51:21.756989000 -0400
@@ -611,7 +611,7 @@
#elif defined(OS_CHROMEOS)
// TODO(oshima): Include 200P only if the device support 200P
supported_scale_factors.push_back(SCALE_FACTOR_200P);
-#elif defined(OS_LINUX) && defined(ENABLE_HIDPI)
+#elif (defined(OS_LINUX) || defined(OS_BSD)) && defined(ENABLE_HIDPI)
supported_scale_factors.push_back(SCALE_FACTOR_200P);
#elif defined(OS_WIN)
bool default_to_100P = true;

11
www/chromium/files/patch-ui__base__web_ui_util.cc Normal file
View File

@ -0,0 +1,11 @@
--- ui/base/webui/web_ui_util.cc.orig 2015-04-14 18:18:59.000000000 -0400
+++ ui/base/webui/web_ui_util.cc 2015-04-28 08:49:38.687761000 -0400
@@ -174,7 +174,7 @@
// TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced
// into Ozone: crbug.com/320050
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
font_family = ui::ResourceBundle::GetSharedInstance().GetFont(
ui::ResourceBundle::BaseFont).GetFontName() + ", " + font_family;
#endif

11
www/chromium/files/patch-ui__events__keycodes__dom4__keycode_converter.cc Normal file
View File

@ -0,0 +1,11 @@
--- ui/events/keycodes/dom4/keycode_converter.cc.orig 2015-04-14 18:19:00.000000000 -0400
+++ ui/events/keycodes/dom4/keycode_converter.cc 2015-04-28 08:47:25.161132000 -0400
@@ -15,7 +15,7 @@
// and DOM Level 3 |code| strings.
#if defined(OS_WIN)
#define USB_KEYMAP(usb, xkb, win, mac, code, id) {usb, win, code}
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
#define USB_KEYMAP(usb, xkb, win, mac, code, id) {usb, xkb, code}
#elif defined(OS_MACOSX)
#define USB_KEYMAP(usb, xkb, win, mac, code, id) {usb, mac, code}

11
www/chromium/files/patch-ui__gfx__canvas_skia.cc Normal file
View File

@ -0,0 +1,11 @@
--- ui/gfx/canvas_skia.cc.orig 2015-04-14 18:31:23.000000000 -0400
+++ ui/gfx/canvas_skia.cc 2015-04-28 08:45:50.095480000 -0400
@@ -287,7 +287,7 @@
Range range = StripAcceleratorChars(flags, &adjusted_text);
bool elide_text = ((flags & NO_ELLIPSIS) == 0);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// On Linux, eliding really means fading the end of the string. But only
// for LTR text. RTL text is still elided (on the left) with "...".
if (elide_text) {

11
www/chromium/files/patch-ui__gl__gl_surface_glx.cc Normal file
View File

@ -0,0 +1,11 @@
--- ui/gl/gl_surface_glx.cc.orig 2015-04-14 18:31:23.000000000 -0400
+++ ui/gl/gl_surface_glx.cc 2015-04-28 08:44:08.840888000 -0400
@@ -57,7 +57,7 @@
bool g_glx_sgi_video_sync_supported = false;
static const base::TimeDelta kGetVSyncParametersMinPeriod =
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// See crbug.com/373489
// On Linux, querying the vsync parameters might burn CPU for up to an
// entire vsync, so we only query periodically to reduce CPU usage.

29
www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc Normal file
View File

@ -0,0 +1,29 @@
--- ui/gl/sync_control_vsync_provider.cc.orig 2015-04-14 18:19:00.000000000 -0400
+++ ui/gl/sync_control_vsync_provider.cc 2015-04-28 08:42:41.263448000 -0400
@@ -9,7 +9,7 @@
#include "base/logging.h"
#include "base/time/time.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// These constants define a reasonable range for a calculated refresh interval.
// Calculating refreshes out of this range will be considered a fatal error.
const int64 kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400;
@@ -35,7 +35,7 @@
void SyncControlVSyncProvider::GetVSyncParameters(
const UpdateVSyncCallback& callback) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
base::TimeTicks timebase;
// The actual clock used for the system time returned by glXGetSyncValuesOML
@@ -151,7 +151,7 @@
last_timebase_ = timebase;
last_media_stream_counter_ = media_stream_counter;
callback.Run(timebase, last_good_interval_);
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
}
} // namespace gfx

11
www/chromium/files/patch-ui__message_center__message_center_style.h Normal file
View File

@ -0,0 +1,11 @@
--- ui/message_center/message_center_style.h.orig 2015-04-28 08:33:38.328173000 -0400
+++ ui/message_center/message_center_style.h 2015-04-28 08:34:12.794494000 -0400
@@ -102,7 +102,7 @@
const int kButtonIconTopPadding = 11; // In DIPs.
const int kButtonIconToTitlePadding = 16; // In DIPs.
-#if !defined(OS_LINUX) || defined(USE_AURA)
+#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA)
const SkColor kButtonSeparatorColor = SkColorSetRGB(234, 234, 234);
const SkColor kHoveredButtonBackgroundColor = SkColorSetRGB(243, 243, 243);
#endif

47
www/chromium/files/patch-ui__message_center__views__message_center_button_bar.cc Normal file
View File

@ -0,0 +1,47 @@
--- ui/message_center/views/message_center_button_bar.cc.orig 2015-04-28 08:29:30.741134000 -0400
+++ ui/message_center/views/message_center_button_bar.cc 2015-04-28 08:31:16.302480000 -0400
@@ -94,7 +94,7 @@
const base::string16& title)
: message_center_view_(message_center_view),
message_center_(message_center),
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
close_bubble_button_(NULL),
#endif
title_arrow_(NULL),
@@ -169,7 +169,7 @@
IDS_MESSAGE_CENTER_SETTINGS_BUTTON_LABEL);
button_container_->AddChildView(settings_button_);
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
close_bubble_button_ = new views::ImageButton(this);
close_bubble_button_->SetImage(
views::Button::STATE_NORMAL,
@@ -231,7 +231,7 @@
0,
0);
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// The close-bubble button.
column->AddColumn(views::GridLayout::LEADING,
views::GridLayout::LEADING,
@@ -246,7 +246,7 @@
layout->AddView(title_arrow_);
layout->AddView(notification_label_);
layout->AddView(button_container_);
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
layout->AddView(close_bubble_button_);
#endif
}
@@ -289,7 +289,7 @@
else
message_center()->EnterQuietModeWithExpire(base::TimeDelta::FromDays(1));
quiet_mode_button_->SetToggled(message_center()->IsQuietMode());
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
} else if (sender == close_bubble_button_) {
message_center_view()->tray()->HideMessageCenterBubble();
#endif

11
www/chromium/files/patch-ui__message_center__views__message_center_button_bar.h Normal file
View File

@ -0,0 +1,11 @@
--- ui/message_center/views/message_center_button_bar.h.orig 2015-04-14 18:19:00.000000000 -0400
+++ ui/message_center/views/message_center_button_bar.h 2015-04-28 08:28:10.714142000 -0400
@@ -68,7 +68,7 @@
// close-on-deactivation is off. This is a tentative solution. Once pkotwicz
// Fixes the problem of focus-follow-mouse, close-on-deactivation will be
// back and this field will be removed. See crbug.com/319516.
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
views::ImageButton* close_bubble_button_;
#endif

20
www/chromium/files/patch-ui__message_center__views__message_center_view.cc Normal file
View File

@ -0,0 +1,20 @@
--- ui/message_center/views/message_center_view.cc.orig 2015-04-14 18:31:23.000000000 -0400
+++ ui/message_center/views/message_center_view.cc 2015-04-28 08:26:17.078043000 -0400
@@ -47,7 +47,7 @@
namespace {
const SkColor kNoNotificationsTextColor = SkColorSetRGB(0xb4, 0xb4, 0xb4);
-#if defined(OS_LINUX) && defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(OS_CHROMEOS)
const SkColor kTransparentColor = SkColorSetARGB(0, 0, 0, 0);
#endif
const int kAnimateClearingNextNotificationDelayMS = 40;
@@ -86,7 +86,7 @@
label_->SetEnabledColor(kNoNotificationsTextColor);
// Set transparent background to ensure that subpixel rendering
// is disabled. See crbug.com/169056
-#if defined(OS_LINUX) && defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(OS_CHROMEOS)
label_->SetBackgroundColor(kTransparentColor);
#endif
AddChildView(label_);

11
www/chromium/files/patch-ui__message_center__views__notification_view.cc Normal file
View File

@ -0,0 +1,11 @@
--- ui/message_center/views/notification_view.cc.orig 2015-04-14 18:19:00.000000000 -0400
+++ ui/message_center/views/notification_view.cc 2015-04-28 08:22:57.679978000 -0400
@@ -278,7 +278,7 @@
NotificationView* notification_view =
new NotificationView(controller, notification);
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// Don't create shadows for notification toasts on linux wih aura.
if (top_level)
return notification_view;

12
www/chromium/files/patch-ui__views__accessibility__native_view_accessibility.cc Normal file
View File

@ -0,0 +1,12 @@
--- ui/views/accessibility/native_view_accessibility.cc.orig 2015-05-21 11:45:00.287962000 -0400
+++ ui/views/accessibility/native_view_accessibility.cc 2015-05-21 11:45:21.186070000 -0400
@@ -13,7 +13,8 @@
namespace views {
-#if !defined(OS_WIN) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if !defined(OS_WIN) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) \
+ && !defined(OS_BSD)
// static
NativeViewAccessibility* NativeViewAccessibility::Create(View* view) {
return new NativeViewAccessibility(view);

11
www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc Normal file
View File

@ -0,0 +1,11 @@
--- ui/views/bubble/bubble_delegate.cc.orig 2015-04-14 18:31:23.000000000 -0400
+++ ui/views/bubble/bubble_delegate.cc 2015-04-28 08:17:15.923055000 -0400
@@ -104,7 +104,7 @@
// the parent frame and let DWM handle compositing. If not, then we don't
// want to allow the bubble to extend the frame because it will be clipped.
bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled());
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// Linux clips bubble windows that extend outside their parent window bounds.
bubble_delegate->set_adjust_if_offscreen(false);
#endif

11
www/chromium/files/patch-ui__views__controls__menu__menu_scroll_view_container.cc Normal file
View File

@ -0,0 +1,11 @@
--- ui/views/controls/menu/menu_scroll_view_container.cc.orig 2015-04-28 08:06:01.162896000 -0400
+++ ui/views/controls/menu/menu_scroll_view_container.cc 2015-04-28 08:06:36.439435000 -0400
@@ -281,7 +281,7 @@
int padding = menu_config.corner_radius > 0 ?
kBorderPaddingDueToRoundedCorners : 0;
-#if defined(USE_AURA) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(USE_AURA) && !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS))
if (menu_config.native_theme == ui::NativeThemeAura::instance()) {
// In case of NativeThemeAura the border gets drawn with the shadow.
// Furthermore no additional padding is wanted.

11
www/chromium/files/patch-ui__views__controls__scrollbar__base_scroll_bar.cc Normal file
View File

@ -0,0 +1,11 @@
--- ui/views/controls/scrollbar/base_scroll_bar.cc.orig 2015-04-14 18:19:00.000000000 -0400
+++ ui/views/controls/scrollbar/base_scroll_bar.cc 2015-04-28 08:04:31.469712000 -0400
@@ -24,7 +24,7 @@
#include "ui/views/controls/scrollbar/base_scroll_bar_thumb.h"
#include "ui/views/widget/widget.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "ui/gfx/screen.h"
#endif

83
www/chromium/files/patch-ui__views__controls__textfield__textfield.cc Normal file
View File

@ -0,0 +1,83 @@
--- ui/views/controls/textfield/textfield.cc.orig 2015-04-14 18:31:23.000000000 -0400
+++ ui/views/controls/textfield/textfield.cc 2015-04-28 07:58:48.300682000 -0400
@@ -41,7 +41,7 @@
#include "base/win/win_util.h"
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
#include "base/strings/utf_string_conversions.h"
#include "ui/events/linux/text_edit_command_auralinux.h"
#include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
@@ -124,7 +124,7 @@
case ui::VKEY_BACK:
if (!control || has_selection)
return IDS_DELETE_BACKWARD;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Only erase by line break on Linux and ChromeOS.
if (shift)
return IDS_DELETE_TO_BEGINNING_OF_LINE;
@@ -133,7 +133,7 @@
case ui::VKEY_DELETE:
if (!control || has_selection)
return (shift && has_selection) ? IDS_APP_CUT : IDS_DELETE_FORWARD;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Only erase by line break on Linux and ChromeOS.
if (shift)
return IDS_DELETE_TO_END_OF_LINE;
@@ -148,7 +148,7 @@
}
}
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// Convert a custom text edit |command| to the equivalent views command ID.
int GetViewsCommand(const ui::TextEditCommandAuraLinux& command, bool rtl) {
const bool select = command.extend_selection();
@@ -612,7 +612,7 @@
OnAfterUserAction();
}
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
if (event.IsOnlyMiddleMouseButton()) {
if (GetRenderText()->IsPointInSelection(event.location())) {
OnBeforeUserAction();
@@ -678,7 +678,7 @@
if (!textfield)
return handled;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
ui::GetTextEditKeyBindingsDelegate();
std::vector<ui::TextEditCommandAuraLinux> commands;
@@ -805,7 +805,7 @@
}
bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// Skip any accelerator handling that conflicts with custom keybindings.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
ui::GetTextEditKeyBindingsDelegate();
@@ -1061,7 +1061,7 @@
scoped_ptr<gfx::Canvas> canvas(
GetCanvasForDragImage(GetWidget(), label.size()));
label.SetEnabledColor(GetTextColor());
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// Desktop Linux Aura does not yet support transparency in drag images.
canvas->DrawColor(GetBackgroundColor());
#endif
@@ -1855,7 +1855,7 @@
}
void Textfield::UpdateSelectionClipboard() const {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
if (performing_user_action_ && HasSelection()) {
ui::ScopedClipboardWriter(
ui::CLIPBOARD_TYPE_SELECTION).WriteText(GetSelectedText());

12
www/chromium/files/patch-ui__views__examples__widget_example.cc Normal file
View File

@ -0,0 +1,12 @@
--- ui/views/examples/widget_example.cc.orig 2015-05-13 18:23:12.000000000 -0400
+++ ui/views/examples/widget_example.cc 2015-05-20 17:45:57.913297000 -0400
@@ -82,7 +82,7 @@
BuildButton(container, "Popup widget", POPUP);
BuildButton(container, "Dialog widget", DIALOG);
BuildButton(container, "Modal Dialog", MODAL_DIALOG);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Windows does not support TYPE_CONTROL top-level widgets.
BuildButton(container, "Child widget", CHILD);
#endif

11
www/chromium/files/patch-ui__views__views_switches.cc Normal file
View File

@ -0,0 +1,11 @@
--- ui/views/views_switches.cc.orig 2015-04-28 07:51:15.723570000 -0400
+++ ui/views/views_switches.cc 2015-04-28 07:51:39.558227000 -0400
@@ -26,7 +26,7 @@
#endif
bool IsRectBasedTargetingEnabled() {
-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
return !base::CommandLine::ForCurrentProcess()->HasSwitch(
kDisableViewsRectBasedTargeting);
#else

11
www/chromium/files/patch-ui__views__window__dialog_delegate.cc Normal file
View File

@ -0,0 +1,11 @@
--- ui/views/window/dialog_delegate.cc.orig 2015-04-14 18:19:00.000000000 -0400
+++ ui/views/window/dialog_delegate.cc 2015-04-28 07:49:18.261990000 -0400
@@ -48,7 +48,7 @@
params.bounds = bounds;
DialogDelegate* dialog = delegate->AsDialogDelegate();
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// The new style doesn't support unparented dialogs on Linux desktop.
if (dialog)
dialog->supports_new_style_ &= parent != NULL;

29
www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc
View File

@ -1,29 +0,0 @@
--- v8/src/base/platform/platform-freebsd.cc.orig 2015-04-19 17:39:23.000000000 +0200
+++ v8/src/base/platform/platform-freebsd.cc 2015-04-19 17:40:29.000000000 +0200
@@ -188,7 +188,7 @@
void* reservation = mmap(OS::GetRandomMmapAddr(),
request_size,
PROT_NONE,
- MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+ MAP_PRIVATE | MAP_ANON,
kMmapFd,
kMmapFdOffset);
if (reservation == MAP_FAILED) return;
@@ -260,7 +260,7 @@
void* result = mmap(OS::GetRandomMmapAddr(),
size,
PROT_NONE,
- MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+ MAP_PRIVATE | MAP_ANON,
kMmapFd,
kMmapFdOffset);
@@ -288,7 +288,7 @@
return mmap(base,
size,
PROT_NONE,
- MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_FIXED,
+ MAP_PRIVATE | MAP_ANON | MAP_FIXED,
kMmapFd,
kMmapFdOffset) != MAP_FAILED;
}

8
www/chromium/pkg-plist
View File

@ -100,7 +100,6 @@ share/applications/chromium-browser.desktop
%%DATADIR%%/resources/inspector/Images/paneFilterButtons.png
%%DATADIR%%/resources/inspector/Images/paneRefreshButtons.png
%%DATADIR%%/resources/inspector/Images/popoverArrows.png
%%DATADIR%%/resources/inspector/Images/popoverBackground.png
%%DATADIR%%/resources/inspector/Images/profileGroupIcon.png
%%DATADIR%%/resources/inspector/Images/profileIcon.png
%%DATADIR%%/resources/inspector/Images/profileSmallIcon.png
@ -116,9 +115,12 @@ share/applications/chromium-browser.desktop
%%DATADIR%%/resources/inspector/Images/responsiveDesign_2x.png
%%DATADIR%%/resources/inspector/Images/searchNext.png
%%DATADIR%%/resources/inspector/Images/searchPrev.png
%%DATADIR%%/resources/inspector/Images/serviceWorker.svg
%%DATADIR%%/resources/inspector/Images/sessionStorage.png
%%DATADIR%%/resources/inspector/Images/settingsListRemove.png
%%DATADIR%%/resources/inspector/Images/settingsListRemove_2x.png
%%DATADIR%%/resources/inspector/Images/speech.png
%%DATADIR%%/resources/inspector/Images/spinner.svg
%%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs.png
%%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs_2x.png
%%DATADIR%%/resources/inspector/Images/statusbarResizerHorizontal.png
@ -134,10 +136,10 @@ share/applications/chromium-browser.desktop
%%DATADIR%%/resources/inspector/Images/touchCursor_2x.png
%%DATADIR%%/resources/inspector/InspectorBackendCommands.js
%%DATADIR%%/resources/inspector/SupportedCSSProperties.js
%%DATADIR%%/resources/inspector/accessibility_module.js
%%DATADIR%%/resources/inspector/audits_module.js
%%DATADIR%%/resources/inspector/components_lazy_module.js
%%DATADIR%%/resources/inspector/console_module.js
%%DATADIR%%/resources/inspector/devices_module.js
%%DATADIR%%/resources/inspector/devtools.css
%%DATADIR%%/resources/inspector/devtools.html
%%DATADIR%%/resources/inspector/devtools.js
@ -152,8 +154,10 @@ share/applications/chromium-browser.desktop
%%DATADIR%%/resources/inspector/profiler_module.js
%%DATADIR%%/resources/inspector/promises_module.js
%%DATADIR%%/resources/inspector/resources_module.js
%%DATADIR%%/resources/inspector/screencast_module.js
%%DATADIR%%/resources/inspector/script_formatter_worker_module.js
%%DATADIR%%/resources/inspector/settings_module.js
%%DATADIR%%/resources/inspector/snippets_module.js
%%DATADIR%%/resources/inspector/source_frame_module.js
%%DATADIR%%/resources/inspector/sources_module.js
%%DATADIR%%/resources/inspector/temp_storage_shared_worker_module.js