[meego-commits] 5018: Changes to Trunk:Testing/chromium
Priya Vijayan
priya.vijayan at intel.com
Tue Jun 29 22:30:14 UTC 2010
Hi,
I have made the following changes to chromium in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Priya Vijayan
[This message was auto-generated]
---
Request #5018:
submit: home:priya:branches:Trunk:Testing/chromium(r2)(cleanup) -> Trunk:Testing/chromium
Message:
Sync with MeeGo 1.0
State: new 2010-06-29T10:26:48 priya
Comment: None
changes files:
--------------
--- chromium.changes
+++ chromium.changes
@@ -0,0 +1,6 @@
+* Tue Jun 29 2010 Priya Vijayan <priya.vijayan at intel.com> - 6.0.417.0
+- Sync with MeeGo-1.0 changes
+
+* Sat Jun 12 2010 Raymond Liu <raymond.liu at intel.com> - 6.0.417.0
+- Update to 6.0.417.0, rebase some patches, fix BMC #2697
+
@@ -2 +8 @@
-- Remove StartupNotify attribute to fix BMC#2195
+- Remove StartupNotify attribute to fix BMC#2195
old:
----
chromium-20100315-system-gyp-v8.patch
chromium-20100319-fix-shm-fd-leaks.patch
chromium-20100319-myzone-int-hook.patch
chromium-20100322-mib-importer.patch
chromium-20100502svn46195.tar.bz2
chromium-20100506-option-window-size.patch
chromium-5.0.395.0-gyp-system-icu.patch
chromium-5.0.395.0-sharedlibfixes.patch
chromium-bold-cjk-droid-font-fix-svn46195.patch
chromium-fix-toolbar-icon-size.patch
new:
----
chromium-6.0.406.0-sharedlibfixes.patch
chromium-6.0.406.0-system-gyp-v8.patch
chromium-6.0.412.0-media-probe.patch
chromium-6.0.417.0-20100526svn48276.tar.bz2
chromium-6.0.417.0-gyp-system-icu.patch
chromium-bold-cjk-droid-font-fix-svn48276.patch
chromium-option-window-layout-svn48276.patch
spec files:
-----------
--- chromium.spec
+++ chromium.spec
@@ -1,6 +1,6 @@
-%global svndate 20100502
-%global svnver svn46195
-%global v8ver 2.2.7
+%global svndate 20100526
+%global svnver svn48276
+%global v8ver 2.2.12
# Useful for debugging
%global noisy 0
@@ -13,9 +13,13 @@
# Chromium depends on forked NSS features not found in upstream.
%global nss 0
+# TODO: Proper list of licenses
+License: BSD and LGPLv2+
+Group: Applications/Internet
+
Name: chromium
# see chrome/VERSION
-Version: 5.0.395.0
+Version: 6.0.417.0
Release: 1%{?dist}
Summary: A WebKit powered web browser
# Licensing Overview
@@ -23,9 +27,6 @@
# ffmpeg headers are LGPLv2+
# libjingle is BSD
-# TODO: Proper list of licenses
-License: BSD and LGPLv2+
-Group: Applications/Internet
# Just the code changes, none of the "makefile" changes
Patch0: chromium-5.0.395.0-codechanges-system-minizip-nss-nspr-v8.patch
@@ -33,13 +34,13 @@
# bzip2, jpeg, png, zlib, xml, xslt, libevent
# Hack support in for system v8
-Patch2: chromium-20100315-system-gyp-v8.patch
+Patch2: chromium-6.0.406.0-system-gyp-v8.patch
-# We also remove minizip, which google left in because ubuntu doesn't have it.
+# We also remove minizip, which google left in because ubuntu doesn't have it. :P
Patch4: chromium-20090807-gyp-system-minizip.patch
# Use system libicu
-Patch7: chromium-5.0.395.0-gyp-system-icu.patch
+Patch7: chromium-6.0.417.0-gyp-system-icu.patch
# Code changes to use system libicu
Patch8: chromium-5.0.395.0-icu-code-changes.patch
@@ -52,7 +53,7 @@
Patch10: chromium-20100419-system-nss.patch
# Fix shared libs
-Patch11: chromium-5.0.395.0-sharedlibfixes.patch
+Patch11: chromium-6.0.406.0-sharedlibfixes.patch
# Fix ChromiumThreading issue in wtf shared lib
Patch12: chromium-20100315-shared-chromiumthreading.patch
@@ -67,69 +68,84 @@
Patch15: chromium-20100218-no-courgette.patch
# Nacl needs fPIC (even on x86_32)
-Patch17: chromium-5.0.395.0-nacl-needs-fPIC.patch
+Patch16: chromium-5.0.395.0-nacl-needs-fPIC.patch
-#patch to re-org the visibility options in Chromium browser build
-#Patch18: chromium-20100315-hidden-option.patch
+# chrome_dll_main.c needs libnacl for NaClMain()
+Patch17: chromium-20100315-NaClMain.patch
+
+# Use system libGLEW
+# Patch18: chromium-5.0.395.0-system-glew.patch
+
+# Don't try to build non-existent test sources
+Patch19: chromium-no-test-sources.patch
+
+# Fix the wrapper
+#Patch20: chromium-fix-wrapper.patch
+
+# Set master_prefs to a sane location
+#Patch21: chromium-master-prefs-path.patch
+
+# Fix media probing
+Patch22: chromium-6.0.412.0-media-probe.patch
+
+# Use system expat
+Patch23: chromium-20100408-system-expat.patch
+
+# Fix ffmpeg wrapper compile
+Patch24: ffmpegfix.patch
+Patch25: chromium-20100408-ffmpeg-no-pkgconfig.patch
+
+# Fix zlib gyp file to not build empty shell
+Patch26: chromium-20100408-no-empty-shell-zlib.patch
+
+# Fix yuv_row_posix when compiled with -fPIC
+Patch27: chromium-20100413-fix-yuv_row_posix-shared.patch
+
+################# patches from fedora ends ###############################
+
+
+
+########### patches to re-org the visibility options in Chromium browser build start
+
+#Patch101: chromium-20100315-hidden-option.patch
#patch to add -fvisibility=hidden when building WebCore shared library
-#Patch19: chromium-20100218-webcore-hidden.patch
+#Patch102: chromium-20100218-webcore-hidden.patch
#patch to explicitly export symbols in WebCore
-#Patch20: chromium-20100315-explicit-export-webcore-symbols.patch
+#Patch103: chromium-20100315-explicit-export-webcore-symbols.patch
+
+########### patches to re-org the visibility options in Chromium browser build ends
+
+
############### patches for MeeGo integration start
+
#patch to adjust option window size and position for compact screen
-Patch21: chromium-20100506-option-window-size.patch
+Patch201: chromium-option-window-layout-svn48276.patch
#patch to let window manager to switch browser's zone to font
-Patch22: chromium-browser-window-focus.patch
+Patch202: chromium-browser-window-focus.patch
#patch to fix the bold CJK font rendering issue
-Patch23: chromium-bold-cjk-droid-font-fix-svn46195.patch
+Patch203: chromium-bold-cjk-droid-font-fix-svn48276.patch
#patch to fix default browser setting issue
-Patch26: chromium-20100319-default-browser-setting.patch
-
-#patch to fix shared memory leak issue
-#Patch27: chromium-20100319-fix-shm-fd-leaks.patch
+Patch204: chromium-20100319-default-browser-setting.patch
#patch to expose chromium browser api
-Patch28: chromium-20100506-expose-chromium-browser-api.patch
-
-#patch to import profile from moblin-internet-browser
-#Patch29: chromium-20100322-mib-importer.patch
-################ patches for MeeGo integration ends
-
-# chrome_dll_main.c needs libnacl for NaClMain()
-Patch30: chromium-20100315-NaClMain.patch
-
-# Use system libGLEW
-#Patch31: chromium-5.0.395.0-system-glew.patch
+Patch205: chromium-20100506-expose-chromium-browser-api.patch
# patch to fix flash plugin BMC#618 and BMC#484
-Patch32: chromium-20100415-flash-plugin-crash-fix.patch
-
-# Don't try to build non-existent test sources
-Patch33: chromium-no-test-sources.patch
+Patch206: chromium-20100415-flash-plugin-crash-fix.patch
-# Use system expat
-Patch37: chromium-20100408-system-expat.patch
-
-# Fix ffmpeg wrapper compile
-Patch38: ffmpegfix.patch
-Patch39: chromium-20100408-ffmpeg-no-pkgconfig.patch
-
-# Fix zlib gyp file to not build empty shell
-Patch40: chromium-20100408-no-empty-shell-zlib.patch
+# Fix icon size cut off in MeeGo 1.0
+#Patch207: chromium-fix-toolbar-icon-size.patch
-# Fix yuv_row_posix when compiled with -fPIC
-Patch41: chromium-20100413-fix-yuv_row_posix-shared.patch
+################ patches for MeeGo integration ends
-# Fix icon size cut off in MeeGo 1.0
-Patch42: chromium-fix-toolbar-icon-size.patch
-Source0: chromium-%{svndate}%{svnver}.tar.bz2
+Source0: chromium-%{version}-%{svndate}%{svnver}.tar.bz2
# Custom build tools for chromium, hammer is a fancy front-end for scons
Source1: http://src.chromium.org/svn/trunk/tools/depot_tools.tar.gz
Source2: chromium-browser.sh
@@ -145,7 +161,7 @@
BuildRequires: desktop-file-utils, gperf, libicu-devel
BuildRequires: nss-devel >= 3.12.3, glew-devel,
BuildRequires: pkgconfig(glu), libXScrnSaver-devel, expat-devel, fdupes
-BuildRequires: python
+BuildRequires: python, cups-devel
# NaCl needs these
@@ -199,7 +215,7 @@
%prep
echo "####### BUILD OPTIONS #######"
echo "Verbose Build: %{noisy}"
-%setup -q -n chromium-%{svndate}%{svnver} -a 1
+%setup -q -n chromium-%{version}-%{svndate}%{svnver} -a 1
# Remove Another copy of zlib
rm -rf third_party/WebKit/WebCore/platform/image-decoders/zlib/
@@ -241,54 +257,61 @@
%patch15 -p1 -b .no-courgette
# Nacl needs fPIC, even on x86_32
-%patch17 -p1 -b .fPIC
-
-#patch to re-org the visibility options in Chromium browser build
-#%patch18 -p1
-
-#patch to add -fvisibility=hidden when building WebCore shared library
-#%patch19 -p1
-
-#patch to explicitly export symbols in WebCore
-#%patch20 -p1
-
-#patches for MeeGo integration
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-#%patch24 -p1
-#%patch25 -p1
-%patch26 -p1
-#%patch27 -p1
-%patch28 -p1
-#%patch29 -p1
+%patch16 -p1 -b .fPIC
# chrome_dll_main.c needs libnacl for NaClMain()
-%patch30 -p1 -b .NaClMain
+%patch17 -p1 -b .NaClMain
# Use system libGLEW
-#%patch31 -p1 -b .GLEW
-
-# fix flash plugin crash issue BMC#383 and BMC#618
-%patch32 -p1
+# They've forked this beyond recognition.
+# %patch18 -p1 -b .GLEW
# Don't try to build non-existent test sources
-%patch33 -p1 -b .notests
+%patch19 -p1 -b .notests
+
+# Fix the wrapper
+#%patch20 -p1 -b .fix
+
+# Set master_prefs to a sane location
+#%patch21 -p1 -b .master_prefs
+
+# Fix media probing
+%patch22 -p1 -b .media-probe
# Use system expat
-%patch37 -p1 -b .system-expat
+%patch23 -p1 -b .system-expat
# Fix ffmpeg wrapper
-%patch38 -p1 -b .fix-ffmpeg
-%patch39 -p1 -b .no-pkgconfig
+%patch24 -p1 -b .fix-ffmpeg
+%patch25 -p1 -b .no-pkgconfig
# Don't build stupid empty shell zlib
-%patch40 -p1 -b .empty-shell
+%patch26 -p1 -b .empty-shell
# Fix yuv_row_posix when compiled with -fPIC
-%patch41 -p1 -b .fix-yrp
+%patch27 -p1 -b .fix-yrp
+
+
+
+
+#patch to re-org the visibility options in Chromium browser build
+#%patch101 -p1
+
+#patch to add -fvisibility=hidden when building WebCore shared library
+#%patch102 -p1
+
+#patch to explicitly export symbols in WebCore
+#%patch103 -p1
+
+#patches for MeeGo integration
+%patch201 -p1
+%patch202 -p1
+%patch203 -p1
+%patch204 -p1
+%patch205 -p1
+%patch206 -p1
+#%patch207 -p1
-%patch42 -p1
# Scrape out incorrect optflags and hack in the correct ones
PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS -DUSE_SYSTEM_LIBEVENT -fPIC -fno-strict-aliasing \' | sed "s/ /',/g" | sed "s/',/', '/g"`
@@ -397,7 +420,7 @@
Name: Chromium browser
Description: Chromium browser development package
Version: 1.0.1
-Libs: -L%{_libdir}/chromium-browser -lapp_base -lallocator -lappcache -lbase -lbase_i18n -lbrowser -lcommon -lcommon_constants -ldatabase -ldebugger -lffmpeg -lglue -lgoogleurl -lharfbuzz -lharfbuzz_interface -lhunspell -lipc -lil -lchrome_version_info -lmedia -lmodp_b64 -lnet -lnet_base -lnotifier -lomx_wrapper -lots -lpcre -lplugin -lprinting -lprofile_import -lprotobuf -lprotobuf_lite -lrenderer -lsandbox -lsdch -lskia -ljingle -lsqlite3 -lsync -lsyncapi -lutility -lwebcore -lwebcore_bindings -lworker -lwtf -lgfx -lsymbolize -linstaller_util -lcld -lskia_opts -lxdg_mime -lnss3 -lnssutil3 -lsmime3 -lssl
+Libs: -L%{_libdir}/chromium-browser -lapp_base -lallocator -lappcache -lbase -lbase_i18n -lbrowser -lcommon -lcommon_net -lcommon_constants -ldatabase -ldebugger -lffmpeg -lglue -lgoogleurl -lharfbuzz -lharfbuzz_interface -lhunspell -lipc -lil -lchrome_version_info -lmedia -lmodp_b64 -lnet -lnet_base -lnotifier -lomx_wrapper -lots -lpcre -lplugin -lprinting -lprofile_import -lprotobuf -lprotobuf_lite -lrenderer -lsandbox -lsdch -lskia -ljingle -lsqlite3 -lsync -lsyncapi -lutility -lwebcore -lwebcore_bindings -lworker -lwtf -lgfx -lsymbolize -linstaller_util -lcld -lskia_opts -lxdg_mime -lnss3 -lnssutil3 -lsmime3 -lssl -ldynamic_annotations -lservice
Cflags: -I%{_libdir}/chromium-browser/include -I%{_libdir}/chromium-browser/include/skia/config
!
@@ -445,9 +468,11 @@
%{_libdir}/chromium-browser/libchrome_gpu.so
%{_libdir}/chromium-browser/libcld.so
%{_libdir}/chromium-browser/libcommon.so
+%{_libdir}/chromium-browser/libcommon_net.so
%{_libdir}/chromium-browser/libcommon_constants.so
%{_libdir}/chromium-browser/libdatabase.so
%{_libdir}/chromium-browser/libdebugger.so
+%{_libdir}/chromium-browser/libdynamic_annotations.so
# Note: This is a dummy lib. There isn't any ffmpeg code in here.
%{_libdir}/chromium-browser/libffmpeg.so
%{_libdir}/chromium-browser/libgfx.so
@@ -479,6 +504,7 @@
%{_libdir}/chromium-browser/librenderer.so
%{_libdir}/chromium-browser/libsandbox.so
%{_libdir}/chromium-browser/libsdch.so
+%{_libdir}/chromium-browser/libservice.so
%{_libdir}/chromium-browser/libskia.so
%{_libdir}/chromium-browser/libskia_opts.so
%{_libdir}/chromium-browser/libsqlite3.so
other changes:
--------------
++++++ chromium-5.0.395.0-codechanges-system-minizip-nss-nspr-v8.patch
--- chromium-5.0.395.0-codechanges-system-minizip-nss-nspr-v8.patch
+++ chromium-5.0.395.0-codechanges-system-minizip-nss-nspr-v8.patch
@@ -324,3 +324,15 @@
#if defined(OS_WIN)
#include "webkit/tools/test_shell/test_shell_webthemeengine.h"
+diff -up chromium-6.0.417.0-20100526svn48276/webkit/glue/plugins/pepper_var.cc.system-code chromium-6.0.417.0-20100526svn48276/webkit/glue/plugins/pepper_var.cc
+--- chromium-6.0.417.0-20100526svn48276/webkit/glue/plugins/pepper_var.cc.system-code 2010-05-27 14:24:38.513557669 -0400
++++ chromium-6.0.417.0-20100526svn48276/webkit/glue/plugins/pepper_var.cc 2010-05-27 14:24:50.347322700 -0400
+@@ -12,7 +12,7 @@
+ #include "third_party/ppapi/c/ppp_class.h"
+ #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
+ #include "webkit/glue/plugins/pepper_string.h"
+-#include "v8/include/v8.h"
++#include <v8.h>
+
+ using WebKit::WebBindings;
+
++++++ chromium-6.0.406.0-sharedlibfixes.patch (new)
--- chromium-6.0.406.0-sharedlibfixes.patch
+++ chromium-6.0.406.0-sharedlibfixes.patch
+diff -up chromium-6.0.406.0/chrome/chrome_browser.gypi.sharedlibsfixes chromium-6.0.406.0/chrome/chrome_browser.gypi
+--- chromium-6.0.406.0/chrome/chrome_browser.gypi.sharedlibsfixes 2010-05-17 11:01:12.354193146 -0400
++++ chromium-6.0.406.0/chrome/chrome_browser.gypi 2010-05-17 11:02:17.295196139 -0400
+@@ -22,6 +22,7 @@
+ 'syncapi',
+ 'theme_resources',
+ 'userfeedback_proto',
++ '../native_client/src/trusted/desc/desc.gyp:nrd_xfer',
+ '../app/app.gyp:app_resources',
+ '../app/app.gyp:app_strings',
+ '../media/media.gyp:media',
+@@ -34,6 +35,8 @@
+ '../third_party/libxml/libxml.gyp:libxml',
+ '../third_party/npapi/npapi.gyp:npapi',
+ '../third_party/hunspell/hunspell.gyp:hunspell',
++ '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
++ '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
+ '../webkit/support/webkit_support.gyp:appcache',
+ '../webkit/support/webkit_support.gyp:database',
+ '../webkit/support/webkit_support.gyp:glue',
+@@ -2545,6 +2548,11 @@
+ '<(grit_out_dir)/grit/theme_resources_map.cc',
+ ],
+ 'conditions': [
++ ['disable_nacl!=1', {
++ 'dependencies': [
++ '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome',
++ ],
++ }],
+ ['javascript_engine=="v8"', {
+ 'defines': [
+ 'CHROME_V8',
+diff -up chromium-6.0.406.0/chrome/chrome_common.gypi.sharedlibsfixes chromium-6.0.406.0/chrome/chrome_common.gypi
+--- chromium-6.0.406.0/chrome/chrome_common.gypi.sharedlibsfixes 2010-05-17 11:01:12.359196621 -0400
++++ chromium-6.0.406.0/chrome/chrome_common.gypi 2010-05-17 11:01:12.681189282 -0400
+@@ -126,6 +126,7 @@
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_i18n',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
++ '../gpu/gpu.gyp:gpu_plugin',
+ '../ipc/ipc.gyp:ipc',
+ '../net/net.gyp:net',
+ '../skia/skia.gyp:skia',
++++++ chromium-20100315-system-gyp-v8.patch -> chromium-6.0.406.0-system-gyp-v8.patch
--- chromium-20100315-system-gyp-v8.patch
+++ chromium-6.0.406.0-system-gyp-v8.patch
@@ -1,7 +1,7 @@
-diff -up chromium-20100315svn41580/build/all.gyp.system-v8 chromium-20100315svn41580/build/all.gyp
---- chromium-20100315svn41580/build/all.gyp.system-v8 2010-03-15 09:12:36.000000000 -0400
-+++ chromium-20100315svn41580/build/all.gyp 2010-03-15 10:20:00.561266935 -0400
-@@ -45,7 +45,7 @@
+diff -up chromium-6.0.406.0/build/all.gyp.system-v8 chromium-6.0.406.0/build/all.gyp
+--- chromium-6.0.406.0/build/all.gyp.system-v8 2010-05-17 04:02:34.000000000 -0400
++++ chromium-6.0.406.0/build/all.gyp 2010-05-17 10:57:36.581201019 -0400
+@@ -50,7 +50,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -9,10 +9,10 @@
+ 'linux/system.gyp:v8',
],
}],
- ['OS=="mac" or OS=="linux" or OS=="freebsd"', {
-diff -up chromium-20100315svn41580/build/linux/system.gyp.system-v8 chromium-20100315svn41580/build/linux/system.gyp
---- chromium-20100315svn41580/build/linux/system.gyp.system-v8 2010-03-15 09:12:36.000000000 -0400
-+++ chromium-20100315svn41580/build/linux/system.gyp 2010-03-15 10:20:00.563320065 -0400
+ ['OS=="mac" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+diff -up chromium-6.0.406.0/build/linux/system.gyp.system-v8 chromium-6.0.406.0/build/linux/system.gyp
+--- chromium-6.0.406.0/build/linux/system.gyp.system-v8 2010-05-17 04:02:34.000000000 -0400
++++ chromium-6.0.406.0/build/linux/system.gyp 2010-05-17 10:56:16.230193214 -0400
@@ -254,6 +254,18 @@
},
}]]
@@ -32,10 +32,10 @@
# TODO(evanm): temporarily disabled while we figure out whether to depend
# on gnome-keyring etc.
# http://code.google.com/p/chromium/issues/detail?id=12351
-diff -up chromium-20100315svn41580/net/net.gyp.system-v8 chromium-20100315svn41580/net/net.gyp
---- chromium-20100315svn41580/net/net.gyp.system-v8 2010-03-15 09:12:01.000000000 -0400
-+++ chromium-20100315svn41580/net/net.gyp 2010-03-15 10:20:00.593277488 -0400
-@@ -520,7 +520,7 @@
+diff -up chromium-6.0.406.0/net/net.gyp.system-v8 chromium-6.0.406.0/net/net.gyp
+--- chromium-6.0.406.0/net/net.gyp.system-v8 2010-05-17 04:01:28.000000000 -0400
++++ chromium-6.0.406.0/net/net.gyp 2010-05-17 10:56:16.276203644 -0400
+@@ -540,7 +540,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -44,10 +44,10 @@
],
}],
[ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-diff -up chromium-20100315svn41580/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp.system-v8 chromium-20100315svn41580/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp
---- chromium-20100315svn41580/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp.system-v8 2010-03-15 09:30:32.000000000 -0400
-+++ chromium-20100315svn41580/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp 2010-03-15 11:43:07.505059773 -0400
-@@ -652,7 +652,7 @@
+diff -up chromium-6.0.406.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp.system-v8 chromium-6.0.406.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp
+--- chromium-6.0.406.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp.system-v8 2010-05-17 04:23:54.000000000 -0400
++++ chromium-6.0.406.0/third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp 2010-05-17 10:56:16.281203845 -0400
+@@ -659,7 +659,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
@@ -56,7 +56,7 @@
],
}],
['enable_svg!=0', {
-@@ -871,10 +871,10 @@
+@@ -878,10 +878,10 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
++++++ chromium-6.0.412.0-media-probe.patch (new)
--- chromium-6.0.412.0-media-probe.patch
+++ chromium-6.0.412.0-media-probe.patch
+diff -up chromium-6.0.412.0-20100520svn47812/net/base/mime_util.cc.media-probe chromium-6.0.412.0-20100520svn47812/net/base/mime_util.cc
+--- chromium-6.0.412.0-20100520svn47812/net/base/mime_util.cc.media-probe 2010-05-20 13:18:15.000000000 -0400
++++ chromium-6.0.412.0-20100520svn47812/net/base/mime_util.cc 2010-05-20 15:07:50.528315339 -0400
+@@ -14,6 +14,9 @@
+ #include "base/string_util.h"
+ #include "base/utf_string_conversions.h"
+
++#include "base/path_service.h"
++#include <dlfcn.h>
++
+ using std::string;
+
+ namespace net {
+@@ -115,6 +118,11 @@ static const MimeInfo secondary_mappings
+ { "application/x-shockwave-flash", "swf,swl" }
+ };
+
++struct format_info {
++ const char* name;
++ const char* symbol;
++};
++
+ static const char* FindMimeType(const MimeInfo* mappings,
+ size_t mappings_len,
+ const char* ext) {
+@@ -194,40 +202,36 @@ static const char* const supported_image
+
+ // A list of media types: http://en.wikipedia.org/wiki/Internet_media_type
+ // A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php
+-static const char* const supported_media_types[] = {
++static const format_info supported_media_types[] = {
+ // Ogg.
+- "video/ogg",
+- "audio/ogg",
+- "application/ogg",
+- "video/webm",
+- "audio/webm",
++ { "video/ogg" , "ogg_demuxer" },
++ { "audio/ogg" , "ogg_demuxer" },
++ { "application/ogg", "ogg_demuxer" },
++ { "video/webm" , "webm_demuxer" },
++ { "audio/webm" , "webm_demuxer" },
+
+-#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
+ // MPEG-4.
+- "video/mp4",
+- "video/x-m4v",
+- "audio/mp4",
+- "audio/x-m4a",
++ { "video/mp4" , "mov_demuxer" },
++ { "video/x-m4v" , "mov_demuxer" },
++ { "audio/mp4" , "mov_demuxer" },
++ { "audio/x-m4a" , "mov_demuxer" },
+
+ // MP3.
+- "audio/mp3",
+- "audio/x-mp3",
+- "audio/mpeg",
+-#endif
++ { "audio/mp3" , "mp3_demuxer" },
++ { "audio/x-mp3" , "mp3_demuxer" },
++ { "audio/mpeg" , "mp3_demuxer" },
+ };
+
+ // List of supported codecs when passed in with <source type="...">.
+ //
+ // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support
+ // for more information.
+-static const char* const supported_media_codecs[] = {
+-#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
+- "avc1",
+- "mp4a",
+-#endif
+- "theora",
+- "vorbis",
+- "vp8"
++static const format_info supported_media_codecs[] = {
++ { "avc1" , "h264_decoder" },
++ { "mp4a" , "aac_decoder" },
++ { "theora", "theora_decoder" },
++ { "vorbis", "vorbis_decoder" },
++ { "vp8", "vp8_decoder" },
+ };
+
+ // Note: does not include javascript types list (see supported_javascript_types)
+@@ -291,6 +295,32 @@ static const char* const view_source_typ
+ "image/svg+xml"
+ };
+
++#if defined(OS_MACOSX)
++#define DSO_NAME(MODULE, VERSION) ("lib" MODULE "." #VERSION ".dylib")
++#elif defined(OS_POSIX)
++#define DSO_NAME(MODULE, VERSION) ("lib" MODULE ".so." #VERSION)
++#else
++#error "Do not know how to construct DSO name for this OS."
++#endif
++
++static void* GetHandle(const FilePath& module_dir, const char* library) {
++ FilePath path = module_dir.Append(library);
++ return dlopen(path.value().c_str(), RTLD_LAZY);
++}
++
++static void DumpHandle(void* dlhandle) {
++ if (dlhandle)
++ dlclose(dlhandle);
++}
++
++static bool ProbeFormat(void* dlhandle, const char* symbol) {
++#if defined(OS_MACOSX) || defined (OS_POSIX)
++ return dlhandle && dlsym(dlhandle, symbol);
++#else
++ return false;
++#endif
++}
++
+ struct MediaFormatStrict {
+ const char* mime_type;
+ const char* codecs_list;
+@@ -302,6 +332,16 @@ static const MediaFormatStrict format_co
+ };
+
+ void MimeUtil::InitializeMimeTypeMaps() {
++ FilePath module_path;
++#if defined(OS_MACOSX)
++ module_path = mac_util::MainAppBundlePath().Append("Libraries");
++#else
++ PathService::Get(base::DIR_MODULE, &module_path);
++#endif
++ void* h_avutil = GetHandle(module_path, DSO_NAME("avutil" , 50));
++ void* h_avcodec = GetHandle(module_path, DSO_NAME("avcodec" , 52));
++ void* h_avformat = GetHandle(module_path, DSO_NAME("avformat", 52));
++
+ for (size_t i = 0; i < arraysize(supported_image_types); ++i)
+ image_map_.insert(supported_image_types[i]);
+
+@@ -311,11 +351,13 @@ void MimeUtil::InitializeMimeTypeMaps()
+ for (size_t i = 0; i < arraysize(supported_javascript_types); ++i)
+ non_image_map_.insert(supported_javascript_types[i]);
+ for (size_t i = 0; i < arraysize(supported_media_types); ++i)
+- non_image_map_.insert(supported_media_types[i]);
++ if (ProbeFormat(h_avformat, supported_media_types[i].symbol))
++ non_image_map_.insert(supported_media_types[i].name);
+
+ // Initialize the supported media types.
+ for (size_t i = 0; i < arraysize(supported_media_types); ++i)
+- media_map_.insert(supported_media_types[i]);
++ if (ProbeFormat(h_avformat, supported_media_types[i].symbol))
++ media_map_.insert(supported_media_types[i].name);
+
+ for (size_t i = 0; i < arraysize(supported_javascript_types); ++i)
+ javascript_map_.insert(supported_javascript_types[i]);
+@@ -324,7 +366,8 @@ void MimeUtil::InitializeMimeTypeMaps()
+ view_source_map_.insert(view_source_types[i]);
+
+ for (size_t i = 0; i < arraysize(supported_media_codecs); ++i)
+- codecs_map_.insert(supported_media_codecs[i]);
++ if (ProbeFormat(h_avcodec, supported_media_codecs[i].symbol))
++ codecs_map_.insert(supported_media_codecs[i].name);
+
+ // Initialize the strict supported media types.
+ for (size_t i = 0; i < arraysize(format_codec_mappings); ++i) {
+@@ -338,6 +381,10 @@ void MimeUtil::InitializeMimeTypeMaps()
+ codecs.insert(mime_type_codecs[j]);
+ strict_format_map_[format_codec_mappings[i].mime_type] = codecs;
+ }
++
++ DumpHandle(h_avformat);
++ DumpHandle(h_avcodec);
++ DumpHandle(h_avutil);
+ }
+
+ bool MimeUtil::IsSupportedImageMimeType(const char* mime_type) const {
++++++ chromium-6.0.417.0-20100526svn48276.tar.bz2 (new)
++++++ chromium-6.0.417.0-gyp-system-icu.patch (new)
--- chromium-6.0.417.0-gyp-system-icu.patch
+++ chromium-6.0.417.0-gyp-system-icu.patch
+diff -up chromium-6.0.417.0-20100526svn48276/app/app_base.gypi.system-icu chromium-6.0.417.0-20100526svn48276/app/app_base.gypi
+--- chromium-6.0.417.0-20100526svn48276/app/app_base.gypi.system-icu 2010-05-26 11:53:31.000000000 -0400
++++ chromium-6.0.417.0-20100526svn48276/app/app_base.gypi 2010-05-27 11:05:33.109177002 -0400
+@@ -78,8 +78,7 @@
+ '../gfx/gfx.gyp:gfx',
+ '../net/net.gyp:net',
+ '../skia/skia.gyp:skia',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/libjpeg/libjpeg.gyp:libjpeg',
+ '../third_party/libpng/libpng.gyp:libpng',
+ '../third_party/sqlite/sqlite.gyp:sqlite',
+diff -up chromium-6.0.417.0-20100526svn48276/app/app.gyp.system-icu chromium-6.0.417.0-20100526svn48276/app/app.gyp
+--- chromium-6.0.417.0-20100526svn48276/app/app.gyp.system-icu 2010-05-26 11:53:31.000000000 -0400
++++ chromium-6.0.417.0-20100526svn48276/app/app.gyp 2010-05-27 11:05:33.110176791 -0400
+@@ -30,8 +30,7 @@
+ '../skia/skia.gyp:skia',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/libjpeg/libjpeg.gyp:libjpeg',
+ '../third_party/libpng/libpng.gyp:libpng',
+ '../third_party/libxml/libxml.gyp:libxml',
+diff -up chromium-6.0.417.0-20100526svn48276/base/base.gyp.system-icu chromium-6.0.417.0-20100526svn48276/base/base.gyp
+--- chromium-6.0.417.0-20100526svn48276/base/base.gyp.system-icu 2010-05-26 11:55:02.000000000 -0400
++++ chromium-6.0.417.0-20100526svn48276/base/base.gyp 2010-05-27 11:05:33.112180378 -0400
+@@ -16,8 +16,7 @@
+ 'msvs_guid': '968F3222-9798-4D21-BE08-15ECB5EF2994',
+ 'dependencies': [
+ 'base',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ ],
+ 'conditions': [
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+@@ -160,7 +159,7 @@
+ 'include_dirs': [
+ # word_iterator.h (used by word_iterator_unittest.cc) leaks an ICU
+ # #include for unicode/uchar.h. This should probably be cleaned up.
+- '../third_party/icu/public/common',
++ # '../third_party/icu/public/common',
+ ],
+ 'dependencies': [
+ 'base',
+diff -up chromium-6.0.417.0-20100526svn48276/build/all.gyp.system-icu chromium-6.0.417.0-20100526svn48276/build/all.gyp
+--- chromium-6.0.417.0-20100526svn48276/build/all.gyp.system-icu 2010-05-27 11:05:33.045203604 -0400
++++ chromium-6.0.417.0-20100526svn48276/build/all.gyp 2010-05-27 11:05:33.114173984 -0400
+@@ -29,7 +29,6 @@
+ '../third_party/cld/cld.gyp:*',
+ '../third_party/codesighs/codesighs.gyp:*',
+ '../third_party/ffmpeg/ffmpeg.gyp:*',
+- '../third_party/icu/icu.gyp:*',
+ '../third_party/libjpeg/libjpeg.gyp:*',
+ '../third_party/libpng/libpng.gyp:*',
+ '../third_party/libxml/libxml.gyp:*',
+diff -up chromium-6.0.417.0-20100526svn48276/build/linux/system.gyp.system-icu chromium-6.0.417.0-20100526svn48276/build/linux/system.gyp
+--- chromium-6.0.417.0-20100526svn48276/build/linux/system.gyp.system-icu 2010-05-27 11:05:33.054205919 -0400
++++ chromium-6.0.417.0-20100526svn48276/build/linux/system.gyp 2010-05-27 11:05:33.132176458 -0400
+@@ -266,6 +266,26 @@
+ },
+ }]]
+ },
++ {
++ 'target_name': 'icu',
++ 'type': 'settings',
++ 'conditions': [
++ ['_toolset=="target"', {
++ 'direct_dependent_settings': {
++ 'cflags': [
++ '<!@(pkg-config --cflags icu)',
++ ],
++ },
++ 'link_settings': {
++ 'ldflags': [
++ '<!@(pkg-config --libs-only-L --libs-only-other icu)',
++ ],
++ 'libraries': [
++ '<!@(pkg-config --libs-only-l icu)',
++ ],
++ },
++ }]]
++ },
+ # TODO(evanm): temporarily disabled while we figure out whether to depend
+ # on gnome-keyring etc.
+ # http://code.google.com/p/chromium/issues/detail?id=12351
+diff -up chromium-6.0.417.0-20100526svn48276/build/temp_gyp/googleurl.gyp.system-icu chromium-6.0.417.0-20100526svn48276/build/temp_gyp/googleurl.gyp
+--- chromium-6.0.417.0-20100526svn48276/build/temp_gyp/googleurl.gyp.system-icu 2010-05-26 11:54:56.000000000 -0400
++++ chromium-6.0.417.0-20100526svn48276/build/temp_gyp/googleurl.gyp 2010-05-27 11:05:33.142193298 -0400
+@@ -14,9 +14,7 @@
+ 'msvs_guid': 'EF5E94AB-B646-4E5B-A058-52EF07B8351C',
+ 'dependencies': [
+ '../../base/base.gyp:base',
+- '../../third_party/icu/icu.gyp:icudata',
+- '../../third_party/icu/icu.gyp:icui18n',
+- '../../third_party/icu/icu.gyp:icuuc',
++ '../../build/linux/system.gyp:icu',
+ ],
+ 'sources': [
+ '../../googleurl/src/gurl.cc',
+@@ -59,7 +57,7 @@
+ 'dependencies': [
+ 'googleurl',
+ '../../testing/gtest.gyp:gtest',
+- '../../third_party/icu/icu.gyp:icuuc',
++ '../../build/linux/system.gyp:icu',
+ ],
+ 'sources': [
+ '../../googleurl/src/gurl_unittest.cc',
+diff -up chromium-6.0.417.0-20100526svn48276/chrome/chrome_browser.gypi.system-icu chromium-6.0.417.0-20100526svn48276/chrome/chrome_browser.gypi
+--- chromium-6.0.417.0-20100526svn48276/chrome/chrome_browser.gypi.system-icu 2010-05-26 11:56:22.000000000 -0400
++++ chromium-6.0.417.0-20100526svn48276/chrome/chrome_browser.gypi 2010-05-27 11:05:33.155186647 -0400
+@@ -29,8 +29,7 @@
+ '../skia/skia.gyp:skia',
+ '../third_party/bzip2/bzip2.gyp:bzip2',
+ '../third_party/expat/expat.gyp:expat',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../third_party/libxml/libxml.gyp:libxml',
+ '../third_party/npapi/npapi.gyp:npapi',
+diff -up chromium-6.0.417.0-20100526svn48276/chrome/chrome_common.gypi.system-icu chromium-6.0.417.0-20100526svn48276/chrome/chrome_common.gypi
+--- chromium-6.0.417.0-20100526svn48276/chrome/chrome_common.gypi.system-icu 2010-05-26 11:56:22.000000000 -0400
++++ chromium-6.0.417.0-20100526svn48276/chrome/chrome_common.gypi 2010-05-27 11:05:33.159181715 -0400
+@@ -129,8 +129,7 @@
+ '../ipc/ipc.gyp:ipc',
+ '../net/net.gyp:net',
+ '../skia/skia.gyp:skia',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/libxml/libxml.gyp:libxml',
+ '../third_party/sqlite/sqlite.gyp:sqlite',
+ '../third_party/zlib/zlib.gyp:zlib',
+diff -up chromium-6.0.417.0-20100526svn48276/chrome/chrome.gyp.system-icu chromium-6.0.417.0-20100526svn48276/chrome/chrome.gyp
+--- chromium-6.0.417.0-20100526svn48276/chrome/chrome.gyp.system-icu 2010-05-26 11:56:22.000000000 -0400
++++ chromium-6.0.417.0-20100526svn48276/chrome/chrome.gyp 2010-05-27 11:05:33.161179632 -0400
+@@ -428,8 +428,7 @@
+ 'chrome_strings',
+ 'theme_resources',
+ '../skia/skia.gyp:skia',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ ],
+ 'include_dirs': [
+ '..',
+@@ -476,8 +475,7 @@
+ 'chrome_strings',
+ '../media/media.gyp:media',
+ '../skia/skia.gyp:skia',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/libxml/libxml.gyp:libxml',
+ '../third_party/npapi/npapi.gyp:npapi',
+ '../third_party/hunspell/hunspell.gyp:hunspell',
+@@ -691,7 +689,7 @@
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ '../third_party/sqlite/sqlite.gyp:sqlite',
+ 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
+diff -up chromium-6.0.417.0-20100526svn48276/chrome/chrome_renderer.gypi.system-icu chromium-6.0.417.0-20100526svn48276/chrome/chrome_renderer.gypi
+--- chromium-6.0.417.0-20100526svn48276/chrome/chrome_renderer.gypi.system-icu 2010-05-26 11:56:22.000000000 -0400
++++ chromium-6.0.417.0-20100526svn48276/chrome/chrome_renderer.gypi 2010-05-27 11:05:33.184193759 -0400
+@@ -18,8 +18,7 @@
+ '../skia/skia.gyp:skia',
+ '../third_party/hunspell/hunspell.gyp:hunspell',
+ '../third_party/cld/cld.gyp:cld',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/npapi/npapi.gyp:npapi',
+ '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
+ '../webkit/support/webkit_support.gyp:glue',
+diff -up chromium-6.0.417.0-20100526svn48276/chrome/chrome_tests.gypi.system-icu chromium-6.0.417.0-20100526svn48276/chrome/chrome_tests.gypi
+--- chromium-6.0.417.0-20100526svn48276/chrome/chrome_tests.gypi.system-icu 2010-05-26 11:56:22.000000000 -0400
++++ chromium-6.0.417.0-20100526svn48276/chrome/chrome_tests.gypi 2010-05-27 11:06:47.056555461 -0400
+@@ -280,8 +280,7 @@
+ '../skia/skia.gyp:skia',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+- '../third_party/icu/icu.gyp:icui18n',
+- '../third_party/icu/icu.gyp:icuuc',
++ '../build/linux/system.gyp:icu',
+ '../third_party/libxml/libxml.gyp:libxml',
+ # run time dependencies
+ '../third_party/ppapi/ppapi.gyp:ppapi_tests',
+@@ -457,8 +456,7 @@
+ '../net/net.gyp:net',
(283 more lines skipped)
++++++ chromium-bold-cjk-droid-font-fix-svn46195.patch -> chromium-bold-cjk-droid-font-fix-svn48276.patch
--- chromium-bold-cjk-droid-font-fix-svn46195.patch
+++ chromium-bold-cjk-droid-font-fix-svn48276.patch
@@ -1,12 +1,12 @@
diff --git a/chrome/browser/renderer_host/render_sandbox_host_linux.cc b/chrome/browser/renderer_host/render_sandbox_host_linux.cc
-index cf51b0f..de5f7d4 100644
+index 453f0c7..de5f7d4 100644
--- a/chrome/browser/renderer_host/render_sandbox_host_linux.cc
+++ b/chrome/browser/renderer_host/render_sandbox_host_linux.cc
@@ -171,7 +171,7 @@ class SandboxIPCProcess {
const char* characters = NULL;
if (characters_bytes > 0) {
const uint32_t kMaxCharactersBytes = 1 << 10;
-- if (characters_bytes % 1 == 0 || // We expect UTF-16.
+- if (characters_bytes % 2 == 0 || // We expect UTF-16.
+ if (characters_bytes % 2 != 0 || // We expect UTF-16.
characters_bytes > kMaxCharactersBytes ||
!pickle.ReadBytes(&iter, &characters, characters_bytes))
++++++ chromium-no-test-sources.patch
--- chromium-no-test-sources.patch
+++ chromium-no-test-sources.patch
@@ -1,9 +1,9 @@
-diff -up chromium-5.0.358.0-20100318svn41971/chrome/chrome.gyp.notests chromium-5.0.358.0-20100318svn41971/chrome/chrome.gyp
---- chromium-5.0.358.0-20100318svn41971/chrome/chrome.gyp.notests 2010-03-18 15:57:37.028204007 -0400
-+++ chromium-5.0.358.0-20100318svn41971/chrome/chrome.gyp 2010-03-18 15:57:46.908185565 -0400
-@@ -124,7 +124,6 @@
- 'chrome_dll.gypi',
- 'chrome_exe.gypi',
+diff -up chromium-6.0.417.0-20100526svn48276/chrome/chrome.gyp.notests chromium-6.0.417.0-20100526svn48276/chrome/chrome.gyp
+--- chromium-6.0.417.0-20100526svn48276/chrome/chrome.gyp.notests 2010-05-27 11:08:15.000000000 -0400
++++ chromium-6.0.417.0-20100526svn48276/chrome/chrome.gyp 2010-05-27 11:09:38.961194394 -0400
+@@ -127,7 +127,6 @@
+ 'chrome_installer.gypi',
+ 'chrome_installer_util.gypi',
'chrome_renderer.gypi',
- 'chrome_tests.gypi',
'common_constants.gypi',
++++++ chromium-option-window-layout-svn48276.patch (new)
--- chromium-option-window-layout-svn48276.patch
+++ chromium-option-window-layout-svn48276.patch
+diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc
+index 022468d..3b0067c 100644
+--- a/chrome/browser/gtk/options/advanced_contents_gtk.cc
++++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc
+@@ -1187,37 +1187,38 @@ AdvancedContentsGtk::~AdvancedContentsGtk() {
+ }
+
+ void AdvancedContentsGtk::Init() {
+- OptionsLayoutBuilderGtk options_builder;
++ scoped_ptr<OptionsLayoutBuilderGtk>
++ options_builder(OptionsLayoutBuilderGtk::Create());
+
+ privacy_section_.reset(new PrivacySection(profile_));
+- options_builder.AddOptionGroup(
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY),
+ privacy_section_->get_page_widget(), false);
+
+ network_section_.reset(new NetworkSection(profile_));
+- options_builder.AddOptionGroup(
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK),
+ network_section_->get_page_widget(), false);
+
+ translate_section_.reset(new TranslateSection(profile_));
+- options_builder.AddOptionGroup(
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_TRANSLATE),
+ translate_section_->get_page_widget(), false);
+
+ download_section_.reset(new DownloadSection(profile_));
+- options_builder.AddOptionGroup(
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME),
+ download_section_->get_page_widget(), false);
+
+ web_content_section_.reset(new WebContentSection(profile_));
+- options_builder.AddOptionGroup(
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT),
+ web_content_section_->get_page_widget(), false);
+
+ security_section_.reset(new SecuritySection(profile_));
+- options_builder.AddOptionGroup(
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY),
+ security_section_->get_page_widget(), false);
+
+- page_ = options_builder.get_page_widget();
++ page_ = options_builder->get_page_widget();
+ }
+diff --git a/chrome/browser/gtk/options/content_filter_page_gtk.cc b/chrome/browser/gtk/options/content_filter_page_gtk.cc
+index bf18c0c..9c2088e 100644
+--- a/chrome/browser/gtk/options/content_filter_page_gtk.cc
++++ b/chrome/browser/gtk/options/content_filter_page_gtk.cc
+@@ -35,11 +35,13 @@ ContentFilterPageGtk::ContentFilterPageGtk(Profile* profile,
+ };
+ COMPILE_ASSERT(arraysize(kTitleIDs) == CONTENT_SETTINGS_NUM_TYPES,
+ kTitleIDs_IncorrectSize);
+- OptionsLayoutBuilderGtk options_builder;
+- options_builder.AddOptionGroup(
++
++ scoped_ptr<OptionsLayoutBuilderGtk>
++ options_builder(OptionsLayoutBuilderGtk::Create());
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(kTitleIDs[content_type_]),
+ InitGroup(), true);
+- page_ = options_builder.get_page_widget();
++ page_ = options_builder->get_page_widget();
+ }
+
+ ContentFilterPageGtk::~ContentFilterPageGtk() {
+diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
+index dcdf53b..9847f59 100644
+--- a/chrome/browser/gtk/options/content_page_gtk.cc
++++ b/chrome/browser/gtk/options/content_page_gtk.cc
+@@ -87,27 +87,28 @@ ContentPageGtk::ContentPageGtk(Profile* profile)
+ }
+
+ // Prepare the group options layout.
+- OptionsLayoutBuilderGtk options_builder;
++ scoped_ptr<OptionsLayoutBuilderGtk>
++ options_builder(OptionsLayoutBuilderGtk::CreateOptionallyCompactLayout());
+ if (sync_service_) {
+- options_builder.AddOptionGroup(
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_SYNC_OPTIONS_GROUP_NAME),
+ InitSyncGroup(), false);
+ UpdateSyncControls();
+ }
+
+- options_builder.AddOptionGroup(
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_OPTIONS_PASSWORDS_GROUP_NAME),
+ InitPasswordSavingGroup(), false);
+- options_builder.AddOptionGroup(
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME),
+ InitFormAutoFillGroup(), false);
+- options_builder.AddOptionGroup(
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_OPTIONS_BROWSING_DATA_GROUP_NAME),
+ InitBrowsingDataGroup(), false);
+- options_builder.AddOptionGroup(
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_APPEARANCE_GROUP_NAME),
+ InitThemesGroup(), false);
+- page_ = options_builder.get_page_widget();
++ page_ = options_builder->get_page_widget();
+
+ // Add preferences observers.
+ ask_to_save_passwords_.Init(prefs::kPasswordManagerEnabled,
+diff --git a/chrome/browser/gtk/options/cookie_filter_page_gtk.cc b/chrome/browser/gtk/options/cookie_filter_page_gtk.cc
+index 726c1f3..e5714b2 100644
+--- a/chrome/browser/gtk/options/cookie_filter_page_gtk.cc
++++ b/chrome/browser/gtk/options/cookie_filter_page_gtk.cc
+@@ -33,11 +33,12 @@ GtkWidget* WrapInHBox(GtkWidget* widget) {
+ CookieFilterPageGtk::CookieFilterPageGtk(Profile* profile)
+ : OptionsPageBase(profile),
+ initializing_(true) {
+- OptionsLayoutBuilderGtk options_builder;
+- options_builder.AddOptionGroup(
++ scoped_ptr<OptionsLayoutBuilderGtk>
++ options_builder(OptionsLayoutBuilderGtk::Create());
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_MODIFY_COOKIE_STORING_LABEL),
+ InitCookieStoringGroup(), true);
+- page_ = options_builder.get_page_widget();
++ page_ = options_builder->get_page_widget();
+
+ clear_site_data_on_exit_.Init(prefs::kClearSiteDataOnExit,
+ profile->GetPrefs(), NULL);
+diff --git a/chrome/browser/gtk/options/fonts_page_gtk.cc b/chrome/browser/gtk/options/fonts_page_gtk.cc
+index 9e73e3e..96c918e 100644
+--- a/chrome/browser/gtk/options/fonts_page_gtk.cc
++++ b/chrome/browser/gtk/options/fonts_page_gtk.cc
+@@ -43,8 +43,8 @@ FontsPageGtk::~FontsPageGtk() {
+ }
+
+ void FontsPageGtk::Init() {
+- OptionsLayoutBuilderGtk options_builder;
+-
++ scoped_ptr<OptionsLayoutBuilderGtk>
++ options_builder(OptionsLayoutBuilderGtk::Create());
+ serif_font_button_ = gtk_font_button_new();
+ gtk_font_button_set_use_font(GTK_FONT_BUTTON(serif_font_button_), TRUE);
+ gtk_font_button_set_use_size(GTK_FONT_BUTTON(serif_font_button_), TRUE);
+@@ -75,7 +75,7 @@ void FontsPageGtk::Init() {
+ fixed_font_button_,
+ NULL);
+
+- options_builder.AddOptionGroup(l10n_util::GetStringUTF8(
++ options_builder->AddOptionGroup(l10n_util::GetStringUTF8(
+ IDS_FONT_LANGUAGE_SETTING_FONT_SUB_DIALOG_FONT_TITLE),
+ font_controls, false);
+
+@@ -86,11 +86,11 @@ void FontsPageGtk::Init() {
+ encoding_group_description.c_str(),
+ default_encoding_combobox_,
+ NULL);
+- options_builder.AddOptionGroup(l10n_util::GetStringUTF8(
++ options_builder->AddOptionGroup(l10n_util::GetStringUTF8(
+ IDS_FONT_LANGUAGE_SETTING_FONT_SUB_DIALOG_ENCODING_TITLE),
+ encoding_controls, false);
+
+- page_ = options_builder.get_page_widget();
++ page_ = options_builder->get_page_widget();
+
+ serif_name_.Init(prefs::kWebKitSerifFontFamily, profile()->GetPrefs(), this);
+ sans_serif_name_.Init(prefs::kWebKitSansSerifFontFamily,
+diff --git a/chrome/browser/gtk/options/general_page_gtk.cc b/chrome/browser/gtk/options/general_page_gtk.cc
+index 8a25f01..434ccbb 100644
+--- a/chrome/browser/gtk/options/general_page_gtk.cc
++++ b/chrome/browser/gtk/options/general_page_gtk.cc
+@@ -66,22 +66,24 @@ GeneralPageGtk::GeneralPageGtk(Profile* profile)
+ initializing_(true),
+ default_browser_worker_(
+ new ShellIntegration::DefaultBrowserWorker(this)) {
+- OptionsLayoutBuilderGtk options_builder;
+- page_ = options_builder.get_page_widget();
++ scoped_ptr<OptionsLayoutBuilderGtk>
++ options_builder(OptionsLayoutBuilderGtk::CreateOptionallyCompactLayout());
++ page_ = options_builder->get_page_widget();
++
+ accessible_widget_helper_.reset(new AccessibleWidgetHelper(
+ page_, profile));
+
+- options_builder.AddOptionGroup(
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_GROUP_NAME),
+ InitStartupGroup(), true);
+- options_builder.AddOptionGroup(
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_OPTIONS_HOMEPAGE_GROUP_NAME),
+ InitHomepageGroup(), false);
+- options_builder.AddOptionGroup(
++ options_builder->AddOptionGroup(
+ l10n_util::GetStringUTF8(IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME),
(181 more lines skipped)
++++++ deleted files:
--- chromium-20100319-fix-shm-fd-leaks.patch
--- chromium-20100319-myzone-int-hook.patch
--- chromium-20100322-mib-importer.patch
--- chromium-20100502svn46195.tar.bz2
--- chromium-20100506-option-window-size.patch
--- chromium-5.0.395.0-gyp-system-icu.patch
--- chromium-5.0.395.0-sharedlibfixes.patch
--- chromium-fix-toolbar-icon-size.patch
More information about the MeeGo-commits
mailing list