aboutsummaryrefslogtreecommitdiffstats
path: root/www/chromium/files
diff options
context:
space:
mode:
authorrene <rene@FreeBSD.org>2011-12-14 04:41:14 +0800
committerrene <rene@FreeBSD.org>2011-12-14 04:41:14 +0800
commitfe793dd9006d825e5cfbf922842b126e3e76cf0e (patch)
treec7fd9a5c31f30842be0d48533f0edd3b20a77ff4 /www/chromium/files
parent454a1d749161a33a9367d05dea7e9edacab8fcda (diff)
downloadfreebsd-ports-gnome-fe793dd9006d825e5cfbf922842b126e3e76cf0e.tar.gz
freebsd-ports-gnome-fe793dd9006d825e5cfbf922842b126e3e76cf0e.tar.zst
freebsd-ports-gnome-fe793dd9006d825e5cfbf922842b126e3e76cf0e.zip
Update to 16.0.912.63
- enhancements to Sync - ability to create multiple profiles on a single instance Obtained from: Chromium Chruetertee development repository Security: http://www.vuxml.org/freebsd/68ac6266-25c3-11e1-b63a-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files')
-rw-r--r--www/chromium/files/extra-patch-base__base.gypi-freebsd54
-rw-r--r--www/chromium/files/extra-patch-base__base.gypi-stub37
-rw-r--r--www/chromium/files/patch-base__allocator__allocator.gyp61
-rw-r--r--www/chromium/files/patch-base__base.gypi60
-rw-r--r--www/chromium/files/patch-base__files__file_path_watcher_stub.cc21
-rw-r--r--www/chromium/files/patch-base__process_util.h46
-rw-r--r--www/chromium/files/patch-build__common.gypi21
-rw-r--r--www/chromium/files/patch-chrome__browser__browser_about_handler.cc24
-rw-r--r--www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc66
-rw-r--r--www/chromium/files/patch-chrome__browser__component_updater__component_updater_configurator.cc17
-rw-r--r--www/chromium/files/patch-chrome__common__child_process_logging.h11
-rw-r--r--www/chromium/files/patch-chrome__nacl.gypi42
-rw-r--r--www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc14
-rw-r--r--www/chromium/files/patch-chrome__test__base__testing_browser_process.h12
-rw-r--r--www/chromium/files/patch-content__browser__browser_main.cc29
-rw-r--r--www/chromium/files/patch-content__browser__renderer_host__backing_store_gtk.cc (renamed from www/chromium/files/patch-content__browser__renderer_host__backing_store_x.cc)6
-rw-r--r--www/chromium/files/patch-content__browser__renderer_host__render_message_filter.cc14
-rw-r--r--www/chromium/files/patch-content__common__gpu__gpu_command_buffer_stub.cc11
-rw-r--r--www/chromium/files/patch-content__content_browser.gypi32
-rw-r--r--www/chromium/files/patch-content__renderer__render_view.h29
-rw-r--r--www/chromium/files/patch-content__renderer__render_view_impl.cc (renamed from www/chromium/files/patch-content__renderer__render_view.cc)16
-rw-r--r--www/chromium/files/patch-content__renderer__render_view_impl.h35
-rw-r--r--www/chromium/files/patch-content__renderer__renderer_glue.cc20
-rw-r--r--www/chromium/files/patch-media__media.gyp24
-rw-r--r--www/chromium/files/patch-skia__ext__vector_platform_device_skia.cc8
-rw-r--r--www/chromium/files/patch-skia__ext__vector_platform_device_skia.h8
-rw-r--r--www/chromium/files/patch-third_party__WebKit__Source__WebCore__config.h11
-rw-r--r--www/chromium/files/patch-third_party__openssl__openssl.gyp11
-rw-r--r--www/chromium/files/patch-third_party__skia__include__core__SkPreConfig.h10
-rw-r--r--www/chromium/files/patch-third_party__yasm__yasm_compile.gypi18
-rw-r--r--www/chromium/files/patch-ui__gfx__surface__transport_dib.h22
-rw-r--r--www/chromium/files/patch-views__events__event.h11
-rw-r--r--www/chromium/files/patch-views_native_types.h20
-rw-r--r--www/chromium/files/patch-webkit__glue__webkit_glue.h11
-rw-r--r--www/chromium/files/patch-webkit__support__webkit_support_glue.cc11
35 files changed, 435 insertions, 408 deletions
diff --git a/www/chromium/files/extra-patch-base__base.gypi-freebsd b/www/chromium/files/extra-patch-base__base.gypi-freebsd
deleted file mode 100644
index 9ee58a67d1a9..000000000000
--- a/www/chromium/files/extra-patch-base__base.gypi-freebsd
+++ /dev/null
@@ -1,54 +0,0 @@
---- base/base.gypi.orig 2011-10-07 11:32:10.000000000 +0300
-+++ base/base.gypi 2011-10-08 21:38:52.007156128 +0300
-@@ -96,6 +96,7 @@
- 'files/file_path_watcher_linux.cc',
- 'files/file_path_watcher_mac.cc',
- 'files/file_path_watcher_win.cc',
-+ 'files/file_path_watcher_freebsd.cc',
- 'float_util.h',
- 'global_descriptors_posix.cc',
- 'global_descriptors_posix.h',
-@@ -188,6 +189,7 @@
- 'process_posix.cc',
- 'process_util.cc',
- 'process_util.h',
-+ 'process_util_freebsd.cc',
- 'process_util_linux.cc',
- 'process_util_mac.mm',
- 'process_util_posix.cc',
-@@ -388,11 +390,9 @@
- }, {
- 'sources!' : [ 'message_pump_gtk.cc', ],
- }],
-- [ 'OS != "linux"', {
-+ [ 'OS != "linux" and OS != "freebsd"', {
- 'sources!': [
- # Not automatically excluded by the *linux.cc rules.
-- 'gtk_util.cc',
-- 'gtk_util.h',
- 'linux_util.cc',
- ],
- },
-@@ -434,7 +434,7 @@
- 'string16.cc',
- ],
- },],
-- ['os_posix==1 and OS!="linux" and OS!="mac"', {
-+ ['os_posix==1 and OS!="linux" and OS!="mac" and OS!="freebsd"', {
- 'sources!': [
- 'files/file_path_watcher_linux.cc',
- ],
-@@ -508,6 +508,13 @@
- ],
- }],
- [ 'OS == "freebsd" or OS == "openbsd"', {
-+ # XXX rene: maybe this chunk should go one day
-+ 'sources!': [
-+ 'file_util_linux.cc',
-+ 'process_linux.cc',
-+ 'process_util_linux.cc',
-+ 'files/file_path_watcher_linux.cc',
-+ ],
- 'link_settings': {
- 'libraries': [
- '-L/usr/local/lib -lexecinfo',
diff --git a/www/chromium/files/extra-patch-base__base.gypi-stub b/www/chromium/files/extra-patch-base__base.gypi-stub
deleted file mode 100644
index 614b04da186a..000000000000
--- a/www/chromium/files/extra-patch-base__base.gypi-stub
+++ /dev/null
@@ -1,37 +0,0 @@
---- base/base.gypi.orig 2011-08-13 18:38:35.292399627 +0300
-+++ base/base.gypi 2011-08-13 18:50:20.106856527 +0300
-@@ -189,6 +189,7 @@
- 'process_posix.cc',
- 'process_util.cc',
- 'process_util.h',
-+ 'process_util_freebsd.cc',
- 'process_util_linux.cc',
- 'process_util_mac.mm',
- 'process_util_posix.cc',
-@@ -371,11 +372,9 @@
- 'message_pump_glib_x.cc',
- ],
- }],
-- [ 'OS != "linux"', {
-+ [ 'OS != "linux" and OS != "freebsd"', {
- 'sources!': [
- # Not automatically excluded by the *linux.cc rules.
-- 'gtk_util.cc',
-- 'gtk_util.h',
- 'linux_util.cc',
- ],
- },
-@@ -491,6 +490,13 @@
- ],
- }],
- [ 'OS == "freebsd" or OS == "openbsd"', {
-+ # XXX rene: maybe this chunk should go one day
-+ 'sources!': [
-+ 'file_util_linux.cc',
-+ 'process_linux.cc',
-+ 'process_util_linux.cc',
-+ 'files/file_path_watcher_linux.cc',
-+ ],
- 'link_settings': {
- 'libraries': [
- '-L/usr/local/lib -lexecinfo',
diff --git a/www/chromium/files/patch-base__allocator__allocator.gyp b/www/chromium/files/patch-base__allocator__allocator.gyp
index dee2f39ac278..404e6714b27b 100644
--- a/www/chromium/files/patch-base__allocator__allocator.gyp
+++ b/www/chromium/files/patch-base__allocator__allocator.gyp
@@ -1,6 +1,6 @@
---- base/allocator/allocator.gyp.orig 2011-09-14 11:01:29.000000000 +0300
-+++ base/allocator/allocator.gyp 2011-09-25 22:56:07.000000000 +0300
-@@ -7,324 +7,196 @@
+--- base/allocator/allocator.gyp.orig 2011-11-28 21:53:42.000000000 +0200
++++ base/allocator/allocator.gyp 2011-11-28 22:01:26.000000000 +0200
+@@ -7,326 +7,198 @@
'jemalloc_dir': '../../third_party/jemalloc/chromium',
'tcmalloc_dir': '../../third_party/tcmalloc/chromium',
},
@@ -107,6 +107,8 @@
- '<(tcmalloc_dir)/src/common.cc',
- '<(tcmalloc_dir)/src/common.h',
- '<(tcmalloc_dir)/src/debugallocation.cc',
+- '<(tcmalloc_dir)/src/free_list.cc',
+- '<(tcmalloc_dir)/src/free_list.h',
- '<(tcmalloc_dir)/src/getpc.h',
- '<(tcmalloc_dir)/src/google/heap-checker.h',
- '<(tcmalloc_dir)/src/google/heap-profiler.h',
@@ -385,7 +387,7 @@
+ '<(tcmalloc_dir)/src/base/spinlock_posix-inl.h',
+ '<(tcmalloc_dir)/src/base/spinlock_win32-inl.h',
+ '<(tcmalloc_dir)/src/base/stl_allocator.h',
-+ '<(tcmalloc_dir)/src/base/src/synchronization_profiling.h',
++ '<(tcmalloc_dir)/src/base/synchronization_profiling.h',
+ '<(tcmalloc_dir)/src/base/sysinfo.cc',
+ '<(tcmalloc_dir)/src/base/sysinfo.h',
+ '<(tcmalloc_dir)/src/base/thread_annotations.h',
@@ -398,6 +400,8 @@
+ '<(tcmalloc_dir)/src/common.cc',
+ '<(tcmalloc_dir)/src/common.h',
+ '<(tcmalloc_dir)/src/debugallocation.cc',
++ '<(tcmalloc_dir)/src/free_list.cc',
++ '<(tcmalloc_dir)/src/free_list.h',
+ '<(tcmalloc_dir)/src/getpc.h',
+ '<(tcmalloc_dir)/src/google/heap-checker.h',
+ '<(tcmalloc_dir)/src/google/heap-profiler.h',
@@ -494,7 +498,7 @@
# jemalloc files
'<(jemalloc_dir)/jemalloc.c',
'<(jemalloc_dir)/jemalloc.h',
-@@ -332,85 +204,239 @@
+@@ -334,85 +206,236 @@
'<(jemalloc_dir)/qr.h',
'<(jemalloc_dir)/rb.h',
@@ -530,6 +534,9 @@
- # debugallocation.cc #includes tcmalloc.cc,
- # so only one of them should be used.
- '<(tcmalloc_dir)/src/tcmalloc.cc',
+- ],
+- 'cflags': [
+- '-DTCMALLOC_FOR_DEBUGALLOCATION',
+ # Included by allocator_shim.cc for maximal inlining.
+ 'generic_allocators.cc',
+ 'win_allocator.cc',
@@ -591,14 +598,18 @@
+ '<(tcmalloc_dir)/src/windows/preamble_patcher.h',
+ '<(tcmalloc_dir)/src/windows/preamble_patcher_with_stub.cc',
],
-- 'cflags': [
-- '-DTCMALLOC_FOR_DEBUGALLOCATION',
-+ 'dependencies': [
-+ '../third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- ],
- }, { # linux_use_debugallocation != 1
- 'sources!': [
- '<(tcmalloc_dir)/src/debugallocation.cc',
++ 'dependencies': [
++ '../third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ ],
+- }],
+- [ 'linux_keep_shadow_stacks==1', {
+- 'sources': [
+- '<(tcmalloc_dir)/src/linux_shadow_stacks.cc',
+- '<(tcmalloc_dir)/src/linux_shadow_stacks.h',
+- '<(tcmalloc_dir)/src/stacktrace_shadow-inl.h',
+ 'msvs_settings': {
+ # TODO(sgk): merge this with build/common.gypi settings
+ 'VCLibrarianTool': {
@@ -738,12 +749,9 @@
+ ],
+ }],
],
-- }],
-- [ 'linux_keep_shadow_stacks==1', {
-- 'sources': [
-- '<(tcmalloc_dir)/src/linux_shadow_stacks.cc',
-- '<(tcmalloc_dir)/src/linux_shadow_stacks.h',
-- '<(tcmalloc_dir)/src/stacktrace_shadow-inl.h',
+- 'cflags': [
+- '-finstrument-functions',
+- '-DKEEP_SHADOW_STACKS',
+ },
+ {
+ 'target_name': 'allocator_unittests',
@@ -752,28 +760,23 @@
+ 'allocator',
+ '../../testing/gtest.gyp:gtest',
],
-- 'cflags': [
-- '-finstrument-functions',
-- '-DKEEP_SHADOW_STACKS',
-+ 'include_dirs': [
-+ '.',
-+ '<(tcmalloc_dir)/src/base',
-+ '<(tcmalloc_dir)/src',
-+ '../..',
- ],
- }],
- [ 'linux_use_heapchecker==0', {
- # Do not compile and link the heapchecker source.
- 'sources!': [
- '<(tcmalloc_dir)/src/heap-checker-bcad.cc',
- '<(tcmalloc_dir)/src/heap-checker.cc',
-+ 'sources': [
-+ 'allocator_unittests.cc',
++ 'include_dirs': [
++ '.',
++ '<(tcmalloc_dir)/src/base',
++ '<(tcmalloc_dir)/src',
++ '../..',
],
- # Disable the heap checker in tcmalloc.
- 'cflags': [
+- 'cflags': [
- '-DNO_HEAP_CHECK',
-+ '-fexceptions',
++ 'sources': [
++ 'allocator_unittests.cc',
],
- }],
- ],
diff --git a/www/chromium/files/patch-base__base.gypi b/www/chromium/files/patch-base__base.gypi
new file mode 100644
index 000000000000..a50815fbc02f
--- /dev/null
+++ b/www/chromium/files/patch-base__base.gypi
@@ -0,0 +1,60 @@
+--- base/base.gypi.orig 2011-11-10 16:01:46.000000000 +0200
++++ base/base.gypi 2011-11-28 21:48:00.000000000 +0200
+@@ -115,6 +115,7 @@
+ 'files/file_path_watcher_mac.cc',
+ 'files/file_path_watcher_stub.cc',
+ 'files/file_path_watcher_win.cc',
++ 'files/file_path_watcher_freebsd.cc',
+ 'float_util.h',
+ 'format_macros.h',
+ 'global_descriptors_posix.cc',
+@@ -216,6 +217,7 @@
+ 'process_posix.cc',
+ 'process_util.cc',
+ 'process_util.h',
++ 'process_util_freebsd.cc',
+ 'process_util_linux.cc',
+ 'process_util_mac.mm',
+ 'process_util_openbsd.cc',
+@@ -425,7 +427,7 @@
+ 'sources!' : [ 'message_pump_gtk.cc', ],
+ 'sources/' : [ [ 'include', 'message_pump_x.cc', ] ],
+ }],
+- [ 'OS != "linux"', {
++ [ 'OS != "linux" and OS != "freebsd"', {
+ 'sources!': [
+ # Not automatically excluded by the *linux.cc rules.
+ 'linux_util.cc',
+@@ -498,6 +500,18 @@
+ 'files/file_path_watcher_stub.cc',
+ ],
+ }],
++ [ 'OS == "freebsd" and os_ver >= 801000', {
++ 'sources!': [
++ 'files/file_path_watcher_stub.cc',
++ 'files/file_path_watcher_linux.cc',
++ ],
++ }],
++ [ 'OS == "freebsd" and os_ver < 801000', {
++ 'sources!': [
++ 'files/file_path_watcher_linux.cc',
++ 'files/file_path_watcher_freebsd.cc',
++ ],
++ }],
+ [ 'OS == "openbsd"', {
+ 'sources/': [
+ ['include', '^base_paths_linux\\.cc$'],
+@@ -600,6 +614,13 @@
+ ],
+ }],
+ [ 'OS == "freebsd" or OS == "openbsd"', {
++ # XXX rene: maybe this chunk should go one day
++ 'sources!': [
++ 'file_util_linux.cc',
++ 'process_linux.cc',
++ 'process_util_linux.cc',
++ 'files/file_path_watcher_linux.cc',
++ ],
+ 'include_dirs': [
+ '/usr/local/include',
+ ],
diff --git a/www/chromium/files/patch-base__files__file_path_watcher_stub.cc b/www/chromium/files/patch-base__files__file_path_watcher_stub.cc
deleted file mode 100644
index c37553bc6d6a..000000000000
--- a/www/chromium/files/patch-base__files__file_path_watcher_stub.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- base/files/file_path_watcher_stub.cc.orig 2011-05-06 12:03:16.000000000 +0300
-+++ base/files/file_path_watcher_stub.cc 2011-06-04 15:41:10.461378331 +0300
-@@ -15,10 +15,16 @@
- class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
- public:
- virtual bool Watch(const FilePath& path,
-- FileWatcher::Delegate* delegate,
-- base::MessageLoopProxy*) OVERRIDE {
-+ FilePathWatcher::Delegate* delegate) OVERRIDE {
- return false;
- }
-+
-+ virtual void Cancel() OVERRIDE {
-+ set_cancelled();
-+ }
-+
-+ protected:
-+ virtual void CancelOnMessageLoopThread() OVERRIDE { }
- };
-
- } // namespace
diff --git a/www/chromium/files/patch-base__process_util.h b/www/chromium/files/patch-base__process_util.h
index d33f037627a4..770449ec8fb9 100644
--- a/www/chromium/files/patch-base__process_util.h
+++ b/www/chromium/files/patch-base__process_util.h
@@ -1,31 +1,37 @@
---- base/process_util.h.orig 2011-09-14 11:01:29.000000000 +0300
-+++ base/process_util.h 2011-09-30 23:12:21.000000000 +0300
-@@ -28,6 +28,10 @@
- #include <sys/types.h>
+--- base/process_util.h.orig 2011-11-01 10:42:54.000000000 +0200
++++ base/process_util.h 2011-11-21 23:05:53.000000000 +0200
+@@ -14,14 +14,14 @@
+ #if defined(OS_WIN)
+ #include <windows.h>
+ #include <tlhelp32.h>
+-#elif defined(OS_MACOSX) || defined(OS_OPENBSD)
++#elif defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
+ // kinfo_proc is defined in <sys/sysctl.h>, but this forward declaration
+ // is sufficient for the vector<kinfo_proc> below.
+ struct kinfo_proc;
+ // malloc_zone_t is defined in <malloc/malloc.h>, but this forward declaration
+ // is sufficient for GetPurgeableZone() below.
+ typedef struct _malloc_zone_t malloc_zone_t;
+-#if !defined(OS_OPENBSD)
++#if !defined(OS_OPENBSD) && !defined(OS_FREEBSD)
+ #include <mach/mach.h>
#endif
-
-+#if defined(OS_FREEBSD)
-+struct kinfo_proc;
-+#endif /* defined(OS_FREEBSD) */
-+
- #include <list>
- #include <string>
- #include <utility>
-@@ -163,7 +167,7 @@
+ #elif defined(OS_POSIX)
+@@ -166,7 +166,7 @@
// Win XP SP1 as well.
- BASE_API ProcessId GetProcId(ProcessHandle process);
+ BASE_EXPORT ProcessId GetProcId(ProcessHandle process);
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD)
// Returns the path to the executable of the given process.
- BASE_API FilePath GetProcessExecutablePath(ProcessHandle process);
+ BASE_EXPORT FilePath GetProcessExecutablePath(ProcessHandle process);
-@@ -467,7 +471,7 @@
+@@ -528,7 +528,7 @@
#if defined(OS_WIN)
HANDLE snapshot_;
bool started_iteration_;
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_FREEBSD)
+-#elif defined(OS_MACOSX) || defined(OS_OPENBSD)
++#elif defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
std::vector<kinfo_proc> kinfo_procs_;
size_t index_of_kinfo_proc_;
#elif defined(OS_POSIX)
diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi
index f9be724f3209..999c648f72ae 100644
--- a/www/chromium/files/patch-build__common.gypi
+++ b/www/chromium/files/patch-build__common.gypi
@@ -1,8 +1,8 @@
---- build/common.gypi.orig 2011-10-07 08:32:09.000000000 +0000
-+++ build/common.gypi 2011-10-10 19:06:38.844749713 +0000
-@@ -331,6 +331,10 @@
- # Whether to build for Wayland display server
- 'use_wayland%': 0,
+--- build/common.gypi.orig 2011-11-10 16:01:45.000000000 +0200
++++ build/common.gypi 2011-12-01 00:10:48.000000000 +0200
+@@ -403,6 +403,10 @@
+ # able to turn it off for remote debugging on Chromium OS
+ 'linux_disable_pie%': 0,
+ 'os_ver%': 0,
+ 'prefix_dir%': '/usr',
@@ -11,16 +11,16 @@
# The release channel that this build targets. This is used to restrict
# channel-specific build options, like which installer packages to create.
# The default is 'all', which does no channel-specific filtering.
-@@ -551,7 +555,7 @@
+@@ -615,7 +619,7 @@
# This is used to tweak build flags for gcc 4.4.
'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
# Figure out the python architecture to decide if we build pyauto.
-- 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/lib/libpython<(python_ver).so.1.0)',
+- 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)',
+ 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)<(prefix_dir)/lib/libpython<(python_ver).so.1)',
'conditions': [
['branding=="Chrome"', {
'linux_breakpad%': 1,
-@@ -1042,7 +1046,7 @@
+@@ -1242,7 +1246,7 @@
['exclude', '(^|/)(wayland)_[^/]*\\.(h|cc)$'],
],
}],
@@ -29,7 +29,7 @@
'sources/': [
['exclude', '_linux(_unittest)?\\.(h|cc)$'],
['exclude', '(^|/)linux/'],
-@@ -1613,6 +1617,21 @@
+@@ -1911,6 +1915,22 @@
'ldflags': [
'-Wl,--no-keep-memory',
],
@@ -43,6 +43,7 @@
+ 'conditions': [
+ ['gcc_version == 42', {
+ 'cflags!': [
++ '-mssse3',
+ '-fno-signed-zeros',
+ '-Wno-unused-result',
+ ],
@@ -50,4 +51,4 @@
+ ],
},
}],
- ['OS=="solaris"', {
+ # Android-specific options; note that most are set above with Linux.
diff --git a/www/chromium/files/patch-chrome__browser__browser_about_handler.cc b/www/chromium/files/patch-chrome__browser__browser_about_handler.cc
index 9a90243508cf..8f3030e3b4d2 100644
--- a/www/chromium/files/patch-chrome__browser__browser_about_handler.cc
+++ b/www/chromium/files/patch-chrome__browser__browser_about_handler.cc
@@ -1,15 +1,15 @@
---- chrome/browser/browser_about_handler.cc.orig 2011-07-28 11:01:59.000000000 +0300
-+++ chrome/browser/browser_about_handler.cc 2011-08-28 20:55:56.000000000 +0300
-@@ -76,7 +76,7 @@
- #include "chrome/browser/chromeos/login/wizard_controller.h"
+--- chrome/browser/browser_about_handler.cc.orig 2011-11-01 10:43:20.000000000 +0200
++++ chrome/browser/browser_about_handler.cc 2011-11-19 19:05:28.000000000 +0200
+@@ -79,7 +79,7 @@
#include "chrome/browser/chromeos/version_loader.h"
+ #include "chrome/browser/oom_priority_manager.h"
#include "content/browser/zygote_host_linux.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
#include "content/browser/zygote_host_linux.h"
#endif
-@@ -146,7 +146,7 @@
+@@ -152,7 +152,7 @@
#if defined(OS_WIN)
chrome::kChromeUIConflictsHost,
#endif
@@ -18,7 +18,7 @@
chrome::kChromeUILinuxProxyConfigHost,
chrome::kChromeUISandboxHost,
#endif
-@@ -194,7 +194,7 @@
+@@ -190,7 +190,7 @@
#if defined(USE_TCMALLOC)
chrome::kChromeUITCMallocHost,
#endif
@@ -27,7 +27,7 @@
chrome::kChromeUILinuxProxyConfigHost,
chrome::kChromeUISandboxHost,
#endif
-@@ -993,7 +993,7 @@
+@@ -1062,7 +1062,7 @@
return data;
}
@@ -36,12 +36,12 @@
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data, 0,
-@@ -1409,7 +1409,7 @@
- response = ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_TERMS_HTML).as_string();
- #endif
+@@ -1447,7 +1447,7 @@
+ return;
+ } else if (host == chrome::kChromeUIHistogramsHost) {
+ response = AboutHistograms(path);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
} else if (host == chrome::kChromeUILinuxProxyConfigHost) {
response = AboutLinuxProxyConfig();
- } else if (host == chrome::kChromeUISandboxHost) {
+ #endif
diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
index 3992724cb99f..090c13997ffd 100644
--- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
+++ b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
@@ -1,51 +1,73 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2011-10-07 08:32:35.000000000 +0000
-+++ chrome/browser/chrome_content_browser_client.cc 2011-10-10 20:09:07.754749149 +0000
-@@ -71,7 +71,7 @@
- #include "net/base/cookie_options.h"
- #include "ui/base/resource/resource_bundle.h"
+--- chrome/browser/chrome_content_browser_client.cc.orig 2011-11-01 10:43:20.000000000 +0200
++++ chrome/browser/chrome_content_browser_client.cc 2011-11-19 19:22:29.000000000 +0200
+@@ -81,18 +81,18 @@
+ #include "chrome/browser/chrome_browser_main_win.h"
+ #elif defined(OS_MACOSX)
+ #include "chrome/browser/chrome_browser_main_mac.h"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_FREEBSD)
+ #include "chrome/browser/chrome_browser_main_gtk.h"
+ #endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
#include "base/linux_util.h"
- #include "chrome/browser/browser_main_gtk.h"
#include "chrome/browser/crash_handler_host_linux.h"
-@@ -81,7 +81,7 @@
- #include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h"
- #elif defined(TOOLKIT_VIEWS)
+ #endif
+
+ #if defined(TOOLKIT_VIEWS)
#include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
#include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
#elif defined(OS_MACOSX)
#include "chrome/browser/tab_contents/tab_contents_view_mac.h"
-@@ -129,7 +129,7 @@
- return new BrowserMainPartsMac(parameters);
- #elif defined(OS_CHROMEOS)
- return new BrowserMainPartsChromeos(parameters);
+@@ -108,7 +108,7 @@
+ #elif defined(OS_WIN)
+ #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
+ #include "content/browser/renderer_host/render_widget_host_view_win.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
- return new BrowserMainPartsGtk(parameters);
+ #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
+ #elif defined(OS_MACOSX)
+ #include "content/browser/renderer_host/render_widget_host_view_mac.h"
+@@ -195,7 +195,7 @@
+ return new ChromeBrowserMainPartsWin(parameters);
+ #elif defined(OS_MACOSX)
+ return new ChromeBrowserMainPartsMac(parameters);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_FREEBSD)
+ return new ChromeBrowserMainPartsGtk(parameters);
#else
return NULL;
-@@ -142,7 +142,7 @@
- return new TabContentsViewTouch(tab_contents);
- #elif defined(TOOLKIT_VIEWS)
+@@ -210,7 +210,7 @@
+ if (views::Widget::IsPureViews())
+ return new RenderWidgetHostViewViews(widget);
+ return new RenderWidgetHostViewWin(widget);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_FREEBSD)
+ return new RenderWidgetHostViewGtk(widget);
+ #elif defined(OS_MACOSX)
+ return render_widget_host_view_mac::CreateRenderWidgetHostView(widget);
+@@ -223,7 +223,7 @@
+ TabContents* tab_contents) {
+ #if defined(TOOLKIT_VIEWS)
return new TabContentsViewViews(tab_contents);
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
return new TabContentsViewGtk(tab_contents);
#elif defined(OS_MACOSX)
return tab_contents_view_mac::CreateTabContentsView(tab_contents);
-@@ -771,7 +771,7 @@
- return g_browser_process->system_request_context();
+@@ -911,7 +911,7 @@
+ return download_util::GetDefaultDownloadDirectory();
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
int ChromeContentBrowserClient::GetCrashSignalFD(
- const std::string& process_type) {
- if (process_type == switches::kRendererProcess)
-@@ -794,7 +794,7 @@
+ const CommandLine& command_line) {
+ if (command_line.HasSwitch(switches::kExtensionProcess)) {
+@@ -937,7 +937,7 @@
return -1;
}
diff --git a/www/chromium/files/patch-chrome__browser__component_updater__component_updater_configurator.cc b/www/chromium/files/patch-chrome__browser__component_updater__component_updater_configurator.cc
new file mode 100644
index 000000000000..fa7528fe4127
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__component_updater__component_updater_configurator.cc
@@ -0,0 +1,17 @@
+--- chrome/browser/component_updater/component_updater_configurator.cc.orig 2011-11-22 01:09:14.000000000 +0200
++++ chrome/browser/component_updater/component_updater_configurator.cc 2011-11-22 01:17:26.000000000 +0200
+@@ -63,6 +63,14 @@
+ #else
+ "os=linux&arch=unknown&prod=chrome&prodversion=";
+ #endif
++#elif defined(OS_FREEBSD)
++ #if defined(__amd64__)
++ "os=freebsd&arch=x64&prod=chrome&prodversion=";
++ #elif defined(__i386__)
++ "os=freebsd&arch=x86&prod=chrome&prodversion=";
++ #else
++ "os=freebsd&arch=unknown&prod=chrome&prodversion=";
++ #endif
+ #elif defined(OS_CHROMEOS)
+ #if defined(__i386__)
+ "os=cros&arch=x86&prod=chrome&prodversion=";
diff --git a/www/chromium/files/patch-chrome__common__child_process_logging.h b/www/chromium/files/patch-chrome__common__child_process_logging.h
new file mode 100644
index 000000000000..97564f5986e5
--- /dev/null
+++ b/www/chromium/files/patch-chrome__common__child_process_logging.h
@@ -0,0 +1,11 @@
+--- chrome/common/child_process_logging.h.orig 2011-11-22 01:03:45.000000000 +0200
++++ chrome/common/child_process_logging.h 2011-11-22 01:03:57.000000000 +0200
+@@ -30,7 +30,7 @@
+
+ namespace child_process_logging {
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ // These are declared here so the crash reporter can access them directly in
+ // compromised context without going through the standard library.
+ extern char g_active_url[];
diff --git a/www/chromium/files/patch-chrome__nacl.gypi b/www/chromium/files/patch-chrome__nacl.gypi
index 7d2ee172a349..07da0980dcbf 100644
--- a/www/chromium/files/patch-chrome__nacl.gypi
+++ b/www/chromium/files/patch-chrome__nacl.gypi
@@ -1,22 +1,22 @@
---- chrome/nacl.gypi.orig 2011-10-10 21:43:36.427755838 +0300
-+++ chrome/nacl.gypi 2011-10-10 21:47:51.837729515 +0300
-@@ -103,8 +103,8 @@
+--- chrome/nacl.gypi.orig 2011-11-01 10:43:23.000000000 +0200
++++ chrome/nacl.gypi 2011-11-19 19:26:48.000000000 +0200
+@@ -102,8 +102,8 @@
+ ],
+ },
],
- },
- ],
-- }],
-- ['OS!="win" and target_arch=="ia32"', {
-+ }], # Disable nacl on freebsd for now.
-+ ['OS!="win" and OS!="freebsd" and target_arch=="ia32"', {
- # Linux-x86-32 and OSX need only the x86-32 IRT.
- 'actions': [
- {
-@@ -120,7 +120,7 @@
- },
- ],
- }],
-- ['OS!="win" and target_arch=="x64"', {
-+ ['OS!="win" and OS!="freebsd" and target_arch=="x64"', {
- # Linux-x86-64 needs only the x86-64 IRT.
- 'actions': [
- {
+- }],
+- ['OS!="win" and target_arch=="ia32"', {
++ }], # Disable nacl on freebsd for now.
++ ['OS!="win" and OS!="freebsd" and target_arch=="ia32"', {
+ # Linux-x86-32 and OSX need only the x86-32 IRT.
+ 'actions': [
+ {
+@@ -119,7 +119,7 @@
+ },
+ ],
+ }],
+- ['OS!="win" and target_arch=="x64"', {
++ ['OS!="win" and OS!="freebsd" and target_arch=="x64"', {
+ # Linux-x86-64 needs only the x86-64 IRT.
+ 'actions': [
+ {
diff --git a/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc b/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
index 63a41a321300..a1ca1203ab1b 100644
--- a/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
+++ b/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
@@ -1,13 +1,13 @@
---- chrome/test/base/in_process_browser_test.cc.orig 2011-09-14 00:41:45.000000000 +0300
-+++ chrome/test/base/in_process_browser_test.cc 2011-09-14 00:46:15.000000000 +0300
+--- chrome/test/base/in_process_browser_test.cc.orig 2011-11-01 10:43:07.000000000 +0200
++++ chrome/test/base/in_process_browser_test.cc 2011-11-19 19:32:51.000000000 +0200
@@ -41,6 +41,10 @@
- #include "net/test/test_server.h"
- #include "sandbox/src/dep.h"
+ #include "chrome/browser/chromeos/audio_handler.h"
+ #endif
+#if defined(OS_FREEBSD)
+#include <signal.h>
+#endif
+
- #if defined(OS_MACOSX)
- #include "base/mac/mac_util.h"
- #include "base/system_monitor/system_monitor.h"
+ // Passed as value of kTestType.
+ static const char kBrowserTestType[] = "browser";
+
diff --git a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
index a7ed54f24493..b63891b7e822 100644
--- a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
+++ b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
@@ -1,11 +1,11 @@
---- chrome/test/base/testing_browser_process.h.orig 2011-07-28 11:01:47.000000000 +0300
-+++ chrome/test/base/testing_browser_process.h 2011-09-06 22:56:31.000000000 +0300
-@@ -104,7 +104,7 @@
- virtual bool plugin_finder_disabled() const;
- virtual void CheckForInspectorFiles() {}
+--- chrome/test/base/testing_browser_process.h.orig 2011-11-01 10:43:07.000000000 +0200
++++ chrome/test/base/testing_browser_process.h 2011-11-19 19:35:37.000000000 +0200
+@@ -110,7 +110,7 @@
+ virtual DownloadRequestLimiter* download_request_limiter() OVERRIDE;
+ virtual bool plugin_finder_disabled() const OVERRIDE;
-#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
- virtual void StartAutoupdateTimer() {}
+ virtual void StartAutoupdateTimer() OVERRIDE {}
#endif
diff --git a/www/chromium/files/patch-content__browser__browser_main.cc b/www/chromium/files/patch-content__browser__browser_main.cc
new file mode 100644
index 000000000000..a9b17f980444
--- /dev/null
+++ b/www/chromium/files/patch-content__browser__browser_main.cc
@@ -0,0 +1,29 @@
+--- content/browser/browser_main.cc.orig 2011-11-30 22:55:59.687176328 +0200
++++ content/browser/browser_main.cc 2011-11-30 22:56:18.705178000 +0200
+@@ -39,7 +39,7 @@
+ #include "ui/base/l10n/l10n_util_win.h"
+ #endif
+
+-#if defined(OS_LINUX)
++#if defined(TOOLKIT_USES_GTK)
+ #include <glib-object.h>
+ #endif
+
+@@ -109,7 +109,7 @@
+ }
+ #endif
+
+-#if defined(OS_LINUX)
++#if defined(TOOLKIT_USES_GTK)
+ static void GLibLogHandler(const gchar* log_domain,
+ GLogLevelFlags log_level,
+ const gchar* message,
+@@ -288,7 +288,7 @@
+ // of intersecting ifdefs we have. To keep it easy to follow, there
+ // are no #else branches on any #ifs.
+
+-#if defined(OS_LINUX)
++#if defined(TOOLKIT_USES_GTK)
+ // We want to call g_thread_init(), but in some codepaths (tests) it
+ // is possible it has already been called. In older versions of
+ // GTK, it is an error to call g_thread_init twice; unfortunately,
diff --git a/www/chromium/files/patch-content__browser__renderer_host__backing_store_x.cc b/www/chromium/files/patch-content__browser__renderer_host__backing_store_gtk.cc
index 8bbc8b42dbd9..3ba12dd2875f 100644
--- a/www/chromium/files/patch-content__browser__renderer_host__backing_store_x.cc
+++ b/www/chromium/files/patch-content__browser__renderer_host__backing_store_gtk.cc
@@ -1,5 +1,5 @@
---- content/browser/renderer_host/backing_store_x.cc.orig 2011-09-14 11:01:10.000000000 +0300
-+++ content/browser/renderer_host/backing_store_x.cc 2011-09-22 00:21:16.000000000 +0300
+--- content/browser/renderer_host/backing_store_gtk.cc.orig 2011-09-14 11:01:10.000000000 +0300
++++ content/browser/renderer_host/backing_store_gtk.cc 2011-09-22 00:21:16.000000000 +0300
@@ -57,6 +57,9 @@
XShmDetach(display, shminfo);
XDestroyImage(image);
@@ -9,7 +9,7 @@
+#endif
}
- BackingStoreX::BackingStoreX(RenderWidgetHost* widget,
+ BackingStoreX::BackingStoreGtk(RenderWidgetHost* widget,
@@ -339,7 +342,9 @@
}
diff --git a/www/chromium/files/patch-content__browser__renderer_host__render_message_filter.cc b/www/chromium/files/patch-content__browser__renderer_host__render_message_filter.cc
index 7466aff71efd..fbc47b56821b 100644
--- a/www/chromium/files/patch-content__browser__renderer_host__render_message_filter.cc
+++ b/www/chromium/files/patch-content__browser__renderer_host__render_message_filter.cc
@@ -1,16 +1,16 @@
---- content/browser/renderer_host/render_message_filter.cc.orig 2011-06-24 11:30:32.000000000 +0300
-+++ content/browser/renderer_host/render_message_filter.cc 2011-06-26 20:58:31.256783053 +0300
-@@ -360,7 +360,7 @@
+--- content/browser/renderer_host/render_message_filter.cc.orig 2011-11-01 10:42:33.000000000 +0200
++++ content/browser/renderer_host/render_message_filter.cc 2011-11-21 21:16:01.000000000 +0200
+@@ -348,7 +348,7 @@
OnCheckNotificationPermission)
- IPC_MESSAGE_HANDLER(ViewHostMsg_AllocateSharedMemoryBuffer,
- OnAllocateSharedMemoryBuffer)
+ IPC_MESSAGE_HANDLER(ChildProcessHostMsg_SyncAllocateSharedMemory,
+ OnAllocateSharedMemory)
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_FREEBSD)
IPC_MESSAGE_HANDLER(ViewHostMsg_AllocTransportDIB, OnAllocTransportDIB)
IPC_MESSAGE_HANDLER(ViewHostMsg_FreeTransportDIB, OnFreeTransportDIB)
#endif
-@@ -647,7 +647,7 @@
- return context_getter->GetURLRequestContext();
+@@ -656,7 +656,7 @@
+ return context;
}
-#if defined(OS_MACOSX)
diff --git a/www/chromium/files/patch-content__common__gpu__gpu_command_buffer_stub.cc b/www/chromium/files/patch-content__common__gpu__gpu_command_buffer_stub.cc
new file mode 100644
index 000000000000..3bece6f46162
--- /dev/null
+++ b/www/chromium/files/patch-content__common__gpu__gpu_command_buffer_stub.cc
@@ -0,0 +1,11 @@
+--- content/common/gpu/gpu_command_buffer_stub.cc.orig 2011-11-30 21:36:25.000000000 +0200
++++ content/common/gpu/gpu_command_buffer_stub.cc 2011-11-30 21:36:49.000000000 +0200
+@@ -193,7 +193,7 @@
+ renderer_id_,
+ route_id_,
+ handle_);
+-#elif defined(OS_WIN) || defined(OS_LINUX)
++#elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)
+ surface_ = gfx::GLSurface::CreateViewGLSurface(software_, handle_);
+ #endif
+ } else {
diff --git a/www/chromium/files/patch-content__content_browser.gypi b/www/chromium/files/patch-content__content_browser.gypi
index a983bfce751b..dc833cdbf4e2 100644
--- a/www/chromium/files/patch-content__content_browser.gypi
+++ b/www/chromium/files/patch-content__content_browser.gypi
@@ -1,17 +1,15 @@
---- content/content_browser.gypi.orig 2011-06-24 11:30:33.000000000 +0300
-+++ content/content_browser.gypi 2011-06-26 21:57:25.042787140 +0300
-@@ -393,6 +393,14 @@
- ['exclude', '^browser/geolocation/wifi_data_provider_linux.h'],
- ]
- }],
-+ ['OS=="freebsd" or OS=="openbsd"', {
-+ 'sources/': [
-+ ['exclude', '^browser/geolocation/wifi_data_provider_linux.cc'],
-+ ['exclude', '^browser/geolocation/wifi_data_provider_linux.h'],
-+ ['exclude', '^browser/geolocation/gateway_data_provider_linux.cc'],
-+ ['exclude', '^browser/geolocation/gateway_data_provider_linux.h'],
-+ ]
-+ }],
- ['OS=="mac"', {
- 'link_settings': {
- 'mac_bundle_resources': [
+--- content/content_browser.gypi.orig 2011-11-01 10:42:35.000000000 +0200
++++ content/content_browser.gypi 2011-11-21 21:36:39.000000000 +0200
+@@ -625,6 +625,12 @@
+ '../views/views.gyp:views',
+ ],
+ }],
++ ['OS=="freebsd" or OS=="openbsd"', {
++ 'sources/': [
++ ['exclude', '^browser/geolocation/wifi_data_provider_linux.cc'],
++ ['exclude', '^browser/geolocation/wifi_data_provider_linux.h'],
++ ]
++ }],
+ ['OS=="mac"', {
+ 'sources!': [
+ 'browser/power_save_blocker_stub.cc',
diff --git a/www/chromium/files/patch-content__renderer__render_view.h b/www/chromium/files/patch-content__renderer__render_view.h
deleted file mode 100644
index 17b9d7ca4971..000000000000
--- a/www/chromium/files/patch-content__renderer__render_view.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- content/renderer/render_view.h.orig 2011-09-10 18:40:54.000000000 +0300
-+++ content/renderer/render_view.h 2011-09-10 19:13:46.000000000 +0300
-@@ -312,7 +312,7 @@
- // Request updated policy regarding firewall NAT traversal being enabled.
- void RequestRemoteAccessClientFirewallTraversal();
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_FREEBSD)
- // Informs the render view that the given plugin has gained or lost focus.
- void PluginFocusChanged(bool focused, int plugin_id);
-
-@@ -654,7 +654,7 @@
- FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnSetTextDirection);
- FRIEND_TEST_ALL_PREFIXES(RenderViewTest, StaleNavigationsIgnored);
- FRIEND_TEST_ALL_PREFIXES(RenderViewTest, UpdateTargetURLWithInvalidURL);
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_FREEBSD)
- FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp);
- #endif
- FRIEND_TEST_ALL_PREFIXES(RenderViewTest, SetHistoryLengthAndPrune);
-@@ -1079,7 +1079,7 @@
- // states for the sizes).
- base::OneShotTimer<RenderView> check_preferred_size_timer_;
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_FREEBSD)
- // Track the fake plugin window handles allocated on the browser side for
- // the accelerated compositor and (currently) accelerated plugins so that
- // we can discard them when the view goes away.
diff --git a/www/chromium/files/patch-content__renderer__render_view.cc b/www/chromium/files/patch-content__renderer__render_view_impl.cc
index 71157cce85e5..7022c6485eb7 100644
--- a/www/chromium/files/patch-content__renderer__render_view.cc
+++ b/www/chromium/files/patch-content__renderer__render_view_impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_view.cc.orig 2011-08-30 11:58:21.000000000 +0300
-+++ content/renderer/render_view.cc 2011-09-11 22:31:33.000000000 +0300
-@@ -437,7 +437,7 @@
+--- content/renderer/render_view_impl.cc.orig 2011-11-01 10:42:35.000000000 +0200
++++ content/renderer/render_view_impl.cc 2011-11-21 22:20:15.000000000 +0200
+@@ -423,7 +423,7 @@
file_chooser_completions_.pop_front();
}
@@ -9,21 +9,21 @@
// Destroy all fake plugin window handles on the browser side.
while (!fake_plugin_window_handles_.empty()) {
// Make sure no NULL plugin window handles were inserted into this list.
-@@ -1522,7 +1522,7 @@
+@@ -1499,7 +1499,7 @@
}
- bool RenderView::isSmartInsertDeleteEnabled() {
+ bool RenderViewImpl::isSmartInsertDeleteEnabled() {
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_FREEBSD)
return true;
#else
return false;
-@@ -4187,7 +4187,7 @@
- return true;
+@@ -4318,7 +4318,7 @@
}
+ #endif
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_FREEBSD)
- void RenderView::PluginFocusChanged(bool focused, int plugin_id) {
+ void RenderViewImpl::PluginFocusChanged(bool focused, int plugin_id) {
IPC::Message* msg = new ViewHostMsg_PluginFocusChanged(routing_id(),
focused, plugin_id);
diff --git a/www/chromium/files/patch-content__renderer__render_view_impl.h b/www/chromium/files/patch-content__renderer__render_view_impl.h
new file mode 100644
index 000000000000..4cb1a4f54a3f
--- /dev/null
+++ b/www/chromium/files/patch-content__renderer__render_view_impl.h
@@ -0,0 +1,35 @@
+--- content/renderer/render_view_impl.h.orig 2011-11-01 10:42:35.000000000 +0200
++++ content/renderer/render_view_impl.h 2011-11-22 00:49:03.000000000 +0200
+@@ -260,12 +260,12 @@
+ // Request updated policy regarding firewall NAT traversal being enabled.
+ void RequestRemoteAccessClientFirewallTraversal();
+
+-#if defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_FREEBSD)
+ // Informs the render view that the given plugin has gained or lost focus.
+ void PluginFocusChanged(bool focused, int plugin_id);
+ #endif
+
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_FREEBSD)
+ // Starts plugin IME.
+ void StartPluginIme();
+
+@@ -670,7 +670,7 @@
+ FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnUpdateWebPreferences);
+ FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, StaleNavigationsIgnored);
+ FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, UpdateTargetURLWithInvalidURL);
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_FREEBSD)
+ FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp);
+ #endif
+ FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndPrune);
+@@ -1097,7 +1097,7 @@
+ bool cached_has_main_frame_horizontal_scrollbar_;
+ bool cached_has_main_frame_vertical_scrollbar_;
+
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_FREEBSD)
+ // Track the fake plugin window handles allocated on the browser side for
+ // the accelerated compositor and (currently) accelerated plugins so that
+ // we can discard them when the view goes away.
diff --git a/www/chromium/files/patch-content__renderer__renderer_glue.cc b/www/chromium/files/patch-content__renderer__renderer_glue.cc
deleted file mode 100644
index e1106814f08d..000000000000
--- a/www/chromium/files/patch-content__renderer__renderer_glue.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/renderer/renderer_glue.cc.orig 2011-06-24 11:30:33.000000000 +0300
-+++ content/renderer/renderer_glue.cc 2011-06-26 22:17:27.417781169 +0300
-@@ -34,7 +34,7 @@
- #include "webkit/glue/webkit_glue.h"
- #include "webkit/glue/websocketstreamhandle_bridge.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- #include "content/common/child_process_sandbox_support_linux.h"
- #endif
-
-@@ -255,7 +255,7 @@
- RenderThread::current()->EnableSpdy(enable);
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- int MatchFontWithFallback(const std::string& face, bool bold,
- bool italic, int charset) {
- return child_process_sandbox_support::MatchFontWithFallback(
diff --git a/www/chromium/files/patch-media__media.gyp b/www/chromium/files/patch-media__media.gyp
index ccdfd9185f6e..fe8882cf8506 100644
--- a/www/chromium/files/patch-media__media.gyp
+++ b/www/chromium/files/patch-media__media.gyp
@@ -1,6 +1,6 @@
---- media/media.gyp.orig 2011-10-10 20:58:23.652729836 +0000
-+++ media/media.gyp 2011-10-10 20:58:50.086730237 +0000
-@@ -248,7 +248,7 @@
+--- media/media.gyp.orig 2011-11-01 10:42:28.000000000 +0200
++++ media/media.gyp 2011-11-22 00:34:45.000000000 +0200
+@@ -293,7 +293,7 @@
],
},
'conditions': [
@@ -9,3 +9,21 @@
'conditions': [
['use_pulseaudio == 1', {
'link_settings': {
+@@ -479,7 +479,7 @@
+ ],
+ },
+ }],
+- [ 'OS=="linux"', {
++ [ 'OS=="linux" or OS=="freebsd"', {
+ 'variables': {
+ 'conditions': [
+ [ 'target_arch=="ia32"', {
+@@ -765,7 +765,7 @@
+ },
+ ],
+ }],
+- ['OS == "linux" and target_arch != "arm"', {
++ ['(OS == "linux" or OS == "freebsd") and target_arch != "arm"', {
+ 'targets': [
+ {
+ 'target_name': 'tile_render_bench',
diff --git a/www/chromium/files/patch-skia__ext__vector_platform_device_skia.cc b/www/chromium/files/patch-skia__ext__vector_platform_device_skia.cc
index be2cea3859fa..e484481fd263 100644
--- a/www/chromium/files/patch-skia__ext__vector_platform_device_skia.cc
+++ b/www/chromium/files/patch-skia__ext__vector_platform_device_skia.cc
@@ -1,11 +1,11 @@
---- skia/ext/vector_platform_device_skia.cc.orig 2011-10-09 00:19:19.935845255 +0300
-+++ skia/ext/vector_platform_device_skia.cc 2011-10-09 00:19:41.820724365 +0300
+--- skia/ext/vector_platform_device_skia.cc.orig 2011-11-01 10:42:37.000000000 +0200
++++ skia/ext/vector_platform_device_skia.cc 2011-11-21 22:28:09.000000000 +0200
@@ -88,7 +88,7 @@
SkASSERT(false);
return NULL;
}
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
+-#elif defined(OS_LINUX) || defined(OS_ANDROID)
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD)
void VectorPlatformDeviceSkia::DrawToNativeContext(
PlatformSurface surface, int x, int y, const PlatformRect* src_rect) {
// Should never be called on Linux.
diff --git a/www/chromium/files/patch-skia__ext__vector_platform_device_skia.h b/www/chromium/files/patch-skia__ext__vector_platform_device_skia.h
index 15fba9c89def..af55ab138cc5 100644
--- a/www/chromium/files/patch-skia__ext__vector_platform_device_skia.h
+++ b/www/chromium/files/patch-skia__ext__vector_platform_device_skia.h
@@ -1,11 +1,11 @@
---- skia/ext/vector_platform_device_skia.h.orig 2011-10-09 00:19:07.294915003 +0300
-+++ skia/ext/vector_platform_device_skia.h 2011-10-09 00:20:01.103617064 +0300
+--- skia/ext/vector_platform_device_skia.h.orig 2011-11-01 10:42:37.000000000 +0200
++++ skia/ext/vector_platform_device_skia.h 2011-11-21 22:29:46.000000000 +0200
@@ -40,7 +40,7 @@
virtual void DrawToNativeContext(CGContext* context, int x, int y,
const CGRect* src_rect);
virtual CGContextRef GetBitmapContext();
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
+-#elif defined(OS_LINUX) || defined(OS_ANDROID)
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD)
virtual void DrawToNativeContext(PlatformSurface surface, int x, int y,
const PlatformRect* src_rect);
#endif
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__WebCore__config.h b/www/chromium/files/patch-third_party__WebKit__Source__WebCore__config.h
index d4e30cd90dc8..5bba2a78442c 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__WebCore__config.h
+++ b/www/chromium/files/patch-third_party__WebKit__Source__WebCore__config.h
@@ -1,13 +1,14 @@
---- third_party/WebKit/Source/WebCore/config.h.orig 2011-07-19 20:24:21.258582723 +0300
-+++ third_party/WebKit/Source/WebCore/config.h 2011-07-19 20:25:31.840201896 +0300
-@@ -199,6 +199,13 @@
- #define USE_SYSTEM_MALLOC 1
- #endif
+--- third_party/WebKit/Source/WebCore/config.h.orig 2011-11-10 16:05:10.000000000 +0200
++++ third_party/WebKit/Source/WebCore/config.h 2011-12-01 20:58:22.000000000 +0200
+@@ -164,6 +164,14 @@
+ #define WTF_USE_NEW_THEME 1
+ #endif // PLATFORM(MAC)
+#if OS(FREEBSD)
+#include <sys/param.h>
+#if __FreeBSD_version < 802502
+#define log2(x) (log(x) / M_LN2)
++#define log2f(x) (logf(x) / (float)M_LN2)
+#endif
+#endif
+
diff --git a/www/chromium/files/patch-third_party__openssl__openssl.gyp b/www/chromium/files/patch-third_party__openssl__openssl.gyp
new file mode 100644
index 000000000000..32af0c66abe8
--- /dev/null
+++ b/www/chromium/files/patch-third_party__openssl__openssl.gyp
@@ -0,0 +1,11 @@
+--- third_party/openssl/openssl.gyp.orig 2011-11-21 22:53:37.000000000 +0200
++++ third_party/openssl/openssl.gyp 2011-11-21 22:54:53.000000000 +0200
+@@ -576,7 +576,7 @@
+ 'openssl/engines/e_ubsec.c',
+ ],
+ 'conditions': [
+- ['OS=="linux"', {
++ ['OS=="linux" or OS=="freebsd"', {
+ 'defines': [
+ # ENGINESDIR must be defined if OPENSSLDIR is.
+ 'ENGINESDIR="/dev/null"',
diff --git a/www/chromium/files/patch-third_party__skia__include__core__SkPreConfig.h b/www/chromium/files/patch-third_party__skia__include__core__SkPreConfig.h
index 71921b5f7dcf..0bd62274d153 100644
--- a/www/chromium/files/patch-third_party__skia__include__core__SkPreConfig.h
+++ b/www/chromium/files/patch-third_party__skia__include__core__SkPreConfig.h
@@ -1,11 +1,11 @@
---- third_party/skia/include/core/SkPreConfig.h.orig 2011-04-16 11:02:02.000000000 +0300
-+++ third_party/skia/include/core/SkPreConfig.h 2011-04-25 20:08:55.031145158 +0300
-@@ -37,7 +37,7 @@
+--- third_party/skia/include/core/SkPreConfig.h.orig 2011-11-01 10:43:44.000000000 +0200
++++ third_party/skia/include/core/SkPreConfig.h 2011-11-21 22:31:26.000000000 +0200
+@@ -30,7 +30,7 @@
#define SK_BUILD_FOR_WIN32
#elif defined(__SYMBIAN32__)
#define SK_BUILD_FOR_WIN32
-- #elif defined(linux)
-+ #elif defined(linux) || defined(__FreeBSD__)
+- #elif defined(linux) || defined(__OpenBSD_)
++ #elif defined(linux) || defined(__OpenBSD_) || defined(__FreeBSD__)
#define SK_BUILD_FOR_UNIX
#elif TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
#define SK_BUILD_FOR_IOS
diff --git a/www/chromium/files/patch-third_party__yasm__yasm_compile.gypi b/www/chromium/files/patch-third_party__yasm__yasm_compile.gypi
new file mode 100644
index 000000000000..9c2ef743b273
--- /dev/null
+++ b/www/chromium/files/patch-third_party__yasm__yasm_compile.gypi
@@ -0,0 +1,18 @@
+--- third_party/yasm/yasm_compile.gypi.orig 2011-11-22 00:07:26.000000000 +0200
++++ third_party/yasm/yasm_compile.gypi 2011-11-22 00:08:10.000000000 +0200
+@@ -36,13 +36,13 @@
+ }],
+
+ # Define yasm_flags that pass into YASM.
+- [ 'OS=="linux" and target_arch=="ia32"', {
++ [ '(OS=="linux" or OS=="freebsd") and target_arch=="ia32"', {
+ 'yasm_flags': [
+ '-felf32',
+ '-m', 'x86',
+ ],
+ }],
+- [ 'OS=="linux" and target_arch=="x64"', {
++ [ '(OS=="linux" or OS=="freebsd") and target_arch=="x64"', {
+ 'yasm_flags': [
+ '-DPIC',
+ '-felf64',
diff --git a/www/chromium/files/patch-ui__gfx__surface__transport_dib.h b/www/chromium/files/patch-ui__gfx__surface__transport_dib.h
index 4165a37e33bd..d5be61e1dda3 100644
--- a/www/chromium/files/patch-ui__gfx__surface__transport_dib.h
+++ b/www/chromium/files/patch-ui__gfx__surface__transport_dib.h
@@ -1,15 +1,15 @@
---- ui/gfx/surface/transport_dib.h.orig 2011-05-06 12:03:42.000000000 +0300
-+++ ui/gfx/surface/transport_dib.h 2011-06-05 21:06:20.559165060 +0300
-@@ -8,7 +8,7 @@
-
+--- ui/gfx/surface/transport_dib.h.orig 2011-11-01 10:43:23.000000000 +0200
++++ ui/gfx/surface/transport_dib.h 2011-11-21 22:35:21.000000000 +0200
+@@ -9,7 +9,7 @@
#include "base/basictypes.h"
+ #include "ui/gfx/surface/surface_export.h"
--#if defined(OS_WIN) || defined(OS_MACOSX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_FREEBSD)
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_FREEBSD)
#include "base/shared_memory.h"
#endif
-@@ -78,7 +78,7 @@
+@@ -79,7 +79,7 @@
static int fake_handle = 10;
return reinterpret_cast<Handle>(fake_handle++);
}
@@ -18,7 +18,7 @@
typedef base::SharedMemoryHandle Handle;
// On Mac, the inode number of the backing file is used as an id.
typedef base::SharedMemoryId Id;
-@@ -93,7 +93,7 @@
+@@ -94,7 +94,7 @@
static int fake_handle = 10;
return Handle(fake_handle++, false);
}
@@ -27,12 +27,12 @@
typedef int Handle; // These two ints are SysV IPC shared memory keys
struct Id {
// Ensure that default initialized Ids are invalid.
-@@ -184,11 +184,12 @@
+@@ -199,11 +199,12 @@
private:
TransportDIB();
--#if defined(OS_WIN) || defined(OS_MACOSX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_FREEBSD)
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_FREEBSD)
explicit TransportDIB(base::SharedMemoryHandle dib);
base::SharedMemory shared_memory_;
uint32 sequence_num_;
diff --git a/www/chromium/files/patch-views__events__event.h b/www/chromium/files/patch-views__events__event.h
deleted file mode 100644
index b2704264d63d..000000000000
--- a/www/chromium/files/patch-views__events__event.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- views/events/event.h.orig 2011-09-10 15:38:07.000000000 +0300
-+++ views/events/event.h 2011-09-10 15:38:29.000000000 +0300
-@@ -90,7 +90,7 @@
- #if defined(OS_WIN)
- // Returns the EventFlags in terms of windows flags.
- int GetWindowsFlags() const;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
- // Get the views::Event flags from a native GdkEvent.
- static int GetFlagsFromGdkEvent(NativeEvent native_event);
- #endif
diff --git a/www/chromium/files/patch-views_native_types.h b/www/chromium/files/patch-views_native_types.h
deleted file mode 100644
index 0308ce641c4a..000000000000
--- a/www/chromium/files/patch-views_native_types.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- views/native_types.h.orig 2011-10-07 11:32:08.000000000 +0300
-+++ views/native_types.h 2011-10-08 22:57:20.811082782 +0300
-@@ -8,7 +8,7 @@
-
- #include "ui/gfx/native_widget_types.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- typedef union _GdkEvent GdkEvent;
- #endif
- #if defined(USE_X11)
-@@ -44,7 +44,7 @@
- typedef aura::Event* NativeEvent;
- #elif defined(OS_WIN)
- typedef MSG NativeEvent;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
-
- #if defined(USE_WAYLAND)
- typedef ui::WaylandEvent* NativeEvent;
diff --git a/www/chromium/files/patch-webkit__glue__webkit_glue.h b/www/chromium/files/patch-webkit__glue__webkit_glue.h
deleted file mode 100644
index 45f7d5ac8380..000000000000
--- a/www/chromium/files/patch-webkit__glue__webkit_glue.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./webkit/glue/webkit_glue.h.orig 2010-12-16 02:11:23.000000000 +0100
-+++ ./webkit/glue/webkit_glue.h 2010-12-20 20:15:08.000000000 +0100
-@@ -271,7 +271,7 @@
- // Notifies the browser that the given action has been performed.
- void UserMetricsRecordAction(const std::string& action);
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- // Return a read-only file descriptor to the font which best matches the given
- // properties or -1 on failure.
- // charset: specifies the language(s) that the font must cover. See
diff --git a/www/chromium/files/patch-webkit__support__webkit_support_glue.cc b/www/chromium/files/patch-webkit__support__webkit_support_glue.cc
deleted file mode 100644
index 1cd14c91c3fd..000000000000
--- a/www/chromium/files/patch-webkit__support__webkit_support_glue.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./webkit/support/webkit_support_glue.cc.orig 2010-12-16 02:11:23.000000000 +0100
-+++ ./webkit/support/webkit_support_glue.cc 2010-12-20 20:15:08.000000000 +0100
-@@ -99,7 +99,7 @@
- void UserMetricsRecordAction(const std::string& action) {
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- int MatchFontWithFallback(const std::string& face, bool bold,
- bool italic, int charset) {
- return -1;