BASELINE: Update Chromium to 47.0.2526.14

Also adding in sources needed for spellchecking.

Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 21 insertions, 6 deletions

diff --git a/chromium/media/media_options.gni b/chromium/media/media_options.gni
index cd7440a8db6..b6c63fb4e7f 100644
--- a/chromium/media/media_options.gni
+++ b/chromium/media/media_options.gni
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chromecast_build.gni")
+
 declare_args() {
   # Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
   # using dlopen. This helps with automated detection of ABI mismatches and
@@ -17,10 +19,14 @@ declare_args() {
   # decoding of VP9 and VP8A type content.
   media_use_libvpx = true
 
-  # Neither Android nor iOS use ffmpeg or libvpx.
+  # Enable libwebm for multiplexing video and audio for JS recording API.
+  media_use_libwebm = true
+
+  # Neither Android nor iOS use ffmpeg, libvpx nor libwebm.
   if (is_android || is_ios) {
     media_use_ffmpeg = false
     media_use_libvpx = false
+    media_use_libwebm = false
   }
 
   # Override to dynamically link the cras (ChromeOS audio) library.
@@ -32,18 +38,27 @@ declare_args() {
   # Enables runtime selection of ALSA library for audio.
   use_alsa = false
 
-  # TODO(GYP): How to handled the "embedded" use case?
-  # Original conditional: (OS=="linux" or OS=="freebsd" or OS=="solaris") and embedded!=1
-  if (is_posix && !is_android && !is_mac) {
+  # Alsa should be used on non-Android, non-Mac POSIX systems, and Chromecast
+  # builds for desktop Linux.
+  if (is_posix && !is_android && !is_mac &&
+      (!is_chromecast || target_cpu != "arm")) {
     use_alsa = true
     if (!use_cras) {
       use_pulseaudio = true
     }
   }
 
+  # Use low-memory buffers on non-Android builds of Chromecast.
+  use_low_memory_buffer = is_chromecast && !is_android
+
   # Enables the MPEG2-TS stream parser for use with Media Source. Disabled by
-  # default since it's not available on the normal Web Platform and costs money.
-  enable_mpeg2ts_stream_parser = false
+  # default (except on Chromecast) since it's not available on the normal Web
+  # Platform and costs money.
+  enable_mpeg2ts_stream_parser = is_chromecast
+
+  # Enable HEVC/H265 demuxing. Actual decoding must be provided by the
+  # platform. Enable by default for Chromecast.
+  enable_hevc_demuxing = is_chromecast
 
   # Experiment to enable mojo media application: http://crbug.com/431776
   # Valid options are: