cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 42.0.2311.90

Browse Source
This commit is contained in:
robert 2015-04-27 16:38:25 +00:00
parent c148e02ce4
commit 0d68a1e686
141 changed files with 1580 additions and 943 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/chromium/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.209 2015/04/04 09:21:04 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.210 2015/04/27 16:38:25 robert Exp $
ONLY_FOR_ARCHS= i386 amd64
DPB_PROPERTIES= parallel
COMMENT= Chromium browser
V= 41.0.2272.118
V= 42.0.2311.90
DISTNAME= chromium-${V}
REVISION= 0
CATEGORIES= www
@ -121,6 +120,7 @@ GYP_DEFS= -Duse_system_bzip2=1 \
-Dwerror= \
-Dno_gc_sections=1 \
-Ddisable_fatal_linker_warnings=1 \
-Dv8_use_external_startup_data=0 \
-DOS=openbsd
# Note: these keys are for OpenBSD use ONLY. For your own distribution,

4
www/chromium/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (chromium-41.0.2272.118.tar.xz) = wEPS7KQayqvU9waKXZohg12sLKdwXdhl03bIpzLsjDw=
SIZE (chromium-41.0.2272.118.tar.xz) = 301445804
SHA256 (chromium-42.0.2311.90.tar.xz) = YLDrOMHD0MyZja5wtzM+U7cVz/KEfBZS4D0XIzANtMk=
SIZE (chromium-42.0.2311.90.tar.xz) = 306502344

8
www/chromium/patches/patch-base_atomicops_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-base_atomicops_h,v 1.14 2015/01/22 11:16:40 robert Exp $
--- base/atomicops.h.orig.port Wed Dec 3 03:13:19 2014
+++ base/atomicops.h Sat Dec 6 11:34:24 2014
@@ -62,7 +62,11 @@ typedef intptr_t Atomic64;
$OpenBSD: patch-base_atomicops_h,v 1.15 2015/04/27 16:38:25 robert Exp $
--- base/atomicops.h.orig.port Wed Apr 15 00:18:48 2015
+++ base/atomicops.h Wed Apr 15 08:32:49 2015
@@ -66,7 +66,11 @@ typedef intptr_t Atomic64;
// Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
// Atomic64 routines below, depending on your architecture.

8
www/chromium/patches/patch-base_base_gypi
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-base_base_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $
--- base/base.gypi.orig.port Tue Mar 10 23:41:39 2015
+++ base/base.gypi Wed Mar 11 07:22:49 2015
@@ -972,11 +972,17 @@
$OpenBSD: patch-base_base_gypi,v 1.33 2015/04/27 16:38:25 robert Exp $
--- base/base.gypi.orig.port Wed Apr 15 00:31:20 2015
+++ base/base.gypi Wed Apr 15 08:32:50 2015
@@ -990,11 +990,17 @@
'process/memory_stubs.cc',
],
'sources/': [

8
www/chromium/patches/patch-base_message_loop_message_loop_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-base_message_loop_message_loop_cc,v 1.2 2015/03/18 19:26:29 robert Exp $
--- base/message_loop/message_loop.cc.orig.port Tue Mar 10 23:41:39 2015
+++ base/message_loop/message_loop.cc Wed Mar 11 07:22:49 2015
@@ -212,7 +212,7 @@ scoped_ptr<MessagePump> MessageLoop::CreateMessagePump
$OpenBSD: patch-base_message_loop_message_loop_cc,v 1.3 2015/04/27 16:38:25 robert Exp $
--- base/message_loop/message_loop.cc.orig.port Wed Apr 15 00:31:20 2015
+++ base/message_loop/message_loop.cc Wed Apr 15 08:32:50 2015
@@ -221,7 +221,7 @@ scoped_ptr<MessagePump> MessageLoop::CreateMessagePump
// TODO(rvargas): Get rid of the OS guards.
#if defined(USE_GLIB) && !defined(OS_NACL)
typedef MessagePumpGlib MessagePumpForUI;

12
www/chromium/patches/patch-base_process_launch_h
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-base_process_launch_h,v 1.1 2014/10/13 06:49:19 robert Exp $
--- base/process/launch.h.orig.port Sat Oct 11 16:35:37 2014
+++ base/process/launch.h Sat Oct 11 16:35:45 2014
@@ -113,7 +113,7 @@ struct BASE_EXPORT LaunchOptions {
$OpenBSD: patch-base_process_launch_h,v 1.2 2015/04/27 16:38:25 robert Exp $
--- base/process/launch.h.orig.port Wed Apr 15 00:31:20 2015
+++ base/process/launch.h Wed Apr 15 08:32:50 2015
@@ -131,7 +131,7 @@ struct BASE_EXPORT LaunchOptions {
// will be the same as its pid.
bool new_process_group;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// If non-zero, start the process using clone(), using flags as provided.
int clone_flags;
// 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

13
www/chromium/patches/patch-base_process_memory_cc Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-base_process_memory_cc,v 1.1 2015/04/27 16:38:25 robert Exp $
--- base/process/memory.cc.orig.port Thu Apr 23 16:15:00 2015
+++ base/process/memory.cc Thu Apr 23 16:15:41 2015
@@ -27,4 +27,9 @@ bool UncheckedCalloc(size_t num_items, size_t size, vo
#endif
+bool UncheckedMalloc(size_t size, void** result) {
+ *result = malloc(size);
+ return *result != NULL;
+}
+
}

8
www/chromium/patches/patch-build_all_gyp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-build_all_gyp,v 1.22 2015/03/18 19:26:29 robert Exp $
--- build/all.gyp.orig.port Tue Mar 10 23:41:39 2015
+++ build/all.gyp Wed Mar 11 07:22:49 2015
@@ -349,7 +349,6 @@
$OpenBSD: patch-build_all_gyp,v 1.23 2015/04/27 16:38:25 robert Exp $
--- build/all.gyp.orig.port Wed Apr 15 00:31:20 2015
+++ build/all.gyp Wed Apr 15 08:32:50 2015
@@ -340,7 +340,6 @@
'../media/media.gyp:media_unittests',
'../mojo/mojo.gyp:mojo',
'../ppapi/ppapi_internal.gyp:ppapi_unittests',

27
www/chromium/patches/patch-build_common_gypi
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-build_common_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $
--- build/common.gypi.orig.port Tue Mar 10 23:41:39 2015
+++ build/common.gypi Wed Mar 11 07:22:50 2015
$OpenBSD: patch-build_common_gypi,v 1.33 2015/04/27 16:38:25 robert Exp $
--- build/common.gypi.orig.port Wed Apr 15 00:31:20 2015
+++ build/common.gypi Thu Apr 23 08:26:31 2015
@@ -94,7 +94,7 @@
'conditions': [
@ -10,7 +10,16 @@ $OpenBSD: patch-build_common_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $
'use_ash%': 1,
'use_aura%': 1,
}],
@@ -800,7 +800,7 @@
@@ -694,7 +694,7 @@
}],
# DBus usage.
- ['OS=="linux" and embedded==0', {
+ ['(OS=="linux" or OS=="openbsd") and embedded==0', {
'use_dbus%': 1,
}, {
'use_dbus%': 0,
@@ -803,7 +803,7 @@
# Use GPU accelerated cross process image transport by default
# on linux builds with the Aura window manager
@ -19,7 +28,7 @@ $OpenBSD: patch-build_common_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $
'ui_compositor_image_transport%': 1,
}, {
'ui_compositor_image_transport%': 0,
@@ -925,7 +925,7 @@
@@ -928,7 +928,7 @@
# --help for more information. Meant to be overriden with GYP_DEFINES.
# TODO(maruel): Remove the conditions as more configurations are
# supported.
@ -28,7 +37,7 @@ $OpenBSD: patch-build_common_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $
'test_isolation_mode%': 'check',
}, {
'test_isolation_mode%': 'noop',
@@ -941,7 +941,7 @@
@@ -944,7 +944,7 @@
}, {
'use_openmax_dl_fft%': 0,
}],
@ -37,7 +46,7 @@ $OpenBSD: patch-build_common_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $
'enable_mdns%' : 1,
}],
@@ -3510,6 +3510,14 @@
@@ -3488,6 +3488,14 @@
},
},
'conditions': [
@ -52,7 +61,7 @@ $OpenBSD: patch-build_common_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $
['os_posix==1', {
'target_defaults': {
'ldflags': [
@@ -4460,7 +4468,7 @@
@@ -4474,7 +4482,7 @@
}],
# FreeBSD-specific options; note that most FreeBSD options are set above,
# with Linux.
@ -61,7 +70,7 @@ $OpenBSD: patch-build_common_gypi,v 1.32 2015/03/18 19:26:29 robert Exp $
'target_defaults': {
'ldflags': [
'-Wl,--no-keep-memory',
@@ -5696,8 +5704,8 @@
@@ -5754,8 +5762,8 @@
['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) '
'and OS!="win"', {
'make_global_settings': [

26
www/chromium/patches/patch-chrome_app_chrome_main_delegate_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.20 2015/03/21 14:11:19 robert Exp $
--- chrome/app/chrome_main_delegate.cc.orig.port Fri Mar 20 04:21:21 2015
+++ chrome/app/chrome_main_delegate.cc Sat Mar 21 11:55:17 2015
@@ -98,11 +98,11 @@
$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.21 2015/04/27 16:38:25 robert Exp $
--- chrome/app/chrome_main_delegate.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/app/chrome_main_delegate.cc Wed Apr 15 08:32:50 2015
@@ -96,11 +96,11 @@
#include "ui/base/x/x11_util.h"
#endif
@ -15,8 +15,8 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.20 2015/03/21 14:11:19 ro
#include "base/environment.h"
#endif
@@ -133,7 +133,7 @@ base::LazyInstance<chrome::ChromeContentPluginClient>
g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
@@ -138,7 +138,7 @@ base::LazyInstance<chrome::ChromeContentBrowserClient>
g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
#endif
-#if defined(OS_POSIX)
@ -24,7 +24,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.20 2015/03/21 14:11:19 ro
base::LazyInstance<chrome::ChromeCrashReporterClient>::Leaky
g_chrome_crash_client = LAZY_INSTANCE_INITIALIZER;
#endif
@@ -234,7 +234,7 @@ bool SubprocessNeedsResourceBundle(const std::string&
@@ -239,7 +239,7 @@ bool SubprocessNeedsResourceBundle(const std::string&
// Mac needs them for the plugin process name.
process_type == switches::kPluginProcess ||
#endif
@ -33,7 +33,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.20 2015/03/21 14:11:19 ro
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
@@ -288,7 +288,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
@@ -293,7 +293,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
}
#endif
@ -42,7 +42,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.20 2015/03/21 14:11:19 ro
void SIGTERMProfilingShutdown(int signal) {
Profiling::Stop();
struct sigaction sigact;
@@ -322,7 +322,7 @@ void InitializeUserDataDir() {
@@ -327,7 +327,7 @@ void InitializeUserDataDir() {
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@ -51,7 +51,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.20 2015/03/21 14:11:19 ro
// On Linux, Chrome does not support running multiple copies under different
// DISPLAYs, so the profile directory can be specified in the environment to
// support the virtual desktop use-case.
@@ -658,7 +658,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -639,7 +639,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType);
@ -60,16 +60,16 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.20 2015/03/21 14:11:19 ro
crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
#endif
@@ -785,7 +785,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -764,7 +764,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
chrome::InitializePDF();
#endif
}
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
#if defined(OS_ANDROID)
@@ -908,7 +908,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization(
@@ -891,7 +891,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization(
#endif
return process_type == switches::kRelauncherProcess;
}

8
www/chromium/patches/patch-chrome_app_chrome_main_delegate_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_app_chrome_main_delegate_h,v 1.4 2015/01/22 11:16:40 robert Exp $
--- chrome/app/chrome_main_delegate.h.orig.port Sat Dec 6 11:40:55 2014
+++ chrome/app/chrome_main_delegate.h Sat Dec 6 11:41:05 2014
@@ -37,7 +37,7 @@ class ChromeMainDelegate : public content::ContentMain
$OpenBSD: patch-chrome_app_chrome_main_delegate_h,v 1.5 2015/04/27 16:38:25 robert Exp $
--- chrome/app/chrome_main_delegate.h.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/app/chrome_main_delegate.h Wed Apr 15 08:32:50 2015
@@ -36,7 +36,7 @@ class ChromeMainDelegate : public content::ContentMain
const std::string& process_type) override;
bool ShouldSendMachPort(const std::string& process_type) override;
bool DelaySandboxInitialization(const std::string& process_type) override;

8
www/chromium/patches/patch-chrome_app_chromium_strings_grd
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.6 2015/01/22 11:16:40 robert Exp $
--- chrome/app/chromium_strings.grd.orig.port Wed Dec 3 03:32:11 2014
+++ chrome/app/chromium_strings.grd Sat Dec 6 11:34:24 2014
@@ -1154,7 +1154,7 @@ Signing in anyway will merge Chromium information like
$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.7 2015/04/27 16:38:25 robert Exp $
--- chrome/app/chromium_strings.grd.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/app/chromium_strings.grd Wed Apr 15 08:32:50 2015
@@ -1121,7 +1121,7 @@ Signing in anyway will merge Chromium information like
</message>
<!-- ProcessSingleton -->

8
www/chromium/patches/patch-chrome_app_google_chrome_strings_grd
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.5 2015/01/22 11:16:40 robert Exp $
--- chrome/app/google_chrome_strings.grd.orig.port Wed Dec 3 03:32:11 2014
+++ chrome/app/google_chrome_strings.grd Sat Dec 6 11:34:25 2014
@@ -1079,7 +1079,7 @@ Signing in anyway will merge Chrome information like b
$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.6 2015/04/27 16:38:25 robert Exp $
--- chrome/app/google_chrome_strings.grd.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/app/google_chrome_strings.grd Wed Apr 15 08:32:50 2015
@@ -1044,7 +1044,7 @@ Signing in anyway will merge Chrome information like b
</message>
<!-- ProcessSingleton -->

8
www/chromium/patches/patch-chrome_app_theme_theme_resources_grd
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_app_theme_theme_resources_grd,v 1.12 2015/03/18 19:26:29 robert Exp $
--- chrome/app/theme/theme_resources.grd.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/app/theme/theme_resources.grd Wed Mar 11 07:22:50 2015
@@ -511,7 +511,7 @@
$OpenBSD: patch-chrome_app_theme_theme_resources_grd,v 1.13 2015/04/27 16:38:25 robert Exp $
--- chrome/app/theme/theme_resources.grd.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/app/theme/theme_resources.grd Wed Apr 15 08:32:50 2015
@@ -518,7 +518,7 @@
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_PERIPHERAL_BATTERY_LOW" file="cros/notification_peripheral_battery_low.png" />
<structure type="chrome_scaled_image" name="IDR_PORTAL_DETECTION_ALERT" file="cros/captive_portal_icon.png" />
</if>

8
www/chromium/patches/patch-chrome_browser_about_flags_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.16 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/about_flags.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/about_flags.cc Wed Mar 11 07:22:50 2015
@@ -1426,7 +1426,7 @@ const Experiment kExperiments[] = {
$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.17 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/about_flags.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/about_flags.cc Wed Apr 15 08:32:50 2015
@@ -1463,7 +1463,7 @@ const Experiment kExperiments[] = {
SINGLE_VALUE_TYPE(switches::kResetAppListInstallState)
},
#if defined(ENABLE_APP_LIST)

8
www/chromium/patches/patch-chrome_browser_browser_resources_grd
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.17 2015/01/22 11:16:40 robert Exp $
--- chrome/browser/browser_resources.grd.orig.port Wed Dec 3 03:32:11 2014
+++ chrome/browser/browser_resources.grd Sat Dec 6 11:34:25 2014
@@ -241,7 +241,7 @@
$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.18 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/browser_resources.grd.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/browser_resources.grd Wed Apr 15 08:32:50 2015
@@ -229,7 +229,7 @@
<if expr="chromeos">
<include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
</if>

26
www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_cc
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.17 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/chrome_content_browser_client.cc.orig.port Wed Mar 11 07:29:41 2015
+++ chrome/browser/chrome_content_browser_client.cc Wed Mar 11 07:30:28 2015
@@ -167,7 +167,7 @@
#include "chrome/browser/chrome_browser_main_posix.h"
$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.18 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/chrome_content_browser_client.cc.orig.port Wed Apr 15 09:22:59 2015
+++ chrome/browser/chrome_content_browser_client.cc Wed Apr 15 09:23:54 2015
@@ -171,7 +171,7 @@
#include "chrome/browser/media/protected_media_identifier_permission_context_factory.h"
#endif
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.17 2015/03/1
#include "base/debug/leak_annotations.h"
#include "components/crash/app/breakpad_linux.h"
#include "components/crash/browser/crash_handler_host_linux.h"
@@ -443,7 +443,7 @@ bool CertMatchesFilter(const net::X509Certificate& cer
@@ -446,7 +446,7 @@ bool CertMatchesFilter(const net::X509Certificate& cer
return false;
}
@ -19,16 +19,16 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.17 2015/03/1
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
const std::string& process_type) {
base::FilePath dumps_path;
@@ -1232,7 +1232,7 @@ bool IsAutoReloadVisibleOnlyEnabled() {
void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
base::CommandLine* command_line,
int child_process_id) {
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) && !defined(OS_BSD)
@@ -1295,7 +1295,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}
-#elif defined(OS_POSIX)
+#elif defined(OS_POSIX) && !defined(OS_BSD)
if (breakpad::IsCrashReporterEnabled()) {
scoped_ptr<metrics::ClientInfo> client_info =
GoogleUpdateSettings::LoadMetricsClientInfo();
@@ -2434,7 +2434,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -2409,7 +2409,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}

12
www/chromium/patches/patch-chrome_browser_chrome_content_browser_client_h
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.11 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/chrome_content_browser_client.h.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/chrome_content_browser_client.h Wed Mar 11 07:22:50 2015
@@ -258,7 +258,7 @@ class ChromeContentBrowserClient : public content::Con
net::CookieStore* OverrideCookieStoreForRenderProcess(
int render_process_id) override;
$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.12 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/chrome_content_browser_client.h.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/chrome_content_browser_client.h Wed Apr 15 08:32:50 2015
@@ -266,7 +266,7 @@ class ChromeContentBrowserClient : public content::Con
content::RenderFrameHost* render_frame_host,
blink::WebPageVisibilityState* visibility_state) override;
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)

8
www/chromium/patches/patch-chrome_browser_download_chrome_download_manager_delegate_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.1 2015/02/15 19:51:28 robert Exp $
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig.port Sun Feb 15 11:06:29 2015
+++ chrome/browser/download/chrome_download_manager_delegate.cc Sun Feb 15 11:06:44 2015
@@ -719,7 +719,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.2 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/download/chrome_download_manager_delegate.cc Wed Apr 15 08:32:50 2015
@@ -720,7 +720,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
const base::FilePath& path) {

36
www/chromium/patches/patch-chrome_browser_download_download_shelf_context_menu_cc
View File

@ -1,28 +1,28 @@
$OpenBSD: patch-chrome_browser_download_download_shelf_context_menu_cc,v 1.1 2015/01/22 11:16:40 robert Exp $
--- chrome/browser/download/download_shelf_context_menu.cc.orig.port Sat Dec 6 16:55:11 2014
+++ chrome/browser/download/download_shelf_context_menu.cc Sat Dec 6 16:56:00 2014
@@ -122,7 +122,7 @@ bool DownloadShelfContextMenu::IsCommandIdChecked(int
return download_item_->GetOpenWhenComplete() ||
$OpenBSD: patch-chrome_browser_download_download_shelf_context_menu_cc,v 1.2 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/download/download_shelf_context_menu.cc.orig.port Wed Apr 15 09:23:59 2015
+++ chrome/browser/download/download_shelf_context_menu.cc Wed Apr 15 09:24:37 2015
@@ -123,7 +123,7 @@ bool DownloadShelfContextMenu::IsCommandIdChecked(int
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 defined(OS_WIN) || defined(OS_LINUX) || \
- (defined(OS_MACOSX) && !defined(OS_IOS))
+ (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD)
if (CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
@@ -162,7 +162,7 @@ void DownloadShelfContextMenu::ExecuteCommand(int comm
bool is_checked = IsCommandIdChecked(ALWAYS_OPEN_TYPE);
download_item_->GetBrowserContext());
@@ -163,7 +163,7 @@ void DownloadShelfContextMenu::ExecuteCommand(int comm
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 defined(OS_WIN) || defined(OS_LINUX) || \
- (defined(OS_MACOSX) && !defined(OS_IOS))
+ (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD)
if (CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
@@ -390,14 +390,14 @@ int DownloadShelfContextMenu::GetAlwaysOpenStringId()
#if defined(OS_WIN)
if (CanOpenPdfInSystemViewer())
return IDS_DOWNLOAD_MENU_ALWAYS_OPEN_PDF_IN_READER;
DownloadItemModel(download_item_).SetShouldPreferOpeningInBrowser(
@@ -392,14 +392,14 @@ int DownloadShelfContextMenu::GetAlwaysOpenStringId()
return IsAdobeReaderDefaultPDFViewer()
? IDS_DOWNLOAD_MENU_ALWAYS_OPEN_PDF_IN_READER
: IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
-#elif defined(OS_MACOSX) || defined(OS_LINUX)
+#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
if (CanOpenPdfInSystemViewer())
@ -36,7 +36,7 @@ $OpenBSD: patch-chrome_browser_download_download_shelf_context_menu_cc,v 1.1 201
bool DownloadShelfContextMenu::IsDownloadPdf() const {
base::FilePath path = download_item_->GetTargetFilePath();
return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
@@ -409,7 +409,7 @@ bool DownloadShelfContextMenu::CanOpenPdfInSystemViewe
@@ -411,7 +411,7 @@ bool DownloadShelfContextMenu::CanOpenPdfInSystemViewe
return IsDownloadPdf() &&
(IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date_ :
true);

8
www/chromium/patches/patch-chrome_browser_first_run_upgrade_util_linux_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-chrome_browser_first_run_upgrade_util_linux_cc,v 1.3 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/first_run/upgrade_util_linux.cc.orig.port Wed Mar 11 07:30:40 2015
+++ chrome/browser/first_run/upgrade_util_linux.cc Wed Mar 11 07:31:09 2015
$OpenBSD: patch-chrome_browser_first_run_upgrade_util_linux_cc,v 1.4 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/first_run/upgrade_util_linux.cc.orig.port Wed Apr 15 09:24:43 2015
+++ chrome/browser/first_run/upgrade_util_linux.cc Wed Apr 15 09:25:11 2015
@@ -22,10 +22,15 @@ double saved_last_modified_time_of_exe = 0;
namespace upgrade_util {
@ -9,7 +9,7 @@ $OpenBSD: patch-chrome_browser_first_run_upgrade_util_linux_cc,v 1.3 2015/03/18
base::LaunchOptions options;
// Don't set NO_NEW_PRIVS on the relaunched browser process.
options.allow_new_privs = true;
return base::LaunchProcess(command_line, options, NULL);
return base::LaunchProcess(command_line, options).IsValid();
+#else
+ NOTIMPLEMENTED();
+ return false;

12
www/chromium/patches/patch-chrome_browser_memory_details_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.25 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/memory_details.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/memory_details.cc Wed Mar 11 07:22:50 2015
@@ -27,7 +27,7 @@
$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.26 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/memory_details.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/memory_details.cc Wed Apr 15 08:32:50 2015
@@ -30,7 +30,7 @@
#include "content/public/common/content_constants.h"
#include "ui/base/l10n/l10n_util.h"
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_memory_details_cc,v 1.25 2015/03/18 19:26:29 robe
#include "content/public/browser/zygote_host_linux.h"
#endif
@@ -247,7 +247,7 @@ void MemoryDetails::CollectChildInfoOnIOThread() {
@@ -209,7 +209,7 @@ void MemoryDetails::CollectChildInfoOnIOThread(Collect
void MemoryDetails::CollectChildInfoOnUIThread() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_memory_details_cc,v 1.25 2015/03/18 19:26:29 robe
const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid();
#endif
@@ -389,7 +389,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
@@ -351,7 +351,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
}
}

8
www/chromium/patches/patch-chrome_browser_net_async_dns_field_trial_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_net_async_dns_field_trial_cc,v 1.1 2014/07/20 17:22:33 robert Exp $
--- chrome/browser/net/async_dns_field_trial.cc.orig.port Sat Jul 19 11:17:49 2014
+++ chrome/browser/net/async_dns_field_trial.cc Sat Jul 19 11:29:34 2014
@@ -16,7 +16,7 @@ bool ConfigureAsyncDnsFieldTrial() {
$OpenBSD: patch-chrome_browser_net_async_dns_field_trial_cc,v 1.2 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/net/async_dns_field_trial.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/net/async_dns_field_trial.cc Wed Apr 15 08:32:50 2015
@@ -67,7 +67,7 @@ bool ConfigureAsyncDnsFieldTrial() {
return false;
#endif

8
www/chromium/patches/patch-chrome_browser_notifications_message_center_notification_manager_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_notifications_message_center_notification_manager_cc,v 1.1 2015/01/22 11:16:40 robert Exp $
--- chrome/browser/notifications/message_center_notification_manager.cc.orig.port Sat Dec 27 12:59:28 2014
+++ chrome/browser/notifications/message_center_notification_manager.cc Sat Dec 27 13:04:12 2014
@@ -83,7 +83,7 @@ MessageCenterNotificationManager::MessageCenterNotific
$OpenBSD: patch-chrome_browser_notifications_message_center_notification_manager_cc,v 1.2 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/notifications/message_center_notification_manager.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/notifications/message_center_notification_manager.cc Wed Apr 15 08:32:50 2015
@@ -80,7 +80,7 @@ MessageCenterNotificationManager::MessageCenterNotific
#endif
blockers_.push_back(new FullscreenNotificationBlocker(message_center));

10
www/chromium/patches/patch-chrome_browser_platform_util_linux_cc
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-chrome_browser_platform_util_linux_cc,v 1.1 2014/07/20 17:22:33 robert Exp $
--- chrome/browser/platform_util_linux.cc.orig.port Fri Jul 18 03:49:32 2014
+++ chrome/browser/platform_util_linux.cc Fri Jul 18 03:49:55 2014
@@ -22,7 +22,9 @@ void XDGUtil(const std::string& util, const std::strin
argv.push_back(arg);
$OpenBSD: patch-chrome_browser_platform_util_linux_cc,v 1.2 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/platform_util_linux.cc.orig.port Wed Apr 15 09:25:47 2015
+++ chrome/browser/platform_util_linux.cc Wed Apr 15 09:25:58 2015
@@ -28,7 +28,9 @@ void XDGUtil(const std::string& util,
base::LaunchOptions options;
options.current_directory = working_directory;
+#if !defined(OS_BSD)
options.allow_new_privs = true;
+#endif

10
www/chromium/patches/patch-chrome_browser_renderer_preferences_util_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.8 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/renderer_preferences_util.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/renderer_preferences_util.cc Wed Mar 11 07:22:50 2015
$OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.9 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/renderer_preferences_util.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/renderer_preferences_util.cc Wed Apr 15 08:32:50 2015
@@ -13,7 +13,7 @@
#include "content/public/common/renderer_preferences.h"
#include "third_party/skia/include/core/SkColor.h"
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.8 2015/03/18 19:
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/views/linux_ui/linux_ui.h"
@@ -76,7 +76,7 @@ void UpdateFromSystemSettings(content::RendererPrefere
@@ -84,7 +84,7 @@ void UpdateFromSystemSettings(content::RendererPrefere
prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;
#endif
@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.8 2015/03/18 19:
views::LinuxUI* linux_ui = views::LinuxUI::instance();
if (linux_ui) {
if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
@@ -98,7 +98,7 @@ void UpdateFromSystemSettings(content::RendererPrefere
@@ -106,7 +106,7 @@ void UpdateFromSystemSettings(content::RendererPrefere
}
#endif

8
www/chromium/patches/patch-chrome_browser_ssl_ssl_blocking_page_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_ssl_ssl_blocking_page_cc,v 1.4 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/ssl/ssl_blocking_page.cc.orig.port Wed Mar 11 07:31:17 2015
+++ chrome/browser/ssl/ssl_blocking_page.cc Wed Mar 11 07:31:39 2015
@@ -236,7 +236,7 @@ void LaunchDateAndTimeSettings() {
$OpenBSD: patch-chrome_browser_ssl_ssl_blocking_page_cc,v 1.5 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ssl/ssl_blocking_page.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/ssl/ssl_blocking_page.cc Wed Apr 15 08:32:50 2015
@@ -132,7 +132,7 @@ void LaunchDateAndTimeSettings() {
// iOS does not have a way to launch the date and time settings.
NOTREACHED();

8
www/chromium/patches/patch-chrome_browser_sync_profile_sync_components_factory_impl_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_sync_profile_sync_components_factory_impl_cc,v 1.11 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/sync/profile_sync_components_factory_impl.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/sync/profile_sync_components_factory_impl.cc Wed Mar 11 07:22:50 2015
@@ -382,7 +382,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktop
$OpenBSD: patch-chrome_browser_sync_profile_sync_components_factory_impl_cc,v 1.12 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/sync/profile_sync_components_factory_impl.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/sync/profile_sync_components_factory_impl.cc Wed Apr 15 08:32:50 2015
@@ -396,7 +396,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktop
}
#endif

12
www/chromium/patches/patch-chrome_browser_tracing_crash_service_uploader_cc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-chrome_browser_tracing_crash_service_uploader_cc,v 1.1 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/tracing/crash_service_uploader.cc.orig.port Wed Apr 15 15:38:34 2015
+++ chrome/browser/tracing/crash_service_uploader.cc Wed Apr 15 15:38:45 2015
@@ -127,6 +127,8 @@ void TraceCrashServiceUploader::DoUploadOnFileThread(
const char product[] = "Chrome_Android";
#elif defined(OS_CHROMEOS)
const char product[] = "Chrome_ChromeOS";
+#elif defined(OS_OPENBSD)
+ const char product[] = "Chrome_OpenBSD";
#else
#error Platform not supported.
#endif

8
www/chromium/patches/patch-chrome_browser_ui_ash_system_tray_delegate_common_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_ui_ash_system_tray_delegate_common_cc,v 1.2 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/ui/ash/system_tray_delegate_common.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/ui/ash/system_tray_delegate_common.cc Wed Mar 11 07:22:50 2015
@@ -118,7 +118,7 @@ void SystemTrayDelegateCommon::ShowDisplaySettings() {
$OpenBSD: patch-chrome_browser_ui_ash_system_tray_delegate_common_cc,v 1.3 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ui/ash/system_tray_delegate_common.cc.orig.port Wed Apr 15 00:18:50 2015
+++ chrome/browser/ui/ash/system_tray_delegate_common.cc Wed Apr 15 08:32:50 2015
@@ -79,7 +79,7 @@ base::HourClockType SystemTrayDelegateCommon::GetHourC
}
void SystemTrayDelegateCommon::ShowChromeSlow() {

8
www/chromium/patches/patch-chrome_browser_ui_browser_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_ui_browser_cc,v 1.7 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/ui/browser.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/ui/browser.cc Wed Mar 11 07:22:50 2015
@@ -1288,7 +1288,7 @@ void Browser::OnWindowDidShow() {
$OpenBSD: patch-chrome_browser_ui_browser_cc,v 1.8 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ui/browser.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/ui/browser.cc Wed Apr 15 08:32:50 2015
@@ -1284,7 +1284,7 @@ void Browser::OnWindowDidShow() {
window_has_shown_ = true;
// CurrentProcessInfo::CreationTime() is missing on some platforms.

16
www/chromium/patches/patch-chrome_browser_ui_browser_command_controller_cc
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.6 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/ui/browser_command_controller.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/ui/browser_command_controller.cc Wed Mar 11 07:22:50 2015
@@ -68,7 +68,7 @@
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
$OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.7 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ui/browser_command_controller.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/ui/browser_command_controller.cc Wed Apr 15 08:32:50 2015
@@ -69,7 +69,7 @@
#include "chrome/browser/ui/browser_commands_chromeos.h"
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.6 2015/03/18
#include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif
@@ -280,7 +280,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
@@ -281,7 +281,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN)
return true;
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.6 2015/03/18
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
@@ -473,7 +473,7 @@ void BrowserCommandController::ExecuteCommandWithDispo
@@ -474,7 +474,7 @@ void BrowserCommandController::ExecuteCommandWithDispo
break;
#endif
@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.6 2015/03/18
case IDC_USE_SYSTEM_TITLE_BAR: {
PrefService* prefs = browser_->profile()->GetPrefs();
prefs->SetBoolean(prefs::kUseCustomChromeFrame,
@@ -897,7 +897,7 @@ void BrowserCommandController::InitCommandState() {
@@ -903,7 +903,7 @@ void BrowserCommandController::InitCommandState() {
command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
#endif

8
www/chromium/patches/patch-chrome_browser_ui_startup_startup_browser_creator_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_ui_startup_startup_browser_creator_cc,v 1.6 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/ui/startup/startup_browser_creator.cc Wed Mar 11 07:22:50 2015
@@ -581,8 +581,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
$OpenBSD: patch-chrome_browser_ui_startup_startup_browser_creator_cc,v 1.7 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/ui/startup/startup_browser_creator.cc Wed Apr 15 08:32:50 2015
@@ -577,8 +577,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
}
#endif // OS_CHROMEOS

8
www/chromium/patches/patch-chrome_browser_ui_toolbar_wrench_menu_model_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_ui_toolbar_wrench_menu_model_cc,v 1.10 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/ui/toolbar/wrench_menu_model.cc Wed Mar 11 07:22:50 2015
@@ -747,7 +747,7 @@ bool WrenchMenuModel::IsCommandIdVisible(int command_i
$OpenBSD: patch-chrome_browser_ui_toolbar_wrench_menu_model_cc,v 1.11 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/ui/toolbar/wrench_menu_model.cc Wed Apr 15 08:32:50 2015
@@ -762,7 +762,7 @@ bool WrenchMenuModel::IsCommandIdVisible(int command_i
#endif
case IDC_UPGRADE_DIALOG:
return UpgradeDetector::GetInstance()->notify_upgrade();

8
www/chromium/patches/patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_cc,v 1.6 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/ui/views/apps/chrome_native_app_window_views.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/ui/views/apps/chrome_native_app_window_views.cc Wed Mar 11 07:22:50 2015
$OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_cc,v 1.7 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ui/views/apps/chrome_native_app_window_views.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/ui/views/apps/chrome_native_app_window_views.cc Wed Apr 15 08:32:50 2015
@@ -30,7 +30,7 @@
#include "ui/wm/core/easy_resize_window_targeter.h"
#include "ui/wm/core/shadow_types.h"
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_cc,v
#include "chrome/browser/shell_integration_linux.h"
#endif
@@ -223,7 +223,7 @@ void ChromeNativeAppWindowViews::InitializeDefaultWind
@@ -230,7 +230,7 @@ void ChromeNativeAppWindowViews::InitializeDefaultWind
init_params.visible_on_all_workspaces =
create_params.visible_on_all_workspaces;

12
www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.6 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/ui/views/chrome_views_delegate.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/ui/views/chrome_views_delegate.cc Wed Mar 11 07:22:50 2015
@@ -44,7 +44,7 @@
$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.7 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ui/views/chrome_views_delegate.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/ui/views/chrome_views_delegate.cc Wed Apr 15 08:32:50 2015
@@ -43,7 +43,7 @@
#include "ui/views/widget/native_widget_aura.h"
#endif
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.6 2015/03/1
#include "ui/views/linux_ui/linux_ui.h"
#endif
@@ -238,7 +238,7 @@ bool ChromeViewsDelegate::IsWindowInMetro(gfx::NativeW
@@ -224,7 +224,7 @@ bool ChromeViewsDelegate::IsWindowInMetro(gfx::NativeW
return chrome::IsNativeViewInAsh(window);
}
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.6 2015/03/1
gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64);
@@ -377,7 +377,7 @@ void ChromeViewsDelegate::OnBeforeWidgetInit(
@@ -363,7 +363,7 @@ void ChromeViewsDelegate::OnBeforeWidgetInit(
#endif
}

10
www/chromium/patches/patch-chrome_browser_ui_views_chrome_views_delegate_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_h,v 1.5 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/ui/views/chrome_views_delegate.h.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/ui/views/chrome_views_delegate.h Wed Mar 11 07:22:50 2015
@@ -36,7 +36,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_h,v 1.6 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ui/views/chrome_views_delegate.h.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/ui/views/chrome_views_delegate.h Wed Apr 15 08:32:50 2015
@@ -31,7 +31,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
virtual HICON GetDefaultWindowIcon() const override;
virtual HICON GetSmallWindowIcon() const override;
virtual bool IsWindowInMetro(gfx::NativeWindow window) const override;
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_h,v 1.5 2015/03/18
gfx::ImageSkia* GetDefaultWindowIcon() const override;
#endif
@@ -49,7 +49,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
@@ -44,7 +44,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
void OnBeforeWidgetInit(
views::Widget::InitParams* params,
views::internal::NativeWidgetDelegate* delegate) override;

21
www/chromium/patches/patch-chrome_browser_ui_views_frame_desktop_browser_frame_aura_cc
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-chrome_browser_ui_views_frame_desktop_browser_frame_aura_cc,v 1.1 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc.orig.port Wed Mar 11 07:33:50 2015
+++ chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc Wed Mar 11 07:34:09 2015
@@ -21,7 +21,7 @@
#include "ui/views/view.h"
#include "ui/wm/core/visibility_controller.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "chrome/browser/shell_integration_linux.h"
#endif
@@ -85,7 +85,7 @@ views::Widget::InitParams DesktopBrowserFrameAura::Get
views::Widget::InitParams params;
params.native_widget = this;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Set up a custom WM_CLASS for some sorts of window types. This allows
// task switchers in X11 environments to distinguish between main browser
// windows and e.g app windows.

23
www/chromium/patches/patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.9 2015/01/22 11:16:41 robert Exp $
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig.port Wed Dec 3 03:32:11 2014
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc Sat Dec 6 11:34:25 2014
$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.10 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig.port Wed Apr 15 09:27:17 2015
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc Wed Apr 15 09:27:53 2015
@@ -54,7 +54,7 @@
#include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h"
#endif
@ -15,11 +15,11 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.9
const int kIconMinimumSize = 16;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+#if defined(OS_BSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
// The number of pixels to move the frame background image upwards when using
// the GTK+ theme and the titlebar is condensed.
const int kGTKThemeCondensedFrameTopInset = 15;
@@ -335,7 +335,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
@@ -341,7 +341,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source,
const gfx::Point& point) {
@ -28,21 +28,12 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.9
views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
views::MenuRunner::HAS_MNEMONICS);
ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(),
@@ -588,7 +588,7 @@ gfx::Rect OpaqueBrowserFrameView::IconBounds() const {
}
bool OpaqueBrowserFrameView::ShouldShowWindowTitleBar() const {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
// Do not show the custom title bar if the system title bar option is enabled.
if (!frame()->UseCustomFrame())
return false;
@@ -633,7 +633,7 @@ void OpaqueBrowserFrameView::PaintMaximizedFrameBorder
@@ -637,7 +637,7 @@ void OpaqueBrowserFrameView::PaintMaximizedFrameBorder
frame_background_->set_theme_image(GetFrameImage());
frame_background_->set_theme_overlay_image(GetFrameOverlayImage());
frame_background_->set_top_area_height(GetTopAreaHeight());
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+#if defined(OS_BSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
// The window manager typically shows a gradient in the native title bar (when
// the system title bar pref is set, or when maximized on Ubuntu). Hide the
// gradient in the tab strip (by shifting it up vertically) to avoid a

8
www/chromium/patches/patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc,v 1.1 2014/07/20 17:22:34 robert Exp $
--- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig.port Sat Jul 19 03:27:25 2014
+++ chrome/browser/ui/views/message_center/message_center_frame_view.cc Sat Jul 19 03:30:52 2014
@@ -12,7 +12,7 @@
$OpenBSD: patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc,v 1.2 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig.port Wed Apr 15 00:31:21 2015
+++ chrome/browser/ui/views/message_center/message_center_frame_view.cc Wed Apr 15 08:32:50 2015
@@ -13,7 +13,7 @@
namespace message_center {
MessageCenterFrameView::MessageCenterFrameView() {

8
www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_strip_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_strip_cc,v 1.9 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/ui/views/tabs/tab_strip.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/ui/views/tabs/tab_strip.cc Wed Mar 11 07:22:50 2015
@@ -282,7 +282,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, views:
$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_strip_cc,v 1.10 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ui/views/tabs/tab_strip.cc.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/browser/ui/views/tabs/tab_strip.cc Wed Apr 15 08:32:50 2015
@@ -284,7 +284,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, views:
: views::ImageButton(listener),
tab_strip_(tab_strip),
destroyed_(NULL) {

29
www/chromium/patches/patch-chrome_browser_ui_webui_about_ui_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.25 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/ui/webui/about_ui.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/ui/webui/about_ui.cc Wed Mar 11 07:22:50 2015
@@ -65,7 +65,7 @@
$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.26 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ui/webui/about_ui.cc.orig.port Wed Apr 15 00:18:50 2015
+++ chrome/browser/ui/webui/about_ui.cc Sat Apr 25 16:24:39 2015
@@ -64,7 +64,7 @@
#include "chrome/browser/ui/webui/theme_source.h"
#endif
@ -10,15 +10,15 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.25 2015/03/18 19:26:29 r
#include "content/public/browser/zygote_host_linux.h"
#include "content/public/common/sandbox_linux.h"
#endif
@@ -844,6 +844,7 @@ std::string AboutLinuxProxyConfig() {
@@ -675,6 +675,7 @@ std::string AboutLinuxProxyConfig() {
return data;
}
+#if !defined(OS_OPENBSD)
void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id,
bool good) {
+#if !defined(OS_BSD)
void AboutSandboxRow(std::string* data, int name_id, bool good) {
data->append("<tr><td>");
@@ -918,6 +919,7 @@ std::string AboutSandbox() {
data->append(l10n_util::GetStringUTF8(name_id));
@@ -742,6 +743,7 @@ std::string AboutSandbox() {
return data;
}
#endif
@ -26,7 +26,16 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.25 2015/03/18 19:26:29 r
// AboutMemoryHandler ----------------------------------------------------------
@@ -1103,7 +1105,7 @@ void AboutUIHTMLSource::StartDataRequest(
@@ -914,7 +916,7 @@ void AboutUIHTMLSource::StartDataRequest(
} else if (source_name_ == chrome::kChromeUIDNSHost) {
AboutDnsHandler::Start(profile(), callback);
return;
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
} else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
response = AboutLinuxProxyConfig();
#endif
@@ -928,7 +930,7 @@ void AboutUIHTMLSource::StartDataRequest(
ChromeOSCreditsHandler::Start(path, callback);
return;
#endif

8
www/chromium/patches/patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.2 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig.port Wed Mar 11 07:34:47 2015
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc Wed Mar 11 07:35:05 2015
@@ -481,7 +481,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.3 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc Wed Apr 15 08:32:50 2015
@@ -480,7 +480,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>;
#endif

18
www/chromium/patches/patch-chrome_browser_ui_webui_options_browser_options_handler_cc
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.12 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/ui/webui/options/browser_options_handler.cc Wed Mar 11 07:22:50 2015
@@ -368,7 +368,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::D
{ "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
{ "translateEnableTranslate",
IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
$OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.13 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig.port Wed Apr 15 09:29:04 2015
+++ chrome/browser/ui/webui/options/browser_options_handler.cc Wed Apr 15 09:29:29 2015
@@ -470,7 +470,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::D
{ "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
#endif // defined(OS_CHROMEOS)
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
{ "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.1
web_ui()->RegisterMessageCallback(
"themesSetNative",
base::Bind(&BrowserOptionsHandler::ThemesSetNative,
@@ -1372,7 +1372,7 @@ void BrowserOptionsHandler::ObserveThemeChanged() {
@@ -1384,7 +1384,7 @@ void BrowserOptionsHandler::ObserveThemeChanged() {
ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
bool is_system_theme = false;
@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.1
bool profile_is_supervised = profile->IsSupervised();
is_system_theme = theme_service->UsingSystemTheme();
base::FundamentalValue native_theme_enabled(!is_system_theme &&
@@ -1394,7 +1394,7 @@ void BrowserOptionsHandler::ThemesReset(const base::Li
@@ -1406,7 +1406,7 @@ void BrowserOptionsHandler::ThemesReset(const base::Li
ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
}

8
www/chromium/patches/patch-chrome_browser_web_applications_web_app_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-chrome_browser_web_applications_web_app_cc,v 1.12 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/web_applications/web_app.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/web_applications/web_app.cc Wed Mar 11 07:22:50 2015
$OpenBSD: patch-chrome_browser_web_applications_web_app_cc,v 1.13 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/web_applications/web_app.cc.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/browser/web_applications/web_app.cc Wed Apr 15 08:32:50 2015
@@ -54,7 +54,7 @@ namespace {
#if defined(OS_MACOSX)
const int kDesiredSizes[] = {16, 32, 128, 256, 512};
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_web_applications_web_app_cc,v 1.12 2015/03/18 19:
// Linux supports icons of any size. FreeDesktop Icon Theme Specification states
// that "Minimally you should install a 48x48 icon in the hicolor theme."
const int kDesiredSizes[] = {16, 32, 48, 128, 256, 512};
@@ -471,7 +471,7 @@ void GetIconsInfo(const WebApplicationInfo& app_info,
@@ -480,7 +480,7 @@ void GetIconsInfo(const WebApplicationInfo& app_info,
}
#endif

8
www/chromium/patches/patch-chrome_browser_web_applications_web_app_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_browser_web_applications_web_app_h,v 1.5 2015/03/18 19:26:29 robert Exp $
--- chrome/browser/web_applications/web_app.h.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/browser/web_applications/web_app.h Wed Mar 11 07:22:50 2015
@@ -213,7 +213,7 @@ typedef std::vector<WebApplicationInfo::IconInfo> Icon
$OpenBSD: patch-chrome_browser_web_applications_web_app_h,v 1.6 2015/04/27 16:38:25 robert Exp $
--- chrome/browser/web_applications/web_app.h.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/browser/web_applications/web_app.h Wed Apr 15 08:32:50 2015
@@ -214,7 +214,7 @@ typedef std::vector<WebApplicationInfo::IconInfo> Icon
void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons);
#endif

14
www/chromium/patches/patch-chrome_chrome_browser_extensions_gypi
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_chrome_browser_extensions_gypi,v 1.17 2015/03/18 19:26:29 robert Exp $
--- chrome/chrome_browser_extensions.gypi.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/chrome_browser_extensions.gypi Wed Mar 11 07:22:50 2015
@@ -971,6 +971,11 @@
$OpenBSD: patch-chrome_chrome_browser_extensions_gypi,v 1.18 2015/04/27 16:38:25 robert Exp $
--- chrome/chrome_browser_extensions.gypi.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/chrome_browser_extensions.gypi Wed Apr 15 08:32:50 2015
@@ -917,6 +917,11 @@
'<@(chrome_browser_extensions_enabled_sources)',
],
'conditions': [
@ -13,9 +13,9 @@ $OpenBSD: patch-chrome_chrome_browser_extensions_gypi,v 1.17 2015/03/18 19:26:29
['chromeos==1', {
'include_dirs': [
'../third_party/libjingle/source',
@@ -1009,7 +1014,7 @@
}, {
'sources': ['<@(chrome_browser_extensions_non_athena_sources)'],
@@ -950,7 +955,7 @@
'../ui/keyboard/keyboard.gyp:keyboard_resources',
],
}],
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="openbsd"', {

20
www/chromium/patches/patch-chrome_chrome_browser_gypi
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.34 2015/03/18 19:26:29 robert Exp $
--- chrome/chrome_browser.gypi.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/chrome_browser.gypi Wed Mar 11 07:22:50 2015
@@ -3245,7 +3245,7 @@
$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.35 2015/04/27 16:38:25 robert Exp $
--- chrome/chrome_browser.gypi.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/chrome_browser.gypi Wed Apr 15 08:32:50 2015
@@ -3260,7 +3260,7 @@
'../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
],
}],
@ -10,18 +10,18 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.34 2015/03/18 19:26:29 robert Exp
'dependencies': [
'../build/linux/system.gyp:libspeechd',
],
@@ -3302,7 +3302,7 @@
}],
],
@@ -3316,7 +3316,7 @@
['use_x11==1', {
'sources': [ '<@(chrome_browser_x11_sources)' ],
}],
- ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', {
'sources': [
'app/chrome_crash_reporter_client.cc',
'app/chrome_crash_reporter_client.h',
@@ -3391,6 +3391,13 @@
@@ -3412,6 +3412,13 @@
}],
],
'sources': [ '<@(chrome_browser_android_sources)' ],
}],
+ ['os_bsd==1', {
+ 'sources/': [
@ -33,7 +33,7 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.34 2015/03/18 19:26:29 robert Exp
['OS=="mac"', {
'dependencies': [
'../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
@@ -3474,7 +3481,7 @@
@@ -3496,7 +3503,7 @@
}],
],
}],

14
www/chromium/patches/patch-chrome_chrome_browser_ui_gypi
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.10 2015/03/18 19:26:29 robert Exp $
--- chrome/chrome_browser_ui.gypi.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/chrome_browser_ui.gypi Wed Mar 11 07:22:50 2015
@@ -2891,7 +2891,7 @@
$OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.11 2015/04/27 16:38:25 robert Exp $
--- chrome/chrome_browser_ui.gypi.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/chrome_browser_ui.gypi Wed Apr 15 08:32:50 2015
@@ -2875,7 +2875,7 @@
}],
],
}],
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.10 2015/03/18 19:26:29 robert
'dependencies': [
# gtk2 is the only component that can interact with gtk2 in our new
# world.
@@ -2899,7 +2899,7 @@
@@ -2883,7 +2883,7 @@
'../build/linux/system.gyp:gio',
],
}],
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.10 2015/03/18 19:26:29 robert
'sources': [ '<@(chrome_browser_ui_desktop_sources)' ],
}],
['use_aura==1', {
@@ -2934,7 +2934,7 @@
@@ -2918,7 +2918,7 @@
['enable_print_preview==1', {
'sources': [ '<@(chrome_browser_ui_print_preview_sources)' ],
}],
@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_chrome_browser_ui_gypi,v 1.10 2015/03/18 19:26:29 robert
'sources': [ '<@(chrome_browser_ui_android_linux_sources)' ],
}],
['OS=="android"', {
@@ -3046,10 +3046,10 @@
@@ -3030,10 +3030,10 @@
}],
],
}],

18
www/chromium/patches/patch-chrome_chrome_exe_gypi
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-chrome_chrome_exe_gypi,v 1.6 2015/03/18 19:26:29 robert Exp $
--- chrome/chrome_exe.gypi.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/chrome_exe.gypi Wed Mar 11 07:22:50 2015
@@ -433,7 +433,7 @@
$OpenBSD: patch-chrome_chrome_exe_gypi,v 1.7 2015/04/27 16:38:25 robert Exp $
--- chrome/chrome_exe.gypi.orig.port Wed Apr 15 09:29:36 2015
+++ chrome/chrome_exe.gypi Wed Apr 15 09:29:54 2015
@@ -190,7 +190,7 @@
'../build/linux/system.gyp:xext',
],
}], # OS=="linux" and chromeos==0 and linux_dump_symbols==1
# Android doesn't use pdfium.
- ['OS!="android"', {
+ ['OS!="android" and (OS!="openbsd" or target_arch=="x64")', {
}],
- ['OS=="linux" and enable_plugins==1', {
+ ['(OS=="openbsd" or OS=="linux") and enable_plugins==1', {
'dependencies': [
# On Mac, this is done in chrome_dll.gypi.
'../pdf/pdf.gyp:pdf',
],

8
www/chromium/patches/patch-chrome_common_chrome_paths_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.24 2014/10/13 06:49:19 robert Exp $
--- chrome/common/chrome_paths.cc.orig.port Thu Oct 2 19:39:46 2014
+++ chrome/common/chrome_paths.cc Fri Oct 10 16:10:30 2014
@@ -461,7 +461,7 @@ bool PathProvider(int key, base::FilePath* result) {
$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.25 2015/04/27 16:38:25 robert Exp $
--- chrome/common/chrome_paths.cc.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/common/chrome_paths.cc Wed Apr 15 08:32:50 2015
@@ -460,7 +460,7 @@ bool PathProvider(int key, base::FilePath* result) {
if (!base::PathExists(cur)) // We don't want to create this
return false;
break;

8
www/chromium/patches/patch-chrome_common_chrome_paths_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_common_chrome_paths_h,v 1.5 2014/10/13 06:49:19 robert Exp $
--- chrome/common/chrome_paths.h.orig.port Thu Oct 2 19:18:54 2014
+++ chrome/common/chrome_paths.h Fri Oct 10 16:10:30 2014
@@ -112,7 +112,7 @@ enum {
$OpenBSD: patch-chrome_common_chrome_paths_h,v 1.6 2015/04/27 16:38:25 robert Exp $
--- chrome/common/chrome_paths.h.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/common/chrome_paths.h Wed Apr 15 08:32:50 2015
@@ -113,7 +113,7 @@ enum {
DIR_SUPERVISED_USERS_DEFAULT_APPS, // Directory where installer places .crx
// files to be installed when managed user
// session starts.

8
www/chromium/patches/patch-chrome_common_chrome_switches_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.10 2015/01/22 11:16:41 robert Exp $
--- chrome/common/chrome_switches.cc.orig.port Wed Dec 3 03:32:11 2014
+++ chrome/common/chrome_switches.cc Sat Dec 6 11:34:26 2014
@@ -1283,7 +1283,7 @@ const char kOpenAsh[] = "open-as
$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.11 2015/04/27 16:38:25 robert Exp $
--- chrome/common/chrome_switches.cc.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/common/chrome_switches.cc Wed Apr 15 08:32:50 2015
@@ -1254,7 +1254,7 @@ const char kOpenAsh[] = "open-as
const char kPasswordStore[] = "password-store";
#endif

8
www/chromium/patches/patch-chrome_common_chrome_switches_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.16 2015/03/18 19:26:29 robert Exp $
--- chrome/common/chrome_switches.h.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/common/chrome_switches.h Wed Mar 11 07:22:50 2015
@@ -359,7 +359,7 @@ extern const char kOpenAsh[];
$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.17 2015/04/27 16:38:25 robert Exp $
--- chrome/common/chrome_switches.h.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/common/chrome_switches.h Wed Apr 15 08:32:50 2015
@@ -357,7 +357,7 @@ extern const char kOpenAsh[];
extern const char kPasswordStore[];
#endif

8
www/chromium/patches/patch-chrome_common_extensions_api_schemas_gypi
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_common_extensions_api_schemas_gypi,v 1.3 2015/03/18 19:26:29 robert Exp $
--- chrome/common/extensions/api/schemas.gypi.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/common/extensions/api/schemas.gypi Wed Mar 11 07:22:50 2015
@@ -168,6 +168,11 @@
$OpenBSD: patch-chrome_common_extensions_api_schemas_gypi,v 1.4 2015/04/27 16:38:25 robert Exp $
--- chrome/common/extensions/api/schemas.gypi.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/common/extensions/api/schemas.gypi Wed Apr 15 08:32:50 2015
@@ -152,6 +152,11 @@
'<@(webrtc_schema_files)',
],
}],

10
www/chromium/patches/patch-chrome_common_pref_names_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_common_pref_names_cc,v 1.12 2015/03/18 19:26:29 robert Exp $
--- chrome/common/pref_names.cc.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/common/pref_names.cc Wed Mar 11 07:22:50 2015
@@ -896,7 +896,7 @@ const char kForceYouTubeSafetyMode[] = "settings.force
$OpenBSD: patch-chrome_common_pref_names_cc,v 1.13 2015/04/27 16:38:25 robert Exp $
--- chrome/common/pref_names.cc.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/common/pref_names.cc Wed Apr 15 08:32:50 2015
@@ -901,7 +901,7 @@ const char kForceYouTubeSafetyMode[] = "settings.force
// supervised users.
const char kRecordHistory[] = "settings.history_recorded";
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_common_pref_names_cc,v 1.12 2015/03/18 19:26:29 robert Ex
// Linux specific preference on whether we should match the system theme.
const char kUsesSystemTheme[] = "extensions.theme.use_system";
#endif
@@ -1428,7 +1428,7 @@ const char kDownloadDefaultDirectory[] = "download.def
@@ -1440,7 +1440,7 @@ const char kDownloadDefaultDirectory[] = "download.def
// upgrade a unsafe location to a safe location.
const char kDownloadDirUpgraded[] = "download.directory_upgrade";

10
www/chromium/patches/patch-chrome_common_pref_names_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_common_pref_names_h,v 1.12 2015/03/18 19:26:29 robert Exp $
--- chrome/common/pref_names.h.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/common/pref_names.h Wed Mar 11 07:22:50 2015
@@ -296,7 +296,7 @@ extern const char kForceYouTubeSafetyMode[];
$OpenBSD: patch-chrome_common_pref_names_h,v 1.13 2015/04/27 16:38:25 robert Exp $
--- chrome/common/pref_names.h.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/common/pref_names.h Wed Apr 15 08:32:50 2015
@@ -297,7 +297,7 @@ extern const char kForceYouTubeSafetyMode[];
extern const char kRecordHistory[];
extern const char kDeleteTimePeriod[];
extern const char kLastClearBrowsingDataTime[];
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_common_pref_names_h,v 1.12 2015/03/18 19:26:29 robert Exp
extern const char kUsesSystemTheme[];
#endif
extern const char kCurrentThemePackFilename[];
@@ -493,7 +493,7 @@ extern const char kAppWindowPlacement[];
@@ -498,7 +498,7 @@ extern const char kAppWindowPlacement[];
extern const char kDownloadDefaultDirectory[];
extern const char kDownloadExtensionsToOpen[];
extern const char kDownloadDirUpgraded[];

8
www/chromium/patches/patch-chrome_test_perf_perf_test_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_test_perf_perf_test_cc,v 1.5 2013/12/12 10:43:18 robert Exp $
--- chrome/test/perf/perf_test.cc.orig.port Wed Dec 4 21:55:17 2013
+++ chrome/test/perf/perf_test.cc Thu Dec 5 15:32:45 2013
@@ -352,7 +352,7 @@ std::string MemoryUsageInfoToString(const std::string&
$OpenBSD: patch-chrome_test_perf_perf_test_cc,v 1.6 2015/04/27 16:38:25 robert Exp $
--- chrome/test/perf/perf_test.cc.orig.port Wed Apr 15 00:31:22 2015
+++ chrome/test/perf/perf_test.cc Wed Apr 15 08:32:50 2015
@@ -349,7 +349,7 @@ std::string MemoryUsageInfoToString(const std::string&
AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name,
total_working_set_size, "bytes",
false /* not important */);

12
www/chromium/patches/patch-components_audio_modem_modem_impl_cc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-components_audio_modem_modem_impl_cc,v 1.1 2015/04/27 16:38:25 robert Exp $
--- components/audio_modem/modem_impl.cc.orig.port Wed Apr 15 15:37:11 2015
+++ components/audio_modem/modem_impl.cc Wed Apr 15 15:41:00 2015
@@ -8,6 +8,8 @@
#include <limits>
#include <vector>
+#include <math.h>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/command_line.h"

12
www/chromium/patches/patch-components_policy_resources_policy_templates_json
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-components_policy_resources_policy_templates_json,v 1.9 2015/03/18 19:26:29 robert Exp $
--- components/policy/resources/policy_templates.json.orig.port Tue Mar 10 23:41:41 2015
+++ components/policy/resources/policy_templates.json Wed Mar 11 07:22:50 2015
@@ -1611,7 +1611,7 @@
$OpenBSD: patch-components_policy_resources_policy_templates_json,v 1.10 2015/04/27 16:38:25 robert Exp $
--- components/policy/resources/policy_templates.json.orig.port Wed Apr 15 00:31:22 2015
+++ components/policy/resources/policy_templates.json Wed Apr 15 08:32:50 2015
@@ -1700,7 +1700,7 @@
'name': 'GSSAPILibraryName',
'type': 'string',
'schema': { 'type': 'string' },
@ -10,7 +10,7 @@ $OpenBSD: patch-components_policy_resources_policy_templates_json,v 1.9 2015/03/
'features': {
'dynamic_refresh': False,
'per_profile': False,
@@ -3955,7 +3955,7 @@
@@ -4044,7 +4044,7 @@
'name': 'RequireOnlineRevocationChecksForLocalAnchors',
'type': 'main',
'schema': { 'type': 'boolean' },
@ -19,7 +19,7 @@ $OpenBSD: patch-components_policy_resources_policy_templates_json,v 1.9 2015/03/
'features': {
'dynamic_refresh': True,
'per_profile': False,
@@ -4634,7 +4634,7 @@
@@ -4776,7 +4776,7 @@
'name': 'BackgroundModeEnabled',
'type': 'main',
'schema': { 'type': 'boolean' },

8
www/chromium/patches/patch-chrome_renderer_printing_print_web_view_helper_h → www/chromium/patches/patch-components_printing_renderer_print_web_view_helper_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-chrome_renderer_printing_print_web_view_helper_h,v 1.12 2015/03/18 19:26:29 robert Exp $
--- chrome/renderer/printing/print_web_view_helper.h.orig.port Tue Mar 10 23:41:40 2015
+++ chrome/renderer/printing/print_web_view_helper.h Wed Mar 11 07:22:50 2015
@@ -232,7 +232,7 @@ class PrintWebViewHelper
$OpenBSD: patch-components_printing_renderer_print_web_view_helper_h,v 1.1 2015/04/27 16:38:25 robert Exp $
--- components/printing/renderer/print_web_view_helper.h.orig.port Wed Apr 15 09:31:19 2015
+++ components/printing/renderer/print_web_view_helper.h Wed Apr 15 09:31:31 2015
@@ -246,7 +246,7 @@ class PrintWebViewHelper
void FinishFramePrinting();
// Prints the page listed in |params|.

13
www/chromium/patches/patch-content_app_content_main_runner_cc
View File

@ -1,12 +1,13 @@
$OpenBSD: patch-content_app_content_main_runner_cc,v 1.20 2015/01/22 11:16:41 robert Exp $
--- content/app/content_main_runner.cc.orig.port Wed Dec 3 03:13:24 2014
+++ content/app/content_main_runner.cc Sat Dec 6 11:34:26 2014
@@ -98,10 +98,10 @@
$OpenBSD: patch-content_app_content_main_runner_cc,v 1.21 2015/04/27 16:38:25 robert Exp $
--- content/app/content_main_runner.cc.orig.port Wed Apr 15 09:31:58 2015
+++ content/app/content_main_runner.cc Wed Apr 15 09:32:36 2015
@@ -93,11 +93,11 @@
#include "base/posix/global_descriptors.h"
#include "content/public/common/content_descriptors.h"
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
#include "content/public/common/content_descriptors.h"
#include "content/public/common/zygote_fork_delegate_linux.h"
#endif
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
@ -14,7 +15,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.20 2015/01/22 11:16:41 ro
#include "content/zygote/zygote_main.h"
#endif
@@ -294,7 +294,7 @@ struct MainFunction {
@@ -258,7 +258,7 @@ struct MainFunction {
int (*function)(const MainFunctionParams&);
};
@ -23,7 +24,7 @@ $OpenBSD: patch-content_app_content_main_runner_cc,v 1.20 2015/01/22 11:16:41 ro
// On platforms that use the zygote, we have a special subset of
// subprocesses that are launched via the zygote. This function
// fills in some process-launching bits around ZygoteMain().
@@ -424,7 +424,7 @@ int RunNamedProcessTypeMain(
@@ -383,7 +383,7 @@ int RunNamedProcessTypeMain(
}
}

12
www/chromium/patches/patch-content_browser_browser_main_loop_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.25 2015/03/18 19:26:29 robert Exp $
--- content/browser/browser_main_loop.cc.orig.port Tue Mar 10 23:41:41 2015
+++ content/browser/browser_main_loop.cc Wed Mar 11 07:22:50 2015
@@ -142,7 +142,7 @@
$OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.26 2015/04/27 16:38:25 robert Exp $
--- content/browser/browser_main_loop.cc.orig.port Wed Apr 15 00:31:22 2015
+++ content/browser/browser_main_loop.cc Wed Apr 15 08:32:50 2015
@@ -143,7 +143,7 @@
namespace content {
namespace {
@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.25 2015/03/18 19:26:29
void SetupSandbox(const base::CommandLine& parsed_command_line) {
TRACE_EVENT0("startup", "SetupSandbox");
base::FilePath sandbox_binary;
@@ -387,7 +387,7 @@ void BrowserMainLoop::Init() {
@@ -388,7 +388,7 @@ void BrowserMainLoop::Init() {
void BrowserMainLoop::EarlyInitialization() {
TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_browser_main_loop_cc,v 1.25 2015/03/18 19:26:29
// No thread should be created before this call, as SetupSandbox()
// will end-up using fork().
SetupSandbox(parsed_command_line_);
@@ -851,7 +851,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
@@ -872,7 +872,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
}
#endif

36
www/chromium/patches/patch-content_browser_child_process_launcher_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:26:29 robert Exp $
--- content/browser/child_process_launcher.cc.orig.port Wed Mar 11 07:35:16 2015
+++ content/browser/child_process_launcher.cc Wed Mar 11 21:28:07 2015
@@ -121,7 +121,7 @@ class ChildProcessLauncher::Context
$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.20 2015/04/27 16:38:25 robert Exp $
--- content/browser/child_process_launcher.cc.orig.port Wed Apr 15 00:31:22 2015
+++ content/browser/child_process_launcher.cc Wed Apr 15 08:32:50 2015
@@ -120,7 +120,7 @@ class ChildProcessLauncher::Context
// Notifies the client about the result of the operation.
// Runs on the UI thread.
void Notify(
@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2
bool zygote,
#endif
base::Process process);
@@ -132,7 +132,7 @@ class ChildProcessLauncher::Context
@@ -131,7 +131,7 @@ class ChildProcessLauncher::Context
bool background);
static void TerminateInternal(
@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2
bool zygote,
#endif
base::Process process);
@@ -145,7 +145,7 @@ class ChildProcessLauncher::Context
@@ -144,7 +144,7 @@ class ChildProcessLauncher::Context
#if defined(OS_ANDROID)
// The fd to close after creating the process.
base::ScopedFD ipcfd_;
@ -28,7 +28,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2
bool zygote_;
#endif
bool starting_;
@@ -159,7 +159,7 @@ ChildProcessLauncher::Context::Context()
@@ -158,7 +158,7 @@ ChildProcessLauncher::Context::Context()
client_thread_id_(BrowserThread::UI),
termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION),
exit_code_(RESULT_CODE_NORMAL_EXIT),
@ -37,7 +37,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2
zygote_(false),
#endif
starting_(true),
@@ -239,7 +239,7 @@ void ChildProcessLauncher::Context::ResetClient() {
@@ -238,7 +238,7 @@ void ChildProcessLauncher::Context::ResetClient() {
}
void ChildProcessLauncher::Context::UpdateTerminationStatus(bool known_dead) {
@ -46,7 +46,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2
if (zygote_) {
termination_status_ = ZygoteHostImpl::GetInstance()->
GetTerminationStatus(process_.Handle(), known_dead, &exit_code_);
@@ -247,7 +247,7 @@ void ChildProcessLauncher::Context::UpdateTerminationS
@@ -246,7 +246,7 @@ void ChildProcessLauncher::Context::UpdateTerminationS
termination_status_ =
base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_);
} else {
@ -55,7 +55,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2
if (known_dead) {
termination_status_ =
base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_);
@@ -317,7 +317,9 @@ void ChildProcessLauncher::Context::LaunchInternal(
@@ -316,7 +316,9 @@ void ChildProcessLauncher::Context::LaunchInternal(
base::EnvironmentMap env = delegate->GetEnvironment();
base::ScopedFD ipcfd = delegate->TakeIpcFd();
#elif defined(OS_POSIX)
@ -65,7 +65,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2
base::EnvironmentMap env = delegate->GetEnvironment();
base::ScopedFD ipcfd = delegate->TakeIpcFd();
#endif
@@ -375,7 +377,7 @@ void ChildProcessLauncher::Context::LaunchInternal(
@@ -366,7 +368,7 @@ void ChildProcessLauncher::Context::LaunchInternal(
// We need to close the client end of the IPC channel to reliably detect
// child termination.
@ -74,7 +74,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2
GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
*cmd_line, child_process_id, files_to_register.get());
if (use_zygote) {
@@ -390,7 +392,7 @@ void ChildProcessLauncher::Context::LaunchInternal(
@@ -382,7 +384,7 @@ void ChildProcessLauncher::Context::LaunchInternal(
files_to_register->GetMappingWithIDAdjustment(
base::GlobalDescriptors::kBaseDescriptor);
@ -83,7 +83,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2
if (process_type == switches::kRendererProcess) {
const int sandbox_fd =
RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
@@ -457,7 +459,7 @@ void ChildProcessLauncher::Context::LaunchInternal(
@@ -446,7 +448,7 @@ void ChildProcessLauncher::Context::LaunchInternal(
client_thread_id, FROM_HERE,
base::Bind(&Context::Notify,
this_object.get(),
@ -92,7 +92,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2
use_zygote,
#endif
base::Passed(&process)));
@@ -465,7 +467,7 @@ void ChildProcessLauncher::Context::LaunchInternal(
@@ -454,7 +456,7 @@ void ChildProcessLauncher::Context::LaunchInternal(
}
void ChildProcessLauncher::Context::Notify(
@ -101,7 +101,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2
bool zygote,
#endif
base::Process process) {
@@ -478,7 +480,7 @@ void ChildProcessLauncher::Context::Notify(
@@ -467,7 +469,7 @@ void ChildProcessLauncher::Context::Notify(
if (!process_.IsValid())
LOG(ERROR) << "Failed to launch child process";
@ -110,7 +110,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2
zygote_ = zygote;
#endif
if (client_) {
@@ -504,7 +506,7 @@ void ChildProcessLauncher::Context::Terminate() {
@@ -493,7 +495,7 @@ void ChildProcessLauncher::Context::Terminate() {
BrowserThread::PostTask(
BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
base::Bind(&Context::TerminateInternal,
@ -119,7 +119,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2
zygote_,
#endif
base::Passed(&process_)));
@@ -522,7 +524,7 @@ void ChildProcessLauncher::Context::SetProcessBackgrou
@@ -511,7 +513,7 @@ void ChildProcessLauncher::Context::SetProcessBackgrou
// static
void ChildProcessLauncher::Context::TerminateInternal(
@ -128,7 +128,7 @@ $OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.19 2015/03/18 19:2
bool zygote,
#endif
base::Process process) {
@@ -536,7 +538,7 @@ void ChildProcessLauncher::Context::TerminateInternal(
@@ -525,7 +527,7 @@ void ChildProcessLauncher::Context::TerminateInternal(
process.Terminate(RESULT_CODE_NORMAL_EXIT);
// On POSIX, we must additionally reap the child.
#if defined(OS_POSIX)

8
www/chromium/patches/patch-content_browser_geolocation_location_arbitrator_impl_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-content_browser_geolocation_location_arbitrator_impl_cc,v 1.2 2014/10/13 06:49:19 robert Exp $
--- content/browser/geolocation/location_arbitrator_impl.cc.orig.port Thu Oct 2 19:18:57 2014
+++ content/browser/geolocation/location_arbitrator_impl.cc Fri Oct 10 16:10:30 2014
@@ -159,7 +159,7 @@ LocationProvider* LocationArbitratorImpl::NewNetworkLo
$OpenBSD: patch-content_browser_geolocation_location_arbitrator_impl_cc,v 1.3 2015/04/27 16:38:25 robert Exp $
--- content/browser/geolocation/location_arbitrator_impl.cc.orig.port Wed Apr 15 00:18:53 2015
+++ content/browser/geolocation/location_arbitrator_impl.cc Wed Apr 15 08:32:50 2015
@@ -170,7 +170,7 @@ LocationProvider* LocationArbitratorImpl::NewNetworkLo
}
LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() {

10
www/chromium/patches/patch-content_browser_renderer_host_render_widget_host_view_aura_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-content_browser_renderer_host_render_widget_host_view_aura_cc,v 1.7 2015/03/18 19:26:29 robert Exp $
--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig.port Tue Mar 10 23:41:41 2015
+++ content/browser/renderer_host/render_widget_host_view_aura.cc Wed Mar 11 07:22:50 2015
$OpenBSD: patch-content_browser_renderer_host_render_widget_host_view_aura_cc,v 1.8 2015/04/27 16:38:25 robert Exp $
--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig.port Wed Apr 15 00:31:22 2015
+++ content/browser/renderer_host/render_widget_host_view_aura.cc Wed Apr 15 08:32:50 2015
@@ -90,7 +90,7 @@
#include "ui/gfx/win/dpi.h"
#endif
@ -10,7 +10,7 @@ $OpenBSD: patch-content_browser_renderer_host_render_widget_host_view_aura_cc,v
#include "content/common/input_messages.h"
#include "ui/events/linux/text_edit_command_auralinux.h"
#include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
@@ -2339,7 +2339,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
@@ -2372,7 +2372,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
}
bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@ -19,7 +19,7 @@ $OpenBSD: patch-content_browser_renderer_host_render_widget_host_view_aura_cc,v
return NeedsInputGrab();
#endif
return false;
@@ -2555,7 +2555,7 @@ void RenderWidgetHostViewAura::DetachFromInputMethod()
@@ -2588,7 +2588,7 @@ void RenderWidgetHostViewAura::DetachFromInputMethod()
void RenderWidgetHostViewAura::ForwardKeyboardEvent(
const NativeWebKeyboardEvent& event) {

12
www/chromium/patches/patch-content_browser_tracing_tracing_ui_cc
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-content_browser_tracing_tracing_ui_cc,v 1.3 2015/03/18 19:26:29 robert Exp $
--- content/browser/tracing/tracing_ui.cc.orig.port Tue Mar 10 23:41:41 2015
+++ content/browser/tracing/tracing_ui.cc Wed Mar 11 07:22:50 2015
@@ -350,6 +350,8 @@ void TracingUI::DoUpload(const base::ListValue* args)
const char product[] = "Chrome_Android";
#elif defined(OS_CHROMEOS)
const char product[] = "Chrome_ChromeOS";
+#elif defined(OS_OPENBSD)
+ const char product[] = "Chrome_OpenBSD";
#else
#error Platform not supported.
#endif

19
www/chromium/patches/patch-content_content_browser_gypi
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-content_content_browser_gypi,v 1.30 2015/03/18 19:26:29 robert Exp $
--- content/content_browser.gypi.orig.port Tue Mar 10 23:41:41 2015
+++ content/content_browser.gypi Wed Mar 11 07:22:50 2015
@@ -1888,9 +1888,26 @@
$OpenBSD: patch-content_content_browser_gypi,v 1.31 2015/04/27 16:38:25 robert Exp $
--- content/content_browser.gypi.orig.port Wed Apr 15 00:31:22 2015
+++ content/content_browser.gypi Thu Apr 23 09:39:53 2015
@@ -1903,9 +1903,26 @@
],
}],
['os_bsd==1', {
@ -30,12 +30,15 @@ $OpenBSD: patch-content_content_browser_gypi,v 1.30 2015/03/18 19:26:29 robert E
}],
['use_aura==1', {
'dependencies': [
@@ -1936,7 +1953,7 @@
@@ -1952,10 +1969,7 @@
'browser/geolocation/empty_wifi_data_provider.cc',
],
}],
- ['OS == "linux" and use_dbus==1', {
- 'sources!': [
- 'browser/geolocation/empty_wifi_data_provider.cc',
- ],
+ ['(OS == "linux" or os_bsd==1) and use_dbus==1', {
'sources!': [
'browser/geolocation/empty_wifi_data_provider.cc',
],
'dependencies': [
'../build/linux/system.gyp:dbus',
'../dbus/dbus.gyp:dbus',

35
www/chromium/patches/patch-content_content_common_gypi
View File

@ -1,25 +1,36 @@
$OpenBSD: patch-content_content_common_gypi,v 1.19 2015/03/18 19:26:29 robert Exp $
--- content/content_common.gypi.orig.port Tue Mar 10 23:41:41 2015
+++ content/content_common.gypi Wed Mar 11 07:22:50 2015
@@ -695,6 +695,23 @@
$OpenBSD: patch-content_content_common_gypi,v 1.20 2015/04/27 16:38:25 robert Exp $
--- content/content_common.gypi.orig.port Wed Apr 15 00:31:22 2015
+++ content/content_common.gypi Thu Apr 23 08:21:24 2015
@@ -701,6 +701,34 @@
'content.gyp:common_aidl',
],
}],
+ ['os_bsd==1', {
+ 'sources!': [
+ 'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc',
+ 'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.h',
+ 'common/sandbox_linux/bpf_gpu_policy_linux.cc',
+ 'common/sandbox_linux/bpf_gpu_policy_linux.h',
+ 'common/sandbox_linux/bpf_ppapi_policy_linux.cc',
+ 'common/sandbox_linux/bpf_ppapi_policy_linux.h',
+ 'common/sandbox_linux/bpf_renderer_policy_linux.cc',
+ 'common/sandbox_linux/bpf_renderer_policy_linux.h',
+ 'common/sandbox_linux/bpf_utility_policy_linux.cc',
+ 'common/sandbox_linux/bpf_utility_policy_linux.h',
+ 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
+ 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
+ 'common/sandbox_linux/sandbox_debug_handling_linux.cc',
+ 'common/sandbox_linux/sandbox_debug_handling_linux.h',
+ 'common/sandbox_linux/sandbox_init_linux.cc',
+ 'common/sandbox_linux/sandbox_linux.cc',
+ 'common/sandbox_linux/sandbox_linux.h',
+ 'common/sandbox_linux/sandbox_seccomp_bpf_linux.cc',
+ 'common/sandbox_linux/sandbox_seccomp_bpf_linux.h',
+ 'common/sandbox_linux.cc',
+ 'common/sandbox_linux.h',
+ 'common/sandbox_init_linux.cc',
+ 'common/sandbox_seccomp_bpf_linux.cc',
+ 'common/sandbox_seccomp_bpf_linux.h',
+ 'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc',
+ 'common/sandbox_linux/bpf_gpu_policy_linux.cc',
+ 'common/sandbox_linux/bpf_ppapi_policy_linux.cc',
+ 'common/sandbox_linux/bpf_renderer_policy_linux.cc',
+ 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
+ 'common/sandbox_linux/sandbox_seccomp_bpf_linux.cc',
+ 'common/sandbox_linux/sandbox_linux.cc',
+ 'common/sandbox_linux/sandbox_linux.h',
+ ],
+ }],
['use_pango == 1', {

8
www/chromium/patches/patch-content_content_renderer_gypi
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-content_content_renderer_gypi,v 1.5 2015/01/22 11:16:41 robert Exp $
--- content/content_renderer.gypi.orig.port Wed Dec 3 03:32:12 2014
+++ content/content_renderer.gypi Sat Dec 6 11:34:27 2014
$OpenBSD: patch-content_content_renderer_gypi,v 1.6 2015/04/27 16:38:25 robert Exp $
--- content/content_renderer.gypi.orig.port Wed Apr 15 09:33:15 2015
+++ content/content_renderer.gypi Wed Apr 15 09:33:35 2015
@@ -26,6 +26,7 @@
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/mojo/mojo_edk.gyp:mojo_js_lib',
+ '../third_party/libyuv/libyuv.gyp:libyuv',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',

18
www/chromium/patches/patch-content_gpu_gpu_main_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-content_gpu_gpu_main_cc,v 1.3 2015/03/18 19:26:29 robert Exp $
--- content/gpu/gpu_main.cc.orig.port Wed Mar 11 07:42:53 2015
+++ content/gpu/gpu_main.cc Wed Mar 11 19:24:41 2015
@@ -76,7 +76,7 @@ bool WarmUpSandbox(const base::CommandLine& command_li
$OpenBSD: patch-content_gpu_gpu_main_cc,v 1.4 2015/04/27 16:38:25 robert Exp $
--- content/gpu/gpu_main.cc.orig.port Wed Apr 15 00:31:22 2015
+++ content/gpu/gpu_main.cc Wed Apr 15 08:32:50 2015
@@ -77,7 +77,7 @@ bool WarmUpSandbox(const base::CommandLine& command_li
bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info);
#endif
@ -10,7 +10,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.3 2015/03/18 19:26:29 robert Exp $
#if !defined(OS_CHROMEOS)
bool CanAccessNvidiaDeviceFile();
#endif
@@ -161,13 +161,13 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -162,13 +162,13 @@ int GpuMain(const MainFunctionParams& parameters) {
message_loop_type = base::MessageLoop::TYPE_UI;
}
base::MessageLoop main_message_loop(message_loop_type);
@ -26,7 +26,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.3 2015/03/18 19:26:29 robert Exp $
base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT);
#elif defined(OS_MACOSX)
// This is necessary for CoreAnimation layers hosted in the GPU process to be
@@ -234,6 +234,10 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -235,6 +235,10 @@ int GpuMain(const MainFunctionParams& parameters) {
initialized_sandbox = true;
}
#endif // defined(OS_LINUX)
@ -37,7 +37,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.3 2015/03/18 19:26:29 robert Exp $
base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
@@ -281,7 +285,7 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -282,7 +286,7 @@ int GpuMain(const MainFunctionParams& parameters) {
}
#endif
@ -46,7 +46,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.3 2015/03/18 19:26:29 robert Exp $
initialized_gl_context = true;
#if !defined(OS_CHROMEOS)
if (gpu_info.gpu.vendor_id == 0x10de && // NVIDIA
@@ -316,14 +320,16 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -317,14 +321,16 @@ int GpuMain(const MainFunctionParams& parameters) {
watchdog_thread = NULL;
}
@ -64,7 +64,7 @@ $OpenBSD: patch-content_gpu_gpu_main_cc,v 1.3 2015/03/18 19:26:29 robert Exp $
#elif defined(OS_WIN)
gpu_info.sandboxed = StartSandboxWindows(parameters.sandbox_info);
#elif defined(OS_MACOSX)
@@ -424,7 +430,7 @@ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
@@ -425,7 +431,7 @@ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
}
#endif

8
www/chromium/patches/patch-content_public_common_content_switches_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-content_public_common_content_switches_cc,v 1.4 2015/03/18 19:26:29 robert Exp $
--- content/public/common/content_switches.cc.orig.port Tue Mar 10 23:41:41 2015
+++ content/public/common/content_switches.cc Wed Mar 11 07:22:50 2015
@@ -917,7 +917,7 @@ const char kDisableVaapiAcceleratedVideoEncode[] =
$OpenBSD: patch-content_public_common_content_switches_cc,v 1.5 2015/04/27 16:38:25 robert Exp $
--- content/public/common/content_switches.cc.orig.port Wed Apr 15 00:31:22 2015
+++ content/public/common/content_switches.cc Wed Apr 15 08:32:50 2015
@@ -940,7 +940,7 @@ const char kDisableVaapiAcceleratedVideoEncode[] =
"disable-vaapi-accelerated-video-encode";
#endif

8
www/chromium/patches/patch-content_public_common_content_switches_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-content_public_common_content_switches_h,v 1.4 2015/03/18 19:26:29 robert Exp $
--- content/public/common/content_switches.h.orig.port Tue Mar 10 23:41:41 2015
+++ content/public/common/content_switches.h Wed Mar 11 07:22:50 2015
@@ -269,7 +269,7 @@ CONTENT_EXPORT extern const char kDisablePanelFitting[
$OpenBSD: patch-content_public_common_content_switches_h,v 1.5 2015/04/27 16:38:25 robert Exp $
--- content/public/common/content_switches.h.orig.port Wed Apr 15 00:31:22 2015
+++ content/public/common/content_switches.h Wed Apr 15 08:32:50 2015
@@ -271,7 +271,7 @@ CONTENT_EXPORT extern const char kDisablePanelFitting[
CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
#endif

10
www/chromium/patches/patch-content_renderer_render_thread_impl_cc
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-content_renderer_render_thread_impl_cc,v 1.1 2015/03/18 19:26:29 robert Exp $
--- content/renderer/render_thread_impl.cc.orig.port Wed Mar 11 07:29:03 2015
+++ content/renderer/render_thread_impl.cc Wed Mar 18 20:00:59 2015
@@ -638,7 +638,7 @@ void RenderThreadImpl::Init() {
DCHECK_GT(num_raster_threads, 0);
$OpenBSD: patch-content_renderer_render_thread_impl_cc,v 1.2 2015/04/27 16:38:25 robert Exp $
--- content/renderer/render_thread_impl.cc.orig.port Wed Apr 15 00:31:22 2015
+++ content/renderer/render_thread_impl.cc Wed Apr 15 08:32:50 2015
@@ -671,7 +671,7 @@ void RenderThreadImpl::Init() {
num_raster_threads = 1;
cc::TileTaskWorkerPool::SetNumWorkerThreads(num_raster_threads);
-#if defined(OS_ANDROID) || defined(OS_LINUX)

12
www/chromium/patches/patch-content_renderer_renderer_blink_platform_impl_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.2 2015/03/18 19:26:29 robert Exp $
--- content/renderer/renderer_blink_platform_impl.cc.orig.port Tue Mar 10 23:41:41 2015
+++ content/renderer/renderer_blink_platform_impl.cc Wed Mar 11 07:22:50 2015
$OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.3 2015/04/27 16:38:25 robert Exp $
--- content/renderer/renderer_blink_platform_impl.cc.orig.port Wed Apr 15 00:31:22 2015
+++ content/renderer/renderer_blink_platform_impl.cc Wed Apr 15 08:32:50 2015
@@ -96,7 +96,7 @@
#if defined(OS_POSIX)
@ -10,7 +10,7 @@ $OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.2 2015/03/1
#include <map>
#include <string>
@@ -190,7 +190,7 @@ class RendererBlinkPlatformImpl::FileUtilities : publi
@@ -187,7 +187,7 @@ class RendererBlinkPlatformImpl::FileUtilities : publi
scoped_refptr<ThreadSafeSender> thread_safe_sender_;
};
@ -19,7 +19,7 @@ $OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.2 2015/03/1
// WebKit doesn't use WebSandboxSupport on android so we don't need to
// implement anything here.
class RendererBlinkPlatformImpl::SandboxSupport {};
@@ -287,7 +287,7 @@ blink::WebFileUtilities* RendererBlinkPlatformImpl::fi
@@ -284,7 +284,7 @@ blink::WebFileUtilities* RendererBlinkPlatformImpl::fi
}
blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() {
@ -28,7 +28,7 @@ $OpenBSD: patch-content_renderer_renderer_blink_platform_impl_cc,v 1.2 2015/03/1
// WebKit doesn't use WebSandboxSupport on android.
return NULL;
#else
@@ -578,7 +578,7 @@ bool RendererBlinkPlatformImpl::SandboxSupport::loadFo
@@ -563,7 +563,7 @@ bool RendererBlinkPlatformImpl::SandboxSupport::loadFo
return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
}

29
www/chromium/patches/patch-dbus_property_cc Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-dbus_property_cc,v 1.1 2015/04/27 16:38:25 robert Exp $
--- dbus/property.cc.orig.port Wed Apr 15 15:43:18 2015
+++ dbus/property.cc Thu Apr 23 08:39:00 2015
@@ -478,6 +478,7 @@ void Property<std::vector<uint8> >::AppendSetValueToWr
writer->CloseContainer(&variant_writer);
}
+#if !defined(OS_BSD)
//
// Property<std::map<std::string, std::string>> specialization.
//
@@ -574,6 +575,7 @@ void Property<std::vector<std::pair<std::vector<uint8_
variant_writer.CloseContainer(&array_writer);
writer->CloseContainer(&variant_writer);
}
+#endif
template class Property<uint8>;
template class Property<bool>;
@@ -589,7 +591,9 @@ template class Property<ObjectPath>;
template class Property<std::vector<std::string> >;
template class Property<std::vector<ObjectPath> >;
template class Property<std::vector<uint8> >;
+#if !defined(OS_BSD)
template class Property<std::map<std::string, std::string>>;
template class Property<std::vector<std::pair<std::vector<uint8_t>, uint16_t>>>;
+#endif
} // namespace dbus

8
www/chromium/patches/patch-device_hid_hid_gyp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-device_hid_hid_gyp,v 1.5 2015/03/18 19:26:29 robert Exp $
--- device/hid/hid.gyp.orig.port Tue Mar 10 23:41:41 2015
+++ device/hid/hid.gyp Wed Mar 11 07:22:50 2015
@@ -66,6 +66,18 @@
$OpenBSD: patch-device_hid_hid_gyp,v 1.6 2015/04/27 16:38:25 robert Exp $
--- device/hid/hid.gyp.orig.port Wed Apr 15 00:31:22 2015
+++ device/hid/hid.gyp Wed Apr 15 08:32:50 2015
@@ -68,6 +68,18 @@
'input_service_linux.h',
],
}],

8
www/chromium/patches/patch-device_serial_serial_service_impl_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-device_serial_serial_service_impl_cc,v 1.1 2015/01/22 11:16:41 robert Exp $
--- device/serial/serial_service_impl.cc.orig.port Sat Dec 6 18:28:30 2014
+++ device/serial/serial_service_impl.cc Sun Dec 7 14:48:40 2014
@@ -72,9 +72,14 @@ void SerialServiceImpl::Connect(
$OpenBSD: patch-device_serial_serial_service_impl_cc,v 1.2 2015/04/27 16:38:25 robert Exp $
--- device/serial/serial_service_impl.cc.orig.port Wed Apr 15 00:18:54 2015
+++ device/serial/serial_service_impl.cc Wed Apr 15 08:32:50 2015
@@ -71,9 +71,14 @@ void SerialServiceImpl::Connect(
}
SerialDeviceEnumerator* SerialServiceImpl::GetDeviceEnumerator() {

48
www/chromium/patches/patch-device_usb_usb_service_impl_cc
View File

@ -1,41 +1,15 @@
$OpenBSD: patch-device_usb_usb_service_impl_cc,v 1.1 2015/03/21 14:11:19 robert Exp $
--- device/usb/usb_service_impl.cc.orig.port Fri Mar 20 04:21:23 2015
+++ device/usb/usb_service_impl.cc Sat Mar 21 12:29:48 2015
@@ -60,11 +60,13 @@ class UsbServiceImpl : public UsbService,
// Adds a new UsbDevice to the devices_ map based on the given libusb device.
scoped_refptr<UsbDeviceImpl> AddDevice(PlatformUsbDevice platform_device);
+#if !defined(OS_BSD)
// Handle hotplug events from libusb.
static int LIBUSB_CALL HotplugCallback(libusb_context* context,
PlatformUsbDevice device,
libusb_hotplug_event event,
void* user_data);
+#endif
// These functions release a reference to the provided platform device.
void OnDeviceAdded(PlatformUsbDevice platform_device);
void OnDeviceRemoved(PlatformUsbDevice platform_device);
@@ -85,7 +87,9 @@ class UsbServiceImpl : public UsbService,
// connected instead of only when a full enumeration is requested.
// TODO(reillyg): Support this on all platforms. crbug.com/411715
bool hotplug_enabled_;
+#if !defined(OS_BSD)
libusb_hotplug_callback_handle hotplug_handle_;
+#endif
// The map from unique IDs to UsbDevices.
typedef std::map<uint32, scoped_refptr<UsbDeviceImpl> > DeviceMap;
@@ -177,6 +181,9 @@ UsbServiceImpl::UsbServiceImpl(
$OpenBSD: patch-device_usb_usb_service_impl_cc,v 1.2 2015/04/27 16:38:25 robert Exp $
--- device/usb/usb_service_impl.cc.orig.port Wed Apr 15 09:33:55 2015
+++ device/usb/usb_service_impl.cc Wed Apr 22 21:25:53 2015
@@ -112,6 +112,7 @@ UsbServiceImpl::UsbServiceImpl(
next_unique_id_(0),
hotplug_enabled_(false),
weak_factory_(this) {
+#if defined(OS_BSD)
+ hotplug_enabled_ = false;
+#else
base::MessageLoop::current()->AddDestructionObserver(this);
+#if !defined(OS_BSD)
task_runner_ = base::ThreadTaskRunnerHandle::Get();
int rv = libusb_hotplug_register_callback(
@@ -196,9 +203,11 @@ UsbServiceImpl::UsbServiceImpl(
context_->context(),
@@ -130,9 +131,11 @@ UsbServiceImpl::UsbServiceImpl(
base::Unretained(ui_thread_helper_)));
#endif // OS_WIN
}
@ -44,10 +18,10 @@ $OpenBSD: patch-device_usb_usb_service_impl_cc,v 1.1 2015/03/21 14:11:19 robert
UsbServiceImpl::~UsbServiceImpl() {
+#if !defined(OS_BSD)
base::MessageLoop::current()->RemoveDestructionObserver(this);
if (hotplug_enabled_) {
libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_);
@@ -211,6 +220,7 @@ UsbServiceImpl::~UsbServiceImpl() {
}
@@ -144,6 +147,7 @@ UsbServiceImpl::~UsbServiceImpl() {
for (const auto& map_entry : devices_) {
map_entry.second->OnDisconnect();
}
@ -55,7 +29,7 @@ $OpenBSD: patch-device_usb_usb_service_impl_cc,v 1.1 2015/03/21 14:11:19 robert
}
void UsbServiceImpl::RefreshDevices() {
@@ -286,6 +296,7 @@ scoped_refptr<UsbDeviceImpl> UsbServiceImpl::AddDevice
@@ -219,6 +223,7 @@ scoped_refptr<UsbDeviceImpl> UsbServiceImpl::AddDevice
}
}
@ -63,7 +37,7 @@ $OpenBSD: patch-device_usb_usb_service_impl_cc,v 1.1 2015/03/21 14:11:19 robert
// static
int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
PlatformUsbDevice device,
@@ -323,6 +334,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb
@@ -256,6 +261,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb
return 0;
}

27
www/chromium/patches/patch-device_usb_usb_service_impl_h Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-device_usb_usb_service_impl_h,v 1.1 2015/04/27 16:38:25 robert Exp $
--- device/usb/usb_service_impl.h.orig.port Wed Apr 15 15:35:01 2015
+++ device/usb/usb_service_impl.h Wed Apr 15 15:44:34 2015
@@ -38,11 +38,13 @@ class UsbServiceImpl : public UsbService {
// Adds a new UsbDevice to the devices_ map based on the given libusb device.
scoped_refptr<UsbDeviceImpl> AddDevice(PlatformUsbDevice platform_device);
+#if !defined(OS_BSD)
// Handle hotplug events from libusb.
static int LIBUSB_CALL HotplugCallback(libusb_context* context,
PlatformUsbDevice device,
libusb_hotplug_event event,
void* user_data);
+#endif
// These functions release a reference to the provided platform device.
void OnDeviceAdded(PlatformUsbDevice platform_device);
void OnDeviceRemoved(PlatformUsbDevice platform_device);
@@ -63,7 +65,9 @@ class UsbServiceImpl : public UsbService {
// connected instead of only when a full enumeration is requested.
// TODO(reillyg): Support this on all platforms. crbug.com/411715
bool hotplug_enabled_;
+#if !defined(OS_BSD)
libusb_hotplug_callback_handle hotplug_handle_;
+#endif
// The map from unique IDs to UsbDevices.
typedef std::map<uint32, scoped_refptr<UsbDeviceImpl>> DeviceMap;

8
www/chromium/patches/patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc,v 1.1 2015/01/22 11:16:41 robert Exp $
--- gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc.orig.port Fri Dec 26 19:54:36 2014
+++ gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc Fri Dec 26 19:54:53 2014
$OpenBSD: patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc,v 1.2 2015/04/27 16:38:25 robert Exp $
--- gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc.orig.port Wed Apr 15 00:31:22 2015
+++ gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc Wed Apr 15 08:32:50 2015
@@ -89,7 +89,7 @@ class TransferThread : public base::Thread {
public:
TransferThread() : base::Thread(kAsyncTransferThreadName) {
@ -10,7 +10,7 @@ $OpenBSD: patch-gpu_command_buffer_service_async_pixel_transfer_manager_egl_cc,v
SetPriority(base::kThreadPriority_Background);
#endif
}
@@ -467,14 +467,14 @@ bool AsyncPixelTransferDelegateEGL::TransferIsInProgre
@@ -465,14 +465,14 @@ bool AsyncPixelTransferDelegateEGL::TransferIsInProgre
void AsyncPixelTransferDelegateEGL::WaitForTransferCompletion() {
if (state_->TransferIsInProgress()) {

15
www/chromium/patches/patch-gpu_config_gpu_info_collector_x11_cc
View File

@ -1,12 +1,7 @@
$OpenBSD: patch-gpu_config_gpu_info_collector_x11_cc,v 1.1 2015/02/22 11:33:57 robert Exp $
--- gpu/config/gpu_info_collector_x11.cc.orig.port Fri Feb 20 05:24:00 2015
+++ gpu/config/gpu_info_collector_x11.cc Sun Feb 22 12:13:30 2015
@@ -4,12 +4,22 @@
#include <X11/Xlib.h>
+#include "base/debug/trace_event.h"
#include "base/logging.h"
$OpenBSD: patch-gpu_config_gpu_info_collector_x11_cc,v 1.2 2015/04/27 16:38:25 robert Exp $
--- gpu/config/gpu_info_collector_x11.cc.orig.port Wed Apr 15 00:18:55 2015
+++ gpu/config/gpu_info_collector_x11.cc Wed Apr 15 15:34:00 2015
@@ -8,8 +8,17 @@
#include "gpu/config/gpu_info_collector_linux.h"
#include "third_party/libXNVCtrl/NVCtrl.h"
#include "third_party/libXNVCtrl/NVCtrlLib.h"
@ -24,7 +19,7 @@ $OpenBSD: patch-gpu_config_gpu_info_collector_x11_cc,v 1.1 2015/02/22 11:33:57 r
namespace gpu {
// Use NVCtrl extention to query NV driver version.
@@ -39,5 +49,42 @@ std::string CollectDriverVersionNVidia() {
@@ -39,5 +48,42 @@ std::string CollectDriverVersionNVidia() {
}
return std::string();
}

8
www/chromium/patches/patch-media_audio_audio_input_controller_cc
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-media_audio_audio_input_controller_cc,v 1.1 2015/01/22 11:16:41 robert Exp $
--- media/audio/audio_input_controller.cc.orig.port Sat Dec 6 14:44:50 2014
+++ media/audio/audio_input_controller.cc Sat Dec 6 14:44:57 2014
$OpenBSD: patch-media_audio_audio_input_controller_cc,v 1.2 2015/04/27 16:38:25 robert Exp $
--- media/audio/audio_input_controller.cc.orig.port Wed Apr 15 00:18:55 2015
+++ media/audio/audio_input_controller.cc Wed Apr 15 08:32:50 2015
@@ -13,6 +13,8 @@
#include "media/base/scoped_histogram_timer.h"
#include "media/audio/audio_parameters.h"
#include "media/base/user_input_monitor.h"
+#include <math.h>

18
www/chromium/patches/patch-media_media_gyp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-media_media_gyp,v 1.34 2015/03/18 19:26:29 robert Exp $
--- media/media.gyp.orig.port Tue Mar 10 23:41:41 2015
+++ media/media.gyp Wed Mar 11 07:22:50 2015
$OpenBSD: patch-media_media_gyp,v 1.35 2015/04/27 16:38:25 robert Exp $
--- media/media.gyp.orig.port Wed Apr 15 00:31:22 2015
+++ media/media.gyp Wed Apr 15 08:32:50 2015
@@ -21,7 +21,7 @@
'media_use_libvpx%': 1,
}],
@ -30,7 +30,7 @@ $OpenBSD: patch-media_media_gyp,v 1.34 2015/03/18 19:26:29 robert Exp $
'audio/pulse/pulse_util.cc',
'audio/pulse/pulse_util.h',
'audio/sample_rates.cc',
@@ -725,6 +731,24 @@
@@ -735,6 +741,24 @@
'filters/h264_bitstream_buffer.h',
],
}],
@ -55,7 +55,7 @@ $OpenBSD: patch-media_media_gyp,v 1.34 2015/03/18 19:26:29 robert Exp $
['use_alsa==1', {
'link_settings': {
'libraries': [
@@ -746,7 +770,7 @@
@@ -756,7 +780,7 @@
'audio/openbsd/audio_manager_openbsd.h',
],
}],
@ -64,7 +64,7 @@ $OpenBSD: patch-media_media_gyp,v 1.34 2015/03/18 19:26:29 robert Exp $
'conditions': [
['use_x11==1', {
'dependencies': [
@@ -836,7 +860,7 @@
@@ -847,7 +871,7 @@
'ozone/media_ozone_platform.h',
]
}],
@ -73,7 +73,7 @@ $OpenBSD: patch-media_media_gyp,v 1.34 2015/03/18 19:26:29 robert Exp $
'sources!': [
'audio/cras/audio_manager_cras.cc',
'audio/cras/audio_manager_cras.h',
@@ -1056,7 +1080,7 @@
@@ -1067,7 +1091,7 @@
'base/simd/convert_yuv_to_rgb_x86.cc',
],
}],
@ -82,7 +82,7 @@ $OpenBSD: patch-media_media_gyp,v 1.34 2015/03/18 19:26:29 robert Exp $
'sources!': [
'base/keyboard_event_counter.cc',
'base/keyboard_event_counter.h',
@@ -1299,7 +1323,7 @@
@@ -1314,7 +1338,7 @@
'USE_PULSEAUDIO',
],
}],
@ -91,7 +91,7 @@ $OpenBSD: patch-media_media_gyp,v 1.34 2015/03/18 19:26:29 robert Exp $
'conditions': [
['use_allocator!="none"', {
'dependencies': [
@@ -1823,7 +1847,7 @@
@@ -1841,7 +1865,7 @@
'test/pipeline_integration_test_base.cc',
],
'conditions': [

249
www/chromium/patches/patch-media_video_capture_linux_video_capture_device_factory_linux_cc
View File

@ -1,35 +1,216 @@
$OpenBSD: patch-media_video_capture_linux_video_capture_device_factory_linux_cc,v 1.3 2015/03/18 19:26:29 robert Exp $
--- media/video/capture/linux/video_capture_device_factory_linux.cc.orig.port Wed Mar 11 07:45:18 2015
+++ media/video/capture/linux/video_capture_device_factory_linux.cc Wed Mar 11 07:45:58 2015
@@ -131,10 +131,7 @@ void VideoCaptureDeviceFactoryLinux::GetDeviceSupporte
for (; HANDLE_EINTR(ioctl(fd.get(), VIDIOC_ENUM_FRAMESIZES,
&frame_size)) == 0;
++frame_size.index) {
- if (frame_size.type == V4L2_FRMSIZE_TYPE_DISCRETE) {
- supported_format.frame_size.SetSize(
- frame_size.discrete.width, frame_size.discrete.height);
- } else if (frame_size.type == V4L2_FRMSIZE_TYPE_STEPWISE ||
+ if (frame_size.type == V4L2_FRMSIZE_TYPE_STEPWISE ||
frame_size.type == V4L2_FRMSIZE_TYPE_CONTINUOUS) {
// TODO(mcasas): see http://crbug.com/249953, support these devices.
NOTIMPLEMENTED();
@@ -142,18 +139,11 @@ void VideoCaptureDeviceFactoryLinux::GetDeviceSupporte
$OpenBSD: patch-media_video_capture_linux_video_capture_device_factory_linux_cc,v 1.4 2015/04/27 16:38:25 robert Exp $
--- media/video/capture/linux/video_capture_device_factory_linux.cc.orig.port Wed Apr 15 09:35:25 2015
+++ media/video/capture/linux/video_capture_device_factory_linux.cc Thu Apr 23 08:48:13 2015
@@ -24,105 +24,21 @@
namespace media {
-static bool HasUsableFormats(int fd, uint32 capabilities) {
+static bool HasUsableFormats(int fd) {
const std::list<int>& usable_fourccs =
VideoCaptureDeviceLinux::GetListOfUsableFourCCs(false);
- static const struct {
- int capability;
- v4l2_buf_type buf_type;
- } kCapabilityAndBufferTypes[] = {
- {V4L2_CAP_VIDEO_CAPTURE, V4L2_BUF_TYPE_VIDEO_CAPTURE},
- {V4L2_CAP_VIDEO_CAPTURE_MPLANE, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE}
- };
-
- for (const auto& capability_and_buffer_type : kCapabilityAndBufferTypes) {
- v4l2_fmtdesc fmtdesc = {};
- if (capabilities & capability_and_buffer_type.capability) {
- fmtdesc.type = capability_and_buffer_type.buf_type;
- for (; HANDLE_EINTR(ioctl(fd, VIDIOC_ENUM_FMT, &fmtdesc)) == 0;
- ++fmtdesc.index) {
- if (std::find(usable_fourccs.begin(), usable_fourccs.end(),
- fmtdesc.pixelformat) != usable_fourccs.end())
- return true;
- }
- }
+ v4l2_fmtdesc fmtdesc = {};
+ fmtdesc.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ for (; HANDLE_EINTR(ioctl(fd, VIDIOC_ENUM_FMT, &fmtdesc)) == 0;
+ ++fmtdesc.index) {
+ if (std::find(usable_fourccs.begin(), usable_fourccs.end(),
+ fmtdesc.pixelformat) != usable_fourccs.end())
+ return true;
}
return false;
}
-static std::list<float> GetFrameRateList(int fd,
- uint32 fourcc,
- uint32 width,
- uint32 height) {
- std::list<float> frame_rates;
-
- v4l2_frmivalenum frame_interval = {};
- frame_interval.pixel_format = fourcc;
- frame_interval.width = width;
- frame_interval.height = height;
- for (; HANDLE_EINTR(ioctl(fd, VIDIOC_ENUM_FRAMEINTERVALS,
- &frame_interval)) == 0; ++frame_interval.index) {
- if (frame_interval.type == V4L2_FRMIVAL_TYPE_DISCRETE) {
- if (frame_interval.discrete.numerator != 0) {
- frame_rates.push_back(frame_interval.discrete.denominator /
- static_cast<float>(frame_interval.discrete.numerator));
- }
- } else if (frame_interval.type == V4L2_FRMIVAL_TYPE_CONTINUOUS ||
- frame_interval.type == V4L2_FRMIVAL_TYPE_STEPWISE) {
- // TODO(mcasas): see http://crbug.com/249953, support these devices.
- NOTIMPLEMENTED();
- break;
- }
- }
- // Some devices, e.g. Kinect, do not enumerate any frame rates, see
- // http://crbug.com/412284. Set their frame_rate to zero.
- if (frame_rates.empty())
- frame_rates.push_back(0);
- return frame_rates;
-}
-
-static void GetSupportedFormatsForV4L2BufferType(
- int fd,
- v4l2_buf_type buf_type,
- media::VideoCaptureFormats* supported_formats) {
- v4l2_fmtdesc v4l2_format = {};
- v4l2_format.type = buf_type;
- for (; HANDLE_EINTR(ioctl(fd, VIDIOC_ENUM_FMT, &v4l2_format)) == 0;
- ++v4l2_format.index) {
- VideoCaptureFormat supported_format;
- supported_format.pixel_format =
- VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(
- v4l2_format.pixelformat);
-
- if (supported_format.pixel_format == PIXEL_FORMAT_UNKNOWN)
- continue;
-
- v4l2_frmsizeenum frame_size = {};
- frame_size.pixel_format = v4l2_format.pixelformat;
- for (; HANDLE_EINTR(ioctl(fd, VIDIOC_ENUM_FRAMESIZES, &frame_size)) == 0;
- ++frame_size.index) {
- if (frame_size.type == V4L2_FRMSIZE_TYPE_DISCRETE) {
- supported_format.frame_size.SetSize(frame_size.discrete.width,
- frame_size.discrete.height);
- } else if (frame_size.type == V4L2_FRMSIZE_TYPE_STEPWISE ||
- frame_size.type == V4L2_FRMSIZE_TYPE_CONTINUOUS) {
- // TODO(mcasas): see http://crbug.com/249953, support these devices.
- NOTIMPLEMENTED();
- }
-
- const std::list<float> frame_rates = GetFrameRateList(
- fd, v4l2_format.pixelformat, frame_size.discrete.width,
- frame_size.discrete.height);
- for (const auto& frame_rate : frame_rates) {
- supported_format.frame_rate = frame_rate;
- supported_formats->push_back(supported_format);
- DVLOG(1) << supported_format.ToString();
- }
- }
- }
-}
-
VideoCaptureDeviceFactoryLinux::VideoCaptureDeviceFactoryLinux(
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
: ui_task_runner_(ui_task_runner) {
@@ -147,7 +63,7 @@ scoped_ptr<VideoCaptureDevice> VideoCaptureDeviceFacto
// allocates the camera.
base::ScopedFD fd(HANDLE_EINTR(open(device_name.id().c_str(), O_RDONLY)));
if (!fd.is_valid()) {
- DLOG(ERROR) << "Cannot open device";
+ DVLOG(1) << "Cannot open device";
delete self;
return scoped_ptr<VideoCaptureDevice>();
}
@@ -177,14 +93,11 @@ void VideoCaptureDeviceFactoryLinux::GetDeviceNames(
// http://crbug.com/139356.
v4l2_capability cap;
if ((HANDLE_EINTR(ioctl(fd.get(), VIDIOC_QUERYCAP, &cap)) == 0) &&
- ((cap.capabilities & V4L2_CAP_VIDEO_CAPTURE ||
- cap.capabilities & V4L2_CAP_VIDEO_CAPTURE_MPLANE) &&
- !(cap.capabilities & V4L2_CAP_VIDEO_OUTPUT) &&
- !(cap.capabilities & V4L2_CAP_VIDEO_OUTPUT_MPLANE)) &&
- HasUsableFormats(fd.get(), cap.capabilities)) {
- VideoCaptureDevice::Name device_name(base::StringPrintf("%s", cap.card),
- unique_id);
- device_names->push_back(device_name);
+ (cap.capabilities & V4L2_CAP_VIDEO_CAPTURE &&
+ !(cap.capabilities & V4L2_CAP_VIDEO_OUTPUT)) &&
+ HasUsableFormats(fd.get())) {
+ device_names->push_front(VideoCaptureDevice::Name(
+ base::StringPrintf("%s", cap.card), unique_id));
}
}
}
@@ -200,10 +113,65 @@ void VideoCaptureDeviceFactoryLinux::GetDeviceSupporte
return;
supported_formats->clear();
- const v4l2_buf_type kCaptureTypes[] = {V4L2_BUF_TYPE_VIDEO_CAPTURE,
- V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE};
- for (const auto& buf_type : kCaptureTypes)
- GetSupportedFormatsForV4L2BufferType(fd.get(), buf_type, supported_formats);
+ // Retrieve the caps one by one, first get pixel format, then sizes, then
+ // frame rates.
+ v4l2_fmtdesc pixel_format = {};
+ pixel_format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ for (; HANDLE_EINTR(ioctl(fd.get(), VIDIOC_ENUM_FMT, &pixel_format)) == 0;
+ ++pixel_format.index) {
+ VideoCaptureFormat supported_format;
+ supported_format.pixel_format =
+ VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(
+ pixel_format.pixelformat);
+ if (supported_format.pixel_format == PIXEL_FORMAT_UNKNOWN)
+ continue;
+
+ v4l2_frmsizeenum frame_size = {};
+ frame_size.pixel_format = pixel_format.pixelformat;
+ for (; HANDLE_EINTR(ioctl(fd.get(), VIDIOC_ENUM_FRAMESIZES,
+ &frame_size)) == 0;
+ ++frame_size.index) {
+ if (frame_size.type == V4L2_FRMSIZE_TYPE_DISCRETE) {
+ supported_format.frame_size.SetSize(
+ frame_size.discrete.width, frame_size.discrete.height);
+ } else if (frame_size.type == V4L2_FRMSIZE_TYPE_STEPWISE ||
+ frame_size.type == V4L2_FRMSIZE_TYPE_CONTINUOUS) {
+ // TODO(mcasas): see http://crbug.com/249953, support these devices.
+ NOTIMPLEMENTED();
+ }
+
+ v4l2_frmivalenum frame_interval = {};
+ frame_interval.pixel_format = pixel_format.pixelformat;
+ frame_interval.width = frame_size.discrete.width;
+ frame_interval.height = frame_size.discrete.height;
+ std::list<float> frame_rates;
+ for (; HANDLE_EINTR(ioctl(fd.get(), VIDIOC_ENUM_FRAMEINTERVALS,
+ &frame_interval)) == 0;
+ ++frame_interval.index) {
+ if (frame_interval.type == V4L2_FRMIVAL_TYPE_DISCRETE) {
+ if (frame_interval.discrete.numerator != 0) {
+ frame_rates.push_back(frame_interval.discrete.denominator /
+ static_cast<float>(frame_interval.discrete.numerator));
+ }
+ } else if (frame_interval.type == V4L2_FRMIVAL_TYPE_CONTINUOUS ||
+ frame_interval.type == V4L2_FRMIVAL_TYPE_STEPWISE) {
+ // TODO(mcasas): see http://crbug.com/249953, support these devices.
+ NOTIMPLEMENTED();
+ break;
+ }
+ }
+ // Some devices, e.g. Kinect, do not enumerate any frame rates, see
+ // http://crbug.com/412284. Set their frame_rate to zero.
+ if (frame_rates.empty())
+ frame_rates.push_back(0.0f);
+
+ for (const auto& it : frame_rates) {
+ supported_format.frame_rate = it;
+ supported_formats->push_back(supported_format);
+ DVLOG(1) << device.name() << " " << supported_format.ToString();
+ }
+ }
+ }
return;
}
v4l2_frmivalenum frame_interval = {};
frame_interval.pixel_format = pixel_format.pixelformat;
- frame_interval.width = frame_size.discrete.width;
- frame_interval.height = frame_size.discrete.height;
std::list<float> frame_rates;
for (; HANDLE_EINTR(ioctl(fd.get(), VIDIOC_ENUM_FRAMEINTERVALS,
&frame_interval)) == 0;
++frame_interval.index) {
- if (frame_interval.type == V4L2_FRMIVAL_TYPE_DISCRETE) {
- if (frame_interval.discrete.numerator != 0) {
- frame_rates.push_back(frame_interval.discrete.denominator /
- static_cast<float>(frame_interval.discrete.numerator));
- }
- } else if (frame_interval.type == V4L2_FRMIVAL_TYPE_CONTINUOUS ||
+ if (frame_interval.type == V4L2_FRMIVAL_TYPE_CONTINUOUS ||
frame_interval.type == V4L2_FRMIVAL_TYPE_STEPWISE) {
// TODO(mcasas): see http://crbug.com/249953, support these devices.
NOTIMPLEMENTED();

72
www/chromium/patches/patch-net_base_net_util_linux_cc
View File

@ -1,7 +1,23 @@
$OpenBSD: patch-net_base_net_util_linux_cc,v 1.1 2015/03/21 14:11:19 robert Exp $
--- net/base/net_util_linux.cc.orig.port Fri Mar 20 04:21:23 2015
+++ net/base/net_util_linux.cc Sat Mar 21 12:14:10 2015
@@ -33,6 +33,7 @@ namespace {
$OpenBSD: patch-net_base_net_util_linux_cc,v 1.2 2015/04/27 16:38:25 robert Exp $
--- net/base/net_util_linux.cc.orig.port Wed Apr 15 09:36:13 2015
+++ net/base/net_util_linux.cc Wed Apr 15 15:52:35 2015
@@ -4,12 +4,14 @@
#include "net/base/net_util_linux.h"
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(OS_BSD)
#include <linux/ethtool.h>
#endif // !defined(OS_ANDROID)
+#if !defined(OS_BSD)
#include <linux/if.h>
#include <linux/sockios.h>
#include <linux/wireless.h>
+#endif
#include <set>
#include <sys/ioctl.h>
#include <sys/types.h>
@@ -39,6 +41,7 @@ namespace {
// application layer.
bool TryConvertNativeToNetIPAttributes(int native_attributes,
int* net_attributes) {
@ -9,7 +25,7 @@ $OpenBSD: patch-net_base_net_util_linux_cc,v 1.1 2015/03/21 14:11:19 robert Exp
// For Linux/ChromeOS/Android, we disallow addresses with attributes
// IFA_F_OPTIMISTIC, IFA_F_DADFAILED, and IFA_F_TENTATIVE as these
// are still progressing through duplicated address detection (DAD)
@@ -55,6 +56,9 @@ bool TryConvertNativeToNetIPAttributes(int native_attr
@@ -61,6 +64,9 @@ bool TryConvertNativeToNetIPAttributes(int native_attr
}
return true;
@ -19,23 +35,49 @@ $OpenBSD: patch-net_base_net_util_linux_cc,v 1.1 2015/03/21 14:11:19 robert Exp
}
} // namespace
@@ -69,6 +73,7 @@ inline const unsigned char* GetIPAddressData(const IPA
#endif
@@ -79,6 +85,7 @@ inline const unsigned char* GetIPAddressData(const IPA
// or ethtool extensions.
NetworkChangeNotifier::ConnectionType GetInterfaceConnectionType(
const std::string& ifname) {
+#if !defined(OS_BSD)
base::ScopedFD s(socket(AF_INET, SOCK_STREAM, 0));
if (!s.is_valid())
return NetworkChangeNotifier::CONNECTION_UNKNOWN;
@@ -99,11 +106,13 @@ NetworkChangeNotifier::ConnectionType GetInterfaceConn
if (ioctl(s.get(), SIOCETHTOOL, &ifr) != -1)
return NetworkChangeNotifier::CONNECTION_ETHERNET;
#endif // !defined(OS_ANDROID)
+#endif
return NetworkChangeNotifier::CONNECTION_UNKNOWN;
}
std::string GetInterfaceSSID(const std::string& ifname) {
+#if !defined(OS_BSD)
base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0));
if (!ioctl_socket.is_valid())
return "";
@@ -115,9 +124,11 @@ std::string GetInterfaceSSID(const std::string& ifname
wreq.u.essid.length = IW_ESSID_MAX_SIZE;
if (ioctl(ioctl_socket.get(), SIOCGIWESSID, &wreq) != -1)
return ssid;
+#endif
return "";
}
+#if !defined(OS_BSD)
bool GetNetworkListImpl(
NetworkInterfaceList* networks,
int policy,
@@ -136,6 +141,7 @@ bool GetNetworkListImpl(
@@ -186,6 +197,7 @@ bool GetNetworkListImpl(
return true;
}
+#endif
} // namespace internal
@@ -143,12 +149,16 @@ bool GetNetworkList(NetworkInterfaceList* networks, in
std::string GetWifiSSIDFromInterfaceListInternal(
const NetworkInterfaceList& interfaces,
@@ -210,12 +222,16 @@ bool GetNetworkList(NetworkInterfaceList* networks, in
if (networks == NULL)
return false;
@ -43,12 +85,12 @@ $OpenBSD: patch-net_base_net_util_linux_cc,v 1.1 2015/03/21 14:11:19 robert Exp
internal::AddressTrackerLinux tracker;
tracker.Init();
return internal::GetNetworkListImpl(networks, policy,
tracker.GetOnlineLinks(),
tracker.GetAddressMap(), &if_indextoname);
return internal::GetNetworkListImpl(
networks, policy, tracker.GetOnlineLinks(), tracker.GetAddressMap(),
&internal::AddressTrackerLinux::GetInterfaceName);
+#else
+ return false;
+#endif
}
} // namespace net
std::string GetWifiSSID() {

8
www/chromium/patches/patch-net_disk_cache_blockfile_disk_format_h
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-net_disk_cache_blockfile_disk_format_h,v 1.1 2014/05/24 15:27:34 robert Exp $
--- net/disk_cache/blockfile/disk_format.h.orig.port Thu May 22 21:53:41 2014
+++ net/disk_cache/blockfile/disk_format.h Thu May 22 21:53:54 2014
$OpenBSD: patch-net_disk_cache_blockfile_disk_format_h,v 1.2 2015/04/27 16:38:25 robert Exp $
--- net/disk_cache/blockfile/disk_format.h.orig.port Wed Apr 15 09:37:17 2015
+++ net/disk_cache/blockfile/disk_format.h Wed Apr 15 09:37:35 2015
@@ -146,7 +146,9 @@ struct RankingsNode {
};
#pragma pack(pop)
+#if !defined(OS_BSD)
COMPILE_ASSERT(sizeof(RankingsNode) == 36, bad_RankingsNode);
static_assert(sizeof(RankingsNode) == 36, "bad RankingsNode");
+#endif
} // namespace disk_cache

8
www/chromium/patches/patch-net_http_http_network_session_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-net_http_http_network_session_cc,v 1.4 2013/09/29 19:04:04 robert Exp $
--- net/http/http_network_session.cc.orig.port Wed Sep 18 10:14:07 2013
+++ net/http/http_network_session.cc Sun Sep 22 16:09:42 2013
@@ -12,7 +12,9 @@
$OpenBSD: patch-net_http_http_network_session_cc,v 1.5 2015/04/27 16:38:25 robert Exp $
--- net/http/http_network_session.cc.orig.port Wed Apr 15 00:31:22 2015
+++ net/http/http_network_session.cc Wed Apr 15 08:32:50 2015
@@ -13,7 +13,9 @@
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/values.h"

8
www/chromium/patches/patch-net_net_gypi
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-net_net_gypi,v 1.6 2015/03/18 19:26:29 robert Exp $
--- net/net.gypi.orig.port Tue Mar 10 23:41:41 2015
+++ net/net.gypi Wed Mar 11 07:22:50 2015
@@ -188,8 +188,6 @@
$OpenBSD: patch-net_net_gypi,v 1.7 2015/04/27 16:38:25 robert Exp $
--- net/net.gypi.orig.port Wed Apr 15 00:31:22 2015
+++ net/net.gypi Wed Apr 15 08:32:50 2015
@@ -187,8 +187,6 @@
'android/network_change_notifier_factory_android.h',
'android/network_library.cc',
'android/network_library.h',

12
www/chromium/patches/patch-net_udp_udp_socket_libevent_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-net_udp_udp_socket_libevent_cc,v 1.4 2015/03/18 19:26:29 robert Exp $
--- net/udp/udp_socket_libevent.cc.orig.port Tue Mar 10 23:41:42 2015
+++ net/udp/udp_socket_libevent.cc Wed Mar 11 07:22:50 2015
@@ -37,7 +37,7 @@ const int kBindRetries = 10;
$OpenBSD: patch-net_udp_udp_socket_libevent_cc,v 1.5 2015/04/27 16:38:25 robert Exp $
--- net/udp/udp_socket_libevent.cc.orig.port Wed Apr 15 00:31:23 2015
+++ net/udp/udp_socket_libevent.cc Wed Apr 15 08:32:50 2015
@@ -36,7 +36,7 @@ const int kBindRetries = 10;
const int kPortStart = 1024;
const int kPortEnd = 65535;
@ -10,7 +10,7 @@ $OpenBSD: patch-net_udp_udp_socket_libevent_cc,v 1.4 2015/03/18 19:26:29 robert
// Returns IPv4 address in network order.
int GetIPv4AddressFromIndex(int socket, uint32 index, uint32* address){
@@ -553,7 +553,7 @@ int UDPSocketLibevent::SetMulticastOptions() {
@@ -547,7 +547,7 @@ int UDPSocketLibevent::SetMulticastOptions() {
if (multicast_interface_ != 0) {
switch (addr_family_) {
case AF_INET: {
@ -19,7 +19,7 @@ $OpenBSD: patch-net_udp_udp_socket_libevent_cc,v 1.4 2015/03/18 19:26:29 robert
ip_mreqn mreq;
mreq.imr_ifindex = multicast_interface_;
mreq.imr_address.s_addr = htonl(INADDR_ANY);
@@ -628,7 +628,7 @@ int UDPSocketLibevent::JoinGroup(const IPAddressNumber
@@ -622,7 +622,7 @@ int UDPSocketLibevent::JoinGroup(const IPAddressNumber
if (addr_family_ != AF_INET)
return ERR_ADDRESS_INVALID;

21
www/chromium/patches/patch-pdf_pdf_gyp
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-pdf_pdf_gyp,v 1.2 2014/10/13 06:49:19 robert Exp $
--- pdf/pdf.gyp.orig.port Thu Oct 2 19:19:00 2014
+++ pdf/pdf.gyp Fri Oct 10 16:10:31 2014
@@ -109,7 +109,7 @@
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
}],
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="openbsd"', {
'configurations': {
'Release_Base': {
#'cflags': [ '-fno-weak',], # get rid of symbols that strip doesn't remove.
@@ -124,7 +124,7 @@
],
'conditions': [
# CrOS has a separate step to do this.
- ['OS=="linux" and chromeos==0',
+ ['(OS=="linux" or OS=="openbsd") and chromeos==0',
{ 'targets': [
{
'target_name': 'pdf_linux_symbols',

48
www/chromium/patches/patch-pdf_pdfium_pdfium_engine_cc Normal file
View File

@ -0,0 +1,48 @@
$OpenBSD: patch-pdf_pdfium_pdfium_engine_cc,v 1.1 2015/04/27 16:38:25 robert Exp $
--- pdf/pdfium/pdfium_engine.cc.orig.port Thu Apr 23 11:26:23 2015
+++ pdf/pdfium/pdfium_engine.cc Thu Apr 23 11:26:42 2015
@@ -126,7 +126,7 @@ std::vector<uint32_t> GetPageNumbersFromPrintPageNumbe
return page_numbers;
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
PP_Instance g_last_instance_id;
@@ -559,7 +559,7 @@ pp::VarDictionary TraverseBookmarks(FPDF_DOCUMENT doc,
bool InitializeSDK() {
FPDF_InitLibrary();
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Font loading doesn't work in the renderer sandbox in Linux.
FPDF_SetSystemFontInfo(&g_font_info);
#endif
@@ -1461,7 +1461,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPDF(
FPDF_ClosePage(pdf_page);
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
g_last_instance_id = client_->GetPluginInstance()->pp_instance();
#endif
@@ -2823,7 +2823,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size());
DCHECK(image_data);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
g_last_instance_id = client_->GetPluginInstance()->pp_instance();
#endif
@@ -3279,7 +3279,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
FORM_DoPageAAction(old_page, form_, FPDFPAGE_AACTION_CLOSE);
}
most_visible_page_ = index;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
g_last_instance_id = client_->GetPluginInstance()->pp_instance();
#endif
if (most_visible_page_ != -1 && called_do_document_action_) {

54
www/chromium/patches/patch-remoting_remoting_host_gypi
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-remoting_remoting_host_gypi,v 1.8 2015/03/18 19:26:29 robert Exp $
--- remoting/remoting_host.gypi.orig.port Wed Mar 11 07:47:46 2015
+++ remoting/remoting_host.gypi Wed Mar 11 07:53:47 2015
@@ -12,7 +12,7 @@
'variables': {
'conditions': [
# Remoting host is supported only on Windows, OSX and Linux (with X11).
- ['OS=="win" or OS=="mac" or (OS=="linux" and use_x11==1)', {
+ ['OS=="win" or OS=="mac" or ((OS=="linux" or os_bsd==1) and use_x11==1)', {
'enable_me2me_host': 1,
'enable_it2me_host': 1,
'enable_remoting_host': 1,
@@ -60,7 +60,7 @@
$OpenBSD: patch-remoting_remoting_host_gypi,v 1.9 2015/04/27 16:38:25 robert Exp $
--- remoting/remoting_host.gypi.orig.port Wed Apr 15 09:38:09 2015
+++ remoting/remoting_host.gypi Wed Apr 15 09:38:43 2015
@@ -18,7 +18,7 @@
'remoting_host_win.gypi',
],
}],
- ['OS=="linux"', {
+ ['OS=="linux" or os_bsd==1', {
'includes': [
'remoting_host_linux.gypi',
],
@@ -56,7 +56,7 @@
'<@(remoting_host_sources)',
],
'conditions': [
@ -19,24 +19,12 @@ $OpenBSD: patch-remoting_remoting_host_gypi,v 1.8 2015/03/18 19:26:29 robert Exp
'conditions': [
['use_x11==1', {
'dependencies': [
@@ -79,11 +79,6 @@
],
}]
@@ -657,7 +657,7 @@
'host/it2me/it2me_native_messaging_host_main.h',
],
- 'link_settings': {
- 'libraries': [
- '-lpam',
- ],
- },
}],
['chromeos==1', {
'dependencies' : [
@@ -668,7 +663,7 @@
'host/it2me/it2me_native_messaging_host_main.h',
],
'conditions': [
- ['OS=="linux" and chromeos==0 and use_ozone==0', {
+ ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_ozone==0', {
'dependencies': [
# Always use GTK on Linux, even for Aura builds.
'../build/linux/system.gyp:gtk',
'conditions': [
- ['OS=="linux" and chromeos==0 and use_ozone==0', {
+ ['(os_bsd==1 or OS=="linux") and chromeos==0 and use_ozone==0', {
'dependencies': [
# Always use GTK on Linux, even for Aura builds.
'../build/linux/system.gyp:gtk',

12
www/chromium/patches/patch-skia_ext_SkMemory_new_handler_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-skia_ext_SkMemory_new_handler_cpp,v 1.1 2015/04/27 16:38:25 robert Exp $
--- skia/ext/SkMemory_new_handler.cpp.orig.port Thu Apr 23 09:49:23 2015
+++ skia/ext/SkMemory_new_handler.cpp Thu Apr 23 09:49:31 2015
@@ -53,7 +53,7 @@ void* sk_malloc_throw(size_t size) {
static void* sk_malloc_nothrow(size_t size) {
// TODO(b.kelemen): we should always use UncheckedMalloc but currently it
// doesn't work as intended everywhere.
-#if defined(OS_IOS)
+#if defined(OS_IOS) || defined(OS_BSD)
return malloc(size);
#else
void* result;

10
www/chromium/patches/patch-skia_skia_chrome_gypi
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-skia_skia_chrome_gypi,v 1.9 2015/03/18 19:26:29 robert Exp $
--- skia/skia_chrome.gypi.orig.port Tue Mar 10 23:41:42 2015
+++ skia/skia_chrome.gypi Wed Mar 11 07:22:50 2015
@@ -82,6 +82,11 @@
'ext/vector_platform_device_emf_win.h',
$OpenBSD: patch-skia_skia_chrome_gypi,v 1.10 2015/04/27 16:38:25 robert Exp $
--- skia/skia_chrome.gypi.orig.port Wed Apr 15 00:18:57 2015
+++ skia/skia_chrome.gypi Wed Apr 15 08:32:50 2015
@@ -79,6 +79,11 @@
'ext/skia_utils_win.h',
],
'conditions': [
+ [ 'use_cairo == 1', {

8
www/chromium/patches/patch-third_party_WebKit_Source_bindings_core_v8_V8ScriptRunner_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-third_party_WebKit_Source_bindings_core_v8_V8ScriptRunner_cpp,v 1.1 2015/03/21 14:11:19 robert Exp $
--- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig.port Fri Mar 20 04:34:27 2015
+++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp Sat Mar 21 13:30:34 2015
@@ -41,7 +41,7 @@
$OpenBSD: patch-third_party_WebKit_Source_bindings_core_v8_V8ScriptRunner_cpp,v 1.2 2015/04/27 16:38:25 robert Exp $
--- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig.port Wed Apr 15 00:44:36 2015
+++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp Wed Apr 15 08:32:50 2015
@@ -43,7 +43,7 @@
#if defined(WTF_OS_WIN)
#include <malloc.h>

40
www/chromium/patches/patch-third_party_WebKit_Source_core_core_gyp
View File

@ -1,21 +1,35 @@
$OpenBSD: patch-third_party_WebKit_Source_core_core_gyp,v 1.13 2015/03/18 19:26:29 robert Exp $
--- third_party/WebKit/Source/core/core.gyp.orig.port Tue Mar 10 23:55:05 2015
+++ third_party/WebKit/Source/core/core.gyp Wed Mar 11 07:22:50 2015
@@ -589,7 +589,7 @@
$OpenBSD: patch-third_party_WebKit_Source_core_core_gyp,v 1.14 2015/04/27 16:38:25 robert Exp $
--- third_party/WebKit/Source/core/core.gyp.orig.port Wed Apr 15 09:38:56 2015
+++ third_party/WebKit/Source/core/core.gyp Wed Apr 15 09:39:42 2015
@@ -505,13 +505,13 @@
# 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 != "openbsd"', {
'sources/': [
['exclude', 'Linux\\.cpp$'],
'sources!': [
'layout/LayoutThemeLinux.cpp',
'layout/LayoutThemeLinux.h',
],
@@ -627,7 +627,7 @@
['OS=="win" and (buildtype=="Official" or (fastbuild==0 and win_z7==1))', {
'msvs_shard': 19,
}],
- ['OS != "linux"', {
+ ['OS != "linux" and OS != "openbsd"', {
'sources/': [
['exclude', 'Linux\\.cpp$'],
- ['OS != "linux" and OS != "android"', {
+ ['OS != "linux" and OS != "android" and OS != "openbsd"', {
'sources!': [
'layout/LayoutThemeFontProviderLinux.cpp',
],
@@ -812,13 +812,13 @@
# 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 != "openbsd"', {
'sources!': [
'layout/LayoutThemeChromiumLinux.cpp',
'layout/LayoutThemeChromiumLinux.h',
],
}],
- ['OS != "linux" and OS != "android"', {
+ ['OS != "linux" and OS != "android" and OS != "openbsd"', {
'sources!': [
'layout/LayoutThemeChromiumFontProviderLinux.cpp',
],

14
www/chromium/patches/patch-third_party_WebKit_Source_platform_blink_platform_gyp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.8 2015/01/22 11:16:41 robert Exp $
--- third_party/WebKit/Source/platform/blink_platform.gyp.orig.port Sat Dec 6 11:49:33 2014
+++ third_party/WebKit/Source/platform/blink_platform.gyp Sat Dec 6 11:50:13 2014
@@ -248,7 +248,7 @@
$OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.9 2015/04/27 16:38:25 robert Exp $
--- third_party/WebKit/Source/platform/blink_platform.gyp.orig.port Wed Apr 15 00:44:37 2015
+++ third_party/WebKit/Source/platform/blink_platform.gyp Wed Apr 15 08:32:50 2015
@@ -246,7 +246,7 @@
# compiler optimizations, see crbug.com/237063
'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
'conditions': [
@ -10,7 +10,7 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.8 2015
'sources/': [
# Cherry-pick files excluded by the broader regular expressions above.
['include', 'fonts/opentype/OpenTypeTypes\\.h$'],
@@ -259,7 +259,7 @@
@@ -257,7 +257,7 @@
],
},
],
@ -19,7 +19,7 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.8 2015
'sources/': [
['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'],
]
@@ -350,7 +350,7 @@
@@ -345,7 +345,7 @@
['exclude', 'scroll/ScrollbarThemeMac'],
],
}],
@ -28,7 +28,7 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_blink_platform_gyp,v 1.8 2015
'sources/': [
['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
],
@@ -395,7 +395,7 @@
@@ -390,7 +390,7 @@
['exclude', 'Android\\.cpp$'],
],
}],

27
www/chromium/patches/patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp,v 1.2 2015/02/22 11:33:57 robert Exp $
--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig.port Fri Feb 20 05:50:09 2015
+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp Sun Feb 22 12:21:03 2015
$OpenBSD: patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp,v 1.3 2015/04/27 16:38:25 robert Exp $
--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig.port Wed Apr 15 09:39:48 2015
+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp Wed Apr 15 09:40:36 2015
@@ -30,7 +30,7 @@
#include "config.h"
@ -16,27 +16,18 @@ $OpenBSD: patch-third_party_WebKit_Source_platform_fonts_skia_FontCacheSkia_cpp,
-#if !OS(WIN) && !OS(ANDROID)
+#if !OS(WIN) && !OS(ANDROID) && !OS(OPENBSD)
static SkStream* streamForFontconfigInterfaceId(int fontconfigInterfaceId)
static SkStreamAsset* streamForFontconfigInterfaceId(int fontconfigInterfaceId)
{
SkAutoTUnref<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal());
@@ -131,7 +131,7 @@ PassRefPtr<SimpleFontData> FontCache::fallbackFontForC
return fontDataFromFontPlatformData(&platformData, DoNotRetain);
}
-#endif // !OS(WIN) && !OS(ANDROID)
+#endif // !OS(WIN) && !OS(ANDROID) && !OS(OPENBSD)
PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(const FontDescription& description, ShouldRetain shouldRetain)
{
@@ -189,9 +189,11 @@ PassRefPtr<SkTypeface> FontCache::createTypeface(const
// TODO(dro): crbug.com/381620 Use creationParams.ttcIndex() after
// https://code.google.com/p/skia/issues/detail?id=1186 gets fixed.
@@ -187,9 +187,11 @@ PassRefPtr<SkTypeface> FontCache::createTypeface(const
#if !OS(WIN) && !OS(ANDROID)
if (creationParams.creationType() == CreateFontByFciIdAndTtcIndex) {
SkTypeface* typeface = nullptr;
+#if !OS(OPENBSD)
if (Platform::current()->sandboxSupport())
typeface = SkTypeface::CreateFromStream(streamForFontconfigInterfaceId(creationParams.fontconfigInterfaceId()));
typeface = SkTypeface::CreateFromStream(streamForFontconfigInterfaceId(creationParams.fontconfigInterfaceId()), creationParams.ttcIndex());
else
+#endif
typeface = SkTypeface::CreateFromFile(creationParams.filename().data());
typeface = SkTypeface::CreateFromFile(creationParams.filename().data(), creationParams.ttcIndex());
if (typeface)

43
www/chromium/patches/patch-third_party_WebKit_Source_platform_heap_StackFrameDepth_cpp Normal file
View File

@ -0,0 +1,43 @@
$OpenBSD: patch-third_party_WebKit_Source_platform_heap_StackFrameDepth_cpp,v 1.1 2015/04/27 16:38:25 robert Exp $
--- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig.port Wed Apr 15 09:41:19 2015
+++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp Wed Apr 22 22:49:42 2015
@@ -14,6 +14,10 @@
#elif defined(__GLIBC__)
extern "C" void* __libc_stack_end; // NOLINT
#endif
+#if OS(OPENBSD)
+#include <sys/signal.h>
+#include <pthread_np.h>
+#endif
namespace blink {
@@ -39,7 +43,7 @@ void StackFrameDepth::configureLimit()
size_t StackFrameDepth::getUnderestimatedStackSize()
{
-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD)
+#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) || OS(OPENBSD)
// We cannot get the stack size in these platforms because
// pthread_getattr_np() can fail for the main thread.
// This is OK because ThreadState::current() doesn't use the stack size
@@ -63,12 +67,18 @@ size_t StackFrameDepth::getUnderestimatedStackSize()
void* StackFrameDepth::getStackStart()
{
-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD)
+#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) || OS(OPENBSD)
pthread_attr_t attr;
int error;
#if OS(FREEBSD)
pthread_attr_init(&attr);
error = pthread_attr_get_np(pthread_self(), &attr);
+#elif OS(OPENBSD)
+ stack_t ss;
+ void *base;
+ error = pthread_stackseg_np(pthread_self(), &ss);
+ base = (void*)((size_t) ss.ss_sp - ss.ss_size);
+ return reinterpret_cast<Address>(base) + ss.ss_size;
#else
error = pthread_getattr_np(pthread_self(), &attr);
#endif

Some files were not shown because too many files have changed in this diff Show More