[Midnightbsd-cvs] mports [17337] trunk/www/chromium/files: update patchset
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Sep 15 22:25:14 EDT 2014
Revision: 17337
http://svnweb.midnightbsd.org/mports/?rev=17337
Author: laffer1
Date: 2014-09-15 22:25:13 -0400 (Mon, 15 Sep 2014)
Log Message:
-----------
update patchset
Modified Paths:
--------------
trunk/www/chromium/files/chrome.in
trunk/www/chromium/files/extra-patch-clang
trunk/www/chromium/files/extra-patch-fixup-execinfo
trunk/www/chromium/files/extra-patch-gcc
trunk/www/chromium/files/patch-base__base.gyp
trunk/www/chromium/files/patch-base__base.gypi
trunk/www/chromium/files/patch-base__debug__stack_trace_posix.cc
trunk/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
trunk/www/chromium/files/patch-base__process__internal_linux.h
trunk/www/chromium/files/patch-base__process__memory_unittest.cc
trunk/www/chromium/files/patch-base__process__process_iterator_freebsd.cc
trunk/www/chromium/files/patch-base__process__process_metrics.h
trunk/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
trunk/www/chromium/files/patch-base__security_unittest.cc
trunk/www/chromium/files/patch-base__sys_info_freebsd.cc
trunk/www/chromium/files/patch-base__sys_info_posix.cc
trunk/www/chromium/files/patch-base__test__expectations__expectation.cc
trunk/www/chromium/files/patch-base__test__launcher__test_launcher.cc
trunk/www/chromium/files/patch-base__threading__platform_thread_linux.cc
trunk/www/chromium/files/patch-breakpad__breakpad.gyp
trunk/www/chromium/files/patch-build__common.gypi
trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
trunk/www/chromium/files/patch-chrome__browser__about_flags.cc
trunk/www/chromium/files/patch-chrome__browser__browser_process_impl.cc
trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
trunk/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
trunk/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
trunk/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc
trunk/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
trunk/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
trunk/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
trunk/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
trunk/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
trunk/www/chromium/files/patch-chrome__browser__memory_details.cc
trunk/www/chromium/files/patch-chrome__browser__net__connection_tester.cc
trunk/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
trunk/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
trunk/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.h
trunk/www/chromium/files/patch-chrome__chrome_browser.gypi
trunk/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
trunk/www/chromium/files/patch-chrome__chrome_tests.gypi
trunk/www/chromium/files/patch-chrome__common__chrome_paths.cc
trunk/www/chromium/files/patch-chrome__common__chrome_switches.cc
trunk/www/chromium/files/patch-chrome__common__chrome_switches.h
trunk/www/chromium/files/patch-chrome__common__pref_names.cc
trunk/www/chromium/files/patch-chrome__common__pref_names.h
trunk/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
trunk/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
trunk/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
trunk/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
trunk/www/chromium/files/patch-chrome__test__perf__perf_test.cc
trunk/www/chromium/files/patch-chrome__tools__build__linux__sed.sh
trunk/www/chromium/files/patch-components__policy__resources__policy_templates.json
trunk/www/chromium/files/patch-components__policy__tools__generate_policy_source.py
trunk/www/chromium/files/patch-content__app__content_main_runner.cc
trunk/www/chromium/files/patch-content__browser__browser_main_loop.cc
trunk/www/chromium/files/patch-content__browser__child_process_launcher.cc
trunk/www/chromium/files/patch-content__browser__download__base_file.cc
trunk/www/chromium/files/patch-content__browser__download__base_file_linux.cc
trunk/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
trunk/www/chromium/files/patch-content__common__set_process_title_linux.cc
trunk/www/chromium/files/patch-content__common__set_process_title_linux.h
trunk/www/chromium/files/patch-content__content_browser.gypi
trunk/www/chromium/files/patch-content__content_common.gypi
trunk/www/chromium/files/patch-content__content_tests.gypi
trunk/www/chromium/files/patch-content__public__test__browser_test_base.cc
trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc
trunk/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc
trunk/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
trunk/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
trunk/www/chromium/files/patch-gpu__config__gpu_control_list.cc
trunk/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc
trunk/www/chromium/files/patch-gpu__config__gpu_test_config.cc
trunk/www/chromium/files/patch-gpu__gpu_config.gypi
trunk/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
trunk/www/chromium/files/patch-media__base__audio_splicer.cc
trunk/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
trunk/www/chromium/files/patch-media__media.gyp
trunk/www/chromium/files/patch-native_client__build__common.gypi
trunk/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
trunk/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp
trunk/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp
trunk/www/chromium/files/patch-net__base__dns_reloader.cc
trunk/www/chromium/files/patch-net__base__mime_util_unittest.cc
trunk/www/chromium/files/patch-net__base__net_util.h
trunk/www/chromium/files/patch-net__base__network_change_notifier.cc
trunk/www/chromium/files/patch-net__dns__address_sorter_posix.cc
trunk/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
trunk/www/chromium/files/patch-net__dns__dns_session.cc
trunk/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
trunk/www/chromium/files/patch-net__net.gyp
trunk/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
trunk/www/chromium/files/patch-net__proxy__proxy_service.cc
trunk/www/chromium/files/patch-net__socket__socks5_client_socket.cc
trunk/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h
trunk/www/chromium/files/patch-net__udp__udp_socket_unittest.cc
trunk/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
trunk/www/chromium/files/patch-sync__util__get_session_name.cc
trunk/www/chromium/files/patch-sync__util__get_session_name_linux.cc
trunk/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
trunk/www/chromium/files/patch-testing__gtest__src__gtest.cc
trunk/www/chromium/files/patch-third_party__WebKit__Source__config.h
trunk/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
trunk/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
trunk/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp
trunk/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp
trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp
trunk/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
trunk/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
trunk/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc
trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h
trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc
trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h
trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h
trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc
trunk/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
trunk/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
trunk/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
trunk/www/chromium/files/patch-third_party__webrtc__build__common.gypi
trunk/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
trunk/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi
trunk/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc
trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc
trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc
trunk/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
trunk/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
trunk/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
trunk/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
trunk/www/chromium/files/patch-ui__events__event_switches.cc
trunk/www/chromium/files/patch-ui__events__event_switches.h
trunk/www/chromium/files/patch-ui__gl__gl.gyp
Property Changed:
----------------
trunk/www/chromium/files/patch-chrome__chrome_tests.gypi
Modified: trunk/www/chromium/files/chrome.in
===================================================================
--- trunk/www/chromium/files/chrome.in 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/chrome.in 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,7 +1,7 @@
#!/bin/sh
SYSCTL=kern.ipc.shm_allow_removed
-if [ `sysctl -n $SYSCTL` = 0 ] ; then
+if [ "`/sbin/sysctl -n $SYSCTL`" = 0 ] ; then
cat << EOMSG
For correct operation, shared memory support has to be enabled
in Chromium by performing the following command as root :
Modified: trunk/www/chromium/files/extra-patch-clang
===================================================================
--- trunk/www/chromium/files/extra-patch-clang 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/extra-patch-clang 2014-09-16 02:25:13 UTC (rev 17337)
@@ -48,7 +48,7 @@
ASSERT_LT(kFinalTlsValue, *ptr);
--- base/tracked_objects.cc 2013-07-03 23:39:54.000000000 -0400
+++ base/tracked_objects.cc 2013-07-19 00:42:10.000000000 -0400
-@@ -346,7 +346,7 @@
+@@ -378,7 +378,7 @@
}
// We must NOT do any allocations during this callback.
// Using the simple linked lists avoids all allocations.
@@ -59,7 +59,7 @@
}
--- base/tracked_objects_unittest.cc.orig 2013-08-30 23:09:01.000000000 +0300
+++ base/tracked_objects_unittest.cc 2013-08-30 23:10:14.000000000 +0300
-@@ -50,9 +50,9 @@
+@@ -53,9 +53,9 @@
Births* birth = ThreadData::TallyABirthIfActive(location);
if (ThreadData::status() == ThreadData::DEACTIVATED)
@@ -71,7 +71,7 @@
}
// Helper function to verify the most common test expectations.
-@@ -231,7 +231,7 @@
+@@ -234,7 +234,7 @@
return;
scoped_ptr<DeathData> data(new DeathData());
@@ -80,7 +80,7 @@
EXPECT_EQ(data->run_duration_sum(), 0);
EXPECT_EQ(data->run_duration_sample(), 0);
EXPECT_EQ(data->queue_duration_sum(), 0);
-@@ -432,7 +432,7 @@
+@@ -435,7 +435,7 @@
Location location(kFunction, kFile, kLineNumber, NULL);
// Do not delete |birth|. We don't own it.
Births* birth = ThreadData::TallyABirthIfActive(location);
@@ -91,7 +91,7 @@
const TrackedTime kStartOfRun = TrackedTime() +
--- chrome/browser/metrics/thread_watcher.cc 2013-07-03 23:45:55.000000000 -0400
+++ chrome/browser/metrics/thread_watcher.cc 2013-07-19 01:38:45.000000000 -0400
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
MSVC_PUSH_DISABLE_WARNING(4748)
int* NullPointer() {
@@ -102,7 +102,7 @@
void NullPointerCrash(int line_number) {
--- chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-03 23:46:07.000000000 -0400
+++ chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-19 01:50:13.000000000 -0400
-@@ -232,7 +232,7 @@
+@@ -260,7 +260,7 @@
}
DCHECK(window_ptr);
DCHECK_EQ(window_ptr->window_id.id(), window_id);
@@ -113,7 +113,7 @@
}
--- media/audio/audio_output_proxy_unittest.cc.orig 2013-08-30 23:23:03.000000000 +0300
+++ media/audio/audio_output_proxy_unittest.cc 2013-08-30 23:23:54.000000000 +0300
-@@ -427,7 +427,7 @@
+@@ -392,7 +392,7 @@
// |stream| is closed at this point. Start() should reopen it again.
EXPECT_CALL(manager(), MakeAudioOutputStream(_, _))
.Times(2)
@@ -124,7 +124,7 @@
.Times(2);
--- media/filters/decrypting_video_decoder_unittest.cc.orig 2013-08-30 23:27:39.000000000 +0300
+++ media/filters/decrypting_video_decoder_unittest.cc 2013-08-30 23:28:27.000000000 +0300
-@@ -482,7 +482,7 @@
+@@ -417,7 +417,7 @@
// callback to cancel the |decryptor_ready_cb|.
EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback()))
.WillOnce(ResetAndRunCallback(&decryptor_ready_cb,
@@ -224,7 +224,7 @@
--- v8/src/runtime.cc.orig 2013-11-08 08:01:04.000000000 +0100
+++ v8/src/runtime.cc 2013-11-15 13:17:39.000000000 +0100
-@@ -14028,7 +14028,7 @@
+@@ -14043,7 +14043,7 @@
local_object->SetInternalField(0, reinterpret_cast<Smi*>(break_iterator));
// Make sure that the pointer to adopted text is NULL.
@@ -235,7 +235,7 @@
JSObject::SetLocalPropertyIgnoreAttributes(
--- base/strings/safe_sprintf_unittest.cc.orig 2013-11-08 07:42:08.000000000 +0100
+++ base/strings/safe_sprintf_unittest.cc 2013-11-15 15:04:45.000000000 +0100
-@@ -733,12 +733,14 @@
+@@ -721,12 +721,14 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion-null"
#endif
@@ -261,14 +261,20 @@
}
static Unique<T> CreateImmovable(Handle<T> handle) {
---- content/browser/renderer_host/render_widget_host_view_guest.cc.orig 2014-01-07 21:02:28.000000000 +0100
-+++ content/browser/renderer_host/render_widget_host_view_guest.cc 2014-01-13 13:48:52.000000000 +0100
-@@ -254,7 +254,7 @@
+--- 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 @@
+
gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const {
- if (guest_->GetEmbedderRenderWidgetHostView())
- return guest_->GetEmbedderRenderWidgetHostView()->GetNativeViewId();
-- return static_cast<gfx::NativeViewId>(NULL);
-+ return reinterpret_cast<gfx::NativeViewId>(NULL);
+ if (!guest_)
+- return static_cast<gfx::NativeViewId>(NULL);
++ return reinterpret_cast<gfx::NativeViewId>(NULL);
+
+ RenderWidgetHostView* rwhv = guest_->GetEmbedderRenderWidgetHostView();
+ if (!rwhv)
+- return static_cast<gfx::NativeViewId>(NULL);
++ return reinterpret_cast<gfx::NativeViewId>(NULL);
+ return rwhv->GetNativeViewId();
}
- gfx::NativeViewAccessible RenderWidgetHostViewGuest::GetNativeViewAccessible() {
+-
Modified: trunk/www/chromium/files/extra-patch-fixup-execinfo
===================================================================
--- trunk/www/chromium/files/extra-patch-fixup-execinfo 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/extra-patch-fixup-execinfo 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- v8/src/checks.cc.orig 2014-01-07 21:03:55.000000000 +0100
-+++ v8/src/checks.cc 2014-01-08 01:14:20.000000000 +0100
-@@ -41,7 +41,7 @@
+--- v8/src/checks.cc.orig 2014-03-07 23:57:27.000000000 +0100
++++ v8/src/checks.cc 2014-03-08 00:04:14.000000000 +0100
+@@ -44,7 +44,7 @@
static V8_INLINE void DumpBacktrace() {
#if V8_LIBC_GLIBC || V8_OS_BSD
void* trace[100];
Modified: trunk/www/chromium/files/extra-patch-gcc
===================================================================
--- trunk/www/chromium/files/extra-patch-gcc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/extra-patch-gcc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
--- base/memory/shared_memory.h.orig 2011-04-01 21:54:26.066717848 +0300
+++ base/memory/shared_memory.h 2011-04-01 21:55:14.292717813 +0300
-@@ -10,6 +10,7 @@
+@@ -12,6 +12,7 @@
#if defined(OS_POSIX)
#include <sys/types.h>
@@ -10,7 +10,7 @@
#endif
--- third_party/libjingle/source/talk/base/stream.h.orig 2011-04-01 22:16:30.129717654 +0300
+++ third_party/libjingle/source/talk/base/stream.h 2011-04-01 22:16:48.245715495 +0300
-@@ -28,6 +28,7 @@
+@@ -30,6 +30,7 @@
#ifndef TALK_BASE_STREAM_H__
#define TALK_BASE_STREAM_H__
@@ -40,7 +40,7 @@
--- third_party/ffmpeg/libavutil/cpu.c.orig 2013-11-16 01:26:14.000000000 +0100
+++ third_party/ffmpeg/libavutil/cpu.c 2013-11-19 00:24:53.000000000 +0100
-@@ -21,6 +21,9 @@
+@@ -24,6 +24,9 @@
#include "opt.h"
#include "common.h"
@@ -86,3 +86,13 @@
#include "third_party/libjpeg_turbo/jpeglib.h"
#else
#include "third_party/libjpeg/jpeglib.h"
+--- ui/gfx/codec/jpeg_codec.cc.orig 2014-08-12 21:02:29.000000000 +0200
++++ ui/gfx/codec/jpeg_codec.cc 2014-08-17 19:32:18.000000000 +0200
+@@ -13,6 +13,7 @@
+
+ extern "C" {
+ #if defined(USE_SYSTEM_LIBJPEG)
++#include <stdio.h>
+ #include <jpeglib.h>
+ #elif defined(USE_LIBJPEG_TURBO)
+ #include "third_party/libjpeg_turbo/jpeglib.h"
Modified: trunk/www/chromium/files/patch-base__base.gyp
===================================================================
--- trunk/www/chromium/files/patch-base__base.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__base.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,14 +1,11 @@
---- base/base.gyp.orig 2013-09-26 02:17:34.000000000 +0300
-+++ base/base.gyp 2013-09-26 03:00:53.000000000 +0300
-@@ -823,6 +823,11 @@
- ['include', '^debug/proc_maps_linux_unittest\\.cc$'],
+--- ./base/base.gyp.orig 2014-08-12 21:01:28.000000000 +0200
++++ ./base/base.gyp 2014-08-13 09:57:00.000000000 +0200
+@@ -129,7 +129,7 @@
],
+ 'link_settings': {
+ 'libraries': [
+- '-L/usr/local/lib -lexecinfo',
++ '-L/usr/local/lib -lexecinfo -lkvm',
+ ],
+ },
}],
-+ ['<(os_bsd) == 1', {
-+ 'sources/': [
-+ ['exclude', '^debug/proc_maps_linux_unittest\\.cc$'],
-+ ],
-+ }],
- ], # target_conditions
- },
- {
Modified: trunk/www/chromium/files/patch-base__base.gypi
===================================================================
--- trunk/www/chromium/files/patch-base__base.gypi 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__base.gypi 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,12 +1,12 @@
---- base/base.gypi.orig 2013-09-28 20:09:58.000000000 +0300
-+++ base/base.gypi 2013-09-26 02:24:27.000000000 +0300
-@@ -872,11 +872,15 @@
+--- ./base/base.gypi.orig 2014-08-12 21:01:28.000000000 +0200
++++ ./base/base.gypi 2014-08-13 09:56:56.000000000 +0200
+@@ -912,11 +912,14 @@
'process/memory_stubs.cc',
],
'sources/': [
+ ['exclude', '^debug/proc_maps_linux\\.cc$'],
['exclude', '^files/file_path_watcher_linux\\.cc$'],
- ['exclude', '^files/file_path_watcher_stub\\.cc$'],
+- ['exclude', '^files/file_path_watcher_stub\\.cc$'],
['exclude', '^file_util_linux\\.cc$'],
+ ['exclude', '^process/memory_linux\\.cc$'],
['exclude', '^process/process_linux\\.cc$'],
@@ -15,4 +15,4 @@
+ ['exclude', '^process/process_metrics_linux\\.cc$'],
],
}],
- ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', {
+ # Remove all unnecessary files for build_nexe.py to avoid exceeding
Modified: trunk/www/chromium/files/patch-base__debug__stack_trace_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-base__debug__stack_trace_posix.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__debug__stack_trace_posix.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,28 +1,21 @@
---- base/debug/stack_trace_posix.cc.orig 2013-02-05 10:02:11.000000000 +0200
-+++ base/debug/stack_trace_posix.cc 2013-02-13 20:27:44.000000000 +0200
-@@ -14,6 +14,9 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
+--- ./base/debug/stack_trace_posix.cc.orig 2014-08-12 21:01:27.000000000 +0200
++++ ./base/debug/stack_trace_posix.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -590,6 +590,10 @@
+ // for the modules that are loaded in the current process.
+ // Returns true on success.
+ bool CacheMemoryRegions() {
+#if defined(OS_FREEBSD)
-+#include <ucontext.h>
-+#endif
++ // TODO (rene) avoid link error, implement something?
++ return false;
++#else
+ // Reads /proc/self/maps.
+ std::string contents;
+ if (!ReadProcMaps(&contents)) {
+@@ -605,6 +609,7 @@
- #include <ostream>
-
-@@ -326,9 +329,15 @@
- // NOTE: This code MUST be async-signal safe (it's used by in-process
- // stack dumping signal handler). NO malloc or stdio is allowed here.
-
-+#if defined(OS_FREEBSD)
-+ // Disable backtrace for now, libexecinfo crashes in getframeaddr
-+ // in release build / i386.
-+ count_ = 0;
-+#else
- // Though the backtrace API man page does not list any possible negative
- // return values, we take no chance.
- count_ = std::max(backtrace(trace_, arraysize(trace_)), 0);
+ is_initialized_ = true;
+ return true;
+#endif
- }
+ }
- void StackTrace::PrintBacktrace() const {
+ // Opens all object files and caches their file descriptors.
Modified: trunk/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- base/posix/unix_domain_socket_linux_unittest.cc.orig 2013-08-19 02:53:00.000000000 +0300
-+++ base/posix/unix_domain_socket_linux_unittest.cc 2013-08-30 19:34:24.000000000 +0300
+--- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-08-12 21:01:28.000000000 +0200
++++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-08-13 09:56:56.000000000 +0200
@@ -2,8 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
Modified: trunk/www/chromium/files/patch-base__process__internal_linux.h
===================================================================
--- trunk/www/chromium/files/patch-base__process__internal_linux.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__process__internal_linux.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- ./base/process/internal_linux.h.orig 2013-09-03 09:09:03.000000000 +0200
-+++ ./base/process/internal_linux.h 2013-09-07 21:29:08.000000000 +0200
-@@ -10,6 +10,8 @@
+--- ./base/process/internal_linux.h.orig 2014-08-12 21:01:27.000000000 +0200
++++ ./base/process/internal_linux.h 2014-08-13 09:56:56.000000000 +0200
+@@ -12,6 +12,8 @@
#include "base/files/file_path.h"
@@ -7,5 +7,5 @@
+#include <unistd.h> /* pid_t */
+
namespace base {
- namespace internal {
+ class Time;
Modified: trunk/www/chromium/files/patch-base__process__memory_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-base__process__memory_unittest.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__process__memory_unittest.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,24 +1,20 @@
---- base/process/memory_unittest.cc.orig 2013-09-24 23:49:53.000000000 +0300
-+++ base/process/memory_unittest.cc 2013-09-24 23:50:57.000000000 +0300
-@@ -153,12 +153,12 @@
+--- ./base/process/memory_unittest.cc.orig 2014-08-12 21:01:27.000000000 +0200
++++ ./base/process/memory_unittest.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -151,9 +151,9 @@
// Android doesn't implement set_new_handler, so we can't use the
// OutOfMemoryTest cases.
-// OpenBSD does not support these tests either.
-+// OpenBSD and FreeBSD does not support these tests either.
- // AddressSanitizer and ThreadSanitizer define the malloc()/free()/etc.
- // functions so that they don't crash if the program is out of memory, so the
- // OOM tests aren't supposed to work.
++// OpenBSD and FreeBSD do not support these tests either.
// TODO(vandebo) make this work on Windows too.
-#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && \
+#if !defined(OS_ANDROID) && !defined(OS_BSD) && \
- !defined(OS_WIN) && \
- !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER)
+ !defined(OS_WIN)
-@@ -375,5 +375,5 @@
- #endif // !ARCH_CPU_64_BITS
- #endif // OS_MACOSX
-
--#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) &&
-+#endif // !defined(OS_ANDROID) && !defined(OS_BSD) &&
- // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER)
+ #if defined(USE_TCMALLOC)
+@@ -425,4 +425,4 @@
+ EXPECT_TRUE(value_ == NULL);
+ }
+ #endif // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
+-#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN)
++#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN)
Modified: trunk/www/chromium/files/patch-base__process__process_iterator_freebsd.cc
===================================================================
--- trunk/www/chromium/files/patch-base__process__process_iterator_freebsd.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__process__process_iterator_freebsd.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,8 +1,8 @@
---- ./base/process/process_iterator_freebsd.cc.orig 2013-09-03 09:09:03.000000000 +0200
-+++ ./base/process/process_iterator_freebsd.cc 2013-09-07 21:31:37.000000000 +0200
-@@ -6,6 +6,10 @@
-
+--- ./base/process/process_iterator_freebsd.cc.orig 2014-08-12 21:01:27.000000000 +0200
++++ ./base/process/process_iterator_freebsd.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -8,6 +8,10 @@
#include <sys/sysctl.h>
+ #include <unistd.h>
+/* getuid() */
+#include <unistd.h>
Modified: trunk/www/chromium/files/patch-base__process__process_metrics.h
===================================================================
--- trunk/www/chromium/files/patch-base__process__process_metrics.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__process__process_metrics.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,8 +1,8 @@
---- base/process/process_metrics.h.orig 2013-08-16 22:01:16.000000000 +0300
-+++ base/process/process_metrics.h 2013-08-16 22:04:12.000000000 +0300
-@@ -15,6 +15,13 @@
- #include "base/process.h"
- #include "base/time.h"
+--- ./base/process/process_metrics.h.orig 2014-08-12 21:01:27.000000000 +0200
++++ ./base/process/process_metrics.h 2014-08-13 09:56:56.000000000 +0200
+@@ -17,6 +17,13 @@
+ #include "base/time/time.h"
+ #include "base/values.h"
+#if defined(OS_BSD)
+#include <kvm.h>
@@ -14,3 +14,21 @@
#if defined(OS_MACOSX)
#include <mach/mach.h>
#endif
+@@ -242,13 +249,17 @@
+ // CPU-related ticks. Returns -1 on parse error.
+ // Exposed for testing.
+ BASE_EXPORT int ParseProcStatCPU(const std::string& input);
++#endif
+
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD)
+ // Get the number of threads of |process| as available in /proc/<pid>/stat.
+ // This should be used with care as no synchronization with running threads is
+ // done. This is mostly useful to guarantee being single-threaded.
+ // Returns 0 on failure.
+ BASE_EXPORT int GetNumberOfThreads(ProcessHandle process);
++#endif
+
++#if defined(OS_LINUX) || defined(OS_ANDROID)
+ // /proc/self/exe refers to the current executable.
+ BASE_EXPORT extern const char kProcSelfExe[];
+
Modified: trunk/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
===================================================================
--- trunk/www/chromium/files/patch-base__process__process_metrics_freebsd.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__process__process_metrics_freebsd.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,13 +1,36 @@
---- ./base/process/process_metrics_freebsd.cc.orig 2013-09-03 09:09:03.000000000 +0200
-+++ ./base/process/process_metrics_freebsd.cc 2013-09-07 21:30:29.000000000 +0200
-@@ -4,6 +4,10 @@
+--- ./base/process/process_metrics_freebsd.cc.orig 2014-08-12 21:01:27.000000000 +0200
++++ ./base/process/process_metrics_freebsd.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -10,6 +10,9 @@
- #include "base/process/process_metrics.h"
+ #include "base/sys_info.h"
-+#include "base/sys_info.h"
-+
+#include <unistd.h> /* getpagesize() */
++#include <fcntl.h> /* O_RDONLY */
+
namespace base {
ProcessMetrics::ProcessMetrics(ProcessHandle process)
+@@ -119,4 +122,23 @@
+ return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
+ }
+
++int GetNumberOfThreads(ProcessHandle process) {
++ // Taken from FreeBSD top (usr.bin/top/machine.c)
++
++ kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open");
++ if (kd == NULL)
++ return 0;
++
++ struct kinfo_proc* pbase;
++ int nproc;
++ pbase = kvm_getprocs(kd, KERN_PROC_PID, process, &nproc);
++ if (pbase == NULL)
++ return 0;
++
++ if (kvm_close(kd) == -1)
++ return 0;
++
++ return nproc;
++}
++
+ } // namespace base
Modified: trunk/www/chromium/files/patch-base__security_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-base__security_unittest.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__security_unittest.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- base/security_unittest.cc.orig 2013-09-01 01:12:36.000000000 +0300
-+++ base/security_unittest.cc 2013-09-01 01:13:35.000000000 +0300
-@@ -161,7 +161,7 @@
+--- ./base/security_unittest.cc.orig 2014-08-12 21:01:28.000000000 +0200
++++ ./base/security_unittest.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -160,7 +160,7 @@
// FAILS_ is too clunky.
void OverflowTestsSoftExpectTrue(bool overflow_detected) {
if (!overflow_detected) {
Modified: trunk/www/chromium/files/patch-base__sys_info_freebsd.cc
===================================================================
--- trunk/www/chromium/files/patch-base__sys_info_freebsd.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__sys_info_freebsd.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- base/sys_info_freebsd.cc.orig 2013-09-28 19:09:58.000000000 +0200
-+++ base/sys_info_freebsd.cc 2013-10-09 17:13:04.000000000 +0200
+--- ./base/sys_info_freebsd.cc.orig 2014-08-12 21:01:28.000000000 +0200
++++ ./base/sys_info_freebsd.cc 2014-08-13 09:56:56.000000000 +0200
@@ -4,6 +4,7 @@
#include "base/sys_info.h"
Modified: trunk/www/chromium/files/patch-base__sys_info_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-base__sys_info_posix.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__sys_info_posix.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- base/sys_info_posix.cc.orig 2011-02-07 00:36:57.000000000 +0100
-+++ base/sys_info_posix.cc 2011-02-07 00:21:53.000000000 +0100
-@@ -23,7 +23,7 @@
+--- ./base/sys_info_posix.cc.orig 2014-08-12 21:01:28.000000000 +0200
++++ ./base/sys_info_posix.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -64,7 +64,7 @@
namespace base {
@@ -7,5 +7,5 @@
-#if !defined(OS_OPENBSD)
+#if !defined(OS_OPENBSD) && !defined(OS_FREEBSD)
int SysInfo::NumberOfProcessors() {
- // It seems that sysconf returns the number of "logical" processors on both
- // Mac and Linux. So we get the number of "online logical" processors.
+ return g_lazy_number_of_processors.Get().value();
+ }
Modified: trunk/www/chromium/files/patch-base__test__expectations__expectation.cc
===================================================================
--- trunk/www/chromium/files/patch-base__test__expectations__expectation.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__test__expectations__expectation.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,14 +1,14 @@
---- base/test/expectations/expectation.cc.orig 2013-08-31 23:17:45.000000000 +0300
-+++ base/test/expectations/expectation.cc 2013-08-31 23:18:59.000000000 +0300
-@@ -58,6 +58,7 @@
+--- ./base/test/expectations/expectation.cc.orig 2014-08-12 21:01:28.000000000 +0200
++++ ./base/test/expectations/expectation.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -60,6 +60,7 @@
variant != "64") {
return false;
}
-+ } else if (name == "FreeBSD" || name == "MidnightBSD") {
++ } else if (name == "FreeBSD") {
} else if (name == "ChromeOS") {
// TODO(rsesek): Figure out what ChromeOS needs.
} else if (name == "iOS") {
-@@ -119,6 +120,8 @@
+@@ -125,6 +126,8 @@
platform.variant = "32";
else if (arch == "x86_64")
platform.variant = "64";
Modified: trunk/www/chromium/files/patch-base__test__launcher__test_launcher.cc
===================================================================
--- trunk/www/chromium/files/patch-base__test__launcher__test_launcher.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__test__launcher__test_launcher.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- base/test/launcher/test_launcher.cc.orig 2014-01-07 21:01:10.000000000 +0100
-+++ base/test/launcher/test_launcher.cc 2014-01-13 01:36:07.000000000 +0100
-@@ -36,6 +36,10 @@
+--- ./base/test/launcher/test_launcher.cc.orig 2014-08-12 21:01:28.000000000 +0200
++++ ./base/test/launcher/test_launcher.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -40,6 +40,10 @@
#include "base/mac/scoped_nsautorelease_pool.h"
#endif
Modified: trunk/www/chromium/files/patch-base__threading__platform_thread_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-base__threading__platform_thread_linux.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-base__threading__platform_thread_linux.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- base/threading/platform_thread_linux.cc.orig 2013-08-17 20:52:20.000000000 +0300
-+++ base/threading/platform_thread_linux.cc 2013-08-17 20:56:34.000000000 +0300
+--- ./base/threading/platform_thread_linux.cc.orig 2014-08-12 21:01:27.000000000 +0200
++++ ./base/threading/platform_thread_linux.cc 2014-08-13 09:56:56.000000000 +0200
@@ -16,7 +16,9 @@
#include "base/tracked_objects.h"
@@ -10,7 +10,7 @@
#include <sys/resource.h>
#include <sys/syscall.h>
#include <sys/time.h>
-@@ -52,7 +54,7 @@
+@@ -50,7 +52,7 @@
ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
tracked_objects::ThreadData::InitializeThreadContext(name);
Modified: trunk/www/chromium/files/patch-breakpad__breakpad.gyp
===================================================================
--- trunk/www/chromium/files/patch-breakpad__breakpad.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-breakpad__breakpad.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,10 +1,10 @@
---- breakpad/breakpad.gyp.orig 2014-01-07 21:02:21.000000000 +0100
-+++ breakpad/breakpad.gyp 2014-01-12 22:55:47.000000000 +0100
-@@ -334,7 +334,7 @@
+--- ./breakpad/breakpad.gyp.orig 2014-08-12 21:02:55.000000000 +0200
++++ ./breakpad/breakpad.gyp 2014-08-13 09:56:56.000000000 +0200
+@@ -340,7 +340,7 @@
},
],
}],
-- [ 'OS=="linux" or OS=="android"', {
+- [ 'OS=="linux" or OS=="android" or OS=="freebsd"', {
+ [ 'OS=="linux" or OS=="android" or os_bsd==1', {
'conditions': [
['OS=="android"', {
Modified: trunk/www/chromium/files/patch-build__common.gypi
===================================================================
--- trunk/www/chromium/files/patch-build__common.gypi 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-build__common.gypi 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,15 @@
---- build/common.gypi.orig 2014-02-20 21:28:44.000000000 +0100
-+++ build/common.gypi 2014-02-24 23:02:26.000000000 +0100
-@@ -573,7 +573,7 @@
+--- ./build/common.gypi.orig 2014-08-12 21:02:52.000000000 +0200
++++ ./build/common.gypi 2014-08-13 09:56:56.000000000 +0200
+@@ -101,7 +101,7 @@
+ #
+ # TODO(erg): Merge this into the previous block once compiling with
+ # aura safely implies including ash capabilities.
+- ['OS=="linux"', {
++ ['OS=="linux" or OS=="freebsd"', {
+ 'use_aura%': 1,
+ }],
+
+@@ -622,7 +622,7 @@
}],
# DBus usage.
@@ -9,27 +18,26 @@
'use_dbus%': 1,
}, {
'use_dbus%': 0,
-@@ -1008,6 +1008,10 @@
+@@ -896,7 +896,7 @@
+ # except when building Android WebView.
+ # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
+ # Set the data reduction proxy origin for Android Webview.
+- ['android_webview_build==0', {
++ ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd"', {
+ 'icu_use_data_file_flag%' : 1,
+ 'spdy_proxy_auth_origin%': '',
+ 'data_reduction_proxy_probe_url%': '',
+@@ -1106,6 +1106,9 @@
# able to turn it off for various reasons.
'linux_disable_pie%': 0,
+ 'os_ver%': 0,
-+ 'prefix_dir%': '/usr',
+ 'use_system_libjpeg%': 0,
+
# 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.
-@@ -1283,7 +1287,7 @@
- }],
- ['os_posix==1 and OS!="mac" and OS!="ios"', {
- # Figure out the python architecture to decide if we build pyauto.
-- 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)',
-+ 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)<(prefix_dir)/lib/libpython<(python_ver).so.1)',
- 'conditions': [
- ['target_arch=="mipsel"', {
- 'werror%': '',
-@@ -3610,6 +3614,13 @@
+@@ -3960,6 +3963,13 @@
'ldflags': [
'-Wl,--no-keep-memory',
],
Modified: trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig 2014-02-20 21:27:29.000000000 +0100
-+++ chrome/app/chrome_main_delegate.cc 2014-02-25 01:39:55.000000000 +0100
-@@ -97,7 +97,7 @@
+--- ./chrome/app/chrome_main_delegate.cc.orig 2014-08-12 21:02:25.000000000 +0200
++++ ./chrome/app/chrome_main_delegate.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -96,7 +96,7 @@
#include "ui/base/x/x11_util.h"
#endif
@@ -9,7 +9,7 @@
#include "components/breakpad/app/breakpad_linux.h"
#endif
-@@ -115,7 +115,7 @@
+@@ -122,7 +122,7 @@
g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
#endif
@@ -18,9 +18,9 @@
base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER;
#endif
-@@ -235,7 +235,7 @@
- // Mac needs them for the plugin process name.
- process_type == switches::kPluginProcess ||
+@@ -245,7 +245,7 @@
+ // Needed for scrollbar related images.
+ process_type == switches::kWorkerProcess ||
#endif
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
@@ -27,7 +27,7 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
-@@ -392,7 +392,7 @@
+@@ -459,7 +459,7 @@
std::string format_str =
command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
if (format_str == "machine") {
@@ -36,7 +36,7 @@
} else if (format_str == "log") {
format = diagnostics::DiagnosticsWriter::LOG;
} else {
-@@ -433,7 +433,7 @@
+@@ -500,7 +500,7 @@
std::string format_str =
command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
if (format_str == "machine") {
@@ -45,7 +45,7 @@
} else if (format_str == "human") {
format = diagnostics::DiagnosticsWriter::HUMAN;
} else {
-@@ -564,7 +564,7 @@
+@@ -632,7 +632,7 @@
std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType);
@@ -54,7 +54,7 @@
breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
#endif
-@@ -703,7 +703,7 @@
+@@ -757,7 +757,7 @@
#endif
}
@@ -63,7 +63,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
#if defined(OS_ANDROID)
-@@ -715,7 +715,7 @@
+@@ -769,7 +769,7 @@
breakpad::InitCrashReporter(process_type);
#endif // defined(OS_ANDROID)
}
@@ -72,7 +72,7 @@
// After all the platform Breakpads have been initialized, store the command
// line for crash reporting.
-@@ -800,7 +800,7 @@
+@@ -854,7 +854,7 @@
return process_type == switches::kNaClLoaderProcess ||
process_type == switches::kRelauncherProcess;
}
Modified: trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__app__chrome_main_delegate.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.h.orig 2014-02-20 21:27:29.000000000 +0100
-+++ chrome/app/chrome_main_delegate.h 2014-02-25 01:45:34.000000000 +0100
-@@ -31,7 +31,7 @@
+--- ./chrome/app/chrome_main_delegate.h.orig 2014-08-12 21:02:25.000000000 +0200
++++ ./chrome/app/chrome_main_delegate.h 2014-08-13 09:56:56.000000000 +0200
+@@ -35,7 +35,7 @@
virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE;
virtual bool DelaySandboxInitialization(
const std::string& process_type) OVERRIDE;
Modified: trunk/www/chromium/files/patch-chrome__browser__about_flags.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__about_flags.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__about_flags.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig 2012-01-18 11:12:44.000000000 +0200
-+++ chrome/browser/about_flags.cc 2012-01-29 14:51:40.000000000 +0200
-@@ -674,7 +674,7 @@
+--- ./chrome/browser/about_flags.cc.orig 2014-08-12 21:01:48.000000000 +0200
++++ ./chrome/browser/about_flags.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -2183,7 +2183,7 @@
return kOsWin;
#elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check.
return kOsCrOS;
@@ -7,5 +7,5 @@
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_LINUX) || defined(OS_BSD)
return kOsLinux;
- #else
- #error Unknown platform
+ #elif defined(OS_ANDROID)
+ return kOsAndroid;
Modified: trunk/www/chromium/files/patch-chrome__browser__browser_process_impl.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__browser_process_impl.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__browser_process_impl.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/browser_process_impl.cc.orig 2013-09-25 23:32:28.000000000 +0300
-+++ chrome/browser/browser_process_impl.cc 2013-09-25 23:34:24.000000000 +0300
-@@ -244,7 +244,7 @@
+--- ./chrome/browser/browser_process_impl.cc.orig 2014-08-12 21:01:48.000000000 +0200
++++ ./chrome/browser/browser_process_impl.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -239,7 +239,7 @@
ExtensionRendererState::GetInstance()->Shutdown();
@@ -7,32 +7,5 @@
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD)
media_file_system_registry_.reset();
- // Delete |storage_monitor_| now. Otherwise the FILE thread would be gone
- // when we try to release it in the dtor and Valgrind would report a
-@@ -618,7 +618,7 @@
- }
-
- StorageMonitor* BrowserProcessImpl::storage_monitor() {
--#if defined(OS_ANDROID) || defined(OS_IOS)
-+#if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_BSD)
- return NULL;
- #else
- return storage_monitor_.get();
-@@ -627,7 +627,7 @@
-
- void BrowserProcessImpl::set_storage_monitor_for_test(
- scoped_ptr<StorageMonitor> monitor) {
--#if !defined(OS_ANDROID) && !defined(OS_IOS)
-+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD)
- storage_monitor_ = monitor.Pass();
- #endif
- }
-@@ -923,7 +923,7 @@
- }
- #endif
-
--#if !defined(OS_ANDROID) && !defined(OS_IOS)
-+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD)
- storage_monitor_.reset(StorageMonitor::Create());
- #endif
-
+ // Remove the global instance of the Storage Monitor now. Otherwise the
+ // FILE thread would be gone when we try to release it in the dtor and
Modified: trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,11 +1,11 @@
---- chrome/browser/chrome_browser_main.cc.orig 2012-05-19 23:45:48.797106216 +0300
-+++ chrome/browser/chrome_browser_main.cc 2012-05-19 23:45:56.878106198 +0300
-@@ -1298,7 +1298,7 @@
- // just changed it to include experiments.
- child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess());
+--- ./chrome/browser/chrome_browser_main.cc.orig 2014-08-12 21:01:47.000000000 +0200
++++ ./chrome/browser/chrome_browser_main.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -926,7 +926,7 @@
+ }
+ #endif
-#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX)
// Set the product channel for crash reports.
- child_process_logging::SetChannel(
+ base::debug::SetCrashKeyValue(crash_keys::kChannel,
chrome::VersionInfo::GetVersionStringModifier());
Modified: trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,18 +1,18 @@
---- chrome/browser/chrome_browser_main_posix.cc.orig 2013-02-28 10:15:23.000000000 +0200
-+++ chrome/browser/chrome_browser_main_posix.cc 2013-03-06 20:31:24.000000000 +0200
-@@ -310,6 +310,11 @@
+--- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-08-12 21:01:48.000000000 +0200
++++ ./chrome/browser/chrome_browser_main_posix.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -305,6 +305,11 @@
g_pipe_pid = getpid();
g_shutdown_pipe_read_fd = pipefd[0];
g_shutdown_pipe_write_fd = pipefd[1];
-+#if defined(OS_FREEBSD) || defined(OS_BSD)
++#if defined(OS_FREEBSD)
+ // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD,
+ // we request the default pthread stack size by specifying 0 here.
+ const size_t kShutdownDetectorThreadStackSize = 0;
+#else
#if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
- const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN;
+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
#else
-@@ -318,6 +323,7 @@
+@@ -313,6 +318,7 @@
// size to avoid hitting the guard page.
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
#endif
Modified: trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2014-01-07 21:01:57.000000000 +0100
-+++ chrome/browser/chrome_content_browser_client.cc 2014-01-11 01:50:13.000000000 +0100
-@@ -486,7 +486,7 @@
+--- ./chrome/browser/chrome_content_browser_client.cc.orig 2014-08-12 21:01:48.000000000 +0200
++++ ./chrome/browser/chrome_content_browser_client.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -492,7 +492,7 @@
}
}
@@ -9,7 +9,7 @@
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
const std::string& process_type) {
base::FilePath dumps_path;
-@@ -543,7 +543,7 @@
+@@ -548,7 +548,7 @@
return -1;
}
@@ -16,9 +16,9 @@
-#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
#endif // !defined(OS_ANDROID)
-
+
#if !defined(OS_CHROMEOS)
-@@ -1389,7 +1389,7 @@
+@@ -1459,7 +1459,7 @@
void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
CommandLine* command_line, int child_process_id) {
@@ -27,8 +27,8 @@
if (breakpad::IsCrashReporterEnabled()) {
std::string enable_crash_reporter;
GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter);
-@@ -2525,7 +2525,7 @@
- Profile::FromBrowserContext(browser_context)));
+@@ -2563,7 +2563,7 @@
+ #endif
}
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ -36,7 +36,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const CommandLine& command_line,
int child_process_id,
-@@ -2580,7 +2580,7 @@
+@@ -2617,7 +2617,7 @@
}
#endif // defined(OS_ANDROID)
}
Modified: trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.h.orig 2013-09-25 22:20:01.000000000 +0300
-+++ chrome/browser/chrome_content_browser_client.h 2013-09-25 22:20:17.000000000 +0300
-@@ -248,7 +248,7 @@
+--- ./chrome/browser/chrome_content_browser_client.h.orig 2014-08-12 21:01:48.000000000 +0200
++++ ./chrome/browser/chrome_content_browser_client.h 2014-08-13 09:56:56.000000000 +0200
+@@ -260,7 +260,7 @@
const base::FilePath& storage_partition_path,
ScopedVector<fileapi::FileSystemBackend>* additional_backends) OVERRIDE;
@@ -7,5 +7,5 @@
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
virtual void GetAdditionalMappedFilesForChildProcess(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
int child_process_id,
Modified: trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,8 +1,8 @@
---- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2013-11-08 07:40:50.000000000 +0100
-+++ chrome/browser/diagnostics/diagnostics_writer.cc 2013-11-16 11:31:52.000000000 +0100
+--- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-08-12 21:01:46.000000000 +0200
++++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-08-13 09:56:56.000000000 +0200
@@ -268,7 +268,7 @@
console_->SetColor(color);
- console_->Write(ASCIIToUTF16(result));
+ console_->Write(base::ASCIIToUTF16(result));
}
- if (format_ == MACHINE) {
+ if (format_ == THEMACHINE) {
Modified: trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- chrome/browser/diagnostics/diagnostics_writer.h.orig 2013-11-08 07:40:50.000000000 +0100
-+++ chrome/browser/diagnostics/diagnostics_writer.h 2013-11-16 11:29:16.000000000 +0100
+--- ./chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-08-12 21:01:46.000000000 +0200
++++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-08-13 09:56:56.000000000 +0200
@@ -18,7 +18,7 @@
public:
// The type of formatting done by this writer.
Modified: trunk/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,9 +1,9 @@
---- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2013-11-16 01:16:39.000000000 +0100
-+++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2013-11-17 23:32:59.000000000 +0100
-@@ -149,10 +149,12 @@
+--- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-08-12 21:01:44.000000000 +0200
++++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -167,10 +167,12 @@
}
- bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunImpl() {
+ bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunAsync() {
+#if !defined(OS_FREEBSD)
RemovableStorageProvider::GetAllDevices(
base::Bind(
Modified: trunk/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-02-20 21:27:39.000000000 +0100
-+++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-02-28 11:05:01.000000000 +0100
+--- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-08-12 21:01:44.000000000 +0200
++++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-08-13 09:56:56.000000000 +0200
@@ -4,6 +4,10 @@
#include "chrome/browser/extensions/api/music_manager_private/device_id.h"
@@ -11,7 +11,7 @@
#include <sys/socket.h> // Must be included before ifaddrs.h.
#include <ifaddrs.h>
#include <net/if.h>
-@@ -100,11 +104,33 @@
+@@ -102,11 +106,33 @@
const char* prefixes[],
size_t prefixes_count) {
const int MAC_LENGTH = 6;
@@ -46,7 +46,7 @@
int sd = socket(AF_INET, SOCK_DGRAM, 0);
int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo);
close(sd);
-@@ -114,11 +140,17 @@
+@@ -116,11 +142,17 @@
const char* mac_address =
static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
Modified: trunk/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2014-02-20 21:27:38.000000000 +0100
-+++ chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-02-24 16:10:53.000000000 +0100
+--- ./chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2014-08-12 21:01:44.000000000 +0200
++++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-08-13 09:56:56.000000000 +0200
@@ -36,7 +36,7 @@
BITRATE_TO_SPEED_CASE(9600)
BITRATE_TO_SPEED_CASE(19200)
Modified: trunk/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- chrome/browser/gpu/gl_string_manager.cc.orig 2013-09-02 20:59:56.000000000 +0300
-+++ chrome/browser/gpu/gl_string_manager.cc 2013-09-02 21:01:13.000000000 +0300
+--- ./chrome/browser/gpu/gl_string_manager.cc.orig 2014-08-12 21:01:33.000000000 +0200
++++ ./chrome/browser/gpu/gl_string_manager.cc 2014-08-13 09:56:56.000000000 +0200
@@ -25,7 +25,7 @@
void GLStringManager::Initialize() {
Modified: trunk/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/gpu/gpu_feature_checker.cc.orig
-+++ chrome/browser/gpu/gpu_feature_checker.cc
-@@ -33,7 +33,7 @@ void GPUFeatureChecker::CheckGPUFeatureAvailability() {
+--- ./chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-08-12 21:01:33.000000000 +0200
++++ ./chrome/browser/gpu/gpu_feature_checker.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -33,7 +33,7 @@
CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
bool finalized = true;
Modified: trunk/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/media/webrtc_log_uploader.cc.orig 2013-08-17 21:10:06.000000000 +0300
-+++ chrome/browser/media/webrtc_log_uploader.cc 2013-08-17 21:10:45.000000000 +0300
-@@ -102,6 +102,8 @@
+--- ./chrome/browser/media/webrtc_log_uploader.cc.orig 2014-08-12 21:01:33.000000000 +0200
++++ ./chrome/browser/media/webrtc_log_uploader.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -196,6 +196,8 @@
const char product[] = "Chrome_Android";
#elif defined(OS_CHROMEOS)
const char product[] = "Chrome_ChromeOS";
@@ -7,5 +7,5 @@
+#elif defined(OS_FREEBSD)
+ const char product[] = "Chrome_FreeBSD";
#else
- // This file should not be compiled for other platforms.
- COMPILE_ASSERT(false);
+ #error Platform not supported.
+ #endif
Modified: trunk/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-01-07 21:01:47.000000000 +0100
-+++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2014-01-13 17:44:02.000000000 +0100
+--- ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-08-12 21:01:32.000000000 +0200
++++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2014-08-13 09:56:56.000000000 +0200
@@ -33,9 +33,11 @@
// Note that this initializes the delegate asynchronously, but since
// the delegate will only be used from the IO thread, it is guaranteed
Modified: trunk/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,12 +1,12 @@
---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-02-03 15:15:11.000000000 -0500
-+++ chrome/browser/media_galleries/media_file_system_registry.cc 2014-02-24 20:57:03.060309366 -0500
-@@ -591,7 +591,10 @@
+--- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-08-12 21:01:33.000000000 +0200
++++ ./chrome/browser/media_galleries/media_file_system_registry.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -724,7 +724,10 @@
// Constructor in 'private' section because depends on private class definition.
MediaFileSystemRegistry::MediaFileSystemRegistry()
- : file_system_context_(new MediaFileSystemContextImpl(this)) {
+ : file_system_context_(new MediaFileSystemContextImpl) {
- StorageMonitor::GetInstance()->AddObserver(this);
-+ /* This conditional is needed for shutdown. Destructors
-+ try to get the media file system registry. */
++ // This conditional is needed for shutdown. Destructors
++ // try to get the media file system registry.
+ if (StorageMonitor::GetInstance())
+ StorageMonitor::GetInstance()->AddObserver(this);
}
Modified: trunk/www/chromium/files/patch-chrome__browser__memory_details.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__memory_details.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__memory_details.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/memory_details.cc.orig 2012-10-31 21:02:26.000000000 +0200
-+++ chrome/browser/memory_details.cc 2012-11-07 17:28:28.000000000 +0200
-@@ -31,7 +31,7 @@
+--- ./chrome/browser/memory_details.cc.orig 2014-08-12 21:01:47.000000000 +0200
++++ ./chrome/browser/memory_details.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -32,7 +32,7 @@
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -9,7 +9,7 @@
#include "content/public/browser/zygote_host_linux.h"
#endif
-@@ -195,7 +195,7 @@
+@@ -202,7 +202,7 @@
void MemoryDetails::CollectChildInfoOnUIThread() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -18,7 +18,7 @@
const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid();
const pid_t sandbox_helper_pid =
content::ZygoteHost::GetInstance()->GetSandboxHelperPid();
-@@ -335,7 +335,7 @@
+@@ -336,7 +336,7 @@
}
}
@@ -25,5 +25,5 @@
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
if (process.pid == zygote_pid) {
- process.type = content::PROCESS_TYPE_ZYGOTE;
+ process.process_type = content::PROCESS_TYPE_ZYGOTE;
} else if (process.pid == sandbox_helper_pid) {
Modified: trunk/www/chromium/files/patch-chrome__browser__net__connection_tester.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__net__connection_tester.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__net__connection_tester.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/net/connection_tester.cc.orig 2012-01-18 11:12:39.000000000 +0200
-+++ chrome/browser/net/connection_tester.cc 2012-01-29 15:24:02.000000000 +0200
-@@ -212,7 +212,7 @@
+--- ./chrome/browser/net/connection_tester.cc.orig 2014-08-12 21:01:39.000000000 +0200
++++ ./chrome/browser/net/connection_tester.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -213,7 +213,7 @@
// Otherwise returns a network error code.
int CreateSystemProxyConfigService(
scoped_ptr<net::ProxyConfigService>* config_service) {
Modified: trunk/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/plugins/plugins_resource_service.cc.orig 2013-01-03 16:15:04.489512557 +0200
-+++ chrome/browser/plugins/plugins_resource_service.cc 2013-01-03 16:16:48.346512702 +0200
-@@ -31,7 +31,7 @@
+--- ./chrome/browser/plugins/plugins_resource_service.cc.orig 2014-08-12 21:01:47.000000000 +0200
++++ ./chrome/browser/plugins/plugins_resource_service.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -33,7 +33,7 @@
std::string filename;
#if defined(OS_WIN)
filename = "plugins_win.json";
Modified: trunk/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/about_ui.cc.orig 2013-02-28 10:15:18.000000000 +0200
-+++ chrome/browser/ui/webui/about_ui.cc 2013-03-06 20:47:33.000000000 +0200
-@@ -740,7 +740,7 @@
+--- ./chrome/browser/ui/webui/about_ui.cc.orig 2014-08-12 21:01:37.000000000 +0200
++++ ./chrome/browser/ui/webui/about_ui.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -763,7 +763,7 @@
return data;
}
@@ -9,7 +9,7 @@
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data, 0,
-@@ -756,6 +756,7 @@
+@@ -779,6 +779,7 @@
return data;
}
@@ -17,7 +17,7 @@
void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id,
bool good) {
data->append("<tr><td>");
-@@ -818,6 +819,7 @@
+@@ -849,6 +850,7 @@
return data;
}
#endif
@@ -25,7 +25,7 @@
// AboutMemoryHandler ----------------------------------------------------------
-@@ -986,7 +988,7 @@
+@@ -1019,7 +1021,7 @@
} else if (source_name_ == chrome::kChromeUIDNSHost) {
AboutDnsHandler::Start(profile(), callback);
return;
Modified: trunk/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2012-11-27 10:02:11.000000000 +0200
-+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2012-11-28 21:02:24.000000000 +0200
-@@ -366,7 +366,7 @@
+--- ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-08-12 21:01:37.000000000 +0200
++++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -488,7 +488,7 @@
url.host() == chrome::kChromeUIMemoryRedirectHost ||
url.host() == chrome::kChromeUIStatsHost ||
url.host() == chrome::kChromeUITermsHost
Modified: trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2013-08-30 06:46:19.000000000 +0300
-+++ chrome/browser/ui/webui/options/browser_options_handler.cc 2013-09-03 21:15:44.092633766 +0300
-@@ -322,7 +322,8 @@
+--- ./chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2014-08-12 21:01:37.000000000 +0200
++++ ./chrome/browser/ui/webui/options/browser_options_handler.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -333,7 +333,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 },
-@@ -596,7 +597,8 @@
+@@ -640,7 +641,8 @@
"requestProfilesInfo",
base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
base::Unretained(this)));
@@ -20,7 +20,7 @@
web_ui()->RegisterMessageCallback(
"themesSetNative",
base::Bind(&BrowserOptionsHandler::ThemesSetNative,
-@@ -1323,7 +1325,8 @@
+@@ -1269,7 +1271,8 @@
ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
bool is_native_theme = false;
@@ -30,7 +30,7 @@
bool profile_is_managed = profile->IsManaged();
is_native_theme = theme_service->UsingNativeTheme();
base::FundamentalValue native_theme_enabled(!is_native_theme &&
-@@ -1345,7 +1348,8 @@
+@@ -1291,7 +1294,8 @@
ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
}
@@ -37,6 +37,6 @@
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
+ !defined(OS_ANDROID)
- void BrowserOptionsHandler::ThemesSetNative(const ListValue* args) {
+ void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) {
content::RecordAction(UserMetricsAction("Options_GtkThemeSet"));
Profile* profile = Profile::FromWebUI(web_ui());
Modified: trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2013-09-03 21:22:36.851628387 +0300
-+++ chrome/browser/ui/webui/options/browser_options_handler.h 2013-09-03 21:23:09.395628553 +0300
-@@ -193,7 +193,8 @@
+--- ./chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-08-12 21:01:37.000000000 +0200
++++ ./chrome/browser/ui/webui/options/browser_options_handler.h 2014-08-13 09:56:57.000000000 +0200
+@@ -197,7 +197,8 @@
void ObserveThemeChanged();
void ThemesReset(const base::ListValue* args);
Modified: trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/web_app.cc.orig 2013-11-16 01:16:28.000000000 +0100
-+++ chrome/browser/web_applications/web_app.cc 2013-11-17 21:13:42.000000000 +0100
-@@ -228,7 +228,7 @@
+--- ./chrome/browser/web_applications/web_app.cc.orig 2014-08-12 21:01:47.000000000 +0200
++++ ./chrome/browser/web_applications/web_app.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -472,7 +472,7 @@
}
#endif
@@ -8,4 +8,4 @@
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
std::string GetWMClassFromAppName(std::string app_name) {
file_util::ReplaceIllegalCharactersInPath(&app_name, '_');
- TrimString(app_name, "_", &app_name);
+ base::TrimString(app_name, "_", &app_name);
Modified: trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__browser__web_applications__web_app.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/web_app.h.orig 2013-11-08 07:40:41.000000000 +0100
-+++ chrome/browser/web_applications/web_app.h 2013-11-15 23:02:30.000000000 +0100
-@@ -97,7 +97,7 @@
+--- ./chrome/browser/web_applications/web_app.h.orig 2014-08-12 21:01:47.000000000 +0200
++++ ./chrome/browser/web_applications/web_app.h 2014-08-13 09:56:57.000000000 +0200
+@@ -188,7 +188,7 @@
IconInfoList* icons);
#endif
Modified: trunk/www/chromium/files/patch-chrome__chrome_browser.gypi
===================================================================
--- trunk/www/chromium/files/patch-chrome__chrome_browser.gypi 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__chrome_browser.gypi 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/chrome_browser.gypi.orig 2013-09-20 05:36:07.000000000 +0300
-+++ chrome/chrome_browser.gypi 2013-09-23 20:34:16.000000000 +0300
-@@ -2735,7 +2735,7 @@
+--- ./chrome/chrome_browser.gypi.orig 2014-08-12 21:02:25.000000000 +0200
++++ ./chrome/chrome_browser.gypi 2014-08-13 09:56:57.000000000 +0200
+@@ -2923,7 +2923,7 @@
'../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
],
}],
@@ -9,17 +9,17 @@
'dependencies': [
'../build/linux/system.gyp:libspeechd',
],
-@@ -2859,7 +2859,7 @@
- ],
- },
+@@ -3046,7 +3046,7 @@
+ '../build/linux/system.gyp:xscrnsaver',
+ ],
}],
- ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', {
'sources': [
- 'app/breakpad_linux.cc',
- 'app/breakpad_linux.h',
-@@ -3104,6 +3104,25 @@
- ['exclude', '^browser/usb/'],
+ 'app/chrome_breakpad_client.cc',
+ 'app/chrome_breakpad_client.h',
+@@ -3281,6 +3281,13 @@
+ ['exclude', '^third_party/mozilla_security_manager/'],
],
}],
+ ['os_bsd==1', {
@@ -27,20 +27,17 @@
+ ['exclude', '^browser/chrome_browser_main_linux.cc'],
+ ['exclude', '^browser/chrome_browser_main_linux.h'],
+ ['exclude', '^browser/media_galleries/linux/'],
-+ ['exclude', '^browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc'],
-+ ['exclude', '^browser/storage_monitor/media_transfer_protocol_device_observer_linux.h'],
-+ ['exclude', '^browser/storage_monitor/removable_device_notifications_linux.cc'],
-+ ['exclude', '^browser/storage_monitor/removable_device_notifications_linux.h'],
-+ ['exclude', '^browser/storage_monitor/storage_monitor_linux.cc'],
-+ ['exclude', '^browser/storage_monitor/storage_monitor_linux.h'],
-+ ['exclude', '^browser/storage_monitor/udev_util_linux.cc'],
-+ ['exclude', '^browser/storage_monitor/udev_util_linux.h'],
-+ ['exclude', '^browser/storage_monitor/test_media_transfer_protocol_manager_linux.cc'],
-+ ['exclude', '^browser/storage_monitor/test_media_transfer_protocol_manager_linux.h'],
-+ ['exclude', '^browser/storage_monitor/mtab_watcher_linux.cc'],
-+ ['exclude', '^browser/storage_monitor/mtab_watcher_linux.h'],
+ ],
+ }],
['OS=="mac"', {
- 'sources!': [
- 'browser/automation/automation_provider_list_generic.cc',
+ 'dependencies': [
+ '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
+@@ -3390,7 +3397,7 @@
+ }],
+ ],
+ }],
+- ['OS=="linux"', {
++ ['OS=="linux" or os_bsd==1', {
+ 'conditions': [
+ ['use_aura==1', {
+ 'dependencies': [
Modified: trunk/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
===================================================================
--- trunk/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/chrome_browser_extensions.gypi.orig 2013-11-16 01:17:16.000000000 +0100
-+++ chrome/chrome_browser_extensions.gypi 2013-11-17 17:09:41.000000000 +0100
-@@ -854,6 +854,11 @@
+--- ./chrome/chrome_browser_extensions.gypi.orig 2014-08-12 21:02:25.000000000 +0200
++++ ./chrome/chrome_browser_extensions.gypi 2014-08-13 09:56:57.000000000 +0200
+@@ -921,6 +921,11 @@
'browser/extensions/window_controller_list_observer.h',
],
'conditions': [
Modified: trunk/www/chromium/files/patch-chrome__chrome_tests.gypi
===================================================================
--- trunk/www/chromium/files/patch-chrome__chrome_tests.gypi 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__chrome_tests.gypi 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,11 +1,11 @@
---- chrome/chrome_tests.gypi.orig 2011-07-28 11:02:03.000000000 +0300
-+++ chrome/chrome_tests.gypi 2011-09-06 22:02:18.000000000 +0300
-@@ -4266,7 +4266,7 @@
- '../courgette/courgette.gyp:courgette_unittests',
- 'browser_tests',
- ]}],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="freebsd"', {
- 'dependencies': [
- # Reason for disabling UI tests on non-Linux above.
- 'ui_tests',
+--- ./chrome/chrome_tests.gypi.orig 2014-08-12 21:02:25.000000000 +0200
++++ ./chrome/chrome_tests.gypi 2014-08-13 09:56:57.000000000 +0200
+@@ -1548,7 +1548,7 @@
+ 'test/remoting/remote_desktop_browsertest.h',
+ 'test/remoting/waiter.cc',
+ 'test/remoting/waiter.h',
+- 'test/security_tests/sandbox_browsertest_linux.cc',
++ #'test/security_tests/sandbox_browsertest_linux.cc',
+ 'test/security_tests/sandbox_browsertest_win.cc',
+ # TODO(craig): Rename this and run from base_unittests when the test
+ # is safe to run there. See http://crbug.com/78722 for details.
Property changes on: trunk/www/chromium/files/patch-chrome__chrome_tests.gypi
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/chromium/files/patch-chrome__common__chrome_paths.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__common__chrome_paths.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__common__chrome_paths.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,7 +1,7 @@
---- chrome/common/chrome_paths.cc.orig 2013-02-28 10:15:52.000000000 +0200
-+++ chrome/common/chrome_paths.cc 2013-03-06 21:25:36.000000000 +0200
-@@ -441,10 +441,12 @@
- if (!file_util::PathExists(cur)) // We don't want to create this
+--- ./chrome/common/chrome_paths.cc.orig 2014-08-12 21:02:17.000000000 +0200
++++ ./chrome/common/chrome_paths.cc 2014-08-13 09:57:00.000000000 +0200
+@@ -471,10 +471,12 @@
+ if (!base::PathExists(cur)) // We don't want to create this
return false;
break;
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
@@ -14,3 +14,21 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif
+@@ -552,7 +554,7 @@
+ #endif
+ break;
+
+-#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
++#if defined(OS_LINUX) || defined(OS_FREEBSD) || (defined(OS_MACOSX) && !defined(OS_IOS))
+ case chrome::DIR_NATIVE_MESSAGING:
+ #if defined(OS_MACOSX)
+ #if defined(GOOGLE_CHROME_BUILD)
+@@ -578,7 +580,7 @@
+ return false;
+ cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
+ break;
+-#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
++#endif // defined(OS_LINUX) || defined(OS_FREEBSD) || (defined(OS_MACOSX) && !defined(OS_IOS))
+
+ default:
+ return false;
Modified: trunk/www/chromium/files/patch-chrome__common__chrome_switches.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__common__chrome_switches.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__common__chrome_switches.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,8 +1,8 @@
---- chrome/common/chrome_switches.cc.orig 2013-11-08 07:41:00.000000000 +0100
-+++ chrome/common/chrome_switches.cc 2013-11-16 01:18:01.000000000 +0100
-@@ -1563,13 +1563,13 @@
+--- ./chrome/common/chrome_switches.cc.orig 2014-08-12 21:02:17.000000000 +0200
++++ ./chrome/common/chrome_switches.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -1375,7 +1375,7 @@
+ const char kPasswordStore[] = "password-store";
#endif
- #endif // OS_POSIX
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
@@ -9,10 +9,12 @@
// Triggers migration of user data directory to another directory
// specified as a parameter. The migration is done under singleton lock,
// and sanity checks are made to avoid corrupting the profile.
- // The browser exits after migration is complete.
- const char kMigrateDataDirForSxS[] = "migrate-data-dir-for-sxs";
+@@ -1386,7 +1386,7 @@
+ // Linux speech service. Because it's buggy, the user must explicitly
+ // enable it so that visiting a random webpage can't cause instability.
+ const char kEnableSpeechDispatcher[] = "enable-speech-dispatcher";
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
#if defined(OS_MACOSX)
- // Forcibly disables Lion-style on newer OSes, to allow developers to test the
+ // Prevents Chrome from quitting when Chrome Apps are open.
Modified: trunk/www/chromium/files/patch-chrome__common__chrome_switches.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__common__chrome_switches.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__common__chrome_switches.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,11 +1,11 @@
---- chrome/common/chrome_switches.h.orig 2013-11-08 07:41:00.000000000 +0100
-+++ chrome/common/chrome_switches.h 2013-11-16 01:20:25.000000000 +0100
-@@ -435,7 +435,7 @@
+--- ./chrome/common/chrome_switches.h.orig 2014-08-12 21:02:17.000000000 +0200
++++ ./chrome/common/chrome_switches.h 2014-08-13 09:56:57.000000000 +0200
+@@ -386,7 +386,7 @@
+ extern const char kPasswordStore[];
#endif
- #endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
+ extern const char kEnableSpeechDispatcher[];
extern const char kMigrateDataDirForSxS[];
#endif
-
Modified: trunk/www/chromium/files/patch-chrome__common__pref_names.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__common__pref_names.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__common__pref_names.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.cc.orig 2013-08-17 21:26:00.000000000 +0300
-+++ chrome/common/pref_names.cc 2013-08-17 21:26:43.000000000 +0300
-@@ -955,7 +955,7 @@
+--- ./chrome/common/pref_names.cc.orig 2014-08-12 21:02:17.000000000 +0200
++++ ./chrome/common/pref_names.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -923,7 +923,7 @@
// Boolean controlling whether SafeSearch is mandatory for Google Web Searches.
const char kForceSafeSearch[] = "settings.force_safesearch";
Modified: trunk/www/chromium/files/patch-chrome__common__pref_names.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__common__pref_names.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__common__pref_names.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.h.orig 2013-08-17 20:35:53.000000000 +0300
-+++ chrome/common/pref_names.h 2013-08-17 20:36:25.000000000 +0300
-@@ -341,7 +341,7 @@
+--- ./chrome/common/pref_names.h.orig 2014-08-12 21:02:17.000000000 +0200
++++ ./chrome/common/pref_names.h 2014-08-13 09:56:57.000000000 +0200
+@@ -298,7 +298,7 @@
extern const char kForceSafeSearch[];
extern const char kDeleteTimePeriod[];
extern const char kLastClearBrowsingDataTime[];
Modified: trunk/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2013-07-15 20:44:54.000000000 +0300
-+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc 2013-07-15 20:45:49.000000000 +0300
+--- ./chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2014-08-12 21:02:25.000000000 +0200
++++ ./chrome/renderer/pepper/pepper_flash_font_file_host.cc 2014-08-13 09:56:57.000000000 +0200
@@ -13,7 +13,7 @@
#include "ppapi/proxy/ppapi_messages.h"
#include "ppapi/proxy/serialized_structs.h"
@@ -9,7 +9,7 @@
#include "content/public/common/child_process_sandbox_support_linux.h"
#endif
-@@ -28,12 +28,12 @@
+@@ -26,14 +26,14 @@
: ResourceHost(host->GetPpapiHost(), instance, resource),
renderer_ppapi_host_(host),
fd_(-1) {
@@ -16,15 +16,17 @@
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
fd_ = content::MatchFontWithFallback(
- description.face.c_str(), description.weight >=
- PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
- description.italic, charset);
+ description.face.c_str(),
+ description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
+ description.italic,
+ charset,
+ PP_BROWSERFONT_TRUSTED_FAMILY_DEFAULT);
-#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
}
- PepperFlashFontFileHost::~PepperFlashFontFileHost() {
-@@ -54,7 +54,7 @@
+ PepperFlashFontFileHost::~PepperFlashFontFileHost() {}
+@@ -53,7 +53,7 @@
uint32_t table) {
std::string contents;
int32_t result = PP_ERROR_FAILED;
@@ -33,7 +35,7 @@
if (fd_ != -1) {
size_t length = 0;
if (content::GetFontTable(fd_, table, 0 /* offset */, NULL, &length)) {
-@@ -69,7 +69,7 @@
+@@ -68,7 +68,7 @@
}
}
}
Modified: trunk/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- chrome/renderer/printing/print_web_view_helper.h.orig 2013-08-30 06:47:03.000000000 +0300
-+++ chrome/renderer/printing/print_web_view_helper.h 2013-09-03 21:39:51.232633592 +0300
-@@ -231,7 +231,7 @@
+--- ./chrome/renderer/printing/print_web_view_helper.h.orig 2014-08-12 21:02:25.000000000 +0200
++++ ./chrome/renderer/printing/print_web_view_helper.h 2014-08-13 09:56:57.000000000 +0200
+@@ -201,7 +201,7 @@
void FinishFramePrinting();
// Prints the page listed in |params|.
@@ -8,4 +8,4 @@
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
void PrintPageInternal(const PrintMsg_PrintPage_Params& params,
const gfx::Size& canvas_size,
- WebKit::WebFrame* frame,
+ blink::WebFrame* frame,
Modified: trunk/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,13 +1,13 @@
---- chrome/test/base/in_process_browser_test.cc.orig 2011-11-01 10:43:07.000000000 +0200
-+++ chrome/test/base/in_process_browser_test.cc 2011-11-19 19:32:51.000000000 +0200
-@@ -41,6 +41,10 @@
- #include "chrome/browser/chromeos/audio_handler.h"
- #endif
+--- ./chrome/test/base/in_process_browser_test.cc.orig 2014-08-12 21:02:10.000000000 +0200
++++ ./chrome/test/base/in_process_browser_test.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -72,6 +72,10 @@
+ namespace {
+
+#if defined(OS_FREEBSD)
+#include <signal.h>
+#endif
+
// Passed as value of kTestType.
- static const char kBrowserTestType[] = "browser";
+ const char kBrowserTestType[] = "browser";
Modified: trunk/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
===================================================================
--- trunk/www/chromium/files/patch-chrome__test__base__testing_browser_process.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__test__base__testing_browser_process.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,11 +1,13 @@
---- chrome/test/base/testing_browser_process.h.orig 2011-11-01 10:43:07.000000000 +0200
-+++ chrome/test/base/testing_browser_process.h 2011-11-19 19:35:37.000000000 +0200
-@@ -110,7 +110,7 @@
+--- ./chrome/test/base/testing_browser_process.h.orig 2014-08-12 21:02:10.000000000 +0200
++++ ./chrome/test/base/testing_browser_process.h 2014-08-13 09:56:57.000000000 +0200
+@@ -100,8 +100,8 @@
+ virtual DownloadStatusUpdater* download_status_updater() OVERRIDE;
virtual DownloadRequestLimiter* download_request_limiter() OVERRIDE;
- virtual bool plugin_finder_disabled() const OVERRIDE;
-#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+- virtual void StartAutoupdateTimer() OVERRIDE {}
+#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
- virtual void StartAutoupdateTimer() OVERRIDE {}
++ virtual void StartAutoupdateTimer() /*OVERRIDE*/ {}
#endif
+ virtual ChromeNetLog* net_log() OVERRIDE;
Modified: trunk/www/chromium/files/patch-chrome__test__perf__perf_test.cc
===================================================================
--- trunk/www/chromium/files/patch-chrome__test__perf__perf_test.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__test__perf__perf_test.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- chrome/test/perf/perf_test.cc.orig 2013-08-19 21:01:58.000000000 +0300
-+++ chrome/test/perf/perf_test.cc 2013-08-19 21:03:16.000000000 +0300
+--- ./chrome/test/perf/perf_test.cc.orig 2014-08-12 21:02:10.000000000 +0200
++++ ./chrome/test/perf/perf_test.cc 2014-08-13 09:56:57.000000000 +0200
@@ -352,7 +352,7 @@
AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name,
total_working_set_size, "bytes",
Modified: trunk/www/chromium/files/patch-chrome__tools__build__linux__sed.sh
===================================================================
--- trunk/www/chromium/files/patch-chrome__tools__build__linux__sed.sh 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-chrome__tools__build__linux__sed.sh 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,8 +1,8 @@
---- ./chrome/tools/build/linux/sed.sh.orig 2010-12-16 02:11:59.000000000 +0100
-+++ ./chrome/tools/build/linux/sed.sh 2010-12-20 20:15:08.000000000 +0100
+--- ./chrome/tools/build/linux/sed.sh.orig 2014-08-12 21:02:25.000000000 +0200
++++ ./chrome/tools/build/linux/sed.sh 2014-08-13 09:56:57.000000000 +0200
@@ -1,4 +1,4 @@
--#!/bin/bash
+-#!/bin/sh
+#!/usr/bin/env bash
- # Copyright (c) 2009 The Chromium Authors. All rights reserved.
+ # Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
Modified: trunk/www/chromium/files/patch-components__policy__resources__policy_templates.json
===================================================================
--- trunk/www/chromium/files/patch-components__policy__resources__policy_templates.json 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-components__policy__resources__policy_templates.json 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- components/policy/resources/policy_templates.json.orig 2013-09-24 21:57:03.000000000 +0300
-+++ components/policy/resources/policy_templates.json 2013-09-24 21:59:32.000000000 +0300
-@@ -1366,7 +1366,7 @@
+--- ./components/policy/resources/policy_templates.json.orig 2014-08-12 21:02:36.000000000 +0200
++++ ./components/policy/resources/policy_templates.json 2014-08-13 09:56:57.000000000 +0200
+@@ -1513,7 +1513,7 @@
'name': 'GSSAPILibraryName',
'type': 'string',
'schema': { 'type': 'string' },
@@ -9,7 +9,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -3339,7 +3339,7 @@
+@@ -3643,7 +3643,7 @@
'name': 'RequireOnlineRevocationChecksForLocalAnchors',
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -18,7 +18,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -3976,7 +3976,7 @@
+@@ -4305,7 +4305,7 @@
'name': 'BackgroundModeEnabled',
'type': 'main',
'schema': { 'type': 'boolean' },
Modified: trunk/www/chromium/files/patch-components__policy__tools__generate_policy_source.py
===================================================================
--- trunk/www/chromium/files/patch-components__policy__tools__generate_policy_source.py 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-components__policy__tools__generate_policy_source.py 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- components/policy/tools/generate_policy_source.py.orig 2013-09-24 21:55:28.000000000 +0300
-+++ components/policy/tools/generate_policy_source.py 2013-09-24 21:56:43.000000000 +0300
-@@ -64,7 +64,7 @@
+--- ./components/policy/tools/generate_policy_source.py.orig 2014-08-12 21:02:35.000000000 +0200
++++ ./components/policy/tools/generate_policy_source.py 2014-08-13 09:56:57.000000000 +0200
+@@ -66,7 +66,7 @@
if platform.startswith('chrome.'):
platform_sub = platform[7:]
if platform_sub == '*':
Modified: trunk/www/chromium/files/patch-content__app__content_main_runner.cc
===================================================================
--- trunk/www/chromium/files/patch-content__app__content_main_runner.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__app__content_main_runner.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- content/app/content_main_runner.cc.orig 2013-07-15 19:05:22.000000000 +0300
-+++ content/app/content_main_runner.cc 2013-07-15 19:11:30.000000000 +0300
-@@ -78,10 +78,10 @@
+--- ./content/app/content_main_runner.cc.orig 2014-08-12 21:01:22.000000000 +0200
++++ ./content/app/content_main_runner.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -88,10 +88,10 @@
#include "base/posix/global_descriptors.h"
#include "content/public/common/content_descriptors.h"
@@ -13,7 +13,7 @@
#include "content/zygote/zygote_main.h"
#endif
-@@ -323,7 +323,8 @@
+@@ -282,7 +282,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().
-@@ -432,7 +433,8 @@
+@@ -412,7 +413,8 @@
}
}
Modified: trunk/www/chromium/files/patch-content__browser__browser_main_loop.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__browser_main_loop.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__browser__browser_main_loop.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,15 +1,6 @@
---- content/browser/browser_main_loop.cc.orig 2014-02-20 21:28:24.000000000 +0100
-+++ content/browser/browser_main_loop.cc 2014-02-24 20:28:45.000000000 +0100
-@@ -102,7 +102,7 @@
- #include "ui/gfx/gtk_util.h"
- #endif
-
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- #include <sys/stat.h>
-
- #include "content/browser/renderer_host/render_sandbox_host_linux.h"
-@@ -125,7 +125,7 @@
+--- ./content/browser/browser_main_loop.cc.orig 2014-08-12 21:01:25.000000000 +0200
++++ ./content/browser/browser_main_loop.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -135,7 +135,7 @@
namespace content {
namespace {
@@ -17,8 +8,8 @@
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
void SetupSandbox(const CommandLine& parsed_command_line) {
TRACE_EVENT0("startup", "SetupSandbox");
- // TODO(evanm): move this into SandboxWrapper; I'm just trying to move this
-@@ -346,7 +346,7 @@
+ base::FilePath sandbox_binary;
+@@ -336,7 +336,7 @@
void BrowserMainLoop::EarlyInitialization() {
TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
@@ -27,7 +18,7 @@
// No thread should be created before this call, as SetupSandbox()
// will end-up using fork().
SetupSandbox(parsed_command_line_);
-@@ -784,7 +784,7 @@
+@@ -762,9 +762,9 @@
}
#endif
@@ -34,5 +25,8 @@
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
ZygoteHostImpl::GetInstance()->TearDownAfterLastChild();
- #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ // The device monitors are using |system_monitor_| as dependency, so delete
+ // them before |system_monitor_| goes away.
Modified: trunk/www/chromium/files/patch-content__browser__child_process_launcher.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__child_process_launcher.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__browser__child_process_launcher.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,17 +1,17 @@
---- content/browser/child_process_launcher.cc.orig 2012-11-27 10:01:25.000000000 +0200
-+++ content/browser/child_process_launcher.cc 2012-12-09 17:02:22.000000000 +0200
-@@ -53,7 +53,7 @@
- termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION),
- exit_code_(RESULT_CODE_NORMAL_EXIT),
- starting_(true)
+--- ./content/browser/child_process_launcher.cc.orig 2014-08-12 21:01:25.000000000 +0200
++++ ./content/browser/child_process_launcher.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -66,7 +66,7 @@
+ #else
+ terminate_child_on_shutdown_(true)
+ #endif
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
, zygote_(false)
#endif
{
-@@ -196,7 +196,7 @@
- FileDescriptorInfo(kPrimaryIPCChannel,
- base::FileDescriptor(ipcfd, false)));
+@@ -232,7 +232,7 @@
+ // child termination.
+ base::ScopedFD ipcfd_closer(ipcfd);
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
@@ -18,7 +18,16 @@
GetContentClient()->browser()->
GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id,
&files_to_register);
-@@ -217,7 +217,7 @@
+@@ -242,7 +242,7 @@
+ process_type);
+ } else
+ // Fall through to the normal posix case below when we're not zygoting.
+-#endif // !defined(OS_MACOSX)
++#endif // !defined(OS_MACOSX) && !defined(OS_BSD)
+ {
+ // Convert FD mapping to FileHandleMappingVector
+ base::FileHandleMappingVector fds_to_map;
+@@ -253,7 +253,7 @@
base::GlobalDescriptors::kBaseDescriptor));
}
@@ -27,7 +36,16 @@
if (process_type == switches::kRendererProcess) {
const int sandbox_fd =
RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
-@@ -269,7 +269,7 @@
+@@ -261,7 +261,7 @@
+ sandbox_fd,
+ GetSandboxFD()));
+ }
+-#endif // defined(OS_MACOSX)
++#endif // defined(OS_MACOSX) && !defined(OS_BSD)
+
+ // Actually launch the app.
+ base::LaunchOptions options;
+@@ -307,7 +307,7 @@
base::Bind(
&Context::Notify,
this_object.get(),
@@ -36,7 +54,7 @@
use_zygote,
#endif
handle));
-@@ -277,7 +277,7 @@
+@@ -315,7 +315,7 @@
}
void Notify(
@@ -45,7 +63,7 @@
bool zygote,
#endif
base::ProcessHandle handle) {
-@@ -290,7 +290,7 @@
+@@ -328,7 +328,7 @@
if (!handle)
LOG(ERROR) << "Failed to launch child process";
@@ -54,7 +72,7 @@
zygote_ = zygote;
#endif
if (client_) {
-@@ -313,7 +313,7 @@
+@@ -355,7 +355,7 @@
BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
base::Bind(
&Context::TerminateInternal,
@@ -63,7 +81,7 @@
zygote_,
#endif
process_.handle()));
-@@ -327,7 +327,7 @@
+@@ -372,7 +372,7 @@
}
static void TerminateInternal(
@@ -72,7 +90,7 @@
bool zygote,
#endif
base::ProcessHandle handle) {
-@@ -341,7 +341,7 @@
+@@ -386,13 +386,13 @@
process.Terminate(RESULT_CODE_NORMAL_EXIT);
// On POSIX, we must additionally reap the child.
#if defined(OS_POSIX)
@@ -81,7 +99,14 @@
if (zygote) {
// If the renderer was created via a zygote, we have to proxy the reaping
// through the zygote process.
-@@ -368,7 +368,7 @@
+ ZygoteHostImpl::GetInstance()->EnsureProcessTerminated(handle);
+ } else
+-#endif // !OS_MACOSX
++#endif // !OS_MACOSX && !OS_BSD
+ {
+ base::EnsureProcessTerminated(handle);
+ }
+@@ -413,7 +413,7 @@
#if defined(OS_ANDROID)
// The fd to close after creating the process.
int ipcfd_;
@@ -90,7 +115,7 @@
bool zygote_;
#endif
};
-@@ -423,7 +423,7 @@
+@@ -455,7 +455,7 @@
*exit_code = context_->exit_code_;
return context_->termination_status_;
}
@@ -98,4 +123,4 @@
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
if (context_->zygote_) {
context_->termination_status_ = ZygoteHostImpl::GetInstance()->
- GetTerminationStatus(handle, &context_->exit_code_);
+ GetTerminationStatus(handle, known_dead, &context_->exit_code_);
Modified: trunk/www/chromium/files/patch-content__browser__download__base_file.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__download__base_file.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__browser__download__base_file.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- content/browser/download/base_file.cc.orig 2013-08-18 21:43:48.000000000 +0300
-+++ content/browser/download/base_file.cc 2013-08-18 21:44:22.000000000 +0300
-@@ -212,7 +212,8 @@
+--- ./content/browser/download/base_file.cc.orig 2014-08-12 21:01:23.000000000 +0200
++++ ./content/browser/download/base_file.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -204,7 +204,8 @@
}
// OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations.
Modified: trunk/www/chromium/files/patch-content__browser__download__base_file_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__download__base_file_linux.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__browser__download__base_file_linux.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- content/browser/download/base_file_linux.cc.orig 2013-08-21 09:50:31.000000000 +0300
-+++ content/browser/download/base_file_linux.cc 2013-08-21 09:51:22.000000000 +0300
+--- ./content/browser/download/base_file_linux.cc.orig 2014-08-12 21:01:23.000000000 +0200
++++ ./content/browser/download/base_file_linux.cc 2014-08-13 09:56:57.000000000 +0200
@@ -13,7 +13,9 @@
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
DCHECK(!detached_);
Modified: trunk/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- content/browser/geolocation/location_arbitrator_impl.cc.orig 2014-01-07 21:02:28.000000000 +0100
-+++ content/browser/geolocation/location_arbitrator_impl.cc 2014-01-13 16:30:21.000000000 +0100
+--- ./content/browser/geolocation/location_arbitrator_impl.cc.orig 2014-08-12 21:01:23.000000000 +0200
++++ ./content/browser/geolocation/location_arbitrator_impl.cc 2014-08-13 09:56:57.000000000 +0200
@@ -160,7 +160,7 @@
}
Modified: trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
===================================================================
--- trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2013-11-15 12:34:18.000000000 +0100
-+++ content/browser/geolocation/wifi_data_provider_freebsd.cc 2013-11-15 22:09:52.000000000 +0100
+--- ./content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2014-08-13 09:56:57.000000000 +0200
++++ ./content/browser/geolocation/wifi_data_provider_freebsd.cc 2014-08-13 09:56:57.000000000 +0200
@@ -0,0 +1,200 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
@@ -148,7 +148,7 @@
+ }
+ strncpy(ssid, id, idlen);
+ ssid[idlen] = '\0';
-+ apd.ssid = UTF8ToUTF16(ssid);
++ apd.ssid = base::UTF8ToUTF16(ssid);
+ apd.mac_address = MacAddressAsString16(isr->isr_bssid);
+ apd.radio_signal_strength = (isr->isr_rssi/2) + isr->isr_noise;
+ apd.signal_to_noise = apd.radio_signal_strength - isr->isr_noise;
Modified: trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
===================================================================
--- trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- content/browser/geolocation/wifi_data_provider_freebsd.h.orig 2013-11-15 12:34:18.000000000 +0100
-+++ content/browser/geolocation/wifi_data_provider_freebsd.h 2013-11-15 22:08:05.000000000 +0100
+--- ./content/browser/geolocation/wifi_data_provider_freebsd.h.orig 2014-08-13 09:56:57.000000000 +0200
++++ ./content/browser/geolocation/wifi_data_provider_freebsd.h 2014-08-13 09:56:57.000000000 +0200
@@ -0,0 +1,31 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
Modified: trunk/www/chromium/files/patch-content__common__set_process_title_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-content__common__set_process_title_linux.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__common__set_process_title_linux.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- content/common/set_process_title_linux.cc.orig 2011-03-20 22:02:04.226737055 +0200
-+++ content/common/set_process_title_linux.cc 2011-03-20 22:02:04.407737434 +0200
+--- ./content/common/set_process_title_linux.cc.orig 2014-08-12 21:01:26.000000000 +0200
++++ ./content/common/set_process_title_linux.cc 2014-08-13 09:56:57.000000000 +0200
@@ -48,6 +48,8 @@
extern char** environ;
Modified: trunk/www/chromium/files/patch-content__common__set_process_title_linux.h
===================================================================
--- trunk/www/chromium/files/patch-content__common__set_process_title_linux.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__common__set_process_title_linux.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,8 +1,8 @@
---- content/common/set_process_title_linux.h.orig 2011-03-20 22:02:04.219736445 +0200
-+++ content/common/set_process_title_linux.h 2011-03-20 22:02:04.404739287 +0200
-@@ -6,6 +6,9 @@
- #define CHROME_COMMON_SET_PROCESS_TITLE_LINUX_H_
- #pragma once
+--- ./content/common/set_process_title_linux.h.orig 2014-08-12 21:01:26.000000000 +0200
++++ ./content/common/set_process_title_linux.h 2014-08-13 09:56:57.000000000 +0200
+@@ -5,6 +5,9 @@
+ #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_
+ #define CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_
+#include "build/build_config.h"
+
@@ -10,7 +10,7 @@
// Set the process title that will show in "ps" and similar tools. Takes
// printf-style format string and arguments. After calling setproctitle()
// the original main() argv[] array should not be used. By default, the
-@@ -15,6 +18,7 @@
+@@ -14,6 +17,7 @@
// This signature and naming is to be compatible with most other Unix
// implementations of setproctitle().
void setproctitle(const char* fmt, ...);
Modified: trunk/www/chromium/files/patch-content__content_browser.gypi
===================================================================
--- trunk/www/chromium/files/patch-content__content_browser.gypi 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__content_browser.gypi 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- ./content/content_browser.gypi.orig 2014-02-20 21:28:25.000000000 +0100
-+++ ./content/content_browser.gypi 2014-02-24 23:00:37.000000000 +0100
-@@ -586,6 +586,8 @@
+--- ./content/content_browser.gypi.orig 2014-08-12 21:01:27.000000000 +0200
++++ ./content/content_browser.gypi 2014-08-13 09:56:57.000000000 +0200
+@@ -631,6 +631,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',
-@@ -1543,8 +1545,18 @@
+@@ -1652,8 +1654,18 @@
],
}],
['os_bsd==1', {
@@ -29,13 +29,13 @@
+ 'browser/udev_linux.cc',
],
}],
- ['use_aura!=1 and OS!="win"', {
-@@ -1635,7 +1647,7 @@
+ ['use_aura==1', {
+@@ -1717,7 +1729,7 @@
'browser/geolocation/empty_wifi_data_provider.cc',
],
}],
- ['OS == "linux" and use_dbus==1', {
-+ ['(OS == "linux" or OS=="freebsd") and use_dbus==1', {
++ ['(OS == "linux" or os_bsd==1) and use_dbus==1', {
'sources!': [
'browser/geolocation/empty_wifi_data_provider.cc',
],
Modified: trunk/www/chromium/files/patch-content__content_common.gypi
===================================================================
--- trunk/www/chromium/files/patch-content__content_common.gypi 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__content_common.gypi 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- content/content_common.gypi.orig 2014-02-20 21:28:25.000000000 +0100
-+++ content/content_common.gypi 2014-02-24 20:59:04.000000000 +0100
-@@ -482,6 +482,21 @@
+--- ./content/content_common.gypi.orig 2014-08-12 21:01:27.000000000 +0200
++++ ./content/content_common.gypi 2014-08-13 09:56:57.000000000 +0200
+@@ -559,6 +559,21 @@
'content.gyp:common_aidl',
],
}],
@@ -19,6 +19,6 @@
+ 'common/sandbox_linux/sandbox_seccomp_bpf_linux.cc',
+ ],
+ }],
- ['toolkit_uses_gtk == 1', {
+ ['use_pango == 1', {
'dependencies': [
- '../build/linux/system.gyp:gtk',
+ '../build/linux/system.gyp:pangocairo',
Modified: trunk/www/chromium/files/patch-content__content_tests.gypi
===================================================================
--- trunk/www/chromium/files/patch-content__content_tests.gypi 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__content_tests.gypi 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- content/content_tests.gypi.orig 2013-01-08 23:49:55.890245836 +0200
-+++ content/content_tests.gypi 2013-01-08 23:52:52.374246102 +0200
-@@ -585,6 +585,15 @@
+--- ./content/content_tests.gypi.orig 2014-08-12 21:01:27.000000000 +0200
++++ ./content/content_tests.gypi 2014-08-13 09:56:57.000000000 +0200
+@@ -872,6 +872,15 @@
'browser/geolocation/wifi_data_provider_linux_unittest.cc',
],
}],
Modified: trunk/www/chromium/files/patch-content__public__test__browser_test_base.cc
===================================================================
--- trunk/www/chromium/files/patch-content__public__test__browser_test_base.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__public__test__browser_test_base.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- content/public/test/browser_test_base.cc.orig 2013-01-08 23:22:25.608704051 +0200
-+++ content/public/test/browser_test_base.cc 2013-01-08 23:24:45.354245363 +0200
+--- ./content/public/test/browser_test_base.cc.orig 2014-08-12 21:01:19.000000000 +0200
++++ ./content/public/test/browser_test_base.cc 2014-08-13 09:56:57.000000000 +0200
@@ -4,6 +4,10 @@
#include "content/public/test/browser_test_base.h"
Modified: trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
===================================================================
--- trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,24 +1,24 @@
---- content/renderer/media/webrtc_audio_capturer.cc.orig 2013-08-30 06:45:44.000000000 +0300
-+++ content/renderer/media/webrtc_audio_capturer.cc 2013-09-03 21:47:30.139633005 +0300
-@@ -26,10 +26,10 @@
- // The listed rates below adds restrictions and WebRtcAudioDeviceImpl::Init()
+--- ./content/renderer/media/webrtc_audio_capturer.cc.orig 2014-08-12 21:01:18.000000000 +0200
++++ ./content/renderer/media/webrtc_audio_capturer.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -31,9 +31,7 @@
// will fail if the user selects any rate outside these ranges.
- const int kValidInputRates[] = {96000, 48000, 44100, 32000, 16000, 8000};
+ const int kValidInputRates[] =
+ {192000, 96000, 48000, 44100, 32000, 16000, 8000};
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
-const int kValidInputRates[] = {48000, 44100};
- #elif defined(OS_ANDROID)
+-#elif defined(OS_ANDROID)
++#elif defined(OS_POSIX)
const int kValidInputRates[] = {48000, 44100};
-+#elif defined(OS_POSIX)
-+const int kValidInputRates[] = {48000, 44100};
#else
const int kValidInputRates[] = {44100};
- #endif
-@@ -430,7 +430,7 @@
- // CaptureCallback.
+@@ -452,8 +450,8 @@
+ // CaptureCallback.
#if defined(OS_WIN) || defined(OS_MACOSX)
DCHECK_LE(volume, 1.0);
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+- // We have a special situation on Linux where the microphone volume can be
+#elif defined(OS_POSIX) && !defined(OS_ANDROID)
- // We have a special situation on Linux where the microphone volume can be
++ // We have a special situation on POSIX where the microphone volume can be
// "higher than maximum". The input volume slider in the sound preference
// allows the user to set a scaling that is higher than 100%. It means that
+ // even if the reported maximum levels is N, the actual microphone level can
Modified: trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc
===================================================================
--- trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- content/renderer/media/webrtc_audio_renderer.cc.orig 2013-09-02 21:19:42.000000000 +0300
-+++ content/renderer/media/webrtc_audio_renderer.cc 2013-09-02 21:21:52.000000000 +0300
-@@ -31,7 +31,7 @@
+--- ./content/renderer/media/webrtc_audio_renderer.cc.orig 2014-08-12 21:01:18.000000000 +0200
++++ ./content/renderer/media/webrtc_audio_renderer.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -34,7 +34,7 @@
// rates below adds restrictions and Initialize() will fail if the user selects
// any rate outside these ranges.
const int kValidOutputRates[] = {96000, 48000, 44100, 32000, 16000};
Modified: trunk/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc
===================================================================
--- trunk/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- content/renderer/pepper/usb_key_code_conversion.cc.orig 2013-09-03 23:00:20.220628554 +0300
-+++ content/renderer/pepper/usb_key_code_conversion.cc 2013-09-03 23:02:18.736631955 +0300
+--- ./content/renderer/pepper/usb_key_code_conversion.cc.orig 2014-08-12 21:01:19.000000000 +0200
++++ ./content/renderer/pepper/usb_key_code_conversion.cc 2014-08-13 09:56:57.000000000 +0200
@@ -10,7 +10,7 @@
namespace content {
Modified: trunk/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2013-05-13 01:33:56.000000000 +0000
-+++ content/renderer/renderer_main_platform_delegate_linux.cc 2013-05-16 23:29:28.000000000 +0000
-@@ -41,11 +41,14 @@
+--- ./content/renderer/renderer_main_platform_delegate_linux.cc.orig 2014-08-12 21:01:19.000000000 +0200
++++ ./content/renderer/renderer_main_platform_delegate_linux.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -50,11 +50,14 @@
// http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox
//
// Anything else is started in InitializeSandbox().
@@ -15,7 +15,7 @@
// The LinuxSandbox class requires going through initialization before
// GetStatus() and others can be used. When we are not launched through the
// Zygote, this initialization will only happen in the renderer process if
-@@ -80,6 +83,7 @@
+@@ -89,6 +92,7 @@
CHECK_EQ(errno, EPERM);
}
#endif // __x86_64__
Modified: trunk/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
===================================================================
--- trunk/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,15 +1,15 @@
---- content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2013-04-30 10:20:40.000000000 +0300
-+++ content/renderer/renderer_webkitplatformsupport_impl.cc 2013-05-07 21:11:09.000000000 +0300
-@@ -87,7 +87,7 @@
- #include "third_party/WebKit/public/platform/mac/WebSandboxSupport.h"
- #endif
+--- ./content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2014-08-12 21:01:19.000000000 +0200
++++ ./content/renderer/renderer_webkitplatformsupport_impl.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -91,7 +91,7 @@
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ #if defined(OS_POSIX)
+ #include "base/file_descriptor_posix.h"
+-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
#include <map>
#include <string>
-@@ -164,7 +164,7 @@
+@@ -179,7 +179,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 {
-@@ -256,7 +256,7 @@
+@@ -272,7 +272,7 @@
}
blink::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() {
@@ -27,7 +27,7 @@
// WebKit doesn't use WebSandboxSupport on android.
return NULL;
#else
-@@ -541,7 +541,7 @@
+@@ -590,7 +590,7 @@
return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
}
Modified: trunk/www/chromium/files/patch-gpu__config__gpu_control_list.cc
===================================================================
--- trunk/www/chromium/files/patch-gpu__config__gpu_control_list.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-gpu__config__gpu_control_list.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- gpu/config/gpu_control_list.cc.orig 2013-09-02 21:03:44.000000000 +0300
-+++ gpu/config/gpu_control_list.cc 2013-09-02 21:05:31.000000000 +0300
-@@ -1346,10 +1346,10 @@
+--- ./gpu/config/gpu_control_list.cc.orig 2014-08-12 21:01:10.000000000 +0200
++++ ./gpu/config/gpu_control_list.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -1512,10 +1512,10 @@
return kOsWin;
#elif defined(OS_ANDROID)
return kOsAndroid;
Modified: trunk/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- gpu/config/gpu_control_list_unittest.cc.orig 2013-09-02 21:20:16.000000000 +0300
-+++ gpu/config/gpu_control_list_unittest.cc 2013-09-02 21:21:01.000000000 +0300
-@@ -177,8 +177,7 @@
+--- ./gpu/config/gpu_control_list_unittest.cc.orig 2014-08-12 21:01:09.000000000 +0200
++++ ./gpu/config/gpu_control_list_unittest.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -176,8 +176,7 @@
features = control_list->MakeDecision(
GpuControlList::kOsLinux, kOsVersion, gpu_info());
EXPECT_SINGLE_FEATURE(features, TEST_FEATURE_0);
Modified: trunk/www/chromium/files/patch-gpu__config__gpu_test_config.cc
===================================================================
--- trunk/www/chromium/files/patch-gpu__config__gpu_test_config.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-gpu__config__gpu_test_config.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- gpu/config/gpu_test_config.cc.orig 2013-09-02 21:22:26.000000000 +0300
-+++ gpu/config/gpu_test_config.cc 2013-09-02 21:23:55.000000000 +0300
-@@ -17,8 +17,6 @@
+--- ./gpu/config/gpu_test_config.cc.orig 2014-08-12 21:01:09.000000000 +0200
++++ ./gpu/config/gpu_test_config.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -23,8 +23,6 @@
GPUTestConfig::OS GetCurrentOS() {
#if defined(OS_CHROMEOS)
return GPUTestConfig::kOsChromeOS;
@@ -9,7 +9,7 @@
#elif defined(OS_WIN)
int32 major_version = 0;
int32 minor_version = 0;
-@@ -53,6 +51,8 @@
+@@ -61,6 +59,8 @@
}
#elif defined(OS_ANDROID)
return GPUTestConfig::kOsAndroid;
Modified: trunk/www/chromium/files/patch-gpu__gpu_config.gypi
===================================================================
--- trunk/www/chromium/files/patch-gpu__gpu_config.gypi 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-gpu__gpu_config.gypi 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- gpu/gpu_config.gypi.orig 2013-08-12 20:57:26.000000000 +0000
-+++ gpu/gpu_config.gypi 2013-08-12 20:58:18.000000000 +0000
-@@ -67,7 +67,7 @@
+--- ./gpu/gpu_config.gypi.orig 2014-08-12 21:01:10.000000000 +0200
++++ ./gpu/gpu_config.gypi 2014-08-13 09:56:57.000000000 +0200
+@@ -63,7 +63,7 @@
'../third_party/amd/amd_videocard_info_win.cc',
],
}],
@@ -7,5 +7,5 @@
- ['OS=="linux" and use_x11==1', {
+ ['(OS=="linux" or os_bsd==1) and use_x11==1', {
'dependencies': [
- '../build/linux/system.gyp:libpci',
- '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl',
+ '../build/linux/system.gyp:x11',
+ '../build/linux/system.gyp:xext',
Modified: trunk/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- media/audio/audio_input_volume_unittest.cc.orig 2013-04-30 10:22:14.000000000 +0300
-+++ media/audio/audio_input_volume_unittest.cc 2013-05-07 21:17:17.000000000 +0300
-@@ -57,7 +57,7 @@
+--- ./media/audio/audio_input_volume_unittest.cc.orig 2014-08-12 21:02:56.000000000 +0200
++++ ./media/audio/audio_input_volume_unittest.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -74,7 +74,7 @@
params, device_id);
EXPECT_TRUE(NULL != ais);
Modified: trunk/www/chromium/files/patch-media__base__audio_splicer.cc
===================================================================
--- trunk/www/chromium/files/patch-media__base__audio_splicer.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-media__base__audio_splicer.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,8 +1,8 @@
---- media/base/audio_splicer.cc.orig 2013-08-30 06:47:05.000000000 +0300
-+++ media/base/audio_splicer.cc 2013-09-03 22:08:02.140628065 +0300
-@@ -60,7 +60,7 @@
- base::TimeDelta expected_timestamp = output_timestamp_helper_.GetTimestamp();
- base::TimeDelta delta = timestamp - expected_timestamp;
+--- ./media/base/audio_splicer.cc.orig 2014-08-12 21:02:57.000000000 +0200
++++ ./media/base/audio_splicer.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -143,7 +143,7 @@
+ output_timestamp_helper_.GetTimestamp();
+ const base::TimeDelta delta = timestamp - expected_timestamp;
- if (std::abs(delta.InMilliseconds()) > kMaxTimeDeltaInMilliseconds) {
+ if (std::labs(delta.InMilliseconds()) > kMaxTimeDeltaInMilliseconds) {
@@ -9,12 +9,12 @@
DVLOG(1) << "Timestamp delta too large: " << delta.InMicroseconds() << "us";
return false;
}
-@@ -69,7 +69,7 @@
+@@ -152,7 +152,7 @@
if (delta != base::TimeDelta())
frames_to_fill = output_timestamp_helper_.GetFramesToTarget(timestamp);
-- if (frames_to_fill == 0 || std::abs(frames_to_fill) < min_gap_size_) {
-+ if (frames_to_fill == 0 || std::labs(frames_to_fill) < min_gap_size_) {
+- if (frames_to_fill == 0 || std::abs(frames_to_fill) < kMinGapSize) {
++ if (frames_to_fill == 0 || std::labs(frames_to_fill) < kMinGapSize) {
AddOutputBuffer(input);
return true;
}
Modified: trunk/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
===================================================================
--- trunk/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- media/filters/decrypting_audio_decoder.cc.orig 2013-08-30 06:47:05.000000000 +0300
-+++ media/filters/decrypting_audio_decoder.cc 2013-09-03 22:11:24.289626887 +0300
+--- ./media/filters/decrypting_audio_decoder.cc.orig 2014-08-12 21:02:56.000000000 +0200
++++ ./media/filters/decrypting_audio_decoder.cc 2014-08-13 09:56:57.000000000 +0200
@@ -30,7 +30,7 @@
// Out of sync of 100ms would be pretty noticeable and we should keep any
// drift below that.
Modified: trunk/www/chromium/files/patch-media__media.gyp
===================================================================
--- trunk/www/chromium/files/patch-media__media.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-media__media.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,20 +1,20 @@
---- media/media.gyp.orig 2013-11-08 07:41:32.000000000 +0100
-+++ media/media.gyp 2013-11-15 16:39:58.000000000 +0100
-@@ -563,7 +563,7 @@
+--- ./media/media.gyp.orig 2014-08-12 21:03:00.000000000 +0200
++++ ./media/media.gyp 2014-08-13 09:56:57.000000000 +0200
+@@ -658,7 +658,7 @@
'audio/openbsd/audio_manager_openbsd.h',
],
}],
- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="freebsd"', {
- 'variables': {
- 'conditions': [
- ['sysroot!=""', {
-@@ -836,7 +836,7 @@
- 'ENABLE_EAC3_PLAYBACK',
++ ['OS=="linux" or os_bsd==1', {
+ 'conditions': [
+ ['use_x11==1', {
+ 'dependencies': [
+@@ -917,7 +917,7 @@
+ 'base/simd/convert_yuv_to_rgb_x86.cc',
],
}],
- ['OS!="linux" and OS!="win"', {
-+ ['OS!="linux" and OS!="win" and OS!="freebsd"', {
++ ['OS!="linux" and OS!="win" and os_bsd!=1', {
'sources!': [
'base/keyboard_event_counter.cc',
'base/keyboard_event_counter.h',
Modified: trunk/www/chromium/files/patch-native_client__build__common.gypi
===================================================================
--- trunk/www/chromium/files/patch-native_client__build__common.gypi 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-native_client__build__common.gypi 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,7 +1,7 @@
---- ./native_client/build/common.gypi.orig 2010-12-16 02:12:20.000000000 +0100
-+++ ./native_client/build/common.gypi 2010-12-20 20:15:08.000000000 +0100
-@@ -375,7 +375,7 @@
- },
+--- ./native_client/build/common.gypi.orig 2014-08-12 21:03:33.000000000 +0200
++++ ./native_client/build/common.gypi 2014-08-13 09:56:57.000000000 +0200
+@@ -269,7 +269,7 @@
+ ],
},
'conditions': [
- ['OS=="linux"', {
Modified: trunk/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
===================================================================
--- trunk/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,11 +1,11 @@
---- ./native_client/src/shared/platform/platform.gyp.orig 2010-12-16 02:12:14.000000000 +0100
-+++ ./native_client/src/shared/platform/platform.gyp 2010-12-20 20:15:08.000000000 +0100
-@@ -60,7 +60,7 @@
- 'time.h',
+--- ./native_client/src/shared/platform/platform.gyp.orig 2014-08-12 21:03:09.000000000 +0200
++++ ./native_client/src/shared/platform/platform.gyp 2014-08-13 09:56:57.000000000 +0200
+@@ -36,7 +36,7 @@
+ 'refcount_base.cc',
],
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'platform_sources': [
- 'linux/condition_variable.cc',
- 'linux/lock.cc',
+ 'linux/nacl_clock.c',
+ 'linux/nacl_host_dir.c',
Modified: trunk/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp
===================================================================
--- trunk/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,7 +1,7 @@
---- ./native_client/src/trusted/debug_stub/debug_stub.gyp.orig 2010-12-16 02:12:15.000000000 +0100
-+++ ./native_client/src/trusted/debug_stub/debug_stub.gyp 2010-12-20 20:15:08.000000000 +0100
-@@ -16,7 +16,7 @@
- 'transport_common.cc',
+--- ./native_client/src/trusted/debug_stub/debug_stub.gyp.orig 2014-08-12 21:03:10.000000000 +0200
++++ ./native_client/src/trusted/debug_stub/debug_stub.gyp 2014-08-13 09:56:57.000000000 +0200
+@@ -27,7 +27,7 @@
+ 'test.cc',
],
'conditions': [
- ['OS=="linux" or OS=="mac"', {
@@ -8,8 +8,8 @@
+ ['OS=="linux" or OS=="freebsd" or OS=="mac"', {
'platform_sources': [
'posix/debug_stub_posix.cc',
- 'posix/mutex_impl.cc',
-@@ -40,7 +40,7 @@
+ 'posix/platform_impl.cc',
+@@ -49,7 +49,7 @@
'target_base': 'none',
},
'target_conditions': [
@@ -16,5 +16,5 @@
- ['OS=="linux" or OS=="mac"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="mac"', {
'cflags': [
- '-Wno-long-long',
+ '-fexceptions',
],
Modified: trunk/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp
===================================================================
--- trunk/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- ./native_client/src/trusted/service_runtime/service_runtime.gyp.orig 2010-12-16 02:12:19.000000000 +0100
-+++ ./native_client/src/trusted/service_runtime/service_runtime.gyp 2010-12-20 20:15:08.000000000 +0100
-@@ -31,7 +31,7 @@
+--- ./native_client/src/trusted/service_runtime/service_runtime.gyp.orig 2014-08-12 21:03:22.000000000 +0200
++++ ./native_client/src/trusted/service_runtime/service_runtime.gyp 2014-08-13 09:56:57.000000000 +0200
+@@ -6,7 +6,7 @@
{
'variables': {
'conditions': [
@@ -7,5 +7,5 @@
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'syscall_handler': [
- 'linux/nacl_syscall_impl.c'
+ 'posix/nacl_syscall_impl.c'
],
Modified: trunk/www/chromium/files/patch-net__base__dns_reloader.cc
===================================================================
--- trunk/www/chromium/files/patch-net__base__dns_reloader.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-net__base__dns_reloader.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,9 +1,9 @@
---- net/base/dns_reloader.cc.orig 2011-10-09 01:12:14.189268935 +0300
-+++ net/base/dns_reloader.cc 2011-10-09 01:32:07.358661959 +0300
-@@ -6,6 +6,9 @@
+--- ./net/base/dns_reloader.cc.orig 2014-08-12 21:02:39.000000000 +0200
++++ ./net/base/dns_reloader.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -7,6 +7,9 @@
+ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
+ !defined(OS_ANDROID)
- #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
-
+#if defined(OS_FREEBSD)
+#include <netinet/in.h>
+#endif
Modified: trunk/www/chromium/files/patch-net__base__mime_util_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-net__base__mime_util_unittest.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-net__base__mime_util_unittest.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- net/base/mime_util_unittest.cc.orig 2013-09-02 22:31:36.000000000 +0300
-+++ net/base/mime_util_unittest.cc 2013-09-02 22:32:33.000000000 +0300
-@@ -245,7 +245,7 @@
+--- ./net/base/mime_util_unittest.cc.orig 2014-08-12 21:02:39.000000000 +0200
++++ ./net/base/mime_util_unittest.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -291,7 +291,7 @@
{ "MeSsAge/*", 1, "eml" },
{ "image/bmp", 1, "bmp" },
{ "video/*", 6, "mp4" },
Modified: trunk/www/chromium/files/patch-net__base__net_util.h
===================================================================
--- trunk/www/chromium/files/patch-net__base__net_util.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-net__base__net_util.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- net/base/net_util.h.orig 2013-09-01 00:45:45.000000000 +0300
-+++ net/base/net_util.h 2013-09-01 00:47:35.000000000 +0300
+--- ./net/base/net_util.h.orig 2014-08-12 21:02:39.000000000 +0200
++++ ./net/base/net_util.h 2014-08-13 09:56:57.000000000 +0200
@@ -13,6 +13,9 @@
#elif defined(OS_POSIX)
#include <sys/types.h>
@@ -9,4 +9,4 @@
+#endif
#endif
- #include <list>
+ #include <string>
Modified: trunk/www/chromium/files/patch-net__base__network_change_notifier.cc
===================================================================
--- trunk/www/chromium/files/patch-net__base__network_change_notifier.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-net__base__network_change_notifier.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- ./net/base/network_change_notifier.cc.orig 2010-12-16 02:11:31.000000000 +0100
-+++ ./net/base/network_change_notifier.cc 2010-12-20 20:15:08.000000000 +0100
-@@ -42,7 +42,6 @@
+--- ./net/base/network_change_notifier.cc.orig 2014-08-12 21:02:39.000000000 +0200
++++ ./net/base/network_change_notifier.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -508,7 +508,6 @@
#elif defined(OS_MACOSX)
return new NetworkChangeNotifierMac();
#else
Modified: trunk/www/chromium/files/patch-net__dns__address_sorter_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-net__dns__address_sorter_posix.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-net__dns__address_sorter_posix.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- net/dns/address_sorter_posix.cc.orig 2012-11-07 16:21:02.000000000 +0200
-+++ net/dns/address_sorter_posix.cc 2012-11-07 16:21:39.000000000 +0200
+--- ./net/dns/address_sorter_posix.cc.orig 2014-08-12 21:02:40.000000000 +0200
++++ ./net/dns/address_sorter_posix.cc 2014-08-13 09:56:57.000000000 +0200
@@ -10,6 +10,7 @@
#include <sys/socket.h> // Must be included before ifaddrs.h.
#include <ifaddrs.h>
Modified: trunk/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- net/dns/dns_config_service_posix_unittest.cc.orig 2013-09-01 00:10:54.000000000 +0300
-+++ net/dns/dns_config_service_posix_unittest.cc 2013-09-01 00:22:00.000000000 +0300
+--- ./net/dns/dns_config_service_posix_unittest.cc.orig 2014-08-12 21:02:40.000000000 +0200
++++ ./net/dns/dns_config_service_posix_unittest.cc 2014-08-13 09:56:57.000000000 +0200
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
Modified: trunk/www/chromium/files/patch-net__dns__dns_session.cc
===================================================================
--- trunk/www/chromium/files/patch-net__dns__dns_session.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-net__dns__dns_session.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- net/dns/dns_session.cc.orig 2013-08-19 01:54:01.000000000 +0200
-+++ net/dns/dns_session.cc 2013-08-26 12:42:02.000000000 +0200
-@@ -176,7 +176,7 @@
+--- ./net/dns/dns_session.cc.orig 2014-08-12 21:02:40.000000000 +0200
++++ ./net/dns/dns_session.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -178,7 +178,7 @@
base::TimeDelta current_error = rtt - estimate;
estimate += current_error / 8; // * alpha
base::TimeDelta abs_error = base::TimeDelta::FromInternalValue(
Modified: trunk/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- net/http/http_auth_gssapi_posix.cc.orig 2013-09-02 22:50:25.000000000 +0300
-+++ net/http/http_auth_gssapi_posix.cc 2013-09-02 22:52:13.000000000 +0300
-@@ -430,8 +430,8 @@
+--- ./net/http/http_auth_gssapi_posix.cc.orig 2014-08-12 21:02:39.000000000 +0200
++++ ./net/http/http_auth_gssapi_posix.cc 2014-08-13 09:56:57.000000000 +0200
+@@ -431,8 +431,8 @@
static const char* const kDefaultLibraryNames[] = {
#if defined(OS_MACOSX)
"libgssapi_krb5.dylib" // MIT Kerberos
Modified: trunk/www/chromium/files/patch-net__net.gyp
===================================================================
--- trunk/www/chromium/files/patch-net__net.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-net__net.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- net/net.gyp.orig 2013-09-20 05:36:19.000000000 +0300
-+++ net/net.gyp 2013-09-23 20:45:35.000000000 +0300
-@@ -1283,9 +1283,10 @@
+--- ./net/net.gyp.orig 2014-08-12 21:02:41.000000000 +0200
++++ ./net/net.gyp 2014-08-13 09:56:57.000000000 +0200
+@@ -277,9 +277,10 @@
}],
['os_bsd==1', {
'sources!': [
@@ -12,18 +12,18 @@
],
},{
'dependencies': [
-@@ -1865,7 +1866,7 @@
- 'websockets/websocket_throttle_unittest.cc',
+@@ -509,7 +510,7 @@
+ '<@(net_test_sources)',
],
'conditions': [
- ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and os_bsd != 1', {
'dependencies': [
- 'quic_library',
- 'flip_in_mem_edsm_server_library',
-@@ -2140,6 +2141,11 @@
- 'cert/x509_cert_types_unittest.cc',
- ],
+ 'balsa',
+ 'epoll_server',
+@@ -973,6 +974,11 @@
+ 'dns/mock_mdns_socket_factory.h'
+ ]
}],
+ [ 'os_bsd == 1', {
+ 'sources!': [
@@ -31,5 +31,5 @@
+ ],
+ }],
],
- },
- {
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
Modified: trunk/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- net/proxy/proxy_config_service_linux.cc.orig 2013-08-22 10:48:23.000000000 +0300
-+++ net/proxy/proxy_config_service_linux.cc 2013-08-22 14:41:23.000000000 +0300
-@@ -12,7 +12,13 @@
+--- ./net/proxy/proxy_config_service_linux.cc.orig 2014-08-12 21:02:40.000000000 +0200
++++ ./net/proxy/proxy_config_service_linux.cc 2014-08-13 09:56:58.000000000 +0200
+@@ -21,7 +21,13 @@
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
@@ -14,7 +14,7 @@
#include <unistd.h>
#include <map>
-@@ -845,9 +851,10 @@
+@@ -855,9 +861,10 @@
public base::MessagePumpLibevent::Watcher {
public:
explicit SettingGetterImplKDE(base::Environment* env_var_getter)
@@ -28,7 +28,7 @@
// This has to be called on the UI thread (http://crbug.com/69057).
base::ThreadRestrictions::ScopedAllowIO allow_io;
-@@ -911,9 +918,10 @@
+@@ -921,9 +928,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.)
@@ -40,7 +40,7 @@
}
virtual bool Init(base::SingleThreadTaskRunner* glib_thread_task_runner,
-@@ -921,11 +929,21 @@
+@@ -931,11 +939,21 @@
// This has to be called on the UI thread (http://crbug.com/69057).
base::ThreadRestrictions::ScopedAllowIO allow_io;
DCHECK(inotify_fd_ < 0);
@@ -62,7 +62,7 @@
int flags = fcntl(inotify_fd_, F_GETFL);
if (fcntl(inotify_fd_, F_SETFL, flags | O_NONBLOCK) < 0) {
PLOG(ERROR) << "fcntl failed";
-@@ -933,6 +951,7 @@
+@@ -943,6 +961,7 @@
inotify_fd_ = -1;
return false;
}
@@ -70,7 +70,7 @@
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().
-@@ -947,20 +966,38 @@
+@@ -957,20 +976,38 @@
close(inotify_fd_);
inotify_fd_ = -1;
}
@@ -109,7 +109,7 @@
notify_delegate_ = delegate;
if (!file_loop_->WatchFileDescriptor(inotify_fd_,
true,
-@@ -981,7 +1018,19 @@
+@@ -991,7 +1028,19 @@
virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE {
DCHECK_EQ(fd, inotify_fd_);
DCHECK(base::MessageLoop::current() == file_loop_);
@@ -129,7 +129,7 @@
}
virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE {
NOTREACHED();
-@@ -1260,8 +1309,11 @@
+@@ -1270,8 +1319,11 @@
void OnChangeNotification() {
DCHECK_GE(inotify_fd_, 0);
DCHECK(base::MessageLoop::current() == file_loop_);
@@ -142,7 +142,7 @@
ssize_t r;
while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) {
// inotify returns variable-length structures, which is why we have
-@@ -1298,6 +1350,7 @@
+@@ -1308,6 +1360,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.)
-@@ -1313,6 +1366,7 @@
+@@ -1323,6 +1376,7 @@
std::vector<std::string> > strings_map_type;
int inotify_fd_;
Modified: trunk/www/chromium/files/patch-net__proxy__proxy_service.cc
===================================================================
--- trunk/www/chromium/files/patch-net__proxy__proxy_service.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-net__proxy__proxy_service.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- net/proxy/proxy_service.cc.orig 2013-08-09 22:05:31.000000000 +0300
-+++ net/proxy/proxy_service.cc 2013-08-19 21:08:08.000000000 +0300
+--- ./net/proxy/proxy_service.cc.orig 2014-08-12 21:02:40.000000000 +0200
++++ ./net/proxy/proxy_service.cc 2014-08-13 09:56:58.000000000 +0200
@@ -39,7 +39,7 @@
#elif defined(OS_MACOSX)
#include "net/proxy/proxy_config_service_mac.h"
@@ -9,7 +9,7 @@
#include "net/proxy/proxy_config_service_linux.h"
#elif defined(OS_ANDROID)
#include "net/proxy/proxy_config_service_android.h"
-@@ -1347,7 +1347,7 @@
+@@ -1382,7 +1382,7 @@
<< "profile_io_data.cc::CreateProxyConfigService and this should "
<< "be used only for examples.";
return new UnsetProxyConfigService;
Modified: trunk/www/chromium/files/patch-net__socket__socks5_client_socket.cc
===================================================================
--- trunk/www/chromium/files/patch-net__socket__socks5_client_socket.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-net__socket__socks5_client_socket.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- net/socket/socks5_client_socket.cc.orig 2012-07-26 22:30:09.628651909 +0300
-+++ net/socket/socks5_client_socket.cc 2012-07-26 22:30:41.781651802 +0300
+--- ./net/socket/socks5_client_socket.cc.orig 2014-08-12 21:02:38.000000000 +0200
++++ ./net/socket/socks5_client_socket.cc 2014-08-13 09:56:58.000000000 +0200
@@ -4,6 +4,10 @@
#include "net/socket/socks5_client_socket.h"
@@ -9,5 +9,5 @@
+#endif
+
#include "base/basictypes.h"
+ #include "base/callback_helpers.h"
#include "base/compiler_specific.h"
- #include "base/debug/trace_event.h"
Modified: trunk/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h
===================================================================
--- trunk/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- net/socket/tcp_listen_socket_unittest.h.orig 2013-09-01 00:30:34.000000000 +0300
-+++ net/socket/tcp_listen_socket_unittest.h 2013-09-01 00:31:11.000000000 +0300
+--- ./net/socket/tcp_listen_socket_unittest.h.orig 2014-08-12 21:02:38.000000000 +0200
++++ ./net/socket/tcp_listen_socket_unittest.h 2014-08-13 09:56:58.000000000 +0200
@@ -13,6 +13,9 @@
#include <arpa/inet.h>
#include <errno.h>
Modified: trunk/www/chromium/files/patch-net__udp__udp_socket_unittest.cc
===================================================================
--- trunk/www/chromium/files/patch-net__udp__udp_socket_unittest.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-net__udp__udp_socket_unittest.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- net/udp/udp_socket_unittest.cc.orig 2013-09-01 17:50:31.000000000 +0300
-+++ net/udp/udp_socket_unittest.cc 2013-09-01 17:50:50.000000000 +0300
+--- ./net/udp/udp_socket_unittest.cc.orig 2014-08-12 21:02:40.000000000 +0200
++++ ./net/udp/udp_socket_unittest.cc 2014-08-13 09:56:58.000000000 +0200
@@ -202,7 +202,7 @@
client_entries, 5, NetLog::TYPE_SOCKET_ALIVE));
}
Modified: trunk/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
===================================================================
--- trunk/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- ppapi/shared_impl/private/net_address_private_impl.cc.orig 2012-10-31 21:01:33.000000000 +0200
-+++ ppapi/shared_impl/private/net_address_private_impl.cc 2012-11-07 14:41:26.000000000 +0200
-@@ -12,6 +12,10 @@
+--- ./ppapi/shared_impl/private/net_address_private_impl.cc.orig 2014-08-12 21:01:16.000000000 +0200
++++ ./ppapi/shared_impl/private/net_address_private_impl.cc 2014-08-13 09:56:58.000000000 +0200
+@@ -14,6 +14,10 @@
#include <sys/types.h>
#endif
@@ -11,7 +11,7 @@
#include <string.h>
#include <string>
-@@ -26,7 +30,7 @@
+@@ -28,7 +32,7 @@
#include "ppapi/shared_impl/var.h"
#include "ppapi/thunk/thunk.h"
Modified: trunk/www/chromium/files/patch-sync__util__get_session_name.cc
===================================================================
--- trunk/www/chromium/files/patch-sync__util__get_session_name.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-sync__util__get_session_name.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- sync/util/get_session_name.cc.orig 2014-01-07 21:02:32.000000000 +0100
-+++ sync/util/get_session_name.cc 2014-01-11 02:17:44.000000000 +0100
+--- ./sync/util/get_session_name.cc.orig 2014-08-12 21:02:55.000000000 +0200
++++ ./sync/util/get_session_name.cc 2014-08-13 09:56:58.000000000 +0200
@@ -11,7 +11,7 @@
#include "base/sys_info.h"
#include "base/task_runner.h"
Modified: trunk/www/chromium/files/patch-sync__util__get_session_name_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-sync__util__get_session_name_linux.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-sync__util__get_session_name_linux.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- sync/util/get_session_name_linux.cc.orig 2013-08-16 23:53:51.000000000 +0300
-+++ sync/util/get_session_name_linux.cc 2013-08-16 23:56:00.000000000 +0300
+--- ./sync/util/get_session_name_linux.cc.orig 2014-08-12 21:02:55.000000000 +0200
++++ ./sync/util/get_session_name_linux.cc 2014-08-13 09:56:58.000000000 +0200
@@ -13,8 +13,9 @@
namespace internal {
Modified: trunk/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
===================================================================
--- trunk/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- testing/gtest/include/gtest/internal/gtest-port.h.orig 2013-08-19 02:58:58.000000000 +0300
-+++ testing/gtest/include/gtest/internal/gtest-port.h 2013-08-30 19:49:05.000000000 +0300
-@@ -261,6 +261,8 @@
+--- ./testing/gtest/include/gtest/internal/gtest-port.h.orig 2014-08-12 21:03:10.000000000 +0200
++++ ./testing/gtest/include/gtest/internal/gtest-port.h 2014-08-13 09:56:58.000000000 +0200
+@@ -265,6 +265,8 @@
# define GTEST_OS_NACL 1
#elif defined __OpenBSD__
# define GTEST_OS_OPENBSD 1
@@ -9,7 +9,7 @@
#elif defined __QNX__
# define GTEST_OS_QNX 1
#endif // __CYGWIN__
-@@ -473,7 +475,7 @@
+@@ -477,7 +479,7 @@
// To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
// to your compiler flags.
# define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \
@@ -18,7 +18,7 @@
#endif // GTEST_HAS_PTHREAD
#if GTEST_HAS_PTHREAD
-@@ -642,7 +644,7 @@
+@@ -646,7 +648,7 @@
(GTEST_OS_MAC && !GTEST_OS_IOS) || GTEST_OS_IOS_SIMULATOR || \
(GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
Modified: trunk/www/chromium/files/patch-testing__gtest__src__gtest.cc
===================================================================
--- trunk/www/chromium/files/patch-testing__gtest__src__gtest.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-testing__gtest__src__gtest.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- testing/gtest/src/gtest.cc.orig 2011-09-14 11:19:34.000000000 +0300
-+++ testing/gtest/src/gtest.cc 2011-09-27 00:34:58.000000000 +0300
-@@ -114,6 +114,10 @@
+--- ./testing/gtest/src/gtest.cc.orig 2014-08-12 21:03:10.000000000 +0200
++++ ./testing/gtest/src/gtest.cc 2014-08-13 09:56:58.000000000 +0200
+@@ -117,6 +117,10 @@
#endif // GTEST_OS_LINUX
@@ -11,7 +11,7 @@
#if GTEST_HAS_EXCEPTIONS
# include <stdexcept>
#endif
-@@ -1621,7 +1625,7 @@
+@@ -1592,7 +1596,7 @@
#if GTEST_OS_WINDOWS
return _wcsicmp(lhs, rhs) == 0;
Modified: trunk/www/chromium/files/patch-third_party__WebKit__Source__config.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__config.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__config.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,10 +1,10 @@
---- third_party/WebKit/Source/config.h.orig 2013-11-08 07:50:10.000000000 +0100
-+++ third_party/WebKit/Source/config.h 2013-11-15 16:58:16.000000000 +0100
-@@ -167,6 +167,6 @@
- #define __STDC_FORMAT_MACROS 1
+--- ./third_party/WebKit/Source/config.h.orig 2014-08-12 21:07:17.000000000 +0200
++++ ./third_party/WebKit/Source/config.h 2014-08-13 09:56:58.000000000 +0200
+@@ -156,6 +156,6 @@
+ #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
#endif
--#if OS(LINUX) || OS(ANDROID) || ENABLE(HARFBUZZ_ON_WINDOWS)
-+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) || ENABLE(HARFBUZZ_ON_WINDOWS)
+-#if OS(LINUX) || OS(ANDROID) || OS(WIN)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) || OS(WIN)
#define WTF_USE_HARFBUZZ 1
#endif
Modified: trunk/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,15 +1,6 @@
---- third_party/WebKit/Source/core/core.gyp.orig 2013-08-09 19:15:52.000000000 +0000
-+++ third_party/WebKit/Source/core/core.gyp 2013-08-12 21:31:28.000000000 +0000
-@@ -593,7 +593,7 @@
- ['exclude', 'platform/Theme\\.cpp$'],
- ],
- 'conditions': [
-- ['OS!="linux"', {
-+ ['OS!="linux" and os_bsd!=1', {
- 'sources/': [
- ['exclude', 'Linux\\.cpp$'],
- ],
-@@ -946,7 +946,7 @@
+--- ./third_party/WebKit/Source/core/core.gyp.orig 2014-08-12 21:07:11.000000000 +0200
++++ ./third_party/WebKit/Source/core/core.gyp 2014-08-13 09:56:58.000000000 +0200
+@@ -636,7 +636,7 @@
# Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable.
'cflags': ['-Wno-uninitialized'],
}],
@@ -18,7 +9,7 @@
'sources/': [
['exclude', 'Linux\\.cpp$'],
],
-@@ -991,7 +991,7 @@
+@@ -675,7 +675,7 @@
['OS=="win" and buildtype=="Official"', {
'msvs_shard': 19,
}],
Modified: trunk/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,20 +1,48 @@
---- third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-02-20 21:32:30.000000000 +0100
-+++ third_party/WebKit/Source/platform/blink_platform.gyp 2014-02-25 01:06:25.000000000 +0100
-@@ -196,7 +196,7 @@
+--- ./third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-08-12 21:07:17.000000000 +0200
++++ ./third_party/WebKit/Source/platform/blink_platform.gyp 2014-08-13 09:56:58.000000000 +0200
+@@ -38,6 +38,9 @@
+ 'targets': [{
+ 'target_name': 'blink_common',
+ 'type': '<(component)',
++ 'include_dirs': [
++ '<(prefix_dir)/include',
++ ],
+ 'variables': { 'enable_wexit_time_destructors': 1 },
+ 'dependencies': [
+ '../config.gyp:config',
+@@ -246,7 +249,7 @@
# compiler optimizations, see crbug.com/237063
'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
'conditions': [
-- ['OS=="linux" or OS=="android"', {
-+ ['OS=="linux" or OS=="android" or OS=="freebsd"', {
+- ['OS=="linux" or OS=="android" or OS=="win"', {
++ ['OS=="linux" or OS=="android" or OS=="win" or os_bsd==1', {
'sources/': [
# Cherry-pick files excluded by the broader regular expressions above.
['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'],
-@@ -304,7 +304,7 @@
+@@ -266,7 +269,7 @@
+ ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'],
+ ],
+ }],
+- ['OS=="linux" or OS=="android"', {
++ ['OS=="linux" or OS=="android" or os_bsd==1', {
+ 'sources/': [
+ ['include', 'fonts/linux/FontPlatformDataLinuxHarfBuzz\\.cpp$'],
+ ]
+@@ -363,7 +366,7 @@
['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'],
],
}],
-- ['OS != "linux" and OS != "mac" and (OS != "win" or (OS == "win" and "ENABLE_GDI_FONTS_ON_WINDOWS=1" in feature_defines))', {
-+ ['OS != "linux" and OS != "freebsd" and OS != "mac" and (OS != "win" or (OS == "win" and "ENABLE_GDI_FONTS_ON_WINDOWS=1" in feature_defines))', {
+- ['OS != "linux" and OS != "mac" and OS != "win"', {
++ ['OS != "linux" and OS != "mac" and OS != "win" and os_bsd != 1', {
'sources/': [
['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
],
+@@ -409,7 +412,7 @@
+ ['exclude', 'Android\\.cpp$'],
+ ],
+ }],
+- ['OS=="linux"', {
++ ['OS=="linux" or os_bsd==1', {
+ 'dependencies': [
+ '<(DEPTH)/build/linux/system.gyp:fontconfig',
+ ],
Modified: trunk/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- third_party/WebKit/Source/web/linux/WebFontRendering.cpp.orig 2014-02-20 21:32:26.000000000 +0100
-+++ third_party/WebKit/Source/web/linux/WebFontRendering.cpp 2014-02-25 00:44:05.000000000 +0100
+--- ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp.orig 2014-08-12 21:07:15.000000000 +0200
++++ ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp 2014-08-13 09:56:58.000000000 +0200
@@ -34,7 +34,7 @@
#include "platform/fonts/FontDescription.h"
#include "platform/fonts/FontPlatformData.h"
Modified: trunk/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- third_party/WebKit/Source/web/web.gyp.orig 2013-07-15 19:48:12.000000000 +0300
-+++ third_party/WebKit/Source/web/web.gyp 2013-07-15 19:48:46.000000000 +0300
+--- ./third_party/WebKit/Source/web/web.gyp.orig 2014-08-12 21:07:15.000000000 +0200
++++ ./third_party/WebKit/Source/web/web.gyp 2014-08-13 09:56:58.000000000 +0200
@@ -142,7 +142,7 @@
},
},
Modified: trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,10 +1,10 @@
---- third_party/WebKit/Source/wtf/Assertions.cpp.orig 2013-09-28 19:19:20.000000000 +0200
-+++ third_party/WebKit/Source/wtf/Assertions.cpp 2013-10-10 11:45:33.000000000 +0200
-@@ -37,6 +37,7 @@
- #include "Compiler.h"
- #include "OwnArrayPtr.h"
+--- ./third_party/WebKit/Source/wtf/Assertions.cpp.orig 2014-08-12 21:07:13.000000000 +0200
++++ ./third_party/WebKit/Source/wtf/Assertions.cpp 2014-08-13 09:56:58.000000000 +0200
+@@ -38,6 +38,7 @@
+ #include "OwnPtr.h"
+ #include "PassOwnPtr.h"
+#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
- #include <string.h>
+ #include <stdlib.h>
Modified: trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-02-20 21:32:28.000000000 +0100
-+++ third_party/WebKit/Source/wtf/ByteSwap.h 2014-02-24 17:55:43.000000000 +0100
+--- ./third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-08-12 21:07:13.000000000 +0200
++++ ./third_party/WebKit/Source/wtf/ByteSwap.h 2014-08-13 09:56:58.000000000 +0200
@@ -52,14 +52,20 @@
#else
Modified: trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp
===================================================================
--- trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- third_party/WebKit/Source/wtf/DateMath.cpp.orig 2013-11-08 07:50:10.000000000 +0100
-+++ third_party/WebKit/Source/wtf/DateMath.cpp 2013-11-15 12:55:05.000000000 +0100
+--- ./third_party/WebKit/Source/wtf/DateMath.cpp.orig 2014-08-12 21:07:13.000000000 +0200
++++ ./third_party/WebKit/Source/wtf/DateMath.cpp 2014-08-13 09:56:58.000000000 +0200
@@ -80,6 +80,7 @@
#include "StringExtras.h"
Modified: trunk/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
===================================================================
--- trunk/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,11 +1,11 @@
---- third_party/ffmpeg/libavutil/mem.c.orig 2011-09-11 11:03:30.000000000 +0300
-+++ third_party/ffmpeg/libavutil/mem.c 2011-09-12 23:49:42.000000000 +0300
-@@ -31,7 +31,7 @@
- #include <limits.h>
+--- ./third_party/ffmpeg/libavutil/mem.c.orig 2014-08-12 21:03:23.000000000 +0200
++++ ./third_party/ffmpeg/libavutil/mem.c 2014-08-13 09:56:58.000000000 +0200
+@@ -32,7 +32,7 @@
+ #include <stdint.h>
#include <stdlib.h>
#include <string.h>
-#if HAVE_MALLOC_H
-+#if HAVE_MALLOC_H && !defined(__FreeBSD__) && !defined(__MidnightBSD__)
++#if HAVE_MALLOC_H && !defined(__FreeBSD__)
#include <malloc.h>
#endif
Modified: trunk/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- third_party/libXNVCtrl/libXNVCtrl.gyp.orig 2012-10-02 20:32:18.000000000 +0300
-+++ third_party/libXNVCtrl/libXNVCtrl.gyp 2012-10-02 20:32:24.000000000 +0300
+--- ./third_party/libXNVCtrl/libXNVCtrl.gyp.orig 2014-08-12 21:02:42.000000000 +0200
++++ ./third_party/libXNVCtrl/libXNVCtrl.gyp 2014-08-13 09:56:58.000000000 +0200
@@ -13,6 +13,9 @@
'NVCtrlLib.h',
'nv_control.h',
Modified: trunk/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjingle__libjingle.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__libjingle__libjingle.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,15 +1,6 @@
---- third_party/libjingle/libjingle.gyp.orig 2013-08-09 22:05:45.000000000 +0300
-+++ third_party/libjingle/libjingle.gyp 2013-08-18 00:43:44.000000000 +0300
-@@ -532,7 +532,7 @@
- '<(libjingle_source)/talk/base/unixfilesystem.h',
- ],
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or os_bsd==1', {
- 'sources': [
- '<(libjingle_source)/talk/base/latebindingsymboltable.cc',
- '<(libjingle_source)/talk/base/latebindingsymboltable.h',
-@@ -772,7 +772,7 @@
+--- ./third_party/libjingle/libjingle.gyp.orig 2014-08-12 21:02:51.000000000 +0200
++++ ./third_party/libjingle/libjingle.gyp 2014-08-13 09:56:58.000000000 +0200
+@@ -473,7 +473,7 @@
],
}],
# TODO(mallinath) - Enable SCTP for iOS.
@@ -16,5 +7,5 @@
- ['OS!="ios"', {
+ ['OS!="ios" and os_bsd!=1', {
'defines': [
- ['HAVE_SCTP',
+ 'HAVE_SCTP',
],
Modified: trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- third_party/libjingle/source/talk/base/cpumonitor.cc.orig 2014-01-07 21:03:06.000000000 +0100
-+++ third_party/libjingle/source/talk/base/cpumonitor.cc 2014-01-13 02:01:01.000000000 +0100
+--- ./third_party/libjingle/source/talk/base/cpumonitor.cc.orig 2014-08-12 21:03:39.000000000 +0200
++++ ./third_party/libjingle/source/talk/base/cpumonitor.cc 2014-08-13 09:56:58.000000000 +0200
@@ -52,13 +52,13 @@
#include <mach/task.h>
#endif // defined(IOS) || defined(OSX)
Modified: trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- third_party/libjingle/source/talk/base/ipaddress.h.orig 2012-01-30 22:44:57.000000000 +0200
-+++ third_party/libjingle/source/talk/base/ipaddress.h 2012-01-30 22:47:28.000000000 +0200
-@@ -33,6 +33,9 @@
+--- ./third_party/libjingle/source/talk/base/ipaddress.h.orig 2014-08-12 21:03:39.000000000 +0200
++++ ./third_party/libjingle/source/talk/base/ipaddress.h 2014-08-13 09:56:58.000000000 +0200
+@@ -34,6 +34,9 @@
#include <arpa/inet.h>
#include <netdb.h>
#endif
Modified: trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- third_party/libjingle/source/talk/base/linux.cc.orig 2013-07-15 17:38:04.000000000 +0300
-+++ third_party/libjingle/source/talk/base/linux.cc 2013-07-15 17:39:04.000000000 +0300
+--- ./third_party/libjingle/source/talk/base/linux.cc.orig 2014-08-12 21:03:39.000000000 +0200
++++ ./third_party/libjingle/source/talk/base/linux.cc 2014-08-13 09:56:58.000000000 +0200
@@ -25,7 +25,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -9,7 +9,7 @@
#include "talk/base/linux.h"
#include <ctype.h>
-@@ -279,4 +279,4 @@
+@@ -362,4 +362,4 @@
} // namespace talk_base
Modified: trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- third_party/libjingle/source/talk/base/linux.h.orig 2013-07-15 17:36:34.000000000 +0300
-+++ third_party/libjingle/source/talk/base/linux.h 2013-07-15 17:37:47.000000000 +0300
+--- ./third_party/libjingle/source/talk/base/linux.h.orig 2014-08-12 21:03:34.000000000 +0200
++++ ./third_party/libjingle/source/talk/base/linux.h 2014-08-13 09:56:58.000000000 +0200
@@ -28,7 +28,7 @@
#ifndef TALK_BASE_LINUX_H_
#define TALK_BASE_LINUX_H_
@@ -9,7 +9,7 @@
#include <string>
#include <map>
#include <vector>
-@@ -131,5 +131,5 @@
+@@ -136,5 +136,5 @@
} // namespace talk_base
Modified: trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- third_party/libjingle/source/talk/base/network.h.orig 2013-05-26 21:44:12.257312749 +0200
-+++ third_party/libjingle/source/talk/base/network.h 2013-05-26 21:45:08.869297313 +0200
+--- ./third_party/libjingle/source/talk/base/network.h.orig 2014-08-12 21:03:39.000000000 +0200
++++ ./third_party/libjingle/source/talk/base/network.h 2014-08-13 09:56:58.000000000 +0200
@@ -38,6 +38,10 @@
#include "talk/base/messagehandler.h"
#include "talk/base/sigslot.h"
Modified: trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- third_party/libjingle/source/talk/base/systeminfo.cc.orig 2013-09-03 03:20:59.000000000 -0400
-+++ third_party/libjingle/source/talk/base/systeminfo.cc 2013-09-12 15:47:30.000000000 -0400
-@@ -36,7 +36,7 @@
+--- ./third_party/libjingle/source/talk/base/systeminfo.cc.orig 2014-08-12 21:03:39.000000000 +0200
++++ ./third_party/libjingle/source/talk/base/systeminfo.cc 2014-08-13 09:56:58.000000000 +0200
+@@ -36,8 +36,12 @@
#elif defined(OSX)
#include <ApplicationServices/ApplicationServices.h>
#include <CoreServices/CoreServices.h>
@@ -7,9 +7,14 @@
-#elif defined(LINUX) || defined(ANDROID)
+#elif defined(LINUX) || defined(ANDROID) || defined(BSD)
#include <unistd.h>
++#if defined(OS_FREEBSD)
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#endif
#endif
#if defined(OSX) || defined(IOS)
-@@ -48,7 +48,7 @@
+ #include <sys/sysctl.h>
+@@ -48,7 +52,7 @@
#include "talk/base/win32.h"
#elif defined(OSX)
#include "talk/base/macconversion.h"
@@ -18,3 +23,21 @@
#include "talk/base/linux.h"
#endif
#include "talk/base/common.h"
+@@ -185,6 +189,17 @@
+ }
+ #elif defined(__native_client__)
+ // TODO(ryanpetrie): Implement this via PPAPI when it's available.
++#elif defined(OS_FREEBSD)
++ void* sysctl_value;
++ size_t length = sizeof(sysctl_value);
++ if (!sysctlbyname("hw.ncpu", &sysctl_value, &length, NULL, 0)) {
++ physical_cpus_ = *static_cast<int*>(sysctl_value);
++ }
++ if (!sysctlbyname("kern.smp.cpus", &sysctl_value, &length, NULL, 0)) {
++ logical_cpus_ = *static_cast<int*>(sysctl_value);
++ }
++ // L3 / L2 cache size?
++ // CPU family/model/stepping (available in dmesg, kernel only TODO)
+ #else // LINUX || ANDROID
+ ProcCpuInfo proc_info;
+ if (proc_info.LoadFromSystem()) {
Modified: trunk/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,21 +1,11 @@
---- third_party/libjpeg_turbo/libjpeg.gyp.orig 2012-09-25 16:03:33.000000000 +0300
-+++ third_party/libjpeg_turbo/libjpeg.gyp 2012-09-29 18:07:42.000000000 +0300
-@@ -231,7 +231,7 @@
+--- third_party/libjpeg_turbo/libjpeg.gyp.orig 2014-07-15 21:03:36.000000000 +0200
++++ third_party/libjpeg_turbo/libjpeg.gyp 2014-08-12 22:43:14.000000000 +0200
+@@ -245,7 +245,7 @@
],
},
}],
-- [ 'OS=="linux" or (OS=="android" and target_arch!="arm")', {
-+ [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and target_arch!="arm")', {
+- [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and target_arch!="arm")', {
++ [ 'OS=="linux" or os_bsd==1 or (OS=="android" and target_arch!="arm")', {
'conditions': [
[ 'use_system_yasm==0', {
'dependencies': [
-@@ -262,6 +262,9 @@
- ],
- }],
- ],
-+ 'include_dirs': [
-+ '<(prefix_dir)/include',
-+ ],
- },
- }],
- ],
Modified: trunk/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
===================================================================
--- trunk/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- third_party/libvpx/unpack_lib_posix.sh.orig 2013-05-08 22:39:15.000000000 +0300
-+++ third_party/libvpx/unpack_lib_posix.sh 2013-05-08 22:37:44.000000000 +0300
+--- ./third_party/libvpx/unpack_lib_posix.sh.orig 2014-08-12 21:03:39.000000000 +0200
++++ ./third_party/libvpx/unpack_lib_posix.sh 2014-08-13 09:56:58.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
@@ -6,8 +6,8 @@
#
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
-@@ -45,16 +45,12 @@
- ar=$AR
+@@ -54,16 +54,12 @@
+ fi
fi
-obj_list="$($ar t $lib_file | grep '\.o$')"
Modified: trunk/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- third_party/ots/include/opentype-sanitiser.h.orig 2012-04-12 09:04:04.000000000 +0200
-+++ third_party/ots/include/opentype-sanitiser.h 2012-04-29 22:09:44.000000000 +0200
+--- ./third_party/ots/include/opentype-sanitiser.h.orig 2014-08-12 21:03:34.000000000 +0200
++++ ./third_party/ots/include/opentype-sanitiser.h 2014-08-13 09:56:58.000000000 +0200
@@ -22,6 +22,7 @@
#else
#include <arpa/inet.h>
Modified: trunk/www/chromium/files/patch-third_party__webrtc__build__common.gypi
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__build__common.gypi 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__webrtc__build__common.gypi 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,7 +1,7 @@
---- third_party/webrtc/build/common.gypi.orig 2013-07-16 16:41:06.000000000 +0300
-+++ third_party/webrtc/build/common.gypi 2013-07-16 17:21:31.000000000 +0300
-@@ -272,6 +272,13 @@
- #'WEBRTC_CLOCK_TYPE_REALTIME',
+--- ./third_party/webrtc/build/common.gypi.orig 2014-08-12 21:04:14.000000000 +0200
++++ ./third_party/webrtc/build/common.gypi 2014-08-13 09:56:59.000000000 +0200
+@@ -286,6 +286,13 @@
+ 'WEBRTC_LINUX',
],
}],
+ ['os_bsd==1', {
Modified: trunk/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2013-07-16 18:26:35.000000000 +0300
-+++ third_party/webrtc/modules/audio_device/audio_device.gypi 2013-07-16 18:29:22.000000000 +0300
-@@ -45,7 +45,7 @@
+--- ./third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2014-08-12 21:03:58.000000000 +0200
++++ ./third_party/webrtc/modules/audio_device/audio_device.gypi 2014-08-13 09:56:59.000000000 +0200
+@@ -47,7 +47,7 @@
'dummy/audio_device_utility_dummy.h',
],
'conditions': [
@@ -9,9 +9,9 @@
'include_dirs': [
'linux',
],
-@@ -133,7 +133,7 @@
- }],
- ],
+@@ -141,7 +141,7 @@
+ ],
+ },
}],
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
Modified: trunk/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2013-08-16 22:24:59.000000000 +0300
-+++ third_party/webrtc/modules/desktop_capture/desktop_capture.gypi 2013-08-16 22:27:28.000000000 +0300
-@@ -75,6 +75,11 @@
+--- ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2014-08-12 21:04:10.000000000 +0200
++++ ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi 2014-08-13 09:57:00.000000000 +0200
+@@ -107,6 +107,11 @@
],
},
}],
@@ -11,4 +11,4 @@
+ }],
['OS!="win" and OS!="mac" and use_x11==0', {
'sources': [
- "screen_capturer_null.cc",
+ "mouse_cursor_monitor_null.cc",
Modified: trunk/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2013-10-09 17:35:26.000000000 +0200
-+++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc 2013-10-09 17:32:54.000000000 +0200
-@@ -14,6 +14,7 @@
+--- ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2014-08-12 21:04:11.000000000 +0200
++++ ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc 2014-08-13 09:57:00.000000000 +0200
+@@ -15,6 +15,7 @@
#include <string.h>
#include <algorithm>
@@ -7,4 +7,4 @@
+#include <cstdlib>
#include <iterator>
- #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h"
+ #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
Modified: trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2013-07-16 17:22:11.000000000 +0300
-+++ third_party/webrtc/system_wrappers/source/atomic32_posix.cc 2013-07-16 17:23:12.000000000 +0300
+--- ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2014-08-12 21:04:15.000000000 +0200
++++ ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc 2014-08-13 09:57:00.000000000 +0200
@@ -12,7 +12,11 @@
#include <assert.h>
@@ -10,5 +10,5 @@
#include <malloc.h>
+#endif
- #include "common_types.h"
+ #include "webrtc/common_types.h"
Modified: trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- third_party/webrtc/system_wrappers/source/cpu_info.cc.orig 2013-08-09 22:21:35.000000000 +0300
-+++ third_party/webrtc/system_wrappers/source/cpu_info.cc 2013-08-16 23:27:36.000000000 +0300
+--- ./third_party/webrtc/system_wrappers/source/cpu_info.cc.orig 2014-08-12 21:04:15.000000000 +0200
++++ ./third_party/webrtc/system_wrappers/source/cpu_info.cc 2014-08-13 09:57:00.000000000 +0200
@@ -12,7 +12,10 @@
#if defined(_WIN32)
Modified: trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2013-08-09 22:21:35.000000000 +0300
-+++ third_party/webrtc/system_wrappers/source/thread_posix.cc 2013-08-16 23:34:09.000000000 +0300
+--- ./third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2014-08-12 21:04:15.000000000 +0200
++++ ./third_party/webrtc/system_wrappers/source/thread_posix.cc 2014-08-13 09:57:00.000000000 +0200
@@ -51,9 +51,11 @@
#include <string.h> // strncpy
#include <unistd.h>
Modified: trunk/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
===================================================================
--- trunk/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2013-08-09 22:21:34.000000000 +0300
-+++ third_party/webrtc/voice_engine/voice_engine_defines.h 2013-08-16 21:25:45.000000000 +0300
-@@ -260,7 +260,7 @@
+--- ./third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2014-08-12 21:04:14.000000000 +0200
++++ ./third_party/webrtc/voice_engine/voice_engine_defines.h 2014-08-13 09:57:00.000000000 +0200
+@@ -237,7 +237,7 @@
#include <pthread.h>
#include <sys/socket.h>
#include <sys/types.h>
Modified: trunk/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
===================================================================
--- trunk/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- tools/gyp/pylib/gyp/generator/make.py.orig 2012-11-27 10:03:58.000000000 +0200
-+++ tools/gyp/pylib/gyp/generator/make.py 2012-12-10 22:26:33.000000000 +0200
-@@ -86,7 +86,7 @@
+--- ./tools/gyp/pylib/gyp/generator/make.py.orig 2014-08-12 21:03:54.000000000 +0200
++++ ./tools/gyp/pylib/gyp/generator/make.py 2014-08-13 09:57:00.000000000 +0200
+@@ -87,7 +87,7 @@
else:
operating_system = flavor
if flavor == 'android':
@@ -9,7 +9,7 @@
default_variables.setdefault('OS', operating_system)
default_variables.setdefault('SHARED_LIB_SUFFIX', '.so')
default_variables.setdefault('SHARED_LIB_DIR','$(builddir)/lib.$(TOOLSET)')
-@@ -250,30 +250,30 @@
+@@ -275,7 +275,7 @@
CFLAGS.target ?= $(CFLAGS)
CXX.target ?= %(CXX.target)s
CXXFLAGS.target ?= $(CXXFLAGS)
@@ -17,18 +17,9 @@
+LINK.target ?= %(CXX.target)s
LDFLAGS.target ?= $(LDFLAGS)
AR.target ?= $(AR)
-
- # C++ apps need to be linked with g++.
- #
- # Note: flock is used to seralize linking. Linking is a memory-intensive
- # process so running parallel links can often lead to thrashing. To disable
- # the serialization, override LINK via an envrionment variable as follows:
- #
- # export LINK=g++
- #
- # This will allow make to invoke N linker processes as specified in -jN.
- LINK ?= %(flock)s $(builddir)/linker.lock $(CXX.target)
-
+
+@@ -292,13 +292,13 @@
+
# TODO(evan): move all cross-compilation logic to gyp-time so we don't need
# to replicate this environment fallback in make as well.
-CC.host ?= %(CC.host)s
@@ -48,7 +39,7 @@
# Define a dir function that can handle spaces.
# http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions
-@@ -1770,7 +1770,7 @@
+@@ -1787,7 +1787,7 @@
return modules
# Retrieve the default value of 'SHARED_LIB_SUFFIX'
Modified: trunk/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
===================================================================
--- trunk/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2010-12-16 02:33:31.000000000 +0100
-+++ tools/gyp/test/additional-targets/src/dir1/actions.gyp 2010-12-20 20:15:08.000000000 +0100
+--- ./tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2014-08-12 21:04:03.000000000 +0200
++++ ./tools/gyp/test/additional-targets/src/dir1/actions.gyp 2014-08-13 09:57:00.000000000 +0200
@@ -47,7 +47,7 @@
},
],
Modified: trunk/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
===================================================================
--- trunk/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,5 +1,5 @@
---- tools/gyp/test/library/src/library.gyp.orig 2010-12-16 02:33:32.000000000 +0100
-+++ tools/gyp/test/library/src/library.gyp 2010-12-20 20:15:08.000000000 +0100
+--- ./tools/gyp/test/library/src/library.gyp.orig 2014-08-12 21:04:03.000000000 +0200
++++ ./tools/gyp/test/library/src/library.gyp 2014-08-13 09:57:00.000000000 +0200
@@ -48,7 +48,7 @@
},
],
Modified: trunk/www/chromium/files/patch-ui__events__event_switches.cc
===================================================================
--- trunk/www/chromium/files/patch-ui__events__event_switches.cc 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-ui__events__event_switches.cc 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,8 +1,8 @@
---- ui/events/event_switches.cc.orig 2014-01-13 11:38:50.000000000 +0100
-+++ ui/events/event_switches.cc 2014-01-13 11:38:26.000000000 +0100
-@@ -20,7 +20,7 @@
- // disabled: touch events are disabled.
- const char kTouchEventsDisabled[] = "disabled";
+--- ./ui/events/event_switches.cc.orig 2014-08-12 21:02:29.000000000 +0200
++++ ./ui/events/event_switches.cc 2014-08-13 09:57:00.000000000 +0200
+@@ -22,7 +22,7 @@
+ // Use the unified gesture detector, instead of the aura gesture detector.
+ const char kUseUnifiedGestureDetector[] = "use-unified-gesture-detector";
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
Modified: trunk/www/chromium/files/patch-ui__events__event_switches.h
===================================================================
--- trunk/www/chromium/files/patch-ui__events__event_switches.h 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-ui__events__event_switches.h 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,8 +1,8 @@
---- ui/events/event_switches.h.orig 2014-01-07 21:02:04.000000000 +0100
-+++ ui/events/event_switches.h 2014-01-13 11:38:59.000000000 +0100
-@@ -16,7 +16,7 @@
- EVENTS_BASE_EXPORT extern const char kTouchEventsEnabled[];
+--- ./ui/events/event_switches.h.orig 2014-08-12 21:02:29.000000000 +0200
++++ ./ui/events/event_switches.h 2014-08-13 09:57:00.000000000 +0200
+@@ -17,7 +17,7 @@
EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[];
+ EVENTS_BASE_EXPORT extern const char kUseUnifiedGestureDetector[];
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
Modified: trunk/www/chromium/files/patch-ui__gl__gl.gyp
===================================================================
--- trunk/www/chromium/files/patch-ui__gl__gl.gyp 2014-09-16 02:24:33 UTC (rev 17336)
+++ trunk/www/chromium/files/patch-ui__gl__gl.gyp 2014-09-16 02:25:13 UTC (rev 17337)
@@ -1,6 +1,6 @@
---- ui/gl/gl.gyp.orig 2013-08-09 22:06:46.000000000 +0300
-+++ ui/gl/gl.gyp 2013-08-16 21:35:40.000000000 +0300
-@@ -178,7 +178,7 @@
+--- ./ui/gl/gl.gyp.orig 2014-08-12 21:02:27.000000000 +0200
++++ ./ui/gl/gl.gyp 2014-08-13 09:57:00.000000000 +0200
+@@ -173,7 +173,7 @@
},
],
'conditions': [
@@ -9,3 +9,12 @@
'sources': [
'egl_util.cc',
'egl_util.h',
+@@ -192,7 +192,7 @@
+ '<(DEPTH)/third_party/khronos',
+ ],
+ }],
+- ['OS in ("android", "linux")', {
++ ['OS in ("android", "linux", "freebsd", "openbsd")', {
+ 'sources': [
+ 'gl_implementation_osmesa.cc',
+ 'gl_implementation_osmesa.h',
More information about the Midnightbsd-cvs
mailing list