svn commit: r384824 - in head/www/chromium: . files
Rene Ladan
rene at FreeBSD.org
Mon Apr 27 11:04:19 UTC 2015
Author: rene
Date: Mon Apr 27 11:04:12 2015
New Revision: 384824
URL: https://svnweb.freebsd.org/changeset/ports/384824
Log:
www/chromium: update to 42.0.2311.90
There were two updates submitted as Github pull requests:
- one for 41.0.2272.118
- one for 42.0.2311.90, based on the first update.
Submitted by: Timothy Vaccarelli <tmvfroid at gmail.com> (41.0.2272.118)
Submitted by: Christoph Moench-Tegeder <cmt at burggraben.net> (42.0.2311.90)
MFH: 2015Q2
Security: http://vuxml.freebsd.org/freebsd/b57f690e-ecc9-11e4-876c-00262d5ed8ee.html
Added:
head/www/chromium/files/patch-chrome__browser__tracing__crash_service_uploader.cc (contents, props changed)
head/www/chromium/files/patch-chrome__chrome_exe.gypi (contents, props changed)
head/www/chromium/files/patch-components__printing__renderer__print_web_view_helper.h (contents, props changed)
head/www/chromium/files/patch-components__update_client__update_query_params.cc (contents, props changed)
head/www/chromium/files/patch-content__common__sandbox_linux__sandbox_debug_handling_linux.cc (contents, props changed)
head/www/chromium/files/patch-device__usb__usb_service_impl.h (contents, props changed)
head/www/chromium/files/patch-net__base__address_tracker_linux.cc (contents, props changed)
head/www/chromium/files/patch-net__base__net_util_linux.cc (contents, props changed)
head/www/chromium/files/patch-skia__ext__SkMemory_new_handler.cpp (contents, props changed)
head/www/chromium/files/patch-third_party__WebKit__Source__bindings__core__v8__V8ScriptRunner.cpp (contents, props changed)
head/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__StackFrameDepth.cpp (contents, props changed)
head/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__Visitor.cpp (contents, props changed)
head/www/chromium/files/patch-third_party__pdfium__third_party__base__logging.h (contents, props changed)
head/www/chromium/files/patch-third_party__skia__src__core__SkVarAlloc.cpp (contents, props changed)
head/www/chromium/files/patch-third_party__webrtc__base__thread_checker_impl.cc (contents, props changed)
head/www/chromium/files/patch-ui__gfx__render_text.cc (contents, props changed)
head/www/chromium/files/patch-v8__src__debug.cc (contents, props changed)
Deleted:
head/www/chromium/files/patch-breakpad__breakpad.gyp
head/www/chromium/files/patch-build__linux__unbundle__openssl.gyp
head/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
head/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc
head/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc
head/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
head/www/chromium/files/patch-third_party__pdfium__third_party__logging.h
head/www/chromium/files/patch-v8__src__preparser.h
Modified:
head/www/chromium/Makefile
head/www/chromium/distinfo
head/www/chromium/files/extra-patch-clang
head/www/chromium/files/patch-base__process__launch.cc
head/www/chromium/files/patch-base__process__launch.h
head/www/chromium/files/patch-build__common.gypi
head/www/chromium/files/patch-cc__layers__layer_impl.cc
head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc
head/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc
head/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc
head/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc
head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
head/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
head/www/chromium/files/patch-content__app__content_main_runner.cc
head/www/chromium/files/patch-content__browser__child_process_launcher.cc
head/www/chromium/files/patch-content__gpu__gpu_main.cc
head/www/chromium/files/patch-device__usb__usb_service_impl.cc
head/www/chromium/files/patch-gpu__config__gpu_util.cc
head/www/chromium/files/patch-gpu__gpu_config.gypi
head/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc
head/www/chromium/files/patch-net__base__address_tracker_linux.h
head/www/chromium/files/patch-net__base__net_util_posix.cc
head/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc
head/www/chromium/files/patch-remoting__remoting_host.gypi
head/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc
head/www/chromium/files/patch-ui__base__ime__input_method_factory.cc
head/www/chromium/files/patch-ui__views__views.gyp
head/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc
head/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc
head/www/chromium/pkg-plist
Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/Makefile Mon Apr 27 11:04:12 2015 (r384824)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 40.0.2214.115
-PORTREVISION= 1
+PORTVERSION= 42.0.2311.90
CATEGORIES= www
MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -21,7 +20,9 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${
yasm:${PORTSDIR}/devel/yasm \
flock:${PORTSDIR}/sysutils/flock \
${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \
- ${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids
+ ${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
+ ${PYTHON_PKGNAMEPREFIX}ply>0:${PORTSDIR}/devel/py-ply
LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \
libdbus-1.so:${PORTSDIR}/devel/dbus \
@@ -111,7 +112,8 @@ GYP_DEFINES+= \
use_system_snappy=1 \
use_system_speex=1 \
use_system_xdg_utils=1 \
- use_system_yasm=1
+ use_system_yasm=1 \
+ v8_use_external_startup_data=0
# allow removal of third_party/adobe
GYP_DEFINES+= flapper_version_h_file='${WRKSRC}/flapper_version.h'
@@ -260,6 +262,7 @@ pre-configure:
'net/third_party/mozilla_security_manager' \
'net/third_party/nss' \
'third_party/WebKit' \
+ 'third_party/analytics' \
'third_party/angle' \
'third_party/angle/src/third_party' \
'third_party/blanketjs' \
@@ -290,7 +293,6 @@ pre-configure:
'third_party/libsrtp' \
'third_party/libvpx' \
'third_party/libvpx/source/libvpx/third_party/x86inc' \
- 'third_party/libwebm' \
'third_party/libxml/chromium' \
'third_party/libXNVCtrl' \
'third_party/libyuv' \
@@ -298,6 +300,7 @@ pre-configure:
'third_party/lzma_sdk' \
'third_party/markupsafe' \
'third_party/mesa' \
+ 'third_party/mojo' \
'third_party/modp_b64' \
'third_party/mt19937ar' \
'third_party/npapi' \
@@ -325,6 +328,7 @@ pre-configure:
'third_party/trace-viewer/third_party/tvcm/third_party' \
'third_party/undoview' \
'third_party/usrsctp' \
+ 'third_party/web-animations-js' \
'third_party/webdriver' \
'third_party/webrtc' \
'third_party/widevine' \
@@ -369,8 +373,6 @@ do-install:
${STAGEDIR}${DATADIR}
${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libffmpegsumo.so \
${STAGEDIR}${DATADIR}
- ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libpdf.so \
- ${STAGEDIR}${DATADIR}
cd ${WRKSRC}/out/${BUILDTYPE} && \
${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR}
@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
Modified: head/www/chromium/distinfo
==============================================================================
--- head/www/chromium/distinfo Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/distinfo Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,4 +1,4 @@
-SHA256 (chromium-40.0.2214.115.tar.xz) = 2261b96dba5747b52512e2391956c54f4e36b9bbaa310b16c7fb0f1e4efba6a5
-SIZE (chromium-40.0.2214.115.tar.xz) = 284973228
-SHA256 (chromium-40.0.2214.115-testdata.tar.xz) = 862a2d2b1afeb7b458f39b65ef1fd4062415dbb7f948d5f463ec31a845369300
-SIZE (chromium-40.0.2214.115-testdata.tar.xz) = 115348788
+SHA256 (chromium-42.0.2311.90.tar.xz) = 60b0eb38c1c3d0cc998dae70b7333e53b715cff2847c1652e03d1723300db4c9
+SIZE (chromium-42.0.2311.90.tar.xz) = 306502344
+SHA256 (chromium-42.0.2311.90-testdata.tar.xz) = 79bb822e879862bee121ea3b8e42e06623790552bc63689beecce680fc018163
+SIZE (chromium-42.0.2311.90-testdata.tar.xz) = 115728192
Modified: head/www/chromium/files/extra-patch-clang
==============================================================================
--- head/www/chromium/files/extra-patch-clang Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/extra-patch-clang Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,5 +1,5 @@
---- base/allocator/allocator_extension.cc 2013-07-03 23:39:54.000000000 -0400
-+++ base/allocator/allocator_extension.cc 2013-07-19 00:39:26.000000000 -0400
+--- base/allocator/allocator_extension.cc 2015-04-15 00:18:47.000000000 +0200
++++ base/allocator/allocator_extension.cc 2015-04-18 21:44:25.000000000 +0200
@@ -35,20 +35,20 @@
void SetGetAllocatorWasteSizeFunction(
thunks::GetAllocatorWasteSizeFunction get_allocator_waste_size_function) {
@@ -24,19 +24,25 @@
thunks::SetReleaseFreeMemoryFunction(release_free_memory_function);
}
---- base/profiler/alternate_timer.cc 2013-07-03 23:39:54.000000000 -0400
-+++ base/profiler/alternate_timer.cc 2013-07-19 00:41:06.000000000 -0400
-@@ -21,7 +21,7 @@
- // Set an alternate timer function to replace the OS time function when
- // profiling.
- void SetAlternateTimeSource(NowFunction* now_function, TimeSourceType type) {
-- DCHECK_EQ(reinterpret_cast<NowFunction*>(NULL), g_time_function);
-+ DCHECK_EQ(static_cast<NowFunction*>(NULL), g_time_function);
- g_time_function = now_function;
- g_time_source_type = type;
- }
---- base/threading/thread_local_storage_unittest.cc.orig 2013-08-30 23:06:21.000000000 +0300
-+++ base/threading/thread_local_storage_unittest.cc 2013-08-30 23:06:50.000000000 +0300
+--- base/strings/safe_sprintf_unittest.cc 2015-04-15 00:18:48.000000000 +0200
++++ base/strings/safe_sprintf_unittest.cc 2015-04-18 22:08:45.000000000 +0200
+@@ -729,12 +729,14 @@
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wconversion-null"
+ #endif
++/* Avoid compiler error: http://pastebin.com/1edWUE84
+ EXPECT_EQ(1, SafeSPrintf(buf, "%d", NULL));
+ EXPECT_EQ("0", std::string(buf));
+ EXPECT_EQ(3, SafeSPrintf(buf, "%p", NULL));
+ EXPECT_EQ("0x0", std::string(buf));
+ EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL));
+ EXPECT_EQ("<NULL>", std::string(buf));
++*/
+ #if defined(__GCC__)
+ #pragma GCC diagnostic pop
+ #endif
+--- base/threading/thread_local_storage_unittest.cc 2015-04-15 00:18:48.000000000 +0200
++++ base/threading/thread_local_storage_unittest.cc 2015-04-18 21:45:40.000000000 +0200
@@ -60,7 +60,7 @@
void ThreadLocalStorageCleanup(void *value) {
int *ptr = reinterpret_cast<int*>(value);
@@ -46,9 +52,9 @@
if (*ptr == kFinalTlsValue)
return; // We've been called enough times.
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
-@@ -378,7 +378,7 @@
+--- base/tracked_objects.cc 2015-04-15 00:31:20.000000000 +0200
++++ base/tracked_objects.cc 2015-04-18 21:57:33.000000000 +0200
+@@ -393,7 +393,7 @@
}
// We must NOT do any allocations during this callback.
// Using the simple linked lists avoids all allocations.
@@ -57,11 +63,11 @@
this->next_retired_worker_ = first_retired_worker_;
first_retired_worker_ = this;
}
---- 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
-@@ -53,9 +53,9 @@
+--- base/tracked_objects_unittest.cc 2015-04-15 00:31:20.000000000 +0200
++++ base/tracked_objects_unittest.cc 2015-04-18 22:01:28.000000000 +0200
+@@ -58,9 +58,9 @@
Births* birth = ThreadData::TallyABirthIfActive(location);
-
+
if (ThreadData::status() == ThreadData::DEACTIVATED)
- EXPECT_EQ(reinterpret_cast<Births*>(NULL), birth);
+ EXPECT_EQ(static_cast<Births*>(NULL), birth);
@@ -69,50 +75,66 @@
- EXPECT_NE(reinterpret_cast<Births*>(NULL), birth);
+ EXPECT_NE(static_cast<Births*>(NULL), birth);
}
-
+
// Helper function to verify the most common test expectations.
-@@ -234,7 +234,7 @@
- return;
-
+@@ -271,7 +271,7 @@
+ }
+
scoped_ptr<DeathData> data(new DeathData());
- ASSERT_NE(data, reinterpret_cast<DeathData*>(NULL));
+ ASSERT_NE(data, static_cast<DeathData*>(NULL));
EXPECT_EQ(data->run_duration_sum(), 0);
EXPECT_EQ(data->run_duration_sample(), 0);
EXPECT_EQ(data->queue_duration_sum(), 0);
-@@ -435,7 +435,7 @@
+@@ -489,7 +489,7 @@
Location location(kFunction, kFile, kLineNumber, NULL);
// Do not delete |birth|. We don't own it.
Births* birth = ThreadData::TallyABirthIfActive(location);
- EXPECT_NE(reinterpret_cast<Births*>(NULL), birth);
+ EXPECT_NE(static_cast<Births*>(NULL), birth);
-
- const TrackedTime kTimePosted = TrackedTime() + Duration::FromMilliseconds(1);
- const TrackedTime kStartOfRun = TrackedTime() +
---- 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
+
+ const unsigned int kTimePosted = 1;
+ const unsigned int kStartOfRun = 5;
+--- chrome/browser/sync/glue/synced_session_tracker.cc 2015-04-15 00:18:50.000000000 +0200
++++ chrome/browser/sync/glue/synced_session_tracker.cc 2015-04-18 22:02:15.000000000 +0200
@@ -260,7 +260,7 @@
}
DCHECK(window_ptr);
DCHECK_EQ(window_ptr->window_id.id(), window_id);
-- DCHECK_EQ(reinterpret_cast<SessionWindow*>(NULL),
-+ DCHECK_EQ(static_cast<SessionWindow*>(NULL),
+- DCHECK_EQ(reinterpret_cast<sessions::SessionWindow*>(NULL),
++ DCHECK_EQ(static_cast<sessions::SessionWindow*>(NULL),
GetSession(session_tag)->windows[window_id]);
GetSession(session_tag)->windows[window_id] = window_ptr;
}
---- 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
-@@ -392,7 +392,7 @@
+--- content/browser/frame_host/render_widget_host_view_guest.cc 2015-04-15 00:31:22.000000000 +0200
++++ content/browser/frame_host/render_widget_host_view_guest.cc 2015-04-18 22:10:28.000000000 +0200
+@@ -241,11 +241,11 @@
+
+ gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const {
+ if (!guest_)
+- return static_cast<gfx::NativeViewId>(NULL);
++ return reinterpret_cast<gfx::NativeViewId>(NULL);
+
+ RenderWidgetHostView* rwhv = guest_->GetOwnerRenderWidgetHostView();
+ if (!rwhv)
+- return static_cast<gfx::NativeViewId>(NULL);
++ return reinterpret_cast<gfx::NativeViewId>(NULL);
+ return rwhv->GetNativeViewId();
+ }
+
+--- media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200
++++ media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200
+@@ -387,7 +387,7 @@
// |stream| is closed at this point. Start() should reopen it again.
EXPECT_CALL(manager(), MakeAudioOutputStream(_, _))
.Times(2)
- .WillRepeatedly(Return(reinterpret_cast<AudioOutputStream*>(NULL)));
+ .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL)));
-
+
EXPECT_CALL(callback_, OnError(_))
.Times(2);
---- media/filters/decrypting_video_decoder_unittest.cc.orig 2014-09-04 02:04:17.000000000 +0200
-+++ media/filters/decrypting_video_decoder_unittest.cc 2014-09-08 20:51:21.000000000 +0200
+--- media/filters/decrypting_video_decoder_unittest.cc 2015-04-15 00:31:22.000000000 +0200
++++ media/filters/decrypting_video_decoder_unittest.cc 2015-04-18 22:03:40.000000000 +0200
@@ -420,7 +420,7 @@
// NULL callback to cancel the |decryptor_ready_cb|.
EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())).WillOnce(
@@ -122,8 +144,8 @@
base::Bind(&DecryptingVideoDecoderTest::DecryptorSet,
base::Unretained(this))));
EXPECT_CALL(*this, DecryptorSet(_)).Times(0);
---- third_party/hunspell/src/hunspell/affentry.hxx 2013-07-03 23:52:32.000000000 -0400
-+++ third_party/hunspell/src/hunspell/affentry.hxx 2013-07-19 01:31:57.000000000 -0400
+--- third_party/hunspell/src/hunspell/affentry.hxx 2015-04-15 00:31:35.000000000 +0200
++++ third_party/hunspell/src/hunspell/affentry.hxx 2015-04-18 22:04:39.000000000 +0200
@@ -27,7 +27,7 @@
struct hentry * checkword(const char * word, int len, char in_compound,
const FLAG needflag = FLAG_NULL);
@@ -142,8 +164,8 @@
char * check_twosfx_morph(const char * word, int len, int optflags,
PfxEntry* ppfx, const FLAG needflag = FLAG_NULL);
---- third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2013-07-03 23:54:15.000000000 -0400
-+++ third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2013-07-19 00:44:09.000000000 -0400
+--- third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200
++++ third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200
@@ -439,7 +439,7 @@
}
@@ -188,54 +210,9 @@
+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
CMapFormat::kFormat4, cmap_id) {
}
-
---- v8/src/runtime/runtime-i18n.cc.orig 2015-01-25 15:08:31.732972197 +0100
-+++ v8/src/runtime/runtime-i18n.cc 2015-01-25 15:09:04.260951597 +0100
-@@ -626,7 +626,7 @@
-
- local_object->SetInternalField(0, reinterpret_cast<Smi*>(break_iterator));
- // Make sure that the pointer to adopted text is NULL.
-- local_object->SetInternalField(1, reinterpret_cast<Smi*>(NULL));
-+ local_object->SetInternalField(1, static_cast<Smi*>(NULL));
-
- Factory* factory = isolate->factory();
- Handle<String> key = factory->NewStringFromStaticChars("breakIterator");
---- 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
-@@ -721,12 +721,14 @@
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wconversion-null"
- #endif
-+/* Avoid compiler error: http://pastebin.com/1edWUE84
- EXPECT_EQ(1, SafeSPrintf(buf, "%d", NULL));
- EXPECT_EQ("0", std::string(buf));
- EXPECT_EQ(3, SafeSPrintf(buf, "%p", NULL));
- EXPECT_EQ("0x0", std::string(buf));
- EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL));
- EXPECT_EQ("<NULL>", std::string(buf));
-+*/
- #if defined(__GCC__)
- #pragma GCC diagnostic pop
- #endif
---- 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_)
-- 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();
- }
--
---- ./third_party/webrtc/base/taskrunner.cc.orig 2014-08-20 21:04:28.000000000 +0200
-+++ ./third_party/webrtc/base/taskrunner.cc 2014-08-22 18:55:46.000000000 +0200
+--- third_party/webrtc/base/taskrunner.cc 2015-04-15 00:32:17.000000000 +0200
++++ third_party/webrtc/base/taskrunner.cc 2015-04-18 22:10:53.000000000 +0200
@@ -102,7 +102,7 @@
std::vector<Task *>::iterator it;
it = std::remove(tasks_.begin(),
@@ -245,20 +222,9 @@
tasks_.erase(it, tasks_.end());
---- v8/src/unique.h.orig 2014-10-10 11:16:50.000000000 +0200
-+++ v8/src/unique.h 2014-10-13 18:55:35.000000000 +0200
-@@ -110,7 +110,7 @@
-
- // TODO(titzer): this is a hack to migrate to Unique<T> incrementally.
- static Unique<T> CreateUninitialized(Handle<T> handle) {
-- return Unique<T>(reinterpret_cast<Address>(NULL), handle);
-+ return Unique<T>(static_cast<Address>(NULL), handle);
- }
-
- static Unique<T> CreateImmovable(Handle<T> handle) {
---- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc.orig 2015-01-25 14:52:44 UTC
-+++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
-@@ -2072,7 +2072,7 @@
+--- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-04-15 00:32:17.000000000 +0200
++++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-04-18 22:13:27.000000000 +0200
+@@ -1754,7 +1754,7 @@
const AudioEncoder* AudioCodingImpl::GetSenderInfo() const {
FATAL() << "Not implemented yet.";
@@ -267,7 +233,7 @@
}
const CodecInst* AudioCodingImpl::GetSenderCodecInst() {
-@@ -2091,7 +2091,7 @@
+@@ -1773,7 +1773,7 @@
const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const {
FATAL() << "Not implemented yet.";
@@ -276,14 +242,25 @@
}
bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) {
---- v8/src/debug.cc.orig 2015-01-25 14:39:37 UTC
-+++ v8/src/debug.cc
-@@ -565,7 +565,7 @@
+--- v8/src/debug.cc 2015-04-15 00:32:36.000000000 +0200
++++ v8/src/debug.cc 2015-04-18 22:14:03.000000000 +0200
+@@ -573,7 +573,7 @@
thread_local_.step_out_fp_ = 0;
// TODO(isolates): frames_are_dropped_?
base::NoBarrier_Store(&thread_local_.current_debug_scope_,
-- static_cast<base::AtomicWord>(NULL));
-+ reinterpret_cast<base::AtomicWord>(NULL));
+- static_cast<base::AtomicWord>(0));
++ reinterpret_cast<base::AtomicWord>(0));
thread_local_.restarter_frame_function_pointer_ = NULL;
}
+--- v8/src/runtime/runtime-i18n.cc 2015-04-15 00:32:37.000000000 +0200
++++ v8/src/runtime/runtime-i18n.cc 2015-04-18 22:06:17.000000000 +0200
+@@ -627,7 +627,7 @@
+
+ local_object->SetInternalField(0, reinterpret_cast<Smi*>(break_iterator));
+ // Make sure that the pointer to adopted text is NULL.
+- local_object->SetInternalField(1, reinterpret_cast<Smi*>(NULL));
++ local_object->SetInternalField(1, static_cast<Smi*>(NULL));
+
+ Factory* factory = isolate->factory();
+ Handle<String> key = factory->NewStringFromStaticChars("breakIterator");
Modified: head/www/chromium/files/patch-base__process__launch.cc
==============================================================================
--- head/www/chromium/files/patch-base__process__launch.cc Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/patch-base__process__launch.cc Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,5 +1,5 @@
---- base/process/launch.cc.orig 2014-10-10 08:54:09 UTC
-+++ base/process/launch.cc
+--- base/process/launch.cc.orig 2015-04-18 22:25:46.000000000 +0200
++++ base/process/launch.cc 2015-04-18 22:26:32.000000000 +0200
@@ -24,10 +24,10 @@
fds_to_remap(NULL),
maximize_rlimits(NULL),
@@ -10,6 +10,6 @@
, allow_new_privs(false)
-#endif // OS_LINUX
+#endif // OS_LINUX || OS_FREEBSD
- #if defined(OS_CHROMEOS)
- , ctrl_terminal_fd(-1)
- #endif // OS_CHROMEOS
+ #if defined(OS_POSIX)
+ , pre_exec_delegate(NULL)
+ #endif // OS_POSIX
Modified: head/www/chromium/files/patch-base__process__launch.h
==============================================================================
--- head/www/chromium/files/patch-base__process__launch.h Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/patch-base__process__launch.h Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,19 +1,20 @@
---- base/process/launch.h.orig 2014-10-10 08:54:09 UTC
-+++ base/process/launch.h
-@@ -113,14 +113,14 @@
+--- base/process/launch.h.orig 2015-04-18 22:29:06.000000000 +0200
++++ base/process/launch.h 2015-04-18 22:30:09.000000000 +0200
+@@ -131,7 +131,7 @@
// will be the same as its pid.
bool new_process_group;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
// If non-zero, start the process using clone(), using flags as provided.
- int clone_flags;
-
+ // Unlike in clone, clone_flags may not contain a custom termination signal
+ // that is sent to the parent when the child dies. The termination signal will
+@@ -141,7 +141,7 @@
// By default, child processes will have the PR_SET_NO_NEW_PRIVS bit set. If
// true, then this bit will not be set in the new child process.
bool allow_new_privs;
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_FREEBSD)
- #if defined(OS_CHROMEOS)
- // If non-negative, the specified file descriptor will be set as the launched
+ #if defined(OS_POSIX)
+ // If not empty, change to this directory before execing the new process.
Modified: head/www/chromium/files/patch-build__common.gypi
==============================================================================
--- head/www/chromium/files/patch-build__common.gypi Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/patch-build__common.gypi Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,6 +1,6 @@
---- build/common.gypi.orig 2014-10-10 09:15:29 UTC
-+++ build/common.gypi
-@@ -91,7 +91,7 @@
+--- build/common.gypi.orig 2015-04-18 22:35:23.000000000 +0200
++++ build/common.gypi 2015-04-18 22:42:51.000000000 +0200
+@@ -94,7 +94,7 @@
'conditions': [
# ChromeOS and Windows use Aura and Ash.
@@ -9,7 +9,7 @@
'use_ash%': 1,
'use_aura%': 1,
}],
-@@ -702,7 +702,7 @@
+@@ -694,7 +694,7 @@
}],
# DBus usage.
@@ -18,7 +18,7 @@
'use_dbus%': 1,
}, {
'use_dbus%': 0,
-@@ -952,7 +952,7 @@
+@@ -944,7 +944,7 @@
}, {
'use_openmax_dl_fft%': 0,
}],
@@ -27,33 +27,33 @@
'enable_mdns%' : 1,
}],
-@@ -975,7 +975,7 @@
- # except when building Android WebView or Chromecast.
+@@ -968,7 +968,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 and android_webview_telemetry_build==0 and chromecast==0', {
-+ ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd" and android_webview_telemetry_build==0 and chromecast==0', {
+- ['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%': '',
-@@ -1228,6 +1228,10 @@
+ }, {
+ 'icu_use_data_file_flag%' : 0,
+@@ -1216,6 +1216,10 @@
# able to turn it off for various reasons.
'linux_disable_pie%': 0,
+ # XXX(rene) More options, keep them?
+ 'os_ver%': 0,
-+ 'use_system_libjpeg%': 0,
++ '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.
-@@ -4391,6 +4395,13 @@
+@@ -4479,6 +4483,13 @@
'ldflags': [
'-Wl,--no-keep-memory',
],
+ 'ldflags!': [
+ '-ldl',
-+ '-pie',
++ '-pie'
+ ],
+ 'libraries!': [
+ '-ldl',
Modified: head/www/chromium/files/patch-cc__layers__layer_impl.cc
==============================================================================
--- head/www/chromium/files/patch-cc__layers__layer_impl.cc Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/patch-cc__layers__layer_impl.cc Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,7 +1,7 @@
---- cc/layers/layer_impl.cc.orig 2015-01-20 21:28:14 UTC
-+++ cc/layers/layer_impl.cc
-@@ -1239,21 +1239,23 @@
- scale_factor * scaled_scroll_bounds.height());
+--- cc/layers/layer_impl.cc.orig 2015-04-18 22:47:03.000000000 +0200
++++ cc/layers/layer_impl.cc 2015-04-18 22:52:19.000000000 +0200
+@@ -1230,13 +1230,15 @@
+ gfx::ToFlooredSize(gfx::ScaleSize(BoundsForScrolling(), scale_factor));
scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds);
- gfx::ScrollOffset max_offset(
@@ -19,14 +19,4 @@
+ return _max_offset;
}
- gfx::Vector2dF LayerImpl::ClampScrollToMaxScrollOffset() {
-- gfx::ScrollOffset max_offset = MaxScrollOffset();
-+ gfx::ScrollOffset _max_offset = MaxScrollOffset();
- gfx::ScrollOffset old_offset = TotalScrollOffset();
- gfx::ScrollOffset clamped_offset = old_offset;
-
-- clamped_offset.SetToMin(max_offset);
-+ clamped_offset.SetToMin(_max_offset);
- clamped_offset.SetToMax(gfx::ScrollOffset());
- gfx::Vector2dF delta = clamped_offset.DeltaFrom(old_offset);
- if (!delta.IsZero())
+ gfx::ScrollOffset LayerImpl::ClampScrollOffsetToLimits(
Modified: head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2014-10-10 09:15:30 UTC
-+++ chrome/browser/chrome_content_browser_client.cc
-@@ -434,7 +434,7 @@
+--- chrome/browser/chrome_content_browser_client.cc.orig 2015-04-18 22:54:06.000000000 +0200
++++ chrome/browser/chrome_content_browser_client.cc 2015-04-18 22:58:13.000000000 +0200
+@@ -446,7 +446,7 @@
return false;
}
@@ -9,7 +9,7 @@
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
const std::string& process_type) {
base::FilePath dumps_path;
-@@ -491,7 +491,7 @@
+@@ -503,7 +503,7 @@
return -1;
}
@@ -18,34 +18,25 @@
#if !defined(OS_CHROMEOS)
GURL GetEffectiveURLForSignin(const GURL& url) {
-@@ -1194,7 +1194,7 @@
-
- void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
- CommandLine* command_line, int child_process_id) {
--#if defined(OS_POSIX)
-+#if defined(OS_POSIX) && !defined(OS_BSD)
+@@ -1295,7 +1295,7 @@
+ command_line->AppendSwitchASCII(switches::kMetricsClientID,
+ client_info->client_id);
+ }
+-#elif defined(OS_POSIX)
++#elif defined(OS_POSIX) && !defined(OS_BSD)
if (breakpad::IsCrashReporterEnabled()) {
scoped_ptr<metrics::ClientInfo> client_info =
GoogleUpdateSettings::LoadMetricsClientInfo();
-@@ -1202,7 +1202,7 @@
- client_info ? client_info->client_id
- : std::string());
- }
--#endif // defined(OS_POSIX)
-+#endif // defined(OS_POSIX) && !defined(OS_BSD)
-
- if (logging::DialogsAreSuppressed())
- command_line->AppendSwitch(switches::kNoErrorDialogs);
-@@ -2408,7 +2408,7 @@
+@@ -2409,7 +2409,7 @@
}
}
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
int child_process_id,
-@@ -2474,7 +2474,7 @@
+@@ -2494,7 +2494,7 @@
}
#endif // defined(OS_ANDROID)
}
Modified: head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,5 +1,5 @@
---- chrome/browser/download/download_shelf_context_menu.cc.orig 2015-01-24 21:45:08 UTC
-+++ chrome/browser/download/download_shelf_context_menu.cc
+--- chrome/browser/download/download_shelf_context_menu.cc.orig 2015-04-18 23:29:54.000000000 +0200
++++ chrome/browser/download/download_shelf_context_menu.cc 2015-04-18 23:31:51.000000000 +0200
@@ -122,7 +122,7 @@
return download_item_->GetOpenWhenComplete() ||
download_crx_util::IsExtensionDownload(*download_item_);
@@ -18,10 +18,10 @@
(defined(OS_MACOSX) && !defined(OS_IOS))
if (CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
-@@ -390,14 +390,14 @@
- #if defined(OS_WIN)
- if (CanOpenPdfInSystemViewer())
- return IDS_DOWNLOAD_MENU_ALWAYS_OPEN_PDF_IN_READER;
+@@ -392,14 +392,14 @@
+ return IsAdobeReaderDefaultPDFViewer()
+ ? IDS_DOWNLOAD_MENU_ALWAYS_OPEN_PDF_IN_READER
+ : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
-#elif defined(OS_MACOSX) || defined(OS_LINUX)
+#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
if (CanOpenPdfInSystemViewer())
@@ -35,12 +35,3 @@
bool DownloadShelfContextMenu::IsDownloadPdf() const {
base::FilePath path = download_item_->GetTargetFilePath();
return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
-@@ -409,7 +409,7 @@
- return IsDownloadPdf() &&
- (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date_ :
- true);
--#elif defined(OS_MACOSX) || defined(OS_LINUX)
-+#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- return IsDownloadPdf();
- #endif
- }
Modified: head/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,20 +1,11 @@
---- chrome/browser/ssl/ssl_blocking_page.cc.orig 2015-01-21 20:28:15 UTC
-+++ chrome/browser/ssl/ssl_blocking_page.cc
-@@ -237,7 +237,7 @@
- #elif defined(OS_IOS)
+--- chrome/browser/ssl/ssl_blocking_page.cc.orig 2015-04-18 23:34:15.000000000 +0200
++++ chrome/browser/ssl/ssl_blocking_page.cc 2015-04-18 23:40:51.000000000 +0200
+@@ -132,7 +132,7 @@
// iOS does not have a way to launch the date and time settings.
NOTREACHED();
+
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
struct ClockCommand {
const char* pathname;
const char* argument;
-@@ -289,7 +289,7 @@
- #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
- base::LaunchOptions options;
- options.wait = false;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- options.allow_new_privs = true;
- #endif
- base::LaunchProcess(command, options, NULL);
Added: head/www/chromium/files/patch-chrome__browser__tracing__crash_service_uploader.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__tracing__crash_service_uploader.cc Mon Apr 27 11:04:12 2015 (r384824)
@@ -0,0 +1,11 @@
+--- chrome/browser/tracing/crash_service_uploader.cc.orig 2015-04-20 19:15:53.000000000 +0200
++++ chrome/browser/tracing/crash_service_uploader.cc 2015-04-20 19:16:21.000000000 +0200
+@@ -127,6 +127,8 @@
+ const char product[] = "Chrome_Android";
+ #elif defined(OS_CHROMEOS)
+ const char product[] = "Chrome_ChromeOS";
++#elif defined(OS_FREEBSD)
++ const char product[] = "Chrome_FreeBSD";
+ #else
+ #error Platform not supported.
+ #endif
Modified: head/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,20 +1,20 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2014-10-10 08:54:11 UTC
-+++ chrome/browser/ui/views/frame/browser_frame.cc
-@@ -36,7 +36,7 @@
- #include "ui/views/controls/menu/menu_runner.h"
- #include "ui/views/widget/native_widget.h"
-
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
- #include "chrome/browser/shell_integration_linux.h"
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2015-04-18 23:43:03.000000000 +0200
++++ chrome/browser/ui/views/frame/browser_frame.cc 2015-04-18 23:46:33.000000000 +0200
+@@ -33,7 +33,7 @@
+ #include "ash/shell.h"
#endif
-@@ -110,7 +110,7 @@
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
#endif
+
+@@ -82,7 +82,7 @@
+ non_client_view()->set_context_menu_controller(this);
}
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
- // Set up a custom WM_CLASS for some sorts of window types. This allows
- // task switchers in X11 environments to distinguish between main browser
- // windows and e.g app windows.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_));
+ #endif
+ }
Modified: head/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,15 +1,15 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2014-10-10 09:15:30 UTC
-+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
-@@ -52,7 +52,7 @@
- #include "ui/views/window/frame_background.h"
- #include "ui/views/window/window_shape.h"
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2015-04-18 23:48:58.000000000 +0200
++++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc 2015-04-18 23:53:50.000000000 +0200
+@@ -54,7 +54,7 @@
+ #include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h"
+ #endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "ui/views/controls/menu/menu_runner.h"
#endif
-@@ -77,7 +77,7 @@
+@@ -79,7 +79,7 @@
// The icon never shrinks below 16 px on a side.
const int kIconMinimumSize = 16;
@@ -18,25 +18,16 @@
// The number of pixels to move the frame background image upwards when using
// the GTK+ theme and the titlebar is condensed.
const int kGTKThemeCondensedFrameTopInset = 15;
-@@ -318,7 +318,7 @@
+@@ -341,7 +341,7 @@
void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source,
const gfx::Point& point) {
-#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
views::MenuRunner::HAS_MNEMONICS);
ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(),
-@@ -571,7 +571,7 @@
- }
-
- bool OpaqueBrowserFrameView::ShouldShowWindowTitleBar() const {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
- // Do not show the custom title bar if the system title bar option is enabled.
- if (!frame()->UseCustomFrame())
- return false;
-@@ -616,7 +616,7 @@
+@@ -637,7 +637,7 @@
frame_background_->set_theme_image(GetFrameImage());
frame_background_->set_theme_overlay_image(GetFrameOverlayImage());
frame_background_->set_top_area_height(GetTopAreaHeight());
Modified: head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,7 +1,16 @@
---- chrome/browser/ui/webui/about_ui.cc.orig 2014-10-10 09:15:30 UTC
-+++ chrome/browser/ui/webui/about_ui.cc
-@@ -761,7 +761,7 @@
- return data;
+--- chrome/browser/ui/webui/about_ui.cc.orig 2015-04-18 23:56:37.000000000 +0200
++++ chrome/browser/ui/webui/about_ui.cc 2015-04-20 19:06:22.000000000 +0200
+@@ -64,7 +64,7 @@
+ #include "chrome/browser/ui/webui/theme_source.h"
+ #endif
+
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "content/public/browser/zygote_host_linux.h"
+ #include "content/public/common/sandbox_linux.h"
+ #endif
+@@ -659,7 +659,7 @@
+ }
}
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
@@ -9,15 +18,15 @@
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data, 0,
-@@ -777,6 +777,7 @@
+@@ -675,6 +675,7 @@
return data;
}
+#if !defined(OS_BSD)
- void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id,
- bool good) {
+ void AboutSandboxRow(std::string* data, int name_id, bool good) {
data->append("<tr><td>");
-@@ -847,6 +848,7 @@
+ data->append(l10n_util::GetStringUTF8(name_id));
+@@ -742,6 +743,7 @@
return data;
}
#endif
@@ -25,7 +34,7 @@
// AboutMemoryHandler ----------------------------------------------------------
-@@ -1019,7 +1021,7 @@
+@@ -914,7 +916,7 @@
} else if (source_name_ == chrome::kChromeUIDNSHost) {
AboutDnsHandler::Start(profile(), callback);
return;
@@ -34,3 +43,12 @@
} else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
response = AboutLinuxProxyConfig();
#endif
+@@ -928,7 +930,7 @@
+ ChromeOSCreditsHandler::Start(path, callback);
+ return;
+ #endif
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_FREEBSD)
+ } else if (source_name_ == chrome::kChromeUISandboxHost) {
+ response = AboutSandbox();
+ #endif
Modified: head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,11 +1,11 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-01-21 20:28:16 UTC
-+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -511,7 +511,7 @@
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-04-19 00:04:55.000000000 +0200
++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2015-04-19 00:05:15.000000000 +0200
+@@ -249,7 +249,7 @@
#if !defined(OS_ANDROID)
- || url.host() == chrome::kChromeUITermsHost
+ || url.host() == chrome::kChromeUITermsHost
#endif
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
- || url.host() == chrome::kChromeUILinuxProxyConfigHost
- || url.host() == chrome::kChromeUISandboxHost
+ || url.host() == chrome::kChromeUILinuxProxyConfigHost
+ || url.host() == chrome::kChromeUISandboxHost
#endif
Modified: head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,15 +1,22 @@
---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2015-01-21 20:28:16 UTC
-+++ chrome/browser/ui/webui/options/browser_options_handler.cc
-@@ -359,7 +359,7 @@
- { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
- { "translateEnableTranslate",
- IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
+--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2015-04-19 00:13:56.000000000 +0200
++++ chrome/browser/ui/webui/options/browser_options_handler.cc 2015-04-19 00:14:26.000000000 +0200
+@@ -470,13 +470,13 @@
+ { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
+ #endif // defined(OS_CHROMEOS)
+
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
{ "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
{ "themesNativeButton", IDS_THEMES_GTK_BUTTON },
{ "themesSetClassic", IDS_THEMES_SET_CLASSIC },
-@@ -692,7 +692,7 @@
+ #else
+ { "themes", IDS_THEMES_GROUP_NAME },
+-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif // defined(OS_POSIX) && !defined(OS_CHROMEOS)
+
+ #if defined(OS_CHROMEOS) && defined(USE_ASH)
+ { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
+@@ -718,7 +718,7 @@
"requestProfilesInfo",
base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
base::Unretained(this)));
@@ -18,7 +25,7 @@
web_ui()->RegisterMessageCallback(
"themesSetNative",
base::Bind(&BrowserOptionsHandler::ThemesSetNative,
-@@ -1342,7 +1342,7 @@
+@@ -1384,7 +1384,7 @@
ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
bool is_system_theme = false;
@@ -27,7 +34,7 @@
bool profile_is_supervised = profile->IsSupervised();
is_system_theme = theme_service->UsingSystemTheme();
base::FundamentalValue native_theme_enabled(!is_system_theme &&
-@@ -1364,7 +1364,7 @@
+@@ -1406,7 +1406,7 @@
ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
}
Added: head/www/chromium/files/patch-chrome__chrome_exe.gypi
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__chrome_exe.gypi Mon Apr 27 11:04:12 2015 (r384824)
@@ -0,0 +1,11 @@
+--- chrome/chrome_exe.gypi.orig 2015-04-20 20:19:42.000000000 +0200
++++ chrome/chrome_exe.gypi 2015-04-20 20:21:17.000000000 +0200
+@@ -190,7 +190,7 @@
+ '../build/linux/system.gyp:xext',
+ ],
+ }],
+- ['OS=="linux" and enable_plugins==1', {
++ ['(OS=="linux" or os_bsd==1) and enable_plugins==1', {
+ 'dependencies': [
+ '../pdf/pdf.gyp:pdf',
+ ],
Modified: head/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,5 +1,5 @@
---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2014-10-10 08:54:12 UTC
-+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc
+--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2015-04-19 00:16:05.000000000 +0200
++++ chrome/renderer/pepper/pepper_flash_font_file_host.cc 2015-04-19 00:17:03.000000000 +0200
@@ -13,7 +13,7 @@
#include "ppapi/proxy/ppapi_messages.h"
#include "ppapi/proxy/serialized_structs.h"
@@ -9,10 +9,10 @@
#include "content/public/common/child_process_sandbox_support_linux.h"
#endif
-@@ -25,14 +25,14 @@
+@@ -24,14 +24,14 @@
+ const ppapi::proxy::SerializedFontDescription& description,
PP_PrivateFontCharset charset)
- : ResourceHost(host->GetPpapiHost(), instance, resource),
- renderer_ppapi_host_(host) {
+ : ResourceHost(host->GetPpapiHost(), instance, resource) {
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
fd_.reset(content::MatchFontWithFallback(
@@ -26,7 +26,7 @@
}
PepperFlashFontFileHost::~PepperFlashFontFileHost() {}
-@@ -52,7 +52,7 @@
+@@ -51,7 +51,7 @@
uint32_t table) {
std::string contents;
int32_t result = PP_ERROR_FAILED;
@@ -35,7 +35,7 @@
int fd = fd_.get();
if (fd != -1) {
size_t length = 0;
-@@ -68,7 +68,7 @@
+@@ -67,7 +67,7 @@
}
}
}
Added: head/www/chromium/files/patch-components__printing__renderer__print_web_view_helper.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__printing__renderer__print_web_view_helper.h Mon Apr 27 11:04:12 2015 (r384824)
@@ -0,0 +1,11 @@
+--- components/printing/renderer/print_web_view_helper.h.orig 2015-04-20 18:54:28.000000000 +0200
++++ components/printing/renderer/print_web_view_helper.h 2015-04-20 18:55:05.000000000 +0200
+@@ -246,7 +246,7 @@
+ void FinishFramePrinting();
+
+ // Prints the page listed in |params|.
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD)
+ void PrintPageInternal(const PrintMsg_PrintPage_Params& params,
+ blink::WebFrame* frame,
+ PdfMetafileSkia* metafile);
Modified: head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
==============================================================================
--- head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc Mon Apr 27 11:03:30 2015 (r384823)
+++ head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc Mon Apr 27 11:04:12 2015 (r384824)
@@ -1,5 +1,5 @@
---- components/storage_monitor/storage_monitor_freebsd.cc.orig 2014-10-13 17:11:08 UTC
-+++ components/storage_monitor/storage_monitor_freebsd.cc
+--- components/storage_monitor/storage_monitor_freebsd.cc.orig 1970-01-01 01:00:00.000000000 +0100
++++ components/storage_monitor/storage_monitor_freebsd.cc 2015-04-19 19:38:05.000000000 +0200
@@ -0,0 +1,102 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
@@ -56,15 +56,15 @@
+ command.push_back(path.value());
+
+ base::LaunchOptions options;
-+ base::ProcessHandle handle;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list