Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Jan 2016 13:49:57 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r407121 - in branches/2016Q1/www/chromium: . files
Message-ID:  <201601241349.u0ODnvt7071236@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Sun Jan 24 13:49:57 2016
New Revision: 407121
URL: https://svnweb.freebsd.org/changeset/ports/407121

Log:
  MFH: r407107
  
  www/chromium: update to 48.0.2564.82
  
  Submitted by:	Christoph Moench-Tegeder via GitHub
  Security:	http://vuxml.freebsd.org/freebsd/371bbea9-3836-4832-9e70-e8e928727f8c.html
  Approved by:	portmgr (miwi)

Added:
  branches/2016Q1/www/chromium/files/patch-base__allocator__allocator_extension.cc
     - copied unchanged from r407107, head/www/chromium/files/patch-base__allocator__allocator_extension.cc
  branches/2016Q1/www/chromium/files/patch-base__process__memory_stubs.cc
     - copied unchanged from r407107, head/www/chromium/files/patch-base__process__memory_stubs.cc
  branches/2016Q1/www/chromium/files/patch-base__trace_event__process_memory_dump.cc
     - copied unchanged from r407107, head/www/chromium/files/patch-base__trace_event__process_memory_dump.cc
  branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__toolbar__app_menu_model.cc
     - copied unchanged from r407107, head/www/chromium/files/patch-chrome__browser__ui__toolbar__app_menu_model.cc
  branches/2016Q1/www/chromium/files/patch-components__autofill__core__common__autofill_l10n_util.cc
     - copied unchanged from r407107, head/www/chromium/files/patch-components__autofill__core__common__autofill_l10n_util.cc
  branches/2016Q1/www/chromium/files/patch-components__cookie_config__cookie_store_util.cc
     - copied unchanged from r407107, head/www/chromium/files/patch-components__cookie_config__cookie_store_util.cc
  branches/2016Q1/www/chromium/files/patch-media__formats__common__offset_byte_queue.cc
     - copied unchanged from r407107, head/www/chromium/files/patch-media__formats__common__offset_byte_queue.cc
  branches/2016Q1/www/chromium/files/patch-media__formats__common__offset_byte_queue.h
     - copied unchanged from r407107, head/www/chromium/files/patch-media__formats__common__offset_byte_queue.h
  branches/2016Q1/www/chromium/files/patch-media__formats__mp2t__es_parser_adts.cc
     - copied unchanged from r407107, head/www/chromium/files/patch-media__formats__mp2t__es_parser_adts.cc
  branches/2016Q1/www/chromium/files/patch-media__formats__mp2t__es_parser_mpeg1audio.cc
     - copied unchanged from r407107, head/www/chromium/files/patch-media__formats__mp2t__es_parser_mpeg1audio.cc
  branches/2016Q1/www/chromium/files/patch-net__dns__dns_reloader.cc
     - copied unchanged from r407107, head/www/chromium/files/patch-net__dns__dns_reloader.cc
  branches/2016Q1/www/chromium/files/patch-third_party__libyuv__include__libyuv__row.h
     - copied unchanged from r407107, head/www/chromium/files/patch-third_party__libyuv__include__libyuv__row.h
  branches/2016Q1/www/chromium/files/patch-ui__views__controls__webview__webview.gyp
     - copied unchanged from r407107, head/www/chromium/files/patch-ui__views__controls__webview__webview.gyp
Deleted:
  branches/2016Q1/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc
  branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__toolbar__wrench_menu_model.cc
  branches/2016Q1/www/chromium/files/patch-net__base__dns_reloader.cc
Modified:
  branches/2016Q1/www/chromium/Makefile
  branches/2016Q1/www/chromium/distinfo
  branches/2016Q1/www/chromium/files/extra-patch-clang
  branches/2016Q1/www/chromium/files/patch-cc__layers__layer_impl.cc
  branches/2016Q1/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc
  branches/2016Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
  branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc
  branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc
  branches/2016Q1/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
  branches/2016Q1/www/chromium/files/patch-content__app__content_main_runner.cc
  branches/2016Q1/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc
  branches/2016Q1/www/chromium/files/patch-content__content_tests.gypi
  branches/2016Q1/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc
  branches/2016Q1/www/chromium/files/patch-native_client__build__common.gypi
  branches/2016Q1/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
  branches/2016Q1/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
  branches/2016Q1/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
  branches/2016Q1/www/chromium/files/patch-ui__base__ime__input_method_initializer.cc
  branches/2016Q1/www/chromium/pkg-plist
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/www/chromium/Makefile
==============================================================================
--- branches/2016Q1/www/chromium/Makefile	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/Makefile	Sun Jan 24 13:49:57 2016	(r407121)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	47.0.2526.111
+PORTVERSION=	48.0.2564.82
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
@@ -273,11 +273,12 @@ pre-configure:
 		'third_party/cacheinvalidation' \
 		'third_party/catapult' \
 		'third_party/catapult/third_party/beautifulsoup' \
+		'third_party/catapult/third_party/py_vulcanize' \
+		'third_party/catapult/third_party/py_vulcanize/py_vulcanize' \
+		'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
+		'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
 		'third_party/catapult/tracing' \
 		'third_party/catapult/tracing/third_party' \
-		'third_party/catapult/tracing/third_party/tvcm' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
-		'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
 		'third_party/cld' \
 		'third_party/cros_system_api' \
 		'third_party/dom_distiller_js' \
@@ -325,7 +326,6 @@ pre-configure:
 		'third_party/pywebsocket' \
 		'third_party/qcms' \
 		'third_party/qunit' \
-		'third_party/readability' \
 		'third_party/sfntly' \
 		'third_party/sinonjs' \
 		'third_party/skia' \

Modified: branches/2016Q1/www/chromium/distinfo
==============================================================================
--- branches/2016Q1/www/chromium/distinfo	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/distinfo	Sun Jan 24 13:49:57 2016	(r407121)
@@ -1,4 +1,4 @@
-SHA256 (chromium-47.0.2526.111.tar.xz) = 179a9189634eb344078c5728fb429bc8581015437ff857261268ab7dbe093708
-SIZE (chromium-47.0.2526.111.tar.xz) = 394641184
-SHA256 (chromium-47.0.2526.111-testdata.tar.xz) = 7a014e11095749ea56683425baa3e7f5b1e6c8ae8cb5a572141e3ab570b8cf1a
-SIZE (chromium-47.0.2526.111-testdata.tar.xz) = 117392528
+SHA256 (chromium-48.0.2564.82.tar.xz) = cda64bf427d01bae7d45863812edcd7fa43176238ec07c7752e42afd3e1714fd
+SIZE (chromium-48.0.2564.82.tar.xz) = 432281684
+SHA256 (chromium-48.0.2564.82-testdata.tar.xz) = 122e42beb5b4ec694649370616d04b4d94301090f80c9f06b8c8950bb1a4d479
+SIZE (chromium-48.0.2564.82-testdata.tar.xz) = 117232108

Modified: branches/2016Q1/www/chromium/files/extra-patch-clang
==============================================================================
--- branches/2016Q1/www/chromium/files/extra-patch-clang	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/extra-patch-clang	Sun Jan 24 13:49:57 2016	(r407121)
@@ -95,9 +95,9 @@
  
    int32 run_ms = 42;
    int32 queue_ms = 8;
---- 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
-@@ -262,7 +262,7 @@
+--- components/sync_sessions/synced_session_tracker.cc.orig	2016-01-21 13:04:41.772845558 +0100
++++ components/sync_sessions/synced_session_tracker.cc	2016-01-21 13:05:17.652842509 +0100
+@@ -286,7 +286,7 @@
    }
    DCHECK(window_ptr);
    DCHECK_EQ(window_ptr->window_id.id(), window_id);
@@ -133,17 +133,6 @@
  
      EXPECT_CALL(callback_, OnError(_))
          .Times(2);
---- 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
-@@ -422,7 +422,7 @@
-   // NULL callback to cancel the |decryptor_ready_cb|.
-   EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())).WillOnce(
-       ResetAndRunCallback(&decryptor_ready_cb,
--                          reinterpret_cast<Decryptor*>(NULL),
-+                          static_cast<Decryptor*>(NULL),
-                           base::Bind(&DecryptingVideoDecoderTest::DecryptorSet,
-                                      base::Unretained(this))));
-   EXPECT_CALL(*this, DecryptorSet(_)).Times(0);
 --- third_party/hunspell/src/hunspell/affentry.hxx.orig 2015-07-21 18:46:37.322427000 -0400
 +++ third_party/hunspell/src/hunspell/affentry.hxx  2015-07-21 18:48:02.034251000 -0400
 @@ -27,7 +27,7 @@
@@ -222,26 +211,6 @@
  
    tasks_.erase(it, tasks_.end());
  
---- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc.orig  2015-09-03 09:31:11.815462000 -0400
-+++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc   2015-09-03 09:31:50.974163000 -0400
-@@ -1028,7 +1028,7 @@
- 
- const AudioEncoder* AudioCodingImpl::GetSenderInfo() const {
-   FATAL() << "Not implemented yet.";
--  return reinterpret_cast<const AudioEncoder*>(NULL);
-+  return static_cast<const AudioEncoder*>(NULL);
- }
- 
- const CodecInst* AudioCodingImpl::GetSenderCodecInst() {
-@@ -1048,7 +1048,7 @@
- 
- const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const {
-   FATAL() << "Not implemented yet.";
--  return reinterpret_cast<const ReceiverInfo*>(NULL);
-+  return static_cast<const ReceiverInfo*>(NULL);
- }
- 
- bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) { 
 --- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig	2015-10-14 22:17:57.580250000 +0200
 +++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp	2015-10-14 22:18:13.766229000 +0200
 @@ -358,7 +358,7 @@

Copied: branches/2016Q1/www/chromium/files/patch-base__allocator__allocator_extension.cc (from r407107, head/www/chromium/files/patch-base__allocator__allocator_extension.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/chromium/files/patch-base__allocator__allocator_extension.cc	Sun Jan 24 13:49:57 2016	(r407121, copy of r407107, head/www/chromium/files/patch-base__allocator__allocator_extension.cc)
@@ -0,0 +1,11 @@
+--- base/allocator/allocator_extension.cc.orig	2016-01-21 17:16:30.192830309 +0100
++++ base/allocator/allocator_extension.cc	2016-01-21 17:16:49.072804621 +0100
+@@ -55,7 +55,7 @@
+ void SetGetNumericPropertyFunction(
+     thunks::GetNumericPropertyFunction get_numeric_property_function) {
+   DCHECK_EQ(thunks::GetGetNumericPropertyFunction(),
+-            reinterpret_cast<thunks::GetNumericPropertyFunction>(NULL));
++            static_cast<thunks::GetNumericPropertyFunction>(NULL));
+   thunks::SetGetNumericPropertyFunction(get_numeric_property_function);
+ }
+ 

Copied: branches/2016Q1/www/chromium/files/patch-base__process__memory_stubs.cc (from r407107, head/www/chromium/files/patch-base__process__memory_stubs.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/chromium/files/patch-base__process__memory_stubs.cc	Sun Jan 24 13:49:57 2016	(r407121, copy of r407107, head/www/chromium/files/patch-base__process__memory_stubs.cc)
@@ -0,0 +1,18 @@
+--- base/process/memory_stubs.cc.orig	2016-01-21 20:31:40.145997166 +0100
++++ base/process/memory_stubs.cc	2016-01-21 20:34:18.367986479 +0100
+@@ -26,6 +26,8 @@
+ // their respective stdlib function since those functions will return null on a
+ // failure to allocate.
+ 
++#if !defined(OS_FREEBSD)
++// FreeBSD brings it's own implementation in memory.cc -- cmt
+ bool UncheckedMalloc(size_t size, void** result) {
+   *result = malloc(size);
+   return *result != nullptr;
+@@ -35,5 +37,6 @@
+   *result = calloc(num_items, size);
+   return *result != nullptr;
+ }
++#endif
+ 
+ }  // namespace base

Copied: branches/2016Q1/www/chromium/files/patch-base__trace_event__process_memory_dump.cc (from r407107, head/www/chromium/files/patch-base__trace_event__process_memory_dump.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/chromium/files/patch-base__trace_event__process_memory_dump.cc	Sun Jan 24 13:49:57 2016	(r407121, copy of r407107, head/www/chromium/files/patch-base__trace_event__process_memory_dump.cc)
@@ -0,0 +1,11 @@
+--- base/trace_event/process_memory_dump.cc.orig	2016-01-21 17:38:36.214712498 +0100
++++ base/trace_event/process_memory_dump.cc	2016-01-21 17:38:51.814711855 +0100
+@@ -66,7 +66,7 @@
+     int error_counter = 0;
+     // HANDLE_EINTR tries for 100 times. So following the same pattern.
+     do {
+-      result = mincore(chunk_start, chunk_size, vector_as_array(&vec));
++      result = mincore(chunk_start, chunk_size, (char *) vector_as_array(&vec));
+     } while (result == -1 && errno == EAGAIN && error_counter++ < 100);
+     if (result)
+       break;

Modified: branches/2016Q1/www/chromium/files/patch-cc__layers__layer_impl.cc
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-cc__layers__layer_impl.cc	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-cc__layers__layer_impl.cc	Sun Jan 24 13:49:57 2016	(r407121)
@@ -1,15 +1,15 @@
---- 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);
+--- cc/layers/layer_impl.cc.orig	2016-01-21 13:23:19.448767974 +0100
++++ cc/layers/layer_impl.cc	2016-01-21 13:24:08.192764717 +0100
+@@ -1549,13 +1549,15 @@
+   scaled_scroll_bounds.SetSize(std::floor(scaled_scroll_bounds.width()),
+                                std::floor(scaled_scroll_bounds.height()));
  
 -  gfx::ScrollOffset max_offset(
 +  // (rene) prevent name collision with /usr/include/vm/vm_map.h on FreeBSD
 +  // which also defines max_offset
 +  gfx::ScrollOffset _max_offset(
-       scaled_scroll_bounds.width() - scroll_clip_layer_->bounds().width(),
-       scaled_scroll_bounds.height() - scroll_clip_layer_->bounds().height());
+       scaled_scroll_bounds.width() - scroll_clip_layer->bounds().width(),
+       scaled_scroll_bounds.height() - scroll_clip_layer->bounds().height());
    // We need the final scroll offset to be in CSS coords.
 -  max_offset.Scale(1 / scale_factor);
 -  max_offset.SetToMax(gfx::ScrollOffset());

Modified: branches/2016Q1/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc	Sun Jan 24 13:49:57 2016	(r407121)
@@ -1,13 +1,13 @@
---- cc/layers/scrollbar_layer_impl_base.cc.orig	2015-05-21 08:37:56.037399000 -0400
-+++ cc/layers/scrollbar_layer_impl_base.cc	2015-05-21 08:38:18.153818000 -0400
-@@ -226,8 +226,8 @@
+--- cc/layers/scrollbar_layer_impl_base.cc.orig	2016-01-21 13:37:26.739709722 +0100
++++ cc/layers/scrollbar_layer_impl_base.cc	2016-01-21 13:37:43.139708550 +0100
+@@ -183,8 +183,8 @@
    int thumb_offset = TrackStart();
-   if (maximum_ > 0) {
-     float ratio = clamped_current_pos / maximum_;
+   if (maximum > 0) {
+     float ratio = clamped_current_pos / maximum;
 -    float max_offset = track_length - thumb_length;
 -    thumb_offset += static_cast<int>(ratio * max_offset);
-+    float max_offset_ = track_length - thumb_length;
-+    thumb_offset += static_cast<int>(ratio * max_offset_);
++    float _max_offset = track_length - thumb_length;
++    thumb_offset += static_cast<int>(ratio * _max_offset);
    }
  
    float thumb_thickness_adjustment =

Modified: branches/2016Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc	Sun Jan 24 13:49:57 2016	(r407121)
@@ -9,15 +9,6 @@
  #include "components/crash/content/app/breakpad_linux.h"
  #endif
  
-@@ -405,7 +405,7 @@
- }  // namespace
- 
- ChromeMainDelegate::ChromeMainDelegate() {
--#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
-   // Record the startup process creation time on supported platforms.
-   startup_metric_utils::RecordStartupProcessCreationTime(
-       base::CurrentProcessInfo::CreationTime());
 @@ -508,7 +508,7 @@
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);

Copied: branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__toolbar__app_menu_model.cc (from r407107, head/www/chromium/files/patch-chrome__browser__ui__toolbar__app_menu_model.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__toolbar__app_menu_model.cc	Sun Jan 24 13:49:57 2016	(r407121, copy of r407107, head/www/chromium/files/patch-chrome__browser__ui__toolbar__app_menu_model.cc)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/toolbar/app_menu_model.cc.orig	2016-01-21 14:37:58.792459231 +0100
++++ chrome/browser/ui/toolbar/app_menu_model.cc	2016-01-21 14:39:05.304456038 +0100
+@@ -779,7 +779,7 @@
+     case IDC_UPGRADE_DIALOG:
+       return browser_defaults::kShowUpgradeMenuItem &&
+           UpgradeDetector::GetInstance()->notify_upgrade();
+-#if !defined(OS_LINUX) || defined(USE_AURA)
++#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA)
+     case IDC_BOOKMARK_PAGE:
+       return !chrome::ShouldRemoveBookmarkThisPageUI(browser_->profile());
+     case IDC_BOOKMARK_ALL_TABS:

Modified: branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc	Sun Jan 24 13:49:57 2016	(r407121)
@@ -18,12 +18,12 @@
      // EndMoveLoop is going to snap the window back to its original location.
      // Hide it so users don't see this. Hiding a window in Linux aura causes
      // it to lose capture so skip it.
-@@ -1791,7 +1791,7 @@
-     if (dragged_window)
-       exclude.insert(dragged_window);
-   }
+@@ -1799,7 +1799,7 @@
+       attached_tabstrip_->GetWidget()->GetNativeWindow();
+   if (exclude_dragged_view && dragged_window)
+     exclude.insert(dragged_window);
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
    // Exclude windows which are pending deletion via Browser::TabStripEmpty().
    // These windows can be returned in the Linux Aura port because the browser
    // window which was used for dragging is not hidden once all of its tabs are

Modified: branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc	Sun Jan 24 13:49:57 2016	(r407121)
@@ -1,6 +1,6 @@
---- 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 @@
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2016-01-21 15:44:16.454185203 +0100
++++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc	2016-01-21 15:50:24.719159940 +0100
+@@ -55,7 +55,7 @@
  #include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h"
  #endif
  
@@ -9,16 +9,7 @@
  #include "ui/views/controls/menu/menu_runner.h"
  #endif
  
-@@ -79,7 +79,7 @@
- // The icon never shrinks below 16 px on a side.
- const int kIconMinimumSize = 16;
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
- // 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;
-@@ -341,7 +341,7 @@
+@@ -336,7 +336,7 @@
  
  void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source,
                                                   const gfx::Point& point) {
@@ -27,12 +18,3 @@
    views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
                                  views::MenuRunner::HAS_MNEMONICS);
    ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(),
-@@ -637,7 +637,7 @@
-   frame_background_->set_theme_image(GetFrameImage());
-   frame_background_->set_theme_overlay_image(GetFrameOverlayImage());
-   frame_background_->set_top_area_height(GetTopAreaHeight());
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
-   // The window manager typically shows a gradient in the native title bar (when
-   // the system title bar pref is set, or when maximized on Ubuntu). Hide the
-   // gradient in the tab strip (by shifting it up vertically) to avoid a

Modified: branches/2016Q1/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc	Sun Jan 24 13:49:57 2016	(r407121)
@@ -1,15 +1,15 @@
---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2015-08-22 15:01:53.000000000 -0400
-+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc	2015-09-03 10:01:52.619879000 -0400
-@@ -13,7 +13,7 @@
+--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2016-01-21 15:55:11.104140125 +0100
++++ chrome/renderer/pepper/pepper_flash_font_file_host.cc	2016-01-21 15:57:35.816130405 +0100
+@@ -14,7 +14,7 @@
  #include "ppapi/proxy/ppapi_messages.h"
  #include "ppapi/proxy/serialized_structs.h"
  
 -#if defined(OS_LINUX) || defined(OS_OPENBSD)
 +#if defined(OS_LINUX) || defined(OS_BSD)
  #include "content/public/common/child_process_sandbox_support_linux.h"
- #endif
- 
-@@ -24,14 +24,14 @@
+ #elif defined(OS_WIN)
+ #include "third_party/skia/include/ports/SkFontMgr.h"
+@@ -27,7 +27,7 @@
      const ppapi::proxy::SerializedFontDescription& description,
      PP_PrivateFontCharset charset)
      : ResourceHost(host->GetPpapiHost(), instance, resource) {
@@ -18,29 +18,21 @@
    fd_.reset(content::MatchFontWithFallback(
        description.face,
        description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
-       description.italic,
-       charset,
-       PP_BROWSERFONT_TRUSTED_FAMILY_DEFAULT));
+@@ -44,7 +44,7 @@
+   skia::RefPtr<SkFontMgr> font_mgr = skia::AdoptRef(SkFontMgr::RefDefault());
+   typeface_ = skia::AdoptRef(
+       font_mgr->matchFamilyStyle(description.face.c_str(), style));
 -#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
  }
  
  PepperFlashFontFileHost::~PepperFlashFontFileHost() {}
-@@ -51,7 +51,7 @@
-     uint32_t table) {
-   std::string contents;
-   int32_t result = PP_ERROR_FAILED;
+@@ -63,7 +63,7 @@
+                                           void* buffer,
+                                           size_t* length) {
+   bool result = false;
 -#if defined(OS_LINUX) || defined(OS_OPENBSD)
 +#if defined(OS_LINUX) || defined(OS_BSD)
    int fd = fd_.get();
-   if (fd != -1) {
-     size_t length = 0;
-@@ -67,7 +67,7 @@
-       }
-     }
-   }
--#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
-+#endif  // defined(OS_LINUX) || defined(OS_BSD)
- 
-   context->reply_msg = PpapiPluginMsg_FlashFontFile_GetFontTableReply(contents);
-   return result;
+   if (fd != -1)
+     result = content::GetFontTable(fd, table, 0 /* offset */,

Copied: branches/2016Q1/www/chromium/files/patch-components__autofill__core__common__autofill_l10n_util.cc (from r407107, head/www/chromium/files/patch-components__autofill__core__common__autofill_l10n_util.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/chromium/files/patch-components__autofill__core__common__autofill_l10n_util.cc	Sun Jan 24 13:49:57 2016	(r407121, copy of r407107, head/www/chromium/files/patch-components__autofill__core__common__autofill_l10n_util.cc)
@@ -0,0 +1,11 @@
+--- components/autofill/core/common/autofill_l10n_util.cc.orig	2016-01-21 18:39:29.016461188 +0100
++++ components/autofill/core/common/autofill_l10n_util.cc	2016-01-21 18:39:45.136459722 +0100
+@@ -22,7 +22,7 @@
+     // library. This could be due to a device-specific issue (has been seen in
+     // the wild on Android devices). In the failure case, |collator_| will be
+     // null. See http://crbug.com/558625.
+-    icu_54::UnicodeString name;
++    icu_55::UnicodeString name;
+     std::string locale_name;
+     locale.getDisplayName(name).toUTF8String(locale_name);
+     LOG(ERROR) << "Failed to initialize the ICU Collator for "

Copied: branches/2016Q1/www/chromium/files/patch-components__cookie_config__cookie_store_util.cc (from r407107, head/www/chromium/files/patch-components__cookie_config__cookie_store_util.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/chromium/files/patch-components__cookie_config__cookie_store_util.cc	Sun Jan 24 13:49:57 2016	(r407121, copy of r407107, head/www/chromium/files/patch-components__cookie_config__cookie_store_util.cc)
@@ -0,0 +1,24 @@
+--- ./components/cookie_config/cookie_store_util.cc.orig	2016-01-21 14:31:28.175486313 +0100
++++ ./components/cookie_config/cookie_store_util.cc	2016-01-21 14:32:42.351481630 +0100
+@@ -10,7 +10,7 @@
+ 
+ namespace cookie_config {
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ namespace {
+ 
+ // Use the operating system's mechanisms to encrypt cookies before writing
+@@ -62,10 +62,10 @@
+ net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
+   return g_cookie_crypto_delegate.Pointer();
+ }
+-#else   // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#else   // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
+   return NULL;
+ }
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ }  // namespace cookie_config

Modified: branches/2016Q1/www/chromium/files/patch-content__app__content_main_runner.cc
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-content__app__content_main_runner.cc	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-content__app__content_main_runner.cc	Sun Jan 24 13:49:57 2016	(r407121)
@@ -1,12 +1,11 @@
---- content/app/content_main_runner.cc.orig	2015-04-19 00:24:28.000000000 +0200
-+++ content/app/content_main_runner.cc	2015-04-19 00:28:17.000000000 +0200
-@@ -93,11 +93,11 @@
+--- content/app/content_main_runner.cc.orig	2016-01-21 16:00:09.209120298 +0100
++++ content/app/content_main_runner.cc	2016-01-21 16:02:40.649109123 +0100
+@@ -98,10 +98,10 @@
  #include "base/posix/global_descriptors.h"
  #include "content/public/common/content_descriptors.h"
  
 -#if !defined(OS_MACOSX)
 +#if !defined(OS_MACOSX) && !defined(OS_BSD)
- #include "content/public/common/content_descriptors.h"
  #include "content/public/common/zygote_fork_delegate_linux.h"
  #endif
 -#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
@@ -14,23 +13,30 @@
  #include "content/zygote/zygote_main.h"
  #endif
  
-@@ -258,7 +258,8 @@
+@@ -259,7 +259,7 @@
    int (*function)(const MainFunctionParams&);
  };
  
 -#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) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
  // 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().
-@@ -383,7 +384,8 @@
+@@ -308,7 +308,7 @@
+   NOTREACHED() << "Unknown zygote process type: " << process_type;
+   return 1;
+ }
+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ 
+ #if !defined(OS_IOS)
+ static void RegisterMainThreadFactories() {
+@@ -379,7 +379,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) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
    // Zygote startup is special -- see RunZygote comments above
    // for why we don't use ZygoteMain directly.
    if (process_type == switches::kZygoteProcess)

Modified: branches/2016Q1/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc	Sun Jan 24 13:49:57 2016	(r407121)
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2015-01-21 20:28:16 UTC
-+++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -89,7 +89,7 @@
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2016-01-21 16:05:17.322098582 +0100
++++ content/browser/renderer_host/render_widget_host_view_aura.cc	2016-01-21 16:08:52.682084606 +0100
+@@ -102,7 +102,7 @@
  #include "ui/gfx/win/dpi.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "content/common/input_messages.h"
  #include "ui/events/linux/text_edit_command_auralinux.h"
  #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
-@@ -677,7 +677,7 @@
+@@ -736,7 +736,7 @@
    if (host)
      return reinterpret_cast<gfx::NativeViewId>(host->GetAcceleratedWidget());
  #endif
@@ -18,21 +18,21 @@
  }
  
  gfx::NativeViewAccessible RenderWidgetHostViewAura::GetNativeViewAccessible() {
-@@ -2326,7 +2326,7 @@
+@@ -2543,7 +2543,7 @@
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
    return NeedsInputGrab();
  #endif
    return false;
-@@ -2542,7 +2542,7 @@
+@@ -2774,7 +2774,7 @@
+   if (host_->delegate())
+     target_host = host_->delegate()->GetFocusedRenderWidgetHost(host_);
  
- void RenderWidgetHostViewAura::ForwardKeyboardEvent(
-     const NativeWebKeyboardEvent& event) {
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
    ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate =
        ui::GetTextEditKeyBindingsDelegate();
    std::vector<ui::TextEditCommandAuraLinux> commands;

Modified: branches/2016Q1/www/chromium/files/patch-content__content_tests.gypi
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-content__content_tests.gypi	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-content__content_tests.gypi	Sun Jan 24 13:49:57 2016	(r407121)
@@ -1,18 +1,18 @@
---- content/content_tests.gypi.orig	2014-10-10 09:15:31 UTC
-+++ content/content_tests.gypi
-@@ -923,6 +923,15 @@
-             'browser/geolocation/wifi_data_provider_linux_unittest.cc',
-           ],
-         }],
-+        ['OS == "freebsd"', {
-+          'sources!': [
-+            'browser/download/file_metadata_unittest_linux.cc',
-+            'browser/geolocation/wifi_data_provider_linux_unittest.cc',
-+            'browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc',
-+            'browser/renderer_host/media/media_stream_manager_unittest.cc',
-+            'browser/renderer_host/media/media_stream_ui_controller_unittest.cc',
-+          ],
-+        }],
-         ['OS != "android" and OS != "ios"', {
-           'dependencies': [
-             '../third_party/libvpx/libvpx.gyp:libvpx',
+--- content/content_tests.gypi.orig	2016-01-21 16:12:12.019069967 +0100
++++ content/content_tests.gypi	2016-01-21 16:32:14.310986945 +0100
+@@ -1264,6 +1264,15 @@
+                 '../third_party/libvpx_new/libvpx.gyp:libvpx_new',
+               ],
+             }],
++            ['OS == "freebsd"', {
++              'sources!': [
++                'browser/download/file_metadata_unittest_linux.cc',
++                'browser/geolocation/wifi_data_provider_linux_unittest.cc',
++                'browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc',
++                'browser/renderer_host/media/media_stream_manager_unittest.cc',
++                'browser/renderer_host/media/media_stream_ui_controller_unittest.cc'
++              ]
++            }],
+             # Avoid windows due to non-availability of cursor resources in test.
+             ['OS != "linux"', {
+               'sources!': [

Modified: branches/2016Q1/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc	Sun Jan 24 13:49:57 2016	(r407121)
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig	2015-11-24 21:00:55.000000000 +0100
-+++ content/renderer/renderer_blink_platform_impl.cc	2015-12-06 14:27:00.785767410 +0100
-@@ -104,7 +104,7 @@
+--- content/renderer/renderer_blink_platform_impl.cc.orig	2016-01-21 16:33:48.151980879 +0100
++++ content/renderer/renderer_blink_platform_impl.cc	2016-01-21 16:36:48.239968431 +0100
+@@ -108,7 +108,7 @@
  
  #if defined(OS_POSIX)
  #include "base/file_descriptor_posix.h"
@@ -9,7 +9,7 @@
  #include <map>
  #include <string>
  
-@@ -195,7 +195,7 @@
+@@ -199,7 +199,7 @@
    scoped_refptr<ThreadSafeSender> thread_safe_sender_;
  };
  
@@ -18,7 +18,7 @@
  class RendererBlinkPlatformImpl::SandboxSupport
      : public blink::WebSandboxSupport {
   public:
-@@ -222,7 +222,7 @@
+@@ -226,7 +226,7 @@
    std::map<int32_t, blink::WebFallbackFont> unicode_font_families_;
  #endif
  };
@@ -27,16 +27,16 @@
  
  //------------------------------------------------------------------------------
  
-@@ -238,7 +238,7 @@
-       plugin_refresh_allowed_(true),
-       default_task_runner_(renderer_scheduler->DefaultTaskRunner()),
-       web_scrollbar_behavior_(new WebScrollbarBehaviorImpl) {
+@@ -243,7 +243,7 @@
+       loading_task_runner_(renderer_scheduler->LoadingTaskRunner()),
+       web_scrollbar_behavior_(new WebScrollbarBehaviorImpl),
+       renderer_scheduler_(renderer_scheduler) {
 -#if !defined(OS_ANDROID) && !defined(OS_WIN)
 +#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
    if (g_sandbox_enabled && sandboxEnabled()) {
      sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
    } else {
-@@ -263,7 +263,7 @@
+@@ -268,7 +268,7 @@
  }
  
  void RendererBlinkPlatformImpl::Shutdown() {
@@ -45,7 +45,7 @@
    // SandboxSupport contains a map of WebFontFamily objects, which hold
    // WebCStrings, which become invalidated when blink is shut down. Hence, we
    // need to clear that map now, just before blink::shutdown() is called.
-@@ -300,7 +300,7 @@
+@@ -328,7 +328,7 @@
  }
  
  blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() {
@@ -54,7 +54,7 @@
    // These platforms do not require sandbox support.
    return NULL;
  #else
-@@ -570,7 +570,7 @@
+@@ -598,7 +598,7 @@
    return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
  }
  

Copied: branches/2016Q1/www/chromium/files/patch-media__formats__common__offset_byte_queue.cc (from r407107, head/www/chromium/files/patch-media__formats__common__offset_byte_queue.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/chromium/files/patch-media__formats__common__offset_byte_queue.cc	Sun Jan 24 13:49:57 2016	(r407121, copy of r407107, head/www/chromium/files/patch-media__formats__common__offset_byte_queue.cc)
@@ -0,0 +1,20 @@
+--- media/formats/common/offset_byte_queue.cc.orig	2016-01-21 18:02:48.165612307 +0100
++++ media/formats/common/offset_byte_queue.cc	2016-01-21 18:03:02.909611412 +0100
+@@ -46,13 +46,13 @@
+   *size = tail() - offset;
+ }
+ 
+-bool OffsetByteQueue::Trim(int64 max_offset) {
+-  if (max_offset < head_) return true;
+-  if (max_offset > tail()) {
++bool OffsetByteQueue::Trim(int64 _max_offset) {
++  if (_max_offset < head_) return true;
++  if (_max_offset > tail()) {
+     Pop(size_);
+     return false;
+   }
+-  Pop(max_offset - head_);
++  Pop(_max_offset - head_);
+   return true;
+ }
+ 

Copied: branches/2016Q1/www/chromium/files/patch-media__formats__common__offset_byte_queue.h (from r407107, head/www/chromium/files/patch-media__formats__common__offset_byte_queue.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/chromium/files/patch-media__formats__common__offset_byte_queue.h	Sun Jan 24 13:49:57 2016	(r407121, copy of r407107, head/www/chromium/files/patch-media__formats__common__offset_byte_queue.h)
@@ -0,0 +1,11 @@
+--- media/formats/common/offset_byte_queue.h.orig	2016-01-21 17:56:56.371637446 +0100
++++ media/formats/common/offset_byte_queue.h	2016-01-21 17:57:23.779644008 +0100
+@@ -42,7 +42,7 @@
+   // including the case where |max_offset| is less than the current head.
+   // Returns false if |max_offset| > tail() (although all bytes currently
+   // buffered are still cleared).
+-  bool Trim(int64 max_offset);
++  bool Trim(int64 _max_offset);
+ 
+   // The head and tail positions, in terms of the file's absolute offsets.
+   // tail() is an exclusive bound.

Copied: branches/2016Q1/www/chromium/files/patch-media__formats__mp2t__es_parser_adts.cc (from r407107, head/www/chromium/files/patch-media__formats__mp2t__es_parser_adts.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/chromium/files/patch-media__formats__mp2t__es_parser_adts.cc	Sun Jan 24 13:49:57 2016	(r407121, copy of r407107, head/www/chromium/files/patch-media__formats__mp2t__es_parser_adts.cc)
@@ -0,0 +1,26 @@
+--- media/formats/mp2t/es_parser_adts.cc.orig	2016-01-21 18:00:32.996621604 +0100
++++ media/formats/mp2t/es_parser_adts.cc	2016-01-21 18:00:53.692621141 +0100
+@@ -61,11 +61,11 @@
+   const uint8* es;
+   es_queue_->Peek(&es, &es_size);
+ 
+-  int max_offset = es_size - kADTSHeaderMinSize;
+-  if (max_offset <= 0)
++  int _max_offset = es_size - kADTSHeaderMinSize;
++  if (_max_offset <= 0)
+     return false;
+ 
+-  for (int offset = 0; offset < max_offset; offset++) {
++  for (int offset = 0; offset < _max_offset; offset++) {
+     const uint8* cur_buf = &es[offset];
+     if (!isAdtsSyncWord(cur_buf))
+       continue;
+@@ -103,7 +103,7 @@
+     return true;
+   }
+ 
+-  es_queue_->Pop(max_offset);
++  es_queue_->Pop(_max_offset);
+   return false;
+ }
+ 

Copied: branches/2016Q1/www/chromium/files/patch-media__formats__mp2t__es_parser_mpeg1audio.cc (from r407107, head/www/chromium/files/patch-media__formats__mp2t__es_parser_mpeg1audio.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/chromium/files/patch-media__formats__mp2t__es_parser_mpeg1audio.cc	Sun Jan 24 13:49:57 2016	(r407121, copy of r407107, head/www/chromium/files/patch-media__formats__mp2t__es_parser_mpeg1audio.cc)
@@ -0,0 +1,26 @@
+--- media/formats/mp2t/es_parser_mpeg1audio.cc.orig	2016-01-21 18:01:40.197617169 +0100
++++ media/formats/mp2t/es_parser_mpeg1audio.cc	2016-01-21 18:01:56.732844406 +0100
+@@ -111,11 +111,11 @@
+   const uint8* es;
+   es_queue_->Peek(&es, &es_size);
+ 
+-  int max_offset = es_size - MPEG1AudioStreamParser::kHeaderSize;
+-  if (max_offset <= 0)
++  int _max_offset = es_size - MPEG1AudioStreamParser::kHeaderSize;
++  if (_max_offset <= 0)
+     return false;
+ 
+-  for (int offset = 0; offset < max_offset; offset++) {
++  for (int offset = 0; offset < _max_offset; offset++) {
+     const uint8* cur_buf = &es[offset];
+     if (cur_buf[0] != 0xff)
+       continue;
+@@ -156,7 +156,7 @@
+     return true;
+   }
+ 
+-  es_queue_->Pop(max_offset);
++  es_queue_->Pop(_max_offset);
+   return false;
+ }
+ 

Modified: branches/2016Q1/www/chromium/files/patch-native_client__build__common.gypi
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-native_client__build__common.gypi	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-native_client__build__common.gypi	Sun Jan 24 13:49:57 2016	(r407121)
@@ -1,6 +1,6 @@
---- native_client/build/common.gypi.orig	2014-10-10 09:16:25 UTC
-+++ native_client/build/common.gypi
-@@ -290,7 +290,7 @@
+--- native_client/build/common.gypi.orig	2016-01-14 01:27:44.000000000 +0100
++++ native_client/build/common.gypi	2016-01-21 16:23:12.810024295 +0100
+@@ -275,7 +275,7 @@
      ],
    },
    'conditions': [

Copied: branches/2016Q1/www/chromium/files/patch-net__dns__dns_reloader.cc (from r407107, head/www/chromium/files/patch-net__dns__dns_reloader.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/chromium/files/patch-net__dns__dns_reloader.cc	Sun Jan 24 13:49:57 2016	(r407121, copy of r407107, head/www/chromium/files/patch-net__dns__dns_reloader.cc)
@@ -0,0 +1,13 @@
+--- net/dns/dns_reloader.cc.orig	2016-01-21 16:39:42.984956172 +0100
++++ net/dns/dns_reloader.cc	2016-01-21 16:40:30.288952815 +0100
+@@ -7,6 +7,10 @@
+ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
+     !defined(OS_ANDROID)
+ 
++#if defined(OS_FREEBSD)
++#include <netinet/in.h>
++#endif
++
+ #include <resolv.h>
+ 
+ #include "base/basictypes.h"

Modified: branches/2016Q1/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc	Sun Jan 24 13:49:57 2016	(r407121)
@@ -1,9 +1,9 @@
---- net/http/http_auth_gssapi_posix.cc.orig	2015-07-15 16:30:05.000000000 -0400
-+++ net/http/http_auth_gssapi_posix.cc	2015-07-22 07:50:14.149575000 -0400
-@@ -432,8 +432,8 @@
+--- net/http/http_auth_gssapi_posix.cc.orig	2016-01-21 16:42:58.881942944 +0100
++++ net/http/http_auth_gssapi_posix.cc	2016-01-21 16:43:28.081940938 +0100
+@@ -431,8 +431,8 @@
+     static const char* const kDefaultLibraryNames[] = {
  #if defined(OS_MACOSX)
-       // This library is provided by Kerberos.framework.
-       "libgssapi_krb5.dylib"
+       "/System/Library/Frameworks/Kerberos.framework/Kerberos"
 -#elif defined(OS_OPENBSD)
 -      "libgssapi.so"          // Heimdal - OpenBSD
 +#elif defined(OS_BSD)

Copied: branches/2016Q1/www/chromium/files/patch-third_party__libyuv__include__libyuv__row.h (from r407107, head/www/chromium/files/patch-third_party__libyuv__include__libyuv__row.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/chromium/files/patch-third_party__libyuv__include__libyuv__row.h	Sun Jan 24 13:49:57 2016	(r407121, copy of r407107, head/www/chromium/files/patch-third_party__libyuv__include__libyuv__row.h)
@@ -0,0 +1,23 @@
+--- third_party/libyuv/include/libyuv/row.h.orig	2016-01-22 20:34:30.817629081 +0100
++++ third_party/libyuv/include/libyuv/row.h	2016-01-22 21:28:33.325381305 +0100
+@@ -105,8 +105,10 @@
+ #define HAS_COPYROW_SSE2
+ #define HAS_H422TOARGBROW_SSSE3
+ #define HAS_I400TOARGBROW_SSE2
++// The following functions fail on gcc/clang 32 bit.
++// caveat: clangcl uses row_win.cc which works.
++#if !(defined(__i386__) && defined(__GNUC__))
+ #define HAS_I411TOARGBROW_SSSE3
+-#if !(defined(_DEBUG) && defined(__i386__))
+ // TODO(fbarchard): fix build error on android_full_debug=1
+ // https://code.google.com/p/libyuv/issues/detail?id=517
+ #define HAS_I422ALPHATOARGBROW_SSSE3
+@@ -197,7 +199,7 @@
+ #define HAS_COPYROW_AVX
+ #define HAS_H422TOARGBROW_AVX2
+ #define HAS_I400TOARGBROW_AVX2
+-#if !(defined(_DEBUG) && defined(__i386__))
++#if !(defined(__i386__) && defined(__GNUC__))
+ // TODO(fbarchard): fix build error on android_full_debug=1
+ // https://code.google.com/p/libyuv/issues/detail?id=517
+ #define HAS_I422ALPHATOARGBROW_AVX2

Modified: branches/2016Q1/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp	Sun Jan 24 13:49:57 2016	(r407121)
@@ -1,18 +1,18 @@
---- third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig	2015-10-14 18:30:46.180316000 +0200
-+++ third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp	2015-10-14 18:31:44.759135000 +0200
-@@ -910,7 +910,7 @@
-                                            const CJS_Parameters& params,
+--- third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig	2016-01-21 16:45:51.849930462 +0100
++++ third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp	2016-01-21 16:46:22.626928815 +0100
+@@ -914,7 +914,7 @@
+                                            const std::vector<CJS_Value>& params,
                                             CJS_Value& vRet,
                                             CFX_WideString& sError) {
 -#if _FX_OS_ != _FX_ANDROID_
 +#if _FX_OS_ != _FX_ANDROID_ && _FX_OS_ != _FX_LINUX_DESKTOP_
-   v8::Isolate* isolate = ::GetIsolate(cc);
    CJS_Context* pContext = (CJS_Context*)cc;
-   ASSERT(pContext != NULL);
-@@ -1213,7 +1213,7 @@
-                                             const CJS_Parameters& params,
-                                             CJS_Value& vRet,
-                                             CFX_WideString& sError) {
+   if (params.size() != 6) {
+     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
+@@ -1214,7 +1214,7 @@
+     const std::vector<CJS_Value>& params,
+     CJS_Value& vRet,
+     CFX_WideString& sError) {
 -#if _FX_OS_ != _FX_ANDROID_
 +#if _FX_OS_ != _FX_ANDROID_ && _FX_OS_ != _FX_LINUX_DESKTOP_
    CJS_Context* pContext = (CJS_Context*)cc;

Modified: branches/2016Q1/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py	Sun Jan 24 13:49:57 2016	(r407121)
@@ -1,31 +1,22 @@
---- tools/gyp/pylib/gyp/generator/make.py.orig	2014-10-10 09:16:07 UTC
-+++ tools/gyp/pylib/gyp/generator/make.py
-@@ -88,7 +88,7 @@
-   else:
-     operating_system = flavor
-     if flavor == 'android':
--      operating_system = 'linux'  # Keep this legacy behavior for now.
-+      operating_system = 'freebsd'  # Keep this legacy behavior for now.
-     default_variables.setdefault('OS', operating_system)
-     default_variables.setdefault('SHARED_LIB_SUFFIX', '.so')
-     default_variables.setdefault('SHARED_LIB_DIR','$(builddir)/lib.$(TOOLSET)')
+--- tools/gyp/pylib/gyp/generator/make.py.orig	2016-01-21 16:48:10.674923813 +0100
++++ tools/gyp/pylib/gyp/generator/make.py	2016-01-21 16:52:28.811903889 +0100
 @@ -276,7 +276,7 @@
- CFLAGS.target ?= $(CFLAGS)
+ CFLAGS.target ?= $(CPPFLAGS) $(CFLAGS)
  CXX.target ?= %(CXX.target)s
- CXXFLAGS.target ?= $(CXXFLAGS)
+ CXXFLAGS.target ?= $(CPPFLAGS) $(CXXFLAGS)
 -LINK.target ?= %(LINK.target)s
 +LINK.target ?= %(CXX.target)s
  LDFLAGS.target ?= $(LDFLAGS)
  AR.target ?= $(AR)
  
-@@ -293,13 +293,13 @@
+@@ -285,13 +285,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
--CFLAGS.host ?=
+-CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host)
 -CXX.host ?= %(CXX.host)s
--CXXFLAGS.host ?=
+-CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host)
 -LINK.host ?= %(LINK.host)s
 -LDFLAGS.host ?=
 -AR.host ?= %(AR.host)s
@@ -39,7 +30,7 @@
  
  # Define a dir function that can handle spaces.
  # http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions
-@@ -1824,7 +1824,7 @@
+@@ -1816,7 +1816,7 @@
        return modules
  
      # Retrieve the default value of 'SHARED_LIB_SUFFIX'

Modified: branches/2016Q1/www/chromium/files/patch-ui__base__ime__input_method_initializer.cc
==============================================================================
--- branches/2016Q1/www/chromium/files/patch-ui__base__ime__input_method_initializer.cc	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/files/patch-ui__base__ime__input_method_initializer.cc	Sun Jan 24 13:49:57 2016	(r407121)
@@ -1,9 +1,9 @@
---- ui/base/ime/input_method_initializer.cc.orig	2015-04-14 18:18:59.000000000 -0400
-+++ ui/base/ime/input_method_initializer.cc	2015-04-28 08:56:59.070063000 -0400
+--- ui/base/ime/input_method_initializer.cc.orig	2016-01-21 16:55:32.692891135 +0100
++++ ui/base/ime/input_method_initializer.cc	2016-01-21 16:56:57.764073061 +0100
 @@ -6,14 +6,14 @@
  
  #if defined(OS_CHROMEOS)
- #include "ui/base/ime/chromeos/ime_bridge.h"
+ #include "ui/base/ime/ime_bridge.h"
 -#elif defined(USE_AURA) && defined(OS_LINUX)
 +#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
  #include "base/logging.h"
@@ -20,18 +20,9 @@
 @@ -36,7 +36,7 @@
  void InitializeInputMethodForTesting() {
  #if defined(OS_CHROMEOS)
-   chromeos::IMEBridge::Initialize();
+   IMEBridge::Initialize();
 -#elif defined(USE_AURA) && defined(OS_LINUX)
 +#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
    if (!g_linux_input_method_context_factory)
      g_linux_input_method_context_factory = new FakeInputMethodContextFactory();
    const LinuxInputMethodContextFactory* factory =
-@@ -52,7 +52,7 @@
- void ShutdownInputMethodForTesting() {
- #if defined(OS_CHROMEOS)
-   chromeos::IMEBridge::Shutdown();
--#elif defined(USE_AURA) && defined(OS_LINUX)
-+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
-   const LinuxInputMethodContextFactory* factory =
-       LinuxInputMethodContextFactory::instance();
-   CHECK(!factory || factory == g_linux_input_method_context_factory)

Copied: branches/2016Q1/www/chromium/files/patch-ui__views__controls__webview__webview.gyp (from r407107, head/www/chromium/files/patch-ui__views__controls__webview__webview.gyp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/chromium/files/patch-ui__views__controls__webview__webview.gyp	Sun Jan 24 13:49:57 2016	(r407121, copy of r407107, head/www/chromium/files/patch-ui__views__controls__webview__webview.gyp)
@@ -0,0 +1,11 @@
+--- ui/views/controls/webview/webview.gyp.orig	2016-01-21 20:39:27.633964842 +0100
++++ ui/views/controls/webview/webview.gyp	2016-01-21 20:39:46.305964070 +0100
+@@ -42,7 +42,7 @@
+         'webview_export.h',
+       ],
+       'conditions': [
+-        ['OS=="linux" or OS=="android"', {
++        ['OS=="linux" or OS=="android" or os_bsd==1', {
+           'sources': [ 'unhandled_keyboard_event_handler_default.cc', ],
+         }],
+       ],

Modified: branches/2016Q1/www/chromium/pkg-plist
==============================================================================
--- branches/2016Q1/www/chromium/pkg-plist	Sun Jan 24 13:43:26 2016	(r407120)
+++ branches/2016Q1/www/chromium/pkg-plist	Sun Jan 24 13:49:57 2016	(r407121)
@@ -114,8 +114,10 @@ share/applications/chromium-browser.desk
 %%DATADIR%%/resources/inspector/Images/responsiveDesign_2x.png
 %%DATADIR%%/resources/inspector/Images/searchNext.png
 %%DATADIR%%/resources/inspector/Images/searchPrev.png
+%%DATADIR%%/resources/inspector/Images/securityPropertyInfo.svg
 %%DATADIR%%/resources/inspector/Images/securityPropertyInsecure.svg
 %%DATADIR%%/resources/inspector/Images/securityPropertySecure.svg
+%%DATADIR%%/resources/inspector/Images/securityPropertyUnknown.svg
 %%DATADIR%%/resources/inspector/Images/securityPropertyWarning.svg
 %%DATADIR%%/resources/inspector/Images/securityStateInsecure.svg
 %%DATADIR%%/resources/inspector/Images/securityStateNeutral.svg



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601241349.u0ODnvt7071236>