update to the latest stable version which is now 11.0.696.60

+ switch from using system sqlite to the bundled one because they have
  many modifications that are needed
+ add a new mirror for the distfile because the google one is utterly slow

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 \

www/chromium/distinfo

@@ -1,5 +1,5 @@
-MD5 (chromium-10.0.648.205.tar.bz2) = TsCPJxjUMDi4hIcDSpbI9Q==
+MD5 (chromium-11.0.696.60.tar.bz2) = G+ZVhy6KBi0lMrl3szPKww==
-RMD160 (chromium-10.0.648.205.tar.bz2) = 7Bjc8WLaKPWwDjpeaLNz7IkRBLI=
+RMD160 (chromium-11.0.696.60.tar.bz2) = HYfn3mrebB58t0+6HrTn8wUe+Xk=
-SHA1 (chromium-10.0.648.205.tar.bz2) = 0nrSUBG/jqnOYRqIZI6bAUqcZPA=
+SHA1 (chromium-11.0.696.60.tar.bz2) = jxZGuMSGThYtoLKQpZSJgh1m2EA=
-SHA256 (chromium-10.0.648.205.tar.bz2) = GicVjUX8ua+EhIh5dS4gr24ncVN56Gs3qIgb20+8e1U=
+SHA256 (chromium-11.0.696.60.tar.bz2) = JLfiY1o5ok8kmQMlpro7gEuFYdjfvIJjNG+oDS2xtHQ=
-SIZE (chromium-10.0.648.205.tar.bz2) = 144190502
+SIZE (chromium-11.0.696.60.tar.bz2) = 145250311

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 $
+$OpenBSD: patch-app_app_base_gypi,v 1.3 2011/04/29 13:18:01 robert Exp $
---- app/app_base.gypi.orig	Fri Mar 11 10:01:06 2011
+--- app/app_base.gypi.orig	Tue Apr 26 10:01:06 2011
-+++ app/app_base.gypi	Mon Mar 14 10:55:37 2011
++++ app/app_base.gypi	Thu Apr 28 11:17:48 2011
-@@ -232,7 +232,7 @@
+@@ -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',

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 $
+$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	Mon Mar 14 10:58:37 2011
+--- app/gfx/gl/gl_context_egl.cc.orig	Tue Apr 26 10:01:05 2011
-+++ app/gfx/gl/gl_context_egl.cc	Mon Mar 14 10:59:00 2011
++++ app/gfx/gl/gl_context_egl.cc	Thu Apr 28 11:17:48 2011
-@@ -4,7 +4,7 @@
+@@ -13,7 +13,7 @@
- 
+ // it brings in #defines that cause conflicts.
- #include <EGL/egl.h>
+ #include "app/gfx/gl/gl_bindings.h"
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_OPENBSD)

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 $
+$OpenBSD: patch-base_base_gyp,v 1.4 2011/04/29 13:18:01 robert Exp $
---- base/base.gyp.orig	Fri Mar 11 10:01:33 2011
+--- base/base.gyp.orig	Tue Apr 26 10:01:34 2011
-+++ base/base.gyp	Mon Mar 14 10:55:37 2011
++++ base/base.gyp	Thu Apr 28 11:17:48 2011
-@@ -238,6 +238,13 @@
+@@ -242,6 +242,13 @@
            ],
          }],
        ],

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 $
+$OpenBSD: patch-base_base_gypi,v 1.5 2011/04/29 13:18:01 robert Exp $
---- base/base.gypi.orig	Mon Mar 14 11:00:03 2011
+--- base/base.gypi.orig	Tue Apr 26 10:01:34 2011
-+++ base/base.gypi	Mon Mar 14 17:36:15 2011
++++ base/base.gypi	Thu Apr 28 11:17:48 2011
-@@ -159,6 +159,7 @@
+@@ -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"', {

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 $
+$OpenBSD: patch-base_logging_cc,v 1.3 2011/04/29 13:18:01 robert Exp $
---- base/logging.cc.orig	Fri Mar 11 10:01:33 2011
+--- base/logging.cc.orig	Tue Apr 26 10:01:34 2011
-+++ base/logging.cc	Mon Mar 14 10:55:37 2011
++++ base/logging.cc	Thu Apr 28 11:17:49 2011
-@@ -133,7 +133,7 @@ int32 CurrentThreadId() {
+@@ -128,7 +128,7 @@ int32 CurrentThreadId() {
    return mach_thread_self();
  #elif defined(OS_LINUX)
    return syscall(__NR_gettid);

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 $
+$OpenBSD: patch-base_logging_h,v 1.3 2011/04/29 13:18:01 robert Exp $
---- base/logging.h.orig	Fri Mar 11 10:01:33 2011
+--- base/logging.h.orig	Tue Apr 26 10:01:34 2011
-+++ base/logging.h	Mon Mar 14 10:55:37 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

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 $
+$OpenBSD: patch-base_process_util_h,v 1.5 2011/04/29 13:18:01 robert Exp $
---- base/process_util.h.orig	Fri Mar 11 10:01:33 2011
+--- base/process_util.h.orig	Thu Apr 28 11:18:26 2011
-+++ base/process_util.h	Wed Mar 16 09:41:54 2011
++++ base/process_util.h	Thu Apr 28 11:19:26 2011
 @@ -14,14 +14,16 @@
  #if defined(OS_WIN)
  #include <windows.h>
@@ -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 <dirent.h>
  #include <limits.h>
-@@ -161,7 +163,7 @@ void CloseProcessHandle(ProcessHandle process);
+@@ -439,7 +441,7 @@ class ProcessIterator {
- // 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 {
  #if defined(OS_WIN)
    HANDLE snapshot_;
    bool started_iteration_;

www/chromium/patches/patch-base_process_util_linux_cc

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

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 $
+$OpenBSD: patch-base_process_util_posix_cc,v 1.3 2011/04/29 13:18:01 robert Exp $
---- base/process_util_posix.cc.orig	Fri Mar 11 10:01:33 2011
+--- base/process_util_posix.cc.orig	Tue Apr 26 10:01:34 2011
-+++ base/process_util_posix.cc	Mon Mar 14 10:55:37 2011
++++ base/process_util_posix.cc	Thu Apr 28 11:17:49 2011
-@@ -102,11 +102,11 @@ int WaitpidWithTimeout(ProcessHandle handle, int64 wai
+@@ -103,11 +103,11 @@ int WaitpidWithTimeout(ProcessHandle handle, int64 wai
    return status;
  }
  

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 $
+$OpenBSD: patch-base_shared_memory_posix_cc,v 1.2 2011/04/29 13:18:01 robert Exp $
---- base/shared_memory_posix.cc.orig	Mon Mar 14 19:21:35 2011
+--- base/shared_memory_posix.cc.orig	Tue Apr 26 10:01:34 2011
-+++ base/shared_memory_posix.cc	Mon Mar 14 19:21:44 2011
++++ base/shared_memory_posix.cc	Thu Apr 28 11:17:49 2011
-@@ -149,7 +149,7 @@ bool SharedMemory::CreateNamed(const std::string& name
+@@ -150,7 +150,7 @@ bool SharedMemory::CreateNamed(const std::string& name
      created_size_ = size;
    }
    if (fp == NULL) {

www/chromium/patches/patch-base_string_util_posix_h

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

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 $
+$OpenBSD: patch-build_common_gypi,v 1.5 2011/04/29 13:18:01 robert Exp $
---- build/common.gypi.orig	Wed Apr 13 10:01:33 2011
+--- build/common.gypi.orig	Tue Apr 26 10:01:32 2011
-+++ build/common.gypi	Fri Apr 15 12:08:33 2011
++++ build/common.gypi	Thu Apr 28 11:17:49 2011
-@@ -92,7 +92,7 @@
+@@ -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%': '<!(python <(DEPTH)/build/compiler_version.py)',
          # Figure out the python architecture to decide if we build pyauto.
@@ -37,7 +37,7 @@ $OpenBSD: patch-build_common_gypi,v 1.4 2011/04/15 10:10:27 robert Exp $
          'conditions': [
            ['branding=="Chrome"', {
              'linux_breakpad%': 1,
-@@ -691,7 +691,7 @@
+@@ -752,7 +752,7 @@
                ['exclude', '(^|/)(gtk|x11)_[^/]*\\.(h|cc)$'],
              ],
            }],

www/chromium/patches/patch-build_features_override_gypi

@@ -1,7 +1,7 @@
-$OpenBSD: patch-build_features_override_gypi,v 1.2 2011/03/15 11:38:05 robert Exp $
+$OpenBSD: patch-build_features_override_gypi,v 1.3 2011/04/29 13:18:01 robert Exp $
---- build/features_override.gypi.orig	Fri Mar 11 10:01:31 2011
+--- build/features_override.gypi.orig	Tue Apr 26 10:01:32 2011
-+++ build/features_override.gypi	Mon Mar 14 10:55:37 2011
++++ build/features_override.gypi	Thu Apr 28 11:17:49 2011
-@@ -72,7 +72,7 @@
+@@ -80,7 +80,7 @@
      'enable_svg%': '<(enable_svg)',
      'enable_touch_events%': '<(enable_touch_events)',
      'conditions': [

www/chromium/patches/patch-chrome_app_generated_resources_grd

@@ -1,7 +1,7 @@
-$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.2 2011/03/15 11:38:05 robert Exp $
+$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.3 2011/04/29 13:18:01 robert Exp $
---- chrome/app/generated_resources.grd.orig	Mon Mar 14 14:24:28 2011
+--- chrome/app/generated_resources.grd.orig	Tue Apr 26 10:01:37 2011
-+++ chrome/app/generated_resources.grd	Mon Mar 14 16:46:42 2011
++++ chrome/app/generated_resources.grd	Thu Apr 28 11:17:49 2011
-@@ -935,7 +935,7 @@ each locale. -->
+@@ -973,7 +973,7 @@ Other platform defines such as use_titlecase are decla
            Preferences...
          </message>
        </if>
@@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_app_generated_resources_grd,v 1.2 2011/03/15 11:38:05 rob
          <message name="IDS_PREFERENCES" desc="The text label of the Preferences menu item.">
            Preferences
          </message>
-@@ -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
        <message name="IDS_OPTIONS_DIALOG_TITLE" desc="The title of the Options dialog box">
          <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> Options
        </message>
@@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_app_generated_resources_grd,v 1.2 2011/03/15 11:38:05 rob
          <message name="IDS_PREFERENCES_DIALOG_TITLE" desc="The title of the Preferences dialog box">
            <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> Preferences
          </message>
-@@ -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
          </message>
        </if>
  

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 $
+$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.3 2011/04/29 13:18:01 robert Exp $
---- chrome/browser/about_flags.cc.orig	Fri Mar 11 10:01:43 2011
+--- chrome/browser/about_flags.cc.orig	Tue Apr 26 10:01:44 2011
-+++ chrome/browser/about_flags.cc	Mon Mar 14 10:55:37 2011
++++ chrome/browser/about_flags.cc	Thu Apr 28 11:17:49 2011
-@@ -503,7 +503,7 @@ int GetCurrentPlatform() {
+@@ -542,7 +542,7 @@ int GetCurrentPlatform() {
    return kOsWin;
  #elif defined(OS_CHROMEOS)  // Needs to be before the OS_LINUX check.
    return kOsCrOS;

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 $
+$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	Mon Mar 14 11:04:14 2011
+--- chrome/browser/browser_about_handler.cc.orig	Thu Apr 28 11:20:53 2011
-+++ chrome/browser/browser_about_handler.cc	Mon Mar 14 11:05:03 2011
++++ chrome/browser/browser_about_handler.cc	Thu Apr 28 11:21:28 2011
-@@ -70,7 +70,7 @@
+@@ -71,7 +71,7 @@
- #include "chrome/browser/zygote_host_linux.h"
+ #include "chrome/browser/chromeos/login/wizard_controller.h"
- #elif defined(OS_MACOSX)
+ #include "chrome/browser/chromeos/version_loader.h"
- #include "chrome/browser/ui/cocoa/about_ipc_dialog.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("<!DOCTYPE HTML>\n");
-@@ -766,7 +766,7 @@ void AboutSource::StartDataRequest(const std::string& 
+@@ -863,7 +863,7 @@ void AboutSource::StartDataRequest(const std::string& 
-   } else if (path == kTermsPath) {
      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) {

www/chromium/patches/patch-chrome_browser_browser_child_process_host_cc

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

www/chromium/patches/patch-chrome_browser_file_path_watcher_file_path_watcher_stub_cc

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

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<int64>& history_ids(iter->history_id());
+-    for (RepeatedField<int64>::const_iterator jiter = history_ids.begin();
++    const RepeatedField<int64_t>& history_ids(iter->history_id());
++    for (RepeatedField<int64_t>::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;

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 $
+$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.4 2011/04/29 13:18:01 robert Exp $
---- chrome/browser/memory_details.cc.orig	Mon Mar 14 11:33:13 2011
+--- chrome/browser/memory_details.cc.orig	Thu Apr 28 11:26:31 2011
-+++ chrome/browser/memory_details.cc	Mon Mar 14 11:33:32 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 "content/browser/zygote_host_linux.h"
- #include "chrome/browser/renderer_host/render_sandbox_host_linux.h"
+ #include "content/browser/renderer_host/render_sandbox_host_linux.h"
  #endif
 @@ -109,7 +109,7 @@ void MemoryDetails::CollectChildInfoOnIOThread() {
  void MemoryDetails::CollectChildInfoOnUIThread() {

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 $
+$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	Fri Mar 11 10:01:39 2011
+--- chrome/browser/net/connection_tester.cc.orig	Tue Apr 26 10:01:41 2011
-+++ chrome/browser/net/connection_tester.cc	Mon Mar 14 10:55:37 2011
++++ chrome/browser/net/connection_tester.cc	Thu Apr 28 11:17:49 2011
-@@ -189,7 +189,7 @@ class ExperimentURLRequestContext : public net::URLReq
+@@ -200,7 +200,7 @@ class ExperimentURLRequestContext : public net::URLReq
    // Otherwise returns a network error code.
    int CreateSystemProxyConfigService(
        scoped_ptr<net::ProxyConfigService>* config_service) {

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 $
+$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	Fri Mar 11 10:01:42 2011
+--- 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	Mon Mar 14 10:55:37 2011
++++ chrome/browser/renderer_host/browser_render_process_host.cc	Thu Apr 28 11:17:49 2011
-@@ -886,7 +886,7 @@ TransportDIB* BrowserRenderProcessHost::MapTransportDI
+@@ -903,7 +903,7 @@ TransportDIB* BrowserRenderProcessHost::MapTransportDI
-   HANDLE section = app::win::GetSectionFromProcess(
+   HANDLE section = chrome::GetSectionFromProcess(
        dib_id.handle, GetHandle(), false /* read write */);
    return TransportDIB::Map(section);
 -#elif defined(OS_MACOSX)

www/chromium/patches/patch-chrome_browser_renderer_host_render_message_filter_cc

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

www/chromium/patches/patch-chrome_browser_renderer_host_render_widget_helper_cc

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

www/chromium/patches/patch-chrome_browser_renderer_host_render_widget_host_unittest_cc

@@ -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<RenderWidgetHostView> view(
-       RenderWidgetHostView::CreateViewForWidget(host_.get()));
-   host_->set_view(view.get());

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 $
+$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	Fri Mar 11 10:01:38 2011
+--- chrome/browser/sync/engine/syncer_thread.cc.orig	Tue Apr 26 10:01:40 2011
-+++ chrome/browser/sync/engine/syncer_thread.cc	Mon Mar 14 10:55:37 2011
++++ chrome/browser/sync/engine/syncer_thread.cc	Thu Apr 28 11:17:49 2011
-@@ -263,7 +263,7 @@ void SyncerThread::ThreadMainLoop() {
+@@ -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<int>(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

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 $
+$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	Mon Mar 14 11:37:38 2011
+--- chrome/browser/sync/engine/syncer_thread.h.orig	Tue Apr 26 10:01:40 2011
-+++ chrome/browser/sync/engine/syncer_thread.h	Mon Mar 14 11:37:51 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)

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 $
+$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	Fri Mar 11 10:01:39 2011
+--- 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	Mon Mar 14 10:55:37 2011
++++ chrome/browser/task_manager/task_manager_resource_providers.cc	Thu Apr 28 11:17:49 2011
-@@ -1240,7 +1240,7 @@ TaskManagerBrowserProcessResource::TaskManagerBrowserP
+@@ -1223,7 +1223,7 @@ TaskManagerBrowserProcessResource::TaskManagerBrowserP
        default_icon_ = IconUtil::CreateSkBitmapFromHICON(icon, icon_size);
      }
    }

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 $
+$OpenBSD: patch-chrome_browser_ui_browser_cc,v 1.3 2011/04/29 13:18:01 robert Exp $
---- chrome/browser/ui/browser.cc.orig	Fri Mar 11 10:01:42 2011
+--- chrome/browser/ui/browser.cc.orig	Tue Apr 26 10:01:43 2011
-+++ chrome/browser/ui/browser.cc	Mon Mar 14 10:55:37 2011
++++ chrome/browser/ui/browser.cc	Thu Apr 28 11:17:49 2011
-@@ -263,7 +263,7 @@ Browser::~Browser() {
+@@ -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() {

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 $
+$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 Mar 15 10:41:36 2011
+--- chrome/browser/ui/browser_list.cc.orig	Tue Apr 26 10:01:43 2011
-+++ chrome/browser/ui/browser_list.cc	Tue Mar 15 10:41:58 2011
++++ chrome/browser/ui/browser_list.cc	Thu Apr 28 11:17:49 2011
-@@ -430,7 +430,7 @@ void BrowserList::SessionEnding() {
+@@ -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);

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 $
+$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	Mon Mar 14 11:40:10 2011
+--- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig	Tue Apr 26 10:01:43 2011
-+++ chrome/browser/ui/toolbar/wrench_menu_model.cc	Mon Mar 14 11:40:49 2011
++++ chrome/browser/ui/toolbar/wrench_menu_model.cc	Thu Apr 28 11:17:49 2011
-@@ -37,7 +37,7 @@
+@@ -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 <gtk/gtk.h>
  #include "chrome/browser/ui/gtk/gtk_util.h"
  #endif
-@@ -355,7 +355,7 @@ void WrenchMenuModel::Build() {
+@@ -359,7 +359,7 @@ void WrenchMenuModel::Build() {
-                              IDS_NEW_INCOGNITO_WINDOW);
+ #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();

www/chromium/patches/patch-chrome_browser_ui_views_accessible_view_helper_cc

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

www/chromium/patches/patch-chrome_browser_ui_views_accessible_view_helper_h

@@ -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<views::View*> managed_views_;
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
-   scoped_ptr<AccessibleWidgetHelper> widget_helper_;
- #endif
- 

www/chromium/patches/patch-chrome_browser_ui_views_download_item_view_cc

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

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 $
+$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	Fri Mar 11 10:01:41 2011
+--- chrome/browser/ui/views/extensions/extension_popup.cc.orig	Thu Apr 28 11:34:16 2011
-+++ chrome/browser/ui/views/extensions/extension_popup.cc	Mon Mar 14 10:55:37 2011
++++ chrome/browser/ui/views/extensions/extension_popup.cc	Thu Apr 28 11:34:35 2011
-@@ -26,7 +26,7 @@
+@@ -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);
+   border_widget_ = new views::WidgetGtk(views::WidgetGtk::TYPE_WINDOW);
-     static_cast<views::WidgetGtk*>(border_widget_)->MakeTransparent();
+   static_cast<views::WidgetGtk*>(border_widget_)->MakeTransparent();
-     static_cast<views::WidgetGtk*>(border_widget_)->make_transient_to_parent();
+   static_cast<views::WidgetGtk*>(border_widget_)->make_transient_to_parent();

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 $
+$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	Fri Mar 11 10:01:42 2011
+--- chrome/browser/ui/views/find_bar_view.cc.orig	Tue Apr 26 10:01:43 2011
-+++ chrome/browser/ui/views/find_bar_view.cc	Mon Mar 14 10:55:37 2011
++++ chrome/browser/ui/views/find_bar_view.cc	Thu Apr 28 11:17:49 2011
-@@ -85,7 +85,7 @@ static const int kDefaultCharWidth = 43;
+@@ -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) {

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 $
+$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	Mon Mar 14 11:38:40 2011
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	Thu Apr 28 11:34:52 2011
-+++ chrome/browser/ui/views/frame/browser_view.cc	Mon Mar 14 11:39:30 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 <gtk/gtk.h>
  #endif
  
-@@ -87,7 +87,7 @@
+@@ -90,7 +90,7 @@
- #include "chrome/browser/aeropeek_manager.h"
  #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,
+   ui::MessageBox(GetNativeHandle(), message, title,
-                        MB_OK | MB_ICONWARNING | MB_TOPMOST);
+                  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)) {
+@@ -1320,7 +1320,7 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeW
-@@ -1302,7 +1302,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<views::WindowGtk*>(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.
  

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 $
+$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	Fri Mar 11 10:01:41 2011
+--- 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	Mon Mar 14 10:55:37 2011
++++ chrome/browser/ui/views/frame/browser_view_layout.cc	Thu Apr 28 11:17:49 2011
-@@ -21,7 +21,7 @@
+@@ -23,7 +23,7 @@
  #include "views/controls/single_split_view.h"
  #include "views/window/window.h"
  

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 $
+$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	Fri Mar 11 10:01:42 2011
+--- chrome/browser/ui/views/info_bubble.cc.orig	Tue Apr 26 10:01:43 2011
-+++ chrome/browser/ui/views/info_bubble.cc	Mon Mar 14 10:55:37 2011
++++ chrome/browser/ui/views/info_bubble.cc	Thu Apr 28 11:17:49 2011
-@@ -314,7 +314,7 @@ void InfoBubble::AnimationProgressed(const ui::Animati
+@@ -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();

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 $
+$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	Mon Mar 14 11:39:43 2011
+--- 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	Mon Mar 14 11:39:53 2011
++++ chrome/browser/ui/views/location_bar/location_bar_view.h	Thu Apr 28 11:17:49 2011
-@@ -25,7 +25,7 @@
+@@ -24,7 +24,7 @@
  
  #if defined(OS_WIN)
  #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"

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 $
+$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	Fri Mar 11 10:01:41 2011
+--- chrome/browser/ui/views/tabs/tab_strip.cc.orig	Tue Apr 26 10:01:43 2011
-+++ chrome/browser/ui/views/tabs/tab_strip.cc	Mon Mar 14 10:55:37 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)

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 $
+$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	Fri Mar 11 10:01:39 2011
+--- chrome/browser/web_applications/web_app.cc.orig	Tue Apr 26 10:01:40 2011
-+++ chrome/browser/web_applications/web_app.cc	Mon Mar 14 10:55:37 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 "content/browser/browser_thread.h"
- #include "chrome/common/web_apps.h"
+ #include "content/browser/tab_contents/tab_contents.h"
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_OPENBSD)

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 $
+$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.5 2011/04/29 13:18:01 robert Exp $
---- chrome/chrome_browser.gypi.orig	Mon Mar 14 11:43:18 2011
+--- chrome/chrome_browser.gypi.orig	Thu Apr 28 11:40:57 2011
-+++ chrome/chrome_browser.gypi	Mon Mar 14 17:47:54 2011
++++ chrome/chrome_browser.gypi	Thu Apr 28 11:42:34 2011
-@@ -3621,7 +3621,7 @@
+@@ -3455,7 +3455,7 @@
-             ['include', '^browser/chromeos/dom_ui/login/'],
+             ['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',
+@@ -4118,7 +4117,7 @@
-             '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 @@
                ],
              }],
              # GTK build only

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 $
+$OpenBSD: patch-chrome_chrome_gyp,v 1.4 2011/04/29 13:18:01 robert Exp $
---- chrome/chrome.gyp.orig	Fri Mar 11 10:01:58 2011
+--- chrome/chrome.gyp.orig	Tue Apr 26 10:01:59 2011
-+++ chrome/chrome.gyp	Mon Mar 14 10:55:37 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',
            ],
          }],

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 $
+$OpenBSD: patch-chrome_chrome_renderer_gypi,v 1.4 2011/04/29 13:18:01 robert Exp $
---- chrome/chrome_renderer.gypi.orig	Fri Mar 11 10:01:58 2011
+--- chrome/chrome_renderer.gypi.orig	Tue Apr 26 10:01:59 2011
-+++ chrome/chrome_renderer.gypi	Mon Mar 14 10:55:37 2011
++++ chrome/chrome_renderer.gypi	Thu Apr 28 11:17:49 2011
-@@ -295,6 +295,14 @@
+@@ -306,6 +306,14 @@
          }],
          # BSD-specific rules.
          ['OS=="openbsd" or OS=="freebsd"', {

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 $
+$OpenBSD: patch-chrome_common_chrome_paths_cc,v 1.3 2011/04/29 13:18:01 robert Exp $
---- chrome/common/chrome_paths.cc.orig	Fri Jan 21 10:20:41 2011
+--- chrome/common/chrome_paths.cc.orig	Tue Apr 26 10:01:59 2011
-+++ chrome/common/chrome_paths.cc	Sun Jan 23 23:27:33 2011
++++ chrome/common/chrome_paths.cc	Thu Apr 28 11:17:49 2011
-@@ -164,7 +164,7 @@ bool PathProvider(int key, FilePath* result) {
+@@ -185,7 +185,7 @@ bool PathProvider(int key, FilePath* result) {
        cur = cur.Append(FILE_PATH_LITERAL("inspector"));
        break;
      case chrome::DIR_APP_DICTIONARIES:

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 $
+$OpenBSD: patch-chrome_common_chrome_switches_cc,v 1.4 2011/04/29 13:18:01 robert Exp $
---- chrome/common/chrome_switches.cc.orig	Wed Apr 13 10:01:58 2011
+--- chrome/common/chrome_switches.cc.orig	Tue Apr 26 10:01:59 2011
-+++ chrome/common/chrome_switches.cc	Fri Apr 15 12:08:03 2011
++++ chrome/common/chrome_switches.cc	Thu Apr 28 11:17:49 2011
-@@ -1302,7 +1302,7 @@ const char kEnableMediaPlayer[]             = "enable-
+@@ -1174,7 +1174,7 @@ const char kEnableMediaPlayer[]             = "enable-
  const char kEnableAdvancedFileSystem[]      = "enable-advanced-fs";
  #endif
  

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 $
+$OpenBSD: patch-chrome_common_chrome_switches_h,v 1.4 2011/04/29 13:18:01 robert Exp $
---- chrome/common/chrome_switches.h.orig	Wed Apr 13 10:01:58 2011
+--- chrome/common/chrome_switches.h.orig	Tue Apr 26 10:01:59 2011
-+++ chrome/common/chrome_switches.h	Fri Apr 15 12:08:03 2011
++++ chrome/common/chrome_switches.h	Thu Apr 28 11:17:49 2011
-@@ -369,7 +369,7 @@ extern const char kEnableMediaPlayer[];
+@@ -332,7 +332,7 @@ extern const char kEnableMediaPlayer[];
  extern const char kEnableAdvancedFileSystem[];
  #endif
  

www/chromium/patches/patch-chrome_common_gpu_messages_internal_h

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

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 $
+$OpenBSD: patch-chrome_common_plugin_messages_cc,v 1.3 2011/04/29 13:18:01 robert Exp $
---- chrome/common/plugin_messages.cc.orig	Mon Mar 14 11:46:57 2011
+--- chrome/common/plugin_messages.cc.orig	Tue Apr 26 10:01:59 2011
-+++ chrome/common/plugin_messages.cc	Mon Mar 14 11:47:41 2011
++++ chrome/common/plugin_messages.cc	Thu Apr 28 11:17:49 2011
-@@ -56,7 +56,7 @@ NPVariant_Param::~NPVariant_Param() {
+@@ -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<PluginMsg_UpdateGeometry_Param>::Writ
+@@ -272,7 +272,7 @@ void ParamTraits<PluginMsg_UpdateGeometry_Param>::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<PluginMsg_UpdateGeometry_Param>::Read
+@@ -286,7 +286,7 @@ bool ParamTraits<PluginMsg_UpdateGeometry_Param>::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<PluginMsg_UpdateGeometry_Param>::Log(
+@@ -305,7 +305,7 @@ void ParamTraits<PluginMsg_UpdateGeometry_Param>::Log(
    LogParam(p.background_buffer, l);
    l->append(", ");
    LogParam(p.transparent, l);

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 $
+$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	Mon Mar 14 11:47:46 2011
+--- chrome/common/render_messages_internal.h.orig	Tue Apr 26 10:01:59 2011
-+++ chrome/common/render_messages_internal.h	Mon Mar 14 11:48:10 2011
++++ chrome/common/render_messages_internal.h	Thu Apr 28 11:17:49 2011
-@@ -2139,7 +2139,7 @@ IPC_MESSAGE_CONTROL2(ViewHostMsg_ExtensionRemoveListen
+@@ -1931,7 +1931,7 @@ IPC_MESSAGE_ROUTED3(ViewHostMsg_CommandStateChanged,
-                      std::string /* extension_id */,
+                     bool /* is_enabled */,
-                      std::string /* name */)
+                     int /* checked_state */)
  
 -#if defined(OS_MACOSX)
 +#if defined(OS_MACOSX) || defined(OS_OPENBSD)

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<MultiProcessLock> initializing_lock_;
+   scoped_ptr<MultiProcessLock> running_lock_;
+ #endif  // OS_LINUX

www/chromium/patches/patch-chrome_gpu_gpu_channel_cc

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

www/chromium/patches/patch-chrome_plugin_command_buffer_stub_h

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

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 $
+$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	Wed Mar 16 10:27:51 2011
+--- chrome/plugin/webplugin_delegate_stub.cc.orig	Tue Apr 26 10:01:44 2011
-+++ chrome/plugin/webplugin_delegate_stub.cc	Wed Mar 16 10:36:37 2011
++++ chrome/plugin/webplugin_delegate_stub.cc	Thu Apr 28 11:17:49 2011
-@@ -314,7 +314,7 @@ void WebPluginDelegateStub::OnUpdateGeometry(
+@@ -305,7 +305,7 @@ void WebPluginDelegateStub::OnUpdateGeometry(
        param.window_rect, param.clip_rect,
        param.windowless_buffer, param.background_buffer,
        param.transparent

www/chromium/patches/patch-chrome_renderer_mock_render_thread_cc

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

www/chromium/patches/patch-chrome_renderer_mock_render_thread_h

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

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 $
+$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 Mar 15 10:02:39 2011
+--- chrome/renderer/pepper_devices.cc.orig	Tue Apr 26 10:01:45 2011
-+++ chrome/renderer/pepper_devices.cc	Tue Mar 15 10:19:59 2011
++++ chrome/renderer/pepper_devices.cc	Thu Apr 28 11:17:49 2011
-@@ -52,7 +52,7 @@ NPError Graphics2DDeviceContext::Initialize(
+@@ -53,7 +53,7 @@ NPError Graphics2DDeviceContext::Initialize(
    uint32 buffer_size = width * height * kBytesPerPixel;
  
    // Allocate the transport DIB and the PlatformCanvas pointing to it.

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 $
+$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	Fri Mar 11 10:01:45 2011
+--- chrome/renderer/pepper_plugin_delegate_impl.cc.orig	Thu Apr 28 11:44:58 2011
-+++ chrome/renderer/pepper_plugin_delegate_impl.cc	Wed Mar 16 10:31:35 2011
++++ chrome/renderer/pepper_plugin_delegate_impl.cc	Thu Apr 28 11:45:20 2011
-@@ -48,7 +48,7 @@
+@@ -54,7 +54,7 @@
- #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
  #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<intptr_t>(dib_->handle());
@@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_renderer_pepper_plugin_delegate_impl_cc,v 1.2 2011/03/16
      return static_cast<intptr_t>(dib_->handle().fd);
  #elif defined(OS_LINUX)
      return static_cast<intptr_t>(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.

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 $
+$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	Fri Mar 11 10:01:44 2011
+--- chrome/renderer/render_process_impl.cc.orig	Tue Apr 26 10:01:45 2011
-+++ chrome/renderer/render_process_impl.cc	Mon Mar 14 10:55:37 2011
++++ chrome/renderer/render_process_impl.cc	Thu Apr 28 11:17:49 2011
-@@ -244,7 +244,7 @@ TransportDIB* RenderProcessImpl::CreateTransportDIB(si
+@@ -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());

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 $
+$OpenBSD: patch-chrome_renderer_render_thread_cc,v 1.4 2011/04/29 13:18:01 robert Exp $
---- chrome/renderer/render_thread.cc.orig	Fri Mar 11 10:01:44 2011
+--- chrome/renderer/render_thread.cc.orig	Tue Apr 26 10:01:45 2011
-+++ chrome/renderer/render_thread.cc	Mon Mar 14 10:55:37 2011
++++ chrome/renderer/render_thread.cc	Thu Apr 28 11:17:49 2011
-@@ -984,7 +984,7 @@ void RenderThread::EnsureWebKitInitialized() {
+@@ -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()) {
    }
  

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 $
+$OpenBSD: patch-chrome_renderer_render_view_h,v 1.4 2011/04/29 13:18:01 robert Exp $
---- chrome/renderer/render_view.h.orig	Fri Mar 11 10:01:45 2011
+--- chrome/renderer/render_view.h.orig	Tue Apr 26 10:01:45 2011
-+++ chrome/renderer/render_view.h	Mon Mar 14 10:55:37 2011
++++ chrome/renderer/render_view.h	Thu Apr 28 11:17:49 2011
-@@ -1112,7 +1112,7 @@ class RenderView : public RenderWidget,
+@@ -1079,7 +1079,7 @@ class RenderView : public RenderWidget,
    // periodic timer so we don't send too many messages.
    void SyncNavigationState();
  

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 $
+$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 Mar 15 10:02:13 2011
+--- chrome/renderer/render_widget.cc.orig	Tue Apr 26 10:01:45 2011
-+++ chrome/renderer/render_widget.cc	Tue Mar 15 10:02:27 2011
++++ chrome/renderer/render_widget.cc	Thu Apr 28 11:17:49 2011
-@@ -888,7 +888,7 @@ void RenderWidget::OnMsgPaintAtSize(const TransportDIB
+@@ -901,7 +901,7 @@ void RenderWidget::OnMsgPaintAtSize(const TransportDIB
        // Close our unused handle.
  #if defined(OS_WIN)
        ::CloseHandle(dib_handle);

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 $
+$OpenBSD: patch-chrome_renderer_renderer_glue_cc,v 1.3 2011/04/29 13:18:01 robert Exp $
---- chrome/renderer/renderer_glue.cc.orig	Fri Mar 11 10:01:45 2011
+--- chrome/renderer/renderer_glue.cc.orig	Tue Apr 26 10:01:45 2011
-+++ chrome/renderer/renderer_glue.cc	Mon Mar 14 10:55:37 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
  

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 $
+$OpenBSD: patch-chrome_renderer_renderer_main_cc,v 1.4 2011/04/29 13:18:01 robert Exp $
---- chrome/renderer/renderer_main.cc.orig	Fri Mar 11 10:01:45 2011
+--- chrome/renderer/renderer_main.cc.orig	Tue Apr 26 10:01:45 2011
-+++ chrome/renderer/renderer_main.cc	Mon Mar 14 10:55:37 2011
++++ chrome/renderer/renderer_main.cc	Thu Apr 28 11:17:49 2011
-@@ -272,7 +272,7 @@ int RendererMain(const MainFunctionParams& parameters)
+@@ -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";
      }

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 $
+$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	Fri Mar 11 10:01:44 2011
+--- chrome/renderer/renderer_webkitclient_impl.cc.orig	Tue Apr 26 10:01:45 2011
-+++ chrome/renderer/renderer_webkitclient_impl.cc	Mon Mar 14 10:55:37 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);
+       const WebKit::WebUChar* characters,
-   virtual void getRenderStyleForStrike(
+       size_t numCharacters,
-@@ -419,7 +419,7 @@ bool RendererWebKitClientImpl::SandboxSupport::ensureF
+@@ -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,

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 $
+$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	Fri Mar 11 10:01:44 2011
+--- chrome/renderer/webplugin_delegate_pepper.cc.orig	Tue Apr 26 10:01:45 2011
-+++ chrome/renderer/webplugin_delegate_pepper.cc	Mon Mar 14 10:55:37 2011
++++ chrome/renderer/webplugin_delegate_pepper.cc	Thu Apr 28 14:33:04 2011
 @@ -9,7 +9,7 @@
  #include <string>
  #include <vector>
@@ -10,16 +10,16 @@ $OpenBSD: patch-chrome_renderer_webplugin_delegate_pepper_cc,v 1.3 2011/03/15 11
  #include <unistd.h>
  #endif
  
-@@ -39,7 +39,7 @@
+@@ -53,7 +53,7 @@
- #include "chrome/renderer/pepper_widget.h"
+ #if defined(OS_MACOSX)
- #include "chrome/renderer/render_thread.h"
+ #include "base/mac/mac_util.h"
- #include "chrome/renderer/render_view.h"
+ #include "base/mac/scoped_cftyperef.h"
--#if defined(OS_LINUX)
+-#elif defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#elif defined(OS_LINUX) || defined(OS_OPENBSD)
  #include "chrome/renderer/renderer_sandbox_support_linux.h"
- #endif
+ #include "printing/pdf_ps_metafile_cairo.h"
- #include "chrome/renderer/webplugin_delegate_proxy.h"
+ #elif defined(OS_WIN)
-@@ -463,7 +463,7 @@ bool WebPluginDelegatePepper::SetCursor(NPCursorType t
+@@ -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<uint8_t*>(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)
-+#endif  // OS_LINUX || OS_OPENBSD
+@@ -852,7 +852,7 @@ bool WebPluginDelegatePepper::VectorPrintPage(int page
-   return num_pages;
- }
- 
-@@ -1198,7 +1198,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
+@@ -871,7 +871,7 @@ 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
      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)
-+#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
+@@ -1039,7 +1039,7 @@ WebPluginDelegatePepper::WebPluginDelegatePepper(
- }
+       plugin_(NULL),
- 
- WebPluginDelegatePepper::WebPluginDelegatePepper(
-@@ -1385,10 +1385,10 @@ WebPluginDelegatePepper::WebPluginDelegatePepper(
        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)
-+#endif  // OS_LINUX || OS_OPENBSD
- #if defined(ENABLE_GPU)
-       command_buffer_(NULL),
-       method_factory3d_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),

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 $
+$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	Fri Mar 11 10:01:45 2011
+--- chrome/renderer/webplugin_delegate_pepper.h.orig	Tue Apr 26 10:01:45 2011
-+++ chrome/renderer/webplugin_delegate_pepper.h	Mon Mar 14 10:55:37 2011
++++ chrome/renderer/webplugin_delegate_pepper.h	Thu Apr 28 11:17:49 2011
-@@ -310,7 +310,7 @@ class WebPluginDelegatePepper : public webkit::npapi::
+@@ -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 id of the current find operation, or -1 if none is in process.
-   // The command buffer used to issue commands to the nested GPU plugin.
+   int find_identifier_;

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 $
+$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	Mon Mar 14 19:30:50 2011
+--- chrome/renderer/webplugin_delegate_proxy.cc.orig	Tue Apr 26 10:01:45 2011
-+++ chrome/renderer/webplugin_delegate_proxy.cc	Mon Mar 14 19:39:56 2011
++++ chrome/renderer/webplugin_delegate_proxy.cc	Thu Apr 28 11:17:49 2011
-@@ -158,7 +158,7 @@ class ResourceClientProxy : public webkit::npapi::WebP
+@@ -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<TransportDIB>* memory,
      scoped_ptr<skia::PlatformCanvas>* canvas) {
    const size_t size = BitmapSizeForPluginRect(plugin_rect_);

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 $
+$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	Mon Mar 14 19:34:19 2011
+--- chrome/renderer/webplugin_delegate_proxy.h.orig	Tue Apr 26 10:01:45 2011
-+++ chrome/renderer/webplugin_delegate_proxy.h	Mon Mar 14 19:34:48 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();
  

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 $
+$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	Fri Mar 11 10:01:55 2011
+--- chrome/test/automation/automation_proxy_uitest.cc.orig	Tue Apr 26 10:01:56 2011
-+++ chrome/test/automation/automation_proxy_uitest.cc	Mon Mar 14 10:55:37 2011
++++ chrome/test/automation/automation_proxy_uitest.cc	Thu Apr 28 11:17:49 2011
-@@ -1376,7 +1376,7 @@ TEST_F(ExternalTabUITestPopupEnabled, MAYBE_UserGestur
+@@ -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<BrowserProxy> 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);
  }
  

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 $
+$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	Fri Mar 11 10:01:55 2011
+--- chrome/test/reliability/page_load_test.cc.orig	Tue Apr 26 10:01:56 2011
-+++ chrome/test/reliability/page_load_test.cc	Mon Mar 14 10:55:37 2011
++++ chrome/test/reliability/page_load_test.cc	Thu Apr 28 11:17:49 2011
-@@ -186,7 +186,7 @@ class PageLoadTest : public UITest {
+@@ -193,7 +193,7 @@ class PageLoadTest : public UITest {
      file_info.reset(
          FileVersionInfo::CreateFileVersionInfo(FilePath(kChromeDll)));
      last_change = WideToASCII(file_info->last_change());

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 $
+$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	Fri Mar 11 10:01:56 2011
+--- chrome/test/testing_browser_process.h.orig	Thu Apr 28 11:46:33 2011
-+++ chrome/test/testing_browser_process.h	Mon Mar 14 10:55:37 2011
++++ chrome/test/testing_browser_process.h	Thu Apr 28 11:46:40 2011
-@@ -57,7 +57,7 @@ class TestingBrowserProcess : public BrowserProcess {
+@@ -49,7 +49,7 @@ class TestingBrowserProcess : public BrowserProcess {
-     return NULL;
+ 
-   }
+   virtual IOThread* io_thread();
  
 -#if defined(OS_LINUX)
 +#if defined(USE_X11)
-   virtual base::Thread* background_x11_thread() {
+   virtual base::Thread* background_x11_thread();
-     return NULL;
+ #endif
-   }
+ 

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 $
+$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	Fri Mar 11 10:01:56 2011
+--- chrome/test/ui_test_utils.cc.orig	Tue Apr 26 10:01:57 2011
-+++ chrome/test/ui_test_utils.cc	Mon Mar 14 10:55:37 2011
++++ chrome/test/ui_test_utils.cc	Thu Apr 28 11:17:49 2011
-@@ -357,7 +357,7 @@ void RunMessageLoop() {
+@@ -364,7 +364,7 @@ void RunMessageLoop() {
  #if defined(TOOLKIT_VIEWS)
    views::AcceleratorHandler handler;
    loop->Run(&handler);

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
+ 

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 $
+$OpenBSD: patch-content_browser_child_process_launcher_cc,v 1.1 2011/04/29 13:18:01 robert Exp $
---- chrome/browser/child_process_launcher.cc.orig	Mon Mar 14 11:05:10 2011
+--- content/browser/child_process_launcher.cc.orig	Thu Apr 28 11:23:09 2011
-+++ chrome/browser/child_process_launcher.cc	Mon Mar 14 11:05:49 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),

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 $
+$OpenBSD: patch-content_browser_geolocation_empty_device_data_provider_cc,v 1.1 2011/04/29 13:18:01 robert Exp $
---- chrome/browser/geolocation/empty_device_data_provider.cc.orig	Mon Mar 14 17:38:51 2011
+--- content/browser/geolocation/empty_device_data_provider.cc.orig	Thu Apr 28 11:26:11 2011
-+++ chrome/browser/geolocation/empty_device_data_provider.cc	Mon Mar 14 17:39:02 2011
++++ content/browser/geolocation/empty_device_data_provider.cc	Thu Apr 28 11:26:23 2011
 @@ -12,7 +12,7 @@ RadioDataProviderImplBase* RadioDataProvider::DefaultF
  }
  

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 $
+$OpenBSD: patch-content_browser_renderer_host_mock_render_process_host_cc,v 1.1 2011/04/29 13:18:01 robert Exp $
---- chrome/browser/renderer_host/mock_render_process_host.cc.orig	Fri Jan 21 10:20:21 2011
+--- content/browser/renderer_host/mock_render_process_host.cc.orig	Thu Apr 28 11:27:05 2011
-+++ chrome/browser/renderer_host/mock_render_process_host.cc	Sun Jan 23 23:27:31 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);

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

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 $
+$OpenBSD: patch-content_browser_renderer_host_render_sandbox_host_linux_cc,v 1.1 2011/04/29 13:18:01 robert Exp $
---- chrome/browser/renderer_host/render_sandbox_host_linux.cc.orig	Fri Mar 11 10:01:42 2011
+--- content/browser/renderer_host/render_sandbox_host_linux.cc.orig	Thu Apr 28 11:28:33 2011
-+++ chrome/browser/renderer_host/render_sandbox_host_linux.cc	Mon Mar 14 10:55:37 2011
++++ content/browser/renderer_host/render_sandbox_host_linux.cc	Thu Apr 28 11:29:21 2011
-@@ -329,7 +329,7 @@ class SandboxIPCProcess  {
+@@ -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.

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_);
+ 

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 $
+$OpenBSD: patch-content_browser_renderer_host_render_widget_helper_h,v 1.1 2011/04/29 13:18:01 robert Exp $
---- chrome/browser/renderer_host/render_widget_helper.h.orig	Fri Mar 11 10:01:42 2011
+--- content/browser/renderer_host/render_widget_helper.h.orig	Thu Apr 28 11:30:04 2011
-+++ chrome/browser/renderer_host/render_widget_helper.h	Mon Mar 14 10:55:37 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
+@@ -131,7 +131,7 @@ class RenderWidgetHelper
-                                  WebKit::WebPopupType popup_type,
+                        int* route_id);
-                                  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);
  

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 $
+$OpenBSD: patch-content_browser_tab_contents_tab_contents_cc,v 1.1 2011/04/29 13:18:01 robert Exp $
---- chrome/browser/tab_contents/tab_contents.cc.orig	Fri Mar 11 10:01:42 2011
+--- content/browser/tab_contents/tab_contents.cc.orig	Thu Apr 28 11:30:45 2011
-+++ chrome/browser/tab_contents/tab_contents.cc	Mon Mar 14 10:55:37 2011
++++ content/browser/tab_contents/tab_contents.cc	Thu Apr 28 11:31:37 2011
-@@ -443,7 +443,7 @@ TabContents::TabContents(Profile* profile,
+@@ -301,7 +301,7 @@ TabContents::TabContents(Profile* profile,
-                  NotificationService::AllSources());
+ 
    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;
      }
  

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 $
+$OpenBSD: patch-content_browser_zygote_host_linux_cc,v 1.1 2011/04/29 13:18:01 robert Exp $
---- chrome/browser/zygote_host_linux.cc.orig	Fri Mar 11 10:01:43 2011
+--- content/browser/zygote_host_linux.cc.orig	Thu Apr 28 11:35:54 2011
-+++ chrome/browser/zygote_host_linux.cc	Mon Mar 14 10:55:37 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<int> fds_vec;
      const int kExpectedLength = sizeof(kZygoteMagic);
      char buf[kExpectedLength];
-@@ -179,6 +190,7 @@ void ZygoteHost::Init(const std::string& sandbox_cmd) 
+@@ -180,6 +191,7 @@ void ZygoteHost::Init(const std::string& sandbox_cmd) 
-       // Reap the sandbox.
        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_);

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 $
+$OpenBSD: patch-content_browser_zygote_host_linux_h,v 1.1 2011/04/29 13:18:01 robert Exp $
---- chrome/browser/zygote_host_linux.h.orig	Mon Mar 14 11:41:11 2011
+--- content/browser/zygote_host_linux.h.orig	Thu Apr 28 11:38:22 2011
-+++ chrome/browser/zygote_host_linux.h	Mon Mar 14 11:41:31 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
    };
  

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 $
+$OpenBSD: patch-content_browser_zygote_main_linux_cc,v 1.1 2011/04/29 13:18:01 robert Exp $
---- chrome/browser/zygote_main_linux.cc.orig	Mon Mar 14 11:41:37 2011
+--- content/browser/zygote_main_linux.cc.orig	Thu Apr 28 11:39:21 2011
-+++ chrome/browser/zygote_main_linux.cc	Mon Mar 14 11:43:12 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 <sys/socket.h>
  #include <sys/stat.h>
  #include <sys/types.h>
-@@ -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(

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

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', {

www/chromium/patches/patch-gfx_gfx_gyp

@@ -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 ' ] } ],
-       ],
-     },
-     {

www/chromium/patches/patch-gfx_scoped_image_h

@@ -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 <glib-object.h>
- #elif defined(OS_MACOSX)
- #include "base/mac/mac_util.h"
-@@ -116,7 +116,7 @@ class ScopedImage<NSImage> : 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<GdkPixbuf> : public gfx::internal::ScopedImage<GdkPixbuf> {
-  public:

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 $
+$OpenBSD: patch-gpu_gpu_gyp,v 1.4 2011/04/29 13:18:01 robert Exp $
---- gpu/gpu.gyp.orig	Fri Mar 11 10:01:07 2011
+--- gpu/gpu.gyp.orig	Tue Apr 26 10:01:07 2011
-+++ gpu/gpu.gyp	Mon Mar 14 10:55:37 2011
++++ gpu/gpu.gyp	Thu Apr 28 11:17:49 2011
-@@ -214,7 +214,7 @@
+@@ -213,7 +213,7 @@
          'command_buffer/service/texture_manager.cc',
        ],
        'conditions': [

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 $
+$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	Fri Jan 21 10:19:46 2011
+--- media/audio/openbsd/audio_manager_openbsd.cc.orig	Thu Apr 28 11:48:27 2011
-+++ media/audio/openbsd/audio_manager_openbsd.cc	Mon Jan 24 11:23:48 2011
++++ media/audio/openbsd/audio_manager_openbsd.cc	Thu Apr 28 11:49:20 2011
-@@ -4,21 +4,23 @@
+@@ -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();
- }
- 

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 $
+$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	Fri Mar 11 10:01:05 2011
+--- media/audio/openbsd/audio_manager_openbsd.h.orig	Tue Apr 26 10:01:05 2011
-+++ media/audio/openbsd/audio_manager_openbsd.h	Mon Mar 14 14:21:49 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();

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 $
+$OpenBSD: patch-media_ffmpeg_file_protocol_cc,v 1.3 2011/04/29 13:18:01 robert Exp $
---- media/ffmpeg/file_protocol.cc.orig	Fri Jan 21 10:19:46 2011
+--- media/ffmpeg/file_protocol.cc.orig	Tue Apr 26 10:01:05 2011
-+++ media/ffmpeg/file_protocol.cc	Mon Jan 24 11:24:49 2011
++++ media/ffmpeg/file_protocol.cc	Thu Apr 28 19:02:41 2011
-@@ -58,7 +58,7 @@ int WriteContext(URLContext* h, unsigned char* buf, in
+@@ -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) {
+-static int64 SeekContext(URLContext* h, int64 offset, int whence) {
-+int64_t SeekContext(URLContext* h, int64_t 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

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 $
+$OpenBSD: patch-media_filters_ffmpeg_glue_cc,v 1.3 2011/04/29 13:18:01 robert Exp $
---- media/filters/ffmpeg_glue.cc.orig	Mon Jan 24 00:09:31 2011
+--- media/filters/ffmpeg_glue.cc.orig	Tue Apr 26 10:01:05 2011
-+++ media/filters/ffmpeg_glue.cc	Mon Jan 24 11:25:42 2011
++++ media/filters/ffmpeg_glue.cc	Thu Apr 28 19:03:53 2011
-@@ -43,7 +43,7 @@ int WriteContext(URLContext* h, unsigned char* buf, in
+@@ -44,7 +44,7 @@ static int WriteContext(URLContext* h, unsigned char* 
    return AVERROR_IO;
  }
  
--int64 SeekContext(URLContext* h, int64 offset, int whence) {
+-static int64 SeekContext(URLContext* h, int64 offset, int whence) {
-+int64_t SeekContext(URLContext* h, int64_t offset, int whence) {
++static int64_t SeekContext(URLContext* h, int64_t offset, int whence) {
-   media::FFmpegURLProtocol* protocol = ToProtocol(h->priv_data);
+   FFmpegURLProtocol* protocol = ToProtocol(h->priv_data);
    int64 new_offset = AVERROR_IO;
    switch (whence) {

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 $
+$OpenBSD: patch-media_media_gyp,v 1.4 2011/04/29 13:18:01 robert Exp $
---- media/media.gyp.orig	Fri Mar 11 10:01:05 2011
+--- media/media.gyp.orig	Tue Apr 26 10:01:05 2011
-+++ media/media.gyp	Mon Mar 14 10:55:37 2011
++++ media/media.gyp	Thu Apr 28 11:17:49 2011
-@@ -175,6 +175,9 @@
+@@ -177,6 +177,9 @@
            'link_settings': {
              'libraries': [
                '-lasound',

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 $
+$OpenBSD: patch-native_client_build_common_gypi,v 1.3 2011/04/29 13:18:01 robert Exp $
---- native_client/build/common.gypi.orig	Fri Jan 21 10:20:49 2011
+--- native_client/build/common.gypi.orig	Tue Apr 26 10:14:23 2011
-+++ native_client/build/common.gypi	Sun Jan 23 23:27:35 2011
++++ native_client/build/common.gypi	Thu Apr 28 11:17:49 2011
-@@ -375,7 +375,7 @@
+@@ -358,7 +358,7 @@
      },
    },
    'conditions': [

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 $
+$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	Fri Mar 11 10:01:15 2011
+--- net/base/host_resolver_impl.cc.orig	Tue Apr 26 10:01:16 2011
-+++ net/base/host_resolver_impl.cc	Mon Mar 14 10:55:37 2011
++++ net/base/host_resolver_impl.cc	Thu Apr 28 11:17:49 2011
-@@ -199,13 +199,11 @@ class JobCreationParameters : public NetLog::EventPara
+@@ -201,13 +201,11 @@ class JobCreationParameters : public NetLog::EventPara
  std::vector<int> 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();
    }