kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

www/chromium: update to 39.0.2171.65

Browse source 
MFH:		2014Q4
Security:	d395e44f-6f4f-11e4-a444-00262d5ed8ee
This commit is contained in:
Rene Ladan 2014-11-20 06:55:14 +00:00
parent 89ca154e90
commit 347e2bc55f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=372849
261 changed files with 781 additions and 974 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
www/chromium/Makefile
View file

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

8
www/chromium/distinfo
View file

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

25
www/chromium/files/extra-patch-clang
View file

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

16
www/chromium/files/extra-patch-gcc
View file

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

4
www/chromium/files/patch-base__base.gyp
View file

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

2
www/chromium/files/patch-base__base.gypi
View file

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

2
www/chromium/files/patch-base__debug__stack_trace_posix.cc
View file

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

2
www/chromium/files/patch-base__files__file_path_watcher_kqueue.h
View file

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

2
www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc
View file

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

2
www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
View file

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

2
www/chromium/files/patch-base__process__internal_linux.h
View file

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

2
www/chromium/files/patch-base__process__launch.cc
View file

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

2
www/chromium/files/patch-base__process__launch.h
View file

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

2
www/chromium/files/patch-base__process__memory_unittest.cc
View file

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

2
www/chromium/files/patch-base__process__process_iterator_freebsd.cc
View file

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

4
www/chromium/files/patch-base__process__process_metrics.h
View file

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

2
www/chromium/files/patch-base__process__process_metrics_freebsd.cc
View file

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

2
www/chromium/files/patch-base__security_unittest.cc
View file

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

2
www/chromium/files/patch-base__strings__safe_sprintf.cc
View file

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

2
www/chromium/files/patch-base__sys_info_freebsd.cc
View file

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

4
www/chromium/files/patch-base__sys_info_posix.cc
View file

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

2
www/chromium/files/patch-base__test__expectations__expectation.cc
View file

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

4
www/chromium/files/patch-base__test__launcher__test_launcher.cc
View file

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

2
www/chromium/files/patch-base__threading__platform_thread_linux.cc
View file

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

4
www/chromium/files/patch-breakpad__breakpad.gyp
View file

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

12
www/chromium/files/patch-build__common.gypi
View file

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

2
www/chromium/files/patch-build__filename_rules.gypi
View file

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

4
www/chromium/files/patch-build__linux__system.gyp
View file

@ -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': [
'../..',
],

2
www/chromium/files/patch-build__linux__unbundle__libwebp.gyp
View file

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

2
www/chromium/files/patch-build__linux__unbundle__openssl.gyp
View file

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

4
www/chromium/files/patch-cc__layers__layer_impl.cc
View file

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

38
www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
View file

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

2
www/chromium/files/patch-chrome__app__chrome_main_delegate.h
View file

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

4
www/chromium/files/patch-chrome__app__chromium_strings.grd
View file

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

19
www/chromium/files/patch-chrome__app__generated_resources.grd
View file

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

2
www/chromium/files/patch-chrome__app__resources__locale_settings.grd
View file

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

4
www/chromium/files/patch-chrome__browser__about_flags.cc
View file

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

2
www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
View file

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

2
www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
View file

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

14
www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
View file

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

4
www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
View file

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

2
www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
View file

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

2
www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
View file

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

2
www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
View file

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

2
www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
View file

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

2
www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
View file

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

2
www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
View file

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

2
www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
View file

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

2
www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
View file

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

4
www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
View file

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

2
www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc
View file

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

10
www/chromium/files/patch-chrome__browser__memory_details.cc
View file

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

18
www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc Normal file
View file

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

2
www/chromium/files/patch-chrome__browser__net__connection_tester.cc
View file

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

57
www/chromium/files/patch-chrome__browser__net__ssl_config_service_manager_pref.cc
View file

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

6
www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc
View file

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

2
www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
View file

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

2
www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc
View file

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

10
www/chromium/files/patch-chrome__browser__prefs__command_line_pref_store.cc
View file

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

2
www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc
View file

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

6
www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc
View file

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

4
www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc
View file

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

4
www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc
View file

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

14
www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc
View file

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

12
www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc
View file

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

8
www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h
View file

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

4
www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc
View file

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

4
www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc
View file

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

14
www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc
View file

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

6
www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc
View file

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

4
www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc
View file

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

2
www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
View file

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

4
www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
View file

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

10
www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
View file

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

4
www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
View file

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

2
www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
View file

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

2
www/chromium/files/patch-chrome__browser__web_applications__web_app.h
View file

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

16
www/chromium/files/patch-chrome__chrome_browser.gypi
View file

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

4
www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
View file

@ -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': [

14
www/chromium/files/patch-chrome__chrome_browser_ui.gypi
View file

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

15
www/chromium/files/patch-chrome__chrome_tests_unit.gypi Normal file
View file

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

2
www/chromium/files/patch-chrome__common__chrome_paths.cc
View file

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

2
www/chromium/files/patch-chrome__common__chrome_paths.h
View file

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

17
www/chromium/files/patch-chrome__common__chrome_switches.cc
View file

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

14
www/chromium/files/patch-chrome__common__chrome_switches.h
View file

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

35
www/chromium/files/patch-chrome__common__localized_error.cc
View file

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

14
www/chromium/files/patch-chrome__common__pref_names.cc
View file

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

14
www/chromium/files/patch-chrome__common__pref_names.h
View file

@ -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[];

2
www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
View file

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

2
www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h
View file

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

6
www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
View file

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

2
www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
View file

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

2
www/chromium/files/patch-chrome__test__base__testing_browser_process.h
View file

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

2
www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc
View file

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

2
www/chromium/files/patch-chrome__test__perf__perf_test.cc
View file

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

2
www/chromium/files/patch-chrome__tools__build__linux__sed.sh
View file

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

2
www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc
View file

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

8
www/chromium/files/patch-components__policy__resources__policy_templates.json
View file

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

4
www/chromium/files/patch-components__policy__tools__generate_policy_source.py
View file

@ -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 == '*':

2
www/chromium/files/patch-components__storage_monitor.gypi
View file

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

Some files were not shown because too many files have changed in this diff Show more