On behalf of the Chromium team, present version 11.0.696.57 (new stable version)

Patch updates from:	George Liaskos
Security:	6887828f-0229-11e0-b84d-00262d5ed8ee

www/chromium/Makefile

@@ -7,8 +7,7 @@
 
 PORTNAME=	chromium
 DISTVERSIONPREFIX=	courgette-redacted-
-DISTVERSION=	10.0.648.205
+DISTVERSION=	11.0.696.57
-PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.goodking.org/downloads/ \
 		ftp://rene-ladan.nl/pub/distfiles/ \
@@ -32,7 +31,8 @@ LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		asound.2:${PORTSDIR}/audio/alsa-lib \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		nss3.1:${PORTSDIR}/security/nss \
-		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
+		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
+		ibus.2:${PORTSDIR}/textproc/ibus
 
 RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \
 		${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/droid-fonts-ttf

www/chromium/distinfo

@@ -1,2 +1,2 @@
-SHA256 (chromium-courgette-redacted-10.0.648.205.tar.xz) = f29e33a2ebd7447db622186a42923216ccc493e16420bcd456fcf2fc044e32e9
+SHA256 (chromium-courgette-redacted-11.0.696.57.tar.xz) = c269ecfd398d9a3bff6ea9af514e6090a50844ed9ce8e35a3045d4bc46621769
-SIZE (chromium-courgette-redacted-10.0.648.205.tar.xz) = 113637616
+SIZE (chromium-courgette-redacted-11.0.696.57.tar.xz) = 115117312

www/chromium/files/patch-app__app_base.gypi

@@ -1,15 +1,14 @@
---- app/app_base.gypi.orig	2011-04-13 10:01:07.000000000 +0200
+--- app/app_base.gypi.orig	2011-04-21 23:19:08.067560122 +0300
-+++ app/app_base.gypi	2011-04-17 22:15:49.000000000 +0200
++++ app/app_base.gypi	2011-04-21 23:19:47.444560550 +0300
-@@ -232,7 +232,7 @@
+@@ -234,6 +234,7 @@
-         'surface/io_surface_support_mac.cc',
          'surface/io_surface_support_mac.h',
          'surface/transport_dib.h',
--        'surface/transport_dib_linux.cc',
+         'surface/transport_dib_linux.cc',
 +        'surface/transport_dib_freebsd.cc',
          'surface/transport_dib_mac.cc',
          'surface/transport_dib_win.cc',
          'win/iat_patch_function.cc',
-@@ -335,7 +335,7 @@
+@@ -334,7 +335,7 @@
              ['exclude', '^win/*'],
            ],
          }],
@@ -18,7 +17,7 @@
            'sources': [
              'gfx/gl/gl_context_egl.cc',
              'gfx/gl/gl_context_egl.h',
-@@ -363,7 +363,6 @@
+@@ -362,11 +363,15 @@
              'link_settings': {
                'libraries': [
                  '-lX11',
@@ -26,3 +25,12 @@
                ],
              },
            },
+         }],
++        ['OS=="freebsd" or OS=="openbsd"', {
++          'sources!': [
++            'surface/transport_dib_linux.cc',
++          ]
++        }],
+         ['OS=="mac"', {
+           'link_settings': {
+             'libraries': [

www/chromium/files/patch-app__gfx__gl__gl_context_egl.cc

@@ -1,20 +1,20 @@
---- app/gfx/gl/gl_context_egl.cc.orig	2011-01-26 10:30:13.000000000 +0100
+--- app/gfx/gl/gl_context_egl.cc.orig	2011-04-16 11:01:07.000000000 +0300
-+++ app/gfx/gl/gl_context_egl.cc	2011-01-30 13:55:55.000000000 +0100
++++ app/gfx/gl/gl_context_egl.cc	2011-04-25 21:52:13.940147280 +0300
-@@ -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_FREEBSD)
  extern "C" {
  #include <X11/Xlib.h>
  }
-@@ -82,7 +82,7 @@
+@@ -85,7 +85,7 @@
    if (initialized)
      return true;
  
 -#ifdef OS_LINUX
-+#ifdef OS_LINUX || defined(OS_FREEBSD)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
    EGLNativeDisplayType native_display = XOpenDisplay(NULL);
  #else
    EGLNativeDisplayType native_display = EGL_DEFAULT_DISPLAY;

www/chromium/files/patch-base__logging.h

@@ -1,39 +0,0 @@
---- ./base/logging.h.orig	2010-12-16 02:11:49.000000000 +0100
-+++ ./base/logging.h	2010-12-20 20:15:08.000000000 +0100
-@@ -141,6 +141,18 @@
- // There is also the special severity of DFATAL, which logs FATAL in
- // debug mode, ERROR in normal mode.
- 
-+// XXX better comment -- must be before we use << and in global namespace
-+// These functions are provided as a convenience for logging, which is where we
-+// use streams (it is against Google style to use streams in other places). It
-+// is designed to allow you to emit non-ASCII Unicode strings to the log file,
-+// which is normally ASCII. It is relatively slow, so try not to use it for
-+// common cases. Non-ASCII characters will be converted to UTF-8 by these
-+// operators.
-+std::ostream& operator<<(std::ostream& out, const wchar_t* wstr);
-+inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
-+  return out << wstr.c_str();
-+}
-+
- namespace logging {
- 
- // Where to record logging output? A flat file and/or system debug log via
-@@ -857,17 +869,6 @@
- 
- }  // namespace logging
- 
--// These functions are provided as a convenience for logging, which is where we
--// use streams (it is against Google style to use streams in other places). It
--// is designed to allow you to emit non-ASCII Unicode strings to the log file,
--// which is normally ASCII. It is relatively slow, so try not to use it for
--// common cases. Non-ASCII characters will be converted to UTF-8 by these
--// operators.
--std::ostream& operator<<(std::ostream& out, const wchar_t* wstr);
--inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
--  return out << wstr.c_str();
--}
--
- // The NOTIMPLEMENTED() macro annotates codepaths which have
- // not been implemented yet.
- //

www/chromium/files/patch-base__process_util.h

@@ -1,12 +1,12 @@
---- base/process_util.h.orig	2011-03-21 07:38:40.133112029 +0200
+--- base/process_util.h.orig	2011-04-15 11:01:37.000000000 +0300
-+++ base/process_util.h	2011-03-21 07:51:24.970111144 +0200
++++ base/process_util.h	2011-04-15 21:36:54.331640613 +0300
 @@ -28,6 +28,10 @@
  #include <sys/types.h>
  #endif
  
 +#if defined(OS_FREEBSD)
 +struct kinfo_proc;
-+#endif
++#endif  /* defined(OS_FREEBSD) */
 +
  #include <list>
  #include <string>
@@ -17,20 +17,26 @@
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_FREEBSD)
- // Returns the ID for the parent of the given process.
+ // Returns the path to the executable of the given process.
- ProcessId GetParentProcessId(ProcessHandle process);
+ FilePath GetProcessExecutablePath(ProcessHandle process);
  
-@@ -172,7 +176,9 @@
+@@ -170,13 +174,14 @@
- // CPU-related ticks.  Returns -1 on parse error.
  // Exposed for testing.
  int ParseProcStatCPU(const std::string& input);
-+#endif
  
-+#if defined(OS_LINUX)
++#elif 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 +445,7 @@
+ // certain process types over others. The range for the adjustment is
+ // [-17,15], with [0,15] being user accessible.
+ bool AdjustOOMScore(ProcessId process, int score);
+-#endif
++#endif  /* defined(OS_LINUX) || defined(OS_FREEBSD) */
+ 
+ #if defined(OS_POSIX)
+ // Returns the ID for the parent of the given process.
+@@ -439,7 +444,7 @@
  #if defined(OS_WIN)
    HANDLE snapshot_;
    bool started_iteration_;

www/chromium/files/patch-chrome__app__chrome_exe_main_gtk.cc

@@ -1,5 +1,5 @@
---- ./chrome/app/chrome_exe_main_gtk.cc.orig	2010-12-16 02:11:51.000000000 +0100
+--- chrome/app/chrome_exe_main_gtk.cc.orig	2011-04-16 11:01:37.000000000 +0300
-+++ ./chrome/app/chrome_exe_main_gtk.cc	2010-12-20 20:15:08.000000000 +0100
++++ chrome/app/chrome_exe_main_gtk.cc	2011-04-25 20:11:07.659145645 +0300
 @@ -3,7 +3,7 @@
  // found in the LICENSE file.
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/first_run/first_run.h"
  #endif
  
-@@ -19,11 +19,11 @@
+@@ -19,16 +19,18 @@
  extern "C" {
  int ChromeMain(int argc, const char** argv);
  
@@ -23,7 +23,14 @@
  }
  
  int main(int argc, const char** argv) {
-@@ -36,7 +36,7 @@
+   base::EnableTerminationOnHeapCorruption();
++#if !defined(OS_FREEBSD)
+   base::EnableTerminationOnOutOfMemory();
++#endif
+ 
+   // NOTE(willchan): One might ask why this call is done here rather than in
+   // process_util_linux.cc with the definition of
+@@ -36,7 +38,7 @@
    // dependency on TCMalloc.  Really, we ought to have our allocator shim code
    // implement this EnableTerminationOnOutOfMemory() function.  Whateverz.  This
    // works for now.

www/chromium/files/patch-chrome__browser__browser_about_handler.cc

@@ -1,24 +1,24 @@
---- chrome/browser/browser_about_handler.cc.orig	2011-01-06 10:01:46.000000000 +0100
+--- chrome/browser/browser_about_handler.cc.orig	2011-04-15 11:01:47.000000000 +0300
-+++ chrome/browser/browser_about_handler.cc	2011-01-09 20:16:04.000000000 +0100
++++ chrome/browser/browser_about_handler.cc	2011-04-15 21:51:24.189641560 +0300
-@@ -74,7 +74,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_FREEBSD)
- #include "chrome/browser/zygote_host_linux.h"
+ #include "content/browser/zygote_host_linux.h"
  #endif
  
-@@ -127,7 +127,7 @@
+@@ -126,7 +126,7 @@
- const char kNetInternalsPath[] = "net-internals";
  const char kPluginsPath[] = "plugins";
+ const char kSyncInternalsPath[] = "sync-internals";
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_FREEBSD)
  const char kLinuxProxyConfigPath[] = "linux-proxy-config";
  const char kSandboxPath[] = "sandbox";
  #endif
-@@ -159,7 +159,7 @@
+@@ -160,7 +160,7 @@
    kTcmallocPath,
    kTermsPath,
    kVersionPath,
@@ -27,7 +27,7 @@
    kSandboxPath,
  #endif
  #if defined(OS_CHROMEOS)
-@@ -549,7 +549,7 @@
+@@ -648,7 +648,7 @@
    return data;
  }
  
@@ -36,10 +36,10 @@
  std::string AboutLinuxProxyConfig() {
    std::string data;
    data.append("<!DOCTYPE HTML>\n");
-@@ -796,7 +796,7 @@
+@@ -863,7 +863,7 @@
-   } else if (path == kTermsPath) {
      response = ResourceBundle::GetSharedInstance().GetRawDataResource(
          IDR_TERMS_HTML).as_string();
+ #endif
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_FREEBSD)
    } else if (path == kLinuxProxyConfigPath) {

www/chromium/files/patch-chrome__browser__file_path_watcher__file_path_watcher_stub.cc

@@ -1,11 +0,0 @@
---- chrome/browser/file_path_watcher/file_path_watcher_stub.cc.orig	2011-03-20 22:02:04.296736175 +0200
-+++ chrome/browser/file_path_watcher/file_path_watcher_stub.cc	2011-03-20 22:02:04.454738659 +0200
-@@ -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/files/patch-chrome__browser__memory_details.cc

@@ -1,15 +1,15 @@
---- ./chrome/browser/memory_details.cc.orig	2010-12-16 02:11:58.000000000 +0100
+--- chrome/browser/memory_details.cc.orig	2011-04-15 11:01:47.000000000 +0300
-+++ ./chrome/browser/memory_details.cc	2010-12-20 20:15:08.000000000 +0100
++++ chrome/browser/memory_details.cc	2011-04-15 22:31:00.350640234 +0300
-@@ -19,7 +19,7 @@
+@@ -25,7 +25,7 @@
- #include "chrome/common/url_constants.h"
+ #include "grit/generated_resources.h"
- #include "grit/chromium_strings.h"
+ #include "ui/base/l10n/l10n_util.h"
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_FREEBSD)
- #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
-@@ -101,7 +101,7 @@
+@@ -109,7 +109,7 @@
  void MemoryDetails::CollectChildInfoOnUIThread() {
    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
  
@@ -18,7 +18,7 @@
    const pid_t zygote_pid = ZygoteHost::GetInstance()->pid();
    const pid_t sandbox_helper_pid = RenderSandboxHostLinux::GetInstance()->pid();
  #endif
-@@ -179,7 +179,7 @@
+@@ -236,7 +236,7 @@
        }
      }
  

www/chromium/files/patch-chrome__browser__renderer_host__render_sandbox_host_linux.cc

@@ -1,15 +0,0 @@
---- ./chrome/browser/renderer_host/render_sandbox_host_linux.cc.orig	2010-12-16 02:11:57.000000000 +0100
-+++ ./chrome/browser/renderer_host/render_sandbox_host_linux.cc	2010-12-20 20:15:08.000000000 +0100
-@@ -660,7 +660,12 @@
-   // 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.
-+#if defined(OS_FREEBSD)
-+  if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds) != 0)
-+    CHECK(socketpair(AF_UNIX, SOCK_DGRAM, 0, fds) == 0);
-+#else
-   CHECK(socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds) == 0);
-+#endif
- 
-   renderer_socket_ = fds[0];
-   const int browser_socket = fds[1];

www/chromium/files/patch-chrome__browser__ui__views__accessible_view_helper.cc

@@ -1,11 +0,0 @@
---- ./chrome/browser/ui/views/accessible_view_helper.cc.orig	2010-12-16 02:11:56.000000000 +0100
-+++ ./chrome/browser/ui/views/accessible_view_helper.cc	2010-12-20 20:15:08.000000000 +0100
-@@ -21,7 +21,7 @@
-   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/files/patch-chrome__browser__ui__views__accessible_view_helper.h

@@ -1,20 +0,0 @@
---- chrome/browser/ui/views/accessible_view_helper.h.orig	2011-01-26 10:30:51.000000000 +0100
-+++ chrome/browser/ui/views/accessible_view_helper.h	2011-01-30 14:03:17.000000000 +0100
-@@ -15,7 +15,7 @@
- #include "chrome/browser/accessibility_events.h"
- #include "gfx/native_widget_types.h"
- 
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- #include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h"
- #endif
- 
-@@ -73,7 +73,7 @@
-   std::string window_title_;
-   std::vector<views::View*> managed_views_;
- 
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
-   scoped_ptr<AccessibleWidgetHelper> widget_helper_;
- #endif
- 

www/chromium/files/patch-chrome__browser__ui__views__download_item_view.cc

@@ -1,20 +1,20 @@
---- ./chrome/browser/ui/views/download_item_view.cc.orig	2010-12-16 02:11:56.000000000 +0100
+--- chrome/browser/ui/views/download_item_view.cc.orig	2011-04-15 11:01:46.000000000 +0300
-+++ ./chrome/browser/ui/views/download_item_view.cc	2010-12-20 20:15:08.000000000 +0100
++++ chrome/browser/ui/views/download_item_view.cc	2011-04-15 22:56:06.858645022 +0300
-@@ -259,7 +259,7 @@
+@@ -261,7 +261,7 @@
  
      // Extract the file extension (if any).
      FilePath filename(download->target_name());
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_FREEBSD)
-     std::wstring extension = base::SysNativeMBToWide(filename.Extension());
+     string16 extension = WideToUTF16(base::SysNativeMBToWide(
+         filename.Extension()));
  #else
-     std::wstring extension = filename.Extension();
+@@ -271,7 +271,7 @@
-@@ -268,7 +268,7 @@
      // Remove leading '.'
      if (extension.length() > 0)
        extension = extension.substr(1);
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_FREEBSD)
-     std::wstring rootname =
+     string16 rootname = WideToUTF16(base::SysNativeMBToWide(
-         base::SysNativeMBToWide(filename.RemoveExtension().value());
+         filename.RemoveExtension().value()));
  #else

www/chromium/files/patch-chrome__browser__ui__views__extensions__extension_popup.cc

@@ -1,17 +1,23 @@
---- ./chrome/browser/ui/views/extensions/extension_popup.cc.orig	2010-12-16 02:11:56.000000000 +0100
+--- chrome/browser/ui/views/extensions/extension_popup.cc.orig	2011-04-15 11:01:45.000000000 +0300
-+++ ./chrome/browser/ui/views/extensions/extension_popup.cc	2010-12-20 20:15:08.000000000 +0100
++++ chrome/browser/ui/views/extensions/extension_popup.cc	2011-04-15 23:02:00.445641973 +0300
-@@ -25,7 +25,7 @@
+@@ -1,4 +1,4 @@
- #include "views/window/window.h"
+-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
++f// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
  
+@@ -23,7 +23,7 @@
+ #include "views/widget/root_view.h"
+ #include "views/window/window.h"
  
 -#if defined(OS_LINUX)
 +#if defined(TOOLKIT_GTK)
  #include "views/widget/widget_gtk.h"
  #endif
  
-@@ -108,7 +108,7 @@
+@@ -94,7 +94,7 @@
+ 
    // The bubble chrome requires a separate window, so construct it here.
-   if (BUBBLE_CHROME == popup_chrome_) {
    gfx::NativeView native_window = frame->GetNativeView();
 -#if defined(OS_LINUX)
 +#if defined(TOOLKIT_GTK)

www/chromium/files/patch-chrome__browser__ui__views__frame__browser_view.cc

@@ -1,5 +1,5 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig	2011-01-26 10:30:50.000000000 +0100
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2011-04-15 11:01:45.000000000 +0300
-+++ chrome/browser/ui/views/frame/browser_view.cc	2011-01-30 14:10:27.000000000 +0100
++++ chrome/browser/ui/views/frame/browser_view.cc	2011-04-16 18:06:47.910070832 +0300
 @@ -4,7 +4,7 @@
  
  #include "chrome/browser/ui/views/frame/browser_view.h"
@@ -9,25 +9,25 @@
  #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(TOOLKIT_GTK)
  #include "chrome/browser/ui/views/accelerator_table_gtk.h"
  #include "views/window/hit_test.h"
  #include "views/window/window_gtk.h"
-@@ -1130,7 +1130,7 @@
+@@ -1162,7 +1162,7 @@
    string16 message = l10n_util::GetStringUTF16(message_id);
-   app::win::MessageBox(GetNativeHandle(), message, title,
+   ui::MessageBox(GetNativeHandle(), message, title,
                   MB_OK | MB_ICONWARNING | MB_TOPMOST);
 -#elif defined(OS_LINUX)
 +#elif defined(TOOLKIT_GTK)
    std::string title = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME);
    std::string message = l10n_util::GetStringUTF8(message_id);
    GtkWidget* dialog = gtk_message_dialog_new(GetNativeHandle(),
-@@ -1224,7 +1224,7 @@
+@@ -1256,7 +1256,7 @@
    views::FocusManager* focus_manager = GetFocusManager();
    DCHECK(focus_manager);
  
@@ -36,16 +36,16 @@
    // 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.
-@@ -1271,7 +1271,7 @@
+@@ -1303,7 +1303,7 @@
      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_FREEBSD)) && !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 @@
-@@ -1287,7 +1287,7 @@
  }
  
  void BrowserView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
@@ -54,7 +54,7 @@
    views::Window* window = GetWidget()->GetWindow();
    if (window && event.os_event && !event.skip_in_browser)
      static_cast<views::WindowGtk*>(window)->HandleKeyboardEvent(event.os_event);
-@@ -2230,7 +2230,7 @@
+@@ -2247,7 +2247,7 @@
  #endif  // No need to invoke SetFullscreen for linux as this code is executed
          // once we're already fullscreen on linux.
  

www/chromium/files/patch-chrome__chrome_browser.gypi

@@ -1,36 +1,7 @@
---- chrome/chrome_browser.gypi.orig	2011-04-13 10:01:59.000000000 +0200
+--- chrome/chrome_browser.gypi.orig	2011-04-16 11:02:00.000000000 +0300
-+++ chrome/chrome_browser.gypi	2011-04-17 22:24:15.000000000 +0200
++++ chrome/chrome_browser.gypi	2011-04-21 21:49:54.625558694 +0300
-@@ -1237,7 +1237,7 @@
+@@ -3455,7 +3455,7 @@
-         'browser/favicon_service.h',
+             ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.h'],
-         'browser/file_path_watcher/file_path_watcher.cc',
-         'browser/file_path_watcher/file_path_watcher.h',
--        'browser/file_path_watcher/file_path_watcher_inotify.cc',
-+        #'browser/file_path_watcher/file_path_watcher_inotify.cc',
-         'browser/file_path_watcher/file_path_watcher_mac.cc',
-         'browser/file_path_watcher/file_path_watcher_win.cc',
-         'browser/file_select_helper.cc',
-@@ -1266,8 +1266,8 @@
-         'browser/geolocation/empty_device_data_provider.h',
-         'browser/geolocation/gateway_data_provider_common.cc',
-         'browser/geolocation/gateway_data_provider_common.h',
--        'browser/geolocation/gateway_data_provider_linux.cc',
--        'browser/geolocation/gateway_data_provider_linux.h',
-+        #'browser/geolocation/gateway_data_provider_linux.cc',
-+        #'browser/geolocation/gateway_data_provider_linux.h',
-         'browser/geolocation/gateway_data_provider_win.cc',
-         'browser/geolocation/gateway_data_provider_win.h',
-         'browser/geolocation/geolocation_content_settings_map.cc',
-@@ -1307,7 +1307,7 @@
-         'browser/geolocation/wifi_data_provider_corewlan_mac.mm',
-         'browser/geolocation/wifi_data_provider_common_win.cc',
-         'browser/geolocation/wifi_data_provider_common_win.h',
--        'browser/geolocation/wifi_data_provider_linux.cc',
-+        #'browser/geolocation/wifi_data_provider_linux.cc',
-         'browser/geolocation/wifi_data_provider_linux.h',
-         'browser/geolocation/wifi_data_provider_mac.cc',
-         'browser/geolocation/wifi_data_provider_mac.h',
-@@ -3621,7 +3621,7 @@
-             ['include', '^browser/chromeos/dom_ui/login/'],
            ],
          }],
 -        ['OS=="linux"', {
@@ -38,7 +9,7 @@
            'dependencies': [
              '../build/linux/system.gyp:dbus-glib',
              '../build/linux/system.gyp:gconf',
-@@ -3631,12 +3631,6 @@
+@@ -3465,12 +3465,6 @@
              '../build/linux/system.gyp:x11',
              '../third_party/undoview/undoview.gyp:undoview',
            ],
@@ -51,7 +22,7 @@
            'sources!': [
              'browser/ui/views/extensions/extension_view.cc',
              'browser/ui/views/extensions/extension_view.h',
-@@ -4294,7 +4288,7 @@
+@@ -4118,7 +4112,7 @@
                ],
              }],
              # GTK build only
@@ -60,3 +31,12 @@
                'sources/': [
                  ['include', '^browser/printing/print_dialog_gtk.cc'],
                  ['include', '^browser/printing/print_dialog_gtk.h'],
+@@ -4196,7 +4190,7 @@
+                 },
+               ],
+             }],
+-            ['OS=="linux" and gcc_version==45', {
++            ['(OS=="linux" or OS=="freebsd") and gcc_version==45', {
+               # Avoid gcc 4.5 miscompilation of template_url.cc
+               # as per http://crbug.com/41887
+               'cflags': [

www/chromium/files/patch-chrome__chrome_tests.gypi

@@ -1,7 +1,7 @@
---- chrome/chrome_tests.gypi.orig	2011-01-06 10:02:02.000000000 +0100
+--- chrome/chrome_tests.gypi.orig	2011-04-16 19:33:32.144068169 +0300
-+++ chrome/chrome_tests.gypi	2011-01-09 21:00:16.000000000 +0100
++++ chrome/chrome_tests.gypi	2011-04-16 19:33:47.813071073 +0300
-@@ -141,7 +141,7 @@
+@@ -185,7 +185,7 @@
-         'test/unit/chrome_test_suite.h',
+         '../content/common/notification_observer_mock.h',
        ],
        'conditions': [
 -        ['OS=="linux"', {
@@ -9,16 +9,16 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../build/linux/system.gyp:nss',
-@@ -191,7 +191,7 @@
+@@ -239,7 +239,7 @@
-         'test/ui/ui_test_suite.h',
+             'chrome.gyp:crash_service',  # run time dependency
            ],
-       'conditions': [
+         }],
 -        ['OS=="linux"', {
 +        ['OS=="linux" or OS=="freebsd"', {
            'dependencies': [
              '../build/linux/system.gyp:gtk',
            ],
-@@ -215,7 +215,7 @@
+@@ -279,7 +279,7 @@
          'test/unit/run_all_unittests.cc',
        ],
        'conditions': [
@@ -27,7 +27,7 @@
            'dependencies': [
              # Needed for the following #include chain:
              #   test/unit/run_all_unittests.cc
-@@ -261,7 +261,7 @@
+@@ -325,7 +325,7 @@
              },
            },
          },],
@@ -36,7 +36,7 @@
            'dependencies': [
              '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
            ],
-@@ -341,7 +341,7 @@
+@@ -398,14 +398,14 @@
          'test/unit/chrome_test_suite.h',
        ],
        'conditions': [
@@ -45,7 +45,15 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../build/linux/system.gyp:nss',
-@@ -555,12 +555,12 @@
+             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+           ],
+         }],
+-        ['OS=="linux" and toolkit_views==0', {
++        ['(OS=="linux" or OS=="freebsd") and toolkit_views==0', {
+           'sources!': [
+             # TODO(port)
+             'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
+@@ -606,12 +606,12 @@
              '../webkit/webkit.gyp:copy_npapi_test_plugin',
            ],
          }],
@@ -60,8 +68,8 @@
            'sources!': [
              'browser/process_singleton_linux_uitest.cc',
            ],
-@@ -720,7 +720,7 @@
+@@ -782,7 +782,7 @@
-         'test/webdriver/commands/webdriver_command.cc',
+         'test/webdriver/commands/webelement_commands.cc',
        ],
        'conditions': [
 -        ['OS=="linux"', {
@@ -69,7 +77,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -1749,7 +1749,7 @@
+@@ -1893,7 +1893,7 @@
              ['exclude', '^browser/chromeos/'],
            ],
          }],
@@ -78,17 +86,17 @@
            'conditions': [
              ['gcc_version==44', {
                # Avoid gcc 4.4 strict aliasing issues in stl_tree.h when
-@@ -1786,7 +1786,7 @@
+@@ -1930,7 +1930,7 @@
            'sources!': [
              'browser/printing/print_job_unittest.cc',
            ],
 -        }, { # else: OS != "linux"
 +        }, { # else: OS != "linux" and OS != "freebsd"
            'sources!': [
-             'browser/gtk/tabs/tab_renderer_gtk_unittest.cc',
+             'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
              'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
-@@ -2265,7 +2265,7 @@
+@@ -2420,7 +2420,7 @@
-             'browser/renderer_host/test/render_view_host_manager_browsertest.cc',
+             '../content/browser/renderer_host/render_view_host_manager_browsertest.cc',
            ],
          }],
 -        ['OS=="linux"', {
@@ -96,7 +104,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../build/linux/system.gyp:nss',
-@@ -2428,7 +2428,7 @@
+@@ -2589,7 +2589,7 @@
              },
            },
          },],
@@ -105,7 +113,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -2529,7 +2529,7 @@
+@@ -2690,7 +2690,7 @@
              },
            },
          },],
@@ -114,7 +122,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
            ],
-@@ -2566,7 +2566,7 @@
+@@ -2727,7 +2727,7 @@
              },
            },
          },],
@@ -123,7 +131,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -2603,7 +2603,7 @@
+@@ -2764,7 +2764,7 @@
          'test/tab_switching/tab_switching_test.cc',
        ],
        'conditions': [
@@ -132,7 +140,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -2637,7 +2637,7 @@
+@@ -2798,7 +2798,7 @@
          'test/memory_test/memory_test.cc',
        ],
        'conditions': [
@@ -141,7 +149,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -2790,7 +2790,7 @@
+@@ -2961,7 +2961,7 @@
              'browser/sync/util/data_encryption_unittest.cc',
            ],
          }],
@@ -150,7 +158,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../build/linux/system.gyp:nss',
-@@ -2908,7 +2908,7 @@
+@@ -3075,7 +3075,7 @@
        ],
        'conditions': [
          # Plugin code.
@@ -159,7 +167,7 @@
            'dependencies': [
              'plugin',
             ],
-@@ -2916,7 +2916,7 @@
+@@ -3083,7 +3083,7 @@
              'plugin',
            ],
          }],
@@ -168,7 +176,16 @@
             'dependencies': [
               '../build/linux/system.gyp:gtk',
               '../build/linux/system.gyp:nss',
-@@ -3143,7 +3143,7 @@
+@@ -3228,7 +3228,7 @@
+           # See comments about "xcode_settings" elsewhere in this file.
+           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
+         }],
+-        ['OS=="linux"', {
++        ['OS=="linux" or OS=="freebsd"', {
+            'dependencies': [
+              '../build/linux/system.gyp:gtk',
+              '../build/linux/system.gyp:nss',
+@@ -3311,7 +3311,7 @@
              'test/perf/url_parse_perftest.cc',
            ],
            'conditions': [

www/chromium/files/patch-chrome__common__gpu_messages_internal.h

@@ -1,11 +1,11 @@
---- ./chrome/common/gpu_messages_internal.h.orig	2010-12-16 02:12:13.000000000 +0100
+--- chrome/common/gpu_messages_internal.h.orig	2011-04-15 11:02:02.000000000 +0300
-+++ ./chrome/common/gpu_messages_internal.h	2010-12-20 20:15:08.000000000 +0100
++++ chrome/common/gpu_messages_internal.h	2011-04-16 19:43:55.218070312 +0300
-@@ -82,7 +82,7 @@
+@@ -142,7 +142,7 @@
- IPC_MESSAGE_CONTROL1(GpuHostMsg_GraphicsInfoCollected,
+ // Response from GPU to a GpuMsg_Synchronize message.
-                      GPUInfo /* GPU logging stats */)
+ IPC_MESSAGE_CONTROL0(GpuHostMsg_SynchronizeReply)
  
--#if defined(OS_LINUX)
+-#if defined(OS_LINUX) && !defined(TOUCH_UI)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
++#if (defined(OS_LINUX) || defined (OS_FREEBSD)) && !defined(TOUCH_UI)
- // Get the XID for a view ID.
+ // Resize the window that is being drawn into. It's important that this
- IPC_SYNC_MESSAGE_CONTROL1_1(GpuHostMsg_GetViewXID,
+ // resize be synchronized with the swapping of the front and back buffers.
-                             gfx::NativeViewId, /* view */
+ IPC_SYNC_MESSAGE_CONTROL2_1(GpuHostMsg_ResizeXID,

www/chromium/files/patch-chrome__common__service_process_util_posix.h

@@ -0,0 +1,28 @@
+--- chrome/common/service_process_util_posix.h.orig	2011-04-21 20:57:02.534558581 +0300
++++ chrome/common/service_process_util_posix.h	2011-04-21 20:57:16.326558123 +0300
+@@ -14,10 +14,10 @@
+ #include "base/message_pump_libevent.h"
+ #include "base/scoped_ptr.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ #include "chrome/common/multi_process_lock.h"
+ MultiProcessLock* TakeServiceRunningLock(bool waiting);
+-#endif  // OS_LINUX
++#endif  // OS_LINUX || OS_FREEBSD
+ 
+ #if defined(OS_MACOSX)
+ #include "base/mac/scoped_cftyperef.h"
+@@ -65,10 +65,10 @@
+   FilePathWatcher executable_watcher_;
+   ServiceProcessState* state_;
+ #endif  // OS_MACOSX
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+   scoped_ptr<MultiProcessLock> initializing_lock_;
+   scoped_ptr<MultiProcessLock> running_lock_;
+-#endif  // OS_LINUX
++#endif  // OS_LINUX || OS_FREEBSD
+   scoped_ptr<ServiceProcessShutdownMonitor> shut_down_monitor_;
+   base::MessagePumpLibevent::FileDescriptorWatcher watcher_;
+   int sockets_[2];

www/chromium/files/patch-chrome__gpu__gpu_channel.cc

@@ -1,11 +0,0 @@
---- chrome/gpu/gpu_channel.cc.orig	2011-01-26 10:30:52.000000000 +0100
-+++ chrome/gpu/gpu_channel.cc	2011-01-30 14:12:45.000000000 +0100
-@@ -139,7 +139,7 @@
-   // 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_FREEBSD)
-   // Ask the browser for the view's XID.
-   gpu_thread_->Send(new GpuHostMsg_GetViewXID(view_id, &handle));
- #elif defined(OS_MACOSX)

www/chromium/files/patch-chrome__renderer__mock_render_thread.cc

@@ -1,20 +0,0 @@
---- ./chrome/renderer/mock_render_thread.cc.orig	2010-12-16 02:11:59.000000000 +0100
-+++ ./chrome/renderer/mock_render_thread.cc	2010-12-20 20:15:08.000000000 +0100
-@@ -108,7 +108,7 @@
-     IPC_MESSAGE_HANDLER(ViewHostMsg_AllocatePDFTransport,
-                         OnAllocatePDFTransport)
- #endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-     IPC_MESSAGE_HANDLER(ViewHostMsg_AllocateTempFileForPrinting,
-                         OnAllocateTempFileForPrinting)
-     IPC_MESSAGE_HANDLER(ViewHostMsg_TempFileForPrintingWritten,
-@@ -156,7 +156,7 @@
- }
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- void MockRenderThread::OnAllocateTempFileForPrinting(
-     base::FileDescriptor* renderer_fd,
-     int* browser_fd) {

www/chromium/files/patch-chrome__renderer__mock_render_thread.h

@@ -1,11 +0,0 @@
---- ./chrome/renderer/mock_render_thread.h.orig	2010-12-16 02:11:59.000000000 +0100
-+++ ./chrome/renderer/mock_render_thread.h	2010-12-20 20:15:08.000000000 +0100
-@@ -105,7 +105,7 @@
-                               base::SharedMemoryHandle* handle);
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   void OnAllocateTempFileForPrinting(base::FileDescriptor* renderer_fd,
-                                      int* browser_fd);
-   void OnTempFileForPrintingWritten(int browser_fd);

www/chromium/files/patch-chrome__renderer__pepper_plugin_delegate_impl.cc

@@ -1,15 +1,15 @@
---- chrome/renderer/pepper_plugin_delegate_impl.cc.orig	2011-03-23 00:45:32.195641203 +0200
+--- chrome/renderer/pepper_plugin_delegate_impl.cc.orig	2011-04-15 11:01:48.000000000 +0300
-+++ chrome/renderer/pepper_plugin_delegate_impl.cc	2011-03-23 00:45:48.140640079 +0200
++++ chrome/renderer/pepper_plugin_delegate_impl.cc	2011-04-16 20:34:00.435069120 +0300
-@@ -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_FREEBSD)
- #include "chrome/common/render_messages.h"
  #include "chrome/renderer/render_thread.h"
  #endif
-@@ -76,7 +76,7 @@
+ 
+@@ -81,7 +81,7 @@
          dib_(dib) {
    }
  
@@ -18,7 +18,7 @@
    // On Mac, we have to tell the browser to free the transport DIB.
    virtual ~PlatformImage2DImpl() {
      if (dib_.get()) {
-@@ -94,7 +94,7 @@
+@@ -99,7 +99,7 @@
      *byte_count = dib_->size();
  #if defined(OS_WIN)
      return reinterpret_cast<intptr_t>(dib_->handle());
@@ -27,7 +27,7 @@
      return static_cast<intptr_t>(dib_->handle().fd);
  #elif defined(OS_LINUX)
      return static_cast<intptr_t>(dib_->handle());
-@@ -494,7 +494,7 @@
+@@ -499,7 +499,7 @@
    uint32 buffer_size = width * height * 4;
  
    // Allocate the transport DIB and the PlatformCanvas pointing to it.

www/chromium/files/patch-chrome__renderer__webplugin_delegate_pepper.cc

@@ -1,5 +1,5 @@
---- ./chrome/renderer/webplugin_delegate_pepper.cc.orig	2010-12-16 02:11:59.000000000 +0100
+--- chrome/renderer/webplugin_delegate_pepper.cc.orig	2011-04-15 11:01:48.000000000 +0300
-+++ ./chrome/renderer/webplugin_delegate_pepper.cc	2010-12-20 20:15:08.000000000 +0100
++++ chrome/renderer/webplugin_delegate_pepper.cc	2011-04-16 20:54:58.991069673 +0300
 @@ -9,7 +9,7 @@
  #include <string>
  #include <vector>
@@ -9,16 +9,16 @@
  #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_FREEBSD)
++#elif defined(OS_LINUX) || defined(OS_FREEBSD)
  #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 @@
+@@ -414,7 +414,7 @@
  NPError NPMatchFontWithFallback(NPP instance,
                                  const NPFontDescription* description,
                                  NPFontID* id) {
@@ -27,7 +27,7 @@
    int fd = renderer_sandbox_support::MatchFontWithFallback(
        description->face, description->weight >= 700, description->italic,
        description->charset);
-@@ -482,7 +482,7 @@
+@@ -433,7 +433,7 @@
                       uint32_t table,
                       void* output,
                       size_t* output_length) {
@@ -36,7 +36,7 @@
    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 @@
+@@ -444,7 +444,7 @@
  }
  
  NPError NPDestroyFont(NPP instance, NPFontID id) {
@@ -45,20 +45,20 @@
    close(id);
    return NPERR_NO_ERROR;
  #else
-@@ -1169,10 +1169,10 @@
+@@ -823,10 +823,10 @@
        current_printer_dpi_ = printer_dpi;
      }
    }
 -#if defined (OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
++#if defined (OS_LINUX) || defined(OS_FREEBSD)
    num_pages_ = num_pages;
    pdf_output_done_ = false;
 -#endif  // (OS_LINUX)
-+#endif  // OS_LINUX || OS_FREEBSD
++#endif  // (OS_LINUX) || (OS_FREEBSD)
    return num_pages;
  }
  
-@@ -1198,7 +1198,7 @@
+@@ -852,7 +852,7 @@
    unsigned char* pdf_output = NULL;
    int32 output_size = 0;
    NPPrintPageNumberRange page_range;
@@ -67,19 +67,19 @@
    // 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 @@
+@@ -861,9 +861,9 @@
      return pdf_output_done_;
    page_range.firstPageNumber = 0;
    page_range.lastPageNumber = num_pages_ - 1;
 -#else  // defined(OS_LINUX)
-+#else  // defined(OS_LINUX) || defined(OS_FREEBSD)
++#else  // !defined(OS_LINUX) && !defined(OS_FREEBSD)
    page_range.firstPageNumber = page_range.lastPageNumber = page_number;
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_FREEBSD)
    NPError err = print_extensions->printPagesAsPDF(instance()->npp(),
                                                    &page_range, 1,
                                                    &pdf_output, &output_size);
-@@ -1217,7 +1217,7 @@
+@@ -871,7 +871,7 @@
      return false;
  
    bool ret = false;
@@ -88,7 +88,7 @@
    // On Linux we need to get the backing PdfPsMetafile and write the bits
    // directly.
    cairo_t* context = canvas->beginPlatformPaint();
-@@ -1370,10 +1370,10 @@
+@@ -1026,10 +1026,10 @@
    current_printer_dpi_ = -1;
  #if defined(OS_MACOSX)
    last_printed_page_ = SkBitmap();
@@ -101,16 +101,16 @@
  }
  
  WebPluginDelegatePepper::WebPluginDelegatePepper(
-@@ -1384,10 +1384,10 @@
+@@ -1039,10 +1039,10 @@
+       plugin_(NULL),
        instance_(instance),
-       nested_delegate_(NULL),
        current_printer_dpi_(-1),
 -#if defined (OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
++#if defined (OS_LINUX) || defined(OS_FREEBSD)
        num_pages_(0),
        pdf_output_done_(false),
 -#endif  // (OS_LINUX)
-+#endif  // OS_LINUX || OS_FREEBSD
++#endif  // (OS_LINUX) || (OS_FREEBSD)
- #if defined(ENABLE_GPU)
+       find_identifier_(-1),
-       command_buffer_(NULL),
+       current_choose_file_callback_(NULL),
-       method_factory3d_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+       current_choose_file_user_data_(NULL) {

www/chromium/files/patch-chrome__renderer__webplugin_delegate_proxy.cc

@@ -5,7 +5,7 @@
  };
  
 -#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_OPENBSD)
++#if defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
  static void ReleaseTransportDIB(TransportDIB* dib) {
    if (dib) {
      IPC::Message* message = new ViewHostMsg_FreeTransportDIB(dib->id());
@@ -14,7 +14,7 @@
  
  WebPluginDelegateProxy::~WebPluginDelegateProxy() {
 -#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_OPENBSD)
++#if defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
    // Ask the browser to release old TransportDIB objects for which no
    // PluginHostMsg_UpdateGeometry_ACK was ever received from the plugin
    // process.
@@ -23,7 +23,7 @@
  
    PluginMsg_UpdateGeometry_Param param;
 -#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_OPENBSD)
++#if defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
    param.ack_key = -1;
  #endif
  
@@ -32,7 +32,7 @@
  
        bool needs_background_store = transparent_;
 -#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_OPENBSD)
++#if defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
        // 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.
@@ -41,7 +41,7 @@
  
  void WebPluginDelegateProxy::ResetWindowlessBitmaps() {
 -#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_OPENBSD)
++#if defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
    DCHECK(!background_store_.get());
    // The Mac TransportDIB implementation uses base::SharedMemory, which
    // cannot be disposed of if an in-flight UpdateGeometry message refers to
@@ -50,13 +50,13 @@
      scoped_ptr<skia::PlatformCanvas>* canvas) {
    const size_t size = BitmapSizeForPluginRect(plugin_rect_);
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && !defined(OS_FREEBSD)
    memory->reset(TransportDIB::Create(size, 0));
    if (!memory->get())
      return false;
  #endif
 -#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_OPENBSD)
++#if defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
    TransportDIB::Handle handle;
    IPC::Message* msg = new ViewHostMsg_AllocTransportDIB(size, true, &handle);
    if (!RenderThread::current()->Send(msg))

www/chromium/files/patch-chrome__test__testing_browser_process.h

@@ -1,11 +1,20 @@
---- ./chrome/test/testing_browser_process.h.orig	2010-12-16 02:12:11.000000000 +0100
+--- chrome/test/testing_browser_process.h.orig	2011-04-15 11:02:00.000000000 +0300
-+++ ./chrome/test/testing_browser_process.h	2010-12-20 20:15:08.000000000 +0100
++++ chrome/test/testing_browser_process.h	2011-04-16 21:00:37.080070649 +0300
-@@ -52,7 +52,7 @@
+@@ -49,7 +49,7 @@
-     return NULL;
+ 
-   }
+   virtual IOThread* io_thread();
  
 -#if defined(OS_LINUX)
-+#if defined(USE_X11)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   virtual base::Thread* background_x11_thread() {
+   virtual base::Thread* background_x11_thread();
-     return NULL;
+ #endif
-   }
+ 
+@@ -120,7 +120,7 @@
+ 
+   virtual void CheckForInspectorFiles() {}
+ 
+-#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
+   virtual void StartAutoupdateTimer() {}
+ #endif
+ 

www/chromium/files/patch-content__browser__browser_child_process_host.cc

@@ -1,5 +1,5 @@
---- ./chrome/browser/browser_child_process_host.cc.orig	2010-12-16 02:11:58.000000000 +0100
+--- ./content/browser/browser_child_process_host.cc.orig	2010-12-16 02:11:58.000000000 +0100
-+++ ./chrome/browser/browser_child_process_host.cc	2010-12-20 20:15:08.000000000 +0100
++++ ./content/browser/browser_child_process_host.cc	2010-12-20 20:15:08.000000000 +0100
 @@ -27,9 +27,9 @@
  #include "chrome/common/result_codes.h"
  #include "chrome/installer/util/google_update_settings.h"

www/chromium/files/patch-content__browser__child_process_launcher.cc

@@ -1,5 +1,5 @@
---- ./chrome/browser/child_process_launcher.cc.orig	2010-12-16 02:11:58.000000000 +0100
+--- ./content/browser/child_process_launcher.cc.orig	2010-12-16 02:11:58.000000000 +0100
-+++ ./chrome/browser/child_process_launcher.cc	2010-12-20 20:15:08.000000000 +0100
++++ ./content/browser/child_process_launcher.cc	2010-12-20 20:15:08.000000000 +0100
 @@ -20,7 +20,7 @@
  #if defined(OS_WIN)
  #include "base/file_path.h"

www/chromium/files/patch-content__browser__renderer_host__mock_render_process_host.cc

@@ -1,5 +1,5 @@
---- ./chrome/browser/renderer_host/mock_render_process_host.cc.orig	2010-12-16 02:11:57.000000000 +0100
+--- content/browser/renderer_host/mock_render_process_host.cc.orig	2010-12-16 02:11:57.000000000 +0100
-+++ ./chrome/browser/renderer_host/mock_render_process_host.cc	2010-12-20 20:15:08.000000000 +0100
++++ content/browser/renderer_host/mock_render_process_host.cc	2010-12-20 20:15:08.000000000 +0100
 @@ -106,7 +106,7 @@
    DuplicateHandle(GetCurrentProcess(), dib_id.handle, GetCurrentProcess(),
                    &duped, 0, TRUE, DUPLICATE_SAME_ACCESS);

www/chromium/files/patch-content__browser__renderer_host__render_message_filter.cc

@@ -1,15 +1,15 @@
---- chrome/browser/renderer_host/render_message_filter.cc.orig	2011-03-23 00:59:35.959798938 +0200
+--- content/browser/renderer_host/render_message_filter.cc.orig	2011-04-15 11:01:10.000000000 +0300
-+++ chrome/browser/renderer_host/render_message_filter.cc	2011-03-23 00:59:46.644644079 +0200
++++ content/browser/renderer_host/render_message_filter.cc	2011-04-16 21:12:33.904069230 +0300
-@@ -375,7 +375,7 @@
+@@ -416,7 +416,7 @@
-     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_GetDefaultPrintSettings,
+     IPC_MESSAGE_HANDLER(ViewHostMsg_V8HeapStats, OnV8HeapStats)
-                                     OnGetDefaultPrintSettings)
+     IPC_MESSAGE_HANDLER(ViewHostMsg_DidZoomURL, OnDidZoomURL)
-     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_ScriptedPrint, OnScriptedPrint)
+     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_ResolveProxy, OnResolveProxy)
 -#if defined(OS_MACOSX)
 +#if defined(OS_MACOSX) || defined(OS_FREEBSD)
      IPC_MESSAGE_HANDLER(ViewHostMsg_AllocTransportDIB, OnAllocTransportDIB)
      IPC_MESSAGE_HANDLER(ViewHostMsg_FreeTransportDIB, OnFreeTransportDIB)
  #endif
-@@ -1196,7 +1196,7 @@
+@@ -1111,7 +1111,7 @@
    HistogramSynchronizer::DeserializeHistogramList(sequence_number, histograms);
  }
  

www/chromium/files/patch-content__browser__renderer_host__render_sandbox_host_linux.cc

@@ -0,0 +1,24 @@
+--- content/browser/renderer_host/render_sandbox_host_linux.cc.orig	2011-04-16 11:01:10.000000000 +0300
++++ content/browser/renderer_host/render_sandbox_host_linux.cc	2011-04-27 00:17:53.236984447 +0300
+@@ -13,6 +13,9 @@
+ #include <sys/socket.h>
+ #include <sys/poll.h>
+ #include <time.h>
++#if defined(OS_FREEBSD)
++#include <sys/param.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -665,7 +668,11 @@
+   // 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.
++#if defined(OS_FREEBSD) && (__FreeBSD_version < 900030)
++  CHECK(socketpair(AF_UNIX, SOCK_DGRAM, 0, fds) == 0);
++#else
+   CHECK(socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds) == 0);
++#endif
+ 
+   renderer_socket_ = fds[0];
+   const int browser_socket = fds[1];

www/chromium/files/patch-content__browser__renderer_host__render_widget_helper.cc

@@ -1,5 +1,5 @@
---- ./chrome/browser/renderer_host/render_widget_helper.cc.orig	2010-12-16 02:11:57.000000000 +0100
+--- content/browser/renderer_host/render_widget_helper.cc.orig	2010-12-16 02:11:57.000000000 +0100
-+++ ./chrome/browser/renderer_host/render_widget_helper.cc	2010-12-20 20:15:08.000000000 +0100
++++ content/browser/renderer_host/render_widget_helper.cc	2010-12-20 20:15:08.000000000 +0100
 @@ -58,7 +58,7 @@
    // object, so we should not be destroyed unless pending_paints_ is empty!
    DCHECK(pending_paints_.empty());

www/chromium/files/patch-content__browser__renderer_host__render_widget_helper.h

@@ -1,5 +1,5 @@
---- ./chrome/browser/renderer_host/render_widget_helper.h.orig	2010-12-16 02:11:57.000000000 +0100
+--- content/browser/renderer_host/render_widget_helper.h.orig	2010-12-16 02:11:57.000000000 +0100
-+++ ./chrome/browser/renderer_host/render_widget_helper.h	2010-12-20 20:15:08.000000000 +0100
++++ content/browser/renderer_host/render_widget_helper.h	2010-12-20 20:15:08.000000000 +0100
 @@ -110,7 +110,7 @@
                          const base::TimeDelta& max_delay,
                          IPC::Message* msg);

www/chromium/files/patch-content__browser__renderer_host__render_widget_host_unittest.cc

@@ -1,5 +1,5 @@
---- ./chrome/browser/renderer_host/render_widget_host_unittest.cc.orig	2010-12-16 02:11:57.000000000 +0100
+--- content/browser/renderer_host/render_widget_host_unittest.cc.orig	2010-12-16 02:11:57.000000000 +0100
-+++ ./chrome/browser/renderer_host/render_widget_host_unittest.cc	2010-12-20 20:15:08.000000000 +0100
++++ content/browser/renderer_host/render_widget_host_unittest.cc	2010-12-20 20:15:08.000000000 +0100
 @@ -407,7 +407,7 @@
  
  // Tests setting custom background

www/chromium/files/patch-content__browser__tab_contents__tab_contents.cc

@@ -1,5 +1,5 @@
---- ./chrome/browser/tab_contents/tab_contents.cc.orig	2010-12-16 02:11:56.000000000 +0100
+--- content/browser/tab_contents/tab_contents.cc.orig	2010-12-16 02:11:56.000000000 +0100
-+++ ./chrome/browser/tab_contents/tab_contents.cc	2010-12-20 20:15:08.000000000 +0100
++++ content/browser/tab_contents/tab_contents.cc	2010-12-20 20:15:08.000000000 +0100
 @@ -407,7 +407,7 @@
                   NotificationService::AllSources());
    registrar_.Add(this, NotificationType::RENDER_WIDGET_HOST_DESTROYED,

www/chromium/files/patch-content__browser__zygote_host_linux.cc

@@ -1,6 +1,16 @@
---- chrome/browser/zygote_host_linux.cc.orig	2011-03-23 00:55:52.194986092 +0200
+--- content/browser/zygote_host_linux.cc.orig	2011-04-16 11:01:10.000000000 +0300
-+++ chrome/browser/zygote_host_linux.cc	2011-03-23 00:56:55.886462243 +0200
++++ content/browser/zygote_host_linux.cc	2011-04-27 00:55:54.430982567 +0300
-@@ -61,8 +61,16 @@
+@@ -8,6 +8,9 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#if defined(OS_FREEBSD)
++#include <sys/param.h>
++#endif
+ 
+ #include "base/command_line.h"
+ #include "base/eintr_wrapper.h"
+@@ -61,8 +64,16 @@
  }
  
  ZygoteHost::~ZygoteHost() {
@@ -18,20 +28,19 @@
  }
  
  // static
-@@ -81,7 +89,12 @@
+@@ -81,7 +92,11 @@
    cmd_line.AppendSwitchASCII(switches::kProcessType, switches::kZygoteProcess);
  
    int fds[2];
-+#if defined(OS_FREEBSD)
++#if defined(OS_FREEBSD) && (__FreeBSD_version < 900030)
-+  if (socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) != 0)
++  CHECK(socketpair(AF_UNIX, SOCK_DGRAM, 0, fds) == 0);
-+    CHECK(socketpair(PF_UNIX, SOCK_DGRAM, 0, fds) == 0);
 +#else
    CHECK(socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) == 0);
 +#endif
    base::file_handle_mapping_vector fds_to_map;
    fds_to_map.push_back(std::make_pair(fds[1], 3));
  
-@@ -149,6 +162,7 @@
+@@ -149,6 +164,7 @@
      // We need to look for it.
      // But first, wait for the zygote to tell us it's running.
      // The sending code is in chrome/browser/zygote_main_linux.cc.
@@ -39,7 +48,7 @@
      std::vector<int> fds_vec;
      const int kExpectedLength = sizeof(kZygoteMagic);
      char buf[kExpectedLength];
-@@ -179,6 +193,7 @@
+@@ -179,6 +195,7 @@
        // Reap the sandbox.
        ProcessWatcher::EnsureProcessGetsReaped(process);
      }
@@ -47,7 +56,7 @@
    } else {
      // Not using the SUID sandbox.
      pid_ = process;
-@@ -245,9 +260,11 @@
+@@ -245,9 +262,11 @@
      if (pid <= 0)
        return base::kNullProcessHandle;
    }
@@ -60,7 +69,7 @@
  
    return pid;
  }
-@@ -285,6 +302,7 @@
+@@ -285,6 +304,7 @@
      selinux_valid = true;
    }
  
@@ -68,7 +77,7 @@
    if (using_suid_sandbox_ && !selinux) {
      base::ProcessHandle sandbox_helper_process;
      std::vector<std::string> adj_oom_score_cmdline;
-@@ -302,6 +320,7 @@
+@@ -302,6 +322,7 @@
      if (!base::AdjustOOMScore(pid, score))
        PLOG(ERROR) << "Failed to adjust OOM score of renderer with pid " << pid;
    }

www/chromium/files/patch-content__browser__zygote_host_linux.h

@@ -1,5 +1,5 @@
---- ./chrome/browser/zygote_host_linux.h.orig	2010-12-16 02:11:58.000000000 +0100
+--- content/browser/zygote_host_linux.h.orig	2010-12-16 02:11:58.000000000 +0100
-+++ ./chrome/browser/zygote_host_linux.h	2010-12-20 20:15:08.000000000 +0100
++++ content/browser/zygote_host_linux.h	2010-12-20 20:15:08.000000000 +0100
 @@ -51,6 +51,9 @@
      kCmdReap = 1,                  // Reap a renderer child.
      kCmdGetTerminationStatus = 2,  // Check what happend to a child process.

www/chromium/files/patch-content__browser__zygote_main_linux.cc

@@ -1,5 +1,5 @@
---- chrome/browser/zygote_main_linux.cc.orig	2011-01-06 10:01:46.000000000 +0100
+--- content/browser/zygote_main_linux.cc.orig	2011-04-15 11:01:10.000000000 +0300
-+++ chrome/browser/zygote_main_linux.cc	2011-01-09 20:41:38.000000000 +0100
++++ content/browser/zygote_main_linux.cc	2011-04-16 21:45:54.101069128 +0300
 @@ -2,12 +2,18 @@
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
@@ -19,7 +19,7 @@
  #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) && \
@@ -28,7 +28,7 @@
  // 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 @@
+@@ -174,6 +180,11 @@
          case ZygoteHost::kCmdGetSandboxStatus:
            HandleGetSandboxStatus(fd, pickle, iter);
            return false;
@@ -40,7 +40,7 @@
          default:
            NOTREACHED();
            break;
-@@ -653,7 +664,7 @@
+@@ -648,7 +659,7 @@
  
      SkiaFontConfigSetImplementation(
          new FontConfigIPC(kMagicSandboxIPCDescriptor));
@@ -49,11 +49,11 @@
      // 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
-@@ -679,6 +690,7 @@
+@@ -674,6 +685,7 @@
          return false;
        }
      }
 +#endif  // !OS_FREEBSD
-   } else if (switches::SeccompSandboxEnabled()) {
+   } else if (CommandLine::ForCurrentProcess()->HasSwitch(
+         switches::kEnableSeccompSandbox)) {
      PreSandboxInit();
-     SkiaFontConfigSetImplementation(

www/chromium/files/patch-content__common__file_path_watcher__file_path_watcher_stub.cc

@@ -0,0 +1,27 @@
+--- content/common/file_path_watcher/file_path_watcher_stub.cc.orig	2011-04-15 11:01:10.000000000 +0300
++++ content/common/file_path_watcher/file_path_watcher_stub.cc	2011-04-19 22:34:32.353038862 +0300
+@@ -5,15 +5,21 @@
+ // 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 void Cancel() {}
++
+   virtual bool Watch(const FilePath& path,
+-                     FileWatcher::Delegate* delegate,
+-                     base::MessageLoopProxy*) OVERRIDE {
++                     FilePathWatcher::Delegate* delegate) OVERRIDE {
+     return false;
+   }
++
++ protected:
++
++  virtual void CancelOnMessageLoopThread() {}
+ };
+ 
+ FilePathWatcher::FilePathWatcher() {

www/chromium/files/patch-content__content_browser.gypi

@@ -0,0 +1,26 @@
+--- content/content_browser.gypi.orig	2011-04-22 01:35:50.895187096 +0300
++++ content/content_browser.gypi	2011-04-22 01:43:35.628663558 +0300
+@@ -324,7 +324,7 @@
+         ['OS=="win"', {
+           'msvs_guid': '639DB58D-32C2-435A-A711-65A12F62E442',
+         }],
+-        ['OS=="linux"', {
++        ['OS=="linux" or OS=="freebsd"', {
+           'dependencies': [
+             '../build/linux/system.gyp:dbus-glib',
+             # For FcLangSetAdd call in render_sandbox_host_linux.cc
+@@ -346,6 +346,14 @@
+             ['exclude', '^browser/geolocation/wifi_data_provider_linux.h'],
+           ]
+         }],
++	['OS=="freebsd" or OS=="openbsd"', {
++          'sources/': [
++            ['exclude', '^browser/geolocation/wifi_data_provider_linux.cc'],
++            ['exclude', '^browser/geolocation/wifi_data_provider_linux.h'],
++            ['exclude', '^browser/geolocation/gateway_data_provider_linux.cc'],
++            ['exclude', '^browser/geolocation/gateway_data_provider_linux.h'],
++          ]
++        }],
+         ['OS=="mac"', {
+           'link_settings': {
+             'mac_bundle_resources': [

www/chromium/files/patch-gfx__scoped_image.h

@@ -1,20 +0,0 @@
---- gfx/scoped_image.h.orig	2011-03-20 22:02:04.269886673 +0200
-+++ gfx/scoped_image.h	2011-03-20 22:02:04.438736904 +0200
-@@ -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_FREEBSD)
- #include <glib-object.h>
- #elif defined(OS_MACOSX)
- #include "base/mac/mac_util.h"
-@@ -116,7 +116,7 @@
- #endif  // defined(OS_MACOSX)
- 
- // Specialization for the GdkPixbuf type on Linux.
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- template <>
- class ScopedImage<GdkPixbuf> : public gfx::internal::ScopedImage<GdkPixbuf> {
-  public:

www/chromium/files/patch-media__media.gyp

@@ -1,6 +1,14 @@
---- media/media.gyp.orig	2011-04-17 22:22:00.000000000 +0200
+--- media/media.gyp.orig	2011-04-21 21:52:13.846559129 +0300
-+++ media/media.gyp	2011-04-17 22:22:15.000000000 +0200
++++ media/media.gyp	2011-04-21 21:52:29.930558911 +0300
-@@ -600,7 +600,6 @@
+@@ -612,7 +612,6 @@
+           ],
+           'libraries': [
+             '-lGL',
+-            '-ldl',
+           ],
+           'sources': [
+             'tools/tile_render_bench/tile_render_bench.cc',
+@@ -692,7 +691,6 @@
            ],
            'link_settings': {
              'libraries': [

www/chromium/files/patch-net__base__net_util.cc

@@ -1,13 +1,10 @@
---- ./net/base/net_util.cc.orig	2010-12-16 02:11:31.000000000 +0100
+--- net/base/net_util.cc.orig	2011-02-17 10:52:37.000000000 +0100
-+++ ./net/base/net_util.cc	2010-12-20 20:15:08.000000000 +0100
++++ net/base/net_util.cc	2011-02-20 21:20:04.000000000 +0100
-@@ -25,9 +25,9 @@
+@@ -24,6 +24,7 @@
  #include <fcntl.h>
  #include <ifaddrs.h>
  #include <netdb.h>
 +#include <sys/socket.h>
  #include <net/if.h>
  #include <netinet/in.h>
--#include <sys/socket.h>
  #endif
- 
- #include "base/base64.h"

www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc

@@ -1,5 +1,5 @@
---- ./net/proxy/proxy_config_service_linux.cc.orig	2010-12-13 12:03:17.000000000 +0100
+--- net/proxy/proxy_config_service_linux.cc.orig	2011-04-04 10:01:16.000000000 +0200
-+++ ./net/proxy/proxy_config_service_linux.cc	2011-01-07 14:17:11.000000000 +0100
++++ net/proxy/proxy_config_service_linux.cc	2011-04-11 00:23:55.000000000 +0200
 @@ -12,7 +12,13 @@
  #include <limits.h>
  #include <stdio.h>
@@ -14,7 +14,7 @@
  #include <unistd.h>
  
  #include <map>
-@@ -432,7 +438,7 @@
+@@ -433,7 +439,7 @@
        public base::MessagePumpLibevent::Watcher {
   public:
    explicit GConfSettingGetterImplKDE(base::Environment* env_var_getter)
@@ -22,8 +22,8 @@
 +      : notify_fd_(-1), notify_delegate_(NULL), indirect_manual_(false),
          auto_no_pac_(false), reversed_bypass_list_(false),
          env_var_getter_(env_var_getter), file_loop_(NULL) {
-     // Derive the location of the kde config dir from the environment.
+     // This has to be called on the UI thread (http://crbug.com/69057).
-@@ -488,31 +494,35 @@
+@@ -492,33 +498,37 @@
    }
  
    virtual ~GConfSettingGetterImplKDE() {
@@ -44,6 +44,8 @@
  
    virtual bool Init(MessageLoop* glib_default_loop,
                      MessageLoopForIO* file_loop) {
+     // This has to be called on the UI thread (http://crbug.com/69057).
+     base::ThreadRestrictions::ScopedAllowIO allow_io;
 -    DCHECK(inotify_fd_ < 0);
 -    inotify_fd_ = inotify_init();
 -    if (inotify_fd_ < 0) {
@@ -69,7 +71,7 @@
        return false;
      }
      file_loop_ = file_loop;
-@@ -523,28 +533,41 @@
+@@ -529,28 +539,41 @@
    }
  
    void Shutdown() {
@@ -119,7 +121,7 @@
    }
  
    virtual MessageLoop* GetNotificationLoop() {
-@@ -553,7 +576,7 @@
+@@ -559,7 +582,7 @@
  
    // Implement base::MessagePumpLibevent::Delegate.
    void OnFileCanReadWithoutBlocking(int fd) {
@@ -128,7 +130,7 @@
      DCHECK(MessageLoop::current() == file_loop_);
      OnChangeNotification();
    }
-@@ -824,12 +847,25 @@
+@@ -830,12 +853,24 @@
    // from the inotify file descriptor and starts up a debounce timer if
    // an event for kioslaverc is seen.
    void OnChangeNotification() {
@@ -139,14 +141,13 @@
 +    bool kioslaverc_touched = true;
 +    struct kevent ke;
 +    if (kevent(notify_fd_, NULL, 0, &ke, 1, NULL) == -1) {
-+      LOG(ERROR) << "kevent() failure: no loner watching kioslaverc";
++      LOG(ERROR) << "kevent() failure: no longer watching kioslaverc";
 +      notify_watcher_.StopWatchingFileDescriptor();
 +      close(notify_fd_);
 +      notify_fd_ = -1;
 +      kioslaverc_touched = false;
 +    }
 +    close(ke.ident);
-+    
 +#else
      char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4];
      bool kioslaverc_touched = false;
@@ -156,12 +157,8 @@
        // inotify returns variable-length structures, which is why we have
        // this strange-looking loop instead of iterating through an array.
        char* event_ptr = event_buf;
-@@ -856,14 +892,15 @@
+@@ -865,9 +900,9 @@
-       if (errno == EINVAL) {
+         // large), but if it does we'd warn continuously since |inotify_fd_|
-         // Our buffer is not large enough to read the next event. This should
-         // not happen (because its size is calculated to always be sufficiently
--        // large), but if it does we'd warn continuously since |inotify_fd_|
-+        // large), but if it does we'd warn continuously since |notify_fd_|
          // would be forever ready to read. Close it and stop watching instead.
          LOG(ERROR) << "inotify failure; no longer watching kioslaverc!";
 -        inotify_watcher_.StopWatchingFileDescriptor();
@@ -172,11 +169,8 @@
 +        notify_fd_ = -1;
        }
      }
-+#endif
      if (kioslaverc_touched) {
-       // We don't use Reset() because the timer may not yet be running.
+@@ -883,8 +918,8 @@
-       // (In that case Stop() is a no-op.)
-@@ -877,8 +914,8 @@
    typedef std::map<std::string, std::string> string_map_type;
    typedef std::map<std::string, std::vector<std::string> > strings_map_type;
  

www/chromium/files/patch-ppapi__proxy__image_data.cc

@@ -1,11 +0,0 @@
---- ppapi/proxy/image_data.cc.orig	2011-03-15 05:44:04.000000000 +0200
-+++ ppapi/proxy/image_data.cc	2011-03-15 05:48:26.000000000 +0200
-@@ -4,7 +4,7 @@
- 
- #include "ppapi/proxy/image_data.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined (OS_FREEBSD)
- #include <sys/shm.h>
- #endif
- 

www/chromium/files/patch-ppapi__proxy__ppb_image_data_proxy.cc

@@ -0,0 +1,11 @@
+--- ppapi/proxy/ppb_image_data_proxy.cc.orig	2011-04-19 21:36:29.491038804 +0300
++++ ppapi/proxy/ppb_image_data_proxy.cc	2011-04-19 21:37:11.973039170 +0300
+@@ -21,7 +21,7 @@
+ #include "ppapi/proxy/ppapi_messages.h"
+ #include "ppapi/shared_impl/image_data_impl.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined (OS_FREEBSD)
+ #include <sys/shm.h>
+ #elif defined(OS_MACOSX)
+ #include <sys/stat.h>

www/chromium/files/patch-third_party__WebKit__Source__WebCore__platform__sql__chromium__SQLiteFileSystemChromiumPosix.cpp

@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp.orig	2011-03-20 22:02:04.262978254 +0200
-+++ third_party/WebKit/Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp	2011-03-20 22:02:04.435738199 +0200
-@@ -755,6 +755,8 @@
-     if (!success)
-         success = !fsync(fd);
-     return success;
-+#elif OS(FREEBSD)
-+    return !fsync(fd);
- #else
-     return !fdatasync(fd);
- #endif

www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp

@@ -1,11 +1,54 @@
---- third_party/ffmpeg/ffmpeg.gyp.orig	2011-03-28 21:25:33.000000000 +0200
+--- third_party/ffmpeg/ffmpeg.gyp.orig	2011-04-26 11:02:53.000000000 +0300
-+++ third_party/ffmpeg/ffmpeg.gyp	2011-03-28 21:28:28.000000000 +0200
++++ third_party/ffmpeg/ffmpeg.gyp	2011-04-29 01:18:16.629475671 +0300
-@@ -56,7 +56,7 @@
+@@ -50,7 +50,7 @@
-       ['target_arch=="arm"', {
+       }, {
-         'ffmpeg_asm_lib': 0,
+         'ffmpeg_config%': '<(target_arch)',
        }],
 -      ['OS=="mac" or OS=="win"', {
 +      ['OS=="mac" or OS=="win" or OS=="freebsd"', {
          'os_config%': '<(OS)',
        }, {  # all other Unix OS's use the linux config
          'os_config%': 'linux',
+@@ -205,8 +205,19 @@
+               ],
+             }],  # ffmpeg_branding
+             ['target_arch=="ia32" or target_arch=="x64"', {
+-              'dependencies': [
+-                '../yasm/yasm.gyp:yasm#host',
++              'conditions': [
++                ['use_system_yasm==0', {
++                  'dependencies': [
++                    '../yasm/yasm.gyp:yasm#host',
++                  ],
++                  'variables': {
++                    'yasm_path': '<(PRODUCT_DIR)/yasm',
++                  },
++                }, {
++                  'variables': {
++                    'yasm_path': '<!(which yasm)',
++                  },
++                }],
+               ],
+               'sources': [
+                 'patched-ffmpeg-mt/libavcodec/libvpxdec.c',
+@@ -365,7 +376,6 @@
+                 ],
+               },
+               'variables': {
+-                'yasm_path': '<(PRODUCT_DIR)/yasm',
+                 'obj_format': 'elf',
+                 'conditions': [
+                   [ 'target_arch=="ia32"', {
+@@ -720,6 +730,12 @@
+               },
+             }],
+ 
++            ['OS=="freebsd" and use_system_vpx==1', {
++              'include_dirs': [
++                '/usr/local/include',
++              ],
++            }],
++
+             ['use_system_vpx==0', {
+               'include_dirs': [
+                 # TODO(fischman): when both mac & linux are building from

www/chromium/files/patch-third_party__icu__icu.gyp

@@ -1,15 +1,15 @@
---- third_party/icu/icu.gyp.orig	2011-01-06 11:00:47.000000000 +0100
+--- third_party/icu/icu.gyp.orig	2011-04-15 11:18:40.000000000 +0300
-+++ third_party/icu/icu.gyp	2011-01-09 19:47:16.000000000 +0100
++++ third_party/icu/icu.gyp	2011-04-19 22:22:13.540040004 +0300
 @@ -54,7 +54,7 @@
              }, {  # else: OS != "win"
-               'sources!': ['icudt42.dll'],
+               'sources!': ['windows/icudt46.dll'],
              }],
 -            [ 'OS != "linux" or chromeos == 1', {
 +            [ '(OS != "linux" and OS != "freebsd") or chromeos == 1', {
-               'sources!': ['linux/icudt42l_dat.S'],
+               'sources!': ['linux/icudt46l_dat.S'],
              }],
              [ 'OS != "mac"', {
-@@ -232,7 +232,7 @@
+@@ -264,7 +264,7 @@
              ],
            },
            'conditions': [
@@ -18,3 +18,12 @@
                # Since ICU wants to internally use its own deprecated APIs, don't
                # complain about it.
                'cflags': [
+@@ -479,7 +479,7 @@
+                 'source/stubdata/stubdata.c',
+               ],
+             }],
+-            [ 'OS == "linux"', {
++            [ 'OS == "linux" or OS == "freebsd"', {
+               'cflags': [
+                 # Since ICU wants to internally use its own deprecated APIs,
+                 # don't complain about it.

www/chromium/files/patch-third_party__icu__public__common__unicode__ptypes.h

@@ -0,0 +1,11 @@
+--- third_party/icu/public/common/unicode/ptypes.h.orig	2011-04-19 21:44:48.515037943 +0300
++++ third_party/icu/public/common/unicode/ptypes.h	2011-04-19 21:44:58.365038712 +0300
+@@ -26,6 +26,8 @@
+ #   include "unicode/pmac.h"
+ #elif defined(__linux__)
+ #   include "unicode/plinux.h"
++#elif defined(__FreeBSD__)
++#   include "unicode/pfreebsd.h"
+ #else
+ #   include "unicode/platform.h"
+ #endif

www/chromium/files/patch-third_party__icu__public__common__unicode__umachine.h

@@ -1,11 +0,0 @@
---- ./third_party/icu/public/common/unicode/umachine.h.orig	2010-12-16 02:34:25.000000000 +0100
-+++ ./third_party/icu/public/common/unicode/umachine.h	2010-12-20 20:15:08.000000000 +0100
-@@ -49,6 +49,8 @@
- #   include "unicode/pmac.h"
- #elif defined(__linux__)
- #   include "unicode/plinux.h"
-+#elif defined(__FreeBSD__)
-+#   include "unicode/pfreebsd.h"
- #else
- #   include "unicode/platform.h"
- #endif

www/chromium/files/patch-third_party__libjingle__source__talk__base__nethelpers.cc

@@ -0,0 +1,20 @@
+--- third_party/libjingle/source/talk/base/nethelpers.cc.orig	2011-04-19 21:39:18.195038614 +0300
++++ third_party/libjingle/source/talk/base/nethelpers.cc	2011-04-19 21:39:48.358036984 +0300
+@@ -32,7 +32,7 @@
+ 
+ namespace talk_base {
+ 
+-#if defined(LINUX) || defined(ANDROID)
++#if defined(LINUX) || defined(ANDROID) || defined(OS_FREEBSD)
+ static const size_t kInitHostentLen = 1024;
+ static const size_t kMaxHostentLen = kInitHostentLen * 8;
+ #endif
+@@ -121,7 +121,7 @@
+   result->h_addr_list[num_addrs] = NULL;
+ 
+   *herrno = 0;
+-#elif defined(LINUX) || defined(ANDROID)
++#elif defined(LINUX) || defined(ANDROID) || defined(OS_FREEBSD)
+   // gethostbyname() is not thread safe, so we need to call gethostbyname_r()
+   // which is a reentrant version of gethostbyname().
+   ASSERT(kInitHostentLen > sizeof(hostent));

www/chromium/files/patch-third_party__skia__include__core__SkPreConfig.h

@@ -1,11 +1,11 @@
---- ./third_party/skia/include/core/SkPreConfig.h.orig	2010-12-16 02:12:24.000000000 +0100
+--- third_party/skia/include/core/SkPreConfig.h.orig	2011-04-16 11:02:02.000000000 +0300
-+++ ./third_party/skia/include/core/SkPreConfig.h	2010-12-20 20:15:08.000000000 +0100
++++ third_party/skia/include/core/SkPreConfig.h	2011-04-25 20:08:55.031145158 +0300
-@@ -57,6 +57,8 @@
+@@ -37,7 +37,7 @@
- #if !defined(SK_RESTRICT)
+         #define SK_BUILD_FOR_WIN32
-     #define SK_RESTRICT __restrict__
+     #elif defined(__SYMBIAN32__)
- #endif
+         #define SK_BUILD_FOR_WIN32
-+#undef SK_RESTRICT
+-    #elif defined(linux)
-+#define SK_RESTRICT
++    #elif defined(linux) || defined(__FreeBSD__)
- 
+         #define SK_BUILD_FOR_UNIX
- //////////////////////////////////////////////////////////////////////
+     #elif TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
- 
+         #define SK_BUILD_FOR_IOS

www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py

@@ -1,18 +1,18 @@
---- ./tools/gyp/pylib/gyp/generator/make.py.orig	2010-12-16 02:33:33.000000000 +0100
+--- tools/gyp/pylib/gyp/generator/make.py.orig	2011-03-01 10:47:14.000000000 +0100
-+++ ./tools/gyp/pylib/gyp/generator/make.py	2010-12-20 20:15:08.000000000 +0100
++++ tools/gyp/pylib/gyp/generator/make.py	2011-03-01 21:25:10.000000000 +0100
-@@ -106,7 +106,7 @@
+@@ -114,7 +114,7 @@
  #   export LINK="$(CXX)"
  #
  # This will allow make to invoke N linker processes as specified in -jN.
--LINK ?= flock $(builddir)/linker.lock $(CXX)
+-LINK ?= flock $(builddir)/linker.lock $(CXX) %(LINK_flags)s
-+LINK ?= $(CXX)
++LINK ?= $(CXX) %(LINK_flags)s
- 
- # We want to use GNU ar's T option if available because it's much faster.
- # We try to archive and link a file to see ar and ld support this feature.
-@@ -147,13 +147,13 @@
-   ARFLAGS.target := $(call detect_arflags,target)
- endif
  
+ CC.target ?= $(CC)
+ CFLAGS.target ?= $(CFLAGS)
+@@ -129,13 +129,13 @@
+ # in gyp's make.py where ARFLAGS.host etc. is computed.
+ # TODO(evan): move all cross-compilation logic to gyp-time so we don't need
+ # to replicate this environment fallback in make as well.
 -CC.host ?= gcc
 -CFLAGS.host ?=
 -CXX.host ?= g++
@@ -27,6 +27,6 @@
 +LINK.host ?= $(LINK)
 +LDFLAGS.host ?= $(LDFLAGS)
 +AR.host ?= $(AR)
- # See the description for ARFLAGS.target.
+ ARFLAGS.host := %(ARFLAGS.host)s
- -include $(obj).host/arflags/arflags.mk
+ 
- # Temporarily disabled -- see ARFLAGS.target.
+ # Flags to make gcc output dependency info.  Note that you need to be

www/chromium/files/patch-ui__base__resource__resource_bundle.cc

@@ -1,11 +1,11 @@
---- ui/base/resource/resource_bundle.cc.orig	2011-01-26 10:31:08.000000000 +0100
+--- ui/base/resource/resource_bundle.cc.orig	2011-04-15 11:02:03.000000000 +0300
-+++ ui/base/resource/resource_bundle.cc	2011-01-30 00:45:39.000000000 +0100
++++ ui/base/resource/resource_bundle.cc	2011-04-16 23:02:04.027069500 +0300
-@@ -176,7 +176,7 @@
+@@ -129,7 +129,7 @@
- #if defined(OS_MACOSX)
+   return *GetEmptyImage();
-   return rb.GetNSImageNamed(resource_id);
+ }
- #elif defined(USE_X11) && !defined(TOOLKIT_VIEWS)
+ 
--  return rb.GetPixbufNamed(resource_id);
+-#if !defined(OS_MACOSX) && !defined(OS_LINUX)
-+  return (gfx::NativeImage)rb.GetPixbufNamed(resource_id);
++#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_FREEBSD)
- #else
+ // Only Mac and Linux have non-Skia native image types. All other platforms use
-   return rb.GetBitmapNamed(resource_id);
+ // Skia natively, so just use GetImageNamed().
- #endif
+ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {

www/chromium/files/patch-ui__gfx__image.cc

@@ -0,0 +1,74 @@
+--- ui/gfx/image.cc.orig	2011-04-21 23:28:33.509559314 +0300
++++ ui/gfx/image.cc	2011-04-21 23:28:36.737559521 +0300
+@@ -9,7 +9,7 @@
+ #include "base/logging.h"
+ #include "third_party/skia/include/core/SkBitmap.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <glib-object.h>
+ #include "ui/gfx/canvas_skia.h"
+@@ -29,7 +29,7 @@
+ const SkBitmap* NSImageToSkBitmap(NSImage* image);
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ const SkBitmap* GdkPixbufToSkBitmap(GdkPixbuf* pixbuf) {
+   gfx::CanvasSkia canvas(gdk_pixbuf_get_width(pixbuf),
+                          gdk_pixbuf_get_height(pixbuf),
+@@ -61,7 +61,7 @@
+     return reinterpret_cast<SkBitmapRep*>(this);
+   }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+   GdkPixbufRep* AsGdkPixbufRep() {
+     CHECK_EQ(type_, Image::kGdkPixbufRep);
+     return reinterpret_cast<GdkPixbufRep*>(this);
+@@ -102,7 +102,7 @@
+   DISALLOW_COPY_AND_ASSIGN(SkBitmapRep);
+ };
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ class GdkPixbufRep : public ImageRep {
+  public:
+   explicit GdkPixbufRep(GdkPixbuf* pixbuf)
+@@ -158,7 +158,7 @@
+   AddRepresentation(rep);
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ Image::Image(GdkPixbuf* pixbuf)
+     : default_representation_(Image::kGdkPixbufRep) {
+   internal::GdkPixbufRep* rep = new internal::GdkPixbufRep(pixbuf);
+@@ -190,7 +190,7 @@
+   return *(this->operator const SkBitmap*());
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ Image::operator GdkPixbuf*() {
+   internal::ImageRep* rep = GetRepresentation(Image::kGdkPixbufRep);
+   return rep->AsGdkPixbufRep()->pixbuf();
+@@ -237,7 +237,7 @@
+   // Handle native-to-Skia conversion.
+   if (rep_type == Image::kSkBitmapRep) {
+     internal::SkBitmapRep* rep = NULL;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+     if (default_representation_ == Image::kGdkPixbufRep) {
+       internal::GdkPixbufRep* pixbuf_rep = default_rep->AsGdkPixbufRep();
+       rep = new internal::SkBitmapRep(
+@@ -261,7 +261,7 @@
+   if (default_rep->type() == Image::kSkBitmapRep) {
+     internal::SkBitmapRep* skia_rep = default_rep->AsSkBitmapRep();
+     internal::ImageRep* native_rep = NULL;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+     if (rep_type == Image::kGdkPixbufRep) {
+       GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(skia_rep->bitmap());
+       native_rep = new internal::GdkPixbufRep(pixbuf);

www/chromium/files/patch-ui__gfx__image.h

@@ -0,0 +1,20 @@
+--- ui/gfx/image.h.orig	2011-04-19 23:12:17.508039568 +0300
++++ ui/gfx/image.h	2011-04-19 23:12:44.348038227 +0300
+@@ -43,7 +43,7 @@
+   // Creates a new image with the default representation. The object will take
+   // ownership of the image.
+   explicit Image(const SkBitmap* bitmap);
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+   // Does not increase |pixbuf|'s reference count; expects to take ownership.
+   explicit Image(GdkPixbuf* pixbuf);
+ #elif defined(OS_MACOSX)
+@@ -57,7 +57,7 @@
+   // Conversion handlers.
+   operator const SkBitmap*();
+   operator const SkBitmap&();
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+   operator GdkPixbuf*();
+ #elif defined(OS_MACOSX)
+   operator NSImage*();

www/chromium/files/patch-ui__gfx__native_widget_types.h

@@ -1,5 +1,5 @@
---- gfx/native_widget_types.h.orig	2011-03-20 22:02:04.270736223 +0200
+--- ui/gfx/native_widget_types.h.orig	2011-04-16 22:00:39.271073137 +0300
-+++ gfx/native_widget_types.h	2011-03-20 22:02:04.441738962 +0200
++++ ui/gfx/native_widget_types.h	2011-04-16 22:02:38.712069130 +0300
 @@ -97,7 +97,7 @@
  
  #if defined(OS_MACOSX)

www/chromium/files/patch-v8__src__platform-freebsd.cc

@@ -1,91 +0,0 @@
---- v8/src/platform-freebsd.cc.orig	2011-03-15 05:43:39.000000000 +0200
-+++ v8/src/platform-freebsd.cc	2011-03-15 05:52:01.000000000 +0200
-@@ -53,6 +53,7 @@
- #include "v8.h"
- 
- #include "platform.h"
-+#include "top.h"
- #include "vm-state-inl.h"
- 
- 
-@@ -526,6 +527,16 @@
-     return result;
-   }
- 
-+  virtual bool TryLock() {
-+    int result = pthread_mutex_trylock(&mutex_);
-+    // Return false if the lock is busy and locking failed.
-+    if (result == EBUSY) {
-+      return false;
-+    }
-+    ASSERT(result == 0);  // Verify no other errors.
-+    return true;
-+  }
-+
-  private:
-   pthread_mutex_t mutex_;   // Pthread mutex for POSIX platforms.
- };
-@@ -595,39 +606,41 @@
- #ifdef ENABLE_LOGGING_AND_PROFILING
- 
- static Sampler* active_sampler_ = NULL;
-+static pthread_t vm_tid_ = 0;
- 
- static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
-   USE(info);
-   if (signal != SIGPROF) return;
--  if (active_sampler_ == NULL) return;
- 
--  TickSample sample;
-+  if (active_sampler_ == NULL || !active_sampler_->IsActive()) return;
-+  if (vm_tid_ != pthread_self()) return;
- 
--  // We always sample the VM state.
--  sample.state = VMState::current_state();
-+  TickSample sample_obj;
-+  TickSample* sample = CpuProfiler::TickSampleEvent();
-+  if (sample == NULL) sample = &sample_obj;
-+
-+  // Extracting the sample from the context is extremely machine dependent.
-+  ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
-+  mcontext_t& mcontext = ucontext->uc_mcontext;
-+  sample->state = Top::current_vm_state();
- 
--  // If profiling, we extract the current pc and sp.
--  if (active_sampler_->IsProfiling()) {
--    // Extracting the sample from the context is extremely machine dependent.
--    ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
--    mcontext_t& mcontext = ucontext->uc_mcontext;
- #if V8_HOST_ARCH_IA32
--    sample.pc = reinterpret_cast<Address>(mcontext.mc_eip);
--    sample.sp = reinterpret_cast<Address>(mcontext.mc_esp);
--    sample.fp = reinterpret_cast<Address>(mcontext.mc_ebp);
-+  sample->pc = reinterpret_cast<Address>(mcontext.mc_eip);
-+  sample->sp = reinterpret_cast<Address>(mcontext.mc_esp);
-+  sample->fp = reinterpret_cast<Address>(mcontext.mc_ebp);
- #elif V8_HOST_ARCH_X64
--    sample.pc = reinterpret_cast<Address>(mcontext.mc_rip);
--    sample.sp = reinterpret_cast<Address>(mcontext.mc_rsp);
--    sample.fp = reinterpret_cast<Address>(mcontext.mc_rbp);
-+  sample->pc = reinterpret_cast<Address>(mcontext.mc_rip);
-+  sample->sp = reinterpret_cast<Address>(mcontext.mc_rsp);
-+  sample->fp = reinterpret_cast<Address>(mcontext.mc_rbp);
- #elif V8_HOST_ARCH_ARM
--    sample.pc = reinterpret_cast<Address>(mcontext.mc_r15);
--    sample.sp = reinterpret_cast<Address>(mcontext.mc_r13);
--    sample.fp = reinterpret_cast<Address>(mcontext.mc_r11);
-+  sample->pc = reinterpret_cast<Address>(mcontext.mc_r15);
-+  sample->sp = reinterpret_cast<Address>(mcontext.mc_r13);
-+  sample->fp = reinterpret_cast<Address>(mcontext.mc_r11);
-+#else
-+  UNIMPLEMENTED();
- #endif
--    active_sampler_->SampleStack(&sample);
--  }
--
--  active_sampler_->Tick(&sample);
-+  active_sampler_->SampleStack(sample);
-+  active_sampler_->Tick(sample);
- }
- 
- 

www/chromium/files/patch-webkit__build__webkit_version.py

@@ -1,37 +0,0 @@
---- webkit/build/webkit_version.py.orig	2011-03-15 05:46:26.000000000 +0200
-+++ webkit/build/webkit_version.py	2011-03-15 05:52:33.000000000 +0200
-@@ -45,21 +45,24 @@
- 
-   # "svn info" tells us what we want, but third_party/WebKit does *not*
-   # point at the upstream repo.  So instead we run svn info on the directory
--  # containing the versioning file (which is some subdirectory of WebKit),
--  # then strip that path back off of the resulting URL.
-+  # containing the versioning file (which is some subdirectory of WebKit).
-   version_file_dir = os.path.dirname(version_file)
-   version_info = lastchange.FetchVersionInfo(
-       default_lastchange=None,
-       directory=os.path.join(webkit_dir, version_file_dir))
- 
--  # Now compute the real WebKit URL by stripping off the version file
--  # directory from the URL we get out of version_info.
--  # Further, we want to strip off the "http://svn..." from the left.
--  # This is the root URL from the repository.
--  assert version_info.url.startswith(version_info.root)
--  assert version_info.url.endswith(version_file_dir)
--  webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)]
--  webkit_url = webkit_url.strip('/')
-+  if (version_info.url.startswith(version_info.root) and
-+      version_info.url.endswith(version_file_dir)):
-+    # Now compute the real WebKit URL by stripping off the version file
-+    # directory from the URL we get out of version_info.
-+    # Further, we want to strip off the "http://svn..." from the left.
-+    # This is the root URL from the repository.
-+    webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)]
-+    webkit_url = webkit_url.strip('/')
-+  else:
-+    # The data isn't as we expect: perhaps they're using git without svn?
-+    # Just dump the output directly.
-+    webkit_url = version_info.url
- 
-   return "%s@%s" % (webkit_url, version_info.revision)
- 

www/chromium/pkg-plist

@@ -111,6 +111,7 @@ bin/chrome
 %%DATADIR%%/resources/inspector/Images/goArrow.png
 %%DATADIR%%/resources/inspector/Images/graphLabelCalloutLeft.png
 %%DATADIR%%/resources/inspector/Images/graphLabelCalloutRight.png
+%%DATADIR%%/resources/inspector/Images/helpButtonGlyph.png
 %%DATADIR%%/resources/inspector/Images/largerResourcesButtonGlyph.png
 %%DATADIR%%/resources/inspector/Images/localStorage.png
 %%DATADIR%%/resources/inspector/Images/networkIcon.png