diff --git a/www/chromium/Makefile b/www/chromium/Makefile index c07b360ed36..038f725e5e6 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.38 2011/04/15 10:10:27 robert Exp $ +# $OpenBSD: Makefile,v 1.39 2011/04/29 13:18:01 robert Exp $ ONLY_FOR_ARCHS= i386 amd64 COMMENT= Chromium browser -V= 10.0.648.205 +V= 11.0.696.60 DISTNAME= chromium-${V} CATEGORIES= www @@ -29,9 +29,10 @@ WANTLIB += gtk-x11-2.0 jpeg m nspr4 pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pixman-1 plc4 plds4 png pthread pthread-stubs xcb xml2 WANTLIB += z execinfo bz2 nss3 nssutil3 ssl3 smime3 softokn3 gconf-2 WANTLIB += GL Xxf86vm drm stdc++ xcb-render xcb-shm -WANTLIB += Xtst event sqlite3 xslt vpx kvm>=10.0 +WANTLIB += Xtst event xslt vpx kvm>=10.0 MASTER_SITES= http://build.chromium.org/buildbot/official/ \ + http://blade2k.humppa.hu/distfiles/ \ ftp://rene-ladan.nl/pub/distfiles/ MODULES= devel/gettext \ @@ -77,8 +78,9 @@ GYP_DEFS= -Duse_system_bzip2=1 \ -Duse_system_libjpeg=1 \ -Duse_system_libpng=1 \ -Duse_system_libxml=1 \ - -Duse_system_sqlite=1 \ + -Duse_system_sqlite=0 \ -Duse_system_vpx=1 \ + -Duse_system_yasm=1 \ -Duse_system_zlib=0 \ -Ddisable_nacl=1 \ -Ddisable_sse2=1 \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index b8bc143ed17..f9f95481b2d 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,5 +1,5 @@ -MD5 (chromium-10.0.648.205.tar.bz2) = TsCPJxjUMDi4hIcDSpbI9Q== -RMD160 (chromium-10.0.648.205.tar.bz2) = 7Bjc8WLaKPWwDjpeaLNz7IkRBLI= -SHA1 (chromium-10.0.648.205.tar.bz2) = 0nrSUBG/jqnOYRqIZI6bAUqcZPA= -SHA256 (chromium-10.0.648.205.tar.bz2) = GicVjUX8ua+EhIh5dS4gr24ncVN56Gs3qIgb20+8e1U= -SIZE (chromium-10.0.648.205.tar.bz2) = 144190502 +MD5 (chromium-11.0.696.60.tar.bz2) = G+ZVhy6KBi0lMrl3szPKww== +RMD160 (chromium-11.0.696.60.tar.bz2) = HYfn3mrebB58t0+6HrTn8wUe+Xk= +SHA1 (chromium-11.0.696.60.tar.bz2) = jxZGuMSGThYtoLKQpZSJgh1m2EA= +SHA256 (chromium-11.0.696.60.tar.bz2) = JLfiY1o5ok8kmQMlpro7gEuFYdjfvIJjNG+oDS2xtHQ= +SIZE (chromium-11.0.696.60.tar.bz2) = 145250311 diff --git a/www/chromium/patches/patch-app_app_base_gypi b/www/chromium/patches/patch-app_app_base_gypi index dfc5c52aaf9..c0d44a4ac2a 100644 --- a/www/chromium/patches/patch-app_app_base_gypi +++ b/www/chromium/patches/patch-app_app_base_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-app_app_base_gypi,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- app/app_base.gypi.orig Fri Mar 11 10:01:06 2011 -+++ app/app_base.gypi Mon Mar 14 10:55:37 2011 -@@ -232,7 +232,7 @@ +$OpenBSD: patch-app_app_base_gypi,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- app/app_base.gypi.orig Tue Apr 26 10:01:06 2011 ++++ app/app_base.gypi Thu Apr 28 11:17:48 2011 +@@ -233,7 +233,7 @@ 'surface/io_surface_support_mac.cc', 'surface/io_surface_support_mac.h', 'surface/transport_dib.h', @@ -10,7 +10,7 @@ $OpenBSD: patch-app_app_base_gypi,v 1.2 2011/03/15 11:38:05 robert Exp $ 'surface/transport_dib_mac.cc', 'surface/transport_dib_win.cc', 'win/iat_patch_function.cc', -@@ -335,7 +335,7 @@ +@@ -334,7 +334,7 @@ ['exclude', '^win/*'], ], }], @@ -19,7 +19,7 @@ $OpenBSD: patch-app_app_base_gypi,v 1.2 2011/03/15 11:38:05 robert Exp $ 'sources': [ 'gfx/gl/gl_context_egl.cc', 'gfx/gl/gl_context_egl.h', -@@ -363,7 +363,6 @@ +@@ -362,7 +362,6 @@ 'link_settings': { 'libraries': [ '-lX11', diff --git a/www/chromium/patches/patch-app_gfx_gl_gl_context_egl_cc b/www/chromium/patches/patch-app_gfx_gl_gl_context_egl_cc index 7568dc117f5..589cf1e20ae 100644 --- a/www/chromium/patches/patch-app_gfx_gl_gl_context_egl_cc +++ b/www/chromium/patches/patch-app_gfx_gl_gl_context_egl_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-app_gfx_gl_gl_context_egl_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- app/gfx/gl/gl_context_egl.cc.orig Mon Mar 14 10:58:37 2011 -+++ app/gfx/gl/gl_context_egl.cc Mon Mar 14 10:59:00 2011 -@@ -4,7 +4,7 @@ - - #include +$OpenBSD: patch-app_gfx_gl_gl_context_egl_cc,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- app/gfx/gl/gl_context_egl.cc.orig Tue Apr 26 10:01:05 2011 ++++ app/gfx/gl/gl_context_egl.cc Thu Apr 28 11:17:48 2011 +@@ -13,7 +13,7 @@ + // it brings in #defines that cause conflicts. + #include "app/gfx/gl/gl_bindings.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_OPENBSD) diff --git a/www/chromium/patches/patch-base_base_gyp b/www/chromium/patches/patch-base_base_gyp index 21f6afc136e..8c5c8e3c00e 100644 --- a/www/chromium/patches/patch-base_base_gyp +++ b/www/chromium/patches/patch-base_base_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_base_gyp,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- base/base.gyp.orig Fri Mar 11 10:01:33 2011 -+++ base/base.gyp Mon Mar 14 10:55:37 2011 -@@ -238,6 +238,13 @@ +$OpenBSD: patch-base_base_gyp,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- base/base.gyp.orig Tue Apr 26 10:01:34 2011 ++++ base/base.gyp Thu Apr 28 11:17:48 2011 +@@ -242,6 +242,13 @@ ], }], ], diff --git a/www/chromium/patches/patch-base_base_gypi b/www/chromium/patches/patch-base_base_gypi index 4dfc1432216..a5c34937550 100644 --- a/www/chromium/patches/patch-base_base_gypi +++ b/www/chromium/patches/patch-base_base_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_base_gypi,v 1.4 2011/03/15 11:38:05 robert Exp $ ---- base/base.gypi.orig Mon Mar 14 11:00:03 2011 -+++ base/base.gypi Mon Mar 14 17:36:15 2011 -@@ -159,6 +159,7 @@ +$OpenBSD: patch-base_base_gypi,v 1.5 2011/04/29 13:18:01 robert Exp $ +--- base/base.gypi.orig Tue Apr 26 10:01:34 2011 ++++ base/base.gypi Thu Apr 28 11:17:48 2011 +@@ -169,6 +169,7 @@ 'process_util.h', 'process_util_linux.cc', 'process_util_mac.mm', @@ -9,7 +9,7 @@ $OpenBSD: patch-base_base_gypi,v 1.4 2011/03/15 11:38:05 robert Exp $ 'process_util_posix.cc', 'process_util_win.cc', 'process_win.cc', -@@ -343,12 +344,11 @@ +@@ -355,12 +356,11 @@ 'message_pump_glib_x.cc', ], }], @@ -23,7 +23,7 @@ $OpenBSD: patch-base_base_gypi,v 1.4 2011/03/15 11:38:05 robert Exp $ ], }, ], -@@ -462,6 +462,12 @@ +@@ -474,6 +474,12 @@ ], }], [ 'OS == "freebsd" or OS == "openbsd"', { diff --git a/www/chromium/patches/patch-base_logging_cc b/www/chromium/patches/patch-base_logging_cc index 9deea54ca7d..2e03f8827bb 100644 --- a/www/chromium/patches/patch-base_logging_cc +++ b/www/chromium/patches/patch-base_logging_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_logging_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- base/logging.cc.orig Fri Mar 11 10:01:33 2011 -+++ base/logging.cc Mon Mar 14 10:55:37 2011 -@@ -133,7 +133,7 @@ int32 CurrentThreadId() { +$OpenBSD: patch-base_logging_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- base/logging.cc.orig Tue Apr 26 10:01:34 2011 ++++ base/logging.cc Thu Apr 28 11:17:49 2011 +@@ -128,7 +128,7 @@ int32 CurrentThreadId() { return mach_thread_self(); #elif defined(OS_LINUX) return syscall(__NR_gettid); diff --git a/www/chromium/patches/patch-base_logging_h b/www/chromium/patches/patch-base_logging_h index 31010d13d4a..36c8d72ad81 100644 --- a/www/chromium/patches/patch-base_logging_h +++ b/www/chromium/patches/patch-base_logging_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-base_logging_h,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- base/logging.h.orig Fri Mar 11 10:01:33 2011 -+++ base/logging.h Mon Mar 14 10:55:37 2011 +$OpenBSD: patch-base_logging_h,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- base/logging.h.orig Tue Apr 26 10:01:34 2011 ++++ base/logging.h Thu Apr 28 11:17:49 2011 @@ -141,6 +141,18 @@ // There is also the special severity of DFATAL, which logs FATAL in // debug mode, ERROR in normal mode. @@ -20,7 +20,7 @@ $OpenBSD: patch-base_logging_h,v 1.2 2011/03/15 11:38:05 robert Exp $ namespace logging { // Where to record logging output? A flat file and/or system debug log via -@@ -865,17 +877,6 @@ void RawLog(int level, const char* message); +@@ -878,17 +890,6 @@ void RawLog(int level, const char* message); } while (0) } // namespace logging diff --git a/www/chromium/patches/patch-base_process_util_h b/www/chromium/patches/patch-base_process_util_h index 9c9b0139bb0..2a1971a1973 100644 --- a/www/chromium/patches/patch-base_process_util_h +++ b/www/chromium/patches/patch-base_process_util_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-base_process_util_h,v 1.4 2011/03/16 10:52:46 robert Exp $ ---- base/process_util.h.orig Fri Mar 11 10:01:33 2011 -+++ base/process_util.h Wed Mar 16 09:41:54 2011 +$OpenBSD: patch-base_process_util_h,v 1.5 2011/04/29 13:18:01 robert Exp $ +--- base/process_util.h.orig Thu Apr 28 11:18:26 2011 ++++ base/process_util.h Thu Apr 28 11:19:26 2011 @@ -14,14 +14,16 @@ #if defined(OS_WIN) #include @@ -19,26 +19,7 @@ $OpenBSD: patch-base_process_util_h,v 1.4 2011/03/16 10:52:46 robert Exp $ #elif defined(OS_POSIX) #include #include -@@ -161,7 +163,7 @@ void CloseProcessHandle(ProcessHandle process); - // Win XP SP1 as well. - ProcessId GetProcId(ProcessHandle process); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_OPENBSD) - // Returns the ID for the parent of the given process. - ProcessId GetParentProcessId(ProcessHandle process); - -@@ -172,7 +174,8 @@ FilePath GetProcessExecutablePath(ProcessHandle proces - // CPU-related ticks. Returns -1 on parse error. - // Exposed for testing. - int ParseProcStatCPU(const std::string& input); -- -+#endif -+#if defined(OS_LINUX) - static const char kAdjustOOMScoreSwitch[] = "--adjust-oom-score"; - - // This adjusts /proc/process/oom_adj so the Linux OOM killer will prefer -@@ -439,7 +442,7 @@ class ProcessIterator { +@@ -439,7 +441,7 @@ class ProcessIterator { #if defined(OS_WIN) HANDLE snapshot_; bool started_iteration_; diff --git a/www/chromium/patches/patch-base_process_util_linux_cc b/www/chromium/patches/patch-base_process_util_linux_cc deleted file mode 100644 index a22c14d2a40..00000000000 --- a/www/chromium/patches/patch-base_process_util_linux_cc +++ /dev/null @@ -1,48 +0,0 @@ -$OpenBSD: patch-base_process_util_linux_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- base/process_util_linux.cc.orig Fri Mar 11 10:01:33 2011 -+++ base/process_util_linux.cc Mon Mar 14 10:55:37 2011 -@@ -449,6 +449,7 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun - - // Exposed for testing. - int ParseProcStatCPU(const std::string& input) { -+#if !defined(OS_OPENBSD) - // /proc//stat contains the process name in parens. In case the - // process name itself contains parens, skip past them. - std::string::size_type rparen = input.rfind(')'); -@@ -467,11 +468,16 @@ int ParseProcStatCPU(const std::string& input) { - base::StringToInt(fields[11], &fields11); - base::StringToInt(fields[12], &fields12); - return fields11 + fields12; -+#else -+ NOTIMPLEMENTED(); -+ return -1; -+#endif - } - - // Get the total CPU of a single process. Return value is number of jiffies - // on success or -1 on error. - static int GetProcessCPU(pid_t pid) { -+#if defined(OS_LINUX) - // Synchronously reading files in /proc is safe. - base::ThreadRestrictions::ScopedAllowIO allow_io; - -@@ -500,6 +506,10 @@ static int GetProcessCPU(pid_t pid) { - closedir(dir); - - return total_cpu; -+#else -+ NOTIMPLEMENTED(); -+ return -1; -+#endif - } - - double ProcessMetrics::GetCPUUsage() { -@@ -610,7 +620,7 @@ void OnNoMemory() { - } // namespace - - extern "C" { --#if !defined(USE_TCMALLOC) -+#if !defined(USE_TCMALLOC) && !defined(OS_OPENBSD) - - extern "C" { - void* __libc_malloc(size_t size); diff --git a/www/chromium/patches/patch-base_process_util_posix_cc b/www/chromium/patches/patch-base_process_util_posix_cc index bd73363b952..11d8968b741 100644 --- a/www/chromium/patches/patch-base_process_util_posix_cc +++ b/www/chromium/patches/patch-base_process_util_posix_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_process_util_posix_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- base/process_util_posix.cc.orig Fri Mar 11 10:01:33 2011 -+++ base/process_util_posix.cc Mon Mar 14 10:55:37 2011 -@@ -102,11 +102,11 @@ int WaitpidWithTimeout(ProcessHandle handle, int64 wai +$OpenBSD: patch-base_process_util_posix_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- base/process_util_posix.cc.orig Tue Apr 26 10:01:34 2011 ++++ base/process_util_posix.cc Thu Apr 28 11:17:49 2011 +@@ -103,11 +103,11 @@ int WaitpidWithTimeout(ProcessHandle handle, int64 wai return status; } diff --git a/www/chromium/patches/patch-base_shared_memory_posix_cc b/www/chromium/patches/patch-base_shared_memory_posix_cc index 8124dce3335..f87bcbe7b74 100644 --- a/www/chromium/patches/patch-base_shared_memory_posix_cc +++ b/www/chromium/patches/patch-base_shared_memory_posix_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-base_shared_memory_posix_cc,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- base/shared_memory_posix.cc.orig Mon Mar 14 19:21:35 2011 -+++ base/shared_memory_posix.cc Mon Mar 14 19:21:44 2011 -@@ -149,7 +149,7 @@ bool SharedMemory::CreateNamed(const std::string& name +$OpenBSD: patch-base_shared_memory_posix_cc,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- base/shared_memory_posix.cc.orig Tue Apr 26 10:01:34 2011 ++++ base/shared_memory_posix.cc Thu Apr 28 11:17:49 2011 +@@ -150,7 +150,7 @@ bool SharedMemory::CreateNamed(const std::string& name created_size_ = size; } if (fp == NULL) { diff --git a/www/chromium/patches/patch-base_string_util_posix_h b/www/chromium/patches/patch-base_string_util_posix_h deleted file mode 100644 index dac59ac5276..00000000000 --- a/www/chromium/patches/patch-base_string_util_posix_h +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-base_string_util_posix_h,v 1.2 2011/02/08 09:43:02 espie Exp $ ---- base/string_util_posix.h.orig Fri Jan 21 10:20:15 2011 -+++ base/string_util_posix.h Mon Jan 24 00:01:36 2011 -@@ -45,7 +45,12 @@ inline int strncmp16(const char16* s1, const char16* s - inline int vswprintf(wchar_t* buffer, size_t size, - const wchar_t* format, va_list arguments) { - DCHECK(IsWprintfFormatPortable(format)); -+#if defined(OS_OPENBSD) -+ // OpenBSD does not have a wide-char equivalent -+ return ::vsnprintf((char *)buffer, size, (const char *)format, arguments); -+#else - return ::vswprintf(buffer, size, format, arguments); -+#endif - } - - } // namespace base diff --git a/www/chromium/patches/patch-build_common_gypi b/www/chromium/patches/patch-build_common_gypi index 7443591156f..a26908ce18a 100644 --- a/www/chromium/patches/patch-build_common_gypi +++ b/www/chromium/patches/patch-build_common_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-build_common_gypi,v 1.4 2011/04/15 10:10:27 robert Exp $ ---- build/common.gypi.orig Wed Apr 13 10:01:33 2011 -+++ build/common.gypi Fri Apr 15 12:08:33 2011 -@@ -92,7 +92,7 @@ +$OpenBSD: patch-build_common_gypi,v 1.5 2011/04/29 13:18:01 robert Exp $ +--- build/common.gypi.orig Tue Apr 26 10:01:32 2011 ++++ build/common.gypi Thu Apr 28 11:17:49 2011 +@@ -97,7 +97,7 @@ 'fastbuild%': 0, # Python version. @@ -10,7 +10,7 @@ $OpenBSD: patch-build_common_gypi,v 1.4 2011/04/15 10:10:27 robert Exp $ # Set ARM-v7 compilation flags 'armv7%': 0, -@@ -280,7 +280,7 @@ +@@ -311,7 +311,7 @@ 'linux_strip_reliability_tests%': 0, # Enable TCMalloc. @@ -19,7 +19,7 @@ $OpenBSD: patch-build_common_gypi,v 1.4 2011/04/15 10:10:27 robert Exp $ # Disable TCMalloc's debugallocation. 'linux_use_debugallocation%': 0, -@@ -301,7 +301,7 @@ +@@ -332,7 +332,7 @@ # Used to disable Native Client at compile time, for platforms where it # isn't supported @@ -28,7 +28,7 @@ $OpenBSD: patch-build_common_gypi,v 1.4 2011/04/15 10:10:27 robert Exp $ # Set Thumb compilation flags. 'arm_thumb%': 0, -@@ -360,7 +360,7 @@ +@@ -394,7 +394,7 @@ # This is used to tweak build flags for gcc 4.4. 'gcc_version%': ' +$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/app/generated_resources.grd.orig Tue Apr 26 10:01:37 2011 ++++ chrome/app/generated_resources.grd Thu Apr 28 11:17:49 2011 +@@ -973,7 +973,7 @@ Other platform defines such as use_titlecase are decla Preferences... @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_app_generated_resources_grd,v 1.2 2011/03/15 11:38:05 rob Preferences -@@ -6527,7 +6527,7 @@ Keep your key file in a safe place. You will need it t +@@ -6774,7 +6774,7 @@ Keep your key file in a safe place. You will need it t $1Google Chrome Options @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_app_generated_resources_grd,v 1.2 2011/03/15 11:38:05 rob $1Google Chrome Preferences -@@ -6913,7 +6913,7 @@ Keep your key file in a safe place. You will need it t +@@ -7167,7 +7167,7 @@ Keep your key file in a safe place. You will need it t diff --git a/www/chromium/patches/patch-chrome_browser_about_flags_cc b/www/chromium/patches/patch-chrome_browser_about_flags_cc index e26608b9546..fda861a9b76 100644 --- a/www/chromium/patches/patch-chrome_browser_about_flags_cc +++ b/www/chromium/patches/patch-chrome_browser_about_flags_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/about_flags.cc.orig Fri Mar 11 10:01:43 2011 -+++ chrome/browser/about_flags.cc Mon Mar 14 10:55:37 2011 -@@ -503,7 +503,7 @@ int GetCurrentPlatform() { +$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/about_flags.cc.orig Tue Apr 26 10:01:44 2011 ++++ chrome/browser/about_flags.cc Thu Apr 28 11:17:49 2011 +@@ -542,7 +542,7 @@ int GetCurrentPlatform() { return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; diff --git a/www/chromium/patches/patch-chrome_browser_browser_about_handler_cc b/www/chromium/patches/patch-chrome_browser_browser_about_handler_cc index f770b7d60eb..d7587bbfcfd 100644 --- a/www/chromium/patches/patch-chrome_browser_browser_about_handler_cc +++ b/www/chromium/patches/patch-chrome_browser_browser_about_handler_cc @@ -1,16 +1,16 @@ -$OpenBSD: patch-chrome_browser_browser_about_handler_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/browser_about_handler.cc.orig Mon Mar 14 11:04:14 2011 -+++ chrome/browser/browser_about_handler.cc Mon Mar 14 11:05:03 2011 -@@ -70,7 +70,7 @@ - #include "chrome/browser/zygote_host_linux.h" - #elif defined(OS_MACOSX) - #include "chrome/browser/ui/cocoa/about_ipc_dialog.h" +$OpenBSD: patch-chrome_browser_browser_about_handler_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/browser_about_handler.cc.orig Thu Apr 28 11:20:53 2011 ++++ chrome/browser/browser_about_handler.cc Thu Apr 28 11:21:28 2011 +@@ -71,7 +71,7 @@ + #include "chrome/browser/chromeos/login/wizard_controller.h" + #include "chrome/browser/chromeos/version_loader.h" + #include "content/browser/zygote_host_linux.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_OPENBSD) - #include "chrome/browser/zygote_host_linux.h" + #include "content/browser/zygote_host_linux.h" #endif -@@ -121,7 +121,7 @@ const char kNetInternalsPath[] = "net-internals"; +@@ -126,7 +126,7 @@ const char kNetInternalsPath[] = "net-internals"; const char kPluginsPath[] = "plugins"; const char kSyncInternalsPath[] = "sync-internals"; @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_browser_about_handler_cc,v 1.2 2011/03/15 11:38:0 const char kLinuxProxyConfigPath[] = "linux-proxy-config"; const char kSandboxPath[] = "sandbox"; #endif -@@ -153,7 +153,7 @@ const char *kAllAboutPaths[] = { +@@ -160,7 +160,7 @@ const char *kAllAboutPaths[] = { kTcmallocPath, kTermsPath, kVersionPath, @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_browser_about_handler_cc,v 1.2 2011/03/15 11:38:0 kSandboxPath, #endif #if defined(OS_CHROMEOS) -@@ -544,7 +544,7 @@ std::string AboutStats() { +@@ -648,7 +648,7 @@ std::string AboutStats(const std::string& query) { return data; } @@ -37,10 +37,10 @@ $OpenBSD: patch-chrome_browser_browser_about_handler_cc,v 1.2 2011/03/15 11:38:0 std::string AboutLinuxProxyConfig() { std::string data; data.append("\n"); -@@ -766,7 +766,7 @@ void AboutSource::StartDataRequest(const std::string& - } else if (path == kTermsPath) { +@@ -863,7 +863,7 @@ void AboutSource::StartDataRequest(const std::string& response = ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_TERMS_HTML).as_string(); + #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_OPENBSD) } else if (path == kLinuxProxyConfigPath) { diff --git a/www/chromium/patches/patch-chrome_browser_browser_child_process_host_cc b/www/chromium/patches/patch-chrome_browser_browser_child_process_host_cc deleted file mode 100644 index 002097e8384..00000000000 --- a/www/chromium/patches/patch-chrome_browser_browser_child_process_host_cc +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-chrome_browser_browser_child_process_host_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/browser_child_process_host.cc.orig Fri Mar 11 10:01:43 2011 -+++ chrome/browser/browser_child_process_host.cc Mon Mar 14 10:55:37 2011 -@@ -25,9 +25,9 @@ - #include "chrome/common/result_codes.h" - #include "chrome/installer/util/google_update_settings.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_OPENBSD) - #include "base/linux_util.h" --#endif // OS_LINUX -+#endif // OS_LINUX || OS_OPENBSD - - namespace { - diff --git a/www/chromium/patches/patch-chrome_browser_file_path_watcher_file_path_watcher_stub_cc b/www/chromium/patches/patch-chrome_browser_file_path_watcher_file_path_watcher_stub_cc deleted file mode 100644 index fadc0f6dc4b..00000000000 --- a/www/chromium/patches/patch-chrome_browser_file_path_watcher_file_path_watcher_stub_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_browser_file_path_watcher_file_path_watcher_stub_cc,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/file_path_watcher/file_path_watcher_stub.cc.orig Mon Mar 14 11:06:24 2011 -+++ chrome/browser/file_path_watcher/file_path_watcher_stub.cc Mon Mar 14 11:06:30 2011 -@@ -9,7 +9,7 @@ - - class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate { - public: -- virtual bool Watch(const FilePath& path, FileWatcher::Delegate* delegate) { -+ virtual bool Watch(const FilePath& path, FilePathWatcher::Delegate* delegate) { - return false; - } - }; diff --git a/www/chromium/patches/patch-chrome_browser_history_in_memory_url_index_cc b/www/chromium/patches/patch-chrome_browser_history_in_memory_url_index_cc new file mode 100644 index 00000000000..a24f12d75b1 --- /dev/null +++ b/www/chromium/patches/patch-chrome_browser_history_in_memory_url_index_cc @@ -0,0 +1,14 @@ +$OpenBSD: patch-chrome_browser_history_in_memory_url_index_cc,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/history/in_memory_url_index.cc.orig Thu Apr 28 12:43:27 2011 ++++ chrome/browser/history/in_memory_url_index.cc Thu Apr 28 12:43:36 2011 +@@ -864,8 +864,8 @@ bool InMemoryURLIndex::RestoreWordIDHistoryMap( + return false; + WordID word_id = iter->word_id(); + HistoryIDSet history_id_set; +- const RepeatedField& history_ids(iter->history_id()); +- for (RepeatedField::const_iterator jiter = history_ids.begin(); ++ const RepeatedField& history_ids(iter->history_id()); ++ for (RepeatedField::const_iterator jiter = history_ids.begin(); + jiter != history_ids.end(); ++jiter) + history_id_set.insert(*jiter); + word_id_history_map_[word_id] = history_id_set; diff --git a/www/chromium/patches/patch-chrome_browser_memory_details_cc b/www/chromium/patches/patch-chrome_browser_memory_details_cc index dac88fb6d0c..59fe8317f20 100644 --- a/www/chromium/patches/patch-chrome_browser_memory_details_cc +++ b/www/chromium/patches/patch-chrome_browser_memory_details_cc @@ -1,14 +1,14 @@ -$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/memory_details.cc.orig Mon Mar 14 11:33:13 2011 -+++ chrome/browser/memory_details.cc Mon Mar 14 11:33:32 2011 +$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/memory_details.cc.orig Thu Apr 28 11:26:31 2011 ++++ chrome/browser/memory_details.cc Thu Apr 28 11:26:49 2011 @@ -25,7 +25,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_OPENBSD) - #include "chrome/browser/zygote_host_linux.h" - #include "chrome/browser/renderer_host/render_sandbox_host_linux.h" + #include "content/browser/zygote_host_linux.h" + #include "content/browser/renderer_host/render_sandbox_host_linux.h" #endif @@ -109,7 +109,7 @@ void MemoryDetails::CollectChildInfoOnIOThread() { void MemoryDetails::CollectChildInfoOnUIThread() { diff --git a/www/chromium/patches/patch-chrome_browser_net_connection_tester_cc b/www/chromium/patches/patch-chrome_browser_net_connection_tester_cc index 2174041fb7f..9215ec5a6ed 100644 --- a/www/chromium/patches/patch-chrome_browser_net_connection_tester_cc +++ b/www/chromium/patches/patch-chrome_browser_net_connection_tester_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_net_connection_tester_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/net/connection_tester.cc.orig Fri Mar 11 10:01:39 2011 -+++ chrome/browser/net/connection_tester.cc Mon Mar 14 10:55:37 2011 -@@ -189,7 +189,7 @@ class ExperimentURLRequestContext : public net::URLReq +$OpenBSD: patch-chrome_browser_net_connection_tester_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/net/connection_tester.cc.orig Tue Apr 26 10:01:41 2011 ++++ chrome/browser/net/connection_tester.cc Thu Apr 28 11:17:49 2011 +@@ -200,7 +200,7 @@ class ExperimentURLRequestContext : public net::URLReq // Otherwise returns a network error code. int CreateSystemProxyConfigService( scoped_ptr* config_service) { diff --git a/www/chromium/patches/patch-chrome_browser_renderer_host_browser_render_process_host_cc b/www/chromium/patches/patch-chrome_browser_renderer_host_browser_render_process_host_cc index 83f31aa5694..6e252235eb7 100644 --- a/www/chromium/patches/patch-chrome_browser_renderer_host_browser_render_process_host_cc +++ b/www/chromium/patches/patch-chrome_browser_renderer_host_browser_render_process_host_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-chrome_browser_renderer_host_browser_render_process_host_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/renderer_host/browser_render_process_host.cc.orig Fri Mar 11 10:01:42 2011 -+++ chrome/browser/renderer_host/browser_render_process_host.cc Mon Mar 14 10:55:37 2011 -@@ -886,7 +886,7 @@ TransportDIB* BrowserRenderProcessHost::MapTransportDI - HANDLE section = app::win::GetSectionFromProcess( +$OpenBSD: patch-chrome_browser_renderer_host_browser_render_process_host_cc,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/renderer_host/browser_render_process_host.cc.orig Tue Apr 26 10:01:43 2011 ++++ chrome/browser/renderer_host/browser_render_process_host.cc Thu Apr 28 11:17:49 2011 +@@ -903,7 +903,7 @@ TransportDIB* BrowserRenderProcessHost::MapTransportDI + HANDLE section = chrome::GetSectionFromProcess( dib_id.handle, GetHandle(), false /* read write */); return TransportDIB::Map(section); -#elif defined(OS_MACOSX) diff --git a/www/chromium/patches/patch-chrome_browser_renderer_host_render_message_filter_cc b/www/chromium/patches/patch-chrome_browser_renderer_host_render_message_filter_cc deleted file mode 100644 index f73ce99ebdb..00000000000 --- a/www/chromium/patches/patch-chrome_browser_renderer_host_render_message_filter_cc +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-chrome_browser_renderer_host_render_message_filter_cc,v 1.1 2011/03/16 10:52:46 robert Exp $ ---- chrome/browser/renderer_host/render_message_filter.cc.orig Wed Mar 16 10:27:48 2011 -+++ chrome/browser/renderer_host/render_message_filter.cc Wed Mar 16 10:34:05 2011 -@@ -375,7 +375,7 @@ bool RenderMessageFilter::OnMessageReceived(const IPC: - IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_GetDefaultPrintSettings, - OnGetDefaultPrintSettings) - IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_ScriptedPrint, OnScriptedPrint) --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_OPENBSD) - IPC_MESSAGE_HANDLER(ViewHostMsg_AllocTransportDIB, OnAllocTransportDIB) - IPC_MESSAGE_HANDLER(ViewHostMsg_FreeTransportDIB, OnFreeTransportDIB) - #endif -@@ -1196,7 +1196,7 @@ void RenderMessageFilter::OnRendererHistograms( - HistogramSynchronizer::DeserializeHistogramList(sequence_number, histograms); - } - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_OPENBSD) - void RenderMessageFilter::OnAllocTransportDIB( - size_t size, bool cache_in_browser, TransportDIB::Handle* handle) { - render_widget_helper_->AllocTransportDIB(size, cache_in_browser, handle); diff --git a/www/chromium/patches/patch-chrome_browser_renderer_host_render_widget_helper_cc b/www/chromium/patches/patch-chrome_browser_renderer_host_render_widget_helper_cc deleted file mode 100644 index 9e03b0d0925..00000000000 --- a/www/chromium/patches/patch-chrome_browser_renderer_host_render_widget_helper_cc +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-chrome_browser_renderer_host_render_widget_helper_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/renderer_host/render_widget_helper.cc.orig Fri Mar 11 10:01:42 2011 -+++ chrome/browser/renderer_host/render_widget_helper.cc Mon Mar 14 10:55:37 2011 -@@ -60,7 +60,7 @@ RenderWidgetHelper::~RenderWidgetHelper() { - // object, so we should not be destroyed unless pending_paints_ is empty! - DCHECK(pending_paints_.empty()); - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_OPENBSD) - ClearAllocatedDIBs(); - #endif - } -@@ -281,7 +281,7 @@ void RenderWidgetHelper::OnCreateFullscreenWidgetOnUI( - host->CreateNewFullscreenWidget(route_id, popup_type); - } - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_OPENBSD) - TransportDIB* RenderWidgetHelper::MapTransportDIB(TransportDIB::Id dib_id) { - base::AutoLock locked(allocated_dibs_lock_); - diff --git a/www/chromium/patches/patch-chrome_browser_renderer_host_render_widget_host_unittest_cc b/www/chromium/patches/patch-chrome_browser_renderer_host_render_widget_host_unittest_cc deleted file mode 100644 index 2202ed79bf7..00000000000 --- a/www/chromium/patches/patch-chrome_browser_renderer_host_render_widget_host_unittest_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_browser_renderer_host_render_widget_host_unittest_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/renderer_host/render_widget_host_unittest.cc.orig Fri Mar 11 10:01:42 2011 -+++ chrome/browser/renderer_host/render_widget_host_unittest.cc Mon Mar 14 10:55:37 2011 -@@ -419,7 +419,7 @@ TEST_F(RenderWidgetHostTest, ResizeThenCrash) { - - // Tests setting custom background - TEST_F(RenderWidgetHostTest, Background) { --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_OPENBSD) - scoped_ptr view( - RenderWidgetHostView::CreateViewForWidget(host_.get())); - host_->set_view(view.get()); diff --git a/www/chromium/patches/patch-chrome_browser_sync_engine_syncer_thread_cc b/www/chromium/patches/patch-chrome_browser_sync_engine_syncer_thread_cc index 7f4a8c060e6..30baaba0e26 100644 --- a/www/chromium/patches/patch-chrome_browser_sync_engine_syncer_thread_cc +++ b/www/chromium/patches/patch-chrome_browser_sync_engine_syncer_thread_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_sync_engine_syncer_thread_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/sync/engine/syncer_thread.cc.orig Fri Mar 11 10:01:38 2011 -+++ chrome/browser/sync/engine/syncer_thread.cc Mon Mar 14 10:55:37 2011 -@@ -263,7 +263,7 @@ void SyncerThread::ThreadMainLoop() { +$OpenBSD: patch-chrome_browser_sync_engine_syncer_thread_cc,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/sync/engine/syncer_thread.cc.orig Tue Apr 26 10:01:40 2011 ++++ chrome/browser/sync/engine/syncer_thread.cc Thu Apr 28 11:17:49 2011 +@@ -293,7 +293,7 @@ void SyncerThread::ThreadMainLoop() { bool initial_sync_for_thread = true; bool continue_sync_cycle = false; @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_sync_engine_syncer_thread_cc,v 1.3 2011/03/15 11: idle_query_.reset(new IdleQueryLinux()); #endif -@@ -358,7 +358,7 @@ void SyncerThread::ThreadMainLoop() { +@@ -389,7 +389,7 @@ void SyncerThread::ThreadMainLoop() { static_cast(vault_.current_wait_interval_.poll_delta.InSeconds()), &user_idle_milliseconds, &continue_sync_cycle, nudged); } @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_sync_engine_syncer_thread_cc,v 1.3 2011/03/15 11: idle_query_.reset(); #endif } -@@ -832,7 +832,7 @@ int SyncerThread::UserIdleTime() { +@@ -877,7 +877,7 @@ int SyncerThread::UserIdleTime() { return 0; } return idle_time / 1000000; // nano to milli diff --git a/www/chromium/patches/patch-chrome_browser_sync_engine_syncer_thread_h b/www/chromium/patches/patch-chrome_browser_sync_engine_syncer_thread_h index 4616d208c9e..e92fb19abff 100644 --- a/www/chromium/patches/patch-chrome_browser_sync_engine_syncer_thread_h +++ b/www/chromium/patches/patch-chrome_browser_sync_engine_syncer_thread_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_sync_engine_syncer_thread_h,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/sync/engine/syncer_thread.h.orig Mon Mar 14 11:37:38 2011 -+++ chrome/browser/sync/engine/syncer_thread.h Mon Mar 14 11:37:51 2011 +$OpenBSD: patch-chrome_browser_sync_engine_syncer_thread_h,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/sync/engine/syncer_thread.h.orig Tue Apr 26 10:01:40 2011 ++++ chrome/browser/sync/engine/syncer_thread.h Thu Apr 28 11:17:49 2011 @@ -26,7 +26,7 @@ #include "chrome/browser/sync/syncable/model_type.h" #include "chrome/common/deprecated/event_sys-inl.h" @@ -10,9 +10,9 @@ $OpenBSD: patch-chrome_browser_sync_engine_syncer_thread_h,v 1.3 2011/03/15 11:3 #include "chrome/browser/sync/engine/idle_query_linux.h" #endif -@@ -329,7 +329,7 @@ class SyncerThread : public base::RefCountedThreadSafe +@@ -339,7 +339,7 @@ class SyncerThread : public base::RefCountedThreadSafe NudgeSource source, - const syncable::ModelTypeBitSet& model_types); + const sessions::TypePayloadMap& model_types_with_payloads); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_OPENBSD) diff --git a/www/chromium/patches/patch-chrome_browser_task_manager_task_manager_resource_providers_cc b/www/chromium/patches/patch-chrome_browser_task_manager_task_manager_resource_providers_cc index e9507c6ae27..76d75d271f4 100644 --- a/www/chromium/patches/patch-chrome_browser_task_manager_task_manager_resource_providers_cc +++ b/www/chromium/patches/patch-chrome_browser_task_manager_task_manager_resource_providers_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_task_manager_task_manager_resource_providers_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/task_manager/task_manager_resource_providers.cc.orig Fri Mar 11 10:01:39 2011 -+++ chrome/browser/task_manager/task_manager_resource_providers.cc Mon Mar 14 10:55:37 2011 -@@ -1240,7 +1240,7 @@ TaskManagerBrowserProcessResource::TaskManagerBrowserP +$OpenBSD: patch-chrome_browser_task_manager_task_manager_resource_providers_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/task_manager/task_manager_resource_providers.cc.orig Tue Apr 26 10:01:40 2011 ++++ chrome/browser/task_manager/task_manager_resource_providers.cc Thu Apr 28 11:17:49 2011 +@@ -1223,7 +1223,7 @@ TaskManagerBrowserProcessResource::TaskManagerBrowserP default_icon_ = IconUtil::CreateSkBitmapFromHICON(icon, icon_size); } } diff --git a/www/chromium/patches/patch-chrome_browser_ui_browser_cc b/www/chromium/patches/patch-chrome_browser_ui_browser_cc index 01583eaa183..d12bddd057f 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_browser_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_browser_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_browser_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/ui/browser.cc.orig Fri Mar 11 10:01:42 2011 -+++ chrome/browser/ui/browser.cc Mon Mar 14 10:55:37 2011 -@@ -263,7 +263,7 @@ Browser::~Browser() { +$OpenBSD: patch-chrome_browser_ui_browser_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/ui/browser.cc.orig Tue Apr 26 10:01:43 2011 ++++ chrome/browser/ui/browser.cc Thu Apr 28 11:17:49 2011 +@@ -277,7 +277,7 @@ Browser::~Browser() { BrowserList::RemoveBrowser(this); @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_cc,v 1.2 2011/03/15 11:38:05 robert Ex if (!BrowserList::HasBrowserWithProfile(profile_)) { // We're the last browser window with this profile. We need to nuke the // TabRestoreService, which will start the shutdown of the -@@ -810,7 +810,7 @@ string16 Browser::GetWindowTitleForCurrentTab() const +@@ -817,7 +817,7 @@ string16 Browser::GetWindowTitleForCurrentTab() const // On Mac or ChromeOS, we don't want to suffix the page title with // the application name. return title; @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_cc,v 1.2 2011/03/15 11:38:05 robert Ex int string_id = IDS_BROWSER_WINDOW_TITLE_FORMAT; // Don't append the app name to window titles on app frames and app popups if (type_ & TYPE_APP) -@@ -1459,7 +1459,7 @@ void Browser::ToggleFullscreenMode() { +@@ -1499,7 +1499,7 @@ void Browser::ToggleFullscreenMode() { window_->SetFullscreen(!window_->IsFullscreen()); // On Linux, setting fullscreen mode is an async call to the X server, which // may or may not support fullscreen mode. @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_cc,v 1.2 2011/03/15 11:38:05 robert Ex UpdateCommandsForFullscreenMode(window_->IsFullscreen()); #endif } -@@ -1706,7 +1706,7 @@ void Browser::OpenFile() { +@@ -1758,7 +1758,7 @@ void Browser::OpenFile() { void Browser::OpenCreateShortcutsDialog() { UserMetrics::RecordAction(UserMetricsAction("CreateShortcut"), profile_); @@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_cc,v 1.2 2011/03/15 11:38:05 robert Ex TabContentsWrapper* current_tab = GetSelectedTabContentsWrapper(); DCHECK(current_tab && web_app::IsValidUrl(current_tab->tab_contents()->GetURL())) << -@@ -2516,7 +2516,7 @@ void Browser::DuplicateContentsAt(int index) { +@@ -2595,7 +2595,7 @@ void Browser::DuplicateContentsAt(int index) { } void Browser::CloseFrameAfterDragSession() { diff --git a/www/chromium/patches/patch-chrome_browser_ui_browser_list_cc b/www/chromium/patches/patch-chrome_browser_ui_browser_list_cc index 7039a6cc6cd..ee4073de025 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_browser_list_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_browser_list_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_browser_list_cc,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/ui/browser_list.cc.orig Tue Mar 15 10:41:36 2011 -+++ chrome/browser/ui/browser_list.cc Tue Mar 15 10:41:58 2011 -@@ -430,7 +430,7 @@ void BrowserList::SessionEnding() { +$OpenBSD: patch-chrome_browser_ui_browser_list_cc,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/ui/browser_list.cc.orig Tue Apr 26 10:01:43 2011 ++++ chrome/browser/ui/browser_list.cc Thu Apr 28 11:17:49 2011 +@@ -444,7 +444,7 @@ void BrowserList::SessionEnding() { // At this point the message loop is still running yet we've shut everything // down. If any messages are processed we'll likely crash. Exit now. ExitProcess(ResultCodes::NORMAL_EXIT); diff --git a/www/chromium/patches/patch-chrome_browser_ui_toolbar_wrench_menu_model_cc b/www/chromium/patches/patch-chrome_browser_ui_toolbar_wrench_menu_model_cc index e1c3d5a3c2f..b40ade7cdbf 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_toolbar_wrench_menu_model_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_toolbar_wrench_menu_model_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_toolbar_wrench_menu_model_cc,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig Mon Mar 14 11:40:10 2011 -+++ chrome/browser/ui/toolbar/wrench_menu_model.cc Mon Mar 14 11:40:49 2011 -@@ -37,7 +37,7 @@ +$OpenBSD: patch-chrome_browser_ui_toolbar_wrench_menu_model_cc,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig Tue Apr 26 10:01:43 2011 ++++ chrome/browser/ui/toolbar/wrench_menu_model.cc Thu Apr 28 11:17:49 2011 +@@ -38,7 +38,7 @@ #include "ui/base/models/button_menu_item_model.h" #include "ui/base/resource/resource_bundle.h" @@ -10,8 +10,8 @@ $OpenBSD: patch-chrome_browser_ui_toolbar_wrench_menu_model_cc,v 1.1 2011/03/15 #include #include "chrome/browser/ui/gtk/gtk_util.h" #endif -@@ -355,7 +355,7 @@ void WrenchMenuModel::Build() { - IDS_NEW_INCOGNITO_WINDOW); +@@ -359,7 +359,7 @@ void WrenchMenuModel::Build() { + #endif AddSeparator(); -#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)) @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_toolbar_wrench_menu_model_cc,v 1.1 2011/03/15 // WARNING: Mac does not use the ButtonMenuItemModel, but instead defines the // layout for this menu item in Toolbar.xib. It does, however, use the // command_id value from AddButtonItem() to identify this special item. -@@ -370,7 +370,7 @@ void WrenchMenuModel::Build() { +@@ -374,7 +374,7 @@ void WrenchMenuModel::Build() { #endif AddSeparator(); diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_accessible_view_helper_cc b/www/chromium/patches/patch-chrome_browser_ui_views_accessible_view_helper_cc deleted file mode 100644 index 9591cbf5282..00000000000 --- a/www/chromium/patches/patch-chrome_browser_ui_views_accessible_view_helper_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_browser_ui_views_accessible_view_helper_cc,v 1.1 2011/02/08 09:43:02 espie Exp $ ---- chrome/browser/ui/views/accessible_view_helper.cc.orig Fri Jan 21 10:20:24 2011 -+++ chrome/browser/ui/views/accessible_view_helper.cc Sun Jan 23 23:27:32 2011 -@@ -21,7 +21,7 @@ AccessibleViewHelper::AccessibleViewHelper( - if (!accessibility_event_router_->AddViewTree(view_tree_, profile)) - view_tree_ = NULL; - --#if defined(OS_LINUX) -+#if defined(TOOLKIT_USES_GTK) - GtkWidget* widget = view_tree->GetWidget()->GetNativeView(); - widget_helper_.reset(new AccessibleWidgetHelper(widget, profile)); - #endif diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_accessible_view_helper_h b/www/chromium/patches/patch-chrome_browser_ui_views_accessible_view_helper_h deleted file mode 100644 index 03158f7800e..00000000000 --- a/www/chromium/patches/patch-chrome_browser_ui_views_accessible_view_helper_h +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-chrome_browser_ui_views_accessible_view_helper_h,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/ui/views/accessible_view_helper.h.orig Mon Mar 14 11:37:56 2011 -+++ chrome/browser/ui/views/accessible_view_helper.h Mon Mar 14 11:38:04 2011 -@@ -15,7 +15,7 @@ - #include "chrome/browser/accessibility_events.h" - #include "gfx/native_widget_types.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_OPENBSD) - #include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h" - #endif - -@@ -73,7 +73,7 @@ class AccessibleViewHelper { - std::string window_title_; - std::vector managed_views_; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_OPENBSD) - scoped_ptr widget_helper_; - #endif - diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_download_item_view_cc b/www/chromium/patches/patch-chrome_browser_ui_views_download_item_view_cc deleted file mode 100644 index 17ee9d8405e..00000000000 --- a/www/chromium/patches/patch-chrome_browser_ui_views_download_item_view_cc +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-chrome_browser_ui_views_download_item_view_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/ui/views/download_item_view.cc.orig Fri Mar 11 10:01:42 2011 -+++ chrome/browser/ui/views/download_item_view.cc Mon Mar 14 10:55:37 2011 -@@ -261,7 +261,7 @@ DownloadItemView::DownloadItemView(DownloadItem* downl - - // Extract the file extension (if any). - FilePath filename(download->target_name()); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_OPENBSD) - std::wstring extension = base::SysNativeMBToWide(filename.Extension()); - #else - std::wstring extension = filename.Extension(); -@@ -270,7 +270,7 @@ DownloadItemView::DownloadItemView(DownloadItem* downl - // Remove leading '.' - if (extension.length() > 0) - extension = extension.substr(1); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_OPENBSD) - std::wstring rootname = - base::SysNativeMBToWide(filename.RemoveExtension().value()); - #else diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_extensions_extension_popup_cc b/www/chromium/patches/patch-chrome_browser_ui_views_extensions_extension_popup_cc index fb55134e6e4..13faff20ac8 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_views_extensions_extension_popup_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_views_extensions_extension_popup_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_views_extensions_extension_popup_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/ui/views/extensions/extension_popup.cc.orig Fri Mar 11 10:01:41 2011 -+++ chrome/browser/ui/views/extensions/extension_popup.cc Mon Mar 14 10:55:37 2011 -@@ -26,7 +26,7 @@ +$OpenBSD: patch-chrome_browser_ui_views_extensions_extension_popup_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/ui/views/extensions/extension_popup.cc.orig Thu Apr 28 11:34:16 2011 ++++ chrome/browser/ui/views/extensions/extension_popup.cc Thu Apr 28 11:34:35 2011 +@@ -23,7 +23,7 @@ #include "views/widget/root_view.h" #include "views/window/window.h" @@ -10,12 +10,12 @@ $OpenBSD: patch-chrome_browser_ui_views_extensions_extension_popup_cc,v 1.2 2011 #include "views/widget/widget_gtk.h" #endif -@@ -110,7 +110,7 @@ ExtensionPopup::ExtensionPopup(ExtensionHost* host, +@@ -94,7 +94,7 @@ ExtensionPopup::ExtensionPopup(ExtensionHost* host, + // The bubble chrome requires a separate window, so construct it here. - if (BUBBLE_CHROME == popup_chrome_) { - gfx::NativeView native_window = frame->GetNativeView(); + gfx::NativeView native_window = frame->GetNativeView(); -#if defined(OS_LINUX) +#if defined(TOOLKIT_GTK) - border_widget_ = new views::WidgetGtk(views::WidgetGtk::TYPE_WINDOW); - static_cast(border_widget_)->MakeTransparent(); - static_cast(border_widget_)->make_transient_to_parent(); + border_widget_ = new views::WidgetGtk(views::WidgetGtk::TYPE_WINDOW); + static_cast(border_widget_)->MakeTransparent(); + static_cast(border_widget_)->make_transient_to_parent(); diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_find_bar_view_cc b/www/chromium/patches/patch-chrome_browser_ui_views_find_bar_view_cc index d41d28541a3..ee7253a7215 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_views_find_bar_view_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_views_find_bar_view_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_views_find_bar_view_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/ui/views/find_bar_view.cc.orig Fri Mar 11 10:01:42 2011 -+++ chrome/browser/ui/views/find_bar_view.cc Mon Mar 14 10:55:37 2011 -@@ -85,7 +85,7 @@ static const int kDefaultCharWidth = 43; +$OpenBSD: patch-chrome_browser_ui_views_find_bar_view_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/ui/views/find_bar_view.cc.orig Tue Apr 26 10:01:43 2011 ++++ chrome/browser/ui/views/find_bar_view.cc Thu Apr 28 11:17:49 2011 +@@ -87,7 +87,7 @@ static const int kDefaultCharWidth = 43; FindBarView::FindBarView(FindBarHost* host) : DropdownBarView(host), @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_find_bar_view_cc,v 1.2 2011/03/15 11:38: ignore_contents_changed_(false), #endif find_text_(NULL), -@@ -176,11 +176,11 @@ FindBarView::~FindBarView() { +@@ -178,11 +178,11 @@ FindBarView::~FindBarView() { } void FindBarView::SetFindText(const string16& find_text) { @@ -24,7 +24,7 @@ $OpenBSD: patch-chrome_browser_ui_views_find_bar_view_cc,v 1.2 2011/03/15 11:38: ignore_contents_changed_ = false; #endif } -@@ -467,7 +467,7 @@ void FindBarView::ButtonPressed( +@@ -468,7 +468,7 @@ void FindBarView::ButtonPressed( void FindBarView::ContentsChanged(views::Textfield* sender, const string16& new_contents) { diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc b/www/chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc index 8cdad2f7258..22eb2e16ab8 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/ui/views/frame/browser_view.cc.orig Mon Mar 14 11:38:40 2011 -+++ chrome/browser/ui/views/frame/browser_view.cc Mon Mar 14 11:39:30 2011 +$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/ui/views/frame/browser_view.cc.orig Thu Apr 28 11:34:52 2011 ++++ chrome/browser/ui/views/frame/browser_view.cc Thu Apr 28 11:35:42 2011 @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/frame/browser_view.h" @@ -10,25 +10,25 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_cc,v 1.2 2011/03/15 1 #include #endif -@@ -87,7 +87,7 @@ - #include "chrome/browser/aeropeek_manager.h" +@@ -90,7 +90,7 @@ #include "chrome/browser/jumplist_win.h" + #include "ui/base/message_box_win.h" #include "ui/base/view_prop.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_OPENBSD) #include "chrome/browser/ui/views/accelerator_table_gtk.h" #include "views/window/hit_test.h" #include "views/window/window_gtk.h" -@@ -1145,7 +1145,7 @@ void BrowserView::ShowProfileErrorDialog(int message_i +@@ -1162,7 +1162,7 @@ void BrowserView::ShowProfileErrorDialog(int message_i string16 message = l10n_util::GetStringUTF16(message_id); - app::win::MessageBox(GetNativeHandle(), message, title, - MB_OK | MB_ICONWARNING | MB_TOPMOST); + ui::MessageBox(GetNativeHandle(), message, title, + MB_OK | MB_ICONWARNING | MB_TOPMOST); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_OPENBSD) std::string title = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME); std::string message = l10n_util::GetStringUTF8(message_id); GtkWidget* dialog = gtk_message_dialog_new(GetNativeHandle(), -@@ -1239,7 +1239,7 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeW +@@ -1256,7 +1256,7 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeW views::FocusManager* focus_manager = GetFocusManager(); DCHECK(focus_manager); @@ -37,16 +37,16 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_cc,v 1.2 2011/03/15 1 // Views and WebKit use different tables for GdkEventKey -> views::KeyEvent // conversion. We need to use View's conversion table here to keep consistent // behavior with views::FocusManager::OnKeyEvent() method. -@@ -1286,7 +1286,7 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeW +@@ -1303,7 +1303,7 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeW return false; // Executing the command may cause |this| object to be destroyed. -#if defined(OS_LINUX) && !defined(TOUCH_UI) +#if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(TOUCH_UI) - if (browser_->IsReservedCommand(id) && !event.match_edit_command) { + if (browser_->IsReservedCommandOrKey(id, event) && + !event.match_edit_command) { #else - if (browser_->IsReservedCommand(id)) { -@@ -1302,7 +1302,7 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeW +@@ -1320,7 +1320,7 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeW } void BrowserView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) { @@ -55,7 +55,7 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_cc,v 1.2 2011/03/15 1 views::Window* window = GetWidget()->GetWindow(); if (window && event.os_event && !event.skip_in_browser) static_cast(window)->HandleKeyboardEvent(event.os_event); -@@ -2245,7 +2245,7 @@ void BrowserView::ProcessFullscreen(bool fullscreen) { +@@ -2247,7 +2247,7 @@ void BrowserView::ProcessFullscreen(bool fullscreen) { #endif // No need to invoke SetFullscreen for linux as this code is executed // once we're already fullscreen on linux. diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_layout_cc b/www/chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_layout_cc index 24a0f053445..e044ef8af2a 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_layout_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_views_frame_browser_view_layout_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_layout_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/ui/views/frame/browser_view_layout.cc.orig Fri Mar 11 10:01:41 2011 -+++ chrome/browser/ui/views/frame/browser_view_layout.cc Mon Mar 14 10:55:37 2011 -@@ -21,7 +21,7 @@ +$OpenBSD: patch-chrome_browser_ui_views_frame_browser_view_layout_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/ui/views/frame/browser_view_layout.cc.orig Tue Apr 26 10:01:43 2011 ++++ chrome/browser/ui/views/frame/browser_view_layout.cc Thu Apr 28 11:17:49 2011 +@@ -23,7 +23,7 @@ #include "views/controls/single_split_view.h" #include "views/window/window.h" diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_info_bubble_cc b/www/chromium/patches/patch-chrome_browser_ui_views_info_bubble_cc index e094815c8ae..06f00d94c94 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_views_info_bubble_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_views_info_bubble_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_views_info_bubble_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/ui/views/info_bubble.cc.orig Fri Mar 11 10:01:42 2011 -+++ chrome/browser/ui/views/info_bubble.cc Mon Mar 14 10:55:37 2011 -@@ -314,7 +314,7 @@ void InfoBubble::AnimationProgressed(const ui::Animati +$OpenBSD: patch-chrome_browser_ui_views_info_bubble_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/ui/views/info_bubble.cc.orig Tue Apr 26 10:01:43 2011 ++++ chrome/browser/ui/views/info_bubble.cc Thu Apr 28 11:17:49 2011 +@@ -320,7 +320,7 @@ void InfoBubble::AnimationProgressed(const ui::Animati InfoBubble::InfoBubble() : @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_info_bubble_cc,v 1.2 2011/03/15 11:38:05 WidgetGtk(TYPE_WINDOW), border_contents_(NULL), #elif defined(OS_WIN) -@@ -386,7 +386,7 @@ void InfoBubble::Init(views::Widget* parent, +@@ -392,7 +392,7 @@ void InfoBubble::InitBubble(views::Widget* parent, WidgetWin::Init(border_->GetNativeView(), gfx::Rect()); SetWindowText(GetNativeView(), delegate_->accessible_name().c_str()); @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_views_info_bubble_cc,v 1.2 2011/03/15 11:38:05 MakeTransparent(); make_transient_to_parent(); WidgetGtk::InitWithWidget(parent, gfx::Rect()); -@@ -462,7 +462,7 @@ void InfoBubble::Init(views::Widget* parent, +@@ -469,7 +469,7 @@ void InfoBubble::InitBubble(views::Widget* parent, ShowWindow(SW_SHOW); if (fade_in) FadeIn(); @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_ui_views_info_bubble_cc,v 1.2 2011/03/15 11:38:05 views::WidgetGtk::Show(); #endif } -@@ -502,7 +502,7 @@ void InfoBubble::OnActivate(UINT action, BOOL minimize +@@ -510,7 +510,7 @@ void InfoBubble::OnActivate(UINT action, BOOL minimize GetRootView()->GetChildViewAt(0)->RequestFocus(); } } @@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_browser_ui_views_info_bubble_cc,v 1.2 2011/03/15 11:38:05 void InfoBubble::IsActiveChanged() { if (!IsActive()) Close(); -@@ -521,7 +521,7 @@ void InfoBubble::DoClose(bool closed_by_escape) { +@@ -529,7 +529,7 @@ void InfoBubble::DoClose(bool closed_by_escape) { #if defined(OS_WIN) border_->Close(); WidgetWin::Close(); diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_location_bar_location_bar_view_h b/www/chromium/patches/patch-chrome_browser_ui_views_location_bar_location_bar_view_h index 6a85643c5cc..0ecba739117 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_views_location_bar_location_bar_view_h +++ b/www/chromium/patches/patch-chrome_browser_ui_views_location_bar_location_bar_view_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_ui_views_location_bar_location_bar_view_h,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/ui/views/location_bar/location_bar_view.h.orig Mon Mar 14 11:39:43 2011 -+++ chrome/browser/ui/views/location_bar/location_bar_view.h Mon Mar 14 11:39:53 2011 -@@ -25,7 +25,7 @@ +$OpenBSD: patch-chrome_browser_ui_views_location_bar_location_bar_view_h,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/ui/views/location_bar/location_bar_view.h.orig Tue Apr 26 10:01:43 2011 ++++ chrome/browser/ui/views/location_bar/location_bar_view.h Thu Apr 28 11:17:49 2011 +@@ -24,7 +24,7 @@ #if defined(OS_WIN) #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" diff --git a/www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_strip_cc b/www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_strip_cc index af8d16813b2..ba788925057 100644 --- a/www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_strip_cc +++ b/www/chromium/patches/patch-chrome_browser_ui_views_tabs_tab_strip_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_strip_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/ui/views/tabs/tab_strip.cc.orig Fri Mar 11 10:01:41 2011 -+++ chrome/browser/ui/views/tabs/tab_strip.cc Mon Mar 14 10:55:37 2011 +$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_strip_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/ui/views/tabs/tab_strip.cc.orig Tue Apr 26 10:01:43 2011 ++++ chrome/browser/ui/views/tabs/tab_strip.cc Thu Apr 28 11:17:49 2011 @@ -31,7 +31,7 @@ #if defined(OS_WIN) - #include "app/win/win_util.h" + #include "views/widget/monitor_win.h" #include "views/widget/widget_win.h" -#elif defined(OS_LINUX) +#elif defined(TOOLKIT_GTK) diff --git a/www/chromium/patches/patch-chrome_browser_web_applications_web_app_cc b/www/chromium/patches/patch-chrome_browser_web_applications_web_app_cc index 57579321d4b..f17c757b399 100644 --- a/www/chromium/patches/patch-chrome_browser_web_applications_web_app_cc +++ b/www/chromium/patches/patch-chrome_browser_web_applications_web_app_cc @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_browser_web_applications_web_app_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/web_applications/web_app.cc.orig Fri Mar 11 10:01:39 2011 -+++ chrome/browser/web_applications/web_app.cc Mon Mar 14 10:55:37 2011 +$OpenBSD: patch-chrome_browser_web_applications_web_app_cc,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/browser/web_applications/web_app.cc.orig Tue Apr 26 10:01:40 2011 ++++ chrome/browser/web_applications/web_app.cc Thu Apr 28 11:17:49 2011 @@ -34,9 +34,9 @@ - #include "chrome/common/url_constants.h" - #include "chrome/common/web_apps.h" + #include "content/browser/browser_thread.h" + #include "content/browser/tab_contents/tab_contents.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_OPENBSD) diff --git a/www/chromium/patches/patch-chrome_chrome_browser_gypi b/www/chromium/patches/patch-chrome_chrome_browser_gypi index a62ecf77ce1..42170dc6123 100644 --- a/www/chromium/patches/patch-chrome_chrome_browser_gypi +++ b/www/chromium/patches/patch-chrome_chrome_browser_gypi @@ -1,8 +1,8 @@ -$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.4 2011/03/15 11:38:05 robert Exp $ ---- chrome/chrome_browser.gypi.orig Mon Mar 14 11:43:18 2011 -+++ chrome/chrome_browser.gypi Mon Mar 14 17:47:54 2011 -@@ -3621,7 +3621,7 @@ - ['include', '^browser/chromeos/dom_ui/login/'], +$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.5 2011/04/29 13:18:01 robert Exp $ +--- chrome/chrome_browser.gypi.orig Thu Apr 28 11:40:57 2011 ++++ chrome/chrome_browser.gypi Thu Apr 28 11:42:34 2011 +@@ -3455,7 +3455,7 @@ + ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.h'], ], }], - ['OS=="linux"', { @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.4 2011/03/15 11:38:05 robert Exp 'dependencies': [ '../build/linux/system.gyp:dbus-glib', '../build/linux/system.gyp:gconf', -@@ -3633,13 +3633,13 @@ +@@ -3467,8 +3467,7 @@ ], 'link_settings': { 'libraries': [ @@ -20,36 +20,7 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.4 2011/03/15 11:38:05 robert Exp ], }, 'sources!': [ - 'browser/ui/views/extensions/extension_view.cc', - 'browser/ui/views/extensions/extension_view.h', -+ 'browser/file_path_watcher/file_path_watcher_inotify.cc', - ], - 'sources': [ - 'browser/crash_handler_host_linux.h', -@@ -3694,7 +3694,6 @@ - 'browser/certificate_manager_model.h', - 'browser/dom_ui/options/certificate_manager_handler.cc', - 'browser/dom_ui/options/certificate_manager_handler.h', -- 'browser/file_path_watcher/file_path_watcher_inotify.cc', - ], - }], - ['OS=="freebsd" or OS=="openbsd"', { -@@ -3705,8 +3704,14 @@ - '../build/linux/system.gyp:x11', - ], - 'sources': [ -+ #'browser/geolocation/gateway_data_provider_bsd.cc', -+ #'browser/geolocation/gateway_data_provider_bsd.h', - 'browser/file_path_watcher/file_path_watcher_stub.cc', - ], -+ 'sources!': [ -+ 'browser/geolocation/gateway_data_provider_linux.cc', -+ 'browser/geolocation/gateway_data_provider_linux.h', -+ ], - }], - # Use system SSL settings on Mac and Windows. Use preferences - # for SSL settings on other platforms. -@@ -4294,7 +4299,7 @@ +@@ -4118,7 +4117,7 @@ ], }], # GTK build only diff --git a/www/chromium/patches/patch-chrome_chrome_gyp b/www/chromium/patches/patch-chrome_chrome_gyp index 6303f2de2c2..5ee79d259c0 100644 --- a/www/chromium/patches/patch-chrome_chrome_gyp +++ b/www/chromium/patches/patch-chrome_chrome_gyp @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_chrome_gyp,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/chrome.gyp.orig Fri Mar 11 10:01:58 2011 -+++ chrome/chrome.gyp Mon Mar 14 10:55:37 2011 +$OpenBSD: patch-chrome_chrome_gyp,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/chrome.gyp.orig Tue Apr 26 10:01:59 2011 ++++ chrome/chrome.gyp Thu Apr 28 11:17:49 2011 @@ -99,6 +99,10 @@ }], ], @@ -12,7 +12,7 @@ $OpenBSD: patch-chrome_chrome_gyp,v 1.3 2011/03/15 11:38:05 robert Exp $ ['OS=="mac"', { 'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist', 'nacl_defines': [ -@@ -635,7 +639,7 @@ +@@ -625,7 +629,7 @@ '..', ], 'conditions': [ @@ -21,7 +21,7 @@ $OpenBSD: patch-chrome_chrome_gyp,v 1.3 2011/03/15 11:38:05 robert Exp $ 'dependencies': [ '../build/linux/system.gyp:gtk', ], -@@ -758,7 +762,7 @@ +@@ -748,7 +752,7 @@ 'gpu/media/mft_angle_video_device.h', ], }], @@ -30,7 +30,7 @@ $OpenBSD: patch-chrome_chrome_gyp,v 1.3 2011/03/15 11:38:05 robert Exp $ 'sources': [ 'gpu/x_util.cc', 'gpu/x_util.h', -@@ -1140,7 +1144,7 @@ +@@ -1150,7 +1154,7 @@ 'service/cloud_print/print_system_win.cc', ], }], diff --git a/www/chromium/patches/patch-chrome_chrome_renderer_gypi b/www/chromium/patches/patch-chrome_chrome_renderer_gypi index 6bac211e480..9bcb8dccfed 100644 --- a/www/chromium/patches/patch-chrome_chrome_renderer_gypi +++ b/www/chromium/patches/patch-chrome_chrome_renderer_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_chrome_renderer_gypi,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/chrome_renderer.gypi.orig Fri Mar 11 10:01:58 2011 -+++ chrome/chrome_renderer.gypi Mon Mar 14 10:55:37 2011 -@@ -295,6 +295,14 @@ +$OpenBSD: patch-chrome_chrome_renderer_gypi,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/chrome_renderer.gypi.orig Tue Apr 26 10:01:59 2011 ++++ chrome/chrome_renderer.gypi Thu Apr 28 11:17:49 2011 +@@ -306,6 +306,14 @@ }], # BSD-specific rules. ['OS=="openbsd" or OS=="freebsd"', { diff --git a/www/chromium/patches/patch-chrome_common_chrome_paths_cc b/www/chromium/patches/patch-chrome_common_chrome_paths_cc index 6cdd82facda..97e5f8c0b6d 100644 --- a/www/chromium/patches/patch-chrome_common_chrome_paths_cc +++ b/www/chromium/patches/patch-chrome_common_chrome_paths_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.2 2011/02/08 09:43:02 espie Exp $ ---- chrome/common/chrome_paths.cc.orig Fri Jan 21 10:20:41 2011 -+++ chrome/common/chrome_paths.cc Sun Jan 23 23:27:33 2011 -@@ -164,7 +164,7 @@ bool PathProvider(int key, FilePath* result) { +$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/common/chrome_paths.cc.orig Tue Apr 26 10:01:59 2011 ++++ chrome/common/chrome_paths.cc Thu Apr 28 11:17:49 2011 +@@ -185,7 +185,7 @@ bool PathProvider(int key, FilePath* result) { cur = cur.Append(FILE_PATH_LITERAL("inspector")); break; case chrome::DIR_APP_DICTIONARIES: diff --git a/www/chromium/patches/patch-chrome_common_chrome_switches_cc b/www/chromium/patches/patch-chrome_common_chrome_switches_cc index 0372f765142..634b70a2cbf 100644 --- a/www/chromium/patches/patch-chrome_common_chrome_switches_cc +++ b/www/chromium/patches/patch-chrome_common_chrome_switches_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.3 2011/04/15 10:10:27 robert Exp $ ---- chrome/common/chrome_switches.cc.orig Wed Apr 13 10:01:58 2011 -+++ chrome/common/chrome_switches.cc Fri Apr 15 12:08:03 2011 -@@ -1302,7 +1302,7 @@ const char kEnableMediaPlayer[] = "enable- +$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/common/chrome_switches.cc.orig Tue Apr 26 10:01:59 2011 ++++ chrome/common/chrome_switches.cc Thu Apr 28 11:17:49 2011 +@@ -1174,7 +1174,7 @@ const char kEnableMediaPlayer[] = "enable- const char kEnableAdvancedFileSystem[] = "enable-advanced-fs"; #endif diff --git a/www/chromium/patches/patch-chrome_common_chrome_switches_h b/www/chromium/patches/patch-chrome_common_chrome_switches_h index 689bec37c80..57b917d6da9 100644 --- a/www/chromium/patches/patch-chrome_common_chrome_switches_h +++ b/www/chromium/patches/patch-chrome_common_chrome_switches_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.3 2011/04/15 10:10:27 robert Exp $ ---- chrome/common/chrome_switches.h.orig Wed Apr 13 10:01:58 2011 -+++ chrome/common/chrome_switches.h Fri Apr 15 12:08:03 2011 -@@ -369,7 +369,7 @@ extern const char kEnableMediaPlayer[]; +$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/common/chrome_switches.h.orig Tue Apr 26 10:01:59 2011 ++++ chrome/common/chrome_switches.h Thu Apr 28 11:17:49 2011 +@@ -332,7 +332,7 @@ extern const char kEnableMediaPlayer[]; extern const char kEnableAdvancedFileSystem[]; #endif diff --git a/www/chromium/patches/patch-chrome_common_gpu_messages_internal_h b/www/chromium/patches/patch-chrome_common_gpu_messages_internal_h deleted file mode 100644 index fea2f1f3900..00000000000 --- a/www/chromium/patches/patch-chrome_common_gpu_messages_internal_h +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_common_gpu_messages_internal_h,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/common/gpu_messages_internal.h.orig Mon Mar 14 11:46:39 2011 -+++ chrome/common/gpu_messages_internal.h Mon Mar 14 11:46:50 2011 -@@ -97,7 +97,7 @@ IPC_MESSAGE_CONTROL0(GpuHostMsg_SynchronizeReply) - IPC_MESSAGE_CONTROL1(GpuHostMsg_GraphicsInfoCollected, - GPUInfo /* GPU logging stats */) - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_OPENBSD) - // Get the XID for a view ID. - IPC_SYNC_MESSAGE_CONTROL1_1(GpuHostMsg_GetViewXID, - gfx::NativeViewId, /* view */ diff --git a/www/chromium/patches/patch-chrome_common_plugin_messages_cc b/www/chromium/patches/patch-chrome_common_plugin_messages_cc index b782850e9fe..577f48cf3ca 100644 --- a/www/chromium/patches/patch-chrome_common_plugin_messages_cc +++ b/www/chromium/patches/patch-chrome_common_plugin_messages_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_common_plugin_messages_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/common/plugin_messages.cc.orig Mon Mar 14 11:46:57 2011 -+++ chrome/common/plugin_messages.cc Mon Mar 14 11:47:41 2011 -@@ -56,7 +56,7 @@ NPVariant_Param::~NPVariant_Param() { +$OpenBSD: patch-chrome_common_plugin_messages_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/common/plugin_messages.cc.orig Tue Apr 26 10:01:59 2011 ++++ chrome/common/plugin_messages.cc Thu Apr 28 11:17:49 2011 +@@ -57,7 +57,7 @@ NPVariant_Param::~NPVariant_Param() { PluginMsg_UpdateGeometry_Param::PluginMsg_UpdateGeometry_Param() : transparent(false), @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_common_plugin_messages_cc,v 1.2 2011/03/15 11:38:05 rober windowless_buffer(TransportDIB::DefaultHandleValue()), background_buffer(TransportDIB::DefaultHandleValue()) #else -@@ -271,7 +271,7 @@ void ParamTraits::Writ +@@ -272,7 +272,7 @@ void ParamTraits::Writ WriteParam(m, p.windowless_buffer); WriteParam(m, p.background_buffer); WriteParam(m, p.transparent); @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_common_plugin_messages_cc,v 1.2 2011/03/15 11:38:05 rober WriteParam(m, p.ack_key); #endif } -@@ -285,7 +285,7 @@ bool ParamTraits::Read +@@ -286,7 +286,7 @@ bool ParamTraits::Read ReadParam(m, iter, &r->windowless_buffer) && ReadParam(m, iter, &r->background_buffer) && ReadParam(m, iter, &r->transparent) @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_common_plugin_messages_cc,v 1.2 2011/03/15 11:38:05 rober && ReadParam(m, iter, &r->ack_key) #endif -@@ -304,7 +304,7 @@ void ParamTraits::Log( +@@ -305,7 +305,7 @@ void ParamTraits::Log( LogParam(p.background_buffer, l); l->append(", "); LogParam(p.transparent, l); diff --git a/www/chromium/patches/patch-chrome_common_render_messages_internal_h b/www/chromium/patches/patch-chrome_common_render_messages_internal_h index 0bc9c9d4696..c4de23557f6 100644 --- a/www/chromium/patches/patch-chrome_common_render_messages_internal_h +++ b/www/chromium/patches/patch-chrome_common_render_messages_internal_h @@ -1,9 +1,9 @@ -$OpenBSD: patch-chrome_common_render_messages_internal_h,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/common/render_messages_internal.h.orig Mon Mar 14 11:47:46 2011 -+++ chrome/common/render_messages_internal.h Mon Mar 14 11:48:10 2011 -@@ -2139,7 +2139,7 @@ IPC_MESSAGE_CONTROL2(ViewHostMsg_ExtensionRemoveListen - std::string /* extension_id */, - std::string /* name */) +$OpenBSD: patch-chrome_common_render_messages_internal_h,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/common/render_messages_internal.h.orig Tue Apr 26 10:01:59 2011 ++++ chrome/common/render_messages_internal.h Thu Apr 28 11:17:49 2011 +@@ -1931,7 +1931,7 @@ IPC_MESSAGE_ROUTED3(ViewHostMsg_CommandStateChanged, + bool /* is_enabled */, + int /* checked_state */) -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_OPENBSD) diff --git a/www/chromium/patches/patch-chrome_common_service_process_util_posix_h b/www/chromium/patches/patch-chrome_common_service_process_util_posix_h new file mode 100644 index 00000000000..66c2873f10f --- /dev/null +++ b/www/chromium/patches/patch-chrome_common_service_process_util_posix_h @@ -0,0 +1,21 @@ +$OpenBSD: patch-chrome_common_service_process_util_posix_h,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- chrome/common/service_process_util_posix.h.orig Thu Apr 28 12:32:15 2011 ++++ chrome/common/service_process_util_posix.h Thu Apr 28 12:32:31 2011 +@@ -14,7 +14,7 @@ + #include "base/message_pump_libevent.h" + #include "base/scoped_ptr.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + #include "chrome/common/multi_process_lock.h" + MultiProcessLock* TakeServiceRunningLock(bool waiting); + #endif // OS_LINUX +@@ -65,7 +65,7 @@ struct ServiceProcessState::StateData + FilePathWatcher executable_watcher_; + ServiceProcessState* state_; + #endif // OS_MACOSX +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + scoped_ptr initializing_lock_; + scoped_ptr running_lock_; + #endif // OS_LINUX diff --git a/www/chromium/patches/patch-chrome_gpu_gpu_channel_cc b/www/chromium/patches/patch-chrome_gpu_gpu_channel_cc deleted file mode 100644 index 4162e19eb88..00000000000 --- a/www/chromium/patches/patch-chrome_gpu_gpu_channel_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_gpu_gpu_channel_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/gpu/gpu_channel.cc.orig Mon Mar 14 11:48:15 2011 -+++ chrome/gpu/gpu_channel.cc Mon Mar 14 11:48:23 2011 -@@ -139,7 +139,7 @@ void GpuChannel::OnCreateViewCommandBuffer( - // offscreen rendering and the browser provides whichever platform specific - // "render target" the GpuCommandBufferStub targets. - handle = gfx::NativeViewFromId(view_id); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_OPENBSD) - // Ask the browser for the view's XID. - gpu_thread_->Send(new GpuHostMsg_GetViewXID(view_id, &handle)); - #elif defined(OS_MACOSX) diff --git a/www/chromium/patches/patch-chrome_plugin_command_buffer_stub_h b/www/chromium/patches/patch-chrome_plugin_command_buffer_stub_h deleted file mode 100644 index 345072902c6..00000000000 --- a/www/chromium/patches/patch-chrome_plugin_command_buffer_stub_h +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_plugin_command_buffer_stub_h,v 1.1 2011/03/16 10:52:46 robert Exp $ ---- chrome/plugin/command_buffer_stub.h.orig Wed Mar 16 10:27:51 2011 -+++ chrome/plugin/command_buffer_stub.h Wed Mar 16 10:35:11 2011 -@@ -62,7 +62,7 @@ class CommandBufferStub : public IPC::Channel::Listene - bool InitializePlatformSpecific(); - void DestroyPlatformSpecific(); - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_OPENBSD) - void OnSetWindowSize(const gfx::Size& size); - void SwapBuffersCallback(); - void AllocTransportDIB(const size_t size, TransportDIB::Handle* dib_handle); diff --git a/www/chromium/patches/patch-chrome_plugin_webplugin_delegate_stub_cc b/www/chromium/patches/patch-chrome_plugin_webplugin_delegate_stub_cc index d1a638304e3..ae5135c02d4 100644 --- a/www/chromium/patches/patch-chrome_plugin_webplugin_delegate_stub_cc +++ b/www/chromium/patches/patch-chrome_plugin_webplugin_delegate_stub_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_plugin_webplugin_delegate_stub_cc,v 1.1 2011/03/16 10:52:46 robert Exp $ ---- chrome/plugin/webplugin_delegate_stub.cc.orig Wed Mar 16 10:27:51 2011 -+++ chrome/plugin/webplugin_delegate_stub.cc Wed Mar 16 10:36:37 2011 -@@ -314,7 +314,7 @@ void WebPluginDelegateStub::OnUpdateGeometry( +$OpenBSD: patch-chrome_plugin_webplugin_delegate_stub_cc,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- chrome/plugin/webplugin_delegate_stub.cc.orig Tue Apr 26 10:01:44 2011 ++++ chrome/plugin/webplugin_delegate_stub.cc Thu Apr 28 11:17:49 2011 +@@ -305,7 +305,7 @@ void WebPluginDelegateStub::OnUpdateGeometry( param.window_rect, param.clip_rect, param.windowless_buffer, param.background_buffer, param.transparent diff --git a/www/chromium/patches/patch-chrome_renderer_mock_render_thread_cc b/www/chromium/patches/patch-chrome_renderer_mock_render_thread_cc deleted file mode 100644 index 7cb83b4802f..00000000000 --- a/www/chromium/patches/patch-chrome_renderer_mock_render_thread_cc +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-chrome_renderer_mock_render_thread_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/renderer/mock_render_thread.cc.orig Fri Mar 11 10:01:45 2011 -+++ chrome/renderer/mock_render_thread.cc Mon Mar 14 10:55:37 2011 -@@ -112,7 +112,7 @@ bool MockRenderThread::OnMessageReceived(const IPC::Me - IPC_MESSAGE_HANDLER(ViewHostMsg_AllocateSharedMemoryBuffer, - OnAllocateSharedMemoryBuffer) - #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_OPENBSD) - IPC_MESSAGE_HANDLER(ViewHostMsg_AllocateTempFileForPrinting, - OnAllocateTempFileForPrinting) - IPC_MESSAGE_HANDLER(ViewHostMsg_TempFileForPrintingWritten, -@@ -161,7 +161,7 @@ void MockRenderThread::OnAllocateSharedMemoryBuffer( - } - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_OPENBSD) - void MockRenderThread::OnAllocateTempFileForPrinting( - base::FileDescriptor* renderer_fd, - int* browser_fd) { diff --git a/www/chromium/patches/patch-chrome_renderer_mock_render_thread_h b/www/chromium/patches/patch-chrome_renderer_mock_render_thread_h deleted file mode 100644 index 6df63b12884..00000000000 --- a/www/chromium/patches/patch-chrome_renderer_mock_render_thread_h +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-chrome_renderer_mock_render_thread_h,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/renderer/mock_render_thread.h.orig Fri Mar 11 10:01:44 2011 -+++ chrome/renderer/mock_render_thread.h Mon Mar 14 10:55:37 2011 -@@ -108,7 +108,7 @@ class MockRenderThread : public RenderThreadBase { - base::SharedMemoryHandle* handle); - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_OPENBSD) - void OnAllocateTempFileForPrinting(base::FileDescriptor* renderer_fd, - int* browser_fd); - void OnTempFileForPrintingWritten(int browser_fd); diff --git a/www/chromium/patches/patch-chrome_renderer_pepper_devices_cc b/www/chromium/patches/patch-chrome_renderer_pepper_devices_cc index 25732cbfb86..cdc15191fc6 100644 --- a/www/chromium/patches/patch-chrome_renderer_pepper_devices_cc +++ b/www/chromium/patches/patch-chrome_renderer_pepper_devices_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_renderer_pepper_devices_cc,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- chrome/renderer/pepper_devices.cc.orig Tue Mar 15 10:02:39 2011 -+++ chrome/renderer/pepper_devices.cc Tue Mar 15 10:19:59 2011 -@@ -52,7 +52,7 @@ NPError Graphics2DDeviceContext::Initialize( +$OpenBSD: patch-chrome_renderer_pepper_devices_cc,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- chrome/renderer/pepper_devices.cc.orig Tue Apr 26 10:01:45 2011 ++++ chrome/renderer/pepper_devices.cc Thu Apr 28 11:17:49 2011 +@@ -53,7 +53,7 @@ NPError Graphics2DDeviceContext::Initialize( uint32 buffer_size = width * height * kBytesPerPixel; // Allocate the transport DIB and the PlatformCanvas pointing to it. diff --git a/www/chromium/patches/patch-chrome_renderer_pepper_plugin_delegate_impl_cc b/www/chromium/patches/patch-chrome_renderer_pepper_plugin_delegate_impl_cc index 0dc156365cb..f9206a28898 100644 --- a/www/chromium/patches/patch-chrome_renderer_pepper_plugin_delegate_impl_cc +++ b/www/chromium/patches/patch-chrome_renderer_pepper_plugin_delegate_impl_cc @@ -1,16 +1,16 @@ -$OpenBSD: patch-chrome_renderer_pepper_plugin_delegate_impl_cc,v 1.2 2011/03/16 10:52:46 robert Exp $ ---- chrome/renderer/pepper_plugin_delegate_impl.cc.orig Fri Mar 11 10:01:45 2011 -+++ chrome/renderer/pepper_plugin_delegate_impl.cc Wed Mar 16 10:31:35 2011 -@@ -48,7 +48,7 @@ - #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" +$OpenBSD: patch-chrome_renderer_pepper_plugin_delegate_impl_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/renderer/pepper_plugin_delegate_impl.cc.orig Thu Apr 28 11:44:58 2011 ++++ chrome/renderer/pepper_plugin_delegate_impl.cc Thu Apr 28 11:45:20 2011 +@@ -54,7 +54,7 @@ #include "webkit/plugins/ppapi/ppb_flash_impl.h" + #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h" -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_OPENBSD) - #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" #endif -@@ -76,7 +76,7 @@ class PlatformImage2DImpl + +@@ -81,7 +81,7 @@ class PlatformImage2DImpl dib_(dib) { } @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_renderer_pepper_plugin_delegate_impl_cc,v 1.2 2011/03/16 // On Mac, we have to tell the browser to free the transport DIB. virtual ~PlatformImage2DImpl() { if (dib_.get()) { -@@ -94,7 +94,7 @@ class PlatformImage2DImpl +@@ -99,7 +99,7 @@ class PlatformImage2DImpl *byte_count = dib_->size(); #if defined(OS_WIN) return reinterpret_cast(dib_->handle()); @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_renderer_pepper_plugin_delegate_impl_cc,v 1.2 2011/03/16 return static_cast(dib_->handle().fd); #elif defined(OS_LINUX) return static_cast(dib_->handle()); -@@ -494,7 +494,7 @@ PepperPluginDelegateImpl::CreateImage2D(int width, int +@@ -499,7 +499,7 @@ PepperPluginDelegateImpl::CreateImage2D(int width, int uint32 buffer_size = width * height * 4; // Allocate the transport DIB and the PlatformCanvas pointing to it. diff --git a/www/chromium/patches/patch-chrome_renderer_render_process_impl_cc b/www/chromium/patches/patch-chrome_renderer_render_process_impl_cc index c4551dcc1df..d6d4b056046 100644 --- a/www/chromium/patches/patch-chrome_renderer_render_process_impl_cc +++ b/www/chromium/patches/patch-chrome_renderer_render_process_impl_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_renderer_render_process_impl_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/renderer/render_process_impl.cc.orig Fri Mar 11 10:01:44 2011 -+++ chrome/renderer/render_process_impl.cc Mon Mar 14 10:55:37 2011 -@@ -244,7 +244,7 @@ TransportDIB* RenderProcessImpl::CreateTransportDIB(si +$OpenBSD: patch-chrome_renderer_render_process_impl_cc,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/renderer/render_process_impl.cc.orig Tue Apr 26 10:01:45 2011 ++++ chrome/renderer/render_process_impl.cc Thu Apr 28 11:17:49 2011 +@@ -193,7 +193,7 @@ TransportDIB* RenderProcessImpl::CreateTransportDIB(si #if defined(OS_WIN) || defined(OS_LINUX) // Windows and Linux create transport DIBs inside the renderer return TransportDIB::Create(size, transport_dib_next_sequence_number_++); @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_renderer_render_process_impl_cc,v 1.3 2011/03/15 11:38:05 // Mac creates transport DIBs in the browser, so we need to do a sync IPC to // get one. The TransportDIB is cached in the browser. TransportDIB::Handle handle; -@@ -261,7 +261,7 @@ void RenderProcessImpl::FreeTransportDIB(TransportDIB* +@@ -210,7 +210,7 @@ void RenderProcessImpl::FreeTransportDIB(TransportDIB* if (!dib) return; @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_renderer_render_process_impl_cc,v 1.3 2011/03/15 11:38:05 // On Mac we need to tell the browser that it can drop a reference to the // shared memory. IPC::Message* msg = new ViewHostMsg_FreeTransportDIB(dib->id()); -@@ -279,7 +279,7 @@ skia::PlatformCanvas* RenderProcessImpl::GetDrawingCan +@@ -228,7 +228,7 @@ skia::PlatformCanvas* RenderProcessImpl::GetDrawingCan int width = rect.width(); int height = rect.height(); const size_t stride = skia::PlatformCanvas::StrideForWidth(rect.width()); diff --git a/www/chromium/patches/patch-chrome_renderer_render_thread_cc b/www/chromium/patches/patch-chrome_renderer_render_thread_cc index 43c771f71de..d89dd0279e3 100644 --- a/www/chromium/patches/patch-chrome_renderer_render_thread_cc +++ b/www/chromium/patches/patch-chrome_renderer_render_thread_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_renderer_render_thread_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/renderer/render_thread.cc.orig Fri Mar 11 10:01:44 2011 -+++ chrome/renderer/render_thread.cc Mon Mar 14 10:55:37 2011 -@@ -984,7 +984,7 @@ void RenderThread::EnsureWebKitInitialized() { +$OpenBSD: patch-chrome_renderer_render_thread_cc,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/renderer/render_thread.cc.orig Tue Apr 26 10:01:45 2011 ++++ chrome/renderer/render_thread.cc Thu Apr 28 11:17:49 2011 +@@ -1009,7 +1009,7 @@ void RenderThread::EnsureWebKitInitialized() { } void RenderThread::IdleHandler() { @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_renderer_render_thread_cc,v 1.3 2011/03/15 11:38:05 rober MallocExtension::instance()->ReleaseFreeMemory(); #endif -@@ -1060,7 +1060,7 @@ void RenderThread::OnPurgeMemory() { +@@ -1085,7 +1085,7 @@ void RenderThread::OnPurgeMemory() { while (!v8::V8::IdleNotification()) { } diff --git a/www/chromium/patches/patch-chrome_renderer_render_view_h b/www/chromium/patches/patch-chrome_renderer_render_view_h index 036394d2404..acd68870b8e 100644 --- a/www/chromium/patches/patch-chrome_renderer_render_view_h +++ b/www/chromium/patches/patch-chrome_renderer_render_view_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_renderer_render_view_h,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/renderer/render_view.h.orig Fri Mar 11 10:01:45 2011 -+++ chrome/renderer/render_view.h Mon Mar 14 10:55:37 2011 -@@ -1112,7 +1112,7 @@ class RenderView : public RenderWidget, +$OpenBSD: patch-chrome_renderer_render_view_h,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/renderer/render_view.h.orig Tue Apr 26 10:01:45 2011 ++++ chrome/renderer/render_view.h Thu Apr 28 11:17:49 2011 +@@ -1079,7 +1079,7 @@ class RenderView : public RenderWidget, // periodic timer so we don't send too many messages. void SyncNavigationState(); diff --git a/www/chromium/patches/patch-chrome_renderer_render_widget_cc b/www/chromium/patches/patch-chrome_renderer_render_widget_cc index e6969680294..c3416ae1013 100644 --- a/www/chromium/patches/patch-chrome_renderer_render_widget_cc +++ b/www/chromium/patches/patch-chrome_renderer_render_widget_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_renderer_render_widget_cc,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- chrome/renderer/render_widget.cc.orig Tue Mar 15 10:02:13 2011 -+++ chrome/renderer/render_widget.cc Tue Mar 15 10:02:27 2011 -@@ -888,7 +888,7 @@ void RenderWidget::OnMsgPaintAtSize(const TransportDIB +$OpenBSD: patch-chrome_renderer_render_widget_cc,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- chrome/renderer/render_widget.cc.orig Tue Apr 26 10:01:45 2011 ++++ chrome/renderer/render_widget.cc Thu Apr 28 11:17:49 2011 +@@ -901,7 +901,7 @@ void RenderWidget::OnMsgPaintAtSize(const TransportDIB // Close our unused handle. #if defined(OS_WIN) ::CloseHandle(dib_handle); diff --git a/www/chromium/patches/patch-chrome_renderer_renderer_glue_cc b/www/chromium/patches/patch-chrome_renderer_renderer_glue_cc index 8848f3dd654..a7ce243a204 100644 --- a/www/chromium/patches/patch-chrome_renderer_renderer_glue_cc +++ b/www/chromium/patches/patch-chrome_renderer_renderer_glue_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_renderer_renderer_glue_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/renderer/renderer_glue.cc.orig Fri Mar 11 10:01:45 2011 -+++ chrome/renderer/renderer_glue.cc Mon Mar 14 10:55:37 2011 +$OpenBSD: patch-chrome_renderer_renderer_glue_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/renderer/renderer_glue.cc.orig Tue Apr 26 10:01:45 2011 ++++ chrome/renderer/renderer_glue.cc Thu Apr 28 11:17:49 2011 @@ -43,7 +43,7 @@ #if defined(OS_WIN) @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_renderer_renderer_glue_cc,v 1.2 2011/03/15 11:38:05 rober #include "chrome/renderer/renderer_sandbox_support_linux.h" #endif -@@ -305,7 +305,7 @@ bool LaunchSelLdr(const char* alleged_url, int socket_ +@@ -297,7 +297,7 @@ bool LaunchSelLdr(const char* alleged_url, int socket_ } #endif diff --git a/www/chromium/patches/patch-chrome_renderer_renderer_main_cc b/www/chromium/patches/patch-chrome_renderer_renderer_main_cc index 5bea74624ef..757ccb155be 100644 --- a/www/chromium/patches/patch-chrome_renderer_renderer_main_cc +++ b/www/chromium/patches/patch-chrome_renderer_renderer_main_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_renderer_renderer_main_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/renderer/renderer_main.cc.orig Fri Mar 11 10:01:45 2011 -+++ chrome/renderer/renderer_main.cc Mon Mar 14 10:55:37 2011 -@@ -272,7 +272,7 @@ int RendererMain(const MainFunctionParams& parameters) +$OpenBSD: patch-chrome_renderer_renderer_main_cc,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/renderer/renderer_main.cc.orig Tue Apr 26 10:01:45 2011 ++++ chrome/renderer/renderer_main.cc Thu Apr 28 11:17:49 2011 +@@ -286,7 +286,7 @@ int RendererMain(const MainFunctionParams& parameters) PepperPluginRegistry::GetInstance(); { @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_renderer_renderer_main_cc,v 1.3 2011/03/15 11:38:05 rober // TODO(markus): Check if it is OK to unconditionally move this // instruction down. RenderProcessImpl render_process; -@@ -284,7 +284,7 @@ int RendererMain(const MainFunctionParams& parameters) +@@ -298,7 +298,7 @@ int RendererMain(const MainFunctionParams& parameters) } else { LOG(ERROR) << "Running without renderer sandbox"; } diff --git a/www/chromium/patches/patch-chrome_renderer_renderer_webkitclient_impl_cc b/www/chromium/patches/patch-chrome_renderer_renderer_webkitclient_impl_cc index 7fc529b1eae..748a7c2ea56 100644 --- a/www/chromium/patches/patch-chrome_renderer_renderer_webkitclient_impl_cc +++ b/www/chromium/patches/patch-chrome_renderer_renderer_webkitclient_impl_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_renderer_renderer_webkitclient_impl_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/renderer/renderer_webkitclient_impl.cc.orig Fri Mar 11 10:01:44 2011 -+++ chrome/renderer/renderer_webkitclient_impl.cc Mon Mar 14 10:55:37 2011 +$OpenBSD: patch-chrome_renderer_renderer_webkitclient_impl_cc,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/renderer/renderer_webkitclient_impl.cc.orig Tue Apr 26 10:01:45 2011 ++++ chrome/renderer/renderer_webkitclient_impl.cc Thu Apr 28 11:17:49 2011 @@ -55,7 +55,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebSandboxSupport.h" #endif @@ -17,9 +17,9 @@ $OpenBSD: patch-chrome_renderer_renderer_webkitclient_impl_cc,v 1.3 2011/03/15 1 -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_OPENBSD) virtual WebKit::WebString getFontFamilyForCharacters( - const WebKit::WebUChar* characters, size_t numCharacters); - virtual void getRenderStyleForStrike( -@@ -419,7 +419,7 @@ bool RendererWebKitClientImpl::SandboxSupport::ensureF + const WebKit::WebUChar* characters, + size_t numCharacters, +@@ -430,7 +430,7 @@ bool RendererWebKitClientImpl::SandboxSupport::ensureF return RenderThread::current()->Send(new ViewHostMsg_PreCacheFont(logfont)); } @@ -27,4 +27,4 @@ $OpenBSD: patch-chrome_renderer_renderer_webkitclient_impl_cc,v 1.3 2011/03/15 1 +#elif defined(OS_LINUX) || defined(OS_OPENBSD) WebString RendererWebKitClientImpl::SandboxSupport::getFontFamilyForCharacters( - const WebKit::WebUChar* characters, size_t num_characters) { + const WebKit::WebUChar* characters, diff --git a/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_pepper_cc b/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_pepper_cc index ecd79367154..e9c070b0dc6 100644 --- a/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_pepper_cc +++ b/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_pepper_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_renderer_webplugin_delegate_pepper_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/renderer/webplugin_delegate_pepper.cc.orig Fri Mar 11 10:01:44 2011 -+++ chrome/renderer/webplugin_delegate_pepper.cc Mon Mar 14 10:55:37 2011 +$OpenBSD: patch-chrome_renderer_webplugin_delegate_pepper_cc,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/renderer/webplugin_delegate_pepper.cc.orig Tue Apr 26 10:01:45 2011 ++++ chrome/renderer/webplugin_delegate_pepper.cc Thu Apr 28 14:33:04 2011 @@ -9,7 +9,7 @@ #include #include @@ -10,16 +10,16 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_pepper_cc,v 1.3 2011/03/15 11 #include #endif -@@ -39,7 +39,7 @@ - #include "chrome/renderer/pepper_widget.h" - #include "chrome/renderer/render_thread.h" - #include "chrome/renderer/render_view.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_OPENBSD) +@@ -53,7 +53,7 @@ + #if defined(OS_MACOSX) + #include "base/mac/mac_util.h" + #include "base/mac/scoped_cftyperef.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_OPENBSD) #include "chrome/renderer/renderer_sandbox_support_linux.h" - #endif - #include "chrome/renderer/webplugin_delegate_proxy.h" -@@ -463,7 +463,7 @@ bool WebPluginDelegatePepper::SetCursor(NPCursorType t + #include "printing/pdf_ps_metafile_cairo.h" + #elif defined(OS_WIN) +@@ -414,7 +414,7 @@ bool WebPluginDelegatePepper::SetCursor(NPCursorType t NPError NPMatchFontWithFallback(NPP instance, const NPFontDescription* description, NPFontID* id) { @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_pepper_cc,v 1.3 2011/03/15 11 int fd = renderer_sandbox_support::MatchFontWithFallback( description->face, description->weight >= 700, description->italic, description->charset); -@@ -482,7 +482,7 @@ NPError GetFontTable(NPP instance, +@@ -433,7 +433,7 @@ NPError GetFontTable(NPP instance, uint32_t table, void* output, size_t* output_length) { @@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_pepper_cc,v 1.3 2011/03/15 11 bool rv = renderer_sandbox_support::GetFontTable( id, table, static_cast(output), output_length); return rv ? NPERR_NO_ERROR : NPERR_GENERIC_ERROR; -@@ -493,7 +493,7 @@ NPError GetFontTable(NPP instance, +@@ -444,7 +444,7 @@ NPError GetFontTable(NPP instance, } NPError NPDestroyFont(NPP instance, NPFontID id) { @@ -46,7 +46,7 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_pepper_cc,v 1.3 2011/03/15 11 close(id); return NPERR_NO_ERROR; #else -@@ -1169,10 +1169,10 @@ int WebPluginDelegatePepper::PrintBegin(const gfx::Rec +@@ -823,7 +823,7 @@ int WebPluginDelegatePepper::PrintBegin(const gfx::Rec current_printer_dpi_ = printer_dpi; } } @@ -54,12 +54,8 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_pepper_cc,v 1.3 2011/03/15 11 +#if defined(OS_LINUX) || defined(OS_OPENBSD) num_pages_ = num_pages; pdf_output_done_ = false; --#endif // (OS_LINUX) -+#endif // OS_LINUX || OS_OPENBSD - return num_pages; - } - -@@ -1198,7 +1198,7 @@ bool WebPluginDelegatePepper::VectorPrintPage(int page + #endif // (OS_LINUX) +@@ -852,7 +852,7 @@ bool WebPluginDelegatePepper::VectorPrintPage(int page unsigned char* pdf_output = NULL; int32 output_size = 0; NPPrintPageNumberRange page_range; @@ -68,19 +64,7 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_pepper_cc,v 1.3 2011/03/15 11 // On Linux we will try and output all pages as PDF in the first call to // PrintPage. This is a temporary hack. // TODO(sanjeevr): Remove this hack and fix this by changing the print -@@ -1207,9 +1207,9 @@ bool WebPluginDelegatePepper::VectorPrintPage(int page - return pdf_output_done_; - page_range.firstPageNumber = 0; - page_range.lastPageNumber = num_pages_ - 1; --#else // defined(OS_LINUX) -+#else // defined(OS_LINUX) || defined(OS_OPENBSD) - page_range.firstPageNumber = page_range.lastPageNumber = page_number; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_OPENBSD) - NPError err = print_extensions->printPagesAsPDF(instance()->npp(), - &page_range, 1, - &pdf_output, &output_size); -@@ -1217,7 +1217,7 @@ bool WebPluginDelegatePepper::VectorPrintPage(int page +@@ -871,7 +871,7 @@ bool WebPluginDelegatePepper::VectorPrintPage(int page return false; bool ret = false; @@ -89,7 +73,7 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_pepper_cc,v 1.3 2011/03/15 11 // On Linux we need to get the backing PdfPsMetafile and write the bits // directly. cairo_t* context = canvas->beginPlatformPaint(); -@@ -1371,10 +1371,10 @@ void WebPluginDelegatePepper::PrintEnd() { +@@ -1026,7 +1026,7 @@ void WebPluginDelegatePepper::PrintEnd() { current_printer_dpi_ = -1; #if defined(OS_MACOSX) last_printed_page_ = SkBitmap(); @@ -97,21 +81,13 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_pepper_cc,v 1.3 2011/03/15 11 +#elif defined(OS_LINUX) || defined(OS_OPENBSD) num_pages_ = 0; pdf_output_done_ = false; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_OPENBSD) - } - - WebPluginDelegatePepper::WebPluginDelegatePepper( -@@ -1385,10 +1385,10 @@ WebPluginDelegatePepper::WebPluginDelegatePepper( + #endif // defined(OS_LINUX) +@@ -1039,7 +1039,7 @@ WebPluginDelegatePepper::WebPluginDelegatePepper( + plugin_(NULL), instance_(instance), - nested_delegate_(NULL), current_printer_dpi_(-1), -#if defined (OS_LINUX) +#if defined(OS_LINUX) || defined(OS_OPENBSD) num_pages_(0), pdf_output_done_(false), --#endif // (OS_LINUX) -+#endif // OS_LINUX || OS_OPENBSD - #if defined(ENABLE_GPU) - command_buffer_(NULL), - method_factory3d_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + #endif // (OS_LINUX) diff --git a/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_pepper_h b/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_pepper_h index e9264f5536d..f8a14ee8882 100644 --- a/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_pepper_h +++ b/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_pepper_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_renderer_webplugin_delegate_pepper_h,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/renderer/webplugin_delegate_pepper.h.orig Fri Mar 11 10:01:45 2011 -+++ chrome/renderer/webplugin_delegate_pepper.h Mon Mar 14 10:55:37 2011 -@@ -310,7 +310,7 @@ class WebPluginDelegatePepper : public webkit::npapi:: +$OpenBSD: patch-chrome_renderer_webplugin_delegate_pepper_h,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- chrome/renderer/webplugin_delegate_pepper.h.orig Tue Apr 26 10:01:45 2011 ++++ chrome/renderer/webplugin_delegate_pepper.h Thu Apr 28 11:17:49 2011 +@@ -281,7 +281,7 @@ class WebPluginDelegatePepper : public webkit::npapi:: // variable to hold on to the pixels. SkBitmap last_printed_page_; #endif // defined(OS_MACOSX) @@ -10,12 +10,12 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_pepper_h,v 1.2 2011/03/15 11: // On Linux, we always send all pages from the renderer to the browser. // So, if the plugin supports printPagesAsPDF we print the entire output // in one shot in the first call to PrintPage. -@@ -321,7 +321,7 @@ class WebPluginDelegatePepper : public webkit::npapi:: +@@ -292,7 +292,7 @@ class WebPluginDelegatePepper : public webkit::npapi:: // Specifies whether we have already output all pages. This is used to ignore // subsequent PrintPage requests. bool pdf_output_done_; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_OPENBSD) - #if defined(ENABLE_GPU) - // The command buffer used to issue commands to the nested GPU plugin. + // The id of the current find operation, or -1 if none is in process. + int find_identifier_; diff --git a/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_proxy_cc b/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_proxy_cc index d20fbb53daf..6771f3c33e0 100644 --- a/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_proxy_cc +++ b/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_proxy_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_renderer_webplugin_delegate_proxy_cc,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- chrome/renderer/webplugin_delegate_proxy.cc.orig Mon Mar 14 19:30:50 2011 -+++ chrome/renderer/webplugin_delegate_proxy.cc Mon Mar 14 19:39:56 2011 -@@ -158,7 +158,7 @@ class ResourceClientProxy : public webkit::npapi::WebP +$OpenBSD: patch-chrome_renderer_webplugin_delegate_proxy_cc,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- chrome/renderer/webplugin_delegate_proxy.cc.orig Tue Apr 26 10:01:45 2011 ++++ chrome/renderer/webplugin_delegate_proxy.cc Thu Apr 28 11:17:49 2011 +@@ -163,7 +163,7 @@ class ResourceClientProxy : public webkit::npapi::WebP bool multibyte_response_expected_; }; @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_proxy_cc,v 1.1 2011/03/15 11: static void ReleaseTransportDIB(TransportDIB* dib) { if (dib) { IPC::Message* message = new ViewHostMsg_FreeTransportDIB(dib->id()); -@@ -184,7 +184,7 @@ WebPluginDelegateProxy::WebPluginDelegateProxy( +@@ -189,7 +189,7 @@ WebPluginDelegateProxy::WebPluginDelegateProxy( } WebPluginDelegateProxy::~WebPluginDelegateProxy() { @@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_proxy_cc,v 1.1 2011/03/15 11: // Ask the browser to release old TransportDIB objects for which no // PluginHostMsg_UpdateGeometry_ACK was ever received from the plugin // process. -@@ -530,7 +530,7 @@ void WebPluginDelegateProxy::UpdateGeometry(const gfx: +@@ -535,7 +535,7 @@ void WebPluginDelegateProxy::UpdateGeometry(const gfx: bool bitmaps_changed = false; PluginMsg_UpdateGeometry_Param param; @@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_proxy_cc,v 1.1 2011/03/15 11: param.ack_key = -1; #endif -@@ -542,7 +542,7 @@ void WebPluginDelegateProxy::UpdateGeometry(const gfx: +@@ -547,7 +547,7 @@ void WebPluginDelegateProxy::UpdateGeometry(const gfx: bitmaps_changed = true; bool needs_background_store = transparent_; @@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_proxy_cc,v 1.1 2011/03/15 11: // We don't support transparency under QuickDraw, and CoreGraphics // preserves transparency information (and does the compositing itself) // so plugins don't need access to the page background. -@@ -614,7 +614,7 @@ void WebPluginDelegateProxy::UpdateGeometry(const gfx: +@@ -619,7 +619,7 @@ void WebPluginDelegateProxy::UpdateGeometry(const gfx: } void WebPluginDelegateProxy::ResetWindowlessBitmaps() { @@ -46,7 +46,7 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_proxy_cc,v 1.1 2011/03/15 11: DCHECK(!background_store_.get()); // The Mac TransportDIB implementation uses base::SharedMemory, which // cannot be disposed of if an in-flight UpdateGeometry message refers to -@@ -675,12 +675,12 @@ bool WebPluginDelegateProxy::CreateSharedBitmap( +@@ -680,12 +680,12 @@ bool WebPluginDelegateProxy::CreateSharedBitmap( scoped_ptr* memory, scoped_ptr* canvas) { const size_t size = BitmapSizeForPluginRect(plugin_rect_); diff --git a/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_proxy_h b/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_proxy_h index fe91fc427f3..2c0376cf0d1 100644 --- a/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_proxy_h +++ b/www/chromium/patches/patch-chrome_renderer_webplugin_delegate_proxy_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_renderer_webplugin_delegate_proxy_h,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- chrome/renderer/webplugin_delegate_proxy.h.orig Mon Mar 14 19:34:19 2011 -+++ chrome/renderer/webplugin_delegate_proxy.h Mon Mar 14 19:34:48 2011 +$OpenBSD: patch-chrome_renderer_webplugin_delegate_proxy_h,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- chrome/renderer/webplugin_delegate_proxy.h.orig Tue Apr 26 10:01:45 2011 ++++ chrome/renderer/webplugin_delegate_proxy.h Thu Apr 28 11:17:49 2011 @@ -21,7 +21,7 @@ #include "webkit/plugins/npapi/webplugininfo.h" #include "webkit/plugins/npapi/webplugin_delegate.h" @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_proxy_h,v 1.1 2011/03/15 11:3 #include "base/hash_tables.h" #include "base/linked_ptr.h" #endif -@@ -216,7 +216,7 @@ class WebPluginDelegateProxy +@@ -212,7 +212,7 @@ class WebPluginDelegateProxy // point the window has already been destroyed). void WillDestroyWindow(); diff --git a/www/chromium/patches/patch-chrome_test_automation_automation_proxy_uitest_cc b/www/chromium/patches/patch-chrome_test_automation_automation_proxy_uitest_cc index 5696249ac12..86cd2650dbd 100644 --- a/www/chromium/patches/patch-chrome_test_automation_automation_proxy_uitest_cc +++ b/www/chromium/patches/patch-chrome_test_automation_automation_proxy_uitest_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_test_automation_automation_proxy_uitest_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/test/automation/automation_proxy_uitest.cc.orig Fri Mar 11 10:01:55 2011 -+++ chrome/test/automation/automation_proxy_uitest.cc Mon Mar 14 10:55:37 2011 -@@ -1376,7 +1376,7 @@ TEST_F(ExternalTabUITestPopupEnabled, MAYBE_UserGestur +$OpenBSD: patch-chrome_test_automation_automation_proxy_uitest_cc,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/test/automation/automation_proxy_uitest.cc.orig Tue Apr 26 10:01:56 2011 ++++ chrome/test/automation/automation_proxy_uitest.cc Thu Apr 28 11:17:49 2011 +@@ -1378,7 +1378,7 @@ TEST_F(ExternalTabUITestPopupEnabled, MAYBE_UserGestur #endif // defined(OS_WIN) // TODO(port): Need to port autocomplete_edit_proxy.* first. @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_test_automation_automation_proxy_uitest_cc,v 1.3 2011/03/ TEST_F(AutomationProxyTest, AutocompleteGetSetText) { scoped_refptr browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); -@@ -1420,7 +1420,7 @@ TEST_F(AutomationProxyTest, AutocompleteParallelProxy) +@@ -1422,7 +1422,7 @@ TEST_F(AutomationProxyTest, AutocompleteParallelProxy) EXPECT_EQ(text_to_set2, actual_text2); } diff --git a/www/chromium/patches/patch-chrome_test_reliability_page_load_test_cc b/www/chromium/patches/patch-chrome_test_reliability_page_load_test_cc index 35b67dbf8d5..a357bb925e1 100644 --- a/www/chromium/patches/patch-chrome_test_reliability_page_load_test_cc +++ b/www/chromium/patches/patch-chrome_test_reliability_page_load_test_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_test_reliability_page_load_test_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/test/reliability/page_load_test.cc.orig Fri Mar 11 10:01:55 2011 -+++ chrome/test/reliability/page_load_test.cc Mon Mar 14 10:55:37 2011 -@@ -186,7 +186,7 @@ class PageLoadTest : public UITest { +$OpenBSD: patch-chrome_test_reliability_page_load_test_cc,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/test/reliability/page_load_test.cc.orig Tue Apr 26 10:01:56 2011 ++++ chrome/test/reliability/page_load_test.cc Thu Apr 28 11:17:49 2011 +@@ -193,7 +193,7 @@ class PageLoadTest : public UITest { file_info.reset( FileVersionInfo::CreateFileVersionInfo(FilePath(kChromeDll))); last_change = WideToASCII(file_info->last_change()); diff --git a/www/chromium/patches/patch-chrome_test_testing_browser_process_h b/www/chromium/patches/patch-chrome_test_testing_browser_process_h index 4f850fd2dd8..1529188e5e1 100644 --- a/www/chromium/patches/patch-chrome_test_testing_browser_process_h +++ b/www/chromium/patches/patch-chrome_test_testing_browser_process_h @@ -1,12 +1,12 @@ -$OpenBSD: patch-chrome_test_testing_browser_process_h,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/test/testing_browser_process.h.orig Fri Mar 11 10:01:56 2011 -+++ chrome/test/testing_browser_process.h Mon Mar 14 10:55:37 2011 -@@ -57,7 +57,7 @@ class TestingBrowserProcess : public BrowserProcess { - return NULL; - } +$OpenBSD: patch-chrome_test_testing_browser_process_h,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/test/testing_browser_process.h.orig Thu Apr 28 11:46:33 2011 ++++ chrome/test/testing_browser_process.h Thu Apr 28 11:46:40 2011 +@@ -49,7 +49,7 @@ class TestingBrowserProcess : public BrowserProcess { + + virtual IOThread* io_thread(); -#if defined(OS_LINUX) +#if defined(USE_X11) - virtual base::Thread* background_x11_thread() { - return NULL; - } + virtual base::Thread* background_x11_thread(); + #endif + diff --git a/www/chromium/patches/patch-chrome_test_ui_test_utils_cc b/www/chromium/patches/patch-chrome_test_ui_test_utils_cc index 665270d4b93..87c10c33745 100644 --- a/www/chromium/patches/patch-chrome_test_ui_test_utils_cc +++ b/www/chromium/patches/patch-chrome_test_ui_test_utils_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_test_ui_test_utils_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/test/ui_test_utils.cc.orig Fri Mar 11 10:01:56 2011 -+++ chrome/test/ui_test_utils.cc Mon Mar 14 10:55:37 2011 -@@ -357,7 +357,7 @@ void RunMessageLoop() { +$OpenBSD: patch-chrome_test_ui_test_utils_cc,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- chrome/test/ui_test_utils.cc.orig Tue Apr 26 10:01:57 2011 ++++ chrome/test/ui_test_utils.cc Thu Apr 28 11:17:49 2011 +@@ -364,7 +364,7 @@ void RunMessageLoop() { #if defined(TOOLKIT_VIEWS) views::AcceleratorHandler handler; loop->Run(&handler); diff --git a/www/chromium/patches/patch-content_browser_browser_child_process_host_cc b/www/chromium/patches/patch-content_browser_browser_child_process_host_cc new file mode 100644 index 00000000000..f0cd97241a8 --- /dev/null +++ b/www/chromium/patches/patch-content_browser_browser_child_process_host_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-content_browser_browser_child_process_host_cc,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- content/browser/browser_child_process_host.cc.orig Thu Apr 28 11:24:41 2011 ++++ content/browser/browser_child_process_host.cc Thu Apr 28 11:24:52 2011 +@@ -25,7 +25,7 @@ + #include "chrome/installer/util/google_update_settings.h" + #include "content/browser/browser_thread.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + #include "base/linux_util.h" + #endif // OS_LINUX + diff --git a/www/chromium/patches/patch-chrome_browser_child_process_launcher_cc b/www/chromium/patches/patch-content_browser_child_process_launcher_cc similarity index 92% rename from www/chromium/patches/patch-chrome_browser_child_process_launcher_cc rename to www/chromium/patches/patch-content_browser_child_process_launcher_cc index 0542b745a2f..81fc5e2a54c 100644 --- a/www/chromium/patches/patch-chrome_browser_child_process_launcher_cc +++ b/www/chromium/patches/patch-content_browser_child_process_launcher_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_child_process_launcher_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/child_process_launcher.cc.orig Mon Mar 14 11:05:10 2011 -+++ chrome/browser/child_process_launcher.cc Mon Mar 14 11:05:49 2011 +$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- content/browser/child_process_launcher.cc.orig Thu Apr 28 11:23:09 2011 ++++ content/browser/child_process_launcher.cc Thu Apr 28 11:24:09 2011 @@ -20,7 +20,7 @@ #if defined(OS_WIN) #include "base/file_path.h" @@ -9,7 +9,7 @@ $OpenBSD: patch-chrome_browser_child_process_launcher_cc,v 1.3 2011/03/15 11:38: +#elif defined(OS_LINUX) || defined(OS_OPENBSD) #include "base/singleton.h" #include "chrome/browser/crash_handler_host_linux.h" - #include "chrome/browser/zygote_host_linux.h" + #include "content/browser/zygote_host_linux.h" @@ -45,7 +45,7 @@ class ChildProcessLauncher::Context : client_(NULL), client_thread_id_(BrowserThread::UI), diff --git a/www/chromium/patches/patch-chrome_browser_geolocation_empty_device_data_provider_cc b/www/chromium/patches/patch-content_browser_geolocation_empty_device_data_provider_cc similarity index 57% rename from www/chromium/patches/patch-chrome_browser_geolocation_empty_device_data_provider_cc rename to www/chromium/patches/patch-content_browser_geolocation_empty_device_data_provider_cc index d20554e5676..d76b67558d3 100644 --- a/www/chromium/patches/patch-chrome_browser_geolocation_empty_device_data_provider_cc +++ b/www/chromium/patches/patch-content_browser_geolocation_empty_device_data_provider_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_geolocation_empty_device_data_provider_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/geolocation/empty_device_data_provider.cc.orig Mon Mar 14 17:38:51 2011 -+++ chrome/browser/geolocation/empty_device_data_provider.cc Mon Mar 14 17:39:02 2011 +$OpenBSD: patch-content_browser_geolocation_empty_device_data_provider_cc,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- content/browser/geolocation/empty_device_data_provider.cc.orig Thu Apr 28 11:26:11 2011 ++++ content/browser/geolocation/empty_device_data_provider.cc Thu Apr 28 11:26:23 2011 @@ -12,7 +12,7 @@ RadioDataProviderImplBase* RadioDataProvider::DefaultF } diff --git a/www/chromium/patches/patch-chrome_browser_renderer_host_mock_render_process_host_cc b/www/chromium/patches/patch-content_browser_renderer_host_mock_render_process_host_cc similarity index 62% rename from www/chromium/patches/patch-chrome_browser_renderer_host_mock_render_process_host_cc rename to www/chromium/patches/patch-content_browser_renderer_host_mock_render_process_host_cc index 260b5dd020c..dda70f79886 100644 --- a/www/chromium/patches/patch-chrome_browser_renderer_host_mock_render_process_host_cc +++ b/www/chromium/patches/patch-content_browser_renderer_host_mock_render_process_host_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_renderer_host_mock_render_process_host_cc,v 1.2 2011/02/08 09:43:02 espie Exp $ ---- chrome/browser/renderer_host/mock_render_process_host.cc.orig Fri Jan 21 10:20:21 2011 -+++ chrome/browser/renderer_host/mock_render_process_host.cc Sun Jan 23 23:27:31 2011 +$OpenBSD: patch-content_browser_renderer_host_mock_render_process_host_cc,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- content/browser/renderer_host/mock_render_process_host.cc.orig Thu Apr 28 11:27:05 2011 ++++ content/browser/renderer_host/mock_render_process_host.cc Thu Apr 28 11:27:14 2011 @@ -106,7 +106,7 @@ TransportDIB* MockRenderProcessHost::GetTransportDIB(T DuplicateHandle(GetCurrentProcess(), dib_id.handle, GetCurrentProcess(), &duped, 0, TRUE, DUPLICATE_SAME_ACCESS); diff --git a/www/chromium/patches/patch-content_browser_renderer_host_render_message_filter_cc b/www/chromium/patches/patch-content_browser_renderer_host_render_message_filter_cc new file mode 100644 index 00000000000..50311b8e089 --- /dev/null +++ b/www/chromium/patches/patch-content_browser_renderer_host_render_message_filter_cc @@ -0,0 +1,21 @@ +$OpenBSD: patch-content_browser_renderer_host_render_message_filter_cc,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- content/browser/renderer_host/render_message_filter.cc.orig Thu Apr 28 11:27:55 2011 ++++ content/browser/renderer_host/render_message_filter.cc Thu Apr 28 11:28:23 2011 +@@ -416,7 +416,7 @@ bool RenderMessageFilter::OnMessageReceived(const IPC: + IPC_MESSAGE_HANDLER(ViewHostMsg_V8HeapStats, OnV8HeapStats) + IPC_MESSAGE_HANDLER(ViewHostMsg_DidZoomURL, OnDidZoomURL) + IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_ResolveProxy, OnResolveProxy) +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_OPENBSD) + IPC_MESSAGE_HANDLER(ViewHostMsg_AllocTransportDIB, OnAllocTransportDIB) + IPC_MESSAGE_HANDLER(ViewHostMsg_FreeTransportDIB, OnFreeTransportDIB) + #endif +@@ -1111,7 +1111,7 @@ void RenderMessageFilter::OnRendererHistograms( + HistogramSynchronizer::DeserializeHistogramList(sequence_number, histograms); + } + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_OPENBSD) + void RenderMessageFilter::OnAllocTransportDIB( + size_t size, bool cache_in_browser, TransportDIB::Handle* handle) { + render_widget_helper_->AllocTransportDIB(size, cache_in_browser, handle); diff --git a/www/chromium/patches/patch-chrome_browser_renderer_host_render_sandbox_host_linux_cc b/www/chromium/patches/patch-content_browser_renderer_host_render_sandbox_host_linux_cc similarity index 60% rename from www/chromium/patches/patch-chrome_browser_renderer_host_render_sandbox_host_linux_cc rename to www/chromium/patches/patch-content_browser_renderer_host_render_sandbox_host_linux_cc index db75fbcd673..b30009eb033 100644 --- a/www/chromium/patches/patch-chrome_browser_renderer_host_render_sandbox_host_linux_cc +++ b/www/chromium/patches/patch-content_browser_renderer_host_render_sandbox_host_linux_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_browser_renderer_host_render_sandbox_host_linux_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/renderer_host/render_sandbox_host_linux.cc.orig Fri Mar 11 10:01:42 2011 -+++ chrome/browser/renderer_host/render_sandbox_host_linux.cc Mon Mar 14 10:55:37 2011 -@@ -329,7 +329,7 @@ class SandboxIPCProcess { +$OpenBSD: patch-content_browser_renderer_host_render_sandbox_host_linux_cc,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- content/browser/renderer_host/render_sandbox_host_linux.cc.orig Thu Apr 28 11:28:33 2011 ++++ content/browser/renderer_host/render_sandbox_host_linux.cc Thu Apr 28 11:29:21 2011 +@@ -335,7 +335,7 @@ class SandboxIPCProcess { return; } @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_renderer_host_render_sandbox_host_linux_cc,v 1.3 if (!pickle.ReadUInt64(&iter, &inode)) return; -@@ -659,7 +659,12 @@ void RenderSandboxHostLinux::Init(const std::string& s +@@ -665,7 +665,12 @@ void RenderSandboxHostLinux::Init(const std::string& s // inherit some sockets. With PF_UNIX+SOCK_DGRAM, it can call sendmsg to send // a datagram to any (abstract) socket on the same system. With // SOCK_SEQPACKET, this is prevented. diff --git a/www/chromium/patches/patch-content_browser_renderer_host_render_widget_helper_cc b/www/chromium/patches/patch-content_browser_renderer_host_render_widget_helper_cc new file mode 100644 index 00000000000..d26084955e2 --- /dev/null +++ b/www/chromium/patches/patch-content_browser_renderer_host_render_widget_helper_cc @@ -0,0 +1,21 @@ +$OpenBSD: patch-content_browser_renderer_host_render_widget_helper_cc,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- content/browser/renderer_host/render_widget_helper.cc.orig Thu Apr 28 11:29:33 2011 ++++ content/browser/renderer_host/render_widget_helper.cc Thu Apr 28 11:29:48 2011 +@@ -58,7 +58,7 @@ RenderWidgetHelper::~RenderWidgetHelper() { + // object, so we should not be destroyed unless pending_paints_ is empty! + DCHECK(pending_paints_.empty()); + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_OPENBSD) + ClearAllocatedDIBs(); + #endif + } +@@ -277,7 +277,7 @@ void RenderWidgetHelper::OnCreateFullscreenWidgetOnUI( + host->CreateNewFullscreenWidget(route_id); + } + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_OPENBSD) + TransportDIB* RenderWidgetHelper::MapTransportDIB(TransportDIB::Id dib_id) { + base::AutoLock locked(allocated_dibs_lock_); + diff --git a/www/chromium/patches/patch-chrome_browser_renderer_host_render_widget_helper_h b/www/chromium/patches/patch-content_browser_renderer_host_render_widget_helper_h similarity index 66% rename from www/chromium/patches/patch-chrome_browser_renderer_host_render_widget_helper_h rename to www/chromium/patches/patch-content_browser_renderer_host_render_widget_helper_h index d3821eab22f..739fe2427ea 100644 --- a/www/chromium/patches/patch-chrome_browser_renderer_host_render_widget_helper_h +++ b/www/chromium/patches/patch-content_browser_renderer_host_render_widget_helper_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_renderer_host_render_widget_helper_h,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/renderer_host/render_widget_helper.h.orig Fri Mar 11 10:01:42 2011 -+++ chrome/browser/renderer_host/render_widget_helper.h Mon Mar 14 10:55:37 2011 +$OpenBSD: patch-content_browser_renderer_host_render_widget_helper_h,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- content/browser/renderer_host/render_widget_helper.h.orig Thu Apr 28 11:30:04 2011 ++++ content/browser/renderer_host/render_widget_helper.h Thu Apr 28 11:30:17 2011 @@ -112,7 +112,7 @@ class RenderWidgetHelper const base::TimeDelta& max_delay, IPC::Message* msg); @@ -10,16 +10,16 @@ $OpenBSD: patch-chrome_browser_renderer_host_render_widget_helper_h,v 1.2 2011/0 // Given the id of a transport DIB, return a mapping to it or NULL on error. TransportDIB* MapTransportDIB(TransportDIB::Id dib_id); #endif -@@ -133,7 +133,7 @@ class RenderWidgetHelper - WebKit::WebPopupType popup_type, - int* route_id); +@@ -131,7 +131,7 @@ class RenderWidgetHelper + int* route_id); + void CreateNewFullscreenWidget(int opener_id, int* route_id); -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_OPENBSD) // Called on the IO thread to handle the allocation of a TransportDIB. If // |cache_in_browser| is |true|, then a copy of the shmem is kept by the // browser, and it is the caller's repsonsibility to call -@@ -188,7 +188,7 @@ class RenderWidgetHelper +@@ -184,7 +184,7 @@ class RenderWidgetHelper // Called on the IO thread to resume a cross-site response. void OnCrossSiteClosePageACK(const ViewMsg_ClosePage_Params& params); diff --git a/www/chromium/patches/patch-chrome_browser_tab_contents_tab_contents_cc b/www/chromium/patches/patch-content_browser_tab_contents_tab_contents_cc similarity index 55% rename from www/chromium/patches/patch-chrome_browser_tab_contents_tab_contents_cc rename to www/chromium/patches/patch-content_browser_tab_contents_tab_contents_cc index f5436dfa6c8..19a25cb4270 100644 --- a/www/chromium/patches/patch-chrome_browser_tab_contents_tab_contents_cc +++ b/www/chromium/patches/patch-content_browser_tab_contents_tab_contents_cc @@ -1,8 +1,8 @@ -$OpenBSD: patch-chrome_browser_tab_contents_tab_contents_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/tab_contents/tab_contents.cc.orig Fri Mar 11 10:01:42 2011 -+++ chrome/browser/tab_contents/tab_contents.cc Mon Mar 14 10:55:37 2011 -@@ -443,7 +443,7 @@ TabContents::TabContents(Profile* profile, - NotificationService::AllSources()); +$OpenBSD: patch-content_browser_tab_contents_tab_contents_cc,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- content/browser/tab_contents/tab_contents.cc.orig Thu Apr 28 11:30:45 2011 ++++ content/browser/tab_contents/tab_contents.cc Thu Apr 28 11:31:37 2011 +@@ -301,7 +301,7 @@ TabContents::TabContents(Profile* profile, + registrar_.Add(this, NotificationType::RENDER_WIDGET_HOST_DESTROYED, NotificationService::AllSources()); -#if defined(OS_LINUX) @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_tab_contents_tab_contents_cc,v 1.3 2011/03/15 11: registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED, NotificationService::AllSources()); #endif -@@ -3264,7 +3264,7 @@ void TabContents::Observe(NotificationType type, +@@ -2721,7 +2721,7 @@ void TabContents::Observe(NotificationType type, break; } diff --git a/www/chromium/patches/patch-chrome_browser_zygote_host_linux_cc b/www/chromium/patches/patch-content_browser_zygote_host_linux_cc similarity index 83% rename from www/chromium/patches/patch-chrome_browser_zygote_host_linux_cc rename to www/chromium/patches/patch-content_browser_zygote_host_linux_cc index 245ee2b7939..3c8c7a76125 100644 --- a/www/chromium/patches/patch-chrome_browser_zygote_host_linux_cc +++ b/www/chromium/patches/patch-content_browser_zygote_host_linux_cc @@ -1,11 +1,11 @@ -$OpenBSD: patch-chrome_browser_zygote_host_linux_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/zygote_host_linux.cc.orig Fri Mar 11 10:01:43 2011 -+++ chrome/browser/zygote_host_linux.cc Mon Mar 14 10:55:37 2011 +$OpenBSD: patch-content_browser_zygote_host_linux_cc,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- content/browser/zygote_host_linux.cc.orig Thu Apr 28 11:35:54 2011 ++++ content/browser/zygote_host_linux.cc Thu Apr 28 11:38:09 2011 @@ -61,7 +61,12 @@ ZygoteHost::ZygoteHost() } ZygoteHost::~ZygoteHost() { -+ Pickle pickle; ++ Pickle pickle; if (init_) +#if defined(OS_OPENBSD) + pickle.WriteInt(kCmdEnd); @@ -35,14 +35,14 @@ $OpenBSD: patch-chrome_browser_zygote_host_linux_cc,v 1.3 2011/03/15 11:38:05 ro std::vector fds_vec; const int kExpectedLength = sizeof(kZygoteMagic); char buf[kExpectedLength]; -@@ -179,6 +190,7 @@ void ZygoteHost::Init(const std::string& sandbox_cmd) - // Reap the sandbox. +@@ -180,6 +191,7 @@ void ZygoteHost::Init(const std::string& sandbox_cmd) ProcessWatcher::EnsureProcessGetsReaped(process); } -+#endif // defined(OS_LINUX) } else { ++#endif // Not using the SUID sandbox. pid_ = process; + } @@ -246,12 +258,15 @@ pid_t ZygoteHost::ForkRenderer( return base::kNullProcessHandle; } @@ -63,7 +63,7 @@ $OpenBSD: patch-chrome_browser_zygote_host_linux_cc,v 1.3 2011/03/15 11:38:05 ro PLOG(ERROR) << "Failed to adjust OOM score of renderer with pid " << pid; } } -+#endif // defined(OS_LINUX) ++#endif void ZygoteHost::EnsureProcessTerminated(pid_t process) { DCHECK(init_); diff --git a/www/chromium/patches/patch-chrome_browser_zygote_host_linux_h b/www/chromium/patches/patch-content_browser_zygote_host_linux_h similarity index 56% rename from www/chromium/patches/patch-chrome_browser_zygote_host_linux_h rename to www/chromium/patches/patch-content_browser_zygote_host_linux_h index 26dfa6c4631..afa4037b8d8 100644 --- a/www/chromium/patches/patch-chrome_browser_zygote_host_linux_h +++ b/www/chromium/patches/patch-content_browser_zygote_host_linux_h @@ -1,12 +1,12 @@ -$OpenBSD: patch-chrome_browser_zygote_host_linux_h,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/zygote_host_linux.h.orig Mon Mar 14 11:41:11 2011 -+++ chrome/browser/zygote_host_linux.h Mon Mar 14 11:41:31 2011 +$OpenBSD: patch-content_browser_zygote_host_linux_h,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- content/browser/zygote_host_linux.h.orig Thu Apr 28 11:38:22 2011 ++++ content/browser/zygote_host_linux.h Thu Apr 28 11:39:07 2011 @@ -51,6 +51,9 @@ class ZygoteHost { kCmdReap = 1, // Reap a renderer child. kCmdGetTerminationStatus = 2, // Check what happend to a child process. kCmdGetSandboxStatus = 3, // Read a bitmask of kSandbox* +#if defined(OS_OPENBSD) -+ kCmdEnd = 5, // Kill zygote for SOCK_DGRAM. ++ kCmdEnd = 4, // Kill zygote for SOCK_DGRAM. +#endif }; diff --git a/www/chromium/patches/patch-chrome_browser_zygote_main_linux_cc b/www/chromium/patches/patch-content_browser_zygote_main_linux_cc similarity index 75% rename from www/chromium/patches/patch-chrome_browser_zygote_main_linux_cc rename to www/chromium/patches/patch-content_browser_zygote_main_linux_cc index 2fab17469d2..98227ccc787 100644 --- a/www/chromium/patches/patch-chrome_browser_zygote_main_linux_cc +++ b/www/chromium/patches/patch-content_browser_zygote_main_linux_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-chrome_browser_zygote_main_linux_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- chrome/browser/zygote_main_linux.cc.orig Mon Mar 14 11:41:37 2011 -+++ chrome/browser/zygote_main_linux.cc Mon Mar 14 11:43:12 2011 +$OpenBSD: patch-content_browser_zygote_main_linux_cc,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- content/browser/zygote_main_linux.cc.orig Thu Apr 28 11:39:21 2011 ++++ content/browser/zygote_main_linux.cc Thu Apr 28 11:40:51 2011 @@ -2,12 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -20,7 +20,7 @@ $OpenBSD: patch-chrome_browser_zygote_main_linux_cc,v 1.3 2011/03/15 11:38:05 ro #include #include #include -@@ -50,7 +56,7 @@ +@@ -51,7 +57,7 @@ #include "unicode/timezone.h" #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) && \ @@ -29,7 +29,7 @@ $OpenBSD: patch-chrome_browser_zygote_main_linux_cc,v 1.3 2011/03/15 11:38:05 ro // The seccomp sandbox is enabled on all ia32 and x86-64 processor as long as // we aren't using SELinux or clang. #define SECCOMP_SANDBOX -@@ -173,6 +179,11 @@ class Zygote { +@@ -174,6 +180,11 @@ class Zygote { case ZygoteHost::kCmdGetSandboxStatus: HandleGetSandboxStatus(fd, pickle, iter); return false; @@ -41,20 +41,19 @@ $OpenBSD: patch-chrome_browser_zygote_main_linux_cc,v 1.3 2011/03/15 11:38:05 ro default: NOTREACHED(); break; -@@ -655,7 +666,7 @@ static bool EnterSandbox() { - +@@ -649,6 +660,7 @@ static bool EnterSandbox() { SkiaFontConfigSetImplementation( new FontConfigIPC(kMagicSandboxIPCDescriptor)); -- + +#if !defined(OS_OPENBSD) // Previously, we required that the binary be non-readable. This causes the // kernel to mark the process as non-dumpable at startup. The thinking was // that, although we were putting the renderers into a PID namespace (with -@@ -681,6 +692,7 @@ static bool EnterSandbox() { +@@ -674,6 +686,7 @@ static bool EnterSandbox() { return false; } } +#endif - } else if (switches::SeccompSandboxEnabled()) { + } else if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableSeccompSandbox)) { PreSandboxInit(); - SkiaFontConfigSetImplementation( diff --git a/www/chromium/patches/patch-content_common_file_path_watcher_file_path_watcher_stub_cc b/www/chromium/patches/patch-content_common_file_path_watcher_file_path_watcher_stub_cc new file mode 100644 index 00000000000..20a4879aac5 --- /dev/null +++ b/www/chromium/patches/patch-content_common_file_path_watcher_file_path_watcher_stub_cc @@ -0,0 +1,26 @@ +$OpenBSD: patch-content_common_file_path_watcher_file_path_watcher_stub_cc,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- content/common/file_path_watcher/file_path_watcher_stub.cc.orig Tue Apr 26 10:01:09 2011 ++++ content/common/file_path_watcher/file_path_watcher_stub.cc Thu Apr 28 18:29:28 2011 +@@ -5,15 +5,19 @@ + // This file exists for Unix systems which don't have the inotify headers, and + // thus cannot build file_watcher_inotify.cc + +-#include "chrome/common/file_path_watcher/file_path_watcher.h" ++#include "content/common/file_path_watcher/file_path_watcher.h" + + 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 { ++ } ++ virtual void CancelOnMessageLoopThread() OVERRIDE { ++ } ++ + }; + + FilePathWatcher::FilePathWatcher() { diff --git a/www/chromium/patches/patch-content_content_browser_gypi b/www/chromium/patches/patch-content_content_browser_gypi new file mode 100644 index 00000000000..f83c0659357 --- /dev/null +++ b/www/chromium/patches/patch-content_content_browser_gypi @@ -0,0 +1,25 @@ +$OpenBSD: patch-content_content_browser_gypi,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- content/content_browser.gypi.orig Thu Apr 28 18:49:07 2011 ++++ content/content_browser.gypi Thu Apr 28 18:51:09 2011 +@@ -324,7 +324,7 @@ + ['OS=="win"', { + 'msvs_guid': '639DB58D-32C2-435A-A711-65A12F62E442', + }], +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="openbsd"', { + 'dependencies': [ + '../build/linux/system.gyp:dbus-glib', + # For FcLangSetAdd call in render_sandbox_host_linux.cc +@@ -338,6 +338,12 @@ + # TODO(mattm): Cert manager stuff is really !USE_NSS. + 'browser/certificate_manager_model.cc', + 'browser/certificate_manager_model.h', ++ ], ++ }], ++ ['OS=="openbsd"', { ++ 'sources!': [ ++ 'browser/geolocation/gateway_data_provider_linux.cc', ++ 'browser/geolocation/gateway_data_provider_linux.h', + ], + }], + ['OS=="linux" and chromeos==1', { diff --git a/www/chromium/patches/patch-gfx_gfx_gyp b/www/chromium/patches/patch-gfx_gfx_gyp deleted file mode 100644 index c31aca1cac1..00000000000 --- a/www/chromium/patches/patch-gfx_gfx_gyp +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-gfx_gfx_gyp,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- gfx/gfx.gyp.orig Fri Mar 11 10:01:06 2011 -+++ gfx/gfx.gyp Mon Mar 14 10:55:37 2011 -@@ -181,6 +181,7 @@ - 'native_widget_types_gtk.cc', - ], - }], -+ ['OS=="openbsd"', { 'include_dirs': [ '/usr/local/include ' ] } ], - ], - }, - { diff --git a/www/chromium/patches/patch-gfx_scoped_image_h b/www/chromium/patches/patch-gfx_scoped_image_h deleted file mode 100644 index 0fd61328a1e..00000000000 --- a/www/chromium/patches/patch-gfx_scoped_image_h +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-gfx_scoped_image_h,v 1.1 2011/03/21 11:27:46 robert Exp $ ---- gfx/scoped_image.h.orig Mon Mar 21 12:18:09 2011 -+++ gfx/scoped_image.h Mon Mar 21 12:18:33 2011 -@@ -11,7 +11,7 @@ - #include "gfx/native_widget_types.h" - #include "third_party/skia/include/core/SkBitmap.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_OPENBSD) - #include - #elif defined(OS_MACOSX) - #include "base/mac/mac_util.h" -@@ -116,7 +116,7 @@ class ScopedImage : public gfx::internal::Sco - #endif // defined(OS_MACOSX) - - // Specialization for the GdkPixbuf type on Linux. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_OPENBSD) - template <> - class ScopedImage : public gfx::internal::ScopedImage { - public: diff --git a/www/chromium/patches/patch-gpu_gpu_gyp b/www/chromium/patches/patch-gpu_gpu_gyp index 27687d07783..af0f5667f99 100644 --- a/www/chromium/patches/patch-gpu_gpu_gyp +++ b/www/chromium/patches/patch-gpu_gpu_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-gpu_gpu_gyp,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- gpu/gpu.gyp.orig Fri Mar 11 10:01:07 2011 -+++ gpu/gpu.gyp Mon Mar 14 10:55:37 2011 -@@ -214,7 +214,7 @@ +$OpenBSD: patch-gpu_gpu_gyp,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- gpu/gpu.gyp.orig Tue Apr 26 10:01:07 2011 ++++ gpu/gpu.gyp Thu Apr 28 11:17:49 2011 +@@ -213,7 +213,7 @@ 'command_buffer/service/texture_manager.cc', ], 'conditions': [ diff --git a/www/chromium/patches/patch-media_audio_openbsd_audio_manager_openbsd_cc b/www/chromium/patches/patch-media_audio_openbsd_audio_manager_openbsd_cc index dcdc1e26104..cfd9749862f 100644 --- a/www/chromium/patches/patch-media_audio_openbsd_audio_manager_openbsd_cc +++ b/www/chromium/patches/patch-media_audio_openbsd_audio_manager_openbsd_cc @@ -1,44 +1,19 @@ -$OpenBSD: patch-media_audio_openbsd_audio_manager_openbsd_cc,v 1.2 2011/02/08 09:43:02 espie Exp $ ---- media/audio/openbsd/audio_manager_openbsd.cc.orig Fri Jan 21 10:19:46 2011 -+++ media/audio/openbsd/audio_manager_openbsd.cc Mon Jan 24 11:23:48 2011 -@@ -4,21 +4,23 @@ +$OpenBSD: patch-media_audio_openbsd_audio_manager_openbsd_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- media/audio/openbsd/audio_manager_openbsd.cc.orig Thu Apr 28 11:48:27 2011 ++++ media/audio/openbsd/audio_manager_openbsd.cc Thu Apr 28 11:49:20 2011 +@@ -4,9 +4,13 @@ #include "media/audio/openbsd/audio_manager_openbsd.h" +#include "base/command_line.h" #include "base/logging.h" +- +-static AudioManagerOpenBSD* g_audio_manager = NULL; +#include "media/audio/audio_output_dispatcher.h" +#include "media/audio/fake_audio_input_stream.h" +#include "media/audio/fake_audio_output_stream.h" +#include "media/base/limits.h" +#include "media/base/media_switches.h" --namespace { --AudioManagerOpenBSD* g_audio_manager = NULL; --} // namespace -- // Implementation of AudioManager. bool AudioManagerOpenBSD::HasAudioOutputDevices() { - NOTIMPLEMENTED(); -- return false; -+ return true; - } - - bool AudioManagerOpenBSD::HasAudioInputDevices() { - NOTIMPLEMENTED(); -- return false; -+ return true; - } - - AudioOutputStream* AudioManagerOpenBSD::MakeAudioOutputStream( -@@ -48,6 +50,10 @@ void AudioManagerOpenBSD::MuteAll() { - } - - void AudioManagerOpenBSD::UnMuteAll() { -+ NOTIMPLEMENTED(); -+} -+ -+void AudioManagerOpenBSD::ReleaseOutputStream(AlsaPcmOutputStream* stream) { - NOTIMPLEMENTED(); - } - diff --git a/www/chromium/patches/patch-media_audio_openbsd_audio_manager_openbsd_h b/www/chromium/patches/patch-media_audio_openbsd_audio_manager_openbsd_h index 508372f8984..53f5c0d16f6 100644 --- a/www/chromium/patches/patch-media_audio_openbsd_audio_manager_openbsd_h +++ b/www/chromium/patches/patch-media_audio_openbsd_audio_manager_openbsd_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-media_audio_openbsd_audio_manager_openbsd_h,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- media/audio/openbsd/audio_manager_openbsd.h.orig Fri Mar 11 10:01:05 2011 -+++ media/audio/openbsd/audio_manager_openbsd.h Mon Mar 14 14:21:49 2011 +$OpenBSD: patch-media_audio_openbsd_audio_manager_openbsd_h,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- media/audio/openbsd/audio_manager_openbsd.h.orig Tue Apr 26 10:01:05 2011 ++++ media/audio/openbsd/audio_manager_openbsd.h Fri Apr 29 09:48:16 2011 @@ -5,8 +5,16 @@ #ifndef MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_ #define MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_ @@ -19,15 +19,11 @@ $OpenBSD: patch-media_audio_openbsd_audio_manager_openbsd_h,v 1.3 2011/03/15 11: class AudioManagerOpenBSD : public AudioManagerBase { public: AudioManagerOpenBSD(); -@@ -19,8 +27,11 @@ class AudioManagerOpenBSD : public AudioManagerBase { +@@ -19,6 +27,7 @@ class AudioManagerOpenBSD : public AudioManagerBase { virtual bool HasAudioInputDevices(); virtual AudioOutputStream* MakeAudioOutputStream(AudioParameters params); virtual AudioInputStream* MakeAudioInputStream(AudioParameters params); + virtual void MuteAll(); virtual void UnMuteAll(); -+ -+ virtual void ReleaseOutputStream(AlsaPcmOutputStream* stream); - protected: - virtual ~AudioManagerOpenBSD(); diff --git a/www/chromium/patches/patch-media_ffmpeg_file_protocol_cc b/www/chromium/patches/patch-media_ffmpeg_file_protocol_cc index 9fb429b97e0..3b50e2c61bf 100644 --- a/www/chromium/patches/patch-media_ffmpeg_file_protocol_cc +++ b/www/chromium/patches/patch-media_ffmpeg_file_protocol_cc @@ -1,12 +1,12 @@ -$OpenBSD: patch-media_ffmpeg_file_protocol_cc,v 1.2 2011/02/08 09:43:02 espie Exp $ ---- media/ffmpeg/file_protocol.cc.orig Fri Jan 21 10:19:46 2011 -+++ media/ffmpeg/file_protocol.cc Mon Jan 24 11:24:49 2011 -@@ -58,7 +58,7 @@ int WriteContext(URLContext* h, unsigned char* buf, in +$OpenBSD: patch-media_ffmpeg_file_protocol_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- media/ffmpeg/file_protocol.cc.orig Tue Apr 26 10:01:05 2011 ++++ media/ffmpeg/file_protocol.cc Thu Apr 28 19:02:41 2011 +@@ -56,7 +56,7 @@ static int WriteContext(URLContext* h, unsigned char* return HANDLE_EINTR(write(GetHandle(h), buf, size)); } --int64 SeekContext(URLContext* h, int64 offset, int whence) { -+int64_t SeekContext(URLContext* h, int64_t offset, int whence) { +-static int64 SeekContext(URLContext* h, int64 offset, int whence) { ++static int64_t SeekContext(URLContext* h, int64_t offset, int whence) { #if defined(OS_WIN) return _lseeki64(GetHandle(h), static_cast<__int64>(offset), whence); #else diff --git a/www/chromium/patches/patch-media_filters_ffmpeg_glue_cc b/www/chromium/patches/patch-media_filters_ffmpeg_glue_cc index a8c4fa22cf9..f61574eba26 100644 --- a/www/chromium/patches/patch-media_filters_ffmpeg_glue_cc +++ b/www/chromium/patches/patch-media_filters_ffmpeg_glue_cc @@ -1,12 +1,12 @@ -$OpenBSD: patch-media_filters_ffmpeg_glue_cc,v 1.2 2011/02/08 09:43:02 espie Exp $ ---- media/filters/ffmpeg_glue.cc.orig Mon Jan 24 00:09:31 2011 -+++ media/filters/ffmpeg_glue.cc Mon Jan 24 11:25:42 2011 -@@ -43,7 +43,7 @@ int WriteContext(URLContext* h, unsigned char* buf, in +$OpenBSD: patch-media_filters_ffmpeg_glue_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- media/filters/ffmpeg_glue.cc.orig Tue Apr 26 10:01:05 2011 ++++ media/filters/ffmpeg_glue.cc Thu Apr 28 19:03:53 2011 +@@ -44,7 +44,7 @@ static int WriteContext(URLContext* h, unsigned char* return AVERROR_IO; } --int64 SeekContext(URLContext* h, int64 offset, int whence) { -+int64_t SeekContext(URLContext* h, int64_t offset, int whence) { - media::FFmpegURLProtocol* protocol = ToProtocol(h->priv_data); +-static int64 SeekContext(URLContext* h, int64 offset, int whence) { ++static int64_t SeekContext(URLContext* h, int64_t offset, int whence) { + FFmpegURLProtocol* protocol = ToProtocol(h->priv_data); int64 new_offset = AVERROR_IO; switch (whence) { diff --git a/www/chromium/patches/patch-media_media_gyp b/www/chromium/patches/patch-media_media_gyp index f127ee2cd67..bdea2880210 100644 --- a/www/chromium/patches/patch-media_media_gyp +++ b/www/chromium/patches/patch-media_media_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-media_media_gyp,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- media/media.gyp.orig Fri Mar 11 10:01:05 2011 -+++ media/media.gyp Mon Mar 14 10:55:37 2011 -@@ -175,6 +175,9 @@ +$OpenBSD: patch-media_media_gyp,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- media/media.gyp.orig Tue Apr 26 10:01:05 2011 ++++ media/media.gyp Thu Apr 28 11:17:49 2011 +@@ -177,6 +177,9 @@ 'link_settings': { 'libraries': [ '-lasound', diff --git a/www/chromium/patches/patch-native_client_build_common_gypi b/www/chromium/patches/patch-native_client_build_common_gypi index 931ab11a79b..6ce1ea88d07 100644 --- a/www/chromium/patches/patch-native_client_build_common_gypi +++ b/www/chromium/patches/patch-native_client_build_common_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-native_client_build_common_gypi,v 1.2 2011/02/08 09:43:02 espie Exp $ ---- native_client/build/common.gypi.orig Fri Jan 21 10:20:49 2011 -+++ native_client/build/common.gypi Sun Jan 23 23:27:35 2011 -@@ -375,7 +375,7 @@ +$OpenBSD: patch-native_client_build_common_gypi,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- native_client/build/common.gypi.orig Tue Apr 26 10:14:23 2011 ++++ native_client/build/common.gypi Thu Apr 28 11:17:49 2011 +@@ -358,7 +358,7 @@ }, }, 'conditions': [ diff --git a/www/chromium/patches/patch-net_base_host_resolver_impl_cc b/www/chromium/patches/patch-net_base_host_resolver_impl_cc index f616e64d8b3..b9f5c61481d 100644 --- a/www/chromium/patches/patch-net_base_host_resolver_impl_cc +++ b/www/chromium/patches/patch-net_base_host_resolver_impl_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-net_base_host_resolver_impl_cc,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- net/base/host_resolver_impl.cc.orig Fri Mar 11 10:01:15 2011 -+++ net/base/host_resolver_impl.cc Mon Mar 14 10:55:37 2011 -@@ -199,13 +199,11 @@ class JobCreationParameters : public NetLog::EventPara +$OpenBSD: patch-net_base_host_resolver_impl_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- net/base/host_resolver_impl.cc.orig Tue Apr 26 10:01:16 2011 ++++ net/base/host_resolver_impl.cc Thu Apr 28 11:17:49 2011 +@@ -201,13 +201,11 @@ class JobCreationParameters : public NetLog::EventPara std::vector GetAllGetAddrinfoOSErrors() { int os_errors[] = { #if defined(OS_POSIX) @@ -15,7 +15,7 @@ $OpenBSD: patch-net_base_host_resolver_impl_cc,v 1.2 2011/03/15 11:38:05 robert EAI_NONAME, EAI_SERVICE, EAI_SOCKTYPE, -@@ -919,7 +917,7 @@ HostResolverImpl::HostResolverImpl( +@@ -921,7 +919,7 @@ HostResolverImpl::HostResolverImpl( #if defined(OS_WIN) EnsureWinsockInit(); #endif @@ -24,7 +24,7 @@ $OpenBSD: patch-net_base_host_resolver_impl_cc,v 1.2 2011/03/15 11:38:05 robert if (HaveOnlyLoopbackAddresses()) additional_resolver_flags_ |= HOST_RESOLVER_LOOPBACK_ONLY; #endif -@@ -1447,7 +1445,7 @@ void HostResolverImpl::OnIPAddressChanged() { +@@ -1459,7 +1457,7 @@ void HostResolverImpl::OnIPAddressChanged() { ipv6_probe_job_ = new IPv6ProbeJob(this); ipv6_probe_job_->Start(); } diff --git a/www/chromium/patches/patch-net_base_net_util_cc b/www/chromium/patches/patch-net_base_net_util_cc index f327ed56a07..27c88cea639 100644 --- a/www/chromium/patches/patch-net_base_net_util_cc +++ b/www/chromium/patches/patch-net_base_net_util_cc @@ -1,14 +1,11 @@ -$OpenBSD: patch-net_base_net_util_cc,v 1.2 2011/02/08 09:43:02 espie Exp $ ---- net/base/net_util.cc.orig Fri Jan 21 10:19:57 2011 -+++ net/base/net_util.cc Sun Jan 23 23:27:35 2011 -@@ -25,9 +25,9 @@ +$OpenBSD: patch-net_base_net_util_cc,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- net/base/net_util.cc.orig Thu Apr 28 11:50:08 2011 ++++ net/base/net_util.cc Thu Apr 28 11:50:25 2011 +@@ -24,6 +24,7 @@ #include #include #include +#include #include #include --#include #endif - - #include "base/base64.h" diff --git a/www/chromium/patches/patch-net_base_net_util_h b/www/chromium/patches/patch-net_base_net_util_h new file mode 100644 index 00000000000..33b33eff996 --- /dev/null +++ b/www/chromium/patches/patch-net_base_net_util_h @@ -0,0 +1,11 @@ +$OpenBSD: patch-net_base_net_util_h,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- net/base/net_util.h.orig Thu Apr 28 18:13:10 2011 ++++ net/base/net_util.h Thu Apr 28 18:13:26 2011 +@@ -12,6 +12,7 @@ + #include + #include + #elif defined(OS_POSIX) ++#include + #include + #endif + diff --git a/www/chromium/patches/patch-net_net_gyp b/www/chromium/patches/patch-net_net_gyp index 27c480d5383..0636f83cae2 100644 --- a/www/chromium/patches/patch-net_net_gyp +++ b/www/chromium/patches/patch-net_net_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-net_net_gyp,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- net/net.gyp.orig Fri Mar 11 10:01:16 2011 -+++ net/net.gyp Mon Mar 14 10:55:37 2011 -@@ -133,12 +133,12 @@ +$OpenBSD: patch-net_net_gyp,v 1.4 2011/04/29 13:18:01 robert Exp $ +--- net/net.gyp.orig Tue Apr 26 10:01:16 2011 ++++ net/net.gyp Thu Apr 28 11:17:49 2011 +@@ -134,12 +134,12 @@ 'base/net_util_win.cc', 'base/network_change_notifier.cc', 'base/network_change_notifier.h', @@ -18,7 +18,7 @@ $OpenBSD: patch-net_net_gyp,v 1.3 2011/03/15 11:38:05 robert Exp $ 'base/network_change_notifier_win.cc', 'base/network_change_notifier_win.h', 'base/network_config_watcher_mac.cc', -@@ -242,7 +242,6 @@ +@@ -245,7 +245,6 @@ 'dependencies': [ '../build/linux/system.gyp:gconf', '../build/linux/system.gyp:gdk', @@ -26,7 +26,7 @@ $OpenBSD: patch-net_net_gyp,v 1.3 2011/03/15 11:38:05 robert Exp $ ], 'conditions': [ ['use_openssl==1', { -@@ -1029,7 +1028,7 @@ +@@ -1023,7 +1022,7 @@ ], } ], @@ -35,7 +35,7 @@ $OpenBSD: patch-net_net_gyp,v 1.3 2011/03/15 11:38:05 robert Exp $ 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ -@@ -1194,7 +1193,7 @@ +@@ -1196,7 +1195,7 @@ }], ], }], diff --git a/www/chromium/patches/patch-net_proxy_proxy_config_service_linux_cc b/www/chromium/patches/patch-net_proxy_proxy_config_service_linux_cc index 7bee58098ac..42ce44cc5ea 100644 --- a/www/chromium/patches/patch-net_proxy_proxy_config_service_linux_cc +++ b/www/chromium/patches/patch-net_proxy_proxy_config_service_linux_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.1 2011/02/08 09:43:02 espie Exp $ ---- net/proxy/proxy_config_service_linux.cc.orig Fri Jan 21 10:19:56 2011 -+++ net/proxy/proxy_config_service_linux.cc Sun Jan 23 23:27:35 2011 +$OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- net/proxy/proxy_config_service_linux.cc.orig Tue Apr 26 10:01:15 2011 ++++ net/proxy/proxy_config_service_linux.cc Thu Apr 28 18:07:56 2011 @@ -12,7 +12,13 @@ #include #include @@ -15,7 +15,7 @@ $OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.1 2011/02/08 09:43:0 #include #include -@@ -432,7 +438,7 @@ class GConfSettingGetterImplKDE +@@ -433,7 +439,7 @@ class GConfSettingGetterImplKDE public base::MessagePumpLibevent::Watcher { public: explicit GConfSettingGetterImplKDE(base::Environment* env_var_getter) @@ -23,8 +23,8 @@ $OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.1 2011/02/08 09:43:0 + : notify_fd_(-1), notify_delegate_(NULL), indirect_manual_(false), auto_no_pac_(false), reversed_bypass_list_(false), env_var_getter_(env_var_getter), file_loop_(NULL) { - // Derive the location of the kde config dir from the environment. -@@ -488,31 +494,35 @@ class GConfSettingGetterImplKDE + // This has to be called on the UI thread (http://crbug.com/69057). +@@ -492,33 +498,37 @@ class GConfSettingGetterImplKDE } virtual ~GConfSettingGetterImplKDE() { @@ -45,6 +45,8 @@ $OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.1 2011/02/08 09:43:0 virtual bool Init(MessageLoop* glib_default_loop, MessageLoopForIO* file_loop) { + // This has to be called on the UI thread (http://crbug.com/69057). + base::ThreadRestrictions::ScopedAllowIO allow_io; - DCHECK(inotify_fd_ < 0); - inotify_fd_ = inotify_init(); - if (inotify_fd_ < 0) { @@ -70,7 +72,7 @@ $OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.1 2011/02/08 09:43:0 return false; } file_loop_ = file_loop; -@@ -523,28 +533,41 @@ class GConfSettingGetterImplKDE +@@ -529,28 +539,40 @@ class GConfSettingGetterImplKDE } void Shutdown() { @@ -95,7 +97,6 @@ $OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.1 2011/02/08 09:43:0 + int kioslavercfd = open(kde_config_dir_.Append("kioslaverc").value().c_str(), O_RDONLY); + if (kioslavercfd == -1) + return false; -+ + struct kevent ke; + EV_SET(&ke, kioslavercfd, EVFILT_VNODE, EV_ADD | EV_ONESHOT, NOTE_DELETE | NOTE_RENAME, 0, NULL); + @@ -120,7 +121,7 @@ $OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.1 2011/02/08 09:43:0 } virtual MessageLoop* GetNotificationLoop() { -@@ -553,7 +576,7 @@ class GConfSettingGetterImplKDE +@@ -559,7 +581,7 @@ class GConfSettingGetterImplKDE // Implement base::MessagePumpLibevent::Delegate. void OnFileCanReadWithoutBlocking(int fd) { @@ -129,13 +130,14 @@ $OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.1 2011/02/08 09:43:0 DCHECK(MessageLoop::current() == file_loop_); OnChangeNotification(); } -@@ -824,12 +847,25 @@ class GConfSettingGetterImplKDE +@@ -830,17 +852,29 @@ class GConfSettingGetterImplKDE // from the inotify file descriptor and starts up a debounce timer if // an event for kioslaverc is seen. void OnChangeNotification() { - DCHECK(inotify_fd_ >= 0); + DCHECK(notify_fd_ >= 0); DCHECK(MessageLoop::current() == file_loop_); +- char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4]; +#if defined(OS_OPENBSD) + bool kioslaverc_touched = true; + struct kevent ke; @@ -147,9 +149,8 @@ $OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.1 2011/02/08 09:43:0 + kioslaverc_touched = false; + } + close(ke.ident); -+ +#else - char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4]; ++ char event_buf[(sizeof(notify_event) + NAME_MAX + 1) * 4]; bool kioslaverc_touched = false; ssize_t r; - while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) { @@ -157,12 +158,14 @@ $OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.1 2011/02/08 09:43:0 // inotify returns variable-length structures, which is why we have // this strange-looking loop instead of iterating through an array. char* event_ptr = event_buf; -@@ -856,14 +892,15 @@ class GConfSettingGetterImplKDE - if (errno == EINVAL) { - // Our buffer is not large enough to read the next event. This should - // not happen (because its size is calculated to always be sufficiently -- // large), but if it does we'd warn continuously since |inotify_fd_| -+ // large), but if it does we'd warn continuously since |notify_fd_| + while (event_ptr < event_buf + r) { +- inotify_event* event = reinterpret_cast(event_ptr); ++ notify_event* event = reinterpret_cast(event_ptr); + // The kernel always feeds us whole events. + CHECK_LE(event_ptr + sizeof(inotify_event), event_buf + r); + CHECK_LE(event->name + event->len, event_buf + r); +@@ -865,11 +899,12 @@ class GConfSettingGetterImplKDE + // large), but if it does we'd warn continuously since |inotify_fd_| // would be forever ready to read. Close it and stop watching instead. LOG(ERROR) << "inotify failure; no longer watching kioslaverc!"; - inotify_watcher_.StopWatchingFileDescriptor(); @@ -177,7 +180,7 @@ $OpenBSD: patch-net_proxy_proxy_config_service_linux_cc,v 1.1 2011/02/08 09:43:0 if (kioslaverc_touched) { // We don't use Reset() because the timer may not yet be running. // (In that case Stop() is a no-op.) -@@ -877,8 +914,8 @@ class GConfSettingGetterImplKDE +@@ -883,8 +918,8 @@ class GConfSettingGetterImplKDE typedef std::map string_map_type; typedef std::map > strings_map_type; diff --git a/www/chromium/patches/patch-ppapi_proxy_image_data_cc b/www/chromium/patches/patch-ppapi_proxy_ppb_image_data_proxy_cc similarity index 65% rename from www/chromium/patches/patch-ppapi_proxy_image_data_cc rename to www/chromium/patches/patch-ppapi_proxy_ppb_image_data_proxy_cc index 2607271d65d..fd3bc974269 100644 --- a/www/chromium/patches/patch-ppapi_proxy_image_data_cc +++ b/www/chromium/patches/patch-ppapi_proxy_ppb_image_data_proxy_cc @@ -1,16 +1,16 @@ -$OpenBSD: patch-ppapi_proxy_image_data_cc,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- ppapi/proxy/image_data.cc.orig Mon Mar 14 13:16:56 2011 -+++ ppapi/proxy/image_data.cc Mon Mar 14 13:17:29 2011 -@@ -8,7 +8,7 @@ - #include - #endif +$OpenBSD: patch-ppapi_proxy_ppb_image_data_proxy_cc,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- ppapi/proxy/ppb_image_data_proxy.cc.orig Thu Apr 28 11:52:04 2011 ++++ ppapi/proxy/ppb_image_data_proxy.cc Thu Apr 28 11:52:22 2011 +@@ -23,7 +23,7 @@ --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_OPENBSD) + #if defined(OS_LINUX) + #include +-#elif defined(OS_MACOSX) ++#elif defined(OS_MACOSX) || defined(OS_OPENBSD) #include #include #endif -@@ -37,7 +37,7 @@ void* ImageData::Map() { +@@ -80,7 +80,7 @@ void* ImageData::Map() { #if defined(OS_WIN) NOTIMPLEMENTED(); return NULL; @@ -19,7 +19,7 @@ $OpenBSD: patch-ppapi_proxy_image_data_cc,v 1.1 2011/03/15 11:38:05 robert Exp $ struct stat st; if (fstat(handle_.fd, &st) != 0) return NULL; -@@ -62,7 +62,7 @@ void* ImageData::Map() { +@@ -105,7 +105,7 @@ void* ImageData::Map() { void ImageData::Unmap() { #if defined(OS_WIN) NOTIMPLEMENTED(); @@ -28,7 +28,7 @@ $OpenBSD: patch-ppapi_proxy_image_data_cc,v 1.1 2011/03/15 11:38:05 robert Exp $ if (mapped_data_) { struct stat st; if (fstat(handle_.fd, &st) == 0) -@@ -77,7 +77,7 @@ void ImageData::Unmap() { +@@ -120,7 +120,7 @@ void ImageData::Unmap() { #if defined(OS_WIN) const ImageHandle ImageData::NullHandle = NULL; @@ -37,7 +37,7 @@ $OpenBSD: patch-ppapi_proxy_image_data_cc,v 1.1 2011/03/15 11:38:05 robert Exp $ const ImageHandle ImageData::NullHandle = ImageHandle(); #else const ImageHandle ImageData::NullHandle = 0; -@@ -86,7 +86,7 @@ const ImageHandle ImageData::NullHandle = 0; +@@ -129,7 +129,7 @@ const ImageHandle ImageData::NullHandle = 0; ImageHandle ImageData::HandleFromInt(int32_t i) { #if defined(OS_WIN) return reinterpret_cast(i); diff --git a/www/chromium/patches/patch-ppapi_proxy_serialized_structs_h b/www/chromium/patches/patch-ppapi_proxy_serialized_structs_h index 8435aea2fcc..a758ad7534c 100644 --- a/www/chromium/patches/patch-ppapi_proxy_serialized_structs_h +++ b/www/chromium/patches/patch-ppapi_proxy_serialized_structs_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-ppapi_proxy_serialized_structs_h,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- ppapi/proxy/serialized_structs.h.orig Mon Mar 14 13:19:38 2011 -+++ ppapi/proxy/serialized_structs.h Mon Mar 14 13:19:47 2011 -@@ -102,7 +102,7 @@ struct PPBFlash_DrawGlyphs_Params { +$OpenBSD: patch-ppapi_proxy_serialized_structs_h,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- ppapi/proxy/serialized_structs.h.orig Tue Apr 26 10:01:08 2011 ++++ ppapi/proxy/serialized_structs.h Thu Apr 28 11:17:49 2011 +@@ -131,7 +131,7 @@ struct PPBURLLoader_UpdateProgress_Params { #if defined(OS_WIN) typedef HANDLE ImageHandle; diff --git a/www/chromium/patches/patch-ppapi_proxy_serialized_var_cc b/www/chromium/patches/patch-ppapi_proxy_serialized_var_cc index 1df64a0f939..b7e2b1583b6 100644 --- a/www/chromium/patches/patch-ppapi_proxy_serialized_var_cc +++ b/www/chromium/patches/patch-ppapi_proxy_serialized_var_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-ppapi_proxy_serialized_var_cc,v 1.1 2011/02/08 09:43:02 espie Exp $ ---- ppapi/proxy/serialized_var.cc.orig Fri Jan 21 10:19:50 2011 -+++ ppapi/proxy/serialized_var.cc Mon Jan 24 11:21:37 2011 -@@ -189,7 +189,7 @@ bool SerializedVar::Inner::ReadFromMessage(const IPC:: +$OpenBSD: patch-ppapi_proxy_serialized_var_cc,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- ppapi/proxy/serialized_var.cc.orig Tue Apr 26 10:01:08 2011 ++++ ppapi/proxy/serialized_var.cc Thu Apr 28 11:17:49 2011 +@@ -194,7 +194,7 @@ bool SerializedVar::Inner::ReadFromMessage(const IPC:: var_.value.as_id = 0; break; case PP_VARTYPE_OBJECT: diff --git a/www/chromium/patches/patch-printing_printing_gyp b/www/chromium/patches/patch-printing_printing_gyp index 8eb9b100eb1..bb3473bead8 100644 --- a/www/chromium/patches/patch-printing_printing_gyp +++ b/www/chromium/patches/patch-printing_printing_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-printing_printing_gyp,v 1.2 2011/02/08 09:43:02 espie Exp $ ---- printing/printing.gyp.orig Fri Jan 21 10:19:48 2011 -+++ printing/printing.gyp Sun Jan 23 23:27:35 2011 -@@ -165,7 +165,7 @@ +$OpenBSD: patch-printing_printing_gyp,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- printing/printing.gyp.orig Tue Apr 26 10:01:07 2011 ++++ printing/printing.gyp Thu Apr 28 11:17:49 2011 +@@ -170,7 +170,7 @@ 'units_unittest.cc', ], 'conditions': [ @@ -10,7 +10,7 @@ $OpenBSD: patch-printing_printing_gyp,v 1.2 2011/02/08 09:43:02 espie Exp $ ['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}], ['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']] }, { # else: OS=="win" -@@ -176,14 +176,12 @@ +@@ -181,14 +181,12 @@ 'dependencies': [ '../build/linux/system.gyp:gtk', ], diff --git a/www/chromium/patches/patch-remoting_host_user_authenticator_bsd_cc b/www/chromium/patches/patch-remoting_host_user_authenticator_bsd_cc new file mode 100644 index 00000000000..30ed485b252 --- /dev/null +++ b/www/chromium/patches/patch-remoting_host_user_authenticator_bsd_cc @@ -0,0 +1,18 @@ +$OpenBSD: patch-remoting_host_user_authenticator_bsd_cc,v 1.1 2011/04/29 13:18:01 robert Exp $ +--- remoting/host/user_authenticator_bsd.cc.orig Fri Apr 29 09:53:14 2011 ++++ remoting/host/user_authenticator_bsd.cc Fri Apr 29 09:53:21 2011 +@@ -0,0 +1,14 @@ ++// Copyright (c) 2011 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "remoting/host/user_authenticator_fake.h" ++ ++namespace remoting { ++ ++// static ++UserAuthenticator* UserAuthenticator::Create() { ++ return new UserAuthenticatorFake(); ++} ++ ++} // namespace remoting diff --git a/www/chromium/patches/patch-remoting_remoting_gyp b/www/chromium/patches/patch-remoting_remoting_gyp index b5fb4e9c100..f189bedcb68 100644 --- a/www/chromium/patches/patch-remoting_remoting_gyp +++ b/www/chromium/patches/patch-remoting_remoting_gyp @@ -1,46 +1,35 @@ -$OpenBSD: patch-remoting_remoting_gyp,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- remoting/remoting.gyp.orig Fri Mar 11 10:01:06 2011 -+++ remoting/remoting.gyp Mon Mar 14 10:55:37 2011 -@@ -16,7 +16,7 @@ - }, - - 'conditions': [ -- ['OS=="linux" or OS=="mac"', { -+ ['OS=="linux" or OS=="openbsd" or OS=="mac"', { - 'targets': [ - # Simple webserver for testing chromoting client plugin. - { -@@ -40,6 +40,8 @@ - 'chromoting_base', - 'chromoting_client', - 'chromoting_jingle_glue', -+ '../build/linux/system.gyp:x11', -+ '../build/linux/system.gyp:xext', - ], - 'link_settings': { - 'libraries': [ -@@ -221,7 +223,11 @@ - 'host/event_executor_win.h', +$OpenBSD: patch-remoting_remoting_gyp,v 1.3 2011/04/29 13:18:01 robert Exp $ +--- remoting/remoting.gyp.orig Tue Apr 26 10:01:06 2011 ++++ remoting/remoting.gyp Fri Apr 29 09:52:53 2011 +@@ -237,22 +237,22 @@ + 'host/user_authenticator_win.cc', ], }], - ['OS=="linux"', { + ['OS=="linux" or OS=="openbsd"', { -+ 'dependencies': [ -+ '../build/linux/system.gyp:x11', -+ '../build/linux/system.gyp:xext', -+ ], 'sources': [ 'host/capturer_linux.cc', 'host/capturer_linux.h', -@@ -233,6 +239,7 @@ + 'host/event_executor_linux.cc', + 'host/event_executor_linux.h', +- 'host/user_authenticator_pam.cc', +- 'host/user_authenticator_pam.h', +- 'host/user_authenticator_linux.cc' ++ 'host/user_authenticator_fake.cc', ++ 'host/user_authenticator_fake.h', ++ 'host/user_authenticator_bsd.cc', + ], ++ 'include_dirs': [ '/usr/X11R6/include' ], + 'link_settings': { + 'libraries': [ '-lX11', '-lXdamage', '-lXtst', -+ '-lvpx', +- '-lpam', ], }, }], -@@ -500,7 +507,7 @@ +@@ -573,7 +573,7 @@ 'host/capturer_gdi_unittest.cc', ], }], diff --git a/www/chromium/patches/patch-testing_gtest_include_gtest_internal_gtest-port_h b/www/chromium/patches/patch-testing_gtest_include_gtest_internal_gtest-port_h deleted file mode 100644 index 9ce64ba8b06..00000000000 --- a/www/chromium/patches/patch-testing_gtest_include_gtest_internal_gtest-port_h +++ /dev/null @@ -1,30 +0,0 @@ -$OpenBSD: patch-testing_gtest_include_gtest_internal_gtest-port_h,v 1.1 2011/02/08 09:43:02 espie Exp $ ---- testing/gtest/include/gtest/internal/gtest-port.h.orig Wed Feb 2 11:14:10 2011 -+++ testing/gtest/include/gtest/internal/gtest-port.h Wed Feb 2 11:15:06 2011 -@@ -230,6 +230,8 @@ - #define GTEST_OS_SOLARIS 1 - #elif defined(_AIX) - #define GTEST_OS_AIX 1 -+#elif defined __OpenBSD__ -+#define GTEST_OS_OPENBSD 1 - #endif // __CYGWIN__ - - // Brings in definitions for functions used in the testing::internal::posix -@@ -394,7 +396,7 @@ - // - // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0 - // to your compiler flags. --#define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC) -+#define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_OPENBSD) - #endif // GTEST_HAS_PTHREAD - - #if GTEST_HAS_PTHREAD -@@ -515,7 +517,7 @@ - // Google Test does not support death tests for VC 7.1 and earlier as - // abort() in a VC 7.1 application compiled as GUI in debug config - // pops up a dialog window that cannot be suppressed programmatically. --#if (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ -+#if (GTEST_OS_OPENBSD || GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ - (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ - GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX) - #define GTEST_HAS_DEATH_TEST 1 diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_JavaScriptCore_wtf_StringExtras_h b/www/chromium/patches/patch-third_party_WebKit_Source_JavaScriptCore_wtf_StringExtras_h deleted file mode 100644 index 3ef13ccdb6d..00000000000 --- a/www/chromium/patches/patch-third_party_WebKit_Source_JavaScriptCore_wtf_StringExtras_h +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-third_party_WebKit_Source_JavaScriptCore_wtf_StringExtras_h,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- third_party/WebKit/Source/JavaScriptCore/wtf/StringExtras.h.orig Fri Mar 11 10:17:19 2011 -+++ third_party/WebKit/Source/JavaScriptCore/wtf/StringExtras.h Mon Mar 14 10:57:25 2011 -@@ -100,7 +100,7 @@ inline int strcasecmp(const char* s1, const char* s2) - - #endif - --#if COMPILER(MSVC) || COMPILER(RVCT) || OS(WINDOWS) || OS(LINUX) || OS(SOLARIS) -+#if COMPILER(MSVC) || COMPILER(RVCT) || OS(WINDOWS) || OS(LINUX) || OS(SOLARIS) || OS(OPENBSD) - // FIXME: should check HAVE_STRNSTR - - inline char* strnstr(const char* buffer, const char* target, size_t bufferLength) diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_WebCore_gyp_WebCore_gyp b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_WebCore_gyp_WebCore_gyp index 3be4f53762c..189f0630dc6 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_WebCore_gyp_WebCore_gyp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_WebCore_gyp_WebCore_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_WebCore_WebCore_gyp_WebCore_gyp,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp.orig Fri Mar 11 10:19:08 2011 -+++ third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp Mon Mar 14 10:57:25 2011 -@@ -950,7 +950,7 @@ +$OpenBSD: patch-third_party_WebKit_Source_WebCore_WebCore_gyp_WebCore_gyp,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp.orig Tue Apr 26 10:04:13 2011 ++++ third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp Thu Apr 28 11:17:49 2011 +@@ -992,7 +992,7 @@ '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib', ], }], @@ -10,7 +10,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebCore_WebCore_gyp_WebCore_gyp,v 1.1 'dependencies': [ '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', '<(chromium_src_dir)/build/linux/system.gyp:gtk', -@@ -1122,7 +1122,7 @@ +@@ -1197,7 +1197,7 @@ ['include', 'thirdparty/glu/libtess/'], ], 'conditions': [ @@ -19,7 +19,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebCore_WebCore_gyp_WebCore_gyp,v 1.1 'sources/': [ # Cherry-pick files excluded by the broader regular expressions above. ['include', 'platform/chromium/KeyCodeConversionGtk\\.cpp$'], -@@ -1240,7 +1240,7 @@ +@@ -1310,7 +1310,7 @@ ['exclude', 'platform/chromium/DragImageChromiumSkia\\.cpp$'], ], }], @@ -28,8 +28,8 @@ $OpenBSD: patch-third_party_WebKit_Source_WebCore_WebCore_gyp_WebCore_gyp,v 1.1 'sources/': [ ['exclude', '(Gtk|Linux)\\.cpp$'], ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'], -@@ -1404,7 +1404,7 @@ - # warnings about uninitialized this.7. +@@ -1390,7 +1390,7 @@ + # warnings about uninitialized this. 'cflags': ['-Wno-uninitialized'], }], - ['OS!="linux" and OS!="freebsd"', { diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_bindings_v8_custom_V8InspectorFrontendHostCustom_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_bindings_v8_custom_V8InspectorFrontendHostCustom_cpp index a6d80778633..fe63659aa57 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_bindings_v8_custom_V8InspectorFrontendHostCustom_cpp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_bindings_v8_custom_V8InspectorFrontendHostCustom_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_WebCore_bindings_v8_custom_V8InspectorFrontendHostCustom_cpp,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- third_party/WebKit/Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp.orig Fri Mar 11 10:19:22 2011 -+++ third_party/WebKit/Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp Mon Mar 14 10:57:25 2011 -@@ -51,6 +51,8 @@ v8::Handle V8InspectorFrontendHost::platfor +$OpenBSD: patch-third_party_WebKit_Source_WebCore_bindings_v8_custom_V8InspectorFrontendHostCustom_cpp,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- third_party/WebKit/Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp.orig Tue Apr 26 10:04:17 2011 ++++ third_party/WebKit/Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp Thu Apr 28 11:17:49 2011 +@@ -52,6 +52,8 @@ v8::Handle V8InspectorFrontendHost::platfor return v8String("freebsd"); #elif defined(OS_WIN) return v8String("windows"); diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_dom_SelectElement_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_dom_SelectElement_cpp index 59ad43470a2..130637a8048 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_dom_SelectElement_cpp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_dom_SelectElement_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_WebCore_dom_SelectElement_cpp,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- third_party/WebKit/Source/WebCore/dom/SelectElement.cpp.orig Fri Mar 11 10:18:22 2011 -+++ third_party/WebKit/Source/WebCore/dom/SelectElement.cpp Mon Mar 14 10:57:25 2011 -@@ -54,7 +54,7 @@ +$OpenBSD: patch-third_party_WebKit_Source_WebCore_dom_SelectElement_cpp,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- third_party/WebKit/Source/WebCore/dom/SelectElement.cpp.orig Tue Apr 26 10:03:49 2011 ++++ third_party/WebKit/Source/WebCore/dom/SelectElement.cpp Thu Apr 28 11:17:49 2011 +@@ -53,7 +53,7 @@ #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) #define ARROW_KEYS_POP_MENU 1 #define SPACE_OR_RETURN_POP_MENU 0 diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_page_EventHandler_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_page_EventHandler_cpp index f8997eebb6a..d5416c1ba3d 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_page_EventHandler_cpp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_page_EventHandler_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_WebCore_page_EventHandler_cpp,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- third_party/WebKit/Source/WebCore/page/EventHandler.cpp.orig Fri Mar 11 10:18:34 2011 -+++ third_party/WebKit/Source/WebCore/page/EventHandler.cpp Mon Mar 14 10:57:25 2011 -@@ -1936,7 +1936,7 @@ bool EventHandler::dispatchMouseEvent(const AtomicStri +$OpenBSD: patch-third_party_WebKit_Source_WebCore_page_EventHandler_cpp,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- third_party/WebKit/Source/WebCore/page/EventHandler.cpp.orig Tue Apr 26 10:03:55 2011 ++++ third_party/WebKit/Source/WebCore/page/EventHandler.cpp Thu Apr 28 11:17:49 2011 +@@ -1961,7 +1961,7 @@ bool EventHandler::dispatchMouseEvent(const AtomicStri return swallowEvent; } diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_platform_chromium_PlatformBridge_h b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_platform_chromium_PlatformBridge_h index 4f0abef0b9d..9c3fa706191 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_platform_chromium_PlatformBridge_h +++ b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_platform_chromium_PlatformBridge_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-third_party_WebKit_Source_WebCore_platform_chromium_PlatformBridge_h,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- third_party/WebKit/Source/WebCore/platform/chromium/PlatformBridge.h.orig Mon Mar 14 14:32:23 2011 -+++ third_party/WebKit/Source/WebCore/platform/chromium/PlatformBridge.h Mon Mar 14 14:32:39 2011 +$OpenBSD: patch-third_party_WebKit_Source_WebCore_platform_chromium_PlatformBridge_h,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- third_party/WebKit/Source/WebCore/platform/chromium/PlatformBridge.h.orig Tue Apr 26 10:04:09 2011 ++++ third_party/WebKit/Source/WebCore/platform/chromium/PlatformBridge.h Thu Apr 28 11:17:49 2011 @@ -148,7 +148,7 @@ class PlatformBridge { (public) #if OS(WINDOWS) static bool ensureFontLoaded(HFONT); @@ -8,9 +8,9 @@ $OpenBSD: patch-third_party_WebKit_Source_WebCore_platform_chromium_PlatformBrid -#if OS(LINUX) || OS(FREEBSD) +#if OS(LINUX) || OS(FREEBSD) || OS(OPENBSD) static void getRenderStyleForStrike(const char* family, int sizeAndStyle, FontRenderStyle* result); - static String getFontFamilyForCharacters(const UChar*, size_t numCharacters); + static String getFontFamilyForCharacters(const UChar*, size_t numCharacters, const char* preferredLocale); #endif -@@ -264,7 +264,7 @@ class PlatformBridge { (public) +@@ -265,7 +265,7 @@ class PlatformBridge { (public) GraphicsContext*, int part, int state, int classicState, const IntRect&); static void paintProgressBar( GraphicsContext*, const IntRect& barRect, const IntRect& valueRect, bool determinate, double animatedSeconds); diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_platform_graphics_skia_FontCustomPlatformData_h b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_platform_graphics_skia_FontCustomPlatformData_h index 0340fee0cf5..3ec81bece3c 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_platform_graphics_skia_FontCustomPlatformData_h +++ b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_platform_graphics_skia_FontCustomPlatformData_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_WebCore_platform_graphics_skia_FontCustomPlatformData_h,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- third_party/WebKit/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.h.orig Fri Mar 11 10:18:47 2011 -+++ third_party/WebKit/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.h Mon Mar 14 10:57:25 2011 -@@ -40,7 +40,7 @@ +$OpenBSD: patch-third_party_WebKit_Source_WebCore_platform_graphics_skia_FontCustomPlatformData_h,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- third_party/WebKit/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.h.orig Tue Apr 26 10:04:06 2011 ++++ third_party/WebKit/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.h Thu Apr 28 11:17:49 2011 +@@ -41,7 +41,7 @@ #if OS(WINDOWS) #include "PlatformString.h" #include @@ -10,7 +10,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebCore_platform_graphics_skia_FontCus #include "SkTypeface.h" #endif -@@ -57,7 +57,7 @@ struct FontCustomPlatformData { (public) +@@ -58,7 +58,7 @@ struct FontCustomPlatformData { (public) : m_fontReference(fontReference) , m_name(name) {} @@ -19,7 +19,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebCore_platform_graphics_skia_FontCus explicit FontCustomPlatformData(SkTypeface* typeface) : m_fontReference(typeface) {} -@@ -73,7 +73,7 @@ struct FontCustomPlatformData { (public) +@@ -74,7 +74,7 @@ struct FontCustomPlatformData { (public) #if OS(WINDOWS) HANDLE m_fontReference; String m_name; diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_platform_sql_chromium_SQLiteFileSystemChromiumPosix_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_platform_sql_chromium_SQLiteFileSystemChromiumPosix_cpp deleted file mode 100644 index 661dc9385ba..00000000000 --- a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_platform_sql_chromium_SQLiteFileSystemChromiumPosix_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-third_party_WebKit_Source_WebCore_platform_sql_chromium_SQLiteFileSystemChromiumPosix_cpp,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- third_party/WebKit/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp.orig Fri Mar 11 10:18:41 2011 -+++ third_party/WebKit/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp Mon Mar 14 10:57:25 2011 -@@ -755,6 +755,8 @@ static bool syncWrapper(int fd, bool fullSync) - if (!success) - success = !fsync(fd); - return success; -+#elif OS(OPENBSD) -+ return !fsync(fd); - #else - return !fdatasync(fd); - #endif diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_storage_IDBDatabaseBackendImpl_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_storage_IDBDatabaseBackendImpl_cpp index 63d4c33326f..c8fbaa970f5 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_storage_IDBDatabaseBackendImpl_cpp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_WebCore_storage_IDBDatabaseBackendImpl_cpp @@ -1,12 +1,15 @@ -$OpenBSD: patch-third_party_WebKit_Source_WebCore_storage_IDBDatabaseBackendImpl_cpp,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- third_party/WebKit/Source/WebCore/storage/IDBDatabaseBackendImpl.cpp.orig Fri Mar 11 10:18:11 2011 -+++ third_party/WebKit/Source/WebCore/storage/IDBDatabaseBackendImpl.cpp Mon Mar 14 10:57:25 2011 -@@ -100,7 +100,7 @@ IDBDatabaseBackendImpl::IDBDatabaseBackendImpl(const S +$OpenBSD: patch-third_party_WebKit_Source_WebCore_storage_IDBDatabaseBackendImpl_cpp,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- third_party/WebKit/Source/WebCore/storage/IDBDatabaseBackendImpl.cpp.orig Thu Apr 28 20:04:15 2011 ++++ third_party/WebKit/Source/WebCore/storage/IDBDatabaseBackendImpl.cpp Thu Apr 28 20:06:19 2011 +@@ -72,9 +72,9 @@ IDBDatabaseBackendImpl::IDBDatabaseBackendImpl(const S + { + ASSERT(!m_name.isNull()); - bool success = extractMetaData(m_sqliteDatabase->db(), m_name, m_version, m_id); +- bool success = m_backingStore->extractIDBDatabaseMetaData(m_name, m_version, m_id); ++ bool success = m_backingStore->extractIDBDatabaseMetaData(m_name, m_version, (int64_t &)m_id); ASSERT_UNUSED(success, success == (m_id != InvalidId)); -- if (!setMetaData(m_sqliteDatabase->db(), m_name, m_version, m_id)) -+ if (!setMetaData(m_sqliteDatabase->db(), m_name, m_version, (int64_t&)m_id)) +- if (!m_backingStore->setIDBDatabaseMetaData(m_name, m_version, m_id, m_id == InvalidId)) ++ if (!m_backingStore->setIDBDatabaseMetaData(m_name, m_version, (int64_t &)m_id, m_id == InvalidId)) ASSERT_NOT_REACHED(); // FIXME: Need better error handling. loadObjectStores(); } diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_WebKit_gyp b/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_WebKit_gyp index 20e2ad62999..cfbd3c2d0a8 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_WebKit_gyp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_WebKit_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_WebKit_gyp,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- third_party/WebKit/Source/WebKit/chromium/WebKit.gyp.orig Fri Mar 11 10:17:39 2011 -+++ third_party/WebKit/Source/WebKit/chromium/WebKit.gyp Mon Mar 14 10:57:25 2011 -@@ -618,7 +618,7 @@ +$OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_WebKit_gyp,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- third_party/WebKit/Source/WebKit/chromium/WebKit.gyp.orig Tue Apr 26 10:03:29 2011 ++++ third_party/WebKit/Source/WebKit/chromium/WebKit.gyp Thu Apr 28 11:17:49 2011 +@@ -634,7 +634,7 @@ }, { 'type': '<(webkit_target_type)' }], @@ -10,7 +10,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_WebKit_gyp,v 1.1 2011/ 'dependencies': [ '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', '<(chromium_src_dir)/build/linux/system.gyp:gtk', -@@ -824,7 +824,7 @@ +@@ -840,7 +840,7 @@ 'tests/DragImageTest.cpp', ], }], diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_src_PlatformBridge_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_src_PlatformBridge_cpp index 83e9b90b9b8..6565d943653 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_src_PlatformBridge_cpp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_src_PlatformBridge_cpp @@ -1,6 +1,6 @@ -$OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_PlatformBridge_cpp,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- third_party/WebKit/Source/WebKit/chromium/src/PlatformBridge.cpp.orig Mon Mar 14 11:49:42 2011 -+++ third_party/WebKit/Source/WebKit/chromium/src/PlatformBridge.cpp Mon Mar 14 17:28:21 2011 +$OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_PlatformBridge_cpp,v 1.2 2011/04/29 13:18:01 robert Exp $ +--- third_party/WebKit/Source/WebKit/chromium/src/PlatformBridge.cpp.orig Thu Apr 28 11:56:06 2011 ++++ third_party/WebKit/Source/WebKit/chromium/src/PlatformBridge.cpp Thu Apr 28 11:56:33 2011 @@ -70,7 +70,7 @@ #include "win/WebThemeEngine.h" #endif @@ -16,10 +16,10 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_PlatformBridge_cpp -#if OS(LINUX) || OS(FREEBSD) +#if OS(LINUX) || OS(FREEBSD) || OS(OPENBSD) - String PlatformBridge::getFontFamilyForCharacters(const UChar* characters, size_t numCharacters) + String PlatformBridge::getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char* preferredLocale) { if (webKitClient()->sandboxSupport()) -@@ -778,7 +778,7 @@ void PlatformBridge::paintProgressBar( +@@ -777,7 +777,7 @@ void PlatformBridge::paintProgressBar( gc->platformContext()->canvas(), barRect, valueRect, determinate, animatedSeconds); } diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_src_WebFrameImpl_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_src_WebFrameImpl_cpp index 8a465f1d0c1..e7a38b59377 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_src_WebFrameImpl_cpp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_src_WebFrameImpl_cpp @@ -1,16 +1,16 @@ -$OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebFrameImpl_cpp,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- third_party/WebKit/Source/WebKit/chromium/src/WebFrameImpl.cpp.orig Fri Mar 11 10:17:36 2011 -+++ third_party/WebKit/Source/WebKit/chromium/src/WebFrameImpl.cpp Mon Mar 14 10:57:25 2011 -@@ -159,7 +159,7 @@ - #include "LocalCurrentGraphicsContext.h" - #endif +$OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebFrameImpl_cpp,v 1.2 2011/04/29 13:18:02 robert Exp $ +--- third_party/WebKit/Source/WebKit/chromium/src/WebFrameImpl.cpp.orig Thu Apr 28 11:56:44 2011 ++++ third_party/WebKit/Source/WebKit/chromium/src/WebFrameImpl.cpp Thu Apr 28 11:57:00 2011 +@@ -154,7 +154,7 @@ + #include + #include -#if OS(LINUX) || OS(FREEBSD) +#if OS(LINUX) || OS(FREEBSD) || OS(OPENBSD) #include #endif -@@ -322,7 +322,7 @@ class ChromePrintContext : public PrintContext { (publ +@@ -324,7 +324,7 @@ class ChromePrintContext : public PrintContext { (publ float scale = m_printedPageWidth / pageRect.width(); ctx.save(); @@ -19,12 +19,3 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebFrameImpl_cpp,v ctx.scale(WebCore::FloatSize(scale, scale)); #endif ctx.translate(static_cast(-pageRect.x()), -@@ -1338,7 +1338,7 @@ float WebFrameImpl::printPage(int page, WebCanvas* can - return 0; - } - --#if OS(WINDOWS) || OS(LINUX) || OS(FREEBSD) || OS(SOLARIS) -+#if OS(WINDOWS) || OS(LINUX) || OS(FREEBSD) || OS(SOLARIS) || OS(OPENBSD) - PlatformContextSkia context(canvas); - GraphicsContext spool(&context); - #elif OS(DARWIN) diff --git a/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp b/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp index 0ffd3b38fb5..efb6fdc5fd8 100644 --- a/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp +++ b/www/chromium/patches/patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp.orig Fri Mar 11 10:17:35 2011 -+++ third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp Mon Mar 14 10:57:25 2011 -@@ -130,7 +130,7 @@ +$OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v 1.2 2011/04/29 13:18:02 robert Exp $ +--- third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp.orig Tue Apr 26 10:03:27 2011 ++++ third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp Thu Apr 28 11:17:49 2011 +@@ -132,7 +132,7 @@ #if OS(WINDOWS) #include "RenderThemeChromiumWin.h" #else @@ -10,7 +10,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v #include "RenderThemeChromiumLinux.h" #endif #include "RenderTheme.h" -@@ -468,7 +468,7 @@ void WebViewImpl::mouseDown(const WebMouseEvent& event +@@ -466,7 +466,7 @@ void WebViewImpl::mouseDown(const WebMouseEvent& event || (event.button == WebMouseEvent::ButtonLeft && event.modifiers & WebMouseEvent::ControlKey)) mouseContextMenu(event); @@ -19,7 +19,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v if (event.button == WebMouseEvent::ButtonRight) mouseContextMenu(event); #endif -@@ -507,7 +507,7 @@ void WebViewImpl::mouseUp(const WebMouseEvent& event) +@@ -505,7 +505,7 @@ void WebViewImpl::mouseUp(const WebMouseEvent& event) if (!mainFrameImpl() || !mainFrameImpl()->frameView()) return; @@ -28,7 +28,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v // If the event was a middle click, attempt to copy text into the focused // frame. We execute this before we let the page have a go at the event // because the page may change what is focused during in its event handler. -@@ -591,11 +591,11 @@ bool WebViewImpl::keyEvent(const WebKeyboardEvent& eve +@@ -589,11 +589,11 @@ bool WebViewImpl::keyEvent(const WebKeyboardEvent& eve if (!handler) return keyEventDefault(event); @@ -42,7 +42,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v WebInputEvent::RawKeyDown; #endif -@@ -605,7 +605,7 @@ bool WebViewImpl::keyEvent(const WebKeyboardEvent& eve +@@ -603,7 +603,7 @@ bool WebViewImpl::keyEvent(const WebKeyboardEvent& eve sendContextMenuEvent(event); return true; } @@ -51,7 +51,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v // It's not clear if we should continue after detecting a capslock keypress. // I'll err on the side of continuing, which is the pre-existing behaviour. -@@ -739,7 +739,7 @@ bool WebViewImpl::touchEvent(const WebTouchEvent& even +@@ -737,7 +737,7 @@ bool WebViewImpl::touchEvent(const WebTouchEvent& even } #endif @@ -60,7 +60,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v // Mac has no way to open a context menu based on a keyboard event. bool WebViewImpl::sendContextMenuEvent(const WebKeyboardEvent& event) { -@@ -2054,7 +2054,7 @@ void WebViewImpl::setDomainRelaxationForbidden(bool fo +@@ -2062,7 +2062,7 @@ void WebViewImpl::setDomainRelaxationForbidden(bool fo void WebViewImpl::setScrollbarColors(unsigned inactiveColor, unsigned activeColor, unsigned trackColor) { @@ -69,7 +69,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v PlatformThemeChromiumGtk::setScrollbarColors(inactiveColor, activeColor, trackColor); -@@ -2065,7 +2065,7 @@ void WebViewImpl::setSelectionColors(unsigned activeBa +@@ -2073,7 +2073,7 @@ void WebViewImpl::setSelectionColors(unsigned activeBa unsigned activeForegroundColor, unsigned inactiveBackgroundColor, unsigned inactiveForegroundColor) { @@ -78,7 +78,7 @@ $OpenBSD: patch-third_party_WebKit_Source_WebKit_chromium_src_WebViewImpl_cpp,v RenderThemeChromiumLinux::setSelectionColors(activeBackgroundColor, activeForegroundColor, inactiveBackgroundColor, -@@ -2141,7 +2141,7 @@ bool WebViewImpl::navigationPolicyFromMouseEvent(unsig +@@ -2149,7 +2149,7 @@ bool WebViewImpl::navigationPolicyFromMouseEvent(unsig bool alt, bool meta, WebNavigationPolicy* policy) { diff --git a/www/chromium/patches/patch-third_party_ffmpeg_ffmpeg_gyp b/www/chromium/patches/patch-third_party_ffmpeg_ffmpeg_gyp index 863d18436d5..2455f65ece9 100644 --- a/www/chromium/patches/patch-third_party_ffmpeg_ffmpeg_gyp +++ b/www/chromium/patches/patch-third_party_ffmpeg_ffmpeg_gyp @@ -1,16 +1,52 @@ -$OpenBSD: patch-third_party_ffmpeg_ffmpeg_gyp,v 1.2 2011/02/08 09:43:02 espie Exp $ ---- third_party/ffmpeg/ffmpeg.gyp.orig Fri Jan 21 10:22:21 2011 -+++ third_party/ffmpeg/ffmpeg.gyp Mon Jan 24 10:13:53 2011 -@@ -82,7 +82,7 @@ - 'ffmpeg_variant%': '<(target_arch)', - - 'use_system_ffmpeg%': 0, -- 'use_system_yasm%': 0, -+ 'use_system_yasm%': 1, - 'build_ffmpegsumo%': 1, - 'use_system_vpx%': 0, - -@@ -433,7 +433,7 @@ +$OpenBSD: patch-third_party_ffmpeg_ffmpeg_gyp,v 1.3 2011/04/29 13:18:02 robert Exp $ +--- third_party/ffmpeg/ffmpeg.gyp.orig Tue Apr 26 10:02:53 2011 ++++ third_party/ffmpeg/ffmpeg.gyp Thu Apr 28 17:32:14 2011 +@@ -204,10 +204,12 @@ + 'patched-ffmpeg-mt/libavformat/mp3.c', + ], + }], # ffmpeg_branding +- ['target_arch=="ia32" or target_arch=="x64"', { ++ ['use_system_yasm==0', { + 'dependencies': [ + '../yasm/yasm.gyp:yasm#host', + ], ++ }], ++ ['target_arch=="ia32" or target_arch=="x64"', { + 'sources': [ + 'patched-ffmpeg-mt/libavcodec/libvpxdec.c', + 'patched-ffmpeg-mt/libavcodec/libvpxenc.c', # sep 09 +@@ -365,9 +367,13 @@ + ], + }, + 'variables': { +- 'yasm_path': '<(PRODUCT_DIR)/yasm', + 'obj_format': 'elf', + 'conditions': [ ++ [ 'use_system_yasm==1', { ++ 'yasm_path': '(buf) + sizeof(hostent); + size_t aux_len = size - sizeof(hostent); +- while ((ret = gethostbyname_r(hostname, reinterpret_cast(buf), aux, ++ while ((ret = gethostbyname(hostname, reinterpret_cast(buf), aux, + aux_len, &result, herrno)) == ERANGE) { + size *= 2; + if (size > kMaxHostentLen) { +@@ -154,6 +154,8 @@ hostent* SafeGetHostByName(const char* hostname, int* + #elif defined(OSX) || defined(IOS) + // Mac OS returns an object with everything allocated. + result = getipnodebyname(hostname, AF_INET, AI_DEFAULT, herrno); ++#elif defined(__OpenBSD__) ++ result = gethostbyname(hostname); + #else + #error "I don't know how to do gethostbyname safely on your system." + #endif diff --git a/www/chromium/patches/patch-third_party_libvpx_libvpx_gyp b/www/chromium/patches/patch-third_party_libvpx_libvpx_gyp index 05e025f165e..57e964cb53d 100644 --- a/www/chromium/patches/patch-third_party_libvpx_libvpx_gyp +++ b/www/chromium/patches/patch-third_party_libvpx_libvpx_gyp @@ -1,7 +1,7 @@ -$OpenBSD: patch-third_party_libvpx_libvpx_gyp,v 1.1 2011/02/08 09:43:02 espie Exp $ ---- third_party/libvpx/libvpx.gyp.orig Fri Jan 21 10:31:24 2011 -+++ third_party/libvpx/libvpx.gyp Sun Jan 23 23:27:36 2011 -@@ -35,6 +35,11 @@ +$OpenBSD: patch-third_party_libvpx_libvpx_gyp,v 1.2 2011/04/29 13:18:02 robert Exp $ +--- third_party/libvpx/libvpx.gyp.orig Tue Apr 26 10:22:57 2011 ++++ third_party/libvpx/libvpx.gyp Thu Apr 28 11:17:49 2011 +@@ -223,6 +223,11 @@ 'libvpx_path': 'lib/linux/arm', }, }], diff --git a/www/chromium/patches/patch-third_party_skia_include_core_SkPreConfig_h b/www/chromium/patches/patch-third_party_skia_include_core_SkPreConfig_h index 1c2d4fd5bc2..bc11325d425 100644 --- a/www/chromium/patches/patch-third_party_skia_include_core_SkPreConfig_h +++ b/www/chromium/patches/patch-third_party_skia_include_core_SkPreConfig_h @@ -1,12 +1,12 @@ -$OpenBSD: patch-third_party_skia_include_core_SkPreConfig_h,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- third_party/skia/include/core/SkPreConfig.h.orig Fri Mar 11 10:01:59 2011 -+++ third_party/skia/include/core/SkPreConfig.h Mon Mar 14 10:55:38 2011 -@@ -71,6 +71,8 @@ - #if !defined(SK_RESTRICT) - #define SK_RESTRICT __restrict__ - #endif -+#undef SK_RESTRICT -+#define SK_RESTRICT - - ////////////////////////////////////////////////////////////////////// - +$OpenBSD: patch-third_party_skia_include_core_SkPreConfig_h,v 1.3 2011/04/29 13:18:02 robert Exp $ +--- third_party/skia/include/core/SkPreConfig.h.orig Tue Apr 26 10:02:01 2011 ++++ third_party/skia/include/core/SkPreConfig.h Fri Apr 29 10:54:22 2011 +@@ -37,7 +37,7 @@ + #define SK_BUILD_FOR_WIN32 + #elif defined(__SYMBIAN32__) + #define SK_BUILD_FOR_WIN32 +- #elif defined(linux) ++ #elif defined(linux) || defined(__OpenBSD__) + #define SK_BUILD_FOR_UNIX + #elif TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR + #define SK_BUILD_FOR_IOS diff --git a/www/chromium/patches/patch-third_party_sqlite_sqlite_gyp b/www/chromium/patches/patch-third_party_sqlite_sqlite_gyp new file mode 100644 index 00000000000..67e51429b9d --- /dev/null +++ b/www/chromium/patches/patch-third_party_sqlite_sqlite_gyp @@ -0,0 +1,12 @@ +$OpenBSD: patch-third_party_sqlite_sqlite_gyp,v 1.3 2011/04/29 13:18:02 robert Exp $ +--- third_party/sqlite/sqlite.gyp.orig Fri Apr 29 08:24:50 2011 ++++ third_party/sqlite/sqlite.gyp Fri Apr 29 08:25:01 2011 +@@ -233,7 +233,7 @@ + }, { # else: OS!="win" + 'sources/': [['exclude', '_(w32|win)\\.cc?$']], + }], +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="openbsd"', { + 'cflags': [ + # SQLite doesn't believe in compiler warnings, + # preferring testing. diff --git a/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py b/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py index 966e980569b..4b038566ec5 100644 --- a/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py +++ b/www/chromium/patches/patch-tools_gyp_pylib_gyp_generator_make_py @@ -1,28 +1,19 @@ -$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.2 2011/02/08 09:43:02 espie Exp $ ---- tools/gyp/pylib/gyp/generator/make.py.orig Fri Jan 21 10:29:51 2011 -+++ tools/gyp/pylib/gyp/generator/make.py Sun Jan 23 23:27:37 2011 -@@ -34,7 +34,7 @@ import pprint - generator_default_variables = { - 'EXECUTABLE_PREFIX': '', - 'EXECUTABLE_SUFFIX': '', -- 'OS': 'linux', -+ 'OS': 'openbsd', - 'STATIC_LIB_PREFIX': 'lib', - 'SHARED_LIB_PREFIX': 'lib', - 'STATIC_LIB_SUFFIX': '.a', -@@ -106,7 +106,7 @@ all_deps := +$OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.3 2011/04/29 13:18:02 robert Exp $ +--- tools/gyp/pylib/gyp/generator/make.py.orig Thu Apr 28 15:08:18 2011 ++++ tools/gyp/pylib/gyp/generator/make.py Thu Apr 28 15:40:24 2011 +@@ -114,7 +114,7 @@ all_deps := # export LINK="$(CXX)" # # This will allow make to invoke N linker processes as specified in -jN. --LINK ?= flock $(builddir)/linker.lock $(CXX) -+LINK ?= $(CXX) - - # We want to use GNU ar's T option if available because it's much faster. - # We try to archive and link a file to see ar and ld support this feature. -@@ -147,13 +147,13 @@ ifeq ($(ARFLAGS.target),) - ARFLAGS.target := $(call detect_arflags,target) - endif +-LINK ?= flock $(builddir)/linker.lock $(CXX) %(LINK_flags)s ++LINK ?= $(CXX) %(LINK_flags)s + CC.target ?= $(CC) + CFLAGS.target ?= $(CFLAGS) +@@ -129,13 +129,13 @@ ARFLAGS.target ?= %(ARFLAGS.target)s + # in gyp's make.py where ARFLAGS.host etc. is computed. + # TODO(evan): move all cross-compilation logic to gyp-time so we don't need + # to replicate this environment fallback in make as well. -CC.host ?= gcc -CFLAGS.host ?= -CXX.host ?= g++ @@ -37,6 +28,6 @@ $OpenBSD: patch-tools_gyp_pylib_gyp_generator_make_py,v 1.2 2011/02/08 09:43:02 +LINK.host ?= $(LINK) +LDFLAGS.host ?= $(LDFLAGS) +AR.host ?= $(AR) - # See the description for ARFLAGS.target. - -include $(obj).host/arflags/arflags.mk - # Temporarily disabled -- see ARFLAGS.target. + ARFLAGS.host := %(ARFLAGS.host)s + + # Flags to make gcc output dependency info. Note that you need to be diff --git a/www/chromium/patches/patch-ui_base_l10n_l10n_util_cc b/www/chromium/patches/patch-ui_base_l10n_l10n_util_cc new file mode 100644 index 00000000000..3fd1f63f953 --- /dev/null +++ b/www/chromium/patches/patch-ui_base_l10n_l10n_util_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-ui_base_l10n_l10n_util_cc,v 1.1 2011/04/29 13:18:02 robert Exp $ +--- ui/base/l10n/l10n_util.cc.orig Fri Apr 29 10:49:13 2011 ++++ ui/base/l10n/l10n_util.cc Fri Apr 29 10:49:22 2011 +@@ -320,7 +320,7 @@ bool CheckAndResolveLocale(const std::string& locale, + // if "foo bar" is RTL. So this function prepends the necessary RLM in such + // cases. + void AdjustParagraphDirectionality(string16* paragraph) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + if (base::i18n::IsRTL() && + base::i18n::StringContainsStrongRTLChars(*paragraph)) { + paragraph->insert(0, 1, static_cast(base::i18n::kRightToLeftMark)); diff --git a/www/chromium/patches/patch-ui_base_resource_resource_bundle_cc b/www/chromium/patches/patch-ui_base_resource_resource_bundle_cc new file mode 100644 index 00000000000..e2542bf3998 --- /dev/null +++ b/www/chromium/patches/patch-ui_base_resource_resource_bundle_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-ui_base_resource_resource_bundle_cc,v 1.1 2011/04/29 13:18:02 robert Exp $ +--- ui/base/resource/resource_bundle.cc.orig Fri Apr 29 08:21:35 2011 ++++ ui/base/resource/resource_bundle.cc Fri Apr 29 08:21:42 2011 +@@ -129,7 +129,7 @@ gfx::Image& ResourceBundle::GetImageNamed(int resource + return *GetEmptyImage(); + } + +-#if !defined(OS_MACOSX) && !defined(OS_LINUX) ++#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_OPENBSD) + // Only Mac and Linux have non-Skia native image types. All other platforms use + // Skia natively, so just use GetImageNamed(). + gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) { diff --git a/www/chromium/patches/patch-ui_gfx_gfx_gyp b/www/chromium/patches/patch-ui_gfx_gfx_gyp new file mode 100644 index 00000000000..8bc20d25656 --- /dev/null +++ b/www/chromium/patches/patch-ui_gfx_gfx_gyp @@ -0,0 +1,11 @@ +$OpenBSD: patch-ui_gfx_gfx_gyp,v 1.1 2011/04/29 13:18:02 robert Exp $ +--- ui/gfx/gfx.gyp.orig Thu Apr 28 11:46:54 2011 ++++ ui/gfx/gfx.gyp Thu Apr 28 11:47:12 2011 +@@ -187,6 +187,7 @@ + 'native_widget_types_gtk.cc', + ], + }], ++ ['OS=="openbsd"', { 'include_dirs': [ '/usr/local/include ' ] } ], + ], + }, + { diff --git a/www/chromium/patches/patch-ui_gfx_image_cc b/www/chromium/patches/patch-ui_gfx_image_cc new file mode 100644 index 00000000000..93fc04aa65e --- /dev/null +++ b/www/chromium/patches/patch-ui_gfx_image_cc @@ -0,0 +1,75 @@ +$OpenBSD: patch-ui_gfx_image_cc,v 1.1 2011/04/29 13:18:02 robert Exp $ +--- ui/gfx/image.cc.orig Fri Apr 29 10:48:33 2011 ++++ ui/gfx/image.cc Fri Apr 29 10:48:56 2011 +@@ -9,7 +9,7 @@ + #include "base/logging.h" + #include "third_party/skia/include/core/SkBitmap.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + #include + #include + #include "ui/gfx/canvas_skia.h" +@@ -29,7 +29,7 @@ namespace internal { + const SkBitmap* NSImageToSkBitmap(NSImage* image); + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + const SkBitmap* GdkPixbufToSkBitmap(GdkPixbuf* pixbuf) { + gfx::CanvasSkia canvas(gdk_pixbuf_get_width(pixbuf), + gdk_pixbuf_get_height(pixbuf), +@@ -61,7 +61,7 @@ class ImageRep { + return reinterpret_cast(this); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + GdkPixbufRep* AsGdkPixbufRep() { + CHECK_EQ(type_, Image::kGdkPixbufRep); + return reinterpret_cast(this); +@@ -102,7 +102,7 @@ class SkBitmapRep : public ImageRep { + DISALLOW_COPY_AND_ASSIGN(SkBitmapRep); + }; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + class GdkPixbufRep : public ImageRep { + public: + explicit GdkPixbufRep(GdkPixbuf* pixbuf) +@@ -158,7 +158,7 @@ Image::Image(const SkBitmap* bitmap) + AddRepresentation(rep); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + Image::Image(GdkPixbuf* pixbuf) + : default_representation_(Image::kGdkPixbufRep) { + internal::GdkPixbufRep* rep = new internal::GdkPixbufRep(pixbuf); +@@ -190,7 +190,7 @@ Image::operator const SkBitmap&() { + return *(this->operator const SkBitmap*()); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + Image::operator GdkPixbuf*() { + internal::ImageRep* rep = GetRepresentation(Image::kGdkPixbufRep); + return rep->AsGdkPixbufRep()->pixbuf(); +@@ -237,7 +237,7 @@ internal::ImageRep* Image::GetRepresentation(Represent + // Handle native-to-Skia conversion. + if (rep_type == Image::kSkBitmapRep) { + internal::SkBitmapRep* rep = NULL; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + if (default_representation_ == Image::kGdkPixbufRep) { + internal::GdkPixbufRep* pixbuf_rep = default_rep->AsGdkPixbufRep(); + rep = new internal::SkBitmapRep( +@@ -261,7 +261,7 @@ internal::ImageRep* Image::GetRepresentation(Represent + if (default_rep->type() == Image::kSkBitmapRep) { + internal::SkBitmapRep* skia_rep = default_rep->AsSkBitmapRep(); + internal::ImageRep* native_rep = NULL; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + if (rep_type == Image::kGdkPixbufRep) { + GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(skia_rep->bitmap()); + native_rep = new internal::GdkPixbufRep(pixbuf); diff --git a/www/chromium/patches/patch-ui_gfx_image_h b/www/chromium/patches/patch-ui_gfx_image_h new file mode 100644 index 00000000000..555e1b5098e --- /dev/null +++ b/www/chromium/patches/patch-ui_gfx_image_h @@ -0,0 +1,21 @@ +$OpenBSD: patch-ui_gfx_image_h,v 1.1 2011/04/29 13:18:02 robert Exp $ +--- ui/gfx/image.h.orig Thu Apr 28 12:10:49 2011 ++++ ui/gfx/image.h Thu Apr 28 12:10:58 2011 +@@ -43,7 +43,7 @@ class Image { + // Creates a new image with the default representation. The object will take + // ownership of the image. + explicit Image(const SkBitmap* bitmap); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + // Does not increase |pixbuf|'s reference count; expects to take ownership. + explicit Image(GdkPixbuf* pixbuf); + #elif defined(OS_MACOSX) +@@ -57,7 +57,7 @@ class Image { + // Conversion handlers. + operator const SkBitmap*(); + operator const SkBitmap&(); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + operator GdkPixbuf*(); + #elif defined(OS_MACOSX) + operator NSImage*(); diff --git a/www/chromium/patches/patch-gfx_native_widget_types_h b/www/chromium/patches/patch-ui_gfx_native_widget_types_h similarity index 60% rename from www/chromium/patches/patch-gfx_native_widget_types_h rename to www/chromium/patches/patch-ui_gfx_native_widget_types_h index 7c525dca9db..e9b6fa5d8b4 100644 --- a/www/chromium/patches/patch-gfx_native_widget_types_h +++ b/www/chromium/patches/patch-ui_gfx_native_widget_types_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-gfx_native_widget_types_h,v 1.1 2011/02/08 09:43:02 espie Exp $ ---- gfx/native_widget_types.h.orig Fri Jan 21 10:19:47 2011 -+++ gfx/native_widget_types.h Sun Jan 23 23:27:34 2011 +$OpenBSD: patch-ui_gfx_native_widget_types_h,v 1.1 2011/04/29 13:18:02 robert Exp $ +--- ui/gfx/native_widget_types.h.orig Thu Apr 28 11:47:26 2011 ++++ ui/gfx/native_widget_types.h Thu Apr 28 11:47:37 2011 @@ -97,7 +97,7 @@ typedef GdkRegion* NativeRegion; #if defined(OS_MACOSX) diff --git a/www/chromium/patches/patch-ui_views_events_accelerator_cc b/www/chromium/patches/patch-ui_views_events_accelerator_cc new file mode 100644 index 00000000000..25ffc1fb8db --- /dev/null +++ b/www/chromium/patches/patch-ui_views_events_accelerator_cc @@ -0,0 +1,21 @@ +$OpenBSD: patch-ui_views_events_accelerator_cc,v 1.1 2011/04/29 13:18:02 robert Exp $ +--- ui/views/events/accelerator.cc.orig Fri Apr 29 10:49:35 2011 ++++ ui/views/events/accelerator.cc Fri Apr 29 10:49:46 2011 +@@ -6,7 +6,7 @@ + + #if defined(OS_WIN) + #include +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_OPENBSD) + #include + #endif + +@@ -99,7 +99,7 @@ string16 GetShortcutTextForAccelerator(const Accelerat + else + key = LOWORD(::MapVirtualKeyW(accelerator.GetKeyCode(), MAPVK_VK_TO_CHAR)); + shortcut += key; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_OPENBSD) + const gchar* name = NULL; + switch (accelerator.GetKeyCode()) { + case ui::VKEY_OEM_2: diff --git a/www/chromium/patches/patch-ui_views_focus_accelerator_handler_h b/www/chromium/patches/patch-ui_views_focus_accelerator_handler_h new file mode 100644 index 00000000000..200476e033b --- /dev/null +++ b/www/chromium/patches/patch-ui_views_focus_accelerator_handler_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-ui_views_focus_accelerator_handler_h,v 1.1 2011/04/29 13:18:02 robert Exp $ +--- ui/views/focus/accelerator_handler.h.orig Fri Apr 29 10:50:04 2011 ++++ ui/views/focus/accelerator_handler.h Fri Apr 29 10:50:10 2011 +@@ -8,7 +8,7 @@ + + #include "build/build_config.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + #include + #endif + diff --git a/www/chromium/patches/patch-ui_views_focus_focus_manager_cc b/www/chromium/patches/patch-ui_views_focus_focus_manager_cc new file mode 100644 index 00000000000..c091236ed86 --- /dev/null +++ b/www/chromium/patches/patch-ui_views_focus_focus_manager_cc @@ -0,0 +1,12 @@ +$OpenBSD: patch-ui_views_focus_focus_manager_cc,v 1.1 2011/04/29 13:18:02 robert Exp $ +--- ui/views/focus/focus_manager.cc.orig Fri Apr 29 10:49:52 2011 ++++ ui/views/focus/focus_manager.cc Fri Apr 29 10:49:59 2011 +@@ -8,7 +8,7 @@ + + #include "build/build_config.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + #include + #endif + diff --git a/www/chromium/patches/patch-v8_src_x64_code-stubs-x64_cc b/www/chromium/patches/patch-v8_src_x64_code-stubs-x64_cc index 5d44e0b1202..0556a64e204 100644 --- a/www/chromium/patches/patch-v8_src_x64_code-stubs-x64_cc +++ b/www/chromium/patches/patch-v8_src_x64_code-stubs-x64_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-v8_src_x64_code-stubs-x64_cc,v 1.1 2011/03/23 12:33:26 robert Exp $ ---- v8/src/x64/code-stubs-x64.cc.orig Thu Mar 17 09:44:50 2011 -+++ v8/src/x64/code-stubs-x64.cc Wed Mar 23 08:28:07 2011 -@@ -1699,11 +1699,14 @@ void ArgumentsAccessStub::GenerateReadElement(MacroAss +$OpenBSD: patch-v8_src_x64_code-stubs-x64_cc,v 1.2 2011/04/29 13:18:02 robert Exp $ +--- v8/src/x64/code-stubs-x64.cc.orig Tue Apr 26 10:22:52 2011 ++++ v8/src/x64/code-stubs-x64.cc Thu Apr 28 11:17:49 2011 +@@ -2280,11 +2280,14 @@ void ArgumentsAccessStub::GenerateReadElement(MacroAss Label slow; __ JumpIfNotSmi(rdx, &slow); @@ -19,7 +19,7 @@ $OpenBSD: patch-v8_src_x64_code-stubs-x64_cc,v 1.1 2011/03/23 12:33:26 robert Ex __ j(equal, &adaptor); // Check index against formal parameters count limit passed in -@@ -1758,8 +1761,8 @@ void ArgumentsAccessStub::GenerateNewObject(MacroAssem +@@ -2339,8 +2342,8 @@ void ArgumentsAccessStub::GenerateNewObject(MacroAssem // Check if the calling frame is an arguments adaptor frame. Label adaptor_frame, try_allocate, runtime; __ movq(rdx, Operand(rbp, StandardFrameConstants::kCallerFPOffset)); @@ -30,7 +30,7 @@ $OpenBSD: patch-v8_src_x64_code-stubs-x64_cc,v 1.1 2011/03/23 12:33:26 robert Ex __ j(equal, &adaptor_frame); // Get the length from the frame. -@@ -3518,8 +3521,8 @@ void StringAddStub::Generate(MacroAssembler* masm) { +@@ -4118,8 +4121,8 @@ void StringAddStub::Generate(MacroAssembler* masm) { // Look at the length of the result of adding the two strings. STATIC_ASSERT(String::kMaxLength <= Smi::kMaxValue / 2); __ SmiAdd(rbx, rbx, rcx); @@ -41,7 +41,7 @@ $OpenBSD: patch-v8_src_x64_code-stubs-x64_cc,v 1.1 2011/03/23 12:33:26 robert Ex __ SmiCompare(rbx, Smi::FromInt(2)); __ j(not_equal, &longer_than_two); -@@ -3823,15 +3826,14 @@ void StringHelper::GenerateTwoCharacterSymbolTableProb +@@ -4471,15 +4474,14 @@ void StringHelper::GenerateTwoCharacterSymbolTableProb FieldOperand(symbol_table, SymbolTable::kCapacityOffset)); __ decl(mask); @@ -59,7 +59,7 @@ $OpenBSD: patch-v8_src_x64_code-stubs-x64_cc,v 1.1 2011/03/23 12:33:26 robert Ex // scratch: - // Perform a number of probes in the symbol table. -@@ -3846,7 +3848,7 @@ void StringHelper::GenerateTwoCharacterSymbolTableProb +@@ -4494,7 +4496,7 @@ void StringHelper::GenerateTwoCharacterSymbolTableProb } __ andl(scratch, mask); @@ -68,7 +68,7 @@ $OpenBSD: patch-v8_src_x64_code-stubs-x64_cc,v 1.1 2011/03/23 12:33:26 robert Ex Register candidate = scratch; // Scratch register contains candidate. STATIC_ASSERT(SymbolTable::kEntrySize == 1); __ movq(candidate, -@@ -3856,9 +3858,17 @@ void StringHelper::GenerateTwoCharacterSymbolTableProb +@@ -4504,9 +4506,17 @@ void StringHelper::GenerateTwoCharacterSymbolTableProb SymbolTable::kElementsStartOffset)); // If entry is undefined no string with this hash can be found. @@ -87,7 +87,7 @@ $OpenBSD: patch-v8_src_x64_code-stubs-x64_cc,v 1.1 2011/03/23 12:33:26 robert Ex // If length is not 2 the string is not a candidate. __ SmiCompare(FieldOperand(candidate, String::kLengthOffset), Smi::FromInt(2)); -@@ -3869,8 +3879,7 @@ void StringHelper::GenerateTwoCharacterSymbolTableProb +@@ -4517,8 +4527,7 @@ void StringHelper::GenerateTwoCharacterSymbolTableProb Register temp = kScratchRegister; // Check that the candidate is a non-external ascii string. diff --git a/www/chromium/patches/patch-v8_src_x64_codegen-x64_cc b/www/chromium/patches/patch-v8_src_x64_codegen-x64_cc index 0c51efdf8e6..cec96ec5104 100644 --- a/www/chromium/patches/patch-v8_src_x64_codegen-x64_cc +++ b/www/chromium/patches/patch-v8_src_x64_codegen-x64_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-v8_src_x64_codegen-x64_cc,v 1.1 2011/03/23 12:33:26 robert Exp $ ---- v8/src/x64/codegen-x64.cc.orig Thu Mar 17 09:44:50 2011 -+++ v8/src/x64/codegen-x64.cc Wed Mar 23 08:28:07 2011 +$OpenBSD: patch-v8_src_x64_codegen-x64_cc,v 1.2 2011/04/29 13:18:02 robert Exp $ +--- v8/src/x64/codegen-x64.cc.orig Tue Apr 26 10:22:52 2011 ++++ v8/src/x64/codegen-x64.cc Thu Apr 28 11:17:49 2011 @@ -760,7 +760,7 @@ void CodeGenerator::ToBoolean(ControlDestination* dest __ AbortIfNotNumber(value.reg()); } @@ -74,7 +74,7 @@ $OpenBSD: patch-v8_src_x64_codegen-x64_cc,v 1.1 2011/03/23 12:33:26 robert Exp $ __ j(equal, &adapted); // No arguments adaptor frame. Copy fixed number of arguments. -@@ -3850,7 +3849,7 @@ void CodeGenerator::VisitForInStatement(ForInStatement +@@ -3851,7 +3850,7 @@ void CodeGenerator::VisitForInStatement(ForInStatement __ movq(rbx, rax); // If the property has been removed while iterating, we just skip it. @@ -83,7 +83,7 @@ $OpenBSD: patch-v8_src_x64_codegen-x64_cc,v 1.1 2011/03/23 12:33:26 robert Exp $ node->continue_target()->Branch(equal); end_del_check.Bind(); -@@ -6182,15 +6181,15 @@ void CodeGenerator::GenerateIsConstructCall(ZoneListSplit(equal); } -@@ -6210,8 +6209,8 @@ void CodeGenerator::GenerateArgumentsLength(ZoneListBranch(not_zero); -@@ -6810,7 +6809,7 @@ void CodeGenerator::GenerateSwapElements(ZoneListBranch(not_equal); @@ -147,7 +147,7 @@ $OpenBSD: patch-v8_src_x64_codegen-x64_cc,v 1.1 2011/03/23 12:33:26 robert Exp $ // Get the elements array from the receiver and check that it is not a // dictionary. __ movq(tmp.reg(), -@@ -8518,6 +8511,14 @@ Result CodeGenerator::EmitKeyedStore(StaticType* key_t +@@ -8541,6 +8534,14 @@ Result CodeGenerator::EmitKeyedStore(StaticType* key_t __ cmpq(FieldOperand(tmp.reg(), HeapObject::kMapOffset), kScratchRegister); deferred->Branch(not_equal); diff --git a/www/chromium/patches/patch-v8_src_x64_full-codegen-x64_cc b/www/chromium/patches/patch-v8_src_x64_full-codegen-x64_cc index 172f72e5fa0..8ad81e4bc4a 100644 --- a/www/chromium/patches/patch-v8_src_x64_full-codegen-x64_cc +++ b/www/chromium/patches/patch-v8_src_x64_full-codegen-x64_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-v8_src_x64_full-codegen-x64_cc,v 1.1 2011/03/23 12:33:26 robert Exp $ ---- v8/src/x64/full-codegen-x64.cc.orig Thu Mar 17 09:44:50 2011 -+++ v8/src/x64/full-codegen-x64.cc Wed Mar 23 08:28:07 2011 -@@ -865,7 +865,7 @@ void FullCodeGenerator::VisitForInStatement(ForInState +$OpenBSD: patch-v8_src_x64_full-codegen-x64_cc,v 1.2 2011/04/29 13:18:02 robert Exp $ +--- v8/src/x64/full-codegen-x64.cc.orig Tue Apr 26 10:22:52 2011 ++++ v8/src/x64/full-codegen-x64.cc Thu Apr 28 11:17:49 2011 +@@ -991,7 +991,7 @@ void FullCodeGenerator::VisitForInStatement(ForInState __ push(rcx); // Enumerable. __ push(rbx); // Current entry. __ InvokeBuiltin(Builtins::FILTER_KEY, CALL_FUNCTION); @@ -10,7 +10,7 @@ $OpenBSD: patch-v8_src_x64_full-codegen-x64_cc,v 1.1 2011/03/23 12:33:26 robert __ j(equal, loop_statement.continue_target()); __ movq(rbx, rax); -@@ -2300,15 +2300,15 @@ void FullCodeGenerator::EmitIsConstructCall(ZoneListvalue() == 0) { testq(dst, dst); -@@ -837,20 +851,41 @@ void MacroAssembler::SmiCompare(Register dst, Smi* src +@@ -841,20 +855,41 @@ void MacroAssembler::SmiCompare(Register dst, Smi* src void MacroAssembler::SmiCompare(Register dst, const Operand& src) { @@ -90,7 +90,7 @@ $OpenBSD: patch-v8_src_x64_macro-assembler-x64_cc,v 1.1 2011/03/23 12:33:26 robe void MacroAssembler::SmiCompareInteger32(const Operand& dst, Register src) { cmpl(Operand(dst, kSmiShift / kBitsPerByte), src); } -@@ -1335,7 +1370,7 @@ void MacroAssembler::Move(const Operand& dst, Handle source) { if (source->IsSmi()) { @@ -99,7 +99,7 @@ $OpenBSD: patch-v8_src_x64_macro-assembler-x64_cc,v 1.1 2011/03/23 12:33:26 robe } else { Move(kScratchRegister, source); cmpq(dst, kScratchRegister); -@@ -1345,7 +1380,7 @@ void MacroAssembler::Cmp(Register dst, Handle +@@ -1349,7 +1384,7 @@ void MacroAssembler::Cmp(Register dst, Handle void MacroAssembler::Cmp(const Operand& dst, Handle source) { if (source->IsSmi()) { @@ -108,7 +108,7 @@ $OpenBSD: patch-v8_src_x64_macro-assembler-x64_cc,v 1.1 2011/03/23 12:33:26 robe } else { ASSERT(source->IsHeapObject()); movq(kScratchRegister, source, RelocInfo::EMBEDDED_OBJECT); -@@ -1692,7 +1727,12 @@ void MacroAssembler::AbortIfSmi(Register object) { +@@ -1719,7 +1754,12 @@ void MacroAssembler::AbortIfSmi(Register object) { void MacroAssembler::AbortIfNotSmi(Register object) { diff --git a/www/chromium/patches/patch-v8_src_x64_macro-assembler-x64_h b/www/chromium/patches/patch-v8_src_x64_macro-assembler-x64_h index 22e6760bb9f..db46e414f8f 100644 --- a/www/chromium/patches/patch-v8_src_x64_macro-assembler-x64_h +++ b/www/chromium/patches/patch-v8_src_x64_macro-assembler-x64_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-v8_src_x64_macro-assembler-x64_h,v 1.1 2011/03/23 12:33:26 robert Exp $ ---- v8/src/x64/macro-assembler-x64.h.orig Thu Mar 17 09:44:50 2011 -+++ v8/src/x64/macro-assembler-x64.h Wed Mar 23 08:28:07 2011 -@@ -256,8 +256,9 @@ class MacroAssembler: public Assembler { +$OpenBSD: patch-v8_src_x64_macro-assembler-x64_h,v 1.2 2011/04/29 13:18:02 robert Exp $ +--- v8/src/x64/macro-assembler-x64.h.orig Tue Apr 26 10:22:52 2011 ++++ v8/src/x64/macro-assembler-x64.h Thu Apr 28 11:17:49 2011 +@@ -263,8 +263,9 @@ class MacroAssembler: public Assembler { int power); @@ -13,7 +13,7 @@ $OpenBSD: patch-v8_src_x64_macro-assembler-x64_h,v 1.1 2011/03/23 12:33:26 rober void SmiCompare(Register dst, Smi* src); void SmiCompare(Register dst, const Operand& src); void SmiCompare(const Operand& dst, Register src); -@@ -579,6 +580,8 @@ class MacroAssembler: public Assembler { +@@ -594,6 +595,8 @@ class MacroAssembler: public Assembler { void Move(const Operand& dst, Handle source); void Cmp(Register dst, Handle source); void Cmp(const Operand& dst, Handle source); @@ -22,7 +22,7 @@ $OpenBSD: patch-v8_src_x64_macro-assembler-x64_h,v 1.1 2011/03/23 12:33:26 rober void Push(Handle source); // Emit code to discard a non-negative number of pointer-sized elements -@@ -646,6 +649,7 @@ class MacroAssembler: public Assembler { +@@ -667,6 +670,7 @@ class MacroAssembler: public Assembler { // Abort execution if argument is not a smi. Used in debug code. void AbortIfNotSmi(Register object); diff --git a/www/chromium/patches/patch-webkit_build_webkit_version_py b/www/chromium/patches/patch-webkit_build_webkit_version_py deleted file mode 100644 index 93989b3cfd6..00000000000 --- a/www/chromium/patches/patch-webkit_build_webkit_version_py +++ /dev/null @@ -1,38 +0,0 @@ -$OpenBSD: patch-webkit_build_webkit_version_py,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- webkit/build/webkit_version.py.orig Fri Mar 11 10:01:07 2011 -+++ webkit/build/webkit_version.py Mon Mar 14 13:30:11 2011 -@@ -45,21 +45,24 @@ def GetWebKitRevision(webkit_dir, version_file): - - # "svn info" tells us what we want, but third_party/WebKit does *not* - # point at the upstream repo. So instead we run svn info on the directory -- # containing the versioning file (which is some subdirectory of WebKit), -- # then strip that path back off of the resulting URL. -+ # containing the versioning file (which is some subdirectory of WebKit). - version_file_dir = os.path.dirname(version_file) - version_info = lastchange.FetchVersionInfo( - default_lastchange=None, - directory=os.path.join(webkit_dir, version_file_dir)) - -- # Now compute the real WebKit URL by stripping off the version file -- # directory from the URL we get out of version_info. -- # Further, we want to strip off the "http://svn..." from the left. -- # This is the root URL from the repository. -- assert version_info.url.startswith(version_info.root) -- assert version_info.url.endswith(version_file_dir) -- webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)] -- webkit_url = webkit_url.strip('/') -+ if (version_info.url.startswith(version_info.root) and -+ version_info.url.endswith(version_file_dir)): -+ # Now compute the real WebKit URL by stripping off the version file -+ # directory from the URL we get out of version_info. -+ # Further, we want to strip off the "http://svn..." from the left. -+ # This is the root URL from the repository. -+ webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)] -+ webkit_url = webkit_url.strip('/') -+ else: -+ # The data isn't as we expect: perhaps they're using git without svn? -+ # Just dump the output directly. -+ webkit_url = version_info.url - - return "%s@%s" % (webkit_url, version_info.revision) - diff --git a/www/chromium/patches/patch-webkit_glue_webkit_glue_h b/www/chromium/patches/patch-webkit_glue_webkit_glue_h index f9f72561b25..4c9c0d0a346 100644 --- a/www/chromium/patches/patch-webkit_glue_webkit_glue_h +++ b/www/chromium/patches/patch-webkit_glue_webkit_glue_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-webkit_glue_webkit_glue_h,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- webkit/glue/webkit_glue.h.orig Fri Mar 11 10:01:07 2011 -+++ webkit/glue/webkit_glue.h Mon Mar 14 10:55:38 2011 -@@ -288,7 +288,7 @@ bool LaunchSelLdr(const char* alleged_url, int socket_ +$OpenBSD: patch-webkit_glue_webkit_glue_h,v 1.3 2011/04/29 13:18:02 robert Exp $ +--- webkit/glue/webkit_glue.h.orig Tue Apr 26 10:01:07 2011 ++++ webkit/glue/webkit_glue.h Thu Apr 28 11:17:49 2011 +@@ -283,7 +283,7 @@ bool LaunchSelLdr(const char* alleged_url, int socket_ void* nacl_process_handle, int* nacl_process_id); #endif diff --git a/www/chromium/patches/patch-webkit_glue_webkitclient_impl_cc b/www/chromium/patches/patch-webkit_glue_webkitclient_impl_cc index 2d573ec3b73..e43841dd921 100644 --- a/www/chromium/patches/patch-webkit_glue_webkitclient_impl_cc +++ b/www/chromium/patches/patch-webkit_glue_webkitclient_impl_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-webkit_glue_webkitclient_impl_cc,v 1.3 2011/03/15 11:38:05 robert Exp $ ---- webkit/glue/webkitclient_impl.cc.orig Mon Mar 14 11:55:05 2011 -+++ webkit/glue/webkitclient_impl.cc Mon Mar 14 14:06:46 2011 -@@ -42,7 +42,7 @@ +$OpenBSD: patch-webkit_glue_webkitclient_impl_cc,v 1.4 2011/04/29 13:18:02 robert Exp $ +--- webkit/glue/webkitclient_impl.cc.orig Tue Apr 26 10:01:06 2011 ++++ webkit/glue/webkitclient_impl.cc Thu Apr 28 11:17:49 2011 +@@ -43,7 +43,7 @@ #include "webkit/glue/websocketstreamhandle_impl.h" #include "webkit/glue/weburlloader_impl.h" @@ -10,7 +10,7 @@ $OpenBSD: patch-webkit_glue_webkitclient_impl_cc,v 1.3 2011/03/15 11:38:05 rober #include "v8/include/v8.h" #endif -@@ -205,7 +205,7 @@ WebKitClientImpl::~WebKitClientImpl() { +@@ -206,7 +206,7 @@ WebKitClientImpl::~WebKitClientImpl() { } WebThemeEngine* WebKitClientImpl::themeEngine() { diff --git a/www/chromium/patches/patch-webkit_glue_webkitclient_impl_h b/www/chromium/patches/patch-webkit_glue_webkitclient_impl_h index 90c02cbb5a7..cd641bf368b 100644 --- a/www/chromium/patches/patch-webkit_glue_webkitclient_impl_h +++ b/www/chromium/patches/patch-webkit_glue_webkitclient_impl_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-webkit_glue_webkitclient_impl_h,v 1.2 2011/03/15 11:38:05 robert Exp $ ---- webkit/glue/webkitclient_impl.h.orig Mon Mar 14 11:55:38 2011 -+++ webkit/glue/webkitclient_impl.h Mon Mar 14 11:55:49 2011 +$OpenBSD: patch-webkit_glue_webkitclient_impl_h,v 1.3 2011/04/29 13:18:02 robert Exp $ +--- webkit/glue/webkitclient_impl.h.orig Tue Apr 26 10:01:07 2011 ++++ webkit/glue/webkitclient_impl.h Thu Apr 28 11:17:49 2011 @@ -10,7 +10,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h" #if defined(OS_WIN) @@ -10,7 +10,7 @@ $OpenBSD: patch-webkit_glue_webkitclient_impl_h,v 1.2 2011/03/15 11:38:05 robert #include "webkit/glue/webthemeengine_impl_linux.h" #elif defined(OS_MACOSX) #include "webkit/glue/webthemeengine_impl_mac.h" -@@ -91,7 +91,7 @@ class WebKitClientImpl : public WebKit::WebKitClient { +@@ -93,7 +93,7 @@ class WebKitClientImpl : public WebKit::WebKitClient { double shared_timer_fire_time_; int shared_timer_suspended_; // counter diff --git a/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc b/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc index 9f87ad0329b..66cb3447614 100644 --- a/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc +++ b/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc @@ -1,7 +1,16 @@ -$OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig Mon Mar 14 11:53:40 2011 -+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc Mon Mar 14 11:54:03 2011 -@@ -304,7 +304,7 @@ PluginInstance::PluginInstance(PluginDelegate* delegat +$OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.2 2011/04/29 13:18:02 robert Exp $ +--- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig Thu Apr 28 11:59:21 2011 ++++ webkit/plugins/ppapi/ppapi_plugin_instance.cc Thu Apr 28 11:59:52 2011 +@@ -64,7 +64,7 @@ + #include "printing/native_metafile_factory.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) + #include "printing/pdf_ps_metafile_cairo.h" + #endif + +@@ -328,7 +328,7 @@ PluginInstance::PluginInstance(PluginDelegate* delegat plugin_pdf_interface_(NULL), plugin_selection_interface_(NULL), plugin_zoom_interface_(NULL), @@ -10,7 +19,7 @@ $OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.1 2011/03/15 1 canvas_(NULL), #endif // defined(OS_LINUX) plugin_print_interface_(NULL), -@@ -335,7 +335,7 @@ PluginInstance::~PluginInstance() { +@@ -360,7 +360,7 @@ PluginInstance::~PluginInstance() { module_->InstanceDeleted(this); ResourceTracker::Get()->InstanceDeleted(pp_instance_); @@ -19,7 +28,7 @@ $OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.1 2011/03/15 1 ranges_.clear(); #endif // defined(OS_LINUX) } -@@ -844,7 +844,7 @@ int PluginInstance::PrintBegin(const gfx::Rect& printa +@@ -930,7 +930,7 @@ int PluginInstance::PrintBegin(const gfx::Rect& printa if (!num_pages) return 0; current_print_settings_ = print_settings; @@ -28,7 +37,7 @@ $OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.1 2011/03/15 1 canvas_ = NULL; ranges_.clear(); #endif // defined(OS_LINUX) -@@ -855,7 +855,7 @@ bool PluginInstance::PrintPage(int page_number, WebKit +@@ -941,7 +941,7 @@ bool PluginInstance::PrintPage(int page_number, WebKit DCHECK(plugin_print_interface_); PP_PrintPageNumberRange_Dev page_range; page_range.first_page_number = page_range.last_page_number = page_number; @@ -37,16 +46,16 @@ $OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc,v 1.1 2011/03/15 1 ranges_.push_back(page_range); canvas_ = canvas; return true; -@@ -886,7 +886,7 @@ bool PluginInstance::PrintPageHelper(PP_PrintPageNumbe - } - +@@ -976,7 +976,7 @@ bool PluginInstance::PrintPageHelper(PP_PrintPageNumbe void PluginInstance::PrintEnd() { + // Keep a reference on the stack. See NOTE above. + scoped_refptr ref(this); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_OPENBSD) // This hack is here because all pages need to be written to PDF at once. if (!ranges_.empty()) PrintPageHelper(&(ranges_.front()), ranges_.size(), canvas_); -@@ -977,7 +977,7 @@ bool PluginInstance::PrintPDFOutput(PP_Resource print_ +@@ -1079,7 +1079,7 @@ bool PluginInstance::PrintPDFOutput(PP_Resource print_ #endif // defined(OS_WIN) bool ret = false; diff --git a/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_h b/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_h index 750d395115b..27596d7ca83 100644 --- a/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_h +++ b/www/chromium/patches/patch-webkit_plugins_ppapi_ppapi_plugin_instance_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-webkit_plugins_ppapi_ppapi_plugin_instance_h,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- webkit/plugins/ppapi/ppapi_plugin_instance.h.orig Mon Mar 14 11:54:10 2011 -+++ webkit/plugins/ppapi/ppapi_plugin_instance.h Mon Mar 14 11:54:17 2011 -@@ -297,7 +297,7 @@ class PluginInstance : public base::RefCounted last_printed_page_; diff --git a/www/chromium/patches/patch-webkit_plugins_ppapi_ppb_file_system_impl_cc b/www/chromium/patches/patch-webkit_plugins_ppapi_ppb_file_system_impl_cc index e5e399b2cce..b188e25d25f 100644 --- a/www/chromium/patches/patch-webkit_plugins_ppapi_ppb_file_system_impl_cc +++ b/www/chromium/patches/patch-webkit_plugins_ppapi_ppb_file_system_impl_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-webkit_plugins_ppapi_ppb_file_system_impl_cc,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- webkit/plugins/ppapi/ppb_file_system_impl.cc.orig Mon Mar 14 11:52:20 2011 -+++ webkit/plugins/ppapi/ppb_file_system_impl.cc Mon Mar 14 11:52:32 2011 -@@ -37,7 +37,7 @@ PP_Resource Create(PP_Instance instance, PP_FileSystem +$OpenBSD: patch-webkit_plugins_ppapi_ppb_file_system_impl_cc,v 1.2 2011/04/29 13:18:02 robert Exp $ +--- webkit/plugins/ppapi/ppb_file_system_impl.cc.orig Tue Apr 26 10:01:06 2011 ++++ webkit/plugins/ppapi/ppb_file_system_impl.cc Thu Apr 28 11:17:49 2011 +@@ -49,7 +49,7 @@ PP_Bool IsFileSystem(PP_Resource resource) { } int32_t Open(PP_Resource file_system_id, diff --git a/www/chromium/patches/patch-webkit_plugins_ppapi_ppb_flash_impl_h b/www/chromium/patches/patch-webkit_plugins_ppapi_ppb_flash_impl_h index cf70078de88..b02fd460718 100644 --- a/www/chromium/patches/patch-webkit_plugins_ppapi_ppb_flash_impl_h +++ b/www/chromium/patches/patch-webkit_plugins_ppapi_ppb_flash_impl_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-webkit_plugins_ppapi_ppb_flash_impl_h,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- webkit/plugins/ppapi/ppb_flash_impl.h.orig Mon Mar 14 11:56:11 2011 -+++ webkit/plugins/ppapi/ppb_flash_impl.h Mon Mar 14 11:56:18 2011 -@@ -33,7 +33,7 @@ class PPB_Flash_Impl { +$OpenBSD: patch-webkit_plugins_ppapi_ppb_flash_impl_h,v 1.2 2011/04/29 13:18:02 robert Exp $ +--- webkit/plugins/ppapi/ppb_flash_impl.h.orig Tue Apr 26 10:01:06 2011 ++++ webkit/plugins/ppapi/ppb_flash_impl.h Thu Apr 28 11:17:49 2011 +@@ -30,7 +30,7 @@ class PPB_Flash_Impl { uint32_t glyph_count, const uint16_t glyph_indices[], const PP_Point glyph_advances[]) diff --git a/www/chromium/patches/patch-webkit_plugins_ppapi_ppb_pdf_impl_cc b/www/chromium/patches/patch-webkit_plugins_ppapi_ppb_pdf_impl_cc index a1e5f242b52..e9ede9a1487 100644 --- a/www/chromium/patches/patch-webkit_plugins_ppapi_ppb_pdf_impl_cc +++ b/www/chromium/patches/patch-webkit_plugins_ppapi_ppb_pdf_impl_cc @@ -1,6 +1,6 @@ -$OpenBSD: patch-webkit_plugins_ppapi_ppb_pdf_impl_cc,v 1.1 2011/03/15 11:38:05 robert Exp $ ---- webkit/plugins/ppapi/ppb_pdf_impl.cc.orig Mon Mar 14 11:54:25 2011 -+++ webkit/plugins/ppapi/ppb_pdf_impl.cc Mon Mar 14 11:54:37 2011 +$OpenBSD: patch-webkit_plugins_ppapi_ppb_pdf_impl_cc,v 1.2 2011/04/29 13:18:02 robert Exp $ +--- webkit/plugins/ppapi/ppb_pdf_impl.cc.orig Tue Apr 26 10:01:06 2011 ++++ webkit/plugins/ppapi/ppb_pdf_impl.cc Thu Apr 28 11:17:49 2011 @@ -25,7 +25,7 @@ namespace webkit { namespace ppapi { @@ -10,7 +10,7 @@ $OpenBSD: patch-webkit_plugins_ppapi_ppb_pdf_impl_cc,v 1.1 2011/03/15 11:38:05 r class PrivateFontFile : public Resource { public: PrivateFontFile(PluginInstance* instance, int fd) -@@ -145,7 +145,7 @@ PP_Resource GetFontFileWithFallback( +@@ -159,7 +159,7 @@ PP_Resource GetFontFileWithFallback( PP_Instance instance_id, const PP_FontDescription_Dev* description, PP_PrivateFontCharset charset) { @@ -19,7 +19,7 @@ $OpenBSD: patch-webkit_plugins_ppapi_ppb_pdf_impl_cc,v 1.1 2011/03/15 11:38:05 r PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id); if (!instance) return 0; -@@ -176,7 +176,7 @@ bool GetFontTableForPrivateFontFile(PP_Resource font_f +@@ -190,7 +190,7 @@ bool GetFontTableForPrivateFontFile(PP_Resource font_f uint32_t table, void* output, uint32_t* output_length) { @@ -28,7 +28,7 @@ $OpenBSD: patch-webkit_plugins_ppapi_ppb_pdf_impl_cc,v 1.1 2011/03/15 11:38:05 r scoped_refptr font( Resource::GetAs(font_file)); if (!font.get()) -@@ -301,7 +301,7 @@ const PPB_PDF* PPB_PDF_Impl::GetInterface() { +@@ -315,7 +315,7 @@ const PPB_PDF* PPB_PDF_Impl::GetInterface() { return &ppb_pdf; }