Update to 12.0.742.91

Patches from:	George Liaskos [geo.liaskos gmail com]
Security:	http://www.vuxml.org/freebsd/6887828f-0229-11e0-b84d-00262d5ed8ee.html

74 files changed, 474 insertions, 1535 deletions

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 94771f225be2..0ebfeb854638 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	chromium
 DISTVERSIONPREFIX=	courgette-redacted-
-DISTVERSION=	11.0.696.77
+DISTVERSION=	12.0.742.91
 CATEGORIES=	www
 MASTER_SITES=	http://download.goodking.org/downloads/ \
 		ftp://rene-ladan.nl/pub/distfiles/ \
@@ -32,7 +32,8 @@ LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		nss3.1:${PORTSDIR}/security/nss \
 		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
-		ibus.2:${PORTSDIR}/textproc/ibus
+		ibus.2:${PORTSDIR}/textproc/ibus \
+		cups.2:${PORTSDIR}/print/cups-client
 
 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
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 7b00e24557fc..ba1fea234da8 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,2 +1,2 @@
-SHA256 (chromium-courgette-redacted-11.0.696.77.tar.xz) = b9e7af4b321c058af28f8c5c0ce42720b366fca9dfbe8e310d81589df58fbe32
-SIZE (chromium-courgette-redacted-11.0.696.77.tar.xz) = 115109808
+SHA256 (chromium-courgette-redacted-12.0.742.91.tar.xz) = c4862e7164fb088237deffb293592af1e6628cfe6cd7d5702d295d08123226cf
+SIZE (chromium-courgette-redacted-12.0.742.91.tar.xz) = 120317140
diff --git a/www/chromium/files/patch-app__app_base.gypi b/www/chromium/files/patch-app__app_base.gypi
index 80dae77d650f..b9896a8231bc 100644
--- a/www/chromium/files/patch-app__app_base.gypi
+++ b/www/chromium/files/patch-app__app_base.gypi
@@ -1,23 +1,15 @@
---- app/app_base.gypi.orig	2011-04-21 23:19:08.067560122 +0300
-+++ app/app_base.gypi	2011-04-21 23:19:47.444560550 +0300
-@@ -234,6 +234,7 @@
-         'surface/io_surface_support_mac.h',
-         'surface/transport_dib.h',
-         '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',
-@@ -334,7 +335,7 @@
+--- app/app_base.gypi.orig	2011-05-06 12:02:51.000000000 +0300
++++ app/app_base.gypi	2011-06-05 20:27:30.437162962 +0300
+@@ -268,7 +268,7 @@
              ['exclude', '^win/*'],
            ],
          }],
 -        ['OS=="linux"', {
-+        ['OS=="linux" or OS=="freebsd"', {
-           'sources': [
-             'gfx/gl/gl_context_egl.cc',
-             'gfx/gl/gl_context_egl.h',
-@@ -362,11 +363,15 @@
++        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+           'sources!': [
+             '../ui/base/keycodes/keyboard_code_conversion_mac.mm',
+             '../ui/base/keycodes/keyboard_code_conversion_mac.h',
+@@ -281,7 +281,6 @@
              'link_settings': {
                'libraries': [
                  '-lX11',
@@ -25,12 +17,3 @@
                ],
              },
            },
-         }],
-+        ['OS=="freebsd" or OS=="openbsd"', {
-+          'sources!': [
-+            'surface/transport_dib_linux.cc',
-+          ]
-+        }],
-         ['OS=="mac"', {
-           'link_settings': {
-             'libraries': [
diff --git a/www/chromium/files/patch-app__gfx__gl__gl_context_egl.cc b/www/chromium/files/patch-app__gfx__gl__gl_context_egl.cc
deleted file mode 100644
index e55713272ed9..000000000000
--- a/www/chromium/files/patch-app__gfx__gl__gl_context_egl.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- app/gfx/gl/gl_context_egl.cc.orig	2011-04-16 11:01:07.000000000 +0300
-+++ app/gfx/gl/gl_context_egl.cc	2011-04-25 21:52:13.940147280 +0300
-@@ -13,7 +13,7 @@
- // it brings in #defines that cause conflicts.
- #include "app/gfx/gl/gl_bindings.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- extern "C" {
- #include <X11/Xlib.h>
- }
-@@ -85,7 +85,7 @@
-   if (initialized)
-     return true;
- 
--#ifdef OS_LINUX
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   EGLNativeDisplayType native_display = XOpenDisplay(NULL);
- #else
-   EGLNativeDisplayType native_display = EGL_DEFAULT_DISPLAY;
diff --git a/www/chromium/files/patch-app__surface__transport_dib_freebsd.cc b/www/chromium/files/patch-app__surface__transport_dib_freebsd.cc
deleted file mode 100644
index bf07072b4438..000000000000
--- a/www/chromium/files/patch-app__surface__transport_dib_freebsd.cc
+++ /dev/null
@@ -1,99 +0,0 @@
---- app/surface/transport_dib_freebsd.cc.orig	2011-03-20 22:02:04.374736591 +0200
-+++ app/surface/transport_dib_freebsd.cc	2011-03-20 22:02:04.482738307 +0200
-@@ -0,0 +1,96 @@
-+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "app/surface/transport_dib.h"
-+
-+#include <unistd.h>
-+#include <sys/stat.h>
-+
-+#include "base/eintr_wrapper.h"
-+#include "base/shared_memory.h"
-+#include "base/scoped_ptr.h"
-+#include "skia/ext/platform_canvas.h"
-+
-+TransportDIB::TransportDIB()
-+    : size_(0) {
-+}
-+
-+TransportDIB::TransportDIB(TransportDIB::Handle dib)
-+    : shared_memory_(dib, false /* read write */),
-+      size_(0) {
-+}
-+
-+TransportDIB::~TransportDIB() {
-+}
-+
-+// static
-+TransportDIB* TransportDIB::Create(size_t size, uint32 sequence_num) {
-+  TransportDIB* dib = new TransportDIB;
-+  if (!dib->shared_memory_.CreateAndMapAnonymous(size)) {
-+    delete dib;
-+    return NULL;
-+  }
-+
-+  dib->size_ = size;
-+  return dib;
-+}
-+
-+// static
-+TransportDIB* TransportDIB::Map(Handle handle) {
-+  scoped_ptr<TransportDIB> dib(CreateWithHandle(handle));
-+  if (!dib->Map())
-+    return NULL;
-+  return dib.release();
-+}
-+
-+// static
-+TransportDIB* TransportDIB::CreateWithHandle(Handle handle) {
-+  return new TransportDIB(handle);
-+}
-+
-+bool TransportDIB::Map() {
-+  if (!is_valid(handle()))
-+    return false;
-+  if (memory())
-+    return true;
-+
-+  struct stat st;
-+  if ((fstat(shared_memory_.handle().fd, &st) != 0) ||
-+      (!shared_memory_.Map(st.st_size))) {
-+    return false;
-+  }
-+
-+  size_ = st.st_size;
-+  return true;
-+}
-+
-+bool TransportDIB::is_valid(Handle dib) {
-+  return dib.fd >= 0;
-+}
-+
-+skia::PlatformCanvas* TransportDIB::GetPlatformCanvas(int w, int h) {
-+  return new skia::PlatformCanvas(w, h, true,
-+                                  reinterpret_cast<uint8_t*>(memory()));
-+}
-+
-+void* TransportDIB::memory() const {
-+  return shared_memory_.memory();
-+}
-+
-+TransportDIB::Id TransportDIB::id() const {
-+  return shared_memory_.id();
-+}
-+
-+TransportDIB::Handle TransportDIB::handle() const {
-+  return shared_memory_.handle();
-+}
-+
-+XID TransportDIB::MapToX(Display* display) {
-+  if (!x_shm_) {
-+    x_shm_ = ui::AttachSharedMemory(display, key_);
-+    display_ = display;
-+  }
-+
-+  return x_shm_;
-+}
diff --git a/www/chromium/files/patch-base__base.gypi b/www/chromium/files/patch-base__base.gypi
index bd153b7557b3..577e745e87ad 100644
--- a/www/chromium/files/patch-base__base.gypi
+++ b/www/chromium/files/patch-base__base.gypi
@@ -1,6 +1,6 @@
---- base/base.gypi.orig	2011-03-21 21:48:13.059300970 +0200
-+++ base/base.gypi	2011-03-21 21:49:30.340376078 +0200
-@@ -157,6 +157,7 @@
+--- base/base.gypi.orig	2011-05-06 12:03:16.000000000 +0300
++++ base/base.gypi	2011-06-05 19:27:52.717164750 +0300
+@@ -190,6 +190,7 @@
            'process_posix.cc',
            'process_util.cc',
            'process_util.h',
@@ -8,7 +8,7 @@
            'process_util_linux.cc',
            'process_util_mac.mm',
            'process_util_posix.cc',
-@@ -343,11 +344,9 @@
+@@ -363,11 +364,9 @@
                  'message_pump_glib_x.cc',
                ],
            }],
@@ -21,7 +21,20 @@
                  'linux_util.cc',
                ],
              },
-@@ -462,6 +461,12 @@
+@@ -408,10 +407,10 @@
+           },],
+           ['OS=="freebsd" or OS=="openbsd"', {
+             'sources!': [
+-              'base/files/file_path_watcher_linux.cc',
++              'files/file_path_watcher_linux.cc',
+             ],
+             'sources': [
+-              'base/files/file_path_watcher_stub.cc',
++              'files/file_path_watcher_stub.cc',
+             ],
+           }],
+         ],
+@@ -481,6 +480,12 @@
              ],
          }],
          [ 'OS == "freebsd" or OS == "openbsd"', {
diff --git a/www/chromium/files/patch-base__files__file_path_watcher_stub.cc b/www/chromium/files/patch-base__files__file_path_watcher_stub.cc
new file mode 100644
index 000000000000..c37553bc6d6a
--- /dev/null
+++ b/www/chromium/files/patch-base__files__file_path_watcher_stub.cc
@@ -0,0 +1,21 @@
+--- base/files/file_path_watcher_stub.cc.orig	2011-05-06 12:03:16.000000000 +0300
++++ base/files/file_path_watcher_stub.cc	2011-06-04 15:41:10.461378331 +0300
+@@ -15,10 +15,16 @@
+ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
+  public:
+   virtual bool Watch(const FilePath& path,
+-                     FileWatcher::Delegate* delegate,
+-                     base::MessageLoopProxy*) OVERRIDE {
++                     FilePathWatcher::Delegate* delegate) OVERRIDE {
+     return false;
+   }
++
++  virtual void Cancel() OVERRIDE {
++    set_cancelled();
++  }
++
++ protected:
++  virtual void CancelOnMessageLoopThread() OVERRIDE { }
+ };
+ 
+ }  // namespace
diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi
index ccca205b5aee..5f7533af98d2 100644
--- a/www/chromium/files/patch-build__common.gypi
+++ b/www/chromium/files/patch-build__common.gypi
@@ -1,6 +1,15 @@
---- ./build/common.gypi.orig	2010-12-20 20:09:09.000000000 +0100
-+++ ./build/common.gypi	2010-12-20 20:15:08.000000000 +0100
-@@ -230,7 +230,7 @@
+--- build/common.gypi.orig	2011-05-06 12:03:15.000000000 +0300
++++ build/common.gypi	2011-06-05 22:52:31.690163552 +0300
+@@ -95,7 +95,7 @@
+       'file_manager_extension%': 0,
+ 
+       # Python version.
+-      'python_ver%': '2.5',
++      'python_ver%': '2.6',
+ 
+       # Set ARM-v7 compilation flags
+       'armv7%': 0,
+@@ -256,7 +256,7 @@
  
      # Whether proprietary audio/video codecs are assumed to be included with
      # this build (only meaningful if branding!=Chrome).
@@ -9,7 +18,7 @@
  
      # TODO(bradnelson): eliminate this when possible.
      # To allow local gyp files to prevent release.vsprops from being included.
-@@ -279,8 +279,8 @@
+@@ -321,8 +321,8 @@
      # Disable TCMalloc's debugallocation.
      'linux_use_debugallocation%': 0,
  
@@ -20,7 +29,7 @@
  
      # Disable shadow stack keeping used by heapcheck to unwind the stacks
      # better.
-@@ -298,7 +298,7 @@
+@@ -337,7 +337,7 @@
  
      # Used to disable Native Client at compile time, for platforms where it
      # isn't supported
@@ -29,7 +38,34 @@
  
      # Set Thumb compilation flags.
      'arm_thumb%': 0,
-@@ -638,7 +638,7 @@
+@@ -368,7 +368,7 @@
+     # Set to 1 to compile with the built in pdf viewer.
+     'internal_pdf%': 0,
+ 
+-    # This allows to use libcros from the current system, ie. /usr/lib/
++    # This allows to use libcros from the current system, ie. /usr/local/lib/
+     # The cros_api will be pulled in as a static library, and all headers
+     # from the system include dirs.
+     'system_libcros%': 0,
+@@ -405,7 +405,7 @@
+         # This is used to tweak build flags for gcc 4.4.
+         'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
+         # Figure out the python architecture to decide if we build pyauto.
+-        'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/lib/libpython<(python_ver).so.1.0)',
++        'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/local/lib/libpython<(python_ver).so.1)',
+         'conditions': [
+           ['branding=="Chrome"', {
+             'linux_breakpad%': 1,
+@@ -478,7 +478,7 @@
+         ],
+       }],
+ 
+-      ['OS=="mac" or (OS=="linux" and chromeos==0 and target_arch!="arm")', {
++      ['OS=="mac" or OS=="freebsd" or (OS=="linux" and chromeos==0 and target_arch!="arm")', {
+         'use_cups%': 1,
+       }, {
+         'use_cups%': 0,
+@@ -779,7 +779,7 @@
                ['exclude', '(^|/)(gtk|x11)_[^/]*\\.(h|cc)$'],
              ],
            }],
diff --git a/www/chromium/files/patch-build__linux__python_arch.sh b/www/chromium/files/patch-build__linux__python_arch.sh
deleted file mode 100644
index c95c7569440c..000000000000
--- a/www/chromium/files/patch-build__linux__python_arch.sh
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./build/linux/python_arch.sh.orig	2010-12-16 02:11:47.000000000 +0100
-+++ ./build/linux/python_arch.sh	2010-12-20 20:15:08.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- # Copyright (c) 2010 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.
-@@ -10,12 +10,7 @@
- #  python_arch.sh /path/to/sysroot/usr/lib/libpython2.4.so.1.0
- #
- 
--python=$(readlink -f "$1")
--if [ ! -r "$python" ]; then
--  echo unknown
--  exit 0;
--fi
--file_out=$(file "$python")
-+file_out=$(file "$1")
- if [ $? -ne 0 ]; then
-   echo unknown
-   exit 0;
diff --git a/www/chromium/files/patch-chrome__app__chrome_exe_main_gtk.cc b/www/chromium/files/patch-chrome__app__chrome_exe_main_gtk.cc
index a4a9b652211c..f4f31a849d33 100644
--- a/www/chromium/files/patch-chrome__app__chrome_exe_main_gtk.cc
+++ b/www/chromium/files/patch-chrome__app__chrome_exe_main_gtk.cc
@@ -1,25 +1,13 @@
---- chrome/app/chrome_exe_main_gtk.cc.orig	2011-04-16 11:01:37.000000000 +0300
-+++ chrome/app/chrome_exe_main_gtk.cc	2011-04-25 20:11:07.659145645 +0300
-@@ -3,7 +3,7 @@
- // found in the LICENSE file.
- 
- #include "base/process_util.h"
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
- #include "chrome/browser/first_run/first_run.h"
- #endif
- 
-@@ -19,16 +19,18 @@
+--- chrome/app/chrome_exe_main_gtk.cc.orig	2011-05-06 12:03:31.000000000 +0300
++++ chrome/app/chrome_exe_main_gtk.cc	2011-06-03 23:30:58.238403064 +0300
+@@ -18,14 +18,16 @@
  extern "C" {
  int ChromeMain(int argc, const char** argv);
  
 -#if defined(OS_LINUX) && defined(USE_TCMALLOC)
 +#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && defined(USE_TCMALLOC)
- 
  int tc_set_new_mode(int mode);
- 
--#endif  // defined(OS_LINUX) && defined(USE_TCMALLOC)
-+#endif  // (defined(OS_LINUX) || defined(OS_FREEBSD)) && defined(USE_TCMALLOC)
+ #endif
  }
  
  int main(int argc, const char** argv) {
@@ -30,7 +18,7 @@
  
    // 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 @@
+@@ -33,7 +35,7 @@
    // dependency on TCMalloc.  Really, we ought to have our allocator shim code
    // implement this EnableTerminationOnOutOfMemory() function.  Whateverz.  This
    // works for now.
diff --git a/www/chromium/files/patch-chrome__app__generated_resources.grd b/www/chromium/files/patch-chrome__app__generated_resources.grd
index 37fe7fb7b105..084984d79a3d 100644
--- a/www/chromium/files/patch-chrome__app__generated_resources.grd
+++ b/www/chromium/files/patch-chrome__app__generated_resources.grd
@@ -1,6 +1,6 @@
---- chrome/app/generated_resources.grd.orig	2011-03-20 22:02:04.245737794 +0200
-+++ chrome/app/generated_resources.grd	2011-03-20 22:02:04.423741982 +0200
-@@ -935,7 +935,7 @@
+--- chrome/app/generated_resources.grd.orig	2011-05-06 12:03:31.000000000 +0300
++++ chrome/app/generated_resources.grd	2011-06-05 19:45:04.234163139 +0300
+@@ -1000,7 +1000,7 @@
            Preferences...
          </message>
        </if>
@@ -9,16 +9,7 @@
          <message name="IDS_PREFERENCES" desc="The text label of the Preferences menu item.">
            Preferences
          </message>
-@@ -6527,7 +6527,7 @@
-       <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>
--      <if expr="os == 'linux2'">
-+      <if expr="os == 'linux2' or os.find('bsd') != -1">
-         <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 @@
+@@ -7124,7 +7124,7 @@
          </message>
        </if>
  
@@ -27,7 +18,16 @@
          <message name="IDS_AUTOFILL_OPTIONS_TITLE" desc="The title of the Autofill dialog.">
            Autofill Preferences
          </message>
-@@ -11110,7 +11110,7 @@
+@@ -9416,7 +9416,7 @@
+       </if> <!-- os == 'darwin' -->
+ 
+       <!-- Linux Global Menubar Menus -->
+-      <if expr="os == 'linux2'">
++      <if expr="os == 'linux2' or os.find('bsd') != -1">
+         <!-- Unity and some other GNOME configurations now have a permanent,
+              Mac-like menu bar that lives outside the window at the top of the
+              screen. The following strings should be in Linux style, not Mac
+@@ -12115,7 +12115,7 @@
        Import bookmarks now...
      </message>
  
diff --git a/www/chromium/files/patch-chrome__browser__browser_main_posix.cc b/www/chromium/files/patch-chrome__browser__browser_main_posix.cc
index 0150fa45b882..fda3fc563ede 100644
--- a/www/chromium/files/patch-chrome__browser__browser_main_posix.cc
+++ b/www/chromium/files/patch-chrome__browser__browser_main_posix.cc
@@ -1,5 +1,5 @@
---- chrome/browser/browser_main_posix.cc.orig	2011-05-27 22:17:55.589297382 +0300
-+++ chrome/browser/browser_main_posix.cc	2011-05-27 22:19:02.906188216 +0300
+--- chrome/browser/browser_main_posix.cc.orig	2011-05-06 12:03:38.000000000 +0300
++++ chrome/browser/browser_main_posix.cc	2011-06-03 23:58:29.518404852 +0300
 @@ -20,7 +20,7 @@
  #include "chrome/common/chrome_switches.h"
  #include "content/browser/browser_thread.h"
@@ -9,15 +9,14 @@
  #include "chrome/browser/printing/print_dialog_gtk.h"
  #endif
  
-@@ -236,9 +236,9 @@
+@@ -230,8 +230,8 @@
      }
    }
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
-   printing::PrintingContextCairo::SetPrintingFunctions(
-       &PrintDialogGtk::CreatePrintDialog,
-       &PrintDialogGtk::PrintDocument);
+   printing::PrintingContextCairo::SetCreatePrintDialogFunction(
+       &PrintDialogGtk::CreatePrintDialog);
 -#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#endif  // (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
  }
diff --git a/www/chromium/files/patch-chrome__browser__sync__engine__syncer_thread.cc b/www/chromium/files/patch-chrome__browser__sync__engine__syncer_thread.cc
deleted file mode 100644
index 495526589ded..000000000000
--- a/www/chromium/files/patch-chrome__browser__sync__engine__syncer_thread.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./chrome/browser/sync/engine/syncer_thread.cc.orig	2010-12-16 02:11:54.000000000 +0100
-+++ ./chrome/browser/sync/engine/syncer_thread.cc	2010-12-20 20:15:08.000000000 +0100
-@@ -264,7 +264,7 @@
-   bool initial_sync_for_thread = true;
-   bool continue_sync_cycle = false;
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   idle_query_.reset(new IdleQueryLinux());
- #endif
- 
-@@ -359,7 +359,7 @@
-         static_cast<int>(vault_.current_wait_interval_.poll_delta.InSeconds()),
-         &user_idle_milliseconds, &continue_sync_cycle, nudged);
-   }
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   idle_query_.reset();
- #endif
- }
-@@ -833,7 +833,7 @@
-     return 0;
-   }
-   return idle_time / 1000000;  // nano to milli
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
-   if (idle_query_.get())
-     return idle_query_->IdleTime();
-   return 0;
diff --git a/www/chromium/files/patch-chrome__browser__sync__engine__syncer_thread.h b/www/chromium/files/patch-chrome__browser__sync__engine__syncer_thread.h
deleted file mode 100644
index 0053976a30de..000000000000
--- a/www/chromium/files/patch-chrome__browser__sync__engine__syncer_thread.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/sync/engine/syncer_thread.h.orig	2011-01-06 10:01:41.000000000 +0100
-+++ chrome/browser/sync/engine/syncer_thread.h	2011-01-09 20:25:21.000000000 +0100
-@@ -26,7 +26,7 @@
- #include "chrome/browser/sync/syncable/model_type.h"
- #include "chrome/common/deprecated/event_sys-inl.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- #include "chrome/browser/sync/engine/idle_query_linux.h"
- #endif
- 
-@@ -329,7 +329,7 @@
-       NudgeSource source,
-       const syncable::ModelTypeBitSet& model_types);
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   // On Linux, we need this information in order to query idle time.
-   scoped_ptr<IdleQueryLinux> idle_query_;
- #endif
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__download_item_view.cc b/www/chromium/files/patch-chrome__browser__ui__views__download__download_item_view.cc
index 678955062c1a..1b0d98097b4e 100644
--- a/www/chromium/files/patch-chrome__browser__ui__views__download_item_view.cc
+++ b/www/chromium/files/patch-chrome__browser__ui__views__download__download_item_view.cc
@@ -1,5 +1,5 @@
---- 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	2011-04-15 22:56:06.858645022 +0300
+--- chrome/browser/ui/views/download/download_item_view.cc.orig	2011-04-15 11:01:46.000000000 +0300
++++ chrome/browser/ui/views/download/download_item_view.cc	2011-04-15 22:56:06.858645022 +0300
 @@ -261,7 +261,7 @@
  
      // Extract the file extension (if any).
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__extensions__extension_popup.cc b/www/chromium/files/patch-chrome__browser__ui__views__extensions__extension_popup.cc
index 37d397a1d1ba..315d52672a1a 100644
--- a/www/chromium/files/patch-chrome__browser__ui__views__extensions__extension_popup.cc
+++ b/www/chromium/files/patch-chrome__browser__ui__views__extensions__extension_popup.cc
@@ -1,11 +1,5 @@
---- 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	2011-04-15 23:02:00.445641973 +0300
-@@ -1,4 +1,4 @@
--// 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.
- 
+--- chrome/browser/ui/views/extensions/extension_popup.cc.orig	2011-05-06 12:03:37.000000000 +0300
++++ chrome/browser/ui/views/extensions/extension_popup.cc	2011-06-04 00:14:39.536404067 +0300
 @@ -23,7 +23,7 @@
  #include "views/widget/root_view.h"
  #include "views/window/window.h"
@@ -15,12 +9,3 @@
  #include "views/widget/widget_gtk.h"
  #endif
  
-@@ -94,7 +94,7 @@
- 
-   // The bubble chrome requires a separate window, so construct it here.
-   gfx::NativeView native_window = frame->GetNativeView();
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
-   border_widget_ = new views::WidgetGtk(views::WidgetGtk::TYPE_WINDOW);
-   static_cast<views::WidgetGtk*>(border_widget_)->MakeTransparent();
-   static_cast<views::WidgetGtk*>(border_widget_)->make_transient_to_parent();
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__find_bar_view.cc b/www/chromium/files/patch-chrome__browser__ui__views__find_bar_view.cc
deleted file mode 100644
index 1afea304c2d1..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__find_bar_view.cc
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./chrome/browser/ui/views/find_bar_view.cc.orig	2010-12-16 02:11:56.000000000 +0100
-+++ ./chrome/browser/ui/views/find_bar_view.cc	2010-12-20 20:15:08.000000000 +0100
-@@ -85,7 +85,7 @@
- 
- FindBarView::FindBarView(FindBarHost* host)
-     : DropdownBarView(host),
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
-       ignore_contents_changed_(false),
- #endif
-       find_text_(NULL),
-@@ -174,11 +174,11 @@
- }
- 
- void FindBarView::SetFindText(const string16& find_text) {
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
-   ignore_contents_changed_ = true;
- #endif
-   find_text_->SetText(find_text);
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
-   ignore_contents_changed_ = false;
- #endif
- }
-@@ -465,7 +465,7 @@
- 
- void FindBarView::ContentsChanged(views::Textfield* sender,
-                                   const string16& new_contents) {
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
-   // On gtk setting the text in the find view causes a notification.
-   if (ignore_contents_changed_)
-     return;
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__find_bar_view.h b/www/chromium/files/patch-chrome__browser__ui__views__find_bar_view.h
deleted file mode 100644
index ba9c7bce89c9..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__find_bar_view.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./chrome/browser/ui/views/find_bar_view.h.orig	2010-12-16 02:11:56.000000000 +0100
-+++ ./chrome/browser/ui/views/find_bar_view.h	2010-12-20 20:15:08.000000000 +0100
-@@ -125,7 +125,7 @@
-   // between us and the TabContentsView.
-   FindBarHost* find_bar_host() const;
- 
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
-   // In GTK we get changed signals if we programmatically set the text. If we
-   // don't ignore them we run into problems. For example, switching tabs back
-   // to one with the find bar visible will cause a search to the next found
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_view.cc b/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_view.cc
index 973589e9d3ee..7a2053d6fa9d 100644
--- a/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_view.cc
+++ b/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-04-15 11:01:45.000000000 +0300
-+++ chrome/browser/ui/views/frame/browser_view.cc	2011-04-16 18:06:47.910070832 +0300
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2011-05-06 12:03:37.000000000 +0300
++++ chrome/browser/ui/views/frame/browser_view.cc	2011-06-04 00:29:37.489403401 +0300
 @@ -4,7 +4,7 @@
  
  #include "chrome/browser/ui/views/frame/browser_view.h"
@@ -9,25 +9,16 @@
  #include <gtk/gtk.h>
  #endif
  
-@@ -90,7 +90,7 @@
- #include "chrome/browser/jumplist_win.h"
+@@ -97,7 +97,7 @@
  #include "ui/base/message_box_win.h"
  #include "ui/base/view_prop.h"
+ #include "views/window/window_win.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"
-@@ -1162,7 +1162,7 @@
-   string16 message = l10n_util::GetStringUTF16(message_id);
-   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(),
-@@ -1256,7 +1256,7 @@
+@@ -1079,7 +1079,7 @@
    views::FocusManager* focus_manager = GetFocusManager();
    DCHECK(focus_manager);
  
@@ -36,7 +27,7 @@
    // 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.
-@@ -1303,7 +1303,7 @@
+@@ -1126,7 +1126,7 @@
      return false;
  
    // Executing the command may cause |this| object to be destroyed.
@@ -45,16 +36,16 @@
    if (browser_->IsReservedCommandOrKey(id, event) &&
        !event.match_edit_command) {
  #else
-@@ -1320,7 +1320,7 @@
+@@ -1143,7 +1143,7 @@
  }
  
  void BrowserView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
 -#if defined(OS_LINUX) && !defined(TOUCH_UI)
 +#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(TOUCH_UI)
    views::Window* window = GetWidget()->GetWindow();
-   if (window && event.os_event && !event.skip_in_browser)
-     static_cast<views::WindowGtk*>(window)->HandleKeyboardEvent(event.os_event);
-@@ -2247,7 +2247,7 @@
+   if (window && event.os_event && !event.skip_in_browser) {
+     views::KeyEvent views_event(reinterpret_cast<GdkEvent*>(event.os_event));
+@@ -2135,7 +2135,7 @@
  #endif  // No need to invoke SetFullscreen for linux as this code is executed
          // once we're already fullscreen on linux.
  
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__fullscreen_exit_bubble.cc b/www/chromium/files/patch-chrome__browser__ui__views__fullscreen_exit_bubble.cc
index 62bf764a1192..4f76f05b1c96 100644
--- a/www/chromium/files/patch-chrome__browser__ui__views__fullscreen_exit_bubble.cc
+++ b/www/chromium/files/patch-chrome__browser__ui__views__fullscreen_exit_bubble.cc
@@ -1,38 +1,11 @@
---- ./chrome/browser/ui/views/fullscreen_exit_bubble.cc.orig	2010-12-16 02:11:56.000000000 +0100
-+++ ./chrome/browser/ui/views/fullscreen_exit_bubble.cc	2010-12-20 20:15:08.000000000 +0100
-@@ -18,7 +18,7 @@
+--- chrome/browser/ui/views/fullscreen_exit_bubble.cc.orig	2011-05-06 12:03:37.000000000 +0300
++++ chrome/browser/ui/views/fullscreen_exit_bubble.cc	2011-06-04 00:31:52.427403621 +0300
+@@ -19,7 +19,7 @@
  #if defined(OS_WIN)
- #include "app/l10n_util_win.h"
+ #include "ui/base/l10n/l10n_util_win.h"
  #include "views/widget/widget_win.h"
 -#elif defined(OS_LINUX)
 +#elif defined(TOOLKIT_GTK)
  #include "views/widget/widget_gtk.h"
  #endif
  
-@@ -119,7 +119,7 @@
-     return MA_NOACTIVATE;
-   }
- };
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- // TODO: figure out the equivalent of MA_NOACTIVATE for gtk.
- #endif
- 
-@@ -154,7 +154,7 @@
-   popup_->set_window_style(WS_POPUP);
-   popup_->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW |
-                               l10n_util::GetExtendedTooltipStyles());
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
-   popup_ = new views::WidgetGtk(views::WidgetGtk::TYPE_POPUP);
-   popup_->MakeTransparent();
- #endif
-@@ -202,7 +202,7 @@
- #if defined(OS_WIN)
-     popup_->MoveWindow(popup_rect.x(), popup_rect.y(), popup_rect.width(),
-                        popup_rect.height());
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
-     popup_->SetBounds(popup_rect);
- #endif
-     popup_->Show();
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__fullscreen_exit_bubble.h b/www/chromium/files/patch-chrome__browser__ui__views__fullscreen_exit_bubble.h
index c16aee35e0f5..43323751439e 100644
--- a/www/chromium/files/patch-chrome__browser__ui__views__fullscreen_exit_bubble.h
+++ b/www/chromium/files/patch-chrome__browser__ui__views__fullscreen_exit_bubble.h
@@ -1,20 +1,11 @@
---- ./chrome/browser/ui/views/fullscreen_exit_bubble.h.orig	2010-12-16 02:11:56.000000000 +0100
-+++ ./chrome/browser/ui/views/fullscreen_exit_bubble.h	2010-12-20 20:15:08.000000000 +0100
-@@ -12,7 +12,7 @@
- #include "chrome/browser/command_updater.h"
- #include "views/controls/link.h"
+--- chrome/browser/ui/views/fullscreen_exit_bubble.h.orig	2011-05-06 12:03:37.000000000 +0300
++++ chrome/browser/ui/views/fullscreen_exit_bubble.h	2011-06-04 00:35:54.816403061 +0300
+@@ -16,7 +16,7 @@
+ class SlideAnimation;
+ }
  
 -#if defined(OS_LINUX)
 +#if defined(TOOLKIT_GTK)
  namespace views {
  class WidgetGtk;
  }
-@@ -76,7 +76,7 @@
-   // The popup itself, which is a slightly modified WidgetWin.  We need to use
-   // a WidgetWin (and thus an HWND) to make the popup float over other HWNDs.
-   FullscreenExitPopup* popup_;
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
-   views::WidgetGtk* popup_;
- #endif
- 
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__info_bubble.cc b/www/chromium/files/patch-chrome__browser__ui__views__info_bubble.cc
deleted file mode 100644
index cc4fe4ba82d6..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__info_bubble.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./chrome/browser/ui/views/info_bubble.cc.orig	2010-12-16 02:11:56.000000000 +0100
-+++ ./chrome/browser/ui/views/info_bubble.cc	2010-12-20 20:15:08.000000000 +0100
-@@ -308,7 +308,7 @@
- 
- InfoBubble::InfoBubble()
-     :
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
-       WidgetGtk(TYPE_WINDOW),
-       border_contents_(NULL),
- #elif defined(OS_WIN)
-@@ -375,7 +375,7 @@
-   WidgetWin::Init(border_->GetNativeView(), gfx::Rect());
- 
-   SetWindowText(GetNativeView(), delegate_->accessible_name().c_str());
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_USES_GTK)
-   MakeTransparent();
-   make_transient_to_parent();
-   WidgetGtk::InitWithWidget(parent, gfx::Rect());
-@@ -447,7 +447,7 @@
-   ShowWindow(SW_SHOW);
-   if (fade_in)
-     FadeIn();
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_USES_GTK)
-   views::WidgetGtk::Show();
- #endif
- }
-@@ -487,7 +487,7 @@
-     GetRootView()->GetChildViewAt(0)->RequestFocus();
-   }
- }
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- void InfoBubble::IsActiveChanged() {
-   if (!IsActive())
-     Close();
-@@ -506,7 +506,7 @@
- #if defined(OS_WIN)
-   border_->Close();
-   WidgetWin::Close();
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
-   WidgetGtk::Close();
- #endif
- }
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__info_bubble.h b/www/chromium/files/patch-chrome__browser__ui__views__info_bubble.h
deleted file mode 100644
index a28bdcb075ee..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__info_bubble.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./chrome/browser/ui/views/info_bubble.h.orig	2010-12-16 02:11:56.000000000 +0100
-+++ ./chrome/browser/ui/views/info_bubble.h	2010-12-20 20:15:08.000000000 +0100
-@@ -14,7 +14,7 @@
- 
- #if defined(OS_WIN)
- #include "views/widget/widget_win.h"
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- #include "views/widget/widget_gtk.h"
- #endif
- 
-@@ -178,7 +178,7 @@
- class InfoBubble
- #if defined(OS_WIN)
-     : public views::WidgetWin,
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
-     : public views::WidgetGtk,
- #endif
-       public views::AcceleratorTarget,
-@@ -252,7 +252,7 @@
- #if defined(OS_WIN)
-   // Overridden from WidgetWin:
-   virtual void OnActivate(UINT action, BOOL minimized, HWND window);
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
-   // Overridden from WidgetGtk:
-   virtual void IsActiveChanged();
- #endif
-@@ -260,7 +260,7 @@
- #if defined(OS_WIN)
-   // The window used to render the padding, border and arrow.
-   BorderWidget* border_;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
-   // The view displaying the border.
-   BorderContents* border_contents_;
- #endif
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__tabs__dragged_tab_view.h b/www/chromium/files/patch-chrome__browser__ui__views__tabs__dragged_tab_view.h
deleted file mode 100644
index f79e77c18b96..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__tabs__dragged_tab_view.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./chrome/browser/ui/views/tabs/dragged_tab_view.h.orig	2010-12-16 02:11:56.000000000 +0100
-+++ ./chrome/browser/ui/views/tabs/dragged_tab_view.h	2010-12-20 20:15:08.000000000 +0100
-@@ -14,7 +14,7 @@
- namespace views {
- #if defined(OS_WIN)
- class WidgetWin;
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- class WidgetGtk;
- #endif
- }
-@@ -71,7 +71,7 @@
-   // The window that contains the DraggedTabView.
- #if defined(OS_WIN)
-   scoped_ptr<views::WidgetWin> container_;
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
-   scoped_ptr<views::WidgetGtk> container_;
- #endif
- 
diff --git a/www/chromium/files/patch-chrome__chrome.gyp b/www/chromium/files/patch-chrome__chrome.gyp
index f7579eb454e9..e75676ddf4b3 100644
--- a/www/chromium/files/patch-chrome__chrome.gyp
+++ b/www/chromium/files/patch-chrome__chrome.gyp
@@ -1,6 +1,6 @@
---- ./chrome/chrome.gyp.orig	2010-12-16 02:12:13.000000000 +0100
-+++ ./chrome/chrome.gyp	2010-12-20 20:15:08.000000000 +0100
-@@ -96,6 +96,10 @@
+--- chrome/chrome.gyp.orig	2011-05-06 12:03:42.000000000 +0300
++++ chrome/chrome.gyp	2011-06-04 00:41:46.403404482 +0300
+@@ -72,6 +72,10 @@
            }],
          ],
        },],
@@ -11,7 +11,7 @@
        ['OS=="mac"', {
          'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist',
          'nacl_defines': [
-@@ -673,7 +677,7 @@
+@@ -419,7 +423,7 @@
          '..',
        ],
        'conditions': [
@@ -20,16 +20,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
            ],
-@@ -795,7 +799,7 @@
-             'gpu/media/mft_angle_video_device.h',
-           ],
-         }],
--        ['OS=="linux" and target_arch!="arm"', {
-+        ['(OS=="linux" or OS=="freebsd") and target_arch!="arm"', {
-           'sources': [
-             'gpu/x_util.cc',
-             'gpu/x_util.h',
-@@ -1175,7 +1179,7 @@
+@@ -769,7 +773,7 @@
              'service/cloud_print/print_system_win.cc',
            ],
          }],
diff --git a/www/chromium/files/patch-chrome__chrome_tests.gypi b/www/chromium/files/patch-chrome__chrome_tests.gypi
index d0b068221ec5..e16c8888d865 100644
--- a/www/chromium/files/patch-chrome__chrome_tests.gypi
+++ b/www/chromium/files/patch-chrome__chrome_tests.gypi
@@ -1,6 +1,6 @@
---- chrome/chrome_tests.gypi.orig	2011-04-16 19:33:32.144068169 +0300
-+++ chrome/chrome_tests.gypi	2011-04-16 19:33:47.813071073 +0300
-@@ -185,7 +185,7 @@
+--- chrome/chrome_tests.gypi.orig	2011-05-06 12:03:42.000000000 +0300
++++ chrome/chrome_tests.gypi	2011-06-04 00:50:16.731405108 +0300
+@@ -191,7 +191,7 @@
          '../content/common/notification_observer_mock.h',
        ],
        'conditions': [
@@ -9,7 +9,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../build/linux/system.gyp:nss',
-@@ -239,7 +239,7 @@
+@@ -245,7 +245,7 @@
              'chrome.gyp:crash_service',  # run time dependency
            ],
          }],
@@ -18,7 +18,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
            ],
-@@ -279,7 +279,7 @@
+@@ -330,7 +330,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
-@@ -325,7 +325,7 @@
+@@ -376,7 +376,7 @@
              },
            },
          },],
@@ -36,7 +36,7 @@
            'dependencies': [
              '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
            ],
-@@ -398,14 +398,14 @@
+@@ -449,14 +449,14 @@
          'test/unit/chrome_test_suite.h',
        ],
        'conditions': [
@@ -53,7 +53,7 @@
            'sources!': [
              # TODO(port)
              'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
-@@ -606,12 +606,12 @@
+@@ -657,12 +657,12 @@
              '../webkit/webkit.gyp:copy_npapi_test_plugin',
            ],
          }],
@@ -68,7 +68,7 @@
            'sources!': [
              'browser/process_singleton_linux_uitest.cc',
            ],
-@@ -782,7 +782,7 @@
+@@ -837,7 +837,7 @@
          'test/webdriver/commands/webelement_commands.cc',
        ],
        'conditions': [
@@ -77,8 +77,8 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -1893,7 +1893,7 @@
-             ['exclude', '^browser/chromeos/'],
+@@ -1946,7 +1946,7 @@
+             ['exclude', '^browser/ui/webui/chromeos/login'],
            ],
          }],
 -        ['OS=="linux"', {
@@ -86,7 +86,7 @@
            'conditions': [
              ['gcc_version==44', {
                # Avoid gcc 4.4 strict aliasing issues in stl_tree.h when
-@@ -1930,7 +1930,7 @@
+@@ -1983,7 +1983,7 @@
            'sources!': [
              'browser/printing/print_job_unittest.cc',
            ],
@@ -95,8 +95,8 @@
            'sources!': [
              'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
              'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
-@@ -2420,7 +2420,7 @@
-             '../content/browser/renderer_host/render_view_host_manager_browsertest.cc',
+@@ -2481,7 +2481,7 @@
+             '../content/browser/child_process_security_policy_browsertest.cc',
            ],
          }],
 -        ['OS=="linux"', {
@@ -104,7 +104,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../build/linux/system.gyp:nss',
-@@ -2589,7 +2589,7 @@
+@@ -2650,7 +2650,7 @@
              },
            },
          },],
@@ -113,7 +113,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -2690,7 +2690,7 @@
+@@ -2751,7 +2751,7 @@
              },
            },
          },],
@@ -122,7 +122,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
            ],
-@@ -2727,7 +2727,7 @@
+@@ -2788,7 +2788,7 @@
              },
            },
          },],
@@ -131,7 +131,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -2764,7 +2764,7 @@
+@@ -2825,7 +2825,7 @@
          'test/tab_switching/tab_switching_test.cc',
        ],
        'conditions': [
@@ -140,7 +140,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -2798,7 +2798,7 @@
+@@ -2859,7 +2859,7 @@
          'test/memory_test/memory_test.cc',
        ],
        'conditions': [
@@ -149,7 +149,7 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -2961,7 +2961,7 @@
+@@ -3025,7 +3025,7 @@
              'browser/sync/util/data_encryption_unittest.cc',
            ],
          }],
@@ -158,25 +158,16 @@
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../build/linux/system.gyp:nss',
-@@ -3075,7 +3075,7 @@
+@@ -3139,7 +3139,7 @@
+         'test/data/resource.rc',
        ],
        'conditions': [
-         # Plugin code.
--        ['OS=="linux" or OS=="win"', {
-+        ['OS=="linux" or OS=="freebsd" or OS=="win"', {
-           'dependencies': [
-             'plugin',
-            ],
-@@ -3083,7 +3083,7 @@
-             'plugin',
-           ],
-         }],
 -        ['OS=="linux"', {
 +        ['OS=="linux" or OS=="freebsd"', {
             'dependencies': [
               '../build/linux/system.gyp:gtk',
               '../build/linux/system.gyp:nss',
-@@ -3228,7 +3228,7 @@
+@@ -3285,7 +3285,7 @@
            # See comments about "xcode_settings" elsewhere in this file.
            'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
          }],
@@ -185,7 +176,7 @@
             'dependencies': [
               '../build/linux/system.gyp:gtk',
               '../build/linux/system.gyp:nss',
-@@ -3311,7 +3311,7 @@
+@@ -3399,7 +3399,7 @@
              'test/perf/url_parse_perftest.cc',
            ],
            'conditions': [
@@ -194,3 +185,12 @@
                'dependencies': [
                  '../build/linux/system.gyp:gtk',
                  '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+@@ -3780,7 +3780,7 @@
+                 '../courgette/courgette.gyp:courgette_unittests',
+                 'browser_tests',
+                 ]}],
+-            ['OS=="linux"', {
++            ['OS=="linux" or OS=="freebsd"', {
+               'dependencies': [
+                 # Reason for disabling UI tests on non-Linux above.
+                 'ui_tests',
diff --git a/www/chromium/files/patch-chrome__common__gpu_messages_internal.h b/www/chromium/files/patch-chrome__common__gpu_messages_internal.h
deleted file mode 100644
index 0a774a33610b..000000000000
--- a/www/chromium/files/patch-chrome__common__gpu_messages_internal.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/common/gpu_messages_internal.h.orig	2011-04-15 11:02:02.000000000 +0300
-+++ chrome/common/gpu_messages_internal.h	2011-04-16 19:43:55.218070312 +0300
-@@ -142,7 +142,7 @@
- // Response from GPU to a GpuMsg_Synchronize message.
- IPC_MESSAGE_CONTROL0(GpuHostMsg_SynchronizeReply)
- 
--#if defined(OS_LINUX) && !defined(TOUCH_UI)
-+#if (defined(OS_LINUX) || defined (OS_FREEBSD)) && !defined(TOUCH_UI)
- // Resize the window that is being drawn into. It's important that this
- // resize be synchronized with the swapping of the front and back buffers.
- IPC_SYNC_MESSAGE_CONTROL2_1(GpuHostMsg_ResizeXID,
diff --git a/www/chromium/files/patch-chrome__common__plugin_messages.cc b/www/chromium/files/patch-chrome__common__plugin_messages.cc
deleted file mode 100644
index efec5c201fc2..000000000000
--- a/www/chromium/files/patch-chrome__common__plugin_messages.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- chrome/common/plugin_messages.cc.orig	2011-01-19 12:12:15.000000000 +0100
-+++ chrome/common/plugin_messages.cc	2011-01-21 20:46:41.000000000 +0100
-@@ -56,7 +56,7 @@
- 
- PluginMsg_UpdateGeometry_Param::PluginMsg_UpdateGeometry_Param()
-     : transparent(false),
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_FREEBSD)
-       windowless_buffer(TransportDIB::DefaultHandleValue()),
-       background_buffer(TransportDIB::DefaultHandleValue())
- #else
-@@ -271,7 +271,7 @@
-   WriteParam(m, p.windowless_buffer);
-   WriteParam(m, p.background_buffer);
-   WriteParam(m, p.transparent);
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_FREEBSD)
-   WriteParam(m, p.ack_key);
- #endif
- }
-@@ -285,7 +285,7 @@
-       ReadParam(m, iter, &r->windowless_buffer) &&
-       ReadParam(m, iter, &r->background_buffer) &&
-       ReadParam(m, iter, &r->transparent)
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_FREEBSD)
-       &&
-       ReadParam(m, iter, &r->ack_key)
- #endif
-@@ -304,7 +304,7 @@
-   LogParam(p.background_buffer, l);
-   l->append(", ");
-   LogParam(p.transparent, l);
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_FREEBSD)
-   l->append(", ");
-   LogParam(p.ack_key, l);
- #endif
diff --git a/www/chromium/files/patch-chrome__renderer__pepper_devices.cc b/www/chromium/files/patch-chrome__renderer__pepper_devices.cc
deleted file mode 100644
index e170f3b44e95..000000000000
--- a/www/chromium/files/patch-chrome__renderer__pepper_devices.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/renderer/pepper_devices.cc.orig	2011-03-23 00:44:41.089126548 +0200
-+++ chrome/renderer/pepper_devices.cc	2011-03-23 00:45:00.811641561 +0200
-@@ -52,7 +52,7 @@
-   uint32 buffer_size = width * height * kBytesPerPixel;
- 
-   // Allocate the transport DIB and the PlatformCanvas pointing to it.
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_FREEBSD)
-   // On the Mac, shared memory has to be created in the browser in order to
-   // work in the sandbox.  Do this by sending a message to the browser
-   // requesting a TransportDIB (see also
diff --git a/www/chromium/files/patch-chrome__renderer__pepper_scrollbar_widget.h b/www/chromium/files/patch-chrome__renderer__pepper_scrollbar_widget.h
deleted file mode 100644
index 24fad497ce70..000000000000
--- a/www/chromium/files/patch-chrome__renderer__pepper_scrollbar_widget.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./chrome/renderer/pepper_scrollbar_widget.h.orig	2010-12-16 02:11:59.000000000 +0100
-+++ ./chrome/renderer/pepper_scrollbar_widget.h	2010-12-20 20:15:08.000000000 +0100
-@@ -38,7 +38,7 @@
-   virtual void getTickmarks(WebKit::WebScrollbar*,
-                             WebKit::WebVector<WebKit::WebRect>*) const;
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   static void SetScrollbarColors(unsigned inactive_color,
-                                  unsigned active_color,
-                                  unsigned track_color);
diff --git a/www/chromium/files/patch-chrome__renderer__render_thread.cc b/www/chromium/files/patch-chrome__renderer__render_thread.cc
deleted file mode 100644
index 6acb175f2494..000000000000
--- a/www/chromium/files/patch-chrome__renderer__render_thread.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./chrome/renderer/render_thread.cc.orig	2010-12-16 02:11:59.000000000 +0100
-+++ ./chrome/renderer/render_thread.cc	2010-12-20 20:15:08.000000000 +0100
-@@ -972,7 +972,7 @@
- }
- 
- void RenderThread::IdleHandler() {
--#if (defined(OS_WIN) || defined(OS_LINUX)) && defined(USE_TCMALLOC)
-+#if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
-   MallocExtension::instance()->ReleaseFreeMemory();
- #endif
- 
-@@ -1048,7 +1048,7 @@
-   while (!v8::V8::IdleNotification()) {
-   }
- 
--#if (defined(OS_WIN) || defined(OS_LINUX)) && defined(USE_TCMALLOC)
-+#if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
-   // Tell tcmalloc to release any free pages it's still holding.
-   MallocExtension::instance()->ReleaseFreeMemory();
- #endif
diff --git a/www/chromium/files/patch-chrome__renderer__renderer_glue.cc b/www/chromium/files/patch-chrome__renderer__renderer_glue.cc
deleted file mode 100644
index d702d968a10f..000000000000
--- a/www/chromium/files/patch-chrome__renderer__renderer_glue.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./chrome/renderer/renderer_glue.cc.orig	2010-12-16 02:11:59.000000000 +0100
-+++ ./chrome/renderer/renderer_glue.cc	2010-12-20 20:15:08.000000000 +0100
-@@ -38,7 +38,7 @@
- 
- #if defined(OS_WIN)
- #include <strsafe.h>  // note: per msdn docs, this must *follow* other includes
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
- #include "chrome/renderer/renderer_sandbox_support_linux.h"
- #endif
- 
-@@ -274,7 +274,7 @@
-       new ViewHostMsg_UserMetricsRecordAction(action));
- }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- int MatchFontWithFallback(const std::string& face, bool bold,
-                           bool italic, int charset) {
-   return renderer_sandbox_support::MatchFontWithFallback(
diff --git a/www/chromium/files/patch-chrome__renderer__webplugin_delegate_pepper.cc b/www/chromium/files/patch-chrome__renderer__webplugin_delegate_pepper.cc
deleted file mode 100644
index 34d58b3ea6b6..000000000000
--- a/www/chromium/files/patch-chrome__renderer__webplugin_delegate_pepper.cc
+++ /dev/null
@@ -1,116 +0,0 @@
---- chrome/renderer/webplugin_delegate_pepper.cc.orig	2011-04-15 11:01:48.000000000 +0300
-+++ chrome/renderer/webplugin_delegate_pepper.cc	2011-04-16 20:54:58.991069673 +0300
-@@ -9,7 +9,7 @@
- #include <string>
- #include <vector>
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- #include <unistd.h>
- #endif
- 
-@@ -53,7 +53,7 @@
- #if defined(OS_MACOSX)
- #include "base/mac/mac_util.h"
- #include "base/mac/scoped_cftyperef.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
- #include "chrome/renderer/renderer_sandbox_support_linux.h"
- #include "printing/pdf_ps_metafile_cairo.h"
- #elif defined(OS_WIN)
-@@ -414,7 +414,7 @@
- NPError NPMatchFontWithFallback(NPP instance,
-                                 const NPFontDescription* description,
-                                 NPFontID* id) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   int fd = renderer_sandbox_support::MatchFontWithFallback(
-       description->face, description->weight >= 700, description->italic,
-       description->charset);
-@@ -433,7 +433,7 @@
-                      uint32_t table,
-                      void* output,
-                      size_t* output_length) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   bool rv = renderer_sandbox_support::GetFontTable(
-       id, table, static_cast<uint8_t*>(output), output_length);
-   return rv ? NPERR_NO_ERROR : NPERR_GENERIC_ERROR;
-@@ -444,7 +444,7 @@
- }
- 
- NPError NPDestroyFont(NPP instance, NPFontID id) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   close(id);
-   return NPERR_NO_ERROR;
- #else
-@@ -823,10 +823,10 @@
-       current_printer_dpi_ = printer_dpi;
-     }
-   }
--#if defined (OS_LINUX)
-+#if defined (OS_LINUX) || defined(OS_FREEBSD)
-   num_pages_ = num_pages;
-   pdf_output_done_ = false;
--#endif  // (OS_LINUX)
-+#endif  // (OS_LINUX) || (OS_FREEBSD)
-   return num_pages;
- }
- 
-@@ -852,7 +852,7 @@
-   unsigned char* pdf_output = NULL;
-   int32 output_size = 0;
-   NPPrintPageNumberRange page_range;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   // 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
-@@ -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)
-   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);
-@@ -871,7 +871,7 @@
-     return false;
- 
-   bool ret = false;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   // On Linux we need to get the backing PdfPsMetafile and write the bits
-   // directly.
-   cairo_t* context = canvas->beginPlatformPaint();
-@@ -1026,10 +1026,10 @@
-   current_printer_dpi_ = -1;
- #if defined(OS_MACOSX)
-   last_printed_page_ = SkBitmap();
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
-   num_pages_ = 0;
-   pdf_output_done_ = false;
--#endif  // defined(OS_LINUX)
-+#endif  // defined(OS_LINUX) || defined(OS_FREEBSD)
- }
- 
- WebPluginDelegatePepper::WebPluginDelegatePepper(
-@@ -1039,10 +1039,10 @@
-       plugin_(NULL),
-       instance_(instance),
-       current_printer_dpi_(-1),
--#if defined (OS_LINUX)
-+#if defined (OS_LINUX) || defined(OS_FREEBSD)
-       num_pages_(0),
-       pdf_output_done_(false),
--#endif  // (OS_LINUX)
-+#endif  // (OS_LINUX) || (OS_FREEBSD)
-       find_identifier_(-1),
-       current_choose_file_callback_(NULL),
-       current_choose_file_user_data_(NULL) {
diff --git a/www/chromium/files/patch-chrome__renderer__webplugin_delegate_pepper.h b/www/chromium/files/patch-chrome__renderer__webplugin_delegate_pepper.h
deleted file mode 100644
index dbaa22a43618..000000000000
--- a/www/chromium/files/patch-chrome__renderer__webplugin_delegate_pepper.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./chrome/renderer/webplugin_delegate_pepper.h.orig	2010-12-16 02:11:59.000000000 +0100
-+++ ./chrome/renderer/webplugin_delegate_pepper.h	2010-12-20 20:15:08.000000000 +0100
-@@ -308,7 +308,7 @@
-   // variable to hold on to the pixels.
-   SkBitmap last_printed_page_;
- #endif   // defined(OS_MACOSX)
--#if defined (OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   // 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.
-@@ -319,7 +319,7 @@
-   // 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_FREEBSD)
- 
- #if defined(ENABLE_GPU)
-   // The command buffer used to issue commands to the nested GPU plugin.
diff --git a/www/chromium/files/patch-chrome__test__testing_profile.cc b/www/chromium/files/patch-chrome__test__testing_profile.cc
deleted file mode 100644
index 576e689b13b7..000000000000
--- a/www/chromium/files/patch-chrome__test__testing_profile.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/test/testing_profile.cc.orig	2011-01-26 10:31:06.000000000 +0100
-+++ chrome/test/testing_profile.cc	2011-01-30 14:14:21.000000000 +0100
-@@ -49,7 +49,7 @@
- #include "testing/gmock/include/gmock/gmock.h"
- #include "webkit/database/database_tracker.h"
- 
--#if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
-+#if defined(TOOLKIT_GTK) && !defined(TOOLKIT_VIEWS)
- #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
- #endif
- 
-@@ -371,7 +371,7 @@
- 
- void TestingProfile::InitThemes() {
-   if (!created_theme_provider_) {
--#if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
-+#if defined(TOOLKIT_GTK) && !defined(TOOLKIT_VIEWS)
-     theme_provider_.reset(new GtkThemeProvider);
- #else
-     theme_provider_.reset(new BrowserThemeProvider);
diff --git a/www/chromium/files/patch-content__browser__child_process_launcher.cc b/www/chromium/files/patch-content__browser__child_process_launcher.cc
index 674e34af1675..6cf13710f1e9 100644
--- a/www/chromium/files/patch-content__browser__child_process_launcher.cc
+++ b/www/chromium/files/patch-content__browser__child_process_launcher.cc
@@ -1,14 +1,14 @@
---- ./content/browser/child_process_launcher.cc.orig	2010-12-16 02:11:58.000000000 +0100
-+++ ./content/browser/child_process_launcher.cc	2010-12-20 20:15:08.000000000 +0100
+--- content/browser/child_process_launcher.cc.orig	2011-05-06 12:02:54.000000000 +0300
++++ content/browser/child_process_launcher.cc	2011-06-04 15:13:25.939378747 +0300
 @@ -20,7 +20,7 @@
  #if defined(OS_WIN)
  #include "base/file_path.h"
  #include "chrome/common/sandbox_policy.h"
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_FREEBSD)
- #include "base/singleton.h"
+ #include "base/memory/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 @@
        : client_(NULL),
          client_thread_id_(BrowserThread::UI),
@@ -24,19 +24,19 @@
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_FREEBSD)
-     if (use_zygote) {
-       base::GlobalDescriptors::Mapping mapping;
-       mapping.push_back(std::pair<uint32_t, int>(kPrimaryIPCChannel, ipcfd));
-@@ -131,7 +131,7 @@
+     // On Linux, we need to add some extra file descriptors for crash handling.
+     std::string process_type =
+         cmd_line->GetSwitchValueASCII(switches::kProcessType);
+@@ -151,7 +151,7 @@
            ipcfd,
            kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_FREEBSD)
-       // On Linux, we need to add some extra file descriptors for crash handling
-       // and the sandbox.
-       bool is_renderer =
-@@ -163,7 +163,7 @@
+       if (crash_signal_fd >= 0) {
+         fds_to_map.push_back(std::make_pair(
+             crash_signal_fd,
+@@ -164,7 +164,7 @@
              sandbox_fd,
              kSandboxIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
        }
@@ -45,7 +45,7 @@
  
        bool launched = false;
  #if defined(OS_MACOSX)
-@@ -199,20 +199,20 @@
+@@ -200,20 +200,20 @@
          NewRunnableMethod(
              this,
              &ChildProcessLauncher::Context::Notify,
@@ -69,7 +69,7 @@
      zygote_ = zygote;
  #endif
      if (client_) {
-@@ -232,7 +232,7 @@
+@@ -233,7 +233,7 @@
          BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
          NewRunnableFunction(
              &ChildProcessLauncher::Context::TerminateInternal,
@@ -78,7 +78,7 @@
              zygote_,
  #endif
              process_.handle()));
-@@ -240,7 +240,7 @@
+@@ -246,7 +246,7 @@
    }
  
    static void TerminateInternal(
@@ -87,7 +87,7 @@
        bool zygote,
  #endif
        base::ProcessHandle handle) {
-@@ -250,13 +250,13 @@
+@@ -256,13 +256,13 @@
      process.Terminate(ResultCodes::NORMAL_EXIT);
      // On POSIX, we must additionally reap the child.
  #if defined(OS_POSIX)
@@ -103,7 +103,7 @@
      {
        ProcessWatcher::EnsureProcessTerminated(handle);
      }
-@@ -269,7 +269,7 @@
+@@ -275,7 +275,7 @@
    base::Process process_;
    bool starting_;
  
@@ -112,7 +112,7 @@
    bool zygote_;
  #endif
  };
-@@ -315,7 +315,7 @@
+@@ -321,7 +321,7 @@
      int* exit_code) {
    base::TerminationStatus status;
    base::ProcessHandle handle = context_->process_.handle();
diff --git a/www/chromium/files/patch-chrome__browser__renderer_host__browser_render_process_host.cc b/www/chromium/files/patch-content__browser__renderer_host__browser_render_process_host.cc
index c15ee65dbe10..6060f7250042 100644
--- a/www/chromium/files/patch-chrome__browser__renderer_host__browser_render_process_host.cc
+++ b/www/chromium/files/patch-content__browser__renderer_host__browser_render_process_host.cc
@@ -1,5 +1,5 @@
---- chrome/browser/renderer_host/browser_render_process_host.cc.orig	2011-03-20 22:02:04.283738713 +0200
-+++ chrome/browser/renderer_host/browser_render_process_host.cc	2011-03-20 22:02:04.448747953 +0200
+--- content/browser/renderer_host/browser_render_process_host.cc.orig	2011-03-20 22:02:04.283738713 +0200
++++ content/browser/renderer_host/browser_render_process_host.cc	2011-03-20 22:02:04.448747953 +0200
 @@ -886,7 +886,7 @@
    HANDLE section = app::win::GetSectionFromProcess(
        dib_id.handle, GetHandle(), false /* read write */);
diff --git a/www/chromium/files/patch-content__browser__renderer_host__render_message_filter.cc b/www/chromium/files/patch-content__browser__renderer_host__render_message_filter.cc
index e74bce36b4dc..ab2ac0fc75ef 100644
--- a/www/chromium/files/patch-content__browser__renderer_host__render_message_filter.cc
+++ b/www/chromium/files/patch-content__browser__renderer_host__render_message_filter.cc
@@ -1,16 +1,16 @@
---- content/browser/renderer_host/render_message_filter.cc.orig	2011-04-15 11:01:10.000000000 +0300
-+++ content/browser/renderer_host/render_message_filter.cc	2011-04-16 21:12:33.904069230 +0300
-@@ -416,7 +416,7 @@
-     IPC_MESSAGE_HANDLER(ViewHostMsg_V8HeapStats, OnV8HeapStats)
+--- content/browser/renderer_host/render_message_filter.cc.orig	2011-05-06 12:02:54.000000000 +0300
++++ content/browser/renderer_host/render_message_filter.cc	2011-06-04 15:22:29.321379253 +0300
+@@ -365,7 +365,7 @@
+     IPC_MESSAGE_HANDLER(ViewHostMsg_AllocateSharedMemoryBuffer,
+                         OnAllocateSharedMemoryBuffer)
      IPC_MESSAGE_HANDLER(ViewHostMsg_DidZoomURL, OnDidZoomURL)
-     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
-@@ -1111,7 +1111,7 @@
-   HistogramSynchronizer::DeserializeHistogramList(sequence_number, histograms);
+@@ -740,7 +740,7 @@
+       context_getter->GetURLRequestContext());
  }
  
 -#if defined(OS_MACOSX)
diff --git a/www/chromium/files/patch-content__common__common_param_traits.h b/www/chromium/files/patch-content__common__common_param_traits.h
new file mode 100644
index 000000000000..1cb5579ec583
--- /dev/null
+++ b/www/chromium/files/patch-content__common__common_param_traits.h
@@ -0,0 +1,11 @@
+--- content/common/common_param_traits.h.orig	2011-06-06 00:08:49.215163238 +0300
++++ content/common/common_param_traits.h	2011-06-06 00:09:04.929165157 +0300
+@@ -187,7 +187,7 @@
+ };
+ #endif
+ 
+-#if defined(USE_X11)
++#if defined(USE_X11) && !defined(OS_FREEBSD)
+ template<>
+ struct ParamTraits<TransportDIB::Id> {
+   typedef TransportDIB::Id param_type;
diff --git a/www/chromium/files/patch-content__common__file_path_watcher__file_path_watcher_stub.cc b/www/chromium/files/patch-content__common__file_path_watcher__file_path_watcher_stub.cc
deleted file mode 100644
index d8f0e516a568..000000000000
--- a/www/chromium/files/patch-content__common__file_path_watcher__file_path_watcher_stub.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- content/common/file_path_watcher/file_path_watcher_stub.cc.orig	2011-04-26 11:01:09.000000000 +0300
-+++ content/common/file_path_watcher/file_path_watcher_stub.cc	2011-05-04 01:10:53.819147264 +0300
-@@ -5,15 +5,23 @@
- // 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 {
-+    set_cancelled();
-+  }
-+
-+ protected:
-+
-+  virtual void CancelOnMessageLoopThread() OVERRIDE { }
- };
- 
- FilePathWatcher::FilePathWatcher() {
diff --git a/www/chromium/files/patch-chrome__gpu__x_util.h b/www/chromium/files/patch-content__common__gpu__x_util.h
index 572626a58f7b..bf3087b04789 100644
--- a/www/chromium/files/patch-chrome__gpu__x_util.h
+++ b/www/chromium/files/patch-content__common__gpu__x_util.h
@@ -1,5 +1,5 @@
---- ./chrome/gpu/x_util.h.orig	2010-12-16 02:11:58.000000000 +0100
-+++ ./chrome/gpu/x_util.h	2010-12-20 20:15:08.000000000 +0100
+--- content/common/gpu/x_util.h.orig	2010-12-16 02:11:58.000000000 +0100
++++ content/common/gpu/x_util.h	2010-12-20 20:15:08.000000000 +0100
 @@ -12,7 +12,7 @@
  #include "build/build_config.h"
  #include "chrome/gpu/gpu_config.h"
diff --git a/www/chromium/files/patch-content__common__gpu_messages.h b/www/chromium/files/patch-content__common__gpu_messages.h
new file mode 100644
index 000000000000..6210684e20d0
--- /dev/null
+++ b/www/chromium/files/patch-content__common__gpu_messages.h
@@ -0,0 +1,20 @@
+--- content/common/gpu_messages.h.orig	2011-05-06 12:02:55.000000000 +0300
++++ content/common/gpu_messages.h	2011-06-04 01:15:56.427405297 +0300
+@@ -161,7 +161,7 @@
+ // information.
+ IPC_MESSAGE_CONTROL0(GpuMsg_CollectGraphicsInfo)
+ 
+-#if defined(OS_LINUX) && !defined(TOUCH_UI) || defined(OS_WIN)
++#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(TOUCH_UI) || defined(OS_WIN)
+ // Tells the GPU process that the browser process has finished resizing the
+ // view.
+ IPC_MESSAGE_CONTROL2(GpuMsg_ResizeViewACK,
+@@ -250,7 +250,7 @@
+ // Response from GPU to a GpuMsg_Synchronize message.
+ IPC_MESSAGE_CONTROL0(GpuHostMsg_SynchronizeReply)
+ 
+-#if defined(OS_LINUX) && !defined(TOUCH_UI) || defined(OS_WIN)
++#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(TOUCH_UI) || defined(OS_WIN)
+ // Resize the window that is being drawn into. It's important that this
+ // resize be synchronized with the swapping of the front and back buffers.
+ IPC_MESSAGE_CONTROL4(GpuHostMsg_ResizeView,
diff --git a/www/chromium/files/patch-chrome__common__native_web_keyboard_event.h b/www/chromium/files/patch-content__common__native_web_keyboard_event.h
index 361dcf60fd91..3be0c8c8b2fa 100644
--- a/www/chromium/files/patch-chrome__common__native_web_keyboard_event.h
+++ b/www/chromium/files/patch-content__common__native_web_keyboard_event.h
@@ -1,5 +1,5 @@
---- chrome/common/native_web_keyboard_event.h.orig	2011-03-20 22:02:04.188736136 +0200
-+++ chrome/common/native_web_keyboard_event.h	2011-03-20 22:02:04.394737178 +0200
+--- content/common/native_web_keyboard_event.h.orig	2011-03-20 22:02:04.188736136 +0200
++++ content/common/native_web_keyboard_event.h	2011-03-20 22:02:04.394737178 +0200
 @@ -60,7 +60,7 @@
    // Currently, it's only used by Linux and Mac ports.
    bool skip_in_browser;
diff --git a/www/chromium/files/patch-chrome__common__plugin_messages.h b/www/chromium/files/patch-content__common__plugin_messages.h
index 1268927e0877..4222f37a9ec1 100644
--- a/www/chromium/files/patch-chrome__common__plugin_messages.h
+++ b/www/chromium/files/patch-content__common__plugin_messages.h
@@ -1,5 +1,5 @@
---- ./chrome/common/plugin_messages.h.orig	2010-12-16 02:12:13.000000000 +0100
-+++ ./chrome/common/plugin_messages.h	2010-12-20 20:15:08.000000000 +0100
+--- content/common/plugin_messages.h.orig	2010-12-16 02:12:13.000000000 +0100
++++ content/common/plugin_messages.h	2010-12-20 20:15:08.000000000 +0100
 @@ -116,7 +116,7 @@
    TransportDIB::Handle windowless_buffer;
    TransportDIB::Handle background_buffer;
diff --git a/www/chromium/files/patch-chrome__common__set_process_title_linux.cc b/www/chromium/files/patch-content__common__set_process_title_linux.cc
index ee15dc427cdb..e232833a853d 100644
--- a/www/chromium/files/patch-chrome__common__set_process_title_linux.cc
+++ b/www/chromium/files/patch-content__common__set_process_title_linux.cc
@@ -1,5 +1,5 @@
---- chrome/common/set_process_title_linux.cc.orig	2011-03-20 22:02:04.226737055 +0200
-+++ chrome/common/set_process_title_linux.cc	2011-03-20 22:02:04.407737434 +0200
+--- content/common/set_process_title_linux.cc.orig	2011-03-20 22:02:04.226737055 +0200
++++ content/common/set_process_title_linux.cc	2011-03-20 22:02:04.407737434 +0200
 @@ -48,6 +48,8 @@
  extern char** environ;
  
diff --git a/www/chromium/files/patch-chrome__common__set_process_title_linux.h b/www/chromium/files/patch-content__common__set_process_title_linux.h
index 73a7bf6ccf8c..5b027a6a9821 100644
--- a/www/chromium/files/patch-chrome__common__set_process_title_linux.h
+++ b/www/chromium/files/patch-content__common__set_process_title_linux.h
@@ -1,5 +1,5 @@
---- chrome/common/set_process_title_linux.h.orig	2011-03-20 22:02:04.219736445 +0200
-+++ chrome/common/set_process_title_linux.h	2011-03-20 22:02:04.404739287 +0200
+--- content/common/set_process_title_linux.h.orig	2011-03-20 22:02:04.219736445 +0200
++++ content/common/set_process_title_linux.h	2011-03-20 22:02:04.404739287 +0200
 @@ -6,6 +6,9 @@
  #define CHROME_COMMON_SET_PROCESS_TITLE_LINUX_H_
  #pragma once
diff --git a/www/chromium/files/patch-chrome__common__render_messages_internal.h b/www/chromium/files/patch-content__common__view_messages.h
index 11dde5605031..1ad3b87f2782 100644
--- a/www/chromium/files/patch-chrome__common__render_messages_internal.h
+++ b/www/chromium/files/patch-content__common__view_messages.h
@@ -1,8 +1,8 @@
---- chrome/common/render_messages_internal.h.orig	2011-01-06 10:02:01.000000000 +0100
-+++ chrome/common/render_messages_internal.h	2011-01-09 20:47:08.000000000 +0100
-@@ -2117,7 +2117,7 @@
-                      std::string /* extension_id */,
-                      std::string /* name */)
+--- content/common/view_messages.h.orig	2011-06-05 19:01:24.752163332 +0300
++++ content/common/view_messages.h	2011-06-05 19:01:40.420163036 +0300
+@@ -1783,7 +1783,7 @@
+ IPC_MESSAGE_CONTROL1(ViewHostMsg_SuddenTerminationChanged,
+                      bool /* enabled */)
  
 -#if defined(OS_MACOSX)
 +#if defined(OS_MACOSX) || defined(OS_FREEBSD)
diff --git a/www/chromium/files/patch-chrome__plugin__plugin_main_linux.cc b/www/chromium/files/patch-content__plugin__plugin_main_linux.cc
index 70c3d55dc5ab..649921105b36 100644
--- a/www/chromium/files/patch-chrome__plugin__plugin_main_linux.cc
+++ b/www/chromium/files/patch-content__plugin__plugin_main_linux.cc
@@ -1,5 +1,5 @@
---- ./chrome/plugin/plugin_main_linux.cc.orig	2010-12-16 02:11:58.000000000 +0100
-+++ ./chrome/plugin/plugin_main_linux.cc	2010-12-20 20:15:08.000000000 +0100
+--- content/plugin/plugin_main_linux.cc.orig	2010-12-16 02:11:58.000000000 +0100
++++ content/plugin/plugin_main_linux.cc	2010-12-20 20:15:08.000000000 +0100
 @@ -5,13 +5,13 @@
  #include <signal.h>
  #include <string.h>
diff --git a/www/chromium/files/patch-chrome__plugin__plugin_thread.cc b/www/chromium/files/patch-content__plugin__plugin_thread.cc
index d6d5e786a380..1a9289314283 100644
--- a/www/chromium/files/patch-chrome__plugin__plugin_thread.cc
+++ b/www/chromium/files/patch-content__plugin__plugin_thread.cc
@@ -1,5 +1,5 @@
---- ./chrome/plugin/plugin_thread.cc.orig	2010-12-16 02:11:58.000000000 +0100
-+++ ./chrome/plugin/plugin_thread.cc	2010-12-20 20:15:08.000000000 +0100
+--- content/plugin/plugin_thread.cc.orig	2010-12-16 02:11:58.000000000 +0100
++++ content/plugin/plugin_thread.cc	2010-12-20 20:15:08.000000000 +0100
 @@ -6,7 +6,7 @@
  
  #include "build/build_config.h"
diff --git a/www/chromium/files/patch-chrome__renderer__pepper_plugin_delegate_impl.cc b/www/chromium/files/patch-content__renderer__pepper_plugin_delegate_impl.cc
index d474644e3598..30d9fc55bc7e 100644
--- a/www/chromium/files/patch-chrome__renderer__pepper_plugin_delegate_impl.cc
+++ b/www/chromium/files/patch-content__renderer__pepper_plugin_delegate_impl.cc
@@ -1,15 +1,6 @@
---- chrome/renderer/pepper_plugin_delegate_impl.cc.orig	2011-04-15 11:01:48.000000000 +0300
-+++ chrome/renderer/pepper_plugin_delegate_impl.cc	2011-04-16 20:34:00.435069120 +0300
-@@ -54,7 +54,7 @@
- #include "webkit/plugins/ppapi/ppb_flash_impl.h"
- #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
- 
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_FREEBSD)
- #include "chrome/renderer/render_thread.h"
- #endif
- 
-@@ -81,7 +81,7 @@
+--- content/renderer/pepper_plugin_delegate_impl.cc.orig	2011-05-06 12:02:55.000000000 +0300
++++ content/renderer/pepper_plugin_delegate_impl.cc	2011-06-04 14:31:17.879380898 +0300
+@@ -112,7 +112,7 @@
          dib_(dib) {
    }
  
@@ -18,7 +9,7 @@
    // On Mac, we have to tell the browser to free the transport DIB.
    virtual ~PlatformImage2DImpl() {
      if (dib_.get()) {
-@@ -99,7 +99,7 @@
+@@ -130,7 +130,7 @@
      *byte_count = dib_->size();
  #if defined(OS_WIN)
      return reinterpret_cast<intptr_t>(dib_->handle());
@@ -27,7 +18,7 @@
      return static_cast<intptr_t>(dib_->handle().fd);
  #elif defined(OS_LINUX)
      return static_cast<intptr_t>(dib_->handle());
-@@ -499,7 +499,7 @@
+@@ -758,7 +758,7 @@
    uint32 buffer_size = width * height * 4;
  
    // Allocate the transport DIB and the PlatformCanvas pointing to it.
diff --git a/www/chromium/files/patch-chrome__renderer__render_process_impl.cc b/www/chromium/files/patch-content__renderer__render_process_impl.cc
index 53e780c25f72..cb310856542e 100644
--- a/www/chromium/files/patch-chrome__renderer__render_process_impl.cc
+++ b/www/chromium/files/patch-content__renderer__render_process_impl.cc
@@ -1,5 +1,5 @@
---- ./chrome/renderer/render_process_impl.cc.orig	2010-12-16 02:11:59.000000000 +0100
-+++ ./chrome/renderer/render_process_impl.cc	2010-12-20 20:15:08.000000000 +0100
+--- content/renderer/render_process_impl.cc.orig	2010-12-16 02:11:59.000000000 +0100
++++ content/renderer/render_process_impl.cc	2010-12-20 20:15:08.000000000 +0100
 @@ -243,7 +243,7 @@
  #if defined(OS_WIN) || defined(OS_LINUX)
    // Windows and Linux create transport DIBs inside the renderer
diff --git a/www/chromium/files/patch-content__renderer__render_thread.cc b/www/chromium/files/patch-content__renderer__render_thread.cc
new file mode 100644
index 000000000000..b258f0a2914b
--- /dev/null
+++ b/www/chromium/files/patch-content__renderer__render_thread.cc
@@ -0,0 +1,11 @@
+--- content/renderer/render_thread.cc.orig	2011-05-06 12:02:55.000000000 +0300
++++ content/renderer/render_thread.cc	2011-06-04 15:55:04.481380035 +0300
+@@ -607,7 +607,7 @@
+ }
+ 
+ void RenderThread::IdleHandler() {
+-#if (defined(OS_WIN) || defined(OS_LINUX)) && defined(USE_TCMALLOC)
++#if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
+   MallocExtension::instance()->ReleaseFreeMemory();
+ #endif
+ 
diff --git a/www/chromium/files/patch-chrome__renderer__render_view.h b/www/chromium/files/patch-content__renderer__render_view.h
index 581e3e381275..2e9d2b0e6654 100644
--- a/www/chromium/files/patch-chrome__renderer__render_view.h
+++ b/www/chromium/files/patch-content__renderer__render_view.h
@@ -1,5 +1,5 @@
---- ./chrome/renderer/render_view.h.orig	2010-12-16 02:11:59.000000000 +0100
-+++ ./chrome/renderer/render_view.h	2010-12-20 20:15:08.000000000 +0100
+--- content/renderer/render_view.h.orig	2010-12-16 02:11:59.000000000 +0100
++++ content/renderer/render_view.h	2010-12-20 20:15:08.000000000 +0100
 @@ -1114,7 +1114,7 @@
    // periodic timer so we don't send too many messages.
    void SyncNavigationState();
diff --git a/www/chromium/files/patch-chrome__renderer__render_widget.cc b/www/chromium/files/patch-content__renderer__render_widget.cc
index d7e35e10afe4..b5c827ad163a 100644
--- a/www/chromium/files/patch-chrome__renderer__render_widget.cc
+++ b/www/chromium/files/patch-content__renderer__render_widget.cc
@@ -1,5 +1,5 @@
---- chrome/renderer/render_widget.cc.orig	2011-03-23 00:47:39.891641114 +0200
-+++ chrome/renderer/render_widget.cc	2011-03-23 00:48:36.043641158 +0200
+--- content/renderer/render_widget.cc.orig	2011-03-23 00:47:39.891641114 +0200
++++ content/renderer/render_widget.cc	2011-03-23 00:48:36.043641158 +0200
 @@ -888,7 +888,7 @@
        // Close our unused handle.
  #if defined(OS_WIN)
diff --git a/www/chromium/files/patch-content__renderer__renderer_glue.cc b/www/chromium/files/patch-content__renderer__renderer_glue.cc
new file mode 100644
index 000000000000..867be06eafb9
--- /dev/null
+++ b/www/chromium/files/patch-content__renderer__renderer_glue.cc
@@ -0,0 +1,20 @@
+--- content/renderer/renderer_glue.cc.orig	2011-05-06 12:02:55.000000000 +0300
++++ content/renderer/renderer_glue.cc	2011-06-04 16:01:20.943412500 +0300
+@@ -34,7 +34,7 @@
+ #include "webkit/glue/webkit_glue.h"
+ #include "webkit/glue/websocketstreamhandle_bridge.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ #include "content/renderer/renderer_sandbox_support_linux.h"
+ #endif
+ 
+@@ -259,7 +259,7 @@
+   RenderThread::current()->EnableSpdy(enable);
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ int MatchFontWithFallback(const std::string& face, bool bold,
+                           bool italic, int charset) {
+   return renderer_sandbox_support::MatchFontWithFallback(
diff --git a/www/chromium/files/patch-chrome__renderer__renderer_main.cc b/www/chromium/files/patch-content__renderer__renderer_main.cc
index 0cb6e3c4350f..74514d48f808 100644
--- a/www/chromium/files/patch-chrome__renderer__renderer_main.cc
+++ b/www/chromium/files/patch-content__renderer__renderer_main.cc
@@ -1,5 +1,5 @@
---- chrome/renderer/renderer_main.cc.orig	2011-03-20 22:02:04.303357408 +0200
-+++ chrome/renderer/renderer_main.cc	2011-03-20 22:02:04.457737643 +0200
+--- content/renderer/renderer_main.cc.orig	2011-03-20 22:02:04.303357408 +0200
++++ content/renderer/renderer_main.cc	2011-03-20 22:02:04.457737643 +0200
 @@ -272,7 +272,7 @@
    PepperPluginRegistry::GetInstance();
  
diff --git a/www/chromium/files/patch-chrome__renderer__renderer_main_platform_delegate_linux.cc b/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
index d2f337bdd4b1..345be5fa59be 100644
--- a/www/chromium/files/patch-chrome__renderer__renderer_main_platform_delegate_linux.cc
+++ b/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
@@ -1,5 +1,5 @@
---- chrome/renderer/renderer_main_platform_delegate_linux.cc.orig	2011-03-20 22:02:04.353053389 +0200
-+++ chrome/renderer/renderer_main_platform_delegate_linux.cc	2011-03-20 22:02:04.476736985 +0200
+--- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2011-03-20 22:02:04.353053389 +0200
++++ content/renderer/renderer_main_platform_delegate_linux.cc	2011-03-20 22:02:04.476736985 +0200
 @@ -36,7 +36,7 @@
    // The seccomp sandbox is started in the renderer.
    // http://code.google.com/p/seccompsandbox/
diff --git a/www/chromium/files/patch-chrome__renderer__renderer_webkitclient_impl.cc b/www/chromium/files/patch-content__renderer__renderer_webkitclient_impl.cc
index 15372cc66b5e..ff9c4d345775 100644
--- a/www/chromium/files/patch-chrome__renderer__renderer_webkitclient_impl.cc
+++ b/www/chromium/files/patch-content__renderer__renderer_webkitclient_impl.cc
@@ -1,5 +1,5 @@
---- chrome/renderer/renderer_webkitclient_impl.cc.orig	2011-03-20 22:02:04.310852495 +0200
-+++ chrome/renderer/renderer_webkitclient_impl.cc	2011-03-20 22:02:04.460737466 +0200
+--- content/renderer/renderer_webkitclient_impl.cc.orig	2011-03-20 22:02:04.310852495 +0200
++++ content/renderer/renderer_webkitclient_impl.cc	2011-03-20 22:02:04.460737466 +0200
 @@ -55,7 +55,7 @@
  #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebSandboxSupport.h"
  #endif
diff --git a/www/chromium/files/patch-chrome__renderer__webplugin_delegate_proxy.cc b/www/chromium/files/patch-content__renderer__webplugin_delegate_proxy.cc
index 09a94a6f3bb6..d89d2fff037d 100644
--- a/www/chromium/files/patch-chrome__renderer__webplugin_delegate_proxy.cc
+++ b/www/chromium/files/patch-content__renderer__webplugin_delegate_proxy.cc
@@ -1,5 +1,5 @@
---- chrome/renderer/webplugin_delegate_proxy.cc.orig	Mon Mar 14 19:30:50 2011
-+++ chrome/renderer/webplugin_delegate_proxy.cc	Mon Mar 14 19:39:56 2011
+--- content/renderer/webplugin_delegate_proxy.cc.orig	Mon Mar 14 19:30:50 2011
++++ content/renderer/webplugin_delegate_proxy.cc	Mon Mar 14 19:39:56 2011
 @@ -158,7 +158,7 @@ class ResourceClientProxy : public webkit::npapi::WebP
    bool multibyte_response_expected_;
  };
diff --git a/www/chromium/files/patch-chrome__renderer__webplugin_delegate_proxy.h b/www/chromium/files/patch-content__renderer__webplugin_delegate_proxy.h
index 68c34bdf9cc5..03e86fd87dd6 100644
--- a/www/chromium/files/patch-chrome__renderer__webplugin_delegate_proxy.h
+++ b/www/chromium/files/patch-content__renderer__webplugin_delegate_proxy.h
@@ -1,5 +1,5 @@
---- chrome/renderer/webplugin_delegate_proxy.h.orig	2011-03-23 00:46:31.521939657 +0200
-+++ chrome/renderer/webplugin_delegate_proxy.h	2011-03-23 00:47:12.163682393 +0200
+--- content/renderer/webplugin_delegate_proxy.h.orig	2011-03-23 00:46:31.521939657 +0200
++++ content/renderer/webplugin_delegate_proxy.h	2011-03-23 00:47:12.163682393 +0200
 @@ -21,7 +21,7 @@
  #include "webkit/plugins/npapi/webplugininfo.h"
  #include "webkit/plugins/npapi/webplugin_delegate.h"
diff --git a/www/chromium/files/patch-chrome__worker__worker_uitest.cc b/www/chromium/files/patch-content__worker__worker_uitest.cc
index 721b1422a7eb..7ac8fdff92c9 100644
--- a/www/chromium/files/patch-chrome__worker__worker_uitest.cc
+++ b/www/chromium/files/patch-content__worker__worker_uitest.cc
@@ -1,5 +1,5 @@
---- chrome/worker/worker_uitest.cc.orig	2011-01-11 10:01:47.000000000 +0100
-+++ chrome/worker/worker_uitest.cc	2011-01-15 22:46:56.000000000 +0100
+--- content/worker/worker_uitest.cc.orig	2011-01-11 10:01:47.000000000 +0100
++++ content/worker/worker_uitest.cc	2011-01-15 22:46:56.000000000 +0100
 @@ -85,8 +85,8 @@
      // The 1 is for the browser process.
      int number_of_processes = 1 + workers +
diff --git a/www/chromium/files/patch-gpu__demos__framework__main_pepper.cc b/www/chromium/files/patch-gpu__demos__framework__main_pepper.cc
deleted file mode 100644
index c6dabfd31905..000000000000
--- a/www/chromium/files/patch-gpu__demos__framework__main_pepper.cc
+++ /dev/null
@@ -1,48 +0,0 @@
---- gpu/demos/framework/main_pepper.cc.orig	2011-01-06 10:01:08.000000000 +0100
-+++ gpu/demos/framework/main_pepper.cc	2011-01-09 19:58:46.000000000 +0100
-@@ -97,7 +97,7 @@
-   NPError err = NPERR_NO_ERROR;
- 
-   switch (variable) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-     case NPPVpluginNameString:
-       *(static_cast<const char**>(value)) = "Pepper GPU Demo";
-       break;
-@@ -153,16 +153,16 @@
- }
- 
- EXPORT NPError API_CALL NP_Initialize(NPNetscapeFuncs* browser_funcs
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-                                      , NPPluginFuncs* plugin_funcs
--#endif  // OS_LINUX
-+#endif  // OS_LINUX || OS_FREEBSD
-                                      ) {
-   gpu::demos::g_browser = browser_funcs;
-   pglInitialize();
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   NP_GetEntryPoints(plugin_funcs);
--#endif  // OS_LINUX
-+#endif  // OS_LINUX || OS_FREEBSD
-   return NPERR_NO_ERROR;
- }
- 
-@@ -170,7 +170,7 @@
-   pglTerminate();
- }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- EXPORT NPError API_CALL NP_GetValue(NPP instance, NPPVariable variable,
-                                     void* value) {
-   return gpu::demos::NPP_GetValue(instance, variable, value);
-@@ -179,5 +179,5 @@
- EXPORT const char* API_CALL NP_GetMIMEDescription() {
-   return "pepper-application/x-gpu-demo::Pepper GPU Demo";
- }
--#endif  // OS_LINUX
-+#endif  // OS_LINUX || OS_FREEBSD
- }  // extern "C"
diff --git a/www/chromium/files/patch-ipc__ipc_channel_posix.cc b/www/chromium/files/patch-ipc__ipc_channel_posix.cc
new file mode 100644
index 000000000000..3bf5d4dae636
--- /dev/null
+++ b/www/chromium/files/patch-ipc__ipc_channel_posix.cc
@@ -0,0 +1,11 @@
+--- ipc/ipc_channel_posix.cc.orig	2011-06-06 00:13:54.367162724 +0300
++++ ipc/ipc_channel_posix.cc	2011-06-06 00:14:09.016163924 +0300
+@@ -927,7 +927,7 @@
+ 
+ bool Channel::ChannelImpl::GetClientEuid(uid_t* client_euid) const {
+   DCHECK(HasAcceptedConnection());
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_FREEBSD)
+   uid_t peer_euid;
+   gid_t peer_gid;
+   if (getpeereid(pipe_, &peer_euid, &peer_gid) != 0) {
diff --git a/www/chromium/files/patch-net__proxy__proxy_service.cc b/www/chromium/files/patch-net__proxy__proxy_service.cc
index 74adfe2b06da..889b0e1eef66 100644
--- a/www/chromium/files/patch-net__proxy__proxy_service.cc
+++ b/www/chromium/files/patch-net__proxy__proxy_service.cc
@@ -1,6 +1,6 @@
---- net/proxy/proxy_service.cc.orig	2011-04-26 11:01:15.000000000 +0300
-+++ net/proxy/proxy_service.cc	2011-05-03 20:34:48.665149760 +0300
-@@ -25,7 +25,7 @@
+--- net/proxy/proxy_service.cc.orig	2011-05-06 12:02:55.000000000 +0300
++++ net/proxy/proxy_service.cc	2011-06-05 19:34:18.920164573 +0300
+@@ -31,7 +31,7 @@
  #elif defined(OS_MACOSX)
  #include "net/proxy/proxy_config_service_mac.h"
  #include "net/proxy/proxy_resolver_mac.h"
@@ -8,30 +8,13 @@
 +#elif (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
  #include "net/proxy/proxy_config_service_linux.h"
  #endif
- #include "net/proxy/proxy_resolver.h"
-@@ -124,6 +124,16 @@
-   }
- };
  
-+// ProxyConfigService implementation that does nothing.
-+class ProxyConfigServiceNull : public ProxyConfigService {
-+public:
-+  ProxyConfigServiceNull() {}
-+  virtual void AddObserver(Observer* observer) {}
-+  virtual void RemoveObserver(Observer* observer) {}
-+  virtual bool GetLatestProxyConfig(ProxyConfig* config) { return true; }
-+  virtual void OnLazyPoll() {}
-+};
-+
- // ProxyResolver that simulates a PAC script which returns
- // |pac_string| for every single URL.
- class ProxyResolverFromPacString : public ProxyResolver {
-@@ -795,7 +805,7 @@
+@@ -807,7 +807,7 @@
    NOTREACHED() << "ProxyConfigService for ChromeOS should be created in "
-                << "chrome_url_request_context.cc::CreateProxyConfigService.";
+                << "profile_io_data.cc::CreateProxyConfigService.";
    return NULL;
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_FREEBSD)
-   ProxyConfigServiceLinux* linux_config_service
-       = new ProxyConfigServiceLinux();
+   ProxyConfigServiceLinux* linux_config_service =
+       new ProxyConfigServiceLinux();
  
diff --git a/www/chromium/files/patch-remoting__remoting.gyp b/www/chromium/files/patch-remoting__remoting.gyp
index 3054d3be354a..8860d68d2698 100644
--- a/www/chromium/files/patch-remoting__remoting.gyp
+++ b/www/chromium/files/patch-remoting__remoting.gyp
@@ -1,5 +1,5 @@
---- ./remoting/remoting.gyp.orig	2010-12-13 12:03:06.000000000 +0100
-+++ ./remoting/remoting.gyp	2011-01-07 14:17:11.000000000 +0100
+--- remoting/remoting.gyp.orig	2011-05-06 12:02:51.000000000 +0300
++++ remoting/remoting.gyp	2011-06-05 16:03:32.069163399 +0300
 @@ -16,7 +16,7 @@
    },
  
@@ -18,25 +18,21 @@
            ],
            'link_settings': {
              'libraries': [
-@@ -221,7 +223,11 @@
-             'host/event_executor_win.h',
-           ],
-         }],
+@@ -238,7 +240,7 @@
+         'host/user_authenticator_win.cc',
+       ],
+       'conditions': [
 -        ['OS=="linux"', {
-+        ['OS=="linux" or OS=="freebsd"', {
-+          'dependencies': [
-+	    '../build/linux/system.gyp:x11',
-+	    '../build/linux/system.gyp:xext',
-+          ],
-           'sources': [
-             'host/capturer_linux.cc',
-             'host/capturer_linux.h',
-@@ -497,7 +503,7 @@
-             'host/capturer_gdi_unittest.cc',
++        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+           'dependencies': [
+             '../build/linux/system.gyp:gtk',
            ],
-         }],
+@@ -555,7 +557,7 @@
+         'run_all_unittests.cc',
+       ],
+       'conditions': [
 -        ['OS=="linux"', {
-+        ['OS=="linux" or OS=="freebsd"', {
++        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
            'dependencies': [
+             '../app/app.gyp:app_base',
              # Needed for the following #include chain:
-             #   base/run_all_unittests.cc
diff --git a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp b/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp
index 739124400f14..a50516051397 100644
--- a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp
+++ b/www/chromium/files/patch-third_party__ffmpeg__ffmpeg.gyp
@@ -1,5 +1,5 @@
---- third_party/ffmpeg/ffmpeg.gyp.orig	2011-05-08 00:21:12.884604466 +0300
-+++ third_party/ffmpeg/ffmpeg.gyp	2011-05-08 00:23:54.819604306 +0300
+--- third_party/ffmpeg/ffmpeg.gyp.orig	2011-05-06 12:05:13.000000000 +0300
++++ third_party/ffmpeg/ffmpeg.gyp	2011-06-05 17:22:39.293163655 +0300
 @@ -50,7 +50,7 @@
        }, {
          'ffmpeg_config%': '<(target_arch)',
@@ -9,43 +9,13 @@
          '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"', {
-@@ -754,6 +764,10 @@
+@@ -767,6 +767,10 @@
                'include_dirs': [
                  'config',
                  'patched-ffmpeg-mt',
 +                # gliaskos: The following include is needed for libvpx,
 +                # should remain _after_ patched-ffmpeg-mt or else
-+                # ffmpeg_stubs.cc picks up system headers. 
++                # ffmpeg_stubs.cc picks up system headers.
 +                '/usr/local/include',
                ],
                'direct_dependent_settings': {
diff --git a/www/chromium/files/patch-app__gfx__gl__gl_bindings.h b/www/chromium/files/patch-ui__gfx__gl__gl_bindings.h
index 5aa6ac1a7321..e1bf588c5dd0 100644
--- a/www/chromium/files/patch-app__gfx__gl__gl_bindings.h
+++ b/www/chromium/files/patch-ui__gfx__gl__gl_bindings.h
@@ -1,5 +1,5 @@
---- ./app/gfx/gl/gl_bindings.h.orig	2010-12-16 02:11:22.000000000 +0100
-+++ ./app/gfx/gl/gl_bindings.h	2010-12-20 20:15:07.000000000 +0100
+--- ui/gfx/gl/gl_bindings.h.orig	2010-12-16 02:11:22.000000000 +0100
++++ ui/gfx/gl/gl_bindings.h	2010-12-20 20:15:07.000000000 +0100
 @@ -22,7 +22,7 @@
  // The standard OpenGL native extension headers are also included.
  #if defined(OS_WIN)
diff --git a/www/chromium/files/patch-ui__gfx__gl__gl_context_egl.cc b/www/chromium/files/patch-ui__gfx__gl__gl_context_egl.cc
new file mode 100644
index 000000000000..69fa94c4140c
--- /dev/null
+++ b/www/chromium/files/patch-ui__gfx__gl__gl_context_egl.cc
@@ -0,0 +1,11 @@
+--- ui/gfx/gl/gl_context_egl.cc.orig	2011-05-06 12:03:42.000000000 +0300
++++ ui/gfx/gl/gl_context_egl.cc	2011-06-05 16:26:28.775163463 +0300
+@@ -15,7 +15,7 @@
+ // it brings in #defines that cause conflicts.
+ #include "ui/gfx/gl/gl_bindings.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ extern "C" {
+ #include <X11/Xlib.h>
+ }
diff --git a/www/chromium/files/patch-ui__gfx__surface__surface.gyp b/www/chromium/files/patch-ui__gfx__surface__surface.gyp
new file mode 100644
index 000000000000..f94899627159
--- /dev/null
+++ b/www/chromium/files/patch-ui__gfx__surface__surface.gyp
@@ -0,0 +1,21 @@
+--- ui/gfx/surface/surface.gyp.orig	2011-06-05 21:15:55.954163307 +0300
++++ ui/gfx/surface/surface.gyp	2011-06-05 21:16:05.238163089 +0300
+@@ -10,11 +10,17 @@
+       ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
+     ],
+     'conditions': [
+-      ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [
++      ['OS=="linux"', {'sources/': [
+         ['include', '/gtk/'],
+         ['include', '_(gtk|linux|posix|skia|x)\\.cc$'],
+         ['include', '/(gtk|x11)_[^/]*\\.cc$'],
+       ]}],
++      ['OS=="freebsd" or OS=="openbsd"', {'sources/': [
++        # gliaskos: Use transport_dib_mac.cc instead of duplicating the code.
++        ['include', '/gtk/'],
++        ['include', '_(gtk|dib_mac|posix|skia|x)\\.cc$'],
++        ['include', '/(gtk|x11)_[^/]*\\.cc$'],
++      ]}],
+       ['OS=="mac"', {'sources/': [
+         ['include', '/cocoa/'],
+         ['include', '_(cocoa|mac|posix)\\.(cc|mm?)$'],
diff --git a/www/chromium/files/patch-app__surface__transport_dib.h b/www/chromium/files/patch-ui__gfx__surface__transport_dib.h
index 696a7528f621..4165a37e33bd 100644
--- a/www/chromium/files/patch-app__surface__transport_dib.h
+++ b/www/chromium/files/patch-ui__gfx__surface__transport_dib.h
@@ -1,5 +1,5 @@
---- ./app/surface/transport_dib.h.orig	2010-12-16 02:11:21.000000000 +0100
-+++ ./app/surface/transport_dib.h	2010-12-20 20:15:07.000000000 +0100
+--- ui/gfx/surface/transport_dib.h.orig	2011-05-06 12:03:42.000000000 +0300
++++ ui/gfx/surface/transport_dib.h	2011-06-05 21:06:20.559165060 +0300
 @@ -8,7 +8,7 @@
  
  #include "base/basictypes.h"
@@ -25,9 +25,9 @@
 -#elif defined(USE_X11)
 +#elif defined(OS_LINUX)
    typedef int Handle;  // These two ints are SysV IPC shared memory keys
-   typedef int Id;
- 
-@@ -171,11 +171,12 @@
+   struct Id {
+     // Ensure that default initialized Ids are invalid.
+@@ -184,11 +184,12 @@
  
   private:
    TransportDIB();
@@ -39,6 +39,6 @@
 -#elif defined(USE_X11)
 +#endif
 +#if defined(USE_X11)
-   int key_;  // SysV shared memory id
+   Id key_;  // SysV shared memory id
    void* address_;  // mapped address
    XSharedMemoryId x_shm_;  // X id for the shared segment
diff --git a/www/chromium/files/patch-ui__gfx__surface__transport_dib_mac.cc b/www/chromium/files/patch-ui__gfx__surface__transport_dib_mac.cc
new file mode 100644
index 000000000000..569e8a6b09d8
--- /dev/null
+++ b/www/chromium/files/patch-ui__gfx__surface__transport_dib_mac.cc
@@ -0,0 +1,15 @@
+--- ui/gfx/surface/transport_dib_mac.cc.orig	2011-06-05 20:47:40.781162828 +0300
++++ ui/gfx/surface/transport_dib_mac.cc	2011-06-05 20:47:51.617166566 +0300
+@@ -96,3 +96,12 @@
+ TransportDIB::Handle TransportDIB::handle() const {
+   return shared_memory_.handle();
+ }
++
++XID TransportDIB::MapToX(Display* display) {
++  if (!x_shm_) {
++    x_shm_ = ui::AttachSharedMemory(display, key_);
++    display_ = display;
++  }
++
++  return x_shm_;
++}
diff --git a/www/chromium/files/patch-v8__src__platform-freebsd.cc b/www/chromium/files/patch-v8__src__platform-freebsd.cc
new file mode 100644
index 000000000000..498e5b26be78
--- /dev/null
+++ b/www/chromium/files/patch-v8__src__platform-freebsd.cc
@@ -0,0 +1,70 @@
+--- v8/src/platform-freebsd.cc.orig	2011-06-05 18:08:56.225331291 +0300
++++ v8/src/platform-freebsd.cc	2011-06-05 18:46:22.678164821 +0300
+@@ -55,6 +55,7 @@
+ 
+ #include "platform.h"
+ #include "vm-state-inl.h"
++#include "v8threads.h"
+ 
+ 
+ namespace v8 {
+@@ -397,31 +398,6 @@
+ };
+ 
+ 
+-ThreadHandle::ThreadHandle(Kind kind) {
+-  data_ = new PlatformData(kind);
+-}
+-
+-
+-void ThreadHandle::Initialize(ThreadHandle::Kind kind) {
+-  data_->Initialize(kind);
+-}
+-
+-
+-ThreadHandle::~ThreadHandle() {
+-  delete data_;
+-}
+-
+-
+-bool ThreadHandle::IsSelf() const {
+-  return pthread_equal(data_->thread_, pthread_self());
+-}
+-
+-
+-bool ThreadHandle::IsValid() const {
+-  return data_->thread_ != kNoThread;
+-}
+-
+-
+ Thread::Thread(Isolate* isolate, const Options& options)
+     : data_(new PlatformData),
+       isolate_(isolate),
+@@ -448,8 +424,8 @@
+   // This is also initialized by the first argument to pthread_create() but we
+   // don't know which thread will run first (the original thread or the new
+   // one) so we initialize it here too.
+-  thread_->data_->thread_ = pthread_self();
+-  ASSERT(thread->IsValid());
++  thread->data()->thread_ = pthread_self();
++  ASSERT(thread->data()->thread_ != kNoThread);
+   Thread::SetThreadLocal(Isolate::isolate_key(), thread->isolate());
+   thread->Run();
+   return NULL;
+@@ -470,13 +446,13 @@
+     pthread_attr_setstacksize(&attr, static_cast<size_t>(stack_size_));
+     attr_ptr = &attr;
+   }
+-  pthread_create(&thread_handle_data()->thread_, attr_ptr, ThreadEntry, this);
+-  ASSERT(IsValid());
++  pthread_create(&data_->thread_, attr_ptr, ThreadEntry, this);
++  ASSERT(data_->thread_ != kNoThread);
+ }
+ 
+ 
+ void Thread::Join() {
+-  pthread_join(thread_handle_data()->thread_, NULL);
++  pthread_join(data_->thread_, NULL);
+ }
+ 
+ 
diff --git a/www/chromium/files/patch-v8__src__x64 b/www/chromium/files/patch-v8__src__x64
deleted file mode 100644
index f167ed1ce8f4..000000000000
--- a/www/chromium/files/patch-v8__src__x64
+++ /dev/null
@@ -1,481 +0,0 @@
-diff -ru v8.orig/src/x64/code-stubs-x64.cc v8/src/x64/code-stubs-x64.cc
---- v8.orig/src/x64/code-stubs-x64.cc	2011-03-12 11:22:17.000000000 +0200
-+++ v8/src/x64/code-stubs-x64.cc	2011-03-23 01:39:18.065180854 +0200
-@@ -1699,11 +1699,14 @@
-   Label slow;
-   __ JumpIfNotSmi(rdx, &slow);
- 
--  // Check if the calling frame is an arguments adaptor frame.
-+  // Check if the calling frame is an arguments adaptor frame.  We look at the
-+  // context offset, and if the frame is not a regular one, then we find a
-+  // Smi instead of the context.  We can't use SmiCompare here, because that
-+  // only works for comparing two smis.
-   Label adaptor;
-   __ movq(rbx, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
--  __ SmiCompare(Operand(rbx, StandardFrameConstants::kContextOffset),
--                Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-+  __ Cmp(Operand(rbx, StandardFrameConstants::kContextOffset),
-+         Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-   __ j(equal, &adaptor);
- 
-   // Check index against formal parameters count limit passed in
-@@ -1758,8 +1761,8 @@
-   // Check if the calling frame is an arguments adaptor frame.
-   Label adaptor_frame, try_allocate, runtime;
-   __ movq(rdx, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
--  __ SmiCompare(Operand(rdx, StandardFrameConstants::kContextOffset),
--                Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-+  __ Cmp(Operand(rdx, StandardFrameConstants::kContextOffset),
-+         Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-   __ j(equal, &adaptor_frame);
- 
-   // Get the length from the frame.
-@@ -3518,8 +3521,8 @@
-   // Look at the length of the result of adding the two strings.
-   STATIC_ASSERT(String::kMaxLength <= Smi::kMaxValue / 2);
-   __ SmiAdd(rbx, rbx, rcx);
--  // Use the runtime system when adding two one character strings, as it
--  // contains optimizations for this specific case using the symbol table.
-+  // Use the symbol table when adding two one character strings, as it
-+  // helps later optimizations to return a symbol here.
-   __ SmiCompare(rbx, Smi::FromInt(2));
-   __ j(not_equal, &longer_than_two);
- 
-@@ -3823,15 +3826,14 @@
-                     FieldOperand(symbol_table, SymbolTable::kCapacityOffset));
-   __ decl(mask);
- 
--  Register undefined = scratch4;
--  __ LoadRoot(undefined, Heap::kUndefinedValueRootIndex);
-+  Register map = scratch4;
- 
-   // Registers
-   // chars:        two character string, char 1 in byte 0 and char 2 in byte 1.
-   // hash:         hash of two character string (32-bit int)
-   // symbol_table: symbol table
-   // mask:         capacity mask (32-bit int)
--  // undefined:    undefined value
-+  // map:          -
-   // scratch:      -
- 
-   // Perform a number of probes in the symbol table.
-@@ -3846,7 +3848,7 @@
-     }
-     __ andl(scratch, mask);
- 
--    // Load the entry from the symble table.
-+    // Load the entry from the symbol table.
-     Register candidate = scratch;  // Scratch register contains candidate.
-     STATIC_ASSERT(SymbolTable::kEntrySize == 1);
-     __ movq(candidate,
-@@ -3856,8 +3858,16 @@
-                          SymbolTable::kElementsStartOffset));
- 
-     // If entry is undefined no string with this hash can be found.
--    __ cmpq(candidate, undefined);
-+    NearLabel is_string;
-+    __ CmpObjectType(candidate, ODDBALL_TYPE, map);
-+    __ j(not_equal, &is_string);
-+
-+    __ CompareRoot(candidate, Heap::kUndefinedValueRootIndex);
-     __ j(equal, not_found);
-+    // Must be null (deleted entry).
-+    __ jmp(&next_probe[i]);
-+
-+    __ bind(&is_string);
- 
-     // If length is not 2 the string is not a candidate.
-     __ SmiCompare(FieldOperand(candidate, String::kLengthOffset),
-@@ -3869,8 +3879,7 @@
-     Register temp = kScratchRegister;
- 
-     // Check that the candidate is a non-external ascii string.
--    __ movq(temp, FieldOperand(candidate, HeapObject::kMapOffset));
--    __ movzxbl(temp, FieldOperand(temp, Map::kInstanceTypeOffset));
-+    __ movzxbl(temp, FieldOperand(map, Map::kInstanceTypeOffset));
-     __ JumpIfInstanceTypeIsNotSequentialAscii(
-         temp, temp, &next_probe[i]);
- 
-Only in v8/src/x64: code-stubs-x64.cc.orig
-diff -ru v8.orig/src/x64/codegen-x64.cc v8/src/x64/codegen-x64.cc
---- v8.orig/src/x64/codegen-x64.cc	2011-03-12 11:22:17.000000000 +0200
-+++ v8/src/x64/codegen-x64.cc	2011-03-23 01:39:18.093150889 +0200
-@@ -760,7 +760,7 @@
-       __ AbortIfNotNumber(value.reg());
-     }
-     // Smi => false iff zero.
--    __ SmiCompare(value.reg(), Smi::FromInt(0));
-+    __ Cmp(value.reg(), Smi::FromInt(0));
-     if (value.is_smi()) {
-       value.Unuse();
-       dest->Split(not_zero);
-@@ -788,7 +788,7 @@
-     dest->false_target()->Branch(equal);
- 
-     // Smi => false iff zero.
--    __ SmiCompare(value.reg(), Smi::FromInt(0));
-+    __ Cmp(value.reg(), Smi::FromInt(0));
-     dest->false_target()->Branch(equal);
-     Condition is_smi = masm_->CheckSmi(value.reg());
-     dest->true_target()->Branch(is_smi);
-@@ -1030,7 +1030,7 @@
-                                         true, overwrite_mode);
-   } else {
-     // Set the flags based on the operation, type and loop nesting level.
--    // Bit operations always assume they likely operate on Smis. Still only
-+    // Bit operations always assume they likely operate on smis. Still only
-     // generate the inline Smi check code if this operation is part of a loop.
-     // For all other operations only inline the Smi check code for likely smis
-     // if the operation is part of a loop.
-@@ -2102,7 +2102,7 @@
-       if (cc == equal) {
-         Label comparison_done;
-         __ SmiCompare(FieldOperand(left_side.reg(), String::kLengthOffset),
--                Smi::FromInt(1));
-+                      Smi::FromInt(1));
-         __ j(not_equal, &comparison_done);
-         uint8_t char_value =
-             static_cast<uint8_t>(String::cast(*right_val)->Get(0));
-@@ -2288,7 +2288,7 @@
-       // CompareStub and the inline code both support all values of cc.
-     }
-     // Implement comparison against a constant Smi, inlining the case
--    // where both sides are Smis.
-+    // where both sides are smis.
-     left_side->ToRegister();
-     Register left_reg = left_side->reg();
-     Smi* constant_smi = Smi::cast(*right_side->handle());
-@@ -2298,7 +2298,6 @@
-         __ AbortIfNotSmi(left_reg);
-       }
-       // Test smi equality and comparison by signed int comparison.
--      // Both sides are smis, so we can use an Immediate.
-       __ SmiCompare(left_reg, constant_smi);
-       left_side->Unuse();
-       right_side->Unuse();
-@@ -2308,7 +2307,7 @@
-       JumpTarget is_smi;
-       if (cc == equal) {
-         // We can do the equality comparison before the smi check.
--        __ SmiCompare(left_reg, constant_smi);
-+        __ Cmp(left_reg, constant_smi);
-         dest->true_target()->Branch(equal);
-         Condition left_is_smi = masm_->CheckSmi(left_reg);
-         dest->false_target()->Branch(left_is_smi);
-@@ -2569,8 +2568,8 @@
-       // adaptor frame below it.
-       Label invoke, adapted;
-       __ movq(rdx, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
--      __ SmiCompare(Operand(rdx, StandardFrameConstants::kContextOffset),
--                    Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-+      __ Cmp(Operand(rdx, StandardFrameConstants::kContextOffset),
-+             Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-       __ j(equal, &adapted);
- 
-       // No arguments adaptor frame. Copy fixed number of arguments.
-@@ -3850,7 +3849,7 @@
-   __ movq(rbx, rax);
- 
-   // If the property has been removed while iterating, we just skip it.
--  __ SmiCompare(rbx, Smi::FromInt(0));
-+  __ Cmp(rbx, Smi::FromInt(0));
-   node->continue_target()->Branch(equal);
- 
-   end_del_check.Bind();
-@@ -6182,15 +6181,15 @@
- 
-   // Skip the arguments adaptor frame if it exists.
-   Label check_frame_marker;
--  __ SmiCompare(Operand(fp.reg(), StandardFrameConstants::kContextOffset),
--                Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-+  __ Cmp(Operand(fp.reg(), StandardFrameConstants::kContextOffset),
-+         Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-   __ j(not_equal, &check_frame_marker);
-   __ movq(fp.reg(), Operand(fp.reg(), StandardFrameConstants::kCallerFPOffset));
- 
-   // Check the marker in the calling frame.
-   __ bind(&check_frame_marker);
--  __ SmiCompare(Operand(fp.reg(), StandardFrameConstants::kMarkerOffset),
--                Smi::FromInt(StackFrame::CONSTRUCT));
-+  __ Cmp(Operand(fp.reg(), StandardFrameConstants::kMarkerOffset),
-+         Smi::FromInt(StackFrame::CONSTRUCT));
-   fp.Unuse();
-   destination()->Split(equal);
- }
-@@ -6210,8 +6209,8 @@
- 
-   // Check if the calling frame is an arguments adaptor frame.
-   __ movq(fp.reg(), Operand(rbp, StandardFrameConstants::kCallerFPOffset));
--  __ SmiCompare(Operand(fp.reg(), StandardFrameConstants::kContextOffset),
--                Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-+  __ Cmp(Operand(fp.reg(), StandardFrameConstants::kContextOffset),
-+         Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-   __ j(not_equal, &exit);
- 
-   // Arguments adaptor case: Read the arguments length from the
-@@ -6767,8 +6766,8 @@
-   // Fetch the map and check if array is in fast case.
-   // Check that object doesn't require security checks and
-   // has no indexed interceptor.
--  __ CmpObjectType(object.reg(), FIRST_JS_OBJECT_TYPE, tmp1.reg());
--  deferred->Branch(below);
-+  __ CmpObjectType(object.reg(), JS_ARRAY_TYPE, tmp1.reg());
-+  deferred->Branch(not_equal);
-   __ testb(FieldOperand(tmp1.reg(), Map::kBitFieldOffset),
-            Immediate(KeyedLoadIC::kSlowCaseBitFieldMask));
-   deferred->Branch(not_zero);
-@@ -6810,7 +6809,7 @@
- 
-   Label done;
-   __ InNewSpace(tmp1.reg(), tmp2.reg(), equal, &done);
--  // Possible optimization: do a check that both values are Smis
-+  // Possible optimization: do a check that both values are smis
-   // (or them and test against Smi mask.)
- 
-   __ movq(tmp2.reg(), tmp1.reg());
-@@ -8485,12 +8484,6 @@
-     __ CmpObjectType(receiver.reg(), JS_ARRAY_TYPE, kScratchRegister);
-     deferred->Branch(not_equal);
- 
--    // Check that the key is within bounds.  Both the key and the length of
--    // the JSArray are smis. Use unsigned comparison to handle negative keys.
--    __ SmiCompare(FieldOperand(receiver.reg(), JSArray::kLengthOffset),
--                  key.reg());
--    deferred->Branch(below_equal);
--
-     // Get the elements array from the receiver and check that it is not a
-     // dictionary.
-     __ movq(tmp.reg(),
-@@ -8519,6 +8512,14 @@
-             kScratchRegister);
-     deferred->Branch(not_equal);
- 
-+    // Check that the key is within bounds.  Both the key and the length of
-+    // the JSArray are smis (because the fixed array check above ensures the
-+    // elements are in fast case). Use unsigned comparison to handle negative
-+    // keys.
-+    __ SmiCompare(FieldOperand(receiver.reg(), JSArray::kLengthOffset),
-+                  key.reg());
-+    deferred->Branch(below_equal);
-+
-     // Store the value.
-     SmiIndex index =
-         masm()->SmiToIndex(kScratchRegister, key.reg(), kPointerSizeLog2);
-Only in v8/src/x64: codegen-x64.cc.orig
-diff -ru v8.orig/src/x64/full-codegen-x64.cc v8/src/x64/full-codegen-x64.cc
---- v8.orig/src/x64/full-codegen-x64.cc	2011-03-12 11:22:17.000000000 +0200
-+++ v8/src/x64/full-codegen-x64.cc	2011-03-23 01:39:18.110779666 +0200
-@@ -865,7 +865,7 @@
-   __ push(rcx);  // Enumerable.
-   __ push(rbx);  // Current entry.
-   __ InvokeBuiltin(Builtins::FILTER_KEY, CALL_FUNCTION);
--  __ SmiCompare(rax, Smi::FromInt(0));
-+  __ Cmp(rax, Smi::FromInt(0));
-   __ j(equal, loop_statement.continue_target());
-   __ movq(rbx, rax);
- 
-@@ -2300,15 +2300,15 @@
- 
-   // Skip the arguments adaptor frame if it exists.
-   Label check_frame_marker;
--  __ SmiCompare(Operand(rax, StandardFrameConstants::kContextOffset),
--                Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-+  __ Cmp(Operand(rax, StandardFrameConstants::kContextOffset),
-+         Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-   __ j(not_equal, &check_frame_marker);
-   __ movq(rax, Operand(rax, StandardFrameConstants::kCallerFPOffset));
- 
-   // Check the marker in the calling frame.
-   __ bind(&check_frame_marker);
--  __ SmiCompare(Operand(rax, StandardFrameConstants::kMarkerOffset),
--                Smi::FromInt(StackFrame::CONSTRUCT));
-+  __ Cmp(Operand(rax, StandardFrameConstants::kMarkerOffset),
-+         Smi::FromInt(StackFrame::CONSTRUCT));
-   PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);
-   Split(equal, if_true, if_false, fall_through);
- 
-@@ -2362,8 +2362,8 @@
- 
-   // Check if the calling frame is an arguments adaptor frame.
-   __ movq(rbx, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
--  __ SmiCompare(Operand(rbx, StandardFrameConstants::kContextOffset),
--                Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-+  __ Cmp(Operand(rbx, StandardFrameConstants::kContextOffset),
-+         Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-   __ j(not_equal, &exit);
- 
-   // Arguments adaptor case: Read the arguments length from the
-Only in v8/src/x64: full-codegen-x64.cc.orig
-Only in v8/src/x64: full-codegen-x64.cc.rej
-diff -ru v8.orig/src/x64/lithium-codegen-x64.cc v8/src/x64/lithium-codegen-x64.cc
---- v8.orig/src/x64/lithium-codegen-x64.cc	2011-03-12 11:22:17.000000000 +0200
-+++ v8/src/x64/lithium-codegen-x64.cc	2011-03-23 01:39:18.127345179 +0200
-@@ -786,7 +786,7 @@
-       __ j(equal, true_label);
-       __ CompareRoot(reg, Heap::kFalseValueRootIndex);
-       __ j(equal, false_label);
--      __ SmiCompare(reg, Smi::FromInt(0));
-+      __ Cmp(reg, Smi::FromInt(0));
-       __ j(equal, false_label);
-       __ JumpIfSmi(reg, true_label);
- 
-Only in v8/src/x64: lithium-codegen-x64.cc.orig
-Only in v8/src/x64: lithium-codegen-x64.cc.rej
-diff -ru v8.orig/src/x64/macro-assembler-x64.cc v8/src/x64/macro-assembler-x64.cc
---- v8.orig/src/x64/macro-assembler-x64.cc	2011-03-12 11:22:17.000000000 +0200
-+++ v8/src/x64/macro-assembler-x64.cc	2011-03-23 01:39:18.144950769 +0200
-@@ -109,7 +109,7 @@
-   ASSERT(!object.is(rsi) && !value.is(rsi) && !index.is(rsi));
- 
-   // First, check if a write barrier is even needed. The tests below
--  // catch stores of Smis and stores into young gen.
-+  // catch stores of smis and stores into young gen.
-   Label done;
-   JumpIfSmi(value, &done);
- 
-@@ -138,7 +138,7 @@
-   ASSERT(!object.is(rsi) && !value.is(rsi) && !address.is(rsi));
- 
-   // First, check if a write barrier is even needed. The tests below
--  // catch stores of Smis and stores into young gen.
-+  // catch stores of smis and stores into young gen.
-   Label done;
-   JumpIfSmi(value, &done);
- 
-@@ -820,12 +820,26 @@
- }
- 
- 
--void MacroAssembler::SmiCompare(Register dst, Register src) {
--  cmpq(dst, src);
-+void MacroAssembler::SmiCompare(Register smi1, Register smi2) {
-+  if (FLAG_debug_code) {
-+    AbortIfNotSmi(smi1);
-+    AbortIfNotSmi(smi2);
-+  }
-+  cmpq(smi1, smi2);
- }
- 
- 
- void MacroAssembler::SmiCompare(Register dst, Smi* src) {
-+  if (FLAG_debug_code) {
-+    AbortIfNotSmi(dst);
-+  }
-+  // Actually, knowing the register is a smi doesn't enable any optimizations
-+  // with the current tagging scheme.
-+  Cmp(dst, src);
-+}
-+
-+
-+void MacroAssembler::Cmp(Register dst, Smi* src) {
-   ASSERT(!dst.is(kScratchRegister));
-   if (src->value() == 0) {
-     testq(dst, dst);
-@@ -837,20 +851,41 @@
- 
- 
- void MacroAssembler::SmiCompare(Register dst, const Operand& src) {
-+  if (FLAG_debug_code) {
-+    AbortIfNotSmi(dst);
-+    AbortIfNotSmi(src);
-+  }
-   cmpq(dst, src);
- }
- 
- 
- void MacroAssembler::SmiCompare(const Operand& dst, Register src) {
-+  if (FLAG_debug_code) {
-+    AbortIfNotSmi(dst);
-+    AbortIfNotSmi(src);
-+  }
-   cmpq(dst, src);
- }
- 
- 
- void MacroAssembler::SmiCompare(const Operand& dst, Smi* src) {
-+  if (FLAG_debug_code) {
-+    AbortIfNotSmi(dst);
-+  }
-   cmpl(Operand(dst, kSmiShift / kBitsPerByte), Immediate(src->value()));
- }
- 
- 
-+void MacroAssembler::Cmp(const Operand& dst, Smi* src) {
-+  // The Operand cannot use the smi register, since we may use the scratch
-+  // register to get around the lack of 64 bit immediates in the instruction
-+  // set.
-+  Register smi_reg = GetSmiConstant(src);
-+  ASSERT(!dst.AddressUsesRegister(smi_reg));
-+  cmpq(dst, smi_reg);
-+}
-+
-+
- void MacroAssembler::SmiCompareInteger32(const Operand& dst, Register src) {
-   cmpl(Operand(dst, kSmiShift / kBitsPerByte), src);
- }
-@@ -1335,7 +1370,7 @@
- 
- void MacroAssembler::Cmp(Register dst, Handle<Object> source) {
-   if (source->IsSmi()) {
--    SmiCompare(dst, Smi::cast(*source));
-+    Cmp(dst, Smi::cast(*source));
-   } else {
-     Move(kScratchRegister, source);
-     cmpq(dst, kScratchRegister);
-@@ -1345,7 +1380,7 @@
- 
- void MacroAssembler::Cmp(const Operand& dst, Handle<Object> source) {
-   if (source->IsSmi()) {
--    SmiCompare(dst, Smi::cast(*source));
-+    Cmp(dst, Smi::cast(*source));
-   } else {
-     ASSERT(source->IsHeapObject());
-     movq(kScratchRegister, source, RelocInfo::EMBEDDED_OBJECT);
-@@ -1692,7 +1727,12 @@
- 
- 
- void MacroAssembler::AbortIfNotSmi(Register object) {
--  NearLabel ok;
-+  Condition is_smi = CheckSmi(object);
-+  Assert(is_smi, "Operand is not a smi");
-+}
-+
-+
-+void MacroAssembler::AbortIfNotSmi(const Operand& object) {
-   Condition is_smi = CheckSmi(object);
-   Assert(is_smi, "Operand is not a smi");
- }
-Only in v8/src/x64: macro-assembler-x64.cc.orig
-diff -ru v8.orig/src/x64/macro-assembler-x64.h v8/src/x64/macro-assembler-x64.h
---- v8.orig/src/x64/macro-assembler-x64.h	2011-03-12 11:22:17.000000000 +0200
-+++ v8/src/x64/macro-assembler-x64.h	2011-03-23 01:39:18.158396891 +0200
-@@ -256,8 +256,9 @@
-                                            int power);
- 
- 
--  // Simple comparison of smis.
--  void SmiCompare(Register dst, Register src);
-+  // Simple comparison of smis.  Both sides must be known smis to use these,
-+  // otherwise use Cmp.
-+  void SmiCompare(Register smi1, Register smi2);
-   void SmiCompare(Register dst, Smi* src);
-   void SmiCompare(Register dst, const Operand& src);
-   void SmiCompare(const Operand& dst, Register src);
-@@ -579,6 +580,8 @@
-   void Move(const Operand& dst, Handle<Object> source);
-   void Cmp(Register dst, Handle<Object> source);
-   void Cmp(const Operand& dst, Handle<Object> source);
-+  void Cmp(Register dst, Smi* src);
-+  void Cmp(const Operand& dst, Smi* src);
-   void Push(Handle<Object> source);
- 
-   // Emit code to discard a non-negative number of pointer-sized elements
-@@ -646,6 +649,7 @@
- 
-   // Abort execution if argument is not a smi. Used in debug code.
-   void AbortIfNotSmi(Register object);
-+  void AbortIfNotSmi(const Operand& object);
- 
-   // Abort execution if argument is a string. Used in debug code.
-   void AbortIfNotString(Register object);
-Only in v8/src/x64: macro-assembler-x64.h.orig
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index 2cf4a732e1d9..285bb1ac44aa 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -103,6 +103,7 @@ bin/chrome
 %%DATADIR%%/resources/inspector/Images/focusButtonGlyph.png
 %%DATADIR%%/resources/inspector/Images/forward.png
 %%DATADIR%%/resources/inspector/Images/frame.png
+%%DATADIR%%/resources/inspector/Images/garbageCollectButtonGlyph.png
 %%DATADIR%%/resources/inspector/Images/gearButtonGlyph.png
 %%DATADIR%%/resources/inspector/Images/glossyHeader.png
 %%DATADIR%%/resources/inspector/Images/glossyHeaderPressed.png
@@ -225,6 +226,7 @@ bin/chrome
 %%DATADIR%%/resources/inspector/Images/warningMediumIcon.png
 %%DATADIR%%/resources/inspector/Images/warningOrangeDot.png
 %%DATADIR%%/resources/inspector/Images/warningsErrors.png
+%%DATADIR%%/resources/inspector/ScriptFormatterWorker.js
 %%DATADIR%%/resources/inspector/devTools.css
 %%DATADIR%%/resources/inspector/devtools.html
 %%DATADIR%%/xdg-settings