diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2014-11-20 14:55:14 +0800 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2014-11-20 14:55:14 +0800 |
| commit | 347e2bc55f9baf2b44a6b265c5ce110d2ed4b9b8 (patch) | |
| tree | 9225b2ce830d701121dcc56dc30db0eb6bf6af71 /www/chromium | |
| parent | 89ca154e9043eb8c372106e13c0ec7a1d48feafd (diff) | |
| download | freebsd-ports-gnome-347e2bc55f9baf2b44a6b265c5ce110d2ed4b9b8.tar.gz freebsd-ports-gnome-347e2bc55f9baf2b44a6b265c5ce110d2ed4b9b8.tar.zst freebsd-ports-gnome-347e2bc55f9baf2b44a6b265c5ce110d2ed4b9b8.zip | |
www/chromium: update to 39.0.2171.65
MFH: 2014Q4
Security: d395e44f-6f4f-11e4-a444-00262d5ed8ee
Diffstat (limited to 'www/chromium')
261 files changed, 781 insertions, 974 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index bd0c95d4b55b..52f1542be033 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,8 +1,9 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> # $FreeBSD$ +#TODO bz@ : if you do undestand the gyp stuff, third_party/widevine/cdm/widevine_cdm.gyp talks about it (plz install libwidevinecdm.so) PORTNAME= chromium -PORTVERSION= 38.0.2125.122 +PORTVERSION= 39.0.2171.65 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -13,7 +14,7 @@ COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi -CFLAGS+= -fno-stack-protector -isystem${LOCALBASE}/include +CFLAGS+= -isystem${LOCALBASE}/include BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ bash:${PORTSDIR}/shells/bash \ @@ -264,6 +265,7 @@ pre-configure: 'third_party/dom_distiller_js' \ 'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \ 'third_party/ffmpeg' \ + 'third_party/gardiner_mod' \ 'third_party/fips181' \ 'third_party/flot' \ 'third_party/hunspell' \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index c0255784c5dc..60d77cd328d0 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,4 +1,4 @@ -SHA256 (chromium-38.0.2125.122.tar.xz) = 3ea94fb3151f59c2d5088f832f8e894897489922a63bfa04f0068ee2fc0e36f3 -SIZE (chromium-38.0.2125.122.tar.xz) = 248207688 -SHA256 (chromium-38.0.2125.122-testdata.tar.xz) = 75f55ee898c3d3dbd2cb8701bb94d2ce6dee13e050df38610c66e99830f1bae6 -SIZE (chromium-38.0.2125.122-testdata.tar.xz) = 115344076 +SHA256 (chromium-39.0.2171.65.tar.xz) = b15746316f2abef40792395d9a0da28ef17713289b9bd334a8ad3ee8b764f451 +SIZE (chromium-39.0.2171.65.tar.xz) = 253057636 +SHA256 (chromium-39.0.2171.65-testdata.tar.xz) = 4be2e8909268a9901ab714b57eabd53329580f83b7525c7dace7a36fbb3e7ea5 +SIZE (chromium-39.0.2171.65-testdata.tar.xz) = 115238768 diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang index 465cde2e599d..a2f23b04f4ba 100644 --- a/www/chromium/files/extra-patch-clang +++ b/www/chromium/files/extra-patch-clang @@ -217,17 +217,6 @@ #if defined(__GCC__) #pragma GCC diagnostic pop #endif ---- v8/src/unique.h.orig 2014-01-07 21:03:55.000000000 +0100 -+++ v8/src/unique.h 2014-01-13 00:41:59.000000000 +0100 -@@ -130,7 +130,7 @@ - - // TODO(titzer): this is a hack to migrate to Unique<T> incrementally. - static Unique<T> CreateUninitialized(Handle<T> handle) { -- return Unique<T>(reinterpret_cast<Address>(NULL), handle); -+ return Unique<T>(static_cast<Address>(NULL), handle); - } - - static Unique<T> CreateImmovable(Handle<T> handle) { --- content/browser/frame_host/render_widget_host_view_guest.cc.orig 2014-03-05 22:24:07.000000000 +0100 +++ content/browser/frame_host/render_widget_host_view_guest.cc 2014-03-09 20:01:20.000000000 +0100 @@ -258,11 +258,11 @@ @@ -256,14 +245,14 @@ tasks_.erase(it, tasks_.end()); ---- v8/src/unique.h.orig 2014-09-04 02:30:24.000000000 +0200 -+++ v8/src/unique.h 2014-09-10 16:19:37.000000000 +0200 -@@ -167,7 +167,7 @@ +--- v8/src/unique.h.orig 2014-10-10 11:16:50.000000000 +0200 ++++ v8/src/unique.h 2014-10-13 18:55:35.000000000 +0200 +@@ -110,7 +110,7 @@ // TODO(titzer): this is a hack to migrate to Unique<T> incrementally. - static PrintableUnique<T> CreateUninitialized(Zone* zone, Handle<T> handle) { -- return PrintableUnique<T>(zone, reinterpret_cast<Address>(NULL), handle); -+ return PrintableUnique<T>(zone, static_cast<Address>(NULL), handle); + static Unique<T> CreateUninitialized(Handle<T> handle) { +- return Unique<T>(reinterpret_cast<Address>(NULL), handle); ++ return Unique<T>(static_cast<Address>(NULL), handle); } - static PrintableUnique<T> CreateImmovable(Zone* zone, Handle<T> handle) { + static Unique<T> CreateImmovable(Handle<T> handle) { diff --git a/www/chromium/files/extra-patch-gcc b/www/chromium/files/extra-patch-gcc index a37a0399d81e..cd1038aeb1f9 100644 --- a/www/chromium/files/extra-patch-gcc +++ b/www/chromium/files/extra-patch-gcc @@ -66,13 +66,13 @@ #include <jpeglib.h> #elif defined(USE_LIBJPEG_TURBO) #include "third_party/libjpeg_turbo/jpeglib.h" ---- media/cast/logging/encoding_event_subscriber.cc.orig 2014-10-02 19:39:47.000000000 +0200 -+++ media/cast/logging/encoding_event_subscriber.cc 2014-10-06 10:38:30.000000000 +0200 -@@ -4,6 +4,7 @@ +--- third_party/webrtc/common_audio/wav_writer.h.orig 2014-10-17 02:57:34.000000000 +0200 ++++ third_party/webrtc/common_audio/wav_writer.h 2014-10-18 12:04:03.000000000 +0200 +@@ -14,6 +14,7 @@ + #ifdef __cplusplus - #include "media/cast/logging/encoding_event_subscriber.h" - -+#include <algorithm> - #include <cstring> - #include <utility> + #include <stdint.h> ++#include <stdio.h> + #include <cstddef> + #include <string> diff --git a/www/chromium/files/patch-base__base.gyp b/www/chromium/files/patch-base__base.gyp index 433903908a20..13b6a98477e4 100644 --- a/www/chromium/files/patch-base__base.gyp +++ b/www/chromium/files/patch-base__base.gyp @@ -1,4 +1,4 @@ ---- base/base.gyp.orig 2014-10-02 21:05:31 UTC +--- base/base.gyp.orig 2014-10-10 09:15:29 UTC +++ base/base.gyp @@ -129,7 +129,7 @@ ], @@ -9,7 +9,7 @@ ], }, }], -@@ -784,6 +784,11 @@ +@@ -803,6 +803,11 @@ ['include', '^debug/proc_maps_linux_unittest\\.cc$'], ], }], diff --git a/www/chromium/files/patch-base__base.gypi b/www/chromium/files/patch-base__base.gypi index 3a8e4b0dfa6d..9ddefad7a81e 100644 --- a/www/chromium/files/patch-base__base.gypi +++ b/www/chromium/files/patch-base__base.gypi @@ -1,4 +1,4 @@ ---- base/base.gypi.orig 2014-10-02 17:39:45 UTC +--- base/base.gypi.orig 2014-10-10 09:15:29 UTC +++ base/base.gypi @@ -945,11 +945,16 @@ 'process/memory_stubs.cc', diff --git a/www/chromium/files/patch-base__debug__stack_trace_posix.cc b/www/chromium/files/patch-base__debug__stack_trace_posix.cc index 2607e1e24925..012c7b6df124 100644 --- a/www/chromium/files/patch-base__debug__stack_trace_posix.cc +++ b/www/chromium/files/patch-base__debug__stack_trace_posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2014-10-02 17:18:52 UTC +--- base/debug/stack_trace_posix.cc.orig 2014-10-10 09:15:29 UTC +++ base/debug/stack_trace_posix.cc @@ -588,6 +588,10 @@ // for the modules that are loaded in the current process. diff --git a/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h b/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h index 0cf07946bcd5..889fbe8c8aed 100644 --- a/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h +++ b/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_kqueue.h.orig 2014-10-02 17:18:52 UTC +--- base/files/file_path_watcher_kqueue.h.orig 2014-10-10 09:15:29 UTC +++ base/files/file_path_watcher_kqueue.h @@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ diff --git a/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc b/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc index 46d0b47dfdc1..dcc6f75b97ce 100644 --- a/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc +++ b/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_linux.cc.orig 2014-10-02 17:18:52 UTC +--- base/posix/unix_domain_socket_linux.cc.orig 2014-10-10 08:54:09 UTC +++ base/posix/unix_domain_socket_linux.cc @@ -18,6 +18,15 @@ #include "base/posix/eintr_wrapper.h" diff --git a/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc b/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc index 817c46b354f0..c9ce60c7b9ee 100644 --- a/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc +++ b/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-10-02 17:18:52 UTC +--- base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-10-10 08:54:09 UTC +++ base/posix/unix_domain_socket_linux_unittest.cc @@ -2,8 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be diff --git a/www/chromium/files/patch-base__process__internal_linux.h b/www/chromium/files/patch-base__process__internal_linux.h index 62c556fb9065..59eadfbe48e8 100644 --- a/www/chromium/files/patch-base__process__internal_linux.h +++ b/www/chromium/files/patch-base__process__internal_linux.h @@ -1,4 +1,4 @@ ---- base/process/internal_linux.h.orig 2014-10-02 17:18:52 UTC +--- base/process/internal_linux.h.orig 2014-10-10 08:54:09 UTC +++ base/process/internal_linux.h @@ -12,6 +12,8 @@ diff --git a/www/chromium/files/patch-base__process__launch.cc b/www/chromium/files/patch-base__process__launch.cc index b748528b157b..d843c1a90d50 100644 --- a/www/chromium/files/patch-base__process__launch.cc +++ b/www/chromium/files/patch-base__process__launch.cc @@ -1,4 +1,4 @@ ---- base/process/launch.cc.orig 2014-10-02 17:18:52 UTC +--- base/process/launch.cc.orig 2014-10-10 08:54:09 UTC +++ base/process/launch.cc @@ -24,10 +24,10 @@ fds_to_remap(NULL), diff --git a/www/chromium/files/patch-base__process__launch.h b/www/chromium/files/patch-base__process__launch.h index 1cb26ebfcaca..c71b1afd257b 100644 --- a/www/chromium/files/patch-base__process__launch.h +++ b/www/chromium/files/patch-base__process__launch.h @@ -1,4 +1,4 @@ ---- base/process/launch.h.orig 2014-10-02 17:18:52 UTC +--- base/process/launch.h.orig 2014-10-10 08:54:09 UTC +++ base/process/launch.h @@ -113,14 +113,14 @@ // will be the same as its pid. diff --git a/www/chromium/files/patch-base__process__memory_unittest.cc b/www/chromium/files/patch-base__process__memory_unittest.cc index 8bdea94b1df5..e23e62c2d221 100644 --- a/www/chromium/files/patch-base__process__memory_unittest.cc +++ b/www/chromium/files/patch-base__process__memory_unittest.cc @@ -1,4 +1,4 @@ ---- base/process/memory_unittest.cc.orig 2014-10-02 17:18:52 UTC +--- base/process/memory_unittest.cc.orig 2014-10-10 09:15:29 UTC +++ base/process/memory_unittest.cc @@ -160,9 +160,9 @@ diff --git a/www/chromium/files/patch-base__process__process_iterator_freebsd.cc b/www/chromium/files/patch-base__process__process_iterator_freebsd.cc index 341826f2d45b..d5a81241c2d1 100644 --- a/www/chromium/files/patch-base__process__process_iterator_freebsd.cc +++ b/www/chromium/files/patch-base__process__process_iterator_freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_iterator_freebsd.cc.orig 2014-10-02 17:18:52 UTC +--- base/process/process_iterator_freebsd.cc.orig 2014-10-10 08:54:09 UTC +++ base/process/process_iterator_freebsd.cc @@ -8,6 +8,10 @@ #include <sys/sysctl.h> diff --git a/www/chromium/files/patch-base__process__process_metrics.h b/www/chromium/files/patch-base__process__process_metrics.h index e21e455a34e4..8899e69cc64e 100644 --- a/www/chromium/files/patch-base__process__process_metrics.h +++ b/www/chromium/files/patch-base__process__process_metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2014-10-02 17:39:45 UTC +--- base/process/process_metrics.h.orig 2014-10-10 08:54:09 UTC +++ base/process/process_metrics.h @@ -17,6 +17,13 @@ #include "base/time/time.h" @@ -14,7 +14,7 @@ #if defined(OS_MACOSX) #include <mach/mach.h> #endif -@@ -240,13 +247,17 @@ +@@ -246,13 +253,17 @@ // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. BASE_EXPORT int ParseProcStatCPU(const std::string& input); diff --git a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc b/www/chromium/files/patch-base__process__process_metrics_freebsd.cc index 928c2a3a8431..674c13873f3d 100644 --- a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc +++ b/www/chromium/files/patch-base__process__process_metrics_freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2014-10-02 17:18:52 UTC +--- base/process/process_metrics_freebsd.cc.orig 2014-10-10 08:54:09 UTC +++ base/process/process_metrics_freebsd.cc @@ -10,6 +10,9 @@ diff --git a/www/chromium/files/patch-base__security_unittest.cc b/www/chromium/files/patch-base__security_unittest.cc index 560ca94c8cde..49d8b5c8db0c 100644 --- a/www/chromium/files/patch-base__security_unittest.cc +++ b/www/chromium/files/patch-base__security_unittest.cc @@ -1,4 +1,4 @@ ---- base/security_unittest.cc.orig 2014-10-02 17:18:52 UTC +--- base/security_unittest.cc.orig 2014-10-10 09:15:29 UTC +++ base/security_unittest.cc @@ -160,7 +160,7 @@ // FAILS_ is too clunky. diff --git a/www/chromium/files/patch-base__strings__safe_sprintf.cc b/www/chromium/files/patch-base__strings__safe_sprintf.cc index 4966c99e5a20..0a9072eb7f95 100644 --- a/www/chromium/files/patch-base__strings__safe_sprintf.cc +++ b/www/chromium/files/patch-base__strings__safe_sprintf.cc @@ -1,4 +1,4 @@ ---- base/strings/safe_sprintf.cc.orig 2014-10-02 17:18:52 UTC +--- base/strings/safe_sprintf.cc.orig 2014-10-10 08:54:09 UTC +++ base/strings/safe_sprintf.cc @@ -107,15 +107,16 @@ : buffer_(buffer), diff --git a/www/chromium/files/patch-base__sys_info_freebsd.cc b/www/chromium/files/patch-base__sys_info_freebsd.cc index 2d580a10ede5..ef6ea777d385 100644 --- a/www/chromium/files/patch-base__sys_info_freebsd.cc +++ b/www/chromium/files/patch-base__sys_info_freebsd.cc @@ -1,4 +1,4 @@ ---- base/sys_info_freebsd.cc.orig 2014-10-02 17:18:52 UTC +--- base/sys_info_freebsd.cc.orig 2014-10-10 08:54:09 UTC +++ base/sys_info_freebsd.cc @@ -4,6 +4,7 @@ diff --git a/www/chromium/files/patch-base__sys_info_posix.cc b/www/chromium/files/patch-base__sys_info_posix.cc index 4d629ace7bb5..2d94e6daf81b 100644 --- a/www/chromium/files/patch-base__sys_info_posix.cc +++ b/www/chromium/files/patch-base__sys_info_posix.cc @@ -1,6 +1,6 @@ ---- base/sys_info_posix.cc.orig 2014-10-02 17:39:45 UTC +--- base/sys_info_posix.cc.orig 2014-10-10 08:54:09 UTC +++ base/sys_info_posix.cc -@@ -64,7 +64,7 @@ +@@ -75,7 +75,7 @@ namespace base { diff --git a/www/chromium/files/patch-base__test__expectations__expectation.cc b/www/chromium/files/patch-base__test__expectations__expectation.cc index 95d5c1147375..30075abb3e5b 100644 --- a/www/chromium/files/patch-base__test__expectations__expectation.cc +++ b/www/chromium/files/patch-base__test__expectations__expectation.cc @@ -1,4 +1,4 @@ ---- base/test/expectations/expectation.cc.orig 2014-10-02 17:18:52 UTC +--- base/test/expectations/expectation.cc.orig 2014-10-10 08:54:09 UTC +++ base/test/expectations/expectation.cc @@ -60,6 +60,7 @@ variant != "64") { diff --git a/www/chromium/files/patch-base__test__launcher__test_launcher.cc b/www/chromium/files/patch-base__test__launcher__test_launcher.cc index 7386e6cbb534..b98d39b5999b 100644 --- a/www/chromium/files/patch-base__test__launcher__test_launcher.cc +++ b/www/chromium/files/patch-base__test__launcher__test_launcher.cc @@ -1,4 +1,4 @@ ---- base/test/launcher/test_launcher.cc.orig 2014-10-02 17:39:45 UTC +--- base/test/launcher/test_launcher.cc.orig 2014-10-10 09:15:29 UTC +++ base/test/launcher/test_launcher.cc @@ -45,6 +45,10 @@ #include "base/win/windows_version.h" @@ -10,4 +10,4 @@ + namespace base { - // Launches a child process using |command_line|. If the child process is still + // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ . diff --git a/www/chromium/files/patch-base__threading__platform_thread_linux.cc b/www/chromium/files/patch-base__threading__platform_thread_linux.cc index 450e2dc96aa9..1ab13483b8aa 100644 --- a/www/chromium/files/patch-base__threading__platform_thread_linux.cc +++ b/www/chromium/files/patch-base__threading__platform_thread_linux.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_linux.cc.orig 2014-10-02 17:39:45 UTC +--- base/threading/platform_thread_linux.cc.orig 2014-10-10 08:54:09 UTC +++ base/threading/platform_thread_linux.cc @@ -16,7 +16,9 @@ #include "base/tracked_objects.h" diff --git a/www/chromium/files/patch-breakpad__breakpad.gyp b/www/chromium/files/patch-breakpad__breakpad.gyp index 241020f2b452..a06faa9ac964 100644 --- a/www/chromium/files/patch-breakpad__breakpad.gyp +++ b/www/chromium/files/patch-breakpad__breakpad.gyp @@ -1,6 +1,6 @@ ---- breakpad/breakpad.gyp.orig 2014-10-02 17:39:45 UTC +--- breakpad/breakpad.gyp.orig 2014-10-10 09:15:29 UTC +++ breakpad/breakpad.gyp -@@ -349,7 +349,7 @@ +@@ -353,7 +353,7 @@ }, ], }], diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi index 3aed2daaa073..921829acc9ac 100644 --- a/www/chromium/files/patch-build__common.gypi +++ b/www/chromium/files/patch-build__common.gypi @@ -1,4 +1,4 @@ ---- build/common.gypi.orig 2014-10-02 17:39:45 UTC +--- build/common.gypi.orig 2014-10-10 09:15:29 UTC +++ build/common.gypi @@ -91,7 +91,7 @@ @@ -9,7 +9,7 @@ 'use_ash%': 1, 'use_aura%': 1, }], -@@ -676,7 +676,7 @@ +@@ -702,7 +702,7 @@ }], # DBus usage. @@ -18,7 +18,7 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -931,7 +931,7 @@ +@@ -952,7 +952,7 @@ }, { 'use_openmax_dl_fft%': 0, }], @@ -27,7 +27,7 @@ 'enable_mdns%' : 1, }], -@@ -954,7 +954,7 @@ +@@ -975,7 +975,7 @@ # except when building Android WebView or Chromecast. # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). # Set the data reduction proxy origin for Android Webview. @@ -36,7 +36,7 @@ 'icu_use_data_file_flag%' : 1, 'spdy_proxy_auth_origin%': '', 'data_reduction_proxy_probe_url%': '', -@@ -1193,6 +1193,10 @@ +@@ -1228,6 +1228,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, @@ -47,7 +47,7 @@ # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -4280,6 +4284,13 @@ +@@ -4391,6 +4395,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], diff --git a/www/chromium/files/patch-build__filename_rules.gypi b/www/chromium/files/patch-build__filename_rules.gypi index 39c267457689..970978cfbdb1 100644 --- a/www/chromium/files/patch-build__filename_rules.gypi +++ b/www/chromium/files/patch-build__filename_rules.gypi @@ -1,4 +1,4 @@ ---- build/filename_rules.gypi.orig 2014-10-02 17:18:52 UTC +--- build/filename_rules.gypi.orig 2014-10-10 08:54:09 UTC +++ build/filename_rules.gypi @@ -85,7 +85,7 @@ ['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', { diff --git a/www/chromium/files/patch-build__linux__system.gyp b/www/chromium/files/patch-build__linux__system.gyp index 65b62e8428c5..849e71b9255a 100644 --- a/www/chromium/files/patch-build__linux__system.gyp +++ b/www/chromium/files/patch-build__linux__system.gyp @@ -1,6 +1,6 @@ ---- build/linux/system.gyp.orig 2014-10-02 17:39:45 UTC +--- build/linux/system.gyp.orig 2014-10-10 08:54:09 UTC +++ build/linux/system.gyp -@@ -890,6 +890,13 @@ +@@ -866,6 +866,13 @@ 'include_dirs': [ '../..', ], diff --git a/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp b/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp index ed8a89e51546..6e6a36a3bf10 100644 --- a/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp +++ b/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp @@ -1,4 +1,4 @@ ---- build/linux/unbundle/libwebp.gyp.orig 2014-10-02 17:18:52 UTC +--- build/linux/unbundle/libwebp.gyp.orig 2014-10-10 08:54:09 UTC +++ build/linux/unbundle/libwebp.gyp @@ -14,13 +14,7 @@ }, diff --git a/www/chromium/files/patch-build__linux__unbundle__openssl.gyp b/www/chromium/files/patch-build__linux__unbundle__openssl.gyp index b049c8746df6..76348a546d36 100644 --- a/www/chromium/files/patch-build__linux__unbundle__openssl.gyp +++ b/www/chromium/files/patch-build__linux__unbundle__openssl.gyp @@ -1,4 +1,4 @@ ---- build/linux/unbundle/openssl.gyp.orig 2014-10-02 17:18:52 UTC +--- build/linux/unbundle/openssl.gyp.orig 2014-10-10 08:54:09 UTC +++ build/linux/unbundle/openssl.gyp @@ -9,15 +9,15 @@ 'type': 'none', diff --git a/www/chromium/files/patch-cc__layers__layer_impl.cc b/www/chromium/files/patch-cc__layers__layer_impl.cc index bb120b34a1dd..a119a2c95bf7 100644 --- a/www/chromium/files/patch-cc__layers__layer_impl.cc +++ b/www/chromium/files/patch-cc__layers__layer_impl.cc @@ -1,6 +1,6 @@ ---- cc/layers/layer_impl.cc.orig 2014-10-02 17:39:45 UTC +--- cc/layers/layer_impl.cc.orig 2014-10-10 09:15:29 UTC +++ cc/layers/layer_impl.cc -@@ -1201,21 +1201,23 @@ +@@ -1202,21 +1202,23 @@ scale_factor * scaled_scroll_bounds.height()); scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds); diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc index 3d2bbaf96774..91ff873223a0 100644 --- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc +++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc @@ -1,33 +1,15 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2014-10-10 09:15:29 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -94,7 +94,7 @@ +@@ -97,7 +97,7 @@ #include "ui/base/x/x11_util.h" #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - #include "components/breakpad/app/breakpad_linux.h" + #include "components/crash/app/breakpad_linux.h" #endif -@@ -124,7 +124,7 @@ - g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; - #endif - --#if defined(OS_POSIX) -+#if defined(OS_POSIX) && !defined(OS_BSD) - base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky - g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; - #endif -@@ -225,7 +225,7 @@ - // Mac needs them for the plugin process name. - process_type == switches::kPluginProcess || - #endif --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - // The zygote process opens the resources for the renderers. - process_type == switches::kZygoteProcess || - #endif -@@ -441,7 +441,7 @@ +@@ -449,7 +449,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -36,7 +18,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -492,7 +492,7 @@ +@@ -500,7 +500,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -45,16 +27,16 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -632,7 +632,7 @@ +@@ -640,7 +640,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_BSD) - breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); + crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); #endif -@@ -759,7 +759,7 @@ +@@ -767,7 +767,7 @@ #endif } @@ -63,7 +45,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -771,7 +771,7 @@ +@@ -779,7 +779,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -72,7 +54,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -863,7 +863,7 @@ +@@ -875,7 +875,7 @@ #endif return process_type == switches::kRelauncherProcess; } diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h b/www/chromium/files/patch-chrome__app__chrome_main_delegate.h index ec577255b7a9..88c7f7a84ee3 100644 --- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h +++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.h @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.h.orig 2014-10-02 17:18:53 UTC +--- chrome/app/chrome_main_delegate.h.orig 2014-10-10 09:15:29 UTC +++ chrome/app/chrome_main_delegate.h @@ -38,7 +38,7 @@ virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; diff --git a/www/chromium/files/patch-chrome__app__chromium_strings.grd b/www/chromium/files/patch-chrome__app__chromium_strings.grd index 3a38ae18c75a..74fa0fa44cbf 100644 --- a/www/chromium/files/patch-chrome__app__chromium_strings.grd +++ b/www/chromium/files/patch-chrome__app__chromium_strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2014-10-02 17:39:45 UTC +--- chrome/app/chromium_strings.grd.orig 2014-10-10 09:15:29 UTC +++ chrome/app/chromium_strings.grd -@@ -1115,7 +1115,7 @@ +@@ -1136,7 +1136,7 @@ </message> <!-- ProcessSingleton --> diff --git a/www/chromium/files/patch-chrome__app__generated_resources.grd b/www/chromium/files/patch-chrome__app__generated_resources.grd deleted file mode 100644 index 6e2893ae7a21..000000000000 --- a/www/chromium/files/patch-chrome__app__generated_resources.grd +++ /dev/null @@ -1,19 +0,0 @@ ---- chrome/app/generated_resources.grd.orig 2014-10-02 17:39:45 UTC -+++ chrome/app/generated_resources.grd -@@ -9024,6 +9024,16 @@ - SSL protocol error. - </message> - -+ <message name="IDS_ERRORPAGES_HEADING_SSL_FALLBACK_BEYOND_MINIMUM_VERSION" desc="Heading in the error page for SSL fallback errors."> -+ SSL server probably obsolete. -+ </message> -+ <message name="IDS_ERRORPAGES_SUMMARY_SSL_FALLBACK_BEYOND_MINIMUM_VERSION" desc="Summary in the error page for SSL fallback errors."> -+ Unable to connect securely to the server. This website may have worked previously, but connecting to such sites has now been shown to cause security risks to all users and thus has been disabled for your safety. -+ </message> -+ <message name="IDS_ERRORPAGES_DETAILS_SSL_FALLBACK_BEYOND_MINIMUM_VERSION" desc="The error message displayed for SSL fallback errors."> -+ An SSLv3 fallback was able to handshake with the server, but we no longer accept SSLv3 fallbacks due to new attacks against the protocol. The server needs to be updated to support a minimum of TLS 1.0 and preferably TLS 1.2. -+ </message> -+ - <message name="IDS_ERRORPAGES_HEADING_PINNING_FAILURE" desc="Title of the error page for a certificate which doesn't match the built-in pins for that name"> - Incorrect certificate for host. - </message> diff --git a/www/chromium/files/patch-chrome__app__resources__locale_settings.grd b/www/chromium/files/patch-chrome__app__resources__locale_settings.grd index 98372707b718..52393447663a 100644 --- a/www/chromium/files/patch-chrome__app__resources__locale_settings.grd +++ b/www/chromium/files/patch-chrome__app__resources__locale_settings.grd @@ -1,4 +1,4 @@ ---- chrome/app/resources/locale_settings.grd.orig 2014-10-02 17:39:45 UTC +--- chrome/app/resources/locale_settings.grd.orig 2014-10-10 09:15:30 UTC +++ chrome/app/resources/locale_settings.grd @@ -264,7 +264,7 @@ 55 diff --git a/www/chromium/files/patch-chrome__browser__about_flags.cc b/www/chromium/files/patch-chrome__browser__about_flags.cc index 75793da6bb12..f0acc01ff487 100644 --- a/www/chromium/files/patch-chrome__browser__about_flags.cc +++ b/www/chromium/files/patch-chrome__browser__about_flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/about_flags.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/about_flags.cc -@@ -2278,7 +2278,7 @@ +@@ -2260,7 +2260,7 @@ return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc index 17146e7f9e41..bf2b9e545538 100644 --- a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc +++ b/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/chrome_browser_main.cc @@ -947,7 +947,7 @@ } diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc index fb084f98ee87..d92c539f93c1 100644 --- a/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc +++ b/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/chrome_browser_main_posix.cc @@ -270,6 +270,11 @@ g_pipe_pid = getpid(); diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc index f4ef03b16a41..c6473886874a 100644 --- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc +++ b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -430,7 +430,7 @@ +@@ -434,7 +434,7 @@ return false; } @@ -9,7 +9,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -487,7 +487,7 @@ +@@ -491,7 +491,7 @@ return -1; } @@ -18,7 +18,7 @@ #if !defined(OS_CHROMEOS) GURL GetEffectiveURLForSignin(const GURL& url) { -@@ -1196,7 +1196,7 @@ +@@ -1194,7 +1194,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( CommandLine* command_line, int child_process_id) { @@ -27,7 +27,7 @@ if (breakpad::IsCrashReporterEnabled()) { scoped_ptr<metrics::ClientInfo> client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -1204,7 +1204,7 @@ +@@ -1202,7 +1202,7 @@ client_info ? client_info->client_id : std::string()); } @@ -36,7 +36,7 @@ if (logging::DialogsAreSuppressed()) command_line->AppendSwitch(switches::kNoErrorDialogs); -@@ -2447,7 +2447,7 @@ +@@ -2408,7 +2408,7 @@ } } @@ -45,7 +45,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const CommandLine& command_line, int child_process_id, -@@ -2513,7 +2513,7 @@ +@@ -2474,7 +2474,7 @@ } #endif // defined(OS_ANDROID) } diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h index 707ca816f426..64c5e79358dc 100644 --- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h +++ b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -287,7 +287,7 @@ +@@ -278,7 +278,7 @@ virtual net::CookieStore* OverrideCookieStoreForRenderProcess( int render_process_id) OVERRIDE; diff --git a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc index d967c2256814..7bede915590f 100644 --- a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc +++ b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc @@ -1,4 +1,4 @@ ---- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/diagnostics/diagnostics_writer.cc @@ -266,7 +266,7 @@ console_->SetColor(color); diff --git a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h index 33abf2f2d9ae..0bc044af772f 100644 --- a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h +++ b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h @@ -1,4 +1,4 @@ ---- chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/diagnostics/diagnostics_writer.h @@ -18,7 +18,7 @@ public: diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc b/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc index 2eff1850e033..34b578ae4fcf 100644 --- a/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc +++ b/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc @@ -167,10 +167,12 @@ } diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc b/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc index 9fee3e87d702..e3cbc53b612a 100644 --- a/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc +++ b/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc @@ -4,6 +4,10 @@ diff --git a/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc b/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc index ab3a4bd02beb..c84898619c3b 100644 --- a/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc +++ b/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/gpu/gl_string_manager.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/gpu/gl_string_manager.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/gpu/gl_string_manager.cc @@ -25,7 +25,7 @@ diff --git a/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc b/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc index a8ff601c2255..32d8db448678 100644 --- a/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc +++ b/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc @@ -1,4 +1,4 @@ ---- chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/gpu/gpu_feature_checker.cc @@ -33,7 +33,7 @@ CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); diff --git a/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc b/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc index 3146cd2e5bf4..87c8072a23d9 100644 --- a/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc +++ b/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc_log_uploader.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/media/webrtc_log_uploader.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/media/webrtc_log_uploader.cc @@ -233,6 +233,8 @@ const char product[] = "Chrome_Android"; diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc b/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc index eb4e326593ea..2285955604fe 100644 --- a/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc +++ b/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc @@ -33,9 +33,11 @@ // Note that this initializes the delegate asynchronously, but since diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc b/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc index 69f0306fd001..68454711ea76 100644 --- a/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc +++ b/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -734,7 +734,10 @@ +@@ -738,7 +738,10 @@ // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc b/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc index 7024fd024300..59ceb375a39c 100644 --- a/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc +++ b/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/media_galleries/media_folder_finder.cc @@ -50,10 +50,10 @@ chrome::DIR_USER_APPLICATIONS, diff --git a/www/chromium/files/patch-chrome__browser__memory_details.cc b/www/chromium/files/patch-chrome__browser__memory_details.cc index 60a9c0d76b14..b9db31ecd43f 100644 --- a/www/chromium/files/patch-chrome__browser__memory_details.cc +++ b/www/chromium/files/patch-chrome__browser__memory_details.cc @@ -1,7 +1,7 @@ ---- chrome/browser/memory_details.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/memory_details.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/memory_details.cc -@@ -27,7 +27,7 @@ - #include "grit/generated_resources.h" +@@ -26,7 +26,7 @@ + #include "content/public/common/bindings_policy.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) @@ -9,7 +9,7 @@ #include "content/public/browser/zygote_host_linux.h" #endif -@@ -248,7 +248,7 @@ +@@ -247,7 +247,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); @@ -18,7 +18,7 @@ const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid(); #endif -@@ -390,7 +390,7 @@ +@@ -389,7 +389,7 @@ } } diff --git a/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc b/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc new file mode 100644 index 000000000000..35a676bfa3a8 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc @@ -0,0 +1,18 @@ +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc +@@ -27,12 +27,14 @@ + + #if defined(OS_LINUX) && !defined(OS_CHROMEOS) + #include <gnu/libc-version.h> ++#endif + ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "base/version.h" + #if defined(USE_X11) + #include "ui/base/x/x11_util.h" + #endif +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif + + #if defined(OS_WIN) + #include "chrome/installer/util/google_update_settings.h" diff --git a/www/chromium/files/patch-chrome__browser__net__connection_tester.cc b/www/chromium/files/patch-chrome__browser__net__connection_tester.cc index 28a10e804d83..823966873564 100644 --- a/www/chromium/files/patch-chrome__browser__net__connection_tester.cc +++ b/www/chromium/files/patch-chrome__browser__net__connection_tester.cc @@ -1,4 +1,4 @@ ---- chrome/browser/net/connection_tester.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/net/connection_tester.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/net/connection_tester.cc @@ -219,7 +219,7 @@ // Otherwise returns a network error code. diff --git a/www/chromium/files/patch-chrome__browser__net__ssl_config_service_manager_pref.cc b/www/chromium/files/patch-chrome__browser__net__ssl_config_service_manager_pref.cc deleted file mode 100644 index 08f8d6d0a50b..000000000000 --- a/www/chromium/files/patch-chrome__browser__net__ssl_config_service_manager_pref.cc +++ /dev/null @@ -1,57 +0,0 @@ ---- chrome/browser/net/ssl_config_service_manager_pref.cc.orig 2014-10-02 17:39:46 UTC -+++ chrome/browser/net/ssl_config_service_manager_pref.cc -@@ -174,6 +174,7 @@ - BooleanPrefMember rev_checking_required_local_anchors_; - StringPrefMember ssl_version_min_; - StringPrefMember ssl_version_max_; -+ StringPrefMember ssl_version_fallback_min_; - BooleanPrefMember ssl_record_splitting_disabled_; - - // The cached list of disabled SSL cipher suites. -@@ -204,6 +205,8 @@ - prefs::kSSLVersionMin, local_state, local_state_callback); - ssl_version_max_.Init( - prefs::kSSLVersionMax, local_state, local_state_callback); -+ ssl_version_fallback_min_.Init( -+ prefs::kSSLVersionFallbackMin, local_state, local_state_callback); - ssl_record_splitting_disabled_.Init( - prefs::kDisableSSLRecordSplitting, local_state, local_state_callback); - -@@ -230,8 +233,12 @@ - SSLProtocolVersionToString(default_config.version_min); - std::string version_max_str = - SSLProtocolVersionToString(default_config.version_max); -+ std::string version_fallback_min_str = -+ SSLProtocolVersionToString(default_config.version_fallback_min); - registry->RegisterStringPref(prefs::kSSLVersionMin, version_min_str); - registry->RegisterStringPref(prefs::kSSLVersionMax, version_max_str); -+ registry->RegisterStringPref(prefs::kSSLVersionFallbackMin, -+ version_fallback_min_str); - registry->RegisterBooleanPref(prefs::kDisableSSLRecordSplitting, - !default_config.false_start_enabled); - registry->RegisterListPref(prefs::kCipherSuiteBlacklist); -@@ -275,10 +282,14 @@ - rev_checking_required_local_anchors_.GetValue(); - std::string version_min_str = ssl_version_min_.GetValue(); - std::string version_max_str = ssl_version_max_.GetValue(); -+ std::string version_fallback_min_str = ssl_version_fallback_min_.GetValue(); - config->version_min = net::kDefaultSSLVersionMin; - config->version_max = net::kDefaultSSLVersionMax; -+ config->version_fallback_min = net::kDefaultSSLVersionFallbackMin; - uint16 version_min = SSLProtocolVersionFromString(version_min_str); - uint16 version_max = SSLProtocolVersionFromString(version_max_str); -+ uint16 version_fallback_min = -+ SSLProtocolVersionFromString(version_fallback_min_str); - if (version_min) { - // TODO(wtc): get the minimum SSL protocol version supported by the - // SSLClientSocket class. Right now it happens to be the same as the -@@ -293,6 +304,9 @@ - uint16 supported_version_max = config->version_max; - config->version_max = std::min(supported_version_max, version_max); - } -+ if (version_fallback_min) { -+ config->version_fallback_min = version_fallback_min; -+ } - config->disabled_cipher_suites = disabled_cipher_suites_; - // disabling False Start also happens to disable record splitting. - config->false_start_enabled = !ssl_record_splitting_disabled_.GetValue(); diff --git a/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc b/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc index 94abe02b4692..6eaadce2bff8 100644 --- a/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc +++ b/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/notifications/message_center_notification_manager.cc.orig 2014-09-10 01:47:12.000000000 +0200 -+++ chrome/browser/notifications/message_center_notification_manager.cc 2014-09-18 14:21:16.000000000 +0200 -@@ -84,7 +84,7 @@ +--- chrome/browser/notifications/message_center_notification_manager.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/notifications/message_center_notification_manager.cc +@@ -82,7 +82,7 @@ blockers_.push_back(new FullscreenNotificationBlocker(message_center)); #if defined(OS_WIN) || defined(OS_MACOSX) \ diff --git a/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc b/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc index b680e11ad385..e0e9f46ef83a 100644 --- a/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc +++ b/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2014-10-02 17:18:54 UTC +--- chrome/browser/plugins/plugins_resource_service.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/plugins/plugins_resource_service.cc @@ -33,7 +33,7 @@ std::string filename; diff --git a/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc b/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc index 7c46401e3dd7..948a0230d463 100644 --- a/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc +++ b/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc @@ -1,4 +1,4 @@ ---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/policy/policy_prefs_browsertest.cc @@ -169,6 +169,8 @@ const std::string os("chromeos"); diff --git a/www/chromium/files/patch-chrome__browser__prefs__command_line_pref_store.cc b/www/chromium/files/patch-chrome__browser__prefs__command_line_pref_store.cc deleted file mode 100644 index 05aa5a59138f..000000000000 --- a/www/chromium/files/patch-chrome__browser__prefs__command_line_pref_store.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- chrome/browser/prefs/command_line_pref_store.cc.orig 2014-10-02 17:39:46 UTC -+++ chrome/browser/prefs/command_line_pref_store.cc -@@ -33,6 +33,7 @@ - { switches::kDiskCacheDir, prefs::kDiskCacheDir }, - { switches::kSSLVersionMin, prefs::kSSLVersionMin }, - { switches::kSSLVersionMax, prefs::kSSLVersionMax }, -+ { switches::kSSLVersionFallbackMin, prefs::kSSLVersionFallbackMin }, - }; - - const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry diff --git a/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc b/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc index 1bedd54843d2..f38027ec092f 100644 --- a/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc +++ b/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2014-10-02 17:18:54 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2014-10-10 08:54:11 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc @@ -8,7 +8,12 @@ diff --git a/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc b/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc index 431e93c24a82..0bb8ea5cfc7a 100644 --- a/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc +++ b/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ssl/ssl_blocking_page.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/ssl/ssl_blocking_page.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/ssl/ssl_blocking_page.cc -@@ -260,7 +260,7 @@ +@@ -234,7 +234,7 @@ // settings. Weird. TODO(palmer): Do something more graceful than ignoring // the user's click! crbug.com/394993 return; @@ -9,7 +9,7 @@ struct ClockCommand { const char* pathname; const char* argument; -@@ -310,7 +310,7 @@ +@@ -284,7 +284,7 @@ #if !defined(OS_CHROMEOS) base::LaunchOptions options; options.wait = false; diff --git a/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc b/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc index 64a6eda7e6ad..8c2ada45ddf8 100644 --- a/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc +++ b/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc @@ -1,5 +1,5 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2014-10-06 09:19:40.000000000 +0200 -+++ chrome/browser/ui/browser_view_prefs.cc 2014-10-06 09:24:45.000000000 +0200 +--- chrome/browser/ui/browser_view_prefs.cc.orig 2014-10-10 08:54:11 UTC ++++ chrome/browser/ui/browser_view_prefs.cc @@ -9,7 +9,7 @@ #include "chrome/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" diff --git a/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc b/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc index 99b45abde311..587c93a80ec8 100644 --- a/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc +++ b/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -79,7 +79,7 @@ +@@ -80,7 +80,7 @@ #include "components/user_manager/user_manager.h" #endif diff --git a/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc b/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc index e813b88194e3..7242f8bef3e9 100644 --- a/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc +++ b/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views.cc.orig 2014-10-06 09:32:59.000000000 +0200 -+++ chrome/browser/ui/views/apps/chrome_native_app_window_views.cc 2014-10-06 09:40:11.000000000 +0200 +--- chrome/browser/ui/views/apps/chrome_native_app_window_views.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/ui/views/apps/chrome_native_app_window_views.cc @@ -29,7 +29,7 @@ #include "ui/wm/core/easy_resize_window_targeter.h" #include "ui/wm/core/shadow_types.h" -#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_BSD) ++#if defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/shell_integration_linux.h" #endif -@@ -217,7 +217,7 @@ - init_params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; - init_params.keep_on_top = create_params.always_on_top; +@@ -219,7 +219,7 @@ + init_params.visible_on_all_workspaces = + create_params.visible_on_all_workspaces; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) // Set up a custom WM_CLASS for app windows. This allows task switchers in // X11 environments to distinguish them from main browser windows. init_params.wm_class_name = web_app::GetWMClassFromAppName(app_name); diff --git a/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc b/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc index 71a23bfc8c29..00fd0867c6b2 100644 --- a/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc +++ b/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_views_delegate.cc.orig 2014-10-06 09:19:23.000000000 +0200 -+++ chrome/browser/ui/views/chrome_views_delegate.cc 2014-10-06 09:22:54.000000000 +0200 -@@ -44,7 +44,7 @@ +--- chrome/browser/ui/views/chrome_views_delegate.cc.orig 2014-10-10 08:54:11 UTC ++++ chrome/browser/ui/views/chrome_views_delegate.cc +@@ -45,7 +45,7 @@ #include "ui/views/widget/native_widget_aura.h" #endif @@ -9,16 +9,16 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -234,7 +234,7 @@ +@@ -235,7 +235,7 @@ return chrome::IsNativeViewInAsh(window); } -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64); -@@ -373,7 +373,7 @@ +@@ -374,7 +374,7 @@ #endif } diff --git a/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h b/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h index 26e706d76f33..34680d06cf25 100644 --- a/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h +++ b/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2014-10-06 09:19:31.000000000 +0200 -+++ chrome/browser/ui/views/chrome_views_delegate.h 2014-10-06 09:23:19.000000000 +0200 +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/ui/views/chrome_views_delegate.h @@ -36,7 +36,7 @@ #if defined(OS_WIN) virtual HICON GetDefaultWindowIcon() const OVERRIDE; virtual bool IsWindowInMetro(gfx::NativeWindow window) const OVERRIDE; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) virtual gfx::ImageSkia* GetDefaultWindowIcon() const OVERRIDE; #endif @@ -14,7 +14,7 @@ views::Widget::InitParams* params, views::internal::NativeWidgetDelegate* delegate) OVERRIDE; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) virtual bool WindowManagerProvidesTitleBar(bool maximized) OVERRIDE; #endif #if defined(USE_AURA) diff --git a/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc b/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc index 4345c44363e5..8e9fc1073cc2 100644 --- a/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc +++ b/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2014-10-10 08:54:11 UTC +++ chrome/browser/ui/views/first_run_dialog.cc -@@ -124,12 +124,16 @@ +@@ -118,12 +118,16 @@ bool FirstRunDialog::Accept() { GetWidget()->Hide(); diff --git a/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc b/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc index 2a389901d048..37f8b0918af7 100644 --- a/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc +++ b/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc @@ -1,5 +1,5 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2014-10-06 09:37:47.000000000 +0200 -+++ chrome/browser/ui/views/frame/browser_frame.cc 2014-10-06 09:37:33.000000000 +0200 +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2014-10-10 08:54:11 UTC ++++ chrome/browser/ui/views/frame/browser_frame.cc @@ -36,7 +36,7 @@ #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/widget/native_widget.h" diff --git a/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc b/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc index e76dd8b9e0f7..775838512ca1 100644 --- a/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc +++ b/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2014-10-06 09:39:10.000000000 +0200 -+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc 2014-10-06 09:39:57.000000000 +0200 -@@ -53,7 +53,7 @@ +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +@@ -52,7 +52,7 @@ #include "ui/views/window/frame_background.h" #include "ui/views/window/window_shape.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -78,7 +78,7 @@ +@@ -77,7 +77,7 @@ // The icon never shrinks below 16 px on a side. const int kIconMinimumSize = 16; @@ -18,7 +18,7 @@ // The number of pixels to move the frame background image upwards when using // the GTK+ theme and the titlebar is condensed. const int kGTKThemeCondensedFrameTopInset = 15; -@@ -316,7 +316,7 @@ +@@ -318,7 +318,7 @@ void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source, const gfx::Point& point) { @@ -27,7 +27,7 @@ views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), views::MenuRunner::HAS_MNEMONICS); ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(), -@@ -569,7 +569,7 @@ +@@ -571,7 +571,7 @@ } bool OpaqueBrowserFrameView::ShouldShowWindowTitleBar() const { @@ -36,7 +36,7 @@ // Do not show the custom title bar if the system title bar option is enabled. if (!frame()->UseCustomFrame()) return false; -@@ -614,7 +614,7 @@ +@@ -616,7 +616,7 @@ frame_background_->set_theme_image(GetFrameImage()); frame_background_->set_theme_overlay_image(GetFrameOverlayImage()); frame_background_->set_top_area_height(GetTopAreaHeight()); diff --git a/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc b/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc index d39edcc8f6cc..d8e3a008fead 100644 --- a/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc +++ b/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2014-10-06 09:41:06.000000000 +0200 -+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc 2014-10-06 09:40:51.000000000 +0200 -@@ -81,7 +81,7 @@ +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc +@@ -82,7 +82,7 @@ // is no avatar icon. const int kTabStripIndent = -6; diff --git a/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc b/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc index 1350ebf4a5c9..bceee1b62cfa 100644 --- a/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc +++ b/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc @@ -1,5 +1,5 @@ ---- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2014-10-06 09:33:35.000000000 +0200 -+++ chrome/browser/ui/views/tabs/tab_strip.cc 2014-10-06 09:31:58.000000000 +0200 +--- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/ui/views/tabs/tab_strip.cc @@ -281,7 +281,7 @@ : views::ImageButton(listener), tab_strip_(tab_strip), diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc index 65fb74bceb43..3bd5b8cd5d27 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/ui/webui/about_ui.cc @@ -761,7 +761,7 @@ return data; diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc index a12231fd0bc2..4f2933506505 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -512,7 +512,7 @@ +@@ -508,7 +508,7 @@ url.host() == chrome::kChromeUIMemoryRedirectHost || url.host() == chrome::kChromeUIStatsHost || url.host() == chrome::kChromeUITermsHost diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc index 44c4d8b96d65..e95e0b929f8b 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2014-10-10 08:54:11 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.cc -@@ -356,7 +356,8 @@ +@@ -344,7 +344,8 @@ { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, { "translateEnableTranslate", IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, @@ -10,7 +10,7 @@ { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, -@@ -685,7 +686,8 @@ +@@ -671,7 +672,8 @@ "requestProfilesInfo", base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Unretained(this))); @@ -20,7 +20,7 @@ web_ui()->RegisterMessageCallback( "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative, -@@ -1316,7 +1318,8 @@ +@@ -1310,7 +1312,8 @@ ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); bool is_system_theme = false; @@ -30,7 +30,7 @@ bool profile_is_supervised = profile->IsSupervised(); is_system_theme = theme_service->UsingSystemTheme(); base::FundamentalValue native_theme_enabled(!is_system_theme && -@@ -1338,7 +1341,8 @@ +@@ -1332,7 +1335,8 @@ ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); } diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h index 1f214f3f27cd..3776287a3ba4 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h +++ b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.h -@@ -197,7 +197,8 @@ +@@ -204,7 +204,8 @@ void ObserveThemeChanged(); void ThemesReset(const base::ListValue* args); diff --git a/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc b/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc index beae46131645..37d0636fd436 100644 --- a/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc +++ b/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/web_app.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/web_applications/web_app.cc.orig 2014-10-10 08:54:11 UTC +++ chrome/browser/web_applications/web_app.cc @@ -424,7 +424,7 @@ } diff --git a/www/chromium/files/patch-chrome__browser__web_applications__web_app.h b/www/chromium/files/patch-chrome__browser__web_applications__web_app.h index d210d1bad876..8285ed378ebb 100644 --- a/www/chromium/files/patch-chrome__browser__web_applications__web_app.h +++ b/www/chromium/files/patch-chrome__browser__web_applications__web_app.h @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/web_app.h.orig 2014-10-02 17:18:54 UTC +--- chrome/browser/web_applications/web_app.h.orig 2014-10-10 08:54:11 UTC +++ chrome/browser/web_applications/web_app.h @@ -208,7 +208,7 @@ void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons); diff --git a/www/chromium/files/patch-chrome__chrome_browser.gypi b/www/chromium/files/patch-chrome__chrome_browser.gypi index be68c9c83fa2..dd476ab4bd55 100644 --- a/www/chromium/files/patch-chrome__chrome_browser.gypi +++ b/www/chromium/files/patch-chrome__chrome_browser.gypi @@ -1,6 +1,6 @@ ---- chrome/chrome_browser.gypi.orig 2014-10-02 17:39:46 UTC +--- chrome/chrome_browser.gypi.orig 2014-10-10 09:15:30 UTC +++ chrome/chrome_browser.gypi -@@ -3173,7 +3173,7 @@ +@@ -3123,7 +3123,7 @@ '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', ], }], @@ -9,16 +9,16 @@ 'dependencies': [ '../build/linux/system.gyp:libspeechd', ], -@@ -3230,7 +3230,7 @@ +@@ -3180,7 +3180,7 @@ }], ], }], - ['os_posix == 1 and OS != "mac" and OS != "ios"', { + ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', { 'sources': [ - 'app/chrome_breakpad_client.cc', - 'app/chrome_breakpad_client.h', -@@ -3313,6 +3313,13 @@ + 'app/chrome_crash_reporter_client.cc', + 'app/chrome_crash_reporter_client.h', +@@ -3267,6 +3267,13 @@ }, { # Non-Android. 'sources': [ '<@(chrome_browser_non_android_sources)' ], }], @@ -28,11 +28,11 @@ + ['exclude', '^browser/chrome_browser_main_linux.h'], + ['exclude', '^browser/media_galleries/linux/'], + ], -+ }], ++ }], ['OS=="mac"', { 'dependencies': [ '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', -@@ -3389,7 +3396,7 @@ +@@ -3343,7 +3350,7 @@ }], ], }], diff --git a/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi b/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi index 4648e6b069d4..1a6999382372 100644 --- a/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi +++ b/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi @@ -1,6 +1,6 @@ ---- chrome/chrome_browser_extensions.gypi.orig 2014-10-02 17:39:46 UTC +--- chrome/chrome_browser_extensions.gypi.orig 2014-10-10 09:15:30 UTC +++ chrome/chrome_browser_extensions.gypi -@@ -1023,6 +1023,11 @@ +@@ -950,6 +950,11 @@ '<@(chrome_browser_extensions_enabled_sources)', ], 'conditions': [ diff --git a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi index 3ffd62526da4..8e0b4e1517fe 100644 --- a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi +++ b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi @@ -1,6 +1,6 @@ ---- chrome/chrome_browser_ui.gypi.orig 2014-10-02 17:39:46 UTC +--- chrome/chrome_browser_ui.gypi.orig 2014-10-10 09:15:30 UTC +++ chrome/chrome_browser_ui.gypi -@@ -2729,7 +2729,7 @@ +@@ -2743,7 +2743,7 @@ }], ], }], @@ -9,7 +9,7 @@ 'dependencies': [ # gtk2 is the only component that can interact with gtk2 in our new # world. -@@ -2737,7 +2737,7 @@ +@@ -2751,7 +2751,7 @@ '../build/linux/system.gyp:gio', ], }], @@ -18,7 +18,7 @@ 'sources': [ '<@(chrome_browser_ui_desktop_sources)' ], }], ['use_aura==1', { -@@ -2772,7 +2772,7 @@ +@@ -2788,7 +2788,7 @@ ['enable_printing==1', { 'sources': [ '<@(chrome_browser_ui_print_preview_sources)' ], }], @@ -27,12 +27,12 @@ 'sources': [ '<@(chrome_browser_ui_android_linux_sources)' ], }], ['OS=="android"', { -@@ -2891,7 +2891,7 @@ +@@ -2907,7 +2907,7 @@ ['desktop_linux==1', { 'sources': [ '<@(chrome_browser_ui_desktop_linux_sources)' ], }], - ['OS=="linux"', { # Both desktop Linux and ChromeOS. + ['OS=="linux" or OS=="freebsd"', { # Both desktop Linux and ChromeOS. 'sources': [ '<@(chrome_browser_ui_linux_sources)' ], - 'dependencies': [ - '../build/linux/system.gyp:udev', + 'conditions': [ + ['use_aura==1', { diff --git a/www/chromium/files/patch-chrome__chrome_tests_unit.gypi b/www/chromium/files/patch-chrome__chrome_tests_unit.gypi new file mode 100644 index 000000000000..1180ff3ec52e --- /dev/null +++ b/www/chromium/files/patch-chrome__chrome_tests_unit.gypi @@ -0,0 +1,15 @@ +--- chrome/chrome_tests_unit.gypi.orig 2014-10-23 01:54:54.000000000 +0200 ++++ chrome/chrome_tests_unit.gypi 2014-10-26 14:01:43.000000000 +0100 +@@ -1878,6 +1878,12 @@ + 'test/ppapi/ppapi_test.h', + ], + }], ++ ['OS=="freebsd"', { ++ 'sources!': [ ++ 'browser/media_galleries/linux/mtp_device_object_enumerator_unittest.cc', ++ 'browser/media_galleries/linux/mtp_device_object_enumerator.h', ++ ], ++ }], + ], + }, + { diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.cc b/www/chromium/files/patch-chrome__common__chrome_paths.cc index 0bee339291ac..bdb3d8e9f54a 100644 --- a/www/chromium/files/patch-chrome__common__chrome_paths.cc +++ b/www/chromium/files/patch-chrome__common__chrome_paths.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths.cc.orig 2014-10-02 21:05:31 UTC +--- chrome/common/chrome_paths.cc.orig 2014-10-10 08:54:11 UTC +++ chrome/common/chrome_paths.cc @@ -461,10 +461,12 @@ if (!base::PathExists(cur)) // We don't want to create this diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.h b/www/chromium/files/patch-chrome__common__chrome_paths.h index ad0a91583cb2..a6de87f6b7da 100644 --- a/www/chromium/files/patch-chrome__common__chrome_paths.h +++ b/www/chromium/files/patch-chrome__common__chrome_paths.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths.h.orig 2014-10-02 17:18:54 UTC +--- chrome/common/chrome_paths.h.orig 2014-10-10 08:54:11 UTC +++ chrome/common/chrome_paths.h @@ -112,7 +112,7 @@ DIR_SUPERVISED_USERS_DEFAULT_APPS, // Directory where installer places .crx diff --git a/www/chromium/files/patch-chrome__common__chrome_switches.cc b/www/chromium/files/patch-chrome__common__chrome_switches.cc index 78ba721ed90b..df15378d9584 100644 --- a/www/chromium/files/patch-chrome__common__chrome_switches.cc +++ b/www/chromium/files/patch-chrome__common__chrome_switches.cc @@ -1,17 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2014-10-02 19:39:46.000000000 +0200 -+++ chrome/common/chrome_switches.cc 2014-10-15 11:59:52.000000000 +0200 -@@ -1127,6 +1127,10 @@ - // "tls1.2"). - const char kSSLVersionMin[] = "ssl-version-min"; - -+// Specifies the minimum SSL/TLS version ("ssl3", "tls1", "tls1.1", or -+// "tls1.2") that TLS fallback will accept. -+const char kSSLVersionFallbackMin[] = "ssl-version-fallback-min"; -+ - // Starts the browser maximized, regardless of any previous settings. - const char kStartMaximized[] = "start-maximized"; - -@@ -1277,13 +1281,13 @@ +--- chrome/common/chrome_switches.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/common/chrome_switches.cc +@@ -1275,13 +1275,13 @@ const char kPasswordStore[] = "password-store"; #endif diff --git a/www/chromium/files/patch-chrome__common__chrome_switches.h b/www/chromium/files/patch-chrome__common__chrome_switches.h index e92c2a4add89..c2b2942d9138 100644 --- a/www/chromium/files/patch-chrome__common__chrome_switches.h +++ b/www/chromium/files/patch-chrome__common__chrome_switches.h @@ -1,14 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2014-10-02 19:39:46.000000000 +0200 -+++ chrome/common/chrome_switches.h 2014-10-15 11:59:52.000000000 +0200 -@@ -309,6 +309,7 @@ - extern const char kSpellingServiceFeedbackIntervalSeconds[]; - extern const char kSSLVersionMax[]; - extern const char kSSLVersionMin[]; -+extern const char kSSLVersionFallbackMin[]; - extern const char kStartMaximized[]; - extern const char kSupervisedUserId[]; - extern const char kSupervisedUserSyncToken[]; -@@ -362,7 +363,7 @@ +--- chrome/common/chrome_switches.h.orig 2014-10-10 09:15:30 UTC ++++ chrome/common/chrome_switches.h +@@ -362,7 +362,7 @@ extern const char kPasswordStore[]; #endif diff --git a/www/chromium/files/patch-chrome__common__localized_error.cc b/www/chromium/files/patch-chrome__common__localized_error.cc deleted file mode 100644 index 23986cfbf534..000000000000 --- a/www/chromium/files/patch-chrome__common__localized_error.cc +++ /dev/null @@ -1,35 +0,0 @@ ---- chrome/common/localized_error.cc.orig 2014-10-02 17:39:46 UTC -+++ chrome/common/localized_error.cc -@@ -40,6 +40,8 @@ - static const char kWeakDHKeyLearnMoreUrl[] = - "http://sites.google.com/a/chromium.org/dev/" - "err_ssl_weak_server_ephemeral_dh_key"; -+static const char kSSLv3FallbackUrl[] = -+ "https://code.google.com/p/chromium/issues/detail?id=418848"; - #if defined(OS_CHROMEOS) - static const char kAppWarningLearnMoreUrl[] = - "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html" -@@ -301,6 +303,13 @@ - IDS_ERRORPAGES_DETAILS_BLOCKED_ENROLLMENT_CHECK_PENDING, - SUGGEST_CHECK_CONNECTION, - }, -+ {net::ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, -+ IDS_ERRORPAGES_TITLE_LOAD_FAILED, -+ IDS_ERRORPAGES_HEADING_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, -+ IDS_ERRORPAGES_SUMMARY_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, -+ IDS_ERRORPAGES_DETAILS_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, -+ SUGGEST_LEARNMORE, -+ }, - }; - - // Special error page to be used in the case of navigating back to a page -@@ -796,6 +805,9 @@ - case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY: - learn_more_url = GURL(kWeakDHKeyLearnMoreUrl); - break; -+ case net::ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION: -+ learn_more_url = GURL(kSSLv3FallbackUrl); -+ break; - default: - break; - } diff --git a/www/chromium/files/patch-chrome__common__pref_names.cc b/www/chromium/files/patch-chrome__common__pref_names.cc index e08e896099e0..23b6abf75f24 100644 --- a/www/chromium/files/patch-chrome__common__pref_names.cc +++ b/www/chromium/files/patch-chrome__common__pref_names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2014-10-02 19:39:46.000000000 +0200 -+++ chrome/common/pref_names.cc 2014-10-15 11:59:52.000000000 +0200 -@@ -898,7 +898,7 @@ +--- chrome/common/pref_names.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/common/pref_names.cc +@@ -891,7 +891,7 @@ // Boolean controlling whether SafeSearch is mandatory for Google Web Searches. const char kForceSafeSearch[] = "settings.force_safesearch"; @@ -9,11 +9,3 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1288,6 +1288,7 @@ - "ssl.rev_checking.required_for_local_anchors"; - const char kSSLVersionMin[] = "ssl.version_min"; - const char kSSLVersionMax[] = "ssl.version_max"; -+const char kSSLVersionFallbackMin[] = "ssl.version_fallback_min"; - const char kCipherSuiteBlacklist[] = "ssl.cipher_suites.blacklist"; - const char kDisableSSLRecordSplitting[] = "ssl.ssl_record_splitting.disabled"; - diff --git a/www/chromium/files/patch-chrome__common__pref_names.h b/www/chromium/files/patch-chrome__common__pref_names.h index bea49931893e..4fd4ed04cd9a 100644 --- a/www/chromium/files/patch-chrome__common__pref_names.h +++ b/www/chromium/files/patch-chrome__common__pref_names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2014-10-02 19:39:46.000000000 +0200 -+++ chrome/common/pref_names.h 2014-10-15 11:59:52.000000000 +0200 -@@ -291,7 +291,7 @@ +--- chrome/common/pref_names.h.orig 2014-10-10 09:15:30 UTC ++++ chrome/common/pref_names.h +@@ -289,7 +289,7 @@ extern const char kForceSafeSearch[]; extern const char kDeleteTimePeriod[]; extern const char kLastClearBrowsingDataTime[]; @@ -9,11 +9,3 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -405,6 +405,7 @@ - extern const char kCertRevocationCheckingRequiredLocalAnchors[]; - extern const char kSSLVersionMin[]; - extern const char kSSLVersionMax[]; -+extern const char kSSLVersionFallbackMin[]; - extern const char kCipherSuiteBlacklist[]; - extern const char kDisableSSLRecordSplitting[]; - diff --git a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc index f7c535818519..38c9bd989cec 100644 --- a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc +++ b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc @@ -1,4 +1,4 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2014-10-02 17:18:55 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2014-10-10 08:54:12 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.cc @@ -13,7 +13,7 @@ #include "ppapi/proxy/ppapi_messages.h" diff --git a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h index 24713b52e929..0b9c4183069b 100644 --- a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h +++ b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h @@ -1,4 +1,4 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2014-10-02 17:18:55 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2014-10-10 09:15:30 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.h @@ -10,7 +10,7 @@ #include "ppapi/c/private/pp_private_font_charset.h" diff --git a/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h b/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h index 51b2ed3e6b6d..afbb6db80d0e 100644 --- a/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h +++ b/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h @@ -1,11 +1,11 @@ ---- chrome/renderer/printing/print_web_view_helper.h.orig 2014-10-02 17:39:46 UTC +--- chrome/renderer/printing/print_web_view_helper.h.orig 2014-10-10 09:15:30 UTC +++ chrome/renderer/printing/print_web_view_helper.h -@@ -207,7 +207,7 @@ +@@ -211,7 +211,7 @@ void FinishFramePrinting(); // Prints the page listed in |params|. -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) void PrintPageInternal(const PrintMsg_PrintPage_Params& params, - const gfx::Size& canvas_size, blink::WebFrame* frame, + PdfMetafileSkia* metafile); diff --git a/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc b/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc index 4da37543501f..d49605347905 100644 --- a/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc +++ b/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc @@ -1,4 +1,4 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/test/base/in_process_browser_test.cc @@ -76,6 +76,10 @@ diff --git a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h index 20cddfa9da39..1a6fb164c5dd 100644 --- a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h +++ b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h @@ -1,4 +1,4 @@ ---- chrome/test/base/testing_browser_process.h.orig 2014-10-02 17:39:46 UTC +--- chrome/test/base/testing_browser_process.h.orig 2014-10-10 09:15:30 UTC +++ chrome/test/base/testing_browser_process.h @@ -105,8 +105,8 @@ virtual DownloadStatusUpdater* download_status_updater() OVERRIDE; diff --git a/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc b/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc index 01d7eba12a1e..345052cbc985 100644 --- a/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc +++ b/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc @@ -1,4 +1,4 @@ ---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2014-10-10 08:54:12 UTC +++ chrome/test/chromedriver/chrome/chrome_finder.cc @@ -42,7 +42,7 @@ installation_locations[i].Append(L"Chromium\\Application")); diff --git a/www/chromium/files/patch-chrome__test__perf__perf_test.cc b/www/chromium/files/patch-chrome__test__perf__perf_test.cc index f8a229564a07..3b5be8c2e926 100644 --- a/www/chromium/files/patch-chrome__test__perf__perf_test.cc +++ b/www/chromium/files/patch-chrome__test__perf__perf_test.cc @@ -1,4 +1,4 @@ ---- chrome/test/perf/perf_test.cc.orig 2014-10-02 17:18:56 UTC +--- chrome/test/perf/perf_test.cc.orig 2014-10-10 08:54:13 UTC +++ chrome/test/perf/perf_test.cc @@ -352,7 +352,7 @@ AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name, diff --git a/www/chromium/files/patch-chrome__tools__build__linux__sed.sh b/www/chromium/files/patch-chrome__tools__build__linux__sed.sh index b858f4518dea..acc1a0f3df25 100644 --- a/www/chromium/files/patch-chrome__tools__build__linux__sed.sh +++ b/www/chromium/files/patch-chrome__tools__build__linux__sed.sh @@ -1,4 +1,4 @@ ---- chrome/tools/build/linux/sed.sh.orig 2014-10-02 17:18:56 UTC +--- chrome/tools/build/linux/sed.sh.orig 2014-10-10 08:54:13 UTC +++ chrome/tools/build/linux/sed.sh @@ -1,4 +1,4 @@ -#!/bin/sh diff --git a/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc b/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc index 561b83baf22c..b1e20a520a45 100644 --- a/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc +++ b/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc @@ -1,4 +1,4 @@ ---- components/omaha_query_params/omaha_query_params.cc.orig 2014-10-02 17:18:56 UTC +--- components/omaha_query_params/omaha_query_params.cc.orig 2014-10-10 08:54:14 UTC +++ components/omaha_query_params/omaha_query_params.cc @@ -31,6 +31,8 @@ "linux"; diff --git a/www/chromium/files/patch-components__policy__resources__policy_templates.json b/www/chromium/files/patch-components__policy__resources__policy_templates.json index 994827b5ed2f..20ea5c052ac0 100644 --- a/www/chromium/files/patch-components__policy__resources__policy_templates.json +++ b/www/chromium/files/patch-components__policy__resources__policy_templates.json @@ -1,6 +1,6 @@ ---- components/policy/resources/policy_templates.json.orig 2014-10-02 17:39:46 UTC +--- components/policy/resources/policy_templates.json.orig 2014-10-10 09:15:31 UTC +++ components/policy/resources/policy_templates.json -@@ -1556,7 +1556,7 @@ +@@ -1563,7 +1563,7 @@ 'name': 'GSSAPILibraryName', 'type': 'string', 'schema': { 'type': 'string' }, @@ -9,7 +9,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -3741,7 +3741,7 @@ +@@ -3771,7 +3771,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -4420,7 +4420,7 @@ +@@ -4450,7 +4450,7 @@ 'name': 'BackgroundModeEnabled', 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components__policy__tools__generate_policy_source.py b/www/chromium/files/patch-components__policy__tools__generate_policy_source.py index 64c05a8d4125..6f46c29e8280 100644 --- a/www/chromium/files/patch-components__policy__tools__generate_policy_source.py +++ b/www/chromium/files/patch-components__policy__tools__generate_policy_source.py @@ -1,6 +1,6 @@ ---- components/policy/tools/generate_policy_source.py.orig 2014-10-02 17:39:46 UTC +--- components/policy/tools/generate_policy_source.py.orig 2014-10-10 08:54:14 UTC +++ components/policy/tools/generate_policy_source.py -@@ -67,7 +67,7 @@ +@@ -73,7 +73,7 @@ if platform.startswith('chrome.'): platform_sub = platform[7:] if platform_sub == '*': diff --git a/www/chromium/files/patch-components__storage_monitor.gypi b/www/chromium/files/patch-components__storage_monitor.gypi index ac1a8a172c82..b98c8a76086d 100644 --- a/www/chromium/files/patch-components__storage_monitor.gypi +++ b/www/chromium/files/patch-components__storage_monitor.gypi @@ -1,4 +1,4 @@ ---- components/storage_monitor.gypi.orig 2014-10-02 17:18:56 UTC +--- components/storage_monitor.gypi.orig 2014-10-10 08:54:14 UTC +++ components/storage_monitor.gypi @@ -50,6 +50,26 @@ 'storage_monitor/volume_mount_watcher_win.h', diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc b/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc index 44c2df7d9a0d..514f70e416e3 100644 --- a/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc +++ b/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc @@ -1,4 +1,4 @@ ---- components/storage_monitor/storage_monitor.cc.orig 2014-10-02 17:18:56 UTC +--- components/storage_monitor/storage_monitor.cc.orig 2014-10-10 09:15:31 UTC +++ components/storage_monitor/storage_monitor.cc @@ -85,6 +85,7 @@ diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc index b8dd670771cd..484a4345d1c6 100644 --- a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc +++ b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc @@ -1,4 +1,4 @@ ---- components/storage_monitor/storage_monitor_freebsd.cc.orig 2014-10-02 21:05:41 UTC +--- components/storage_monitor/storage_monitor_freebsd.cc.orig 2014-10-13 17:11:08 UTC +++ components/storage_monitor/storage_monitor_freebsd.cc @@ -0,0 +1,102 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h index 0aa340da58ff..9fccb9bb7518 100644 --- a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h +++ b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h @@ -1,4 +1,4 @@ ---- components/storage_monitor/storage_monitor_freebsd.h.orig 2014-10-02 21:05:41 UTC +--- components/storage_monitor/storage_monitor_freebsd.h.orig 2014-10-13 17:11:08 UTC +++ components/storage_monitor/storage_monitor_freebsd.h @@ -0,0 +1,47 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-components__usb_service.gypi b/www/chromium/files/patch-components__usb_service.gypi deleted file mode 100644 index f6a3e865f7fd..000000000000 --- a/www/chromium/files/patch-components__usb_service.gypi +++ /dev/null @@ -1,14 +0,0 @@ ---- components/usb_service.gypi.orig 2014-10-02 17:39:47 UTC -+++ components/usb_service.gypi -@@ -46,6 +46,11 @@ - '../build/linux/system.gyp:udev', - ], - }], -+ ['OS == "freebsd"', { -+ 'dependencies!': [ -+ '../third_party/libusb/libusb.gyp:libusb', -+ ], -+ }], - ['chromeos==1', { - 'dependencies': [ - '../chromeos/chromeos.gyp:chromeos', diff --git a/www/chromium/files/patch-components__usb_service__usb_context.cc b/www/chromium/files/patch-components__usb_service__usb_context.cc deleted file mode 100644 index 90880d0de839..000000000000 --- a/www/chromium/files/patch-components__usb_service__usb_context.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- components/usb_service/usb_context.cc.orig 2014-10-02 17:39:47 UTC -+++ components/usb_service/usb_context.cc -@@ -8,8 +8,13 @@ - #include "base/synchronization/waitable_event.h" - #include "base/threading/platform_thread.h" - #include "components/usb_service/usb_error.h" -+#if defined(OS_FREEBSD) -+#include "libusb.h" -+#define LIBUSB_CALL -+#else - #include "third_party/libusb/src/libusb/interrupt.h" - #include "third_party/libusb/src/libusb/libusb.h" -+#endif - - namespace usb_service { - -@@ -46,7 +51,9 @@ - running_ = false; - // Spreading running_ to the UsbEventHandler thread. - base::subtle::MemoryBarrier(); -+#if !defined(OS_FREEBSD) // XXX(rene) only available in bundled version - libusb_interrupt_handle_event(context_); -+#endif - base::PlatformThread::Join(thread_handle_); - } - diff --git a/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc b/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc deleted file mode 100644 index 397c5feb4eb7..000000000000 --- a/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- components/usb_service/usb_context_unittest.cc.orig 2014-10-02 17:39:47 UTC -+++ components/usb_service/usb_context_unittest.cc -@@ -6,7 +6,11 @@ - #include "build/build_config.h" - #include "components/usb_service/usb_context.h" - #include "testing/gtest/include/gtest/gtest.h" -+#if defined(OS_FREEBSD) -+#include "libusb.h" -+#else - #include "third_party/libusb/src/libusb/libusb.h" -+#endif - - using usb_service::UsbContext; - using usb_service::PlatformUsbContext; diff --git a/www/chromium/files/patch-components__usb_service__usb_device_impl.cc b/www/chromium/files/patch-components__usb_service__usb_device_impl.cc deleted file mode 100644 index 126355ef8858..000000000000 --- a/www/chromium/files/patch-components__usb_service__usb_device_impl.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- components/usb_service/usb_device_impl.cc.orig 2014-10-02 17:39:47 UTC -+++ components/usb_service/usb_device_impl.cc -@@ -12,7 +12,11 @@ - #include "components/usb_service/usb_error.h" - #include "components/usb_service/usb_interface_impl.h" - #include "content/public/browser/browser_thread.h" -+#if defined(OS_FREEBSD) -+#include "libusb.h" -+#else - #include "third_party/libusb/src/libusb/libusb.h" -+#endif - - #if defined(OS_CHROMEOS) - #include "base/sys_info.h" diff --git a/www/chromium/files/patch-components__usb_service__usb_error.cc b/www/chromium/files/patch-components__usb_service__usb_error.cc deleted file mode 100644 index 945d581a4eba..000000000000 --- a/www/chromium/files/patch-components__usb_service__usb_error.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- components/usb_service/usb_error.cc.orig 2014-10-02 17:39:47 UTC -+++ components/usb_service/usb_error.cc -@@ -4,7 +4,11 @@ - - #include "components/usb_service/usb_error.h" - -+#if defined(__FreeBSD__) -+#include "libusb.h" -+#else - #include "third_party/libusb/src/libusb/libusb.h" -+#endif - - namespace usb_service { - diff --git a/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc b/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc deleted file mode 100644 index 338755b16921..000000000000 --- a/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- components/usb_service/usb_interface_impl.cc.orig 2014-10-02 17:39:47 UTC -+++ components/usb_service/usb_interface_impl.cc -@@ -5,7 +5,11 @@ - #include "components/usb_service/usb_interface_impl.h" - - #include "base/logging.h" -+#if defined(OS_FREEBSD) -+#include "libusb.h" -+#else - #include "third_party/libusb/src/libusb/libusb.h" -+#endif - - namespace usb_service { - diff --git a/www/chromium/files/patch-components__usb_service__usb_service_impl.cc b/www/chromium/files/patch-components__usb_service__usb_service_impl.cc deleted file mode 100644 index 308b46d43934..000000000000 --- a/www/chromium/files/patch-components__usb_service__usb_service_impl.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- components/usb_service/usb_service_impl.cc.orig 2014-10-02 17:39:47 UTC -+++ components/usb_service/usb_service_impl.cc -@@ -14,7 +14,11 @@ - #include "components/usb_service/usb_device_impl.h" - #include "components/usb_service/usb_error.h" - #include "content/public/browser/browser_thread.h" -+#if defined(OS_FREEBSD) -+#include "libusb.h" -+#else - #include "third_party/libusb/src/libusb/libusb.h" -+#endif - - namespace usb_service { - diff --git a/www/chromium/files/patch-content__app__content_main_runner.cc b/www/chromium/files/patch-content__app__content_main_runner.cc index 45767cd79292..02d7bc21c50b 100644 --- a/www/chromium/files/patch-content__app__content_main_runner.cc +++ b/www/chromium/files/patch-content__app__content_main_runner.cc @@ -1,4 +1,4 @@ ---- content/app/content_main_runner.cc.orig 2014-10-02 17:39:47 UTC +--- content/app/content_main_runner.cc.orig 2014-10-10 09:15:31 UTC +++ content/app/content_main_runner.cc @@ -95,10 +95,10 @@ #include "base/posix/global_descriptors.h" @@ -13,7 +13,7 @@ #include "content/zygote/zygote_main.h" #endif -@@ -286,7 +286,8 @@ +@@ -291,7 +291,8 @@ int (*function)(const MainFunctionParams&); }; @@ -23,7 +23,7 @@ // On platforms that use the zygote, we have a special subset of // subprocesses that are launched via the zygote. This function // fills in some process-launching bits around ZygoteMain(). -@@ -416,7 +417,8 @@ +@@ -421,7 +422,8 @@ } } diff --git a/www/chromium/files/patch-content__browser__browser_main_loop.cc b/www/chromium/files/patch-content__browser__browser_main_loop.cc index 28d7c7f4dad7..e163b79bf61c 100644 --- a/www/chromium/files/patch-content__browser__browser_main_loop.cc +++ b/www/chromium/files/patch-content__browser__browser_main_loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2014-10-02 17:39:47 UTC +--- content/browser/browser_main_loop.cc.orig 2014-10-10 09:15:31 UTC +++ content/browser/browser_main_loop.cc -@@ -134,7 +134,7 @@ +@@ -135,7 +135,7 @@ namespace content { namespace { @@ -9,7 +9,7 @@ void SetupSandbox(const base::CommandLine& parsed_command_line) { TRACE_EVENT0("startup", "SetupSandbox"); base::FilePath sandbox_binary; -@@ -376,7 +376,7 @@ +@@ -377,7 +377,7 @@ void BrowserMainLoop::EarlyInitialization() { TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); @@ -18,7 +18,7 @@ // No thread should be created before this call, as SetupSandbox() // will end-up using fork(). SetupSandbox(parsed_command_line_); -@@ -809,9 +809,9 @@ +@@ -808,9 +808,9 @@ } #endif 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 ba777d813dc1..feeffe620981 100644 --- a/www/chromium/files/patch-content__browser__child_process_launcher.cc +++ b/www/chromium/files/patch-content__browser__child_process_launcher.cc @@ -1,4 +1,4 @@ ---- content/browser/child_process_launcher.cc.orig 2014-10-02 17:39:47 UTC +--- content/browser/child_process_launcher.cc.orig 2014-10-10 09:15:31 UTC +++ content/browser/child_process_launcher.cc @@ -68,7 +68,7 @@ #else diff --git a/www/chromium/files/patch-content__browser__download__base_file.cc b/www/chromium/files/patch-content__browser__download__base_file.cc index 88fa15f2ab1b..f2453fd16fde 100644 --- a/www/chromium/files/patch-content__browser__download__base_file.cc +++ b/www/chromium/files/patch-content__browser__download__base_file.cc @@ -1,6 +1,6 @@ ---- content/browser/download/base_file.cc.orig 2014-10-02 17:39:47 UTC +--- content/browser/download/base_file.cc.orig 2014-10-10 08:54:14 UTC +++ content/browser/download/base_file.cc -@@ -205,7 +205,8 @@ +@@ -208,7 +208,8 @@ } // OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations. diff --git a/www/chromium/files/patch-content__browser__download__base_file_linux.cc b/www/chromium/files/patch-content__browser__download__base_file_linux.cc index 5254f3828aed..7d420406c713 100644 --- a/www/chromium/files/patch-content__browser__download__base_file_linux.cc +++ b/www/chromium/files/patch-content__browser__download__base_file_linux.cc @@ -1,4 +1,4 @@ ---- content/browser/download/base_file_linux.cc.orig 2014-10-02 17:18:57 UTC +--- content/browser/download/base_file_linux.cc.orig 2014-10-10 08:54:14 UTC +++ content/browser/download/base_file_linux.cc @@ -13,7 +13,9 @@ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); diff --git a/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc b/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc index 079510d7c53f..523040433216 100644 --- a/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc +++ b/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc @@ -1,4 +1,4 @@ ---- content/browser/geolocation/location_arbitrator_impl.cc.orig 2014-10-02 17:18:57 UTC +--- content/browser/geolocation/location_arbitrator_impl.cc.orig 2014-10-10 08:54:14 UTC +++ content/browser/geolocation/location_arbitrator_impl.cc @@ -159,7 +159,7 @@ } diff --git a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc index 76193c247cf2..6af3455d0b58 100644 --- a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc +++ b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc @@ -1,6 +1,6 @@ ---- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2014-10-02 21:05:41 UTC +--- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2014-10-13 17:11:09 UTC +++ content/browser/geolocation/wifi_data_provider_freebsd.cc -@@ -0,0 +1,200 @@ +@@ -0,0 +1,201 @@ +// 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. @@ -25,6 +25,7 @@ + +#include "base/strings/utf_string_conversions.h" +#include "content/browser/geolocation/wifi_data_provider_common.h" ++#include "content/browser/geolocation/wifi_data_provider_manager.h" + +namespace content { +namespace { @@ -49,10 +50,10 @@ +} + +// Provides the wifi API binding for FreeBSD. -+class FreeBSDAccessPointData : public WifiDataProviderCommon::WlanApiInterface { ++class AccessPointDataFreeBSD : public WifiDataProviderCommon::WlanApiInterface { +public: -+ FreeBSDAccessPointData(); -+ ~FreeBSDAccessPointData(); ++ AccessPointDataFreeBSD(); ++ ~AccessPointDataFreeBSD(); + + // this does nothing + bool Init(); @@ -61,20 +62,20 @@ + virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data); + +private: -+ DISALLOW_COPY_AND_ASSIGN(FreeBSDAccessPointData); ++ DISALLOW_COPY_AND_ASSIGN(AccessPointDataFreeBSD); +}; + -+FreeBSDAccessPointData::FreeBSDAccessPointData() { ++AccessPointDataFreeBSD::AccessPointDataFreeBSD() { +} + -+FreeBSDAccessPointData::~FreeBSDAccessPointData() { ++AccessPointDataFreeBSD::~AccessPointDataFreeBSD() { +} + -+bool FreeBSDAccessPointData::Init() { ++bool AccessPointDataFreeBSD::Init() { + return true; +} + -+bool FreeBSDAccessPointData::GetAccessPointData(WifiData::AccessPointDataSet* data) { ++bool AccessPointDataFreeBSD::GetAccessPointData(WifiData::AccessPointDataSet* data) { + bool res; + char *dupn; + struct ifaddrs *ifal, *ifa; @@ -174,26 +175,26 @@ +} // namespace + +// static -+WifiDataProviderImplBase* WifiDataProvider::DefaultFactoryFunction() { -+ return new FreeBSDWifiDataProvider(); ++WifiDataProvider* WifiDataProviderManager::DefaultFactoryFunction() { ++ return new WifiDataProviderFreeBSD(); +} + -+FreeBSDWifiDataProvider::FreeBSDWifiDataProvider() { ++WifiDataProviderFreeBSD::WifiDataProviderFreeBSD() { +} + -+FreeBSDWifiDataProvider::~FreeBSDWifiDataProvider() { ++WifiDataProviderFreeBSD::~WifiDataProviderFreeBSD() { +} + -+WifiDataProviderCommon::WlanApiInterface* FreeBSDWifiDataProvider::NewWlanApi() { ++WifiDataProviderCommon::WlanApiInterface* WifiDataProviderFreeBSD::NewWlanApi() { + -+ scoped_ptr<FreeBSDAccessPointData> wlan_api(new FreeBSDAccessPointData); ++ scoped_ptr<AccessPointDataFreeBSD> wlan_api(new AccessPointDataFreeBSD); + if (wlan_api->Init()) + return wlan_api.release(); + + return NULL; +} + -+WifiPollingPolicy* FreeBSDWifiDataProvider::NewPollingPolicy() { ++WifiPollingPolicy* WifiDataProviderFreeBSD::NewPollingPolicy() { + return new GenericWifiPollingPolicy<kDefaultPollingInterval, + kNoChangePollingInterval, + kTwoNoChangePollingInterval, diff --git a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h index 391b6301204b..232b1607615a 100644 --- a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h +++ b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h @@ -1,6 +1,6 @@ ---- content/browser/geolocation/wifi_data_provider_freebsd.h.orig 2014-10-02 21:05:41 UTC +--- content/browser/geolocation/wifi_data_provider_freebsd.h.orig 2014-10-13 17:11:09 UTC +++ content/browser/geolocation/wifi_data_provider_freebsd.h -@@ -0,0 +1,31 @@ +@@ -0,0 +1,30 @@ +// Copyright (c) 2012 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. @@ -14,21 +14,20 @@ + +namespace content { + -+// Implementation of the wifi data provider for FreeBSD. -+class CONTENT_EXPORT FreeBSDWifiDataProvider : public WifiDataProviderCommon { -+public: -+ FreeBSDWifiDataProvider(); ++class CONTENT_EXPORT WifiDataProviderFreeBSD : public WifiDataProviderCommon { ++ public: ++ WifiDataProviderFreeBSD(); + -+private: -+ virtual ~FreeBSDWifiDataProvider(); ++ private: ++ virtual ~WifiDataProviderFreeBSD(); + -+ // WifiDataProviderCommon -+ virtual WlanApiInterface* NewWlanApi() OVERRIDE; -+ virtual WifiPollingPolicy* NewPollingPolicy() OVERRIDE; ++ // WifiDataProviderCommon ++ virtual WlanApiInterface* NewWlanApi() OVERRIDE; ++ virtual WifiPollingPolicy* NewPollingPolicy() OVERRIDE; + -+ DISALLOW_COPY_AND_ASSIGN(FreeBSDWifiDataProvider); ++ DISALLOW_COPY_AND_ASSIGN(WifiDataProviderFreeBSD); +}; + -+} // namespace content ++} // namespace content + +#endif // CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_ diff --git a/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc b/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc index b08a8e6dd3c9..a032c6ab1e27 100644 --- a/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc +++ b/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc @@ -1,38 +1,35 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2014-10-02 17:39:47 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2014-10-10 08:54:14 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -454,7 +454,9 @@ +@@ -471,7 +471,9 @@ gpu_info.gl_renderer = gl_renderer; gpu_info.gl_version = gl_version; -+#if !defined(OS_FREEBSD) //XXX(rene) hack ++#if !defined(OS_FREEBSD) gpu::CollectDriverInfoGL(&gpu_info); +#endif UpdateGpuInfo(gpu_info); UpdateGpuSwitchingManager(gpu_info); -@@ -497,10 +499,13 @@ +@@ -514,10 +516,12 @@ // Also declare the driver_vendor to be osmesa to be able to specify // exceptions based on driver_vendor==osmesa for some blacklist rules. gpu_info.driver_vendor = gfx::kGLImplementationOSMesaName; +#ifndef __FreeBSD__ } else { -+ //XXX(rene) hack TRACE_EVENT0("startup", "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo"); gpu::CollectBasicGraphicsInfo(&gpu_info); +#endif } #if defined(ARCH_CPU_X86_FAMILY) - if (!gpu_info.gpu.vendor_id || !gpu_info.gpu.device_id) -@@ -547,8 +552,10 @@ - // No further update of gpu_info if falling back to SwiftShader. - if (use_swiftshader_) + if (!gpu_info.gpu.vendor_id || !gpu_info.gpu.device_id) { +@@ -569,7 +573,9 @@ + if (use_swiftshader_ || ShouldUseWarp()) return; -- + +#ifndef __FreeBSD__ -+ // XXX(rene) hack gpu::MergeGPUInfo(&gpu_info_, gpu_info); +#endif - complete_gpu_info_already_requested_ = - complete_gpu_info_already_requested_ || gpu_info_.finalized; + if (IsCompleteGpuInfoAvailable()) + complete_gpu_info_already_requested_ = true; diff --git a/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc b/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc index d98eefd41bac..ef5c05adf8f9 100644 --- a/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc +++ b/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc @@ -1,6 +1,6 @@ ---- content/browser/indexed_db/indexed_db_backing_store.cc.orig 2014-10-02 17:39:47 UTC +--- content/browser/indexed_db/indexed_db_backing_store.cc.orig 2014-10-10 09:15:31 UTC +++ content/browser/indexed_db/indexed_db_backing_store.cc -@@ -2375,7 +2375,7 @@ +@@ -2377,7 +2377,7 @@ // The round-trip can be lossy; round to nearest millisecond. int64 delta = (descriptor.last_modified() - info.last_modified).InMilliseconds(); diff --git a/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc b/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc index 6217b780ed50..b6ef72b5f29c 100644 --- a/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc +++ b/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc @@ -1,6 +1,6 @@ ---- content/browser/tracing/tracing_ui.cc.orig 2014-10-02 17:39:47 UTC +--- content/browser/tracing/tracing_ui.cc.orig 2014-10-10 08:54:14 UTC +++ content/browser/tracing/tracing_ui.cc -@@ -358,6 +358,8 @@ +@@ -330,6 +330,8 @@ const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; diff --git a/www/chromium/files/patch-content__common__set_process_title_linux.cc b/www/chromium/files/patch-content__common__set_process_title_linux.cc index 1bdea03206e8..b8b766cbb9e8 100644 --- a/www/chromium/files/patch-content__common__set_process_title_linux.cc +++ b/www/chromium/files/patch-content__common__set_process_title_linux.cc @@ -1,4 +1,4 @@ ---- content/common/set_process_title_linux.cc.orig 2014-10-02 17:18:57 UTC +--- content/common/set_process_title_linux.cc.orig 2014-10-10 08:54:14 UTC +++ content/common/set_process_title_linux.cc @@ -48,6 +48,8 @@ extern char** environ; diff --git a/www/chromium/files/patch-content__common__set_process_title_linux.h b/www/chromium/files/patch-content__common__set_process_title_linux.h index 520f31e666f2..1d4c3b93a870 100644 --- a/www/chromium/files/patch-content__common__set_process_title_linux.h +++ b/www/chromium/files/patch-content__common__set_process_title_linux.h @@ -1,4 +1,4 @@ ---- content/common/set_process_title_linux.h.orig 2014-10-02 17:18:57 UTC +--- content/common/set_process_title_linux.h.orig 2014-10-10 08:54:14 UTC +++ content/common/set_process_title_linux.h @@ -5,6 +5,9 @@ #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_ diff --git a/www/chromium/files/patch-content__content_browser.gypi b/www/chromium/files/patch-content__content_browser.gypi index 10afa9e794b8..5053c2ee8232 100644 --- a/www/chromium/files/patch-content__content_browser.gypi +++ b/www/chromium/files/patch-content__content_browser.gypi @@ -1,6 +1,6 @@ ---- content/content_browser.gypi.orig 2014-10-02 17:39:47 UTC +--- content/content_browser.gypi.orig 2014-10-10 09:15:31 UTC +++ content/content_browser.gypi -@@ -679,6 +679,8 @@ +@@ -687,6 +687,8 @@ 'browser/geolocation/wifi_data_provider_common_win.cc', 'browser/geolocation/wifi_data_provider_common_win.h', 'browser/geolocation/wifi_data_provider_corewlan_mac.mm', @@ -9,7 +9,7 @@ 'browser/geolocation/wifi_data_provider_linux.cc', 'browser/geolocation/wifi_data_provider_linux.h', 'browser/geolocation/wifi_data_provider_mac.cc', -@@ -1806,8 +1808,18 @@ +@@ -1818,8 +1820,18 @@ ], }], ['os_bsd==1', { @@ -30,7 +30,7 @@ ], }], ['use_aura==1', { -@@ -1855,7 +1867,7 @@ +@@ -1867,7 +1879,7 @@ 'browser/geolocation/empty_wifi_data_provider.cc', ], }], diff --git a/www/chromium/files/patch-content__content_common.gypi b/www/chromium/files/patch-content__content_common.gypi index 56ff958cb22f..5551554149a7 100644 --- a/www/chromium/files/patch-content__content_common.gypi +++ b/www/chromium/files/patch-content__content_common.gypi @@ -1,6 +1,6 @@ ---- content/content_common.gypi.orig 2014-10-02 17:39:47 UTC +--- content/content_common.gypi.orig 2014-10-10 09:15:31 UTC +++ content/content_common.gypi -@@ -668,6 +668,21 @@ +@@ -671,6 +671,21 @@ 'content.gyp:common_aidl', ], }], diff --git a/www/chromium/files/patch-content__content_tests.gypi b/www/chromium/files/patch-content__content_tests.gypi index 5c50ebd7f5f1..4a8df67d4aba 100644 --- a/www/chromium/files/patch-content__content_tests.gypi +++ b/www/chromium/files/patch-content__content_tests.gypi @@ -1,6 +1,6 @@ ---- content/content_tests.gypi.orig 2014-10-02 17:39:47 UTC +--- content/content_tests.gypi.orig 2014-10-10 09:15:31 UTC +++ content/content_tests.gypi -@@ -916,6 +916,15 @@ +@@ -923,6 +923,15 @@ 'browser/geolocation/wifi_data_provider_linux_unittest.cc', ], }], diff --git a/www/chromium/files/patch-content__gpu__gpu_child_thread.cc b/www/chromium/files/patch-content__gpu__gpu_child_thread.cc index 8b5f838aca93..4af16809ede5 100644 --- a/www/chromium/files/patch-content__gpu__gpu_child_thread.cc +++ b/www/chromium/files/patch-content__gpu__gpu_child_thread.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_child_thread.cc.orig 2014-10-02 17:39:47 UTC +--- content/gpu/gpu_child_thread.cc.orig 2014-10-10 08:54:14 UTC +++ content/gpu/gpu_child_thread.cc -@@ -179,6 +179,7 @@ +@@ -180,6 +180,7 @@ } void GpuChildThread::OnCollectGraphicsInfo() { @@ -8,7 +8,7 @@ #if defined(OS_WIN) // GPU full info collection should only happen on un-sandboxed GPU process // or single process/in-process gpu mode on Windows. -@@ -218,6 +219,7 @@ +@@ -222,6 +223,7 @@ base::MessageLoop::current()->Quit(); } #endif // OS_WIN diff --git a/www/chromium/files/patch-content__gpu__gpu_main.cc b/www/chromium/files/patch-content__gpu__gpu_main.cc index 370a339bb9b4..75d27c4c7033 100644 --- a/www/chromium/files/patch-content__gpu__gpu_main.cc +++ b/www/chromium/files/patch-content__gpu__gpu_main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2014-10-02 17:39:47 UTC +--- content/gpu/gpu_main.cc.orig 2014-10-10 08:54:14 UTC +++ content/gpu/gpu_main.cc -@@ -71,7 +71,7 @@ +@@ -72,7 +72,7 @@ const CommandLine& command_line); bool WarmUpSandbox(const CommandLine& command_line); @@ -9,7 +9,7 @@ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info); #endif -@@ -265,7 +265,7 @@ +@@ -268,7 +268,7 @@ // and we already registered them through SetGpuInfo() above. base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now(); @@ -18,7 +18,7 @@ if (!CollectGraphicsInfo(gpu_info)) dead_on_arrival = true; -@@ -393,7 +393,7 @@ +@@ -401,7 +401,7 @@ return true; } diff --git a/www/chromium/files/patch-content__public__common__content_switches.cc b/www/chromium/files/patch-content__public__common__content_switches.cc index 9e87ae0a4faa..0a88ff8d4b7a 100644 --- a/www/chromium/files/patch-content__public__common__content_switches.cc +++ b/www/chromium/files/patch-content__public__common__content_switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2014-10-02 17:39:47 UTC +--- content/public/common/content_switches.cc.orig 2014-10-10 09:15:31 UTC +++ content/public/common/content_switches.cc -@@ -920,7 +920,7 @@ +@@ -924,7 +924,7 @@ "disable-vaapi-accelerated-video-encode"; #endif diff --git a/www/chromium/files/patch-content__public__common__content_switches.h b/www/chromium/files/patch-content__public__common__content_switches.h index 3c950aa1a4e7..036d21c5ac35 100644 --- a/www/chromium/files/patch-content__public__common__content_switches.h +++ b/www/chromium/files/patch-content__public__common__content_switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2014-10-02 17:39:47 UTC +--- content/public/common/content_switches.h.orig 2014-10-10 09:15:31 UTC +++ content/public/common/content_switches.h -@@ -266,7 +266,7 @@ +@@ -268,7 +268,7 @@ CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[]; #endif diff --git a/www/chromium/files/patch-content__public__test__browser_test_base.cc b/www/chromium/files/patch-content__public__test__browser_test_base.cc index eb810d53542b..73454dc8d516 100644 --- a/www/chromium/files/patch-content__public__test__browser_test_base.cc +++ b/www/chromium/files/patch-content__public__test__browser_test_base.cc @@ -1,4 +1,4 @@ ---- content/public/test/browser_test_base.cc.orig 2014-10-02 17:39:47 UTC +--- content/public/test/browser_test_base.cc.orig 2014-10-10 09:15:31 UTC +++ content/public/test/browser_test_base.cc @@ -4,6 +4,10 @@ diff --git a/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc b/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc index dc00b2382881..111ea4107a17 100644 --- a/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc +++ b/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc @@ -1,24 +1,24 @@ ---- content/renderer/accessibility/blink_ax_tree_source.cc.orig 2014-10-02 17:39:47 UTC +--- content/renderer/accessibility/blink_ax_tree_source.cc.orig 2014-10-10 09:15:31 UTC +++ content/renderer/accessibility/blink_ax_tree_source.cc -@@ -443,13 +443,15 @@ +@@ -470,13 +470,15 @@ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X, scroll_offset.width()); dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y, scroll_offset.height()); -- const gfx::Size& min_offset = document.frame()->minimumScrollOffset(); +- const gfx::Size& min_offset = document.minimumScrollOffset(); - dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MIN, min_offset.width()); - dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MIN, min_offset.height()); + // Prefix {min|max}_offset with '_' to avoid collision with + // FreeBSD namespace -+ const gfx::Size& _min_offset = document.frame()->minimumScrollOffset(); ++ const gfx::Size& _min_offset = document.minimumScrollOffset(); + dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MIN, _min_offset.width()); + dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MIN, _min_offset.height()); -- const gfx::Size& max_offset = document.frame()->maximumScrollOffset(); +- const gfx::Size& max_offset = document.maximumScrollOffset(); - dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, max_offset.width()); - dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, max_offset.height()); -+ const gfx::Size& _max_offset = document.frame()->maximumScrollOffset(); ++ const gfx::Size& _max_offset = document.maximumScrollOffset(); + dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, _max_offset.width()); + dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, _max_offset.height()); - } - if (dst->role == ui::AX_ROLE_TABLE) { + if (node_to_frame_routing_id_map_ && !src.equals(GetRoot())) { + WebLocalFrame* frame = document.frame(); diff --git a/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc b/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc index b27f3aab288c..45444e9692cd 100644 --- a/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc +++ b/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc @@ -1,6 +1,6 @@ ---- content/renderer/media/webrtc_audio_capturer.cc.orig 2014-10-02 17:39:47 UTC +--- content/renderer/media/webrtc_audio_capturer.cc.orig 2014-10-10 09:15:31 UTC +++ content/renderer/media/webrtc_audio_capturer.cc -@@ -430,8 +430,8 @@ +@@ -448,8 +448,8 @@ // CaptureCallback. #if defined(OS_WIN) || defined(OS_MACOSX) DCHECK_LE(volume, 1.0); diff --git a/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc b/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc index c8e1d1dfa324..a4d264859fff 100644 --- a/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc +++ b/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc @@ -1,4 +1,4 @@ ---- content/renderer/pepper/usb_key_code_conversion.cc.orig 2014-10-02 17:18:57 UTC +--- content/renderer/pepper/usb_key_code_conversion.cc.orig 2014-10-10 08:54:14 UTC +++ content/renderer/pepper/usb_key_code_conversion.cc @@ -10,7 +10,7 @@ diff --git a/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc b/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc index 918f7732cf45..344ffc236b8d 100644 --- a/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc +++ b/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc @@ -1,4 +1,4 @@ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2014-10-02 17:39:47 UTC +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2014-10-10 08:54:15 UTC +++ content/renderer/renderer_main_platform_delegate_linux.cc @@ -40,6 +40,7 @@ } diff --git a/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc b/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc index d1dfdf74792d..7c869222a7d1 100644 --- a/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc +++ b/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2014-10-02 17:39:47 UTC +--- content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2014-10-10 09:15:31 UTC +++ content/renderer/renderer_webkitplatformsupport_impl.cc -@@ -93,7 +93,7 @@ +@@ -92,7 +92,7 @@ #if defined(OS_POSIX) #include "base/file_descriptor_posix.h" @@ -9,7 +9,7 @@ #include <map> #include <string> -@@ -187,7 +187,7 @@ +@@ -184,7 +184,7 @@ scoped_refptr<ThreadSafeSender> thread_safe_sender_; }; @@ -18,7 +18,7 @@ // WebKit doesn't use WebSandboxSupport on android so we don't need to // implement anything here. class RendererWebKitPlatformSupportImpl::SandboxSupport { -@@ -281,7 +281,7 @@ +@@ -277,7 +277,7 @@ } blink::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() { @@ -27,7 +27,7 @@ // WebKit doesn't use WebSandboxSupport on android. return NULL; #else -@@ -577,7 +577,7 @@ +@@ -573,7 +573,7 @@ return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } diff --git a/www/chromium/files/patch-crypto__nss_util.cc b/www/chromium/files/patch-crypto__nss_util.cc index 907162ee5fcd..4b9a616991b0 100644 --- a/www/chromium/files/patch-crypto__nss_util.cc +++ b/www/chromium/files/patch-crypto__nss_util.cc @@ -1,4 +1,4 @@ ---- crypto/nss_util.cc.orig 2014-10-02 17:39:47 UTC +--- crypto/nss_util.cc.orig 2014-10-10 08:54:15 UTC +++ crypto/nss_util.cc @@ -13,7 +13,7 @@ #include <prtime.h> diff --git a/www/chromium/files/patch-device__hid__hid.gyp b/www/chromium/files/patch-device__hid__hid.gyp index 745b7fd7accd..f3444038cd6f 100644 --- a/www/chromium/files/patch-device__hid__hid.gyp +++ b/www/chromium/files/patch-device__hid__hid.gyp @@ -1,6 +1,6 @@ ---- device/hid/hid.gyp.orig 2014-10-02 17:39:47 UTC +--- device/hid/hid.gyp.orig 2014-10-10 08:54:15 UTC +++ device/hid/hid.gyp -@@ -61,6 +61,18 @@ +@@ -63,6 +63,18 @@ 'input_service_linux.h', ], }], diff --git a/www/chromium/files/patch-device__hid__hid_service.cc b/www/chromium/files/patch-device__hid__hid_service.cc new file mode 100644 index 000000000000..31e980e31e72 --- /dev/null +++ b/www/chromium/files/patch-device__hid__hid_service.cc @@ -0,0 +1,11 @@ +--- device/hid/hid_service.cc.orig 2014-10-14 17:38:39 UTC ++++ device/hid/hid_service.cc +@@ -15,7 +15,7 @@ + #include "device/hid/hid_service_linux.h" + #elif defined(OS_MACOSX) + #include "device/hid/hid_service_mac.h" +-#else ++#elif !defined(OS_BSD) + #include "device/hid/hid_service_win.h" + #endif + diff --git a/www/chromium/files/patch-device__media_transfer_protocol__media_transfer_protocol_manager.h b/www/chromium/files/patch-device__media_transfer_protocol__media_transfer_protocol_manager.h new file mode 100644 index 000000000000..c5d7508273ce --- /dev/null +++ b/www/chromium/files/patch-device__media_transfer_protocol__media_transfer_protocol_manager.h @@ -0,0 +1,13 @@ +--- device/media_transfer_protocol/media_transfer_protocol_manager.h.orig 2014-10-23 00:53:03.000000000 +0200 ++++ device/media_transfer_protocol/media_transfer_protocol_manager.h 2014-10-26 11:53:02.000000000 +0100 +@@ -12,8 +12,8 @@ + #include "base/memory/ref_counted.h" + #include "build/build_config.h" + +-#if !defined(OS_LINUX) +-#error "Only used on Linux and ChromeOS" ++#if !defined(OS_LINUX) && !defined(OS_FREEBSD) ++#error "Only used on Linux and ChromeOS and FreeBSD" + #endif + + class MtpFileEntry; diff --git a/www/chromium/files/patch-device__serial__serial.gyp b/www/chromium/files/patch-device__serial__serial.gyp index 4a3f58dfc1c5..f88115cac52c 100644 --- a/www/chromium/files/patch-device__serial__serial.gyp +++ b/www/chromium/files/patch-device__serial__serial.gyp @@ -1,7 +1,7 @@ ---- device/serial/serial.gyp.orig 2014-10-02 17:39:47 UTC +--- device/serial/serial.gyp.orig 2014-10-10 09:15:31 UTC +++ device/serial/serial.gyp -@@ -32,6 +32,12 @@ - '../../build/linux/system.gyp:udev', +@@ -38,6 +38,12 @@ + 'serial_device_enumerator_linux.h', ], }], + ['os_bsd==1', { diff --git a/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc b/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc index b21b3aa5543b..d2afcab124a2 100644 --- a/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc +++ b/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc @@ -1,4 +1,4 @@ ---- device/serial/serial_io_handler_posix.cc.orig 2014-10-02 17:18:57 UTC +--- device/serial/serial_io_handler_posix.cc.orig 2014-10-10 08:54:15 UTC +++ device/serial/serial_io_handler_posix.cc @@ -39,7 +39,7 @@ BITRATE_TO_SPEED_CASE(9600) diff --git a/www/chromium/files/patch-device__usb__usb.gyp b/www/chromium/files/patch-device__usb__usb.gyp new file mode 100644 index 000000000000..d72e1ccc3111 --- /dev/null +++ b/www/chromium/files/patch-device__usb__usb.gyp @@ -0,0 +1,14 @@ +--- device/usb/usb.gyp.orig 2014-10-10 08:54:15 UTC ++++ device/usb/usb.gyp +@@ -65,6 +65,11 @@ + '../../build/linux/system.gyp:udev', + ], + }], ++ ['OS == "freebsd"', { ++ 'dependencies!': [ ++ '../../third_party/libusb/libusb.gyp:libusb', ++ ], ++ }], + ['chromeos==1', { + 'dependencies': [ + '../../chromeos/chromeos.gyp:chromeos', diff --git a/www/chromium/files/patch-device__usb__usb_context.cc b/www/chromium/files/patch-device__usb__usb_context.cc new file mode 100644 index 000000000000..705b1217c253 --- /dev/null +++ b/www/chromium/files/patch-device__usb__usb_context.cc @@ -0,0 +1,26 @@ +--- device/usb/usb_context.cc.orig 2014-10-10 09:15:31 UTC ++++ device/usb/usb_context.cc +@@ -9,8 +9,13 @@ + #include "base/synchronization/waitable_event.h" + #include "base/threading/platform_thread.h" + #include "device/usb/usb_error.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#define LIBUSB_CALL ++#else + #include "third_party/libusb/src/libusb/interrupt.h" + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace device { + +@@ -43,7 +48,9 @@ + + UsbContext::UsbEventHandler::~UsbEventHandler() { + base::subtle::Release_Store(&running_, 0); ++#if !defined(OS_FREEBSD) // XXX(rene) not available in base version + libusb_interrupt_handle_event(context_); ++#endif + base::PlatformThread::Join(thread_handle_); + } + diff --git a/www/chromium/files/patch-device__usb__usb_context_unittest.cc b/www/chromium/files/patch-device__usb__usb_context_unittest.cc new file mode 100644 index 000000000000..45ceb2e19eda --- /dev/null +++ b/www/chromium/files/patch-device__usb__usb_context_unittest.cc @@ -0,0 +1,14 @@ +--- device/usb/usb_context_unittest.cc.orig 2014-10-10 08:54:15 UTC ++++ device/usb/usb_context_unittest.cc +@@ -6,7 +6,11 @@ + #include "build/build_config.h" + #include "device/usb/usb_context.h" + #include "testing/gtest/include/gtest/gtest.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace device { + diff --git a/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc b/www/chromium/files/patch-device__usb__usb_device_handle_impl.cc index 9627ab53a3c8..bd3626d28e4d 100644 --- a/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc +++ b/www/chromium/files/patch-device__usb__usb_device_handle_impl.cc @@ -1,17 +1,24 @@ ---- components/usb_service/usb_device_handle_impl.cc.orig 2014-10-02 17:39:47 UTC -+++ components/usb_service/usb_device_handle_impl.cc -@@ -17,8 +17,25 @@ - #include "components/usb_service/usb_interface.h" - #include "components/usb_service/usb_service.h" - #include "content/public/browser/browser_thread.h" +--- device/usb/usb_device_handle_impl.cc.orig 2014-10-10 08:54:15 UTC ++++ device/usb/usb_device_handle_impl.cc +@@ -19,7 +19,13 @@ + #include "device/usb/usb_device_impl.h" + #include "device/usb/usb_error.h" + #include "device/usb/usb_service.h" +#if defined(OS_FREEBSD) ++#include <osreldate.h> +#include "libusb.h" +#define LIBUSB_CALL +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif -+/* Define for FreeBSD < 9.3, thanks to db@freebsd.org */ + namespace device { + +@@ -105,6 +111,18 @@ + + } // namespace + ++// Define for FreeBSD < 9.3, thanks to db@freebsd.org +#if defined(OS_FREEBSD) && __FreeBSD_version < 903000 +int libusb_get_string_descriptor(libusb_device_handle *dev, + uint8_t descriptor_index, uint16_t lang_id, unsigned char* data, int length) { @@ -22,7 +29,7 @@ + lang_id, data, (uint16_t)length, 1000); +} +#endif -+ - using content::BrowserThread; - - namespace usb_service { ++ + class UsbDeviceHandleImpl::InterfaceClaimer + : public base::RefCountedThreadSafe<UsbDeviceHandleImpl::InterfaceClaimer> { + public: diff --git a/www/chromium/files/patch-device__usb__usb_device_handle_impl.h b/www/chromium/files/patch-device__usb__usb_device_handle_impl.h new file mode 100644 index 000000000000..d4c4b756efb2 --- /dev/null +++ b/www/chromium/files/patch-device__usb__usb_device_handle_impl.h @@ -0,0 +1,15 @@ +--- device/usb/usb_device_handle_impl.h.orig 2014-10-10 09:15:31 UTC ++++ device/usb/usb_device_handle_impl.h +@@ -14,7 +14,12 @@ + #include "base/threading/thread_checker.h" + #include "device/usb/usb_device_handle.h" + #include "net/base/io_buffer.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#define LIBUSB_CALL ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace base { + class SingleThreadTaskRunner; diff --git a/www/chromium/files/patch-device__usb__usb_device_impl.cc b/www/chromium/files/patch-device__usb__usb_device_impl.cc new file mode 100644 index 000000000000..0f5171afb2b7 --- /dev/null +++ b/www/chromium/files/patch-device__usb__usb_device_impl.cc @@ -0,0 +1,14 @@ +--- device/usb/usb_device_impl.cc.orig 2014-10-10 08:54:15 UTC ++++ device/usb/usb_device_impl.cc +@@ -17,7 +17,11 @@ + #include "device/usb/usb_descriptors.h" + #include "device/usb/usb_device_handle_impl.h" + #include "device/usb/usb_error.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + #if defined(OS_CHROMEOS) + #include "base/sys_info.h" diff --git a/www/chromium/files/patch-device__usb__usb_error.cc b/www/chromium/files/patch-device__usb__usb_error.cc new file mode 100644 index 000000000000..211925521b07 --- /dev/null +++ b/www/chromium/files/patch-device__usb__usb_error.cc @@ -0,0 +1,14 @@ +--- device/usb/usb_error.cc.orig 2014-10-10 08:54:15 UTC ++++ device/usb/usb_error.cc +@@ -4,7 +4,11 @@ + + #include "device/usb/usb_error.h" + ++#if defined(__FreeBSD__) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace device { + diff --git a/www/chromium/files/patch-device__usb__usb_service_impl.cc b/www/chromium/files/patch-device__usb__usb_service_impl.cc new file mode 100644 index 000000000000..9c4f1c13c073 --- /dev/null +++ b/www/chromium/files/patch-device__usb__usb_service_impl.cc @@ -0,0 +1,14 @@ +--- device/usb/usb_service_impl.cc.orig 2014-10-10 09:15:31 UTC ++++ device/usb/usb_service_impl.cc +@@ -14,7 +14,11 @@ + #include "device/usb/usb_context.h" + #include "device/usb/usb_device_impl.h" + #include "device/usb/usb_error.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace device { + diff --git a/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc b/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc index c1ed98af7d94..8ffdcee1508f 100644 --- a/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc +++ b/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/serial/serial_api.cc.orig 2014-10-02 17:39:47 UTC +--- extensions/browser/api/serial/serial_api.cc.orig 2014-10-10 08:54:15 UTC +++ extensions/browser/api/serial/serial_api.cc @@ -85,11 +85,13 @@ void SerialGetDevicesFunction::Work() { diff --git a/www/chromium/files/patch-gpu__config__gpu_control_list.cc b/www/chromium/files/patch-gpu__config__gpu_control_list.cc index 1dafe3fa1fe7..2152bbebf257 100644 --- a/www/chromium/files/patch-gpu__config__gpu_control_list.cc +++ b/www/chromium/files/patch-gpu__config__gpu_control_list.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_control_list.cc.orig 2014-10-02 17:39:47 UTC +--- gpu/config/gpu_control_list.cc.orig 2014-10-10 08:54:15 UTC +++ gpu/config/gpu_control_list.cc -@@ -1480,10 +1480,10 @@ +@@ -1482,10 +1482,10 @@ return kOsWin; #elif defined(OS_ANDROID) return kOsAndroid; diff --git a/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc b/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc index 2b37c3147b9d..b1da2bcf8b34 100644 --- a/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc +++ b/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_control_list_unittest.cc.orig 2014-10-02 17:39:47 UTC +--- gpu/config/gpu_control_list_unittest.cc.orig 2014-10-10 08:54:15 UTC +++ gpu/config/gpu_control_list_unittest.cc @@ -177,8 +177,7 @@ features = control_list->MakeDecision( diff --git a/www/chromium/files/patch-gpu__config__gpu_info_collector.cc b/www/chromium/files/patch-gpu__config__gpu_info_collector.cc index 39651cb96c07..716378f704d0 100644 --- a/www/chromium/files/patch-gpu__config__gpu_info_collector.cc +++ b/www/chromium/files/patch-gpu__config__gpu_info_collector.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_info_collector.cc.orig 2014-10-02 17:39:47 UTC +--- gpu/config/gpu_info_collector.cc.orig 2014-10-10 08:54:15 UTC +++ gpu/config/gpu_info_collector.cc @@ -126,7 +126,9 @@ gpu_info->pixel_shader_version = glsl_version; diff --git a/www/chromium/files/patch-gpu__config__gpu_test_config.cc b/www/chromium/files/patch-gpu__config__gpu_test_config.cc index bb5d0db1aecf..86551afb8f10 100644 --- a/www/chromium/files/patch-gpu__config__gpu_test_config.cc +++ b/www/chromium/files/patch-gpu__config__gpu_test_config.cc @@ -1,35 +1,26 @@ ---- gpu/config/gpu_test_config.cc.orig 2014-10-02 17:39:47 UTC +--- gpu/config/gpu_test_config.cc.orig 2014-10-10 08:54:15 UTC +++ gpu/config/gpu_test_config.cc -@@ -23,8 +23,6 @@ +@@ -23,7 +23,7 @@ GPUTestConfig::OS GetCurrentOS() { #if defined(OS_CHROMEOS) return GPUTestConfig::kOsChromeOS; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) -- return GPUTestConfig::kOsLinux; ++#elif defined(OS_LINUX) || defined(OS_BSD) + return GPUTestConfig::kOsLinux; #elif defined(OS_WIN) int32 major_version = 0; - int32 minor_version = 0; -@@ -61,6 +59,8 @@ - } - #elif defined(OS_ANDROID) - return GPUTestConfig::kOsAndroid; -+#elif defined(OS_POSIX) -+ return GPUTestConfig::kOsLinux; - #endif - return GPUTestConfig::kOsUnknown; - } -@@ -234,6 +234,10 @@ +@@ -233,6 +233,10 @@ + bool rt; if (gpu_info == NULL) { GPUInfo my_gpu_info; - GpuIDResult result; +#if defined(OS_FREEBSD) + rt = false; + LOG(WARNING) << "CollectGpuID not present on FreeBSD"; +#else - result = CollectGpuID(&my_gpu_info.gpu.vendor_id, - &my_gpu_info.gpu.device_id); - if (result == kGpuIDNotSupported) { -@@ -243,6 +247,7 @@ + CollectInfoResult result = CollectGpuID( + &my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id); + if (result != kCollectInfoSuccess) { +@@ -242,6 +246,7 @@ } else { rt = SetGPUInfo(my_gpu_info); } diff --git a/www/chromium/files/patch-gpu__config__gpu_util.cc b/www/chromium/files/patch-gpu__config__gpu_util.cc index 9633ee261979..9a341acb82a6 100644 --- a/www/chromium/files/patch-gpu__config__gpu_util.cc +++ b/www/chromium/files/patch-gpu__config__gpu_util.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_util.cc.orig 2014-10-02 17:18:58 UTC +--- gpu/config/gpu_util.cc.orig 2014-10-10 08:54:15 UTC +++ gpu/config/gpu_util.cc @@ -54,10 +54,12 @@ } diff --git a/www/chromium/files/patch-gpu__gpu_config.gypi b/www/chromium/files/patch-gpu__gpu_config.gypi index a8fb231ac5d8..ece2fc95d53c 100644 --- a/www/chromium/files/patch-gpu__gpu_config.gypi +++ b/www/chromium/files/patch-gpu__gpu_config.gypi @@ -1,4 +1,4 @@ ---- gpu/gpu_config.gypi.orig 2014-10-02 17:18:58 UTC +--- gpu/gpu_config.gypi.orig 2014-10-10 08:54:15 UTC +++ gpu/gpu_config.gypi @@ -70,12 +70,18 @@ '../build/linux/system.gyp:libpci', diff --git a/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc b/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc index 540d26e50994..128a6cd136ab 100644 --- a/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc +++ b/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc @@ -1,4 +1,4 @@ ---- media/audio/audio_input_volume_unittest.cc.orig 2014-10-02 17:39:47 UTC +--- media/audio/audio_input_volume_unittest.cc.orig 2014-10-10 08:54:15 UTC +++ media/audio/audio_input_volume_unittest.cc @@ -74,7 +74,7 @@ params, device_id); diff --git a/www/chromium/files/patch-media__base__audio_splicer.cc b/www/chromium/files/patch-media__base__audio_splicer.cc index 53dc9c46e1fb..ee90d95cc4f6 100644 --- a/www/chromium/files/patch-media__base__audio_splicer.cc +++ b/www/chromium/files/patch-media__base__audio_splicer.cc @@ -1,4 +1,4 @@ ---- media/base/audio_splicer.cc.orig 2014-10-02 17:39:47 UTC +--- media/base/audio_splicer.cc.orig 2014-10-10 08:54:15 UTC +++ media/base/audio_splicer.cc @@ -137,7 +137,7 @@ output_timestamp_helper_.GetTimestamp(); diff --git a/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc b/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc index e2d135bcad67..070ad810587b 100644 --- a/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc +++ b/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc @@ -1,4 +1,4 @@ ---- media/filters/decrypting_audio_decoder.cc.orig 2014-10-02 17:39:47 UTC +--- media/filters/decrypting_audio_decoder.cc.orig 2014-10-10 08:54:15 UTC +++ media/filters/decrypting_audio_decoder.cc @@ -30,7 +30,7 @@ // Out of sync of 100ms would be pretty noticeable and we should keep any diff --git a/www/chromium/files/patch-media__media.gyp b/www/chromium/files/patch-media__media.gyp index 836067211d8b..b897efdfcc08 100644 --- a/www/chromium/files/patch-media__media.gyp +++ b/www/chromium/files/patch-media__media.gyp @@ -1,6 +1,6 @@ ---- media/media.gyp.orig 2014-10-02 17:39:47 UTC +--- media/media.gyp.orig 2014-10-10 09:15:31 UTC +++ media/media.gyp -@@ -678,7 +678,7 @@ +@@ -690,7 +690,7 @@ 'audio/openbsd/audio_manager_openbsd.h', ], }], @@ -9,7 +9,7 @@ 'conditions': [ ['use_x11==1', { 'dependencies': [ -@@ -986,7 +986,7 @@ +@@ -998,7 +998,7 @@ 'base/simd/convert_yuv_to_rgb_x86.cc', ], }], diff --git a/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc b/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc index 6af5e4fed2f4..ccbbdd333d0d 100644 --- a/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc +++ b/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc @@ -1,4 +1,4 @@ ---- media/video/capture/video_capture_device_factory.cc.orig 2014-10-02 17:18:58 UTC +--- media/video/capture/video_capture_device_factory.cc.orig 2014-10-10 08:54:15 UTC +++ media/video/capture/video_capture_device_factory.cc @@ -11,7 +11,7 @@ diff --git a/www/chromium/files/patch-native_client__build__common.gypi b/www/chromium/files/patch-native_client__build__common.gypi index b8b153d40ebc..a50506ade66a 100644 --- a/www/chromium/files/patch-native_client__build__common.gypi +++ b/www/chromium/files/patch-native_client__build__common.gypi @@ -1,4 +1,4 @@ ---- native_client/build/common.gypi.orig 2014-10-02 17:40:29 UTC +--- native_client/build/common.gypi.orig 2014-10-10 09:16:25 UTC +++ native_client/build/common.gypi @@ -290,7 +290,7 @@ ], diff --git a/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp b/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp index ad771b066ad2..a708c944b87e 100644 --- a/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp +++ b/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp @@ -1,4 +1,4 @@ ---- native_client/src/shared/platform/platform.gyp.orig 2014-10-02 17:40:30 UTC +--- native_client/src/shared/platform/platform.gyp.orig 2014-10-10 09:16:25 UTC +++ native_client/src/shared/platform/platform.gyp @@ -36,7 +36,7 @@ 'refcount_base.cc', diff --git a/www/chromium/files/patch-net__base__address_tracker_linux.h b/www/chromium/files/patch-net__base__address_tracker_linux.h index 30aed4c9c429..fb5452579e53 100644 --- a/www/chromium/files/patch-net__base__address_tracker_linux.h +++ b/www/chromium/files/patch-net__base__address_tracker_linux.h @@ -1,4 +1,4 @@ ---- net/base/address_tracker_linux.h.orig 2014-10-02 17:39:47 UTC +--- net/base/address_tracker_linux.h.orig 2014-10-10 09:15:31 UTC +++ net/base/address_tracker_linux.h @@ -6,10 +6,12 @@ #define NET_BASE_ADDRESS_TRACKER_LINUX_H_ diff --git a/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc b/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc index 2bd2d0c783d3..acebe7025116 100644 --- a/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc +++ b/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc @@ -1,7 +1,7 @@ ---- net/base/address_tracker_linux_unittest.cc.orig 2014-10-02 17:39:47 UTC +--- net/base/address_tracker_linux_unittest.cc.orig 2014-10-10 08:54:16 UTC +++ net/base/address_tracker_linux_unittest.cc -@@ -4,7 +4,11 @@ - +@@ -5,7 +5,11 @@ + #include "base/memory/scoped_ptr.h" #include "net/base/address_tracker_linux.h" +#if defined(__linux__) diff --git a/www/chromium/files/patch-net__base__dns_reloader.cc b/www/chromium/files/patch-net__base__dns_reloader.cc index 119fdd583f99..d99f5ae0110c 100644 --- a/www/chromium/files/patch-net__base__dns_reloader.cc +++ b/www/chromium/files/patch-net__base__dns_reloader.cc @@ -1,4 +1,4 @@ ---- net/base/dns_reloader.cc.orig 2014-10-02 17:18:59 UTC +--- net/base/dns_reloader.cc.orig 2014-10-10 09:15:31 UTC +++ net/base/dns_reloader.cc @@ -7,6 +7,9 @@ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ diff --git a/www/chromium/files/patch-net__base__mime_util_unittest.cc b/www/chromium/files/patch-net__base__mime_util_unittest.cc index 88b9f55c5fa5..c4a759e23527 100644 --- a/www/chromium/files/patch-net__base__mime_util_unittest.cc +++ b/www/chromium/files/patch-net__base__mime_util_unittest.cc @@ -1,6 +1,6 @@ ---- net/base/mime_util_unittest.cc.orig 2014-10-02 17:39:47 UTC +--- net/base/mime_util_unittest.cc.orig 2014-10-10 08:54:16 UTC +++ net/base/mime_util_unittest.cc -@@ -383,7 +383,7 @@ +@@ -392,7 +392,7 @@ { "MeSsAge/*", 1, "eml" }, { "image/bmp", 1, "bmp" }, { "video/*", 6, "mp4" }, diff --git a/www/chromium/files/patch-net__base__net_error_list.h b/www/chromium/files/patch-net__base__net_error_list.h deleted file mode 100644 index 417c040678bf..000000000000 --- a/www/chromium/files/patch-net__base__net_error_list.h +++ /dev/null @@ -1,13 +0,0 @@ ---- net/base/net_error_list.h.orig 2014-10-02 17:18:59 UTC -+++ net/base/net_error_list.h -@@ -336,6 +336,10 @@ - // library. - NET_ERROR(SSL_CLIENT_AUTH_CERT_BAD_FORMAT, -164) - -+// The SSL server requires falling back to a version older than the configured -+// minimum fallback version, and thus fallback failed. -+NET_ERROR(SSL_FALLBACK_BEYOND_MINIMUM_VERSION, -165) -+ - // Certificate error codes - // - // The values of certificate error codes must be consecutive. diff --git a/www/chromium/files/patch-net__base__net_util.h b/www/chromium/files/patch-net__base__net_util.h index 96c65b5796f9..692275550979 100644 --- a/www/chromium/files/patch-net__base__net_util.h +++ b/www/chromium/files/patch-net__base__net_util.h @@ -1,4 +1,4 @@ ---- net/base/net_util.h.orig 2014-10-02 17:39:47 UTC +--- net/base/net_util.h.orig 2014-10-10 09:15:31 UTC +++ net/base/net_util.h @@ -13,6 +13,9 @@ #elif defined(OS_POSIX) diff --git a/www/chromium/files/patch-net__base__network_change_notifier.cc b/www/chromium/files/patch-net__base__network_change_notifier.cc index 49cccfc16a2f..6dd50247adcb 100644 --- a/www/chromium/files/patch-net__base__network_change_notifier.cc +++ b/www/chromium/files/patch-net__base__network_change_notifier.cc @@ -1,4 +1,4 @@ ---- net/base/network_change_notifier.cc.orig 2014-10-02 17:39:47 UTC +--- net/base/network_change_notifier.cc.orig 2014-10-10 09:15:31 UTC +++ net/base/network_change_notifier.cc @@ -521,7 +521,6 @@ #elif defined(OS_MACOSX) diff --git a/www/chromium/files/patch-net__dns__address_sorter_posix.cc b/www/chromium/files/patch-net__dns__address_sorter_posix.cc index f07d0bad1905..aaea2f92427a 100644 --- a/www/chromium/files/patch-net__dns__address_sorter_posix.cc +++ b/www/chromium/files/patch-net__dns__address_sorter_posix.cc @@ -1,4 +1,4 @@ ---- net/dns/address_sorter_posix.cc.orig 2014-10-02 17:18:59 UTC +--- net/dns/address_sorter_posix.cc.orig 2014-10-10 08:54:16 UTC +++ net/dns/address_sorter_posix.cc @@ -10,6 +10,7 @@ #include <sys/socket.h> // Must be included before ifaddrs.h. diff --git a/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc b/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc index c7699213014d..cdfd08eb2427 100644 --- a/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc +++ b/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc @@ -1,4 +1,4 @@ ---- net/dns/dns_config_service_posix_unittest.cc.orig 2014-10-02 17:18:59 UTC +--- net/dns/dns_config_service_posix_unittest.cc.orig 2014-10-10 08:54:16 UTC +++ net/dns/dns_config_service_posix_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be diff --git a/www/chromium/files/patch-net__dns__dns_session.cc b/www/chromium/files/patch-net__dns__dns_session.cc index da774a67fc4f..878b4ba3ec91 100644 --- a/www/chromium/files/patch-net__dns__dns_session.cc +++ b/www/chromium/files/patch-net__dns__dns_session.cc @@ -1,4 +1,4 @@ ---- net/dns/dns_session.cc.orig 2014-10-02 17:39:47 UTC +--- net/dns/dns_session.cc.orig 2014-10-10 08:54:16 UTC +++ net/dns/dns_session.cc @@ -178,7 +178,7 @@ base::TimeDelta current_error = rtt - estimate; diff --git a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc index a1259b9b8dfa..e9d7216b6a6e 100644 --- a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc +++ b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc @@ -1,4 +1,4 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2014-10-02 17:18:59 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2014-10-10 08:54:16 UTC +++ net/http/http_auth_gssapi_posix.cc @@ -431,8 +431,8 @@ static const char* const kDefaultLibraryNames[] = { diff --git a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h index e2bc5bf42caa..05ce11b41ce5 100644 --- a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h +++ b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h @@ -1,4 +1,4 @@ ---- net/http/http_auth_gssapi_posix.h.orig 2014-10-02 17:18:59 UTC +--- net/http/http_auth_gssapi_posix.h.orig 2014-10-10 09:15:31 UTC +++ net/http/http_auth_gssapi_posix.h @@ -16,6 +16,9 @@ MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 diff --git a/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h b/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h index cf7f1e4d3b57..36ac13cf06e6 100644 --- a/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h +++ b/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h @@ -1,4 +1,4 @@ ---- net/http/mock_gssapi_library_posix.h.orig 2014-10-02 17:18:59 UTC +--- net/http/mock_gssapi_library_posix.h.orig 2014-10-10 09:15:31 UTC +++ net/http/mock_gssapi_library_posix.h @@ -15,6 +15,9 @@ MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 diff --git a/www/chromium/files/patch-net__net.gyp b/www/chromium/files/patch-net__net.gyp index 4c2aa9f04b7b..afea1daf4633 100644 --- a/www/chromium/files/patch-net__net.gyp +++ b/www/chromium/files/patch-net__net.gyp @@ -1,6 +1,6 @@ ---- net/net.gyp.orig 2014-10-02 17:39:47 UTC +--- net/net.gyp.orig 2014-10-10 09:15:31 UTC +++ net/net.gyp -@@ -322,9 +322,10 @@ +@@ -316,9 +316,10 @@ }], ['os_bsd==1', { 'sources!': [ @@ -12,7 +12,7 @@ ], },{ 'dependencies': [ -@@ -556,7 +557,7 @@ +@@ -551,7 +552,7 @@ '<@(net_test_sources)', ], 'conditions': [ @@ -21,7 +21,7 @@ 'dependencies': [ 'epoll_server', 'flip_in_mem_edsm_server_base', -@@ -1028,6 +1029,11 @@ +@@ -1033,6 +1034,11 @@ 'test/cert_test_util_nss.cc', ], }], diff --git a/www/chromium/files/patch-net__net.gypi b/www/chromium/files/patch-net__net.gypi index f8c35628e693..895804f8ae84 100644 --- a/www/chromium/files/patch-net__net.gypi +++ b/www/chromium/files/patch-net__net.gypi @@ -1,6 +1,6 @@ ---- net/net.gypi.orig 2014-10-02 17:39:47 UTC +--- net/net.gypi.orig 2014-10-10 09:15:31 UTC +++ net/net.gypi -@@ -177,8 +177,8 @@ +@@ -182,8 +182,8 @@ 'android/network_change_notifier_factory_android.h', 'android/network_library.cc', 'android/network_library.h', @@ -11,7 +11,7 @@ 'base/backoff_entry.cc', 'base/backoff_entry.h', 'base/bandwidth_metrics.cc', -@@ -1250,7 +1250,7 @@ +@@ -1252,7 +1252,7 @@ 'android/keystore_unittest.cc', 'android/network_change_notifier_android_unittest.cc', 'base/address_list_unittest.cc', diff --git a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc index 38f0a59aed54..e5531fb4b948 100644 --- a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc +++ b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc @@ -1,6 +1,6 @@ ---- net/proxy/proxy_config_service_linux.cc.orig 2014-10-02 17:39:47 UTC +--- net/proxy/proxy_config_service_linux.cc.orig 2014-10-10 09:15:31 UTC +++ net/proxy/proxy_config_service_linux.cc -@@ -21,7 +21,13 @@ +@@ -12,7 +12,13 @@ #include <limits.h> #include <stdio.h> #include <stdlib.h> @@ -14,21 +14,21 @@ #include <unistd.h> #include <map> -@@ -861,9 +867,10 @@ +@@ -858,9 +864,10 @@ public base::MessagePumpLibevent::Watcher { public: explicit SettingGetterImplKDE(base::Environment* env_var_getter) - : inotify_fd_(-1), notify_delegate_(NULL), indirect_manual_(false), - auto_no_pac_(false), reversed_bypass_list_(false), -- env_var_getter_(env_var_getter), file_loop_(NULL) { +- env_var_getter_(env_var_getter), file_task_runner_(NULL) { + : inotify_fd_(-1), config_fd_(-1), notify_delegate_(NULL), + indirect_manual_(false), auto_no_pac_(false), + reversed_bypass_list_(false), env_var_getter_(env_var_getter), -+ file_loop_(NULL) { ++ file_task_runner_(NULL) { // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; -@@ -927,9 +934,10 @@ +@@ -924,9 +931,10 @@ // and pending tasks may then be deleted without being run. // Here in the KDE version, we can safely close the file descriptor // anyway. (Not that it really matters; the process is exiting.) @@ -39,8 +39,8 @@ + DCHECK(config_fd_ < 0); } - virtual bool Init(base::SingleThreadTaskRunner* glib_thread_task_runner, -@@ -937,11 +945,21 @@ + virtual bool Init( +@@ -936,11 +944,20 @@ // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; DCHECK(inotify_fd_ < 0); @@ -57,20 +57,19 @@ +#endif return false; } -+ +#if !defined(OS_FREEBSD) int flags = fcntl(inotify_fd_, F_GETFL); if (fcntl(inotify_fd_, F_SETFL, flags | O_NONBLOCK) < 0) { PLOG(ERROR) << "fcntl failed"; -@@ -949,6 +967,7 @@ +@@ -948,6 +965,7 @@ inotify_fd_ = -1; return false; } +#endif - file_loop_ = file_loop; - // The initial read is done on the current thread, not |file_loop_|, - // since we will need to have it for SetUpAndFetchInitialConfig(). -@@ -963,20 +982,38 @@ + file_task_runner_ = file_task_runner; + // The initial read is done on the current thread, not + // |file_task_runner_|, since we will need to have it for +@@ -963,21 +981,39 @@ close(inotify_fd_); inotify_fd_ = -1; } @@ -84,7 +83,7 @@ ProxyConfigServiceLinux::Delegate* delegate) OVERRIDE { DCHECK(inotify_fd_ >= 0); + DCHECK(config_fd_ >= 0); - DCHECK(base::MessageLoop::current() == file_loop_); + DCHECK(file_task_runner_->BelongsToCurrentThread()); // We can't just watch the kioslaverc file directly, since KDE will write // a new copy of it and then rename it whenever settings are changed and // inotify watches inodes (so we'll be watching the old deleted file after @@ -103,16 +102,17 @@ + return false; +#else if (inotify_add_watch(inotify_fd_, kde_config_dir_.value().c_str(), - IN_MODIFY | IN_MOVED_TO) < 0) + IN_MODIFY | IN_MOVED_TO) < 0) { return false; + } +#endif notify_delegate_ = delegate; - if (!file_loop_->WatchFileDescriptor(inotify_fd_, - true, -@@ -997,7 +1034,19 @@ + if (!base::MessageLoopForIO::current()->WatchFileDescriptor( + inotify_fd_, true, base::MessageLoopForIO::WATCH_READ, +@@ -998,7 +1034,19 @@ virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE { DCHECK_EQ(fd, inotify_fd_); - DCHECK(base::MessageLoop::current() == file_loop_); + DCHECK(file_task_runner_->BelongsToCurrentThread()); +#if defined(OS_FREEBSD) + struct kevent ev; + int rv = kevent(inotify_fd_, NULL, 0, &ev, 1, NULL); @@ -129,20 +129,20 @@ } virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE { NOTREACHED(); -@@ -1276,8 +1325,11 @@ +@@ -1277,8 +1325,11 @@ void OnChangeNotification() { DCHECK_GE(inotify_fd_, 0); - DCHECK(base::MessageLoop::current() == file_loop_); + DCHECK(file_task_runner_->BelongsToCurrentThread()); - char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4]; bool kioslaverc_touched = false; -+#if defined(OS_BSD) ++#if defined(OS_FREEBSD) + kioslaverc_touched = true; +#else + char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4]; ssize_t r; while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) { // inotify returns variable-length structures, which is why we have -@@ -1314,6 +1366,7 @@ +@@ -1315,6 +1366,7 @@ inotify_fd_ = -1; } } @@ -150,7 +150,7 @@ if (kioslaverc_touched) { // We don't use Reset() because the timer may not yet be running. // (In that case Stop() is a no-op.) -@@ -1329,6 +1382,7 @@ +@@ -1330,6 +1382,7 @@ std::vector<std::string> > strings_map_type; int inotify_fd_; diff --git a/www/chromium/files/patch-net__proxy__proxy_service.cc b/www/chromium/files/patch-net__proxy__proxy_service.cc index ef43f9c8a637..0107af239f30 100644 --- a/www/chromium/files/patch-net__proxy__proxy_service.cc +++ b/www/chromium/files/patch-net__proxy__proxy_service.cc @@ -1,4 +1,4 @@ ---- net/proxy/proxy_service.cc.orig 2014-10-02 17:39:47 UTC +--- net/proxy/proxy_service.cc.orig 2014-10-10 09:15:31 UTC +++ net/proxy/proxy_service.cc @@ -40,7 +40,7 @@ #elif defined(OS_MACOSX) diff --git a/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc b/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc index dfae1873f33e..4fa57ec6a1bf 100644 --- a/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc +++ b/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc @@ -1,4 +1,4 @@ ---- net/quic/congestion_control/rtt_stats.cc.orig 2014-10-02 17:18:59 UTC +--- net/quic/congestion_control/rtt_stats.cc.orig 2014-10-10 08:54:16 UTC +++ net/quic/congestion_control/rtt_stats.cc @@ -85,7 +85,7 @@ } else { diff --git a/www/chromium/files/patch-net__socket__socks5_client_socket.cc b/www/chromium/files/patch-net__socket__socks5_client_socket.cc index 32399e2d5d23..f0abf5c60607 100644 --- a/www/chromium/files/patch-net__socket__socks5_client_socket.cc +++ b/www/chromium/files/patch-net__socket__socks5_client_socket.cc @@ -1,4 +1,4 @@ ---- net/socket/socks5_client_socket.cc.orig 2014-10-02 17:18:59 UTC +--- net/socket/socks5_client_socket.cc.orig 2014-10-10 08:54:16 UTC +++ net/socket/socks5_client_socket.cc @@ -4,6 +4,10 @@ diff --git a/www/chromium/files/patch-net__socket__ssl_client_socket_nss.cc b/www/chromium/files/patch-net__socket__ssl_client_socket_nss.cc deleted file mode 100644 index b9b8223100bd..000000000000 --- a/www/chromium/files/patch-net__socket__ssl_client_socket_nss.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- net/socket/ssl_client_socket_nss.cc.orig 2014-10-02 17:39:47 UTC -+++ net/socket/ssl_client_socket_nss.cc -@@ -3330,6 +3330,11 @@ - EnterFunction(result); - - if (result == OK) { -+ if (ssl_config_.version_fallback && -+ ssl_config_.version_max < ssl_config_.version_fallback_min) { -+ return ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION; -+ } -+ - // SSL handshake is completed. Let's verify the certificate. - GotoState(STATE_VERIFY_CERT); - // Done! diff --git a/www/chromium/files/patch-net__socket__ssl_client_socket_openssl.cc b/www/chromium/files/patch-net__socket__ssl_client_socket_openssl.cc deleted file mode 100644 index 45a2d53a3e82..000000000000 --- a/www/chromium/files/patch-net__socket__ssl_client_socket_openssl.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- net/socket/ssl_client_socket_openssl.cc.orig 2014-10-02 17:39:47 UTC -+++ net/socket/ssl_client_socket_openssl.cc -@@ -890,6 +890,11 @@ - << " is: " << (SSL_session_reused(ssl_) ? "Success" : "Fail"); - } - -+ if (ssl_config_.version_fallback && -+ ssl_config_.version_max < ssl_config_.version_fallback_min) { -+ return ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION; -+ } -+ - // SSL handshake is completed. If NPN wasn't negotiated, see if ALPN was. - if (npn_status_ == kNextProtoUnsupported) { - const uint8_t* alpn_proto = NULL; diff --git a/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h b/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h index dadb67efa16c..5b8abaa5ea06 100644 --- a/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h +++ b/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h @@ -1,4 +1,4 @@ ---- net/socket/tcp_listen_socket_unittest.h.orig 2014-10-02 17:19:00 UTC +--- net/socket/tcp_listen_socket_unittest.h.orig 2014-10-10 09:15:31 UTC +++ net/socket/tcp_listen_socket_unittest.h @@ -13,6 +13,9 @@ #include <arpa/inet.h> diff --git a/www/chromium/files/patch-net__ssl__ssl_config.cc b/www/chromium/files/patch-net__ssl__ssl_config.cc deleted file mode 100644 index daceda466cb4..000000000000 --- a/www/chromium/files/patch-net__ssl__ssl_config.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- net/ssl/ssl_config.cc.orig 2014-10-02 17:39:47 UTC -+++ net/ssl/ssl_config.cc -@@ -25,6 +25,8 @@ - SSL_PROTOCOL_VERSION_TLS1_2; - #endif - -+const uint16 kDefaultSSLVersionFallbackMin = SSL_PROTOCOL_VERSION_TLS1; -+ - SSLConfig::CertAndStatus::CertAndStatus() : cert_status(0) {} - - SSLConfig::CertAndStatus::~CertAndStatus() {} -@@ -34,6 +36,7 @@ - rev_checking_required_local_anchors(false), - version_min(kDefaultSSLVersionMin), - version_max(kDefaultSSLVersionMax), -+ version_fallback_min(kDefaultSSLVersionFallbackMin), - channel_id_enabled(true), - false_start_enabled(true), - signed_cert_timestamps_enabled(true), diff --git a/www/chromium/files/patch-net__ssl__ssl_config.h b/www/chromium/files/patch-net__ssl__ssl_config.h deleted file mode 100644 index c9593650685a..000000000000 --- a/www/chromium/files/patch-net__ssl__ssl_config.h +++ /dev/null @@ -1,25 +0,0 @@ ---- net/ssl/ssl_config.h.orig 2014-10-02 17:19:00 UTC -+++ net/ssl/ssl_config.h -@@ -32,6 +32,9 @@ - // Default maximum protocol version. - NET_EXPORT extern const uint16 kDefaultSSLVersionMax; - -+// Default minimum protocol version that it's acceptable to fallback to. -+NET_EXPORT extern const uint16 kDefaultSSLVersionFallbackMin; -+ - // A collection of SSL-related configuration settings. - struct NET_EXPORT SSLConfig { - // Default to revocation checking. -@@ -73,6 +76,12 @@ - uint16 version_min; - uint16 version_max; - -+ // version_fallback_min contains the minimum version that is acceptable to -+ // fallback to. Versions before this may be tried to see whether they would -+ // have succeeded and thus to give a better message to the user, but the -+ // resulting connection won't be used in these cases. -+ uint16 version_fallback_min; -+ - // Presorted list of cipher suites which should be explicitly prevented from - // being used in addition to those disabled by the net built-in policy. - // diff --git a/www/chromium/files/patch-net__udp__udp_socket_unittest.cc b/www/chromium/files/patch-net__udp__udp_socket_unittest.cc index 9bd500edd78e..ba500a24d2d2 100644 --- a/www/chromium/files/patch-net__udp__udp_socket_unittest.cc +++ b/www/chromium/files/patch-net__udp__udp_socket_unittest.cc @@ -1,4 +1,4 @@ ---- net/udp/udp_socket_unittest.cc.orig 2014-10-02 17:19:00 UTC +--- net/udp/udp_socket_unittest.cc.orig 2014-10-10 08:54:16 UTC +++ net/udp/udp_socket_unittest.cc @@ -204,7 +204,7 @@ client_entries, 5, NetLog::TYPE_SOCKET_ALIVE)); diff --git a/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc b/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc index 46d0964e8637..4d872bef67f0 100644 --- a/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc +++ b/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc @@ -1,4 +1,4 @@ ---- ppapi/proxy/file_io_resource.cc.orig 2014-10-02 17:39:47 UTC +--- ppapi/proxy/file_io_resource.cc.orig 2014-10-10 08:54:16 UTC +++ ppapi/proxy/file_io_resource.cc @@ -283,15 +283,17 @@ diff --git a/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc b/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc index 34edb5a94c43..6dde84fa3cc3 100644 --- a/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc +++ b/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc @@ -1,4 +1,4 @@ ---- ppapi/shared_impl/private/net_address_private_impl.cc.orig 2014-10-02 17:19:00 UTC +--- ppapi/shared_impl/private/net_address_private_impl.cc.orig 2014-10-10 08:54:16 UTC +++ ppapi/shared_impl/private/net_address_private_impl.cc @@ -14,6 +14,10 @@ #include <sys/types.h> diff --git a/www/chromium/files/patch-printing__printing.gyp b/www/chromium/files/patch-printing__printing.gyp index 45e5d81b7535..78c655c9797a 100644 --- a/www/chromium/files/patch-printing__printing.gyp +++ b/www/chromium/files/patch-printing__printing.gyp @@ -1,4 +1,4 @@ ---- printing/printing.gyp.orig 2014-10-02 17:39:47 UTC +--- printing/printing.gyp.orig 2014-10-10 08:54:16 UTC +++ printing/printing.gyp @@ -187,7 +187,7 @@ 'backend/print_backend_chromeos.cc', diff --git a/www/chromium/files/patch-remoting__remoting_host.gypi b/www/chromium/files/patch-remoting__remoting_host.gypi index 831098b76bb4..4c07b7bfccaa 100644 --- a/www/chromium/files/patch-remoting__remoting_host.gypi +++ b/www/chromium/files/patch-remoting__remoting_host.gypi @@ -1,20 +1,29 @@ ---- remoting/remoting_host.gypi.orig 2014-10-02 17:39:48 UTC +--- remoting/remoting_host.gypi.orig 2014-10-10 09:15:31 UTC +++ remoting/remoting_host.gypi @@ -12,7 +12,7 @@ 'variables': { 'conditions': [ # Remoting host is supported only on Windows, OSX and Linux (with X11). -- ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', { -+ ['OS=="win" or OS=="mac" or os_bsd==1 or (OS=="linux" and chromeos==0 and use_x11==1)', { +- ['OS=="win" or OS=="mac" or (OS=="linux" and use_x11==1)', { ++ ['OS=="win" or OS=="mac" or ((OS=="linux" or os_bsd==1) and use_x11==1)', { + 'enable_me2me_host': 1, + 'enable_it2me_host': 1, 'enable_remoting_host': 1, - }, { - 'enable_remoting_host': 0, -@@ -285,7 +285,7 @@ - 'host/win/wts_terminal_observer.h', +@@ -310,7 +310,7 @@ + ], + }, + }], +- ['OS=="linux" and chromeos==0', { ++ ['(OS=="linux" and chromeos==0) or os_bsd==1', { + 'dependencies' : [ + # Always use GTK on Linux, even for Aura builds. + '../build/linux/system.gyp:gtk', +@@ -872,7 +872,7 @@ + 'host/it2me/it2me_native_messaging_host_main.h', ], 'conditions': [ -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { +- ['OS=="linux" and chromeos==0', { ++ ['(OS=="linux" and chromeos==0) or os_bsd==1', { 'dependencies': [ # Always use GTK on Linux, even for Aura builds. '../build/linux/system.gyp:gtk', diff --git a/www/chromium/files/patch-skia__skia_chrome.gypi b/www/chromium/files/patch-skia__skia_chrome.gypi index 865301e8eaf2..8c6ad7f6e758 100644 --- a/www/chromium/files/patch-skia__skia_chrome.gypi +++ b/www/chromium/files/patch-skia__skia_chrome.gypi @@ -1,6 +1,6 @@ ---- skia/skia_chrome.gypi.orig 2014-10-02 17:39:48 UTC +--- skia/skia_chrome.gypi.orig 2014-10-10 09:15:32 UTC +++ skia/skia_chrome.gypi -@@ -87,6 +87,11 @@ +@@ -89,6 +89,11 @@ 'ext/vector_platform_device_skia.h', ], 'conditions': [ diff --git a/www/chromium/files/patch-skia__skia_common.gypi b/www/chromium/files/patch-skia__skia_common.gypi index 6b93402be58c..07b71ad2ff9f 100644 --- a/www/chromium/files/patch-skia__skia_common.gypi +++ b/www/chromium/files/patch-skia__skia_common.gypi @@ -1,4 +1,4 @@ ---- skia/skia_common.gypi.orig 2014-10-02 17:39:48 UTC +--- skia/skia_common.gypi.orig 2014-10-10 08:54:17 UTC +++ skia/skia_common.gypi @@ -61,7 +61,7 @@ }], diff --git a/www/chromium/files/patch-sync__util__get_session_name.cc b/www/chromium/files/patch-sync__util__get_session_name.cc index 8b0878b4a861..6266a07e35cc 100644 --- a/www/chromium/files/patch-sync__util__get_session_name.cc +++ b/www/chromium/files/patch-sync__util__get_session_name.cc @@ -1,6 +1,6 @@ ---- sync/util/get_session_name.cc.orig 2014-10-02 17:39:48 UTC +--- sync/util/get_session_name.cc.orig 2014-10-10 08:54:17 UTC +++ sync/util/get_session_name.cc -@@ -11,7 +11,7 @@ +@@ -12,7 +12,7 @@ #include "base/sys_info.h" #include "base/task_runner.h" @@ -9,7 +9,7 @@ #include "sync/util/get_session_name_linux.h" #elif defined(OS_IOS) #include "sync/util/get_session_name_ios.h" -@@ -36,7 +36,7 @@ +@@ -37,7 +37,7 @@ // like "stumpy-signed-mp-v2keys" etc. The information can be checked on // "CHROMEOS_RELEASE_BOARD" line in chrome://system. session_name = board.substr(0, 6) == "stumpy" ? "Chromebox" : "Chromebook"; diff --git a/www/chromium/files/patch-sync__util__get_session_name_linux.cc b/www/chromium/files/patch-sync__util__get_session_name_linux.cc index 47f84b2377e0..4f7f5de68fb5 100644 --- a/www/chromium/files/patch-sync__util__get_session_name_linux.cc +++ b/www/chromium/files/patch-sync__util__get_session_name_linux.cc @@ -1,4 +1,4 @@ ---- sync/util/get_session_name_linux.cc.orig 2014-10-02 17:19:01 UTC +--- sync/util/get_session_name_linux.cc.orig 2014-10-10 08:54:17 UTC +++ sync/util/get_session_name_linux.cc @@ -13,8 +13,9 @@ namespace internal { diff --git a/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h b/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h index 8deaaf66e0f8..5b9c740b1634 100644 --- a/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h +++ b/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h @@ -1,4 +1,4 @@ ---- testing/gtest/include/gtest/internal/gtest-port.h.orig 2014-10-02 17:39:53 UTC +--- testing/gtest/include/gtest/internal/gtest-port.h.orig 2014-10-10 09:15:35 UTC +++ testing/gtest/include/gtest/internal/gtest-port.h @@ -343,6 +343,8 @@ # define GTEST_OS_NACL 1 diff --git a/www/chromium/files/patch-testing__gtest__src__gtest.cc b/www/chromium/files/patch-testing__gtest__src__gtest.cc index 87e6e4aad4bd..cbdab15180ca 100644 --- a/www/chromium/files/patch-testing__gtest__src__gtest.cc +++ b/www/chromium/files/patch-testing__gtest__src__gtest.cc @@ -1,4 +1,4 @@ ---- testing/gtest/src/gtest.cc.orig 2014-10-02 17:39:53 UTC +--- testing/gtest/src/gtest.cc.orig 2014-10-10 09:15:35 UTC +++ testing/gtest/src/gtest.cc @@ -121,6 +121,10 @@ diff --git a/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp b/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp index 7922b122b2bc..c0f5de9a0f99 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp +++ b/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp @@ -1,6 +1,6 @@ ---- third_party/WebKit/Source/core/core.gyp.orig 2014-10-02 18:00:36 UTC +--- third_party/WebKit/Source/core/core.gyp.orig 2014-10-10 09:34:37 UTC +++ third_party/WebKit/Source/core/core.gyp -@@ -589,7 +589,7 @@ +@@ -587,7 +587,7 @@ # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable. 'cflags': ['-Wno-uninitialized'], }], @@ -9,7 +9,7 @@ 'sources/': [ ['exclude', 'Linux\\.cpp$'], ], -@@ -627,7 +627,7 @@ +@@ -625,7 +625,7 @@ ['OS=="win" and buildtype=="Official"', { 'msvs_shard': 19, }], diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp b/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp index aec2d595b2d0..4bc2153c8586 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp +++ b/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-10-02 18:00:37 UTC +--- third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-10-10 09:34:37 UTC +++ third_party/WebKit/Source/platform/blink_platform.gyp @@ -38,6 +38,9 @@ 'targets': [{ @@ -19,7 +19,7 @@ 'sources/': [ # Cherry-pick files excluded by the broader regular expressions above. ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'], -@@ -268,7 +271,7 @@ +@@ -267,7 +270,7 @@ ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'], ], }], @@ -28,7 +28,7 @@ 'sources/': [ ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'], ] -@@ -367,7 +370,7 @@ +@@ -363,7 +366,7 @@ ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'], ], }], @@ -37,7 +37,7 @@ 'sources/': [ ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], ], -@@ -413,7 +416,7 @@ +@@ -409,7 +412,7 @@ ['exclude', 'Android\\.cpp$'], ], }], diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp b/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp index 71a235d85d9b..e3efda10f173 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp +++ b/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp @@ -1,6 +1,6 @@ ---- third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig 2014-10-02 18:00:37 UTC +--- third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig 2014-10-10 09:34:37 UTC +++ third_party/WebKit/Source/platform/heap/ThreadState.cpp -@@ -54,13 +54,22 @@ +@@ -56,13 +56,22 @@ #include <sanitizer/msan_interface.h> #endif @@ -24,7 +24,7 @@ void* base; size_t size; int error = pthread_attr_getstack(&attr, &base, &size); -@@ -68,6 +77,9 @@ +@@ -70,6 +79,9 @@ pthread_attr_destroy(&attr); return reinterpret_cast<Address>(base) + size; } diff --git a/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp b/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp index 328d8e4120ec..d4a9ceee74b7 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp +++ b/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/web/web.gyp.orig 2014-10-02 18:00:38 UTC +--- third_party/WebKit/Source/web/web.gyp.orig 2014-10-10 09:34:38 UTC +++ third_party/WebKit/Source/web/web.gyp @@ -145,7 +145,7 @@ }, diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h b/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h index fbe42f130b9b..5c2491da2c6b 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h +++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-10-02 18:00:38 UTC +--- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-10-10 09:34:38 UTC +++ third_party/WebKit/Source/wtf/ByteSwap.h @@ -52,14 +52,20 @@ diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp b/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp index 8048b3d17e3f..75f74b23371d 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp +++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp @@ -1,6 +1,6 @@ ---- third_party/WebKit/Source/wtf/wtf.gyp.orig 2014-10-02 18:00:38 UTC +--- third_party/WebKit/Source/wtf/wtf.gyp.orig 2014-10-10 09:34:38 UTC +++ third_party/WebKit/Source/wtf/wtf.gyp -@@ -70,7 +70,7 @@ +@@ -67,7 +67,7 @@ 'target_name': 'wtf', 'type': '<(component)', 'include_dirs': [ diff --git a/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c b/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c index c28da5279ca7..d6b63698fe02 100644 --- a/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c +++ b/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c @@ -1,4 +1,4 @@ ---- third_party/ffmpeg/libavutil/mem.c.orig 2014-10-02 17:40:35 UTC +--- third_party/ffmpeg/libavutil/mem.c.orig 2014-10-10 09:16:21 UTC +++ third_party/ffmpeg/libavutil/mem.c @@ -32,7 +32,7 @@ #include <stdint.h> diff --git a/www/chromium/files/patch-third_party__khronos__khronos.gyp b/www/chromium/files/patch-third_party__khronos__khronos.gyp index 876e4e5e172b..5492deb2a985 100644 --- a/www/chromium/files/patch-third_party__khronos__khronos.gyp +++ b/www/chromium/files/patch-third_party__khronos__khronos.gyp @@ -1,4 +1,4 @@ ---- third_party/khronos/khronos.gyp.orig 2014-10-02 17:19:02 UTC +--- third_party/khronos/khronos.gyp.orig 2014-10-10 08:54:17 UTC +++ third_party/khronos/khronos.gyp @@ -11,6 +11,7 @@ 'include_dirs': [ diff --git a/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp b/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp index d0a93f92e763..3267cb7b1ef3 100644 --- a/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp +++ b/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp @@ -1,4 +1,4 @@ ---- third_party/libXNVCtrl/libXNVCtrl.gyp.orig 2014-10-02 17:19:02 UTC +--- third_party/libXNVCtrl/libXNVCtrl.gyp.orig 2014-10-10 08:54:17 UTC +++ third_party/libXNVCtrl/libXNVCtrl.gyp @@ -13,6 +13,9 @@ 'NVCtrlLib.h', diff --git a/www/chromium/files/patch-third_party__libexif__libexif.gyp b/www/chromium/files/patch-third_party__libexif__libexif.gyp index cf62b7ae6de5..a820bf7e79c5 100644 --- a/www/chromium/files/patch-third_party__libexif__libexif.gyp +++ b/www/chromium/files/patch-third_party__libexif__libexif.gyp @@ -1,4 +1,4 @@ ---- third_party/libexif/libexif.gyp.orig 2014-09-04 00:04:19 UTC +--- third_party/libexif/libexif.gyp.orig 2014-10-10 08:54:17 UTC +++ third_party/libexif/libexif.gyp @@ -5,9 +5,9 @@ { diff --git a/www/chromium/files/patch-third_party__libjingle__libjingle.gyp b/www/chromium/files/patch-third_party__libjingle__libjingle.gyp index a73b47e11390..aa8161fda744 100644 --- a/www/chromium/files/patch-third_party__libjingle__libjingle.gyp +++ b/www/chromium/files/patch-third_party__libjingle__libjingle.gyp @@ -1,6 +1,6 @@ ---- third_party/libjingle/libjingle.gyp.orig 2014-10-02 17:39:48 UTC +--- third_party/libjingle/libjingle.gyp.orig 2014-10-10 09:15:32 UTC +++ third_party/libjingle/libjingle.gyp -@@ -484,7 +484,7 @@ +@@ -495,7 +495,7 @@ ], }], # TODO(mallinath) - Enable SCTP for iOS. diff --git a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp index f3eb3f4f1f91..1902c94e9cac 100644 --- a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp +++ b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp @@ -1,4 +1,4 @@ ---- third_party/libjpeg_turbo/libjpeg.gyp.orig 2014-09-04 00:29:24 UTC +--- third_party/libjpeg_turbo/libjpeg.gyp.orig 2014-10-10 09:15:45 UTC +++ third_party/libjpeg_turbo/libjpeg.gyp @@ -246,7 +246,7 @@ ], diff --git a/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp b/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp index efe72bb3040a..ec8140d9501a 100644 --- a/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp +++ b/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp @@ -1,4 +1,4 @@ ---- third_party/libphonenumber/libphonenumber.gyp.orig 2014-10-02 17:19:02 UTC +--- third_party/libphonenumber/libphonenumber.gyp.orig 2014-10-10 08:54:17 UTC +++ third_party/libphonenumber/libphonenumber.gyp @@ -11,6 +11,7 @@ # generated protocol headers to be available with "phonenumbers" include diff --git a/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh b/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh index d52d5b5f594e..ae21f7b0a163 100644 --- a/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh +++ b/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh @@ -1,4 +1,4 @@ ---- third_party/libvpx/unpack_lib_posix.sh.orig 2014-10-02 17:40:17 UTC +--- third_party/libvpx/unpack_lib_posix.sh.orig 2014-10-10 09:15:53 UTC +++ third_party/libvpx/unpack_lib_posix.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e diff --git a/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h b/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h index 2182a696ba12..616f6aa4a7fd 100644 --- a/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h +++ b/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h @@ -1,4 +1,4 @@ ---- third_party/ots/include/opentype-sanitiser.h.orig 2014-10-02 17:40:20 UTC +--- third_party/ots/include/opentype-sanitiser.h.orig 2014-10-10 09:15:53 UTC +++ third_party/ots/include/opentype-sanitiser.h @@ -22,6 +22,7 @@ #else diff --git a/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi b/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi index c57575bab76a..d6e50badc1a4 100644 --- a/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi +++ b/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi @@ -1,4 +1,4 @@ ---- third_party/pdfium/build/standalone.gypi.orig 2014-10-02 17:40:24 UTC +--- third_party/pdfium/build/standalone.gypi.orig 2014-10-10 09:15:54 UTC +++ third_party/pdfium/build/standalone.gypi @@ -13,7 +13,7 @@ 'variables': { diff --git a/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h b/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h index aadef589923a..093876a9275f 100644 --- a/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h +++ b/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h @@ -1,4 +1,4 @@ ---- third_party/pdfium/core/include/fxcrt/fx_system.h.orig 2014-10-02 17:40:24 UTC +--- third_party/pdfium/core/include/fxcrt/fx_system.h.orig 2014-10-10 09:15:54 UTC +++ third_party/pdfium/core/include/fxcrt/fx_system.h @@ -21,7 +21,7 @@ #elif defined(_WIN32) || defined(_WIN64) diff --git a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp index 3bbe0340466b..9e163796efe6 100644 --- a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp +++ b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp @@ -1,4 +1,4 @@ ---- third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig 2014-10-02 17:40:24 UTC +--- third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig 2014-10-10 09:15:55 UTC +++ third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp @@ -1052,7 +1052,7 @@ //function AFNumber_Format(nDec, sepStyle, negStyle, currStyle, strCurrency, bCurrencyPrepend) diff --git a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp index 75526fd21fb5..3525f9269945 100644 --- a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp +++ b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp @@ -1,4 +1,4 @@ ---- third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig 2014-10-02 17:40:24 UTC +--- third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig 2014-10-10 09:15:55 UTC +++ third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp @@ -753,12 +753,17 @@ diff --git a/www/chromium/files/patch-third_party__pdfium__pdfium.gyp b/www/chromium/files/patch-third_party__pdfium__pdfium.gyp index ebd2b8f0bf83..5477cdf23665 100644 --- a/www/chromium/files/patch-third_party__pdfium__pdfium.gyp +++ b/www/chromium/files/patch-third_party__pdfium__pdfium.gyp @@ -1,4 +1,4 @@ ---- third_party/pdfium/pdfium.gyp.orig 2014-10-02 17:40:24 UTC +--- third_party/pdfium/pdfium.gyp.orig 2014-10-10 09:15:55 UTC +++ third_party/pdfium/pdfium.gyp @@ -13,7 +13,7 @@ ['pdf_use_skia==1', { diff --git a/www/chromium/files/patch-third_party__pdfium__third_party__logging.h b/www/chromium/files/patch-third_party__pdfium__third_party__logging.h index 986dc05af056..33b39e4d2097 100644 --- a/www/chromium/files/patch-third_party__pdfium__third_party__logging.h +++ b/www/chromium/files/patch-third_party__pdfium__third_party__logging.h @@ -1,4 +1,4 @@ ---- third_party/pdfium/third_party/logging.h.orig 2014-10-02 17:40:24 UTC +--- third_party/pdfium/third_party/logging.h.orig 2014-10-10 09:15:55 UTC +++ third_party/pdfium/third_party/logging.h @@ -10,7 +10,7 @@ #define CHECK(condition) \ diff --git a/www/chromium/files/patch-third_party__sfntly__sfntly.gyp b/www/chromium/files/patch-third_party__sfntly__sfntly.gyp index a8040aa0f232..efd24c266537 100644 --- a/www/chromium/files/patch-third_party__sfntly__sfntly.gyp +++ b/www/chromium/files/patch-third_party__sfntly__sfntly.gyp @@ -1,4 +1,4 @@ ---- third_party/sfntly/sfntly.gyp.orig 2014-10-02 17:19:02 UTC +--- third_party/sfntly/sfntly.gyp.orig 2014-10-10 08:54:18 UTC +++ third_party/sfntly/sfntly.gyp @@ -126,7 +126,7 @@ 'cpp/src/sample/chromium/subsetter_impl.h', diff --git a/www/chromium/files/patch-third_party__sqlite__sqlite.gyp b/www/chromium/files/patch-third_party__sqlite__sqlite.gyp index fb52106c35fc..31dc7ea984be 100644 --- a/www/chromium/files/patch-third_party__sqlite__sqlite.gyp +++ b/www/chromium/files/patch-third_party__sqlite__sqlite.gyp @@ -1,4 +1,4 @@ ---- third_party/sqlite/sqlite.gyp.orig 2014-10-02 17:39:48 UTC +--- third_party/sqlite/sqlite.gyp.orig 2014-10-10 09:15:32 UTC +++ third_party/sqlite/sqlite.gyp @@ -105,6 +105,8 @@ 'amalgamation', diff --git a/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc b/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc index c56d148649f9..cbd6382b93ab 100644 --- a/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc +++ b/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/cpumonitor.cc.orig 2014-10-02 17:40:33 UTC +--- third_party/webrtc/base/cpumonitor.cc.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/base/cpumonitor.cc @@ -36,13 +36,13 @@ #include <mach/task.h> diff --git a/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc b/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc index b3ae82e41eec..862465c2c289 100644 --- a/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc +++ b/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/httpcommon.cc.orig 2014-10-02 17:40:33 UTC +--- third_party/webrtc/base/httpcommon.cc.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/base/httpcommon.cc @@ -382,7 +382,7 @@ gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60; @@ -6,6 +6,6 @@ // TODO: Android should support timezone, see b/2441195 -#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID) || defined(BSD) +#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD) - tm *tm_for_timezone = localtime((time_t *)&gmt); + tm *tm_for_timezone = localtime(&gmt); *seconds = gmt + tm_for_timezone->tm_gmtoff; #else diff --git a/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h b/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h index 5d9021eda452..7f66fa6e0ccb 100644 --- a/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h +++ b/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/ipaddress.h.orig 2014-10-02 17:40:33 UTC +--- third_party/webrtc/base/ipaddress.h.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/base/ipaddress.h @@ -17,6 +17,9 @@ #include <arpa/inet.h> diff --git a/www/chromium/files/patch-third_party__webrtc__base__linux.cc b/www/chromium/files/patch-third_party__webrtc__base__linux.cc index 1e20b7d72ab6..ae29684ee768 100644 --- a/www/chromium/files/patch-third_party__webrtc__base__linux.cc +++ b/www/chromium/files/patch-third_party__webrtc__base__linux.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/linux.cc.orig 2014-10-02 17:40:33 UTC +--- third_party/webrtc/base/linux.cc.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/base/linux.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. diff --git a/www/chromium/files/patch-third_party__webrtc__base__linux.h b/www/chromium/files/patch-third_party__webrtc__base__linux.h index 7c95f39ee948..73240496042a 100644 --- a/www/chromium/files/patch-third_party__webrtc__base__linux.h +++ b/www/chromium/files/patch-third_party__webrtc__base__linux.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/linux.h.orig 2014-10-02 17:40:33 UTC +--- third_party/webrtc/base/linux.h.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/base/linux.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_BASE_LINUX_H_ diff --git a/www/chromium/files/patch-third_party__webrtc__base__network.cc b/www/chromium/files/patch-third_party__webrtc__base__network.cc index 9567127fb370..f6cd6376116f 100644 --- a/www/chromium/files/patch-third_party__webrtc__base__network.cc +++ b/www/chromium/files/patch-third_party__webrtc__base__network.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/network.cc.orig 2014-10-02 17:40:33 UTC +--- third_party/webrtc/base/network.cc.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/base/network.cc @@ -18,7 +18,7 @@ // linux/if.h can't be included at the same time as the posix sys/if.h, and @@ -9,16 +9,16 @@ #include <linux/if.h> #include <linux/route.h> #elif !defined(__native_client__) -@@ -462,7 +462,7 @@ +@@ -479,7 +479,7 @@ } - #endif // WEBRTC_WIN + #endif // WEBRTC_WIN -#if defined(WEBRTC_LINUX) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) bool IsDefaultRoute(const std::string& network_name) { FileStream fs; if (!fs.Open("/proc/net/route", "r", NULL)) { -@@ -502,7 +502,7 @@ +@@ -519,7 +519,7 @@ strncmp(network.name().c_str(), "vnic", 4) == 0) { return true; } diff --git a/www/chromium/files/patch-third_party__webrtc__base__network.h b/www/chromium/files/patch-third_party__webrtc__base__network.h index 0b57fee375db..722bf656b2fd 100644 --- a/www/chromium/files/patch-third_party__webrtc__base__network.h +++ b/www/chromium/files/patch-third_party__webrtc__base__network.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/network.h.orig 2014-10-02 17:40:33 UTC +--- third_party/webrtc/base/network.h.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/base/network.h @@ -21,6 +21,10 @@ #include "webrtc/base/messagehandler.h" diff --git a/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc b/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc index a0e1f69ec240..4e750e90ead6 100644 --- a/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc +++ b/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/physicalsocketserver.cc.orig 2014-10-02 17:40:33 UTC +--- third_party/webrtc/base/physicalsocketserver.cc.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/base/physicalsocketserver.cc @@ -240,7 +240,7 @@ socklen_t optlen = sizeof(*value); diff --git a/www/chromium/files/patch-third_party__webrtc__base__stringutils.h b/www/chromium/files/patch-third_party__webrtc__base__stringutils.h index 79f826c54285..fdea78fc41a6 100644 --- a/www/chromium/files/patch-third_party__webrtc__base__stringutils.h +++ b/www/chromium/files/patch-third_party__webrtc__base__stringutils.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/stringutils.h.orig 2014-10-02 17:40:33 UTC +--- third_party/webrtc/base/stringutils.h.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/base/stringutils.h @@ -23,11 +23,11 @@ #endif // WEBRTC_WIN diff --git a/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc b/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc index 2e7c482b04d3..ae09b81d3f8d 100644 --- a/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc +++ b/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/systeminfo.cc.orig 2014-10-02 17:40:33 UTC +--- third_party/webrtc/base/systeminfo.cc.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/base/systeminfo.cc @@ -19,8 +19,12 @@ #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) diff --git a/www/chromium/files/patch-third_party__webrtc__build__common.gypi b/www/chromium/files/patch-third_party__webrtc__build__common.gypi index 43bbc3b12900..bde85ec062f4 100644 --- a/www/chromium/files/patch-third_party__webrtc__build__common.gypi +++ b/www/chromium/files/patch-third_party__webrtc__build__common.gypi @@ -1,6 +1,6 @@ ---- third_party/webrtc/build/common.gypi.orig 2014-10-02 17:40:33 UTC +--- third_party/webrtc/build/common.gypi.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/build/common.gypi -@@ -321,6 +321,13 @@ +@@ -328,6 +328,13 @@ 'WEBRTC_LINUX', ], }], diff --git a/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi b/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi index 0a4e1b61a3ca..d675b381742b 100644 --- a/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi +++ b/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi @@ -1,4 +1,4 @@ ---- third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2014-10-02 17:40:34 UTC +--- third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/modules/audio_device/audio_device.gypi @@ -49,7 +49,7 @@ 'dummy/file_audio_device.h', diff --git a/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi b/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi index 53452089f85f..b74e63c4f5b9 100644 --- a/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi +++ b/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2014-10-02 17:40:34 UTC +--- third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/modules/desktop_capture/desktop_capture.gypi -@@ -109,6 +109,11 @@ +@@ -110,6 +110,11 @@ ], }, }], diff --git a/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc b/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc index 544bb93c5410..53284e3c4fa1 100644 --- a/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc +++ b/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2014-10-02 17:40:34 UTC +--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc @@ -15,6 +15,7 @@ #include <string.h> diff --git a/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc b/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc index 950e7b3ad0e2..eec0af52d01d 100644 --- a/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc +++ b/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/modules/video_coding/main/source/receiver.cc.orig 2014-10-02 17:40:34 UTC +--- third_party/webrtc/modules/video_coding/main/source/receiver.cc.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/modules/video_coding/main/source/receiver.cc @@ -134,8 +134,8 @@ // Assume that render timing errors are due to changes in the video stream. diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc index b1ba0d24232f..ff19711b78f9 100644 --- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc +++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2014-10-02 17:40:34 UTC +--- third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/system_wrappers/source/atomic32_posix.cc @@ -12,7 +12,11 @@ diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc index 360a5fce2a6e..64289e1a9e36 100644 --- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc +++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/system_wrappers/source/cpu_info.cc.orig 2014-10-02 17:40:34 UTC +--- third_party/webrtc/system_wrappers/source/cpu_info.cc.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/system_wrappers/source/cpu_info.cc @@ -12,7 +12,10 @@ diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc index 8d7a76cfb6f6..72309c1252ad 100644 --- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc +++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2014-10-02 17:40:34 UTC +--- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/system_wrappers/source/thread_posix.cc @@ -51,9 +51,11 @@ #include <string.h> // strncpy diff --git a/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h b/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h index 93d4ab14441b..d6cf407af772 100644 --- a/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h +++ b/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2014-10-02 17:40:34 UTC +--- third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2014-10-10 09:16:13 UTC +++ third_party/webrtc/voice_engine/voice_engine_defines.h @@ -237,7 +237,7 @@ #include <pthread.h> diff --git a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py index 20eb0aa948fa..7781fcb43461 100644 --- a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py +++ b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py @@ -1,4 +1,4 @@ ---- tools/gyp/pylib/gyp/generator/make.py.orig 2014-10-02 17:40:30 UTC +--- tools/gyp/pylib/gyp/generator/make.py.orig 2014-10-10 09:16:07 UTC +++ tools/gyp/pylib/gyp/generator/make.py @@ -88,7 +88,7 @@ else: diff --git a/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp b/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp index bf8b5326125e..3587dff0b5a1 100644 --- a/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp +++ b/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp @@ -1,4 +1,4 @@ ---- tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2014-10-02 17:40:30 UTC +--- tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2014-10-10 09:16:07 UTC +++ tools/gyp/test/additional-targets/src/dir1/actions.gyp @@ -47,7 +47,7 @@ }, diff --git a/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp b/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp index 09fbdedc774e..24d8b05b4c3c 100644 --- a/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp +++ b/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp @@ -1,4 +1,4 @@ ---- tools/gyp/test/library/src/library.gyp.orig 2014-10-02 17:40:30 UTC +--- tools/gyp/test/library/src/library.gyp.orig 2014-10-10 09:16:07 UTC +++ tools/gyp/test/library/src/library.gyp @@ -48,7 +48,7 @@ }, diff --git a/www/chromium/files/patch-tools__metrics__histograms__histograms.xml b/www/chromium/files/patch-tools__metrics__histograms__histograms.xml deleted file mode 100644 index 0eaff934a058..000000000000 --- a/www/chromium/files/patch-tools__metrics__histograms__histograms.xml +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/metrics/histograms/histograms.xml.orig 2014-10-02 17:39:48 UTC -+++ tools/metrics/histograms/histograms.xml -@@ -45253,6 +45253,7 @@ - <int value="162" label="SOCKET_RECEIVE_BUFFER_SIZE_UNCHANGEABLE"/> - <int value="163" label="SOCKET_SEND_BUFFER_SIZE_UNCHANGEABLE"/> - <int value="164" label="SSL_CLIENT_AUTH_CERT_BAD_FORMAT"/> -+ <int value="165" label="SSL_FALLBACK_BEYOND_MINIMUM_VERSION"/> - <int value="200" label="CERT_COMMON_NAME_INVALID"/> - <int value="201" label="CERT_DATE_INVALID"/> - <int value="202" label="CERT_AUTHORITY_INVALID"/> diff --git a/www/chromium/files/patch-ui__app_list__app_list_constants.cc b/www/chromium/files/patch-ui__app_list__app_list_constants.cc index 33a346e62861..b86b0a18a2b2 100644 --- a/www/chromium/files/patch-ui__app_list__app_list_constants.cc +++ b/www/chromium/files/patch-ui__app_list__app_list_constants.cc @@ -1,6 +1,6 @@ ---- ui/app_list/app_list_constants.cc.orig 2014-10-02 17:39:48 UTC +--- ui/app_list/app_list_constants.cc.orig 2014-10-10 09:15:32 UTC +++ ui/app_list/app_list_constants.cc -@@ -95,7 +95,7 @@ +@@ -94,7 +94,7 @@ const ui::ResourceBundle::FontStyle kItemTextFontStyle = ui::ResourceBundle::SmallBoldFont; diff --git a/www/chromium/files/patch-ui__app_list__app_list_constants.h b/www/chromium/files/patch-ui__app_list__app_list_constants.h index 58a9bd2cbffd..31eed0a0bfe2 100644 --- a/www/chromium/files/patch-ui__app_list__app_list_constants.h +++ b/www/chromium/files/patch-ui__app_list__app_list_constants.h @@ -1,4 +1,4 @@ ---- ui/app_list/app_list_constants.h.orig 2014-10-02 17:39:48 UTC +--- ui/app_list/app_list_constants.h.orig 2014-10-10 09:15:32 UTC +++ ui/app_list/app_list_constants.h @@ -66,8 +66,8 @@ diff --git a/www/chromium/files/patch-ui__base__ui_base.gyp b/www/chromium/files/patch-ui__base__ui_base.gyp index 4c0fd7628092..dc1b824787f0 100644 --- a/www/chromium/files/patch-ui__base__ui_base.gyp +++ b/www/chromium/files/patch-ui__base__ui_base.gyp @@ -1,6 +1,6 @@ ---- ui/base/ui_base.gyp.orig 2014-10-02 17:39:48 UTC +--- ui/base/ui_base.gyp.orig 2014-10-10 08:54:18 UTC +++ ui/base/ui_base.gyp -@@ -427,7 +427,7 @@ +@@ -434,7 +434,7 @@ 'x/selection_utils.h', ] }], diff --git a/www/chromium/files/patch-ui__events__event_switches.cc b/www/chromium/files/patch-ui__events__event_switches.cc index 10656707bfb5..090aae006943 100644 --- a/www/chromium/files/patch-ui__events__event_switches.cc +++ b/www/chromium/files/patch-ui__events__event_switches.cc @@ -1,6 +1,6 @@ ---- ui/events/event_switches.cc.orig 2014-10-02 17:39:48 UTC +--- ui/events/event_switches.cc.orig 2014-10-10 08:54:18 UTC +++ ui/events/event_switches.cc -@@ -39,7 +39,7 @@ +@@ -27,7 +27,7 @@ const char kCompensateForUnstablePinchZoom[] = "compensate-for-unstable-pinch-zoom"; diff --git a/www/chromium/files/patch-ui__events__event_switches.h b/www/chromium/files/patch-ui__events__event_switches.h index 07ea0f37e972..7e7697ed2d44 100644 --- a/www/chromium/files/patch-ui__events__event_switches.h +++ b/www/chromium/files/patch-ui__events__event_switches.h @@ -1,7 +1,7 @@ ---- ui/events/event_switches.h.orig 2014-10-02 17:39:48 UTC +--- ui/events/event_switches.h.orig 2014-10-10 08:54:18 UTC +++ ui/events/event_switches.h -@@ -21,7 +21,7 @@ - EVENTS_BASE_EXPORT extern const char kUnifiedGestureDetectorDisabled[]; +@@ -17,7 +17,7 @@ + EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[]; EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[]; -#if defined(OS_LINUX) diff --git a/www/chromium/files/patch-ui__gl__gl.gyp b/www/chromium/files/patch-ui__gl__gl.gyp index 4ba85d435130..75b22c7a7aa7 100644 --- a/www/chromium/files/patch-ui__gl__gl.gyp +++ b/www/chromium/files/patch-ui__gl__gl.gyp @@ -1,6 +1,6 @@ ---- ui/gl/gl.gyp.orig 2014-10-02 17:39:48 UTC +--- ui/gl/gl.gyp.orig 2014-10-10 09:15:32 UTC +++ ui/gl/gl.gyp -@@ -174,7 +174,7 @@ +@@ -173,7 +173,7 @@ }, ], 'conditions': [ @@ -9,7 +9,7 @@ 'sources': [ 'egl_util.cc', 'egl_util.h', -@@ -195,7 +195,7 @@ +@@ -194,7 +194,7 @@ '<(DEPTH)/third_party/khronos', ], }], diff --git a/www/chromium/files/patch-ui__resources__ui_resources.grd b/www/chromium/files/patch-ui__resources__ui_resources.grd index 9540badb4cac..d5b93d24aa94 100644 --- a/www/chromium/files/patch-ui__resources__ui_resources.grd +++ b/www/chromium/files/patch-ui__resources__ui_resources.grd @@ -1,5 +1,5 @@ ---- ui/resources/ui_resources.grd.orig 2014-09-10 01:47:14.000000000 +0200 -+++ ui/resources/ui_resources.grd 2014-09-17 13:51:43.000000000 +0200 +--- ui/resources/ui_resources.grd.orig 2014-10-10 09:15:32 UTC ++++ ui/resources/ui_resources.grd @@ -39,7 +39,7 @@ <structure type="chrome_scaled_image" name="IDR_APP_TOP_LEFT" file="app_top_left.png" /> <structure type="chrome_scaled_image" name="IDR_APP_TOP_RIGHT" file="app_top_right.png" /> diff --git a/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc b/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc index 8937c44b0cb7..9e0c68d4b82e 100644 --- a/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc +++ b/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc @@ -1,4 +1,4 @@ ---- ui/shell_dialogs/select_file_dialog.cc.orig 2014-10-02 17:19:03 UTC +--- ui/shell_dialogs/select_file_dialog.cc.orig 2014-10-10 08:54:19 UTC +++ ui/shell_dialogs/select_file_dialog.cc @@ -19,7 +19,7 @@ #include "ui/shell_dialogs/select_file_dialog_mac.h" diff --git a/www/chromium/files/patch-ui__views__views.gyp b/www/chromium/files/patch-ui__views__views.gyp index 45c3b5892859..889754500a80 100644 --- a/www/chromium/files/patch-ui__views__views.gyp +++ b/www/chromium/files/patch-ui__views__views.gyp @@ -1,6 +1,6 @@ ---- ui/views/views.gyp.orig 2014-10-02 17:39:48 UTC +--- ui/views/views.gyp.orig 2014-10-10 08:54:19 UTC +++ ui/views/views.gyp -@@ -605,7 +605,7 @@ +@@ -612,7 +612,7 @@ '../display/display.gyp:display_util', ], }], diff --git a/www/chromium/files/patch-ui__views__views_delegate.cc b/www/chromium/files/patch-ui__views__views_delegate.cc index 41174dbbc365..b110234906bb 100644 --- a/www/chromium/files/patch-ui__views__views_delegate.cc +++ b/www/chromium/files/patch-ui__views__views_delegate.cc @@ -1,4 +1,4 @@ ---- ui/views/views_delegate.cc.orig 2014-10-02 17:19:03 UTC +--- ui/views/views_delegate.cc.orig 2014-10-10 08:54:19 UTC +++ ui/views/views_delegate.cc @@ -50,7 +50,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { diff --git a/www/chromium/files/patch-ui__views__views_delegate.h b/www/chromium/files/patch-ui__views__views_delegate.h index 3b7a8d1647ec..0647a0a39a8d 100644 --- a/www/chromium/files/patch-ui__views__views_delegate.h +++ b/www/chromium/files/patch-ui__views__views_delegate.h @@ -1,4 +1,4 @@ ---- ui/views/views_delegate.h.orig 2014-10-02 17:19:03 UTC +--- ui/views/views_delegate.h.orig 2014-10-10 08:54:19 UTC +++ ui/views/views_delegate.h @@ -98,7 +98,7 @@ // Returns true if the window passed in is in the Windows 8 metro diff --git a/www/chromium/files/patch-ui__views__window__custom_frame_view.cc b/www/chromium/files/patch-ui__views__window__custom_frame_view.cc index ce53449abb5c..a7428bd4638e 100644 --- a/www/chromium/files/patch-ui__views__window__custom_frame_view.cc +++ b/www/chromium/files/patch-ui__views__window__custom_frame_view.cc @@ -1,6 +1,6 @@ ---- ui/views/window/custom_frame_view.cc.orig 2014-10-06 09:19:47.000000000 +0200 -+++ ui/views/window/custom_frame_view.cc 2014-10-06 09:20:31.000000000 +0200 -@@ -281,7 +281,7 @@ +--- ui/views/window/custom_frame_view.cc.orig 2014-10-10 08:54:19 UTC ++++ ui/views/window/custom_frame_view.cc +@@ -283,7 +283,7 @@ int CustomFrameView::CaptionButtonY() const { // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. diff --git a/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc b/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc index 2256ed45e94e..7134b69108f5 100644 --- a/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc +++ b/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc @@ -1,37 +1,34 @@ ---- v8/src/base/platform/platform-freebsd.cc.orig 2014-10-02 17:41:11 UTC -+++ v8/src/base/platform/platform-freebsd.cc -@@ -131,14 +131,14 @@ - addr_buffer[0] = '0'; - addr_buffer[1] = 'x'; - addr_buffer[10] = 0; -- int result = read(fd, addr_buffer + 2, 8); -- if (result < 8) break; -+ int resultread = read(fd, addr_buffer + 2, 8); -+ if (resultread < 8) break; - unsigned start = StringToLong(addr_buffer); -- result = read(fd, addr_buffer + 2, 1); -- if (result < 1) break; -+ resultread = read(fd, addr_buffer + 2, 1); -+ if (resultread < 1) break; - if (addr_buffer[2] != '-') break; -- result = read(fd, addr_buffer + 2, 8); -- if (result < 8) break; -+ resultread = read(fd, addr_buffer + 2, 8); -+ if (resultread < 8) break; +--- v8/src/base/platform/platform-freebsd.cc.orig 2014-10-17 02:58:15.000000000 +0200 ++++ v8/src/base/platform/platform-freebsd.cc 2014-10-20 18:26:17.000000000 +0200 +@@ -141,21 +141,21 @@ + if (bytes_read < 8) break; unsigned end = StringToLong(addr_buffer); char buffer[MAP_LENGTH]; - int bytes_read = -1; -@@ -146,8 +146,8 @@ - bytes_read++; - if (bytes_read >= MAP_LENGTH - 1) +- int bytes_read = -1; ++ int _bytes_read = -1; + do { +- bytes_read++; +- if (bytes_read >= MAP_LENGTH - 1) ++ _bytes_read++; ++ if (_bytes_read >= MAP_LENGTH - 1) break; -- result = read(fd, buffer + bytes_read, 1); -- if (result < 1) break; -+ resultread = read(fd, buffer + bytes_read, 1); -+ if (resultread < 1) break; - } while (buffer[bytes_read] != '\n'); - buffer[bytes_read] = 0; +- bytes_read = read(fd, buffer + bytes_read, 1); ++ bytes_read = read(fd, buffer + _bytes_read, 1); + if (bytes_read < 1) break; +- } while (buffer[bytes_read] != '\n'); +- buffer[bytes_read] = 0; ++ } while (buffer[_bytes_read] != '\n'); ++ buffer[_bytes_read] = 0; // Ignore mappings that are not executable. + if (buffer[3] != 'x') continue; + char* start_of_path = index(buffer, '/'); + // There may be no filename in this line. Skip to next. + if (start_of_path == NULL) continue; +- buffer[bytes_read] = 0; ++ buffer[_bytes_read] = 0; + result.push_back(SharedLibraryAddress(start_of_path, start, end)); + } + close(fd); @@ -187,7 +187,7 @@ void* reservation = mmap(OS::GetRandomMmapAddr(), request_size, diff --git a/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc b/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc deleted file mode 100644 index d7bbced0213a..000000000000 --- a/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2014-10-02 17:41:11 UTC -+++ v8/src/base/platform/platform-posix.cc -@@ -324,7 +324,9 @@ - #if defined(ANDROID) - return static_cast<int>(syscall(__NR_gettid)); - #else -+#ifdef HAVE_SYSCALL_H - return static_cast<int>(syscall(SYS_gettid)); -+#endif - #endif // defined(ANDROID) - } - diff --git a/www/chromium/files/patch-v8__src__preparser.h b/www/chromium/files/patch-v8__src__preparser.h index 12fa993b6abf..c0b70fc2b93b 100644 --- a/www/chromium/files/patch-v8__src__preparser.h +++ b/www/chromium/files/patch-v8__src__preparser.h @@ -1,6 +1,6 @@ ---- v8/src/preparser.h.orig 2014-10-02 17:41:11 UTC +--- v8/src/preparser.h.orig 2014-10-10 09:16:50 UTC +++ v8/src/preparser.h -@@ -437,7 +437,7 @@ +@@ -450,7 +450,7 @@ void ReportMessageAt(Scanner::Location location, const char* message, bool is_reference_error = false) { Traits::ReportMessageAt(location, message, diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 571c5b9e4683..d173fea1213b 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -127,61 +127,77 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/thumbHoverVert.png %%DATADIR%%/resources/inspector/Images/thumbVert.png %%DATADIR%%/resources/inspector/Images/toolbarItemSelected.png +%%DATADIR%%/resources/inspector/Images/touchCursor.png +%%DATADIR%%/resources/inspector/Images/touchCursor_2x.png +%%DATADIR%%/resources/inspector/Images/transformControls.png +%%DATADIR%%/resources/inspector/Images/transformControls_2x.png +%%DATADIR%%/resources/inspector/InspectorBackendCommands.js +%%DATADIR%%/resources/inspector/Runtime.js +%%DATADIR%%/resources/inspector/SupportedCSSProperties.js %%DATADIR%%/resources/inspector/accelerometer.css -%%DATADIR%%/resources/inspector/audits/_module.js %%DATADIR%%/resources/inspector/auditsPanel.css +%%DATADIR%%/resources/inspector/audits_module.js %%DATADIR%%/resources/inspector/breakpointsList.css %%DATADIR%%/resources/inspector/canvasProfiler.css %%DATADIR%%/resources/inspector/cm/codemirror.css %%DATADIR%%/resources/inspector/cmdevtools.css -%%DATADIR%%/resources/inspector/console/_module.js +%%DATADIR%%/resources/inspector/console_module.js %%DATADIR%%/resources/inspector/dataGrid.css -%%DATADIR%%/resources/inspector/devices/_module.js %%DATADIR%%/resources/inspector/devicesView.css +%%DATADIR%%/resources/inspector/devices_module.js +%%DATADIR%%/resources/inspector/devtools.css %%DATADIR%%/resources/inspector/devtools.html +%%DATADIR%%/resources/inspector/devtools.js %%DATADIR%%/resources/inspector/devtools_extension_api.js -%%DATADIR%%/resources/inspector/documentation/_module.js -%%DATADIR%%/resources/inspector/elements/_module.js +%%DATADIR%%/resources/inspector/documentationView.css +%%DATADIR%%/resources/inspector/documentation_module.js %%DATADIR%%/resources/inspector/elementsPanel.css -%%DATADIR%%/resources/inspector/extensions/_module.js +%%DATADIR%%/resources/inspector/elements_module.js +%%DATADIR%%/resources/inspector/extensions_module.js %%DATADIR%%/resources/inspector/filter.css %%DATADIR%%/resources/inspector/filteredItemSelectionDialog.css %%DATADIR%%/resources/inspector/flameChart.css %%DATADIR%%/resources/inspector/heapProfiler.css -%%DATADIR%%/resources/inspector/heap_snapshot_worker/_module.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker_module.js %%DATADIR%%/resources/inspector/helpScreen.css %%DATADIR%%/resources/inspector/indexedDBViews.css -%%DATADIR%%/resources/inspector/inspector.css %%DATADIR%%/resources/inspector/inspectorCommon.css -%%DATADIR%%/resources/inspector/layers/_module.js +%%DATADIR%%/resources/inspector/inspectorSyntaxHighlight.css %%DATADIR%%/resources/inspector/layersPanel.css -%%DATADIR%%/resources/inspector/main/Main.js +%%DATADIR%%/resources/inspector/layers_module.js %%DATADIR%%/resources/inspector/navigatorView.css -%%DATADIR%%/resources/inspector/network/_module.js %%DATADIR%%/resources/inspector/networkLogView.css %%DATADIR%%/resources/inspector/networkPanel.css +%%DATADIR%%/resources/inspector/network_module.js %%DATADIR%%/resources/inspector/overrides.css +%%DATADIR%%/resources/inspector/overviewGrid.css %%DATADIR%%/resources/inspector/panelEnablerView.css -%%DATADIR%%/resources/inspector/profiler/_module.js +%%DATADIR%%/resources/inspector/pieChart.css +%%DATADIR%%/resources/inspector/profiler_module.js %%DATADIR%%/resources/inspector/profilesPanel.css +%%DATADIR%%/resources/inspector/promisesPanel.css +%%DATADIR%%/resources/inspector/promises_module.js %%DATADIR%%/resources/inspector/requestCookiesView.css %%DATADIR%%/resources/inspector/requestHeadersView.css %%DATADIR%%/resources/inspector/resourceView.css -%%DATADIR%%/resources/inspector/resources/_module.js %%DATADIR%%/resources/inspector/resourcesPanel.css +%%DATADIR%%/resources/inspector/resources_module.js %%DATADIR%%/resources/inspector/responsiveDesignView.css %%DATADIR%%/resources/inspector/revisionHistory.css %%DATADIR%%/resources/inspector/screencastView.css -%%DATADIR%%/resources/inspector/script_formatter_worker/_module.js -%%DATADIR%%/resources/inspector/settings/_module.js -%%DATADIR%%/resources/inspector/source_frame/_module.js -%%DATADIR%%/resources/inspector/sources/_module.js +%%DATADIR%%/resources/inspector/script_formatter_worker_module.js +%%DATADIR%%/resources/inspector/settings_module.js +%%DATADIR%%/resources/inspector/source_frame_module.js %%DATADIR%%/resources/inspector/sourcesPanel.css %%DATADIR%%/resources/inspector/sourcesView.css +%%DATADIR%%/resources/inspector/sources_module.js %%DATADIR%%/resources/inspector/spectrum.css -%%DATADIR%%/resources/inspector/temp_storage_shared_worker/_module.js -%%DATADIR%%/resources/inspector/timeline/_module.js +%%DATADIR%%/resources/inspector/temp_storage_shared_worker_module.js %%DATADIR%%/resources/inspector/timelinePanel.css +%%DATADIR%%/resources/inspector/timeline_module.js +%%DATADIR%%/resources/inspector/toolbox.css +%%DATADIR%%/resources/inspector/toolbox.html +%%DATADIR%%/resources/inspector/toolbox.js %%DATADIR%%/resources/inspector/webSocketFrameView.css share/icons/hicolor/128x128/apps/chrome.png share/icons/hicolor/22x22/apps/chrome.png @@ -189,3 +205,25 @@ share/icons/hicolor/24x24/apps/chrome.png share/icons/hicolor/256x256/apps/chrome.png share/icons/hicolor/48x48/apps/chrome.png share/icons/hicolor/64x64/apps/chrome.png +@dir %%DATADIR%%/locales +@dir %%DATADIR%%/resources/extension/demo +@dir %%DATADIR%%/resources/extension +@dir %%DATADIR%%/resources/inspector/Images +@dir %%DATADIR%%/resources/inspector/cm +@dir %%DATADIR%%/resources/inspector +@dir %%DATADIR%%/resources +@dir %%DATADIR%% +@dir share/icons/hicolor/128x128/apps +@dir share/icons/hicolor/128x128 +@dir share/icons/hicolor/22x22/apps +@dir share/icons/hicolor/22x22 +@dir share/icons/hicolor/24x24/apps +@dir share/icons/hicolor/24x24 +@dir share/icons/hicolor/256x256/apps +@dir share/icons/hicolor/256x256 +@dir share/icons/hicolor/48x48/apps +@dir share/icons/hicolor/48x48 +@dir share/icons/hicolor/64x64/apps +@dir share/icons/hicolor/64x64 +@dir share/icons/hicolor +@dir share/icons |