diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:19:40 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:01:50 +0000 |
commit | 51f6c2793adab2d864b3d2b360000ef8db1d3e92 (patch) | |
tree | 835b3b4446b012c75e80177cef9fbe6972cc7dbe /chromium/chromecast | |
parent | 6036726eb981b6c4b42047513b9d3f4ac865daac (diff) | |
download | qtwebengine-chromium-51f6c2793adab2d864b3d2b360000ef8db1d3e92.tar.gz |
BASELINE: Update Chromium to 71.0.3578.93
Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chromecast')
-rw-r--r-- | chromium/chromecast/BUILD.gn | 7 | ||||
-rw-r--r-- | chromium/chromecast/base/BUILD.gn | 5 | ||||
-rw-r--r-- | chromium/chromecast/browser/BUILD.gn | 11 | ||||
-rw-r--r-- | chromium/chromecast/browser/android/BUILD.gn | 7 | ||||
-rw-r--r-- | chromium/chromecast/chromecast.gni | 10 | ||||
-rw-r--r-- | chromium/chromecast/common/BUILD.gn | 2 | ||||
-rw-r--r-- | chromium/chromecast/device/bluetooth/le/BUILD.gn | 10 | ||||
-rw-r--r-- | chromium/chromecast/graphics/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/chromecast/media/audio/BUILD.gn | 13 | ||||
-rw-r--r-- | chromium/chromecast/media/audio/mixer_service/BUILD.gn | 54 | ||||
-rw-r--r-- | chromium/chromecast/media/base/BUILD.gn | 7 | ||||
-rw-r--r-- | chromium/chromecast/media/cma/BUILD.gn | 6 | ||||
-rw-r--r-- | chromium/chromecast/media/cma/backend/BUILD.gn | 20 | ||||
-rw-r--r-- | chromium/chromecast/media/cma/backend/android/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/chromecast/media/cma/backend/fuchsia/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/chromecast/net/BUILD.gn | 14 | ||||
-rw-r--r-- | chromium/chromecast/public/BUILD.gn | 2 | ||||
-rw-r--r-- | chromium/chromecast/renderer/media/BUILD.gn | 2 |
18 files changed, 162 insertions, 20 deletions
diff --git a/chromium/chromecast/BUILD.gn b/chromium/chromecast/BUILD.gn index 4b32fda2228..d1cb014dc62 100644 --- a/chromium/chromecast/BUILD.gn +++ b/chromium/chromecast/BUILD.gn @@ -122,6 +122,10 @@ cast_test_group("cast_tests") { cast_media_unittests_filter = { test_name = "cast_media_unittests" + # TODO(almasrymina) : Track this test as a separate bug + # (internal : b/115400220) + gtest_excludes = [ "AudioVideoPipelineDeviceTest.Mp4Playback" ] + # --test-launcher-jobs=1 => so internal code can bind to port args = [ "--test-launcher-jobs=1" ] } @@ -463,6 +467,7 @@ if (is_fuchsia) { fuchsia_package("cast_shell_pkg") { binary = ":cast_shell" package_name_override = "cast_shell" + sandbox_policy = "//build/config/fuchsia/testing_sandbox_policy" if (chromecast_branding != "public") { deps = [ @@ -586,6 +591,8 @@ buildflag_header("chromecast_buildflags") { "IS_SINGLE_VOLUME=$is_single_volume", "USE_ANDROID_USER_AGENT=$use_android_user_agent", "USE_CHROMECAST_CDMS=$use_chromecast_cdms", + "DEFAULT_COMMAND_LINE_FLAGS=\"$default_command_line_flags\"", + "DISABLE_SECURE_FLAC_OPUS_DECODING=$disable_secure_flac_and_opus_decoding", ] } diff --git a/chromium/chromecast/base/BUILD.gn b/chromium/chromecast/base/BUILD.gn index c32f61bc9df..5955fdea1ce 100644 --- a/chromium/chromecast/base/BUILD.gn +++ b/chromium/chromecast/base/BUILD.gn @@ -313,7 +313,6 @@ if (is_android) { "$java_src_dir/org/chromium/chromecast/base/BiFunction.java", "$java_src_dir/org/chromium/chromecast/base/BiPredicate.java", "$java_src_dir/org/chromium/chromecast/base/Both.java", - "$java_src_dir/org/chromium/chromecast/base/CircularBuffer.java", "$java_src_dir/org/chromium/chromecast/base/Controller.java", "$java_src_dir/org/chromium/chromecast/base/Consumer.java", "$java_src_dir/org/chromium/chromecast/base/Function.java", @@ -322,8 +321,10 @@ if (is_android) { "$java_src_dir/org/chromium/chromecast/base/Observer.java", "$java_src_dir/org/chromium/chromecast/base/Observers.java", "$java_src_dir/org/chromium/chromecast/base/Scope.java", + "$java_src_dir/org/chromium/chromecast/base/Scopes.java", "$java_src_dir/org/chromium/chromecast/base/Predicate.java", "$java_src_dir/org/chromium/chromecast/base/Subscription.java", + "$java_src_dir/org/chromium/chromecast/base/Sequencer.java", "$java_src_dir/org/chromium/chromecast/base/Supplier.java", "$java_src_dir/org/chromium/chromecast/base/Unit.java", @@ -358,7 +359,6 @@ if (is_android) { java_files = [ "$java_test_dir/org/chromium/chromecast/base/BothTest.java", "$java_test_dir/org/chromium/chromecast/base/ControllerTest.java", - "$java_test_dir/org/chromium/chromecast/base/CircularBufferTest.java", "$java_test_dir/org/chromium/chromecast/base/ItertoolsTest.java", "$java_test_dir/org/chromium/chromecast/base/ObservableAndTest.java", "$java_test_dir/org/chromium/chromecast/base/ObservableAndThenTest.java", @@ -368,6 +368,7 @@ if (is_android) { "$java_test_dir/org/chromium/chromecast/base/ObservableNotTest.java", "$java_test_dir/org/chromium/chromecast/base/ReactiveRecorderTest.java", "$java_test_dir/org/chromium/chromecast/base/ObserversTest.java", + "$java_test_dir/org/chromium/chromecast/base/SequencerTest.java", "$java_test_dir/org/chromium/chromecast/base/UnitTest.java", ] deps = [ diff --git a/chromium/chromecast/browser/BUILD.gn b/chromium/chromecast/browser/BUILD.gn index 3c7aade4b4e..665d5c64610 100644 --- a/chromium/chromecast/browser/BUILD.gn +++ b/chromium/chromecast/browser/BUILD.gn @@ -29,10 +29,10 @@ cast_source_set("browser") { "cast_browser_process.h", "cast_content_browser_client.cc", "cast_content_browser_client.h", + "cast_content_gesture_handler.cc", + "cast_content_gesture_handler.h", "cast_download_manager_delegate.cc", "cast_download_manager_delegate.h", - "cast_gesture_dispatcher.cc", - "cast_gesture_dispatcher.h", "cast_http_user_agent_settings.cc", "cast_http_user_agent_settings.h", "cast_media_blocker.cc", @@ -57,6 +57,8 @@ cast_source_set("browser") { "cast_web_view_default.h", "cast_web_view_factory.cc", "cast_web_view_factory.h", + "default_navigation_throttle.cc", + "default_navigation_throttle.h", "devtools/cast_devtools_manager_delegate.cc", "devtools/cast_devtools_manager_delegate.h", "devtools/remote_debugging_server.cc", @@ -298,8 +300,6 @@ cast_source_set("browser") { "cast_web_view_extension.h", "ui/aura/accessibility/automation_manager_aura.cc", "ui/aura/accessibility/automation_manager_aura.h", - "ui/aura/accessibility/ax_root_obj_wrapper.cc", - "ui/aura/accessibility/ax_root_obj_wrapper.h", "ui/aura/accessibility/ax_tree_source_aura.cc", "ui/aura/accessibility/ax_tree_source_aura.h", ] @@ -332,6 +332,7 @@ cast_source_set("browser") { # This target should only include interfaces which are required for unit tests. cast_source_set("public") { sources = [ + "cast_content_window.cc", "cast_content_window.h", "cast_web_view.cc", "cast_web_view.h", @@ -443,7 +444,7 @@ cast_source_set("test_support") { cast_source_set("browsertests") { testonly = true sources = [ - "cast_gesture_dispatcher_test.cc", + "cast_content_gesture_handler_test.cc", "cast_media_blocker_browsertest.cc", "renderer_prelauncher_test.cc", "test/cast_features_browsertest.cc", diff --git a/chromium/chromecast/browser/android/BUILD.gn b/chromium/chromecast/browser/android/BUILD.gn index 4f159b52910..345d20e48b2 100644 --- a/chromium/chromecast/browser/android/BUILD.gn +++ b/chromium/chromecast/browser/android/BUILD.gn @@ -91,7 +91,7 @@ android_library("reactive_android_java") { deps = [ "//base:base_java", "//chromecast/base:base_java", - "//third_party/android_tools:android_support_core_utils_java", + "//third_party/android_deps:android_support_core_utils_java", ] } @@ -108,6 +108,7 @@ android_library("cast_shell_java") { "$java_src_dir/org/chromium/chromecast/shell/CastCrashUploader.java", "$java_src_dir/org/chromium/chromecast/shell/CastCrashUploaderFactory.java", "$java_src_dir/org/chromium/chromecast/shell/CastMetricsHelper.java", + "$java_src_dir/org/chromium/chromecast/shell/CastSerialGenerator.java", "$java_src_dir/org/chromium/chromecast/shell/CastSysInfoAndroid.java", "$java_src_dir/org/chromium/chromecast/shell/CastWebContentsActivity.java", "$java_src_dir/org/chromium/chromecast/shell/CastWebContentsComponent.java", @@ -143,7 +144,7 @@ android_library("cast_shell_java") { "//net/android:net_java", # TODO(slan): We may need to pass this in as a parameter. - "//third_party/android_tools:android_support_core_utils_java", + "//third_party/android_deps:android_support_core_utils_java", "//ui/android:ui_java", ] @@ -185,7 +186,7 @@ junit_binary("cast_shell_junit_tests") { "//base:base_junit_test_support", "//chromecast/base:cast_base_test_utils_java", "//content/public/android:content_java", - "//third_party/android_tools:android_support_core_utils_java", + "//third_party/android_deps:android_support_core_utils_java", "//third_party/hamcrest:hamcrest_java", ] } diff --git a/chromium/chromecast/chromecast.gni b/chromium/chromecast/chromecast.gni index 75cf2fc4390..fef8c70163b 100644 --- a/chromium/chromecast/chromecast.gni +++ b/chromium/chromecast/chromecast.gni @@ -88,6 +88,16 @@ declare_args() { # versions of websites. # TODO(halliwell): consider making this default for all Cast hardware. use_android_user_agent = false + + # Contain default command line switches we want to set. + # The syntax: "test-flag-one=public,test-flag-two=true,test-flag-three=1,". + # This arg can be overridden but not supports += operator. + # TODO(ziyangch): make the parsing logic have ability to quote/escape characters. + default_command_line_flags = "" + + # Set to true to disable secure flac/opus support in EME, when using + # cast CMA media backend and supporting Widevine or Playready. + disable_secure_flac_and_opus_decoding = false } declare_args() { diff --git a/chromium/chromecast/common/BUILD.gn b/chromium/chromecast/common/BUILD.gn index b4faf3f24ff..dac6096cc84 100644 --- a/chromium/chromecast/common/BUILD.gn +++ b/chromium/chromecast/common/BUILD.gn @@ -34,8 +34,6 @@ cast_source_set("common") { "cast_extensions_client.h", "cast_redirect_manifest_handler.cc", "cast_redirect_manifest_handler.h", - "extensions_api/cast_aliases.cc", - "extensions_api/cast_aliases.h", "extensions_api/cast_api_permissions.cc", "extensions_api/cast_api_permissions.h", "extensions_api/cast_extension_messages.cc", diff --git a/chromium/chromecast/device/bluetooth/le/BUILD.gn b/chromium/chromecast/device/bluetooth/le/BUILD.gn index c0dd5594cd2..5c138aaa452 100644 --- a/chromium/chromecast/device/bluetooth/le/BUILD.gn +++ b/chromium/chromecast/device/bluetooth/le/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. import("//chromecast/chromecast.gni") +import("//testing/libfuzzer/fuzzer_test.gni") cast_source_set("le") { sources = [ @@ -94,3 +95,12 @@ cast_source_set("unittests") { "//testing/gtest", ] } + +fuzzer_test("le_scan_result_fuzzer") { + sources = [ + "le_scan_result_fuzzer.cc", + ] + deps = [ + ":le", + ] +} diff --git a/chromium/chromecast/graphics/BUILD.gn b/chromium/chromecast/graphics/BUILD.gn index 2a80cc9db0e..d241a63fd19 100644 --- a/chromium/chromecast/graphics/BUILD.gn +++ b/chromium/chromecast/graphics/BUILD.gn @@ -8,6 +8,7 @@ import("//testing/test.gni") cast_source_set("graphics") { sources = [ + "cast_touch_activity_observer.h", "cast_window_manager.h", "gestures/cast_gesture_handler.cc", "gestures/cast_gesture_handler.h", @@ -44,6 +45,8 @@ cast_source_set("graphics") { "accessibility/partial_magnification_controller.h", "cast_focus_client_aura.cc", "cast_focus_client_aura.h", + "cast_touch_event_gate.cc", + "cast_touch_event_gate.h", "cast_window_manager_aura.cc", "cast_window_manager_aura.h", "gestures/cast_system_gesture_dispatcher.cc", @@ -114,6 +117,7 @@ if (use_aura && !is_cast_audio_only) { "accessibility/accessibility_focus_ring_controller_unittest.cc", "accessibility/partial_magnification_controller_unittest.cc", "cast_focus_client_aura_test.cc", + "cast_touch_event_gate_test.cc", "cast_views_test.cc", "cast_window_manager_aura_test.cc", "gestures/cast_system_gesture_dispatcher_test.cc", diff --git a/chromium/chromecast/media/audio/BUILD.gn b/chromium/chromecast/media/audio/BUILD.gn index a6078c92f50..d19d4476496 100644 --- a/chromium/chromecast/media/audio/BUILD.gn +++ b/chromium/chromecast/media/audio/BUILD.gn @@ -48,3 +48,16 @@ cast_shared_library("libcast_external_audio_pipeline_1.0") { "//chromecast/public/media", ] } + +source_set("fake_external_audio_pipeline") { + sources = [ + "fake_external_audio_pipeline.cc", + "fake_external_audio_pipeline_support.h", + ] + + deps = [ + "//base", + "//chromecast/public", + "//chromecast/public/media", + ] +} diff --git a/chromium/chromecast/media/audio/mixer_service/BUILD.gn b/chromium/chromecast/media/audio/mixer_service/BUILD.gn new file mode 100644 index 00000000000..091225b4866 --- /dev/null +++ b/chromium/chromecast/media/audio/mixer_service/BUILD.gn @@ -0,0 +1,54 @@ +# Copyright 2018 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/buildflag_header.gni") +import("//chromecast/chromecast.gni") +import("//third_party/protobuf/proto_library.gni") + +proto_library("proto") { + proto_out_dir = "chromecast/media/audio/mixer_service" + sources = [ + "mixer_service.proto", + ] +} + +use_unix_sockets = is_linux +buildflag_header("buildflags") { + header = "mixer_service_buildflags.h" + + flags = [ "USE_UNIX_SOCKETS=$use_unix_sockets" ] +} + +cast_source_set("common") { + sources = [ + "constants.h", + "proto_helpers.cc", + "proto_helpers.h", + ] + + deps = [ + ":buildflags", + ":proto", + "//base", + "//chromecast/net:small_message_socket", + "//net", + ] +} + +cast_source_set("connection") { + sources = [ + "mixer_service_connection.cc", + "mixer_service_connection.h", + ] + + deps = [ + ":buildflags", + ":common", + ":proto", + "//base", + "//chromecast/base", + "//chromecast/net:small_message_socket", + "//net", + ] +} diff --git a/chromium/chromecast/media/base/BUILD.gn b/chromium/chromecast/media/base/BUILD.gn index bc5fe5bfd94..450a06d21cb 100644 --- a/chromium/chromecast/media/base/BUILD.gn +++ b/chromium/chromecast/media/base/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. import("//chromecast/chromecast.gni") +import("//third_party/widevine/cdm/widevine.gni") cast_source_set("key_systems") { sources = [ @@ -18,8 +19,12 @@ cast_source_set("key_systems") { "//base", "//chromecast/public/media", "//media", - "//third_party/widevine/cdm:headers", + "//third_party/widevine/cdm:buildflags", ] + + if (enable_widevine) { + deps += [ "//third_party/widevine/cdm:headers" ] + } } cast_source_set("base") { diff --git a/chromium/chromecast/media/cma/BUILD.gn b/chromium/chromecast/media/cma/BUILD.gn index d92c0748a28..427c96cf40d 100644 --- a/chromium/chromecast/media/cma/BUILD.gn +++ b/chromium/chromecast/media/cma/BUILD.gn @@ -36,13 +36,16 @@ cast_source_set("test_support") { "//base", "//chromecast/common/mojom", "//chromecast/media/cma/backend", - "//chromecast/media/cma/backend:null_video", "//chromecast/media/cma/base", "//media:test_support", "//testing/gmock", "//testing/gtest", "//ui/gfx/geometry", ] + + if (!enable_video_with_mixed_audio) { + deps += [ "//chromecast/media/cma/backend:null_video" ] + } } cast_source_set("unittests") { @@ -74,6 +77,7 @@ cast_source_set("unittests") { if (enable_video_with_mixed_audio) { defines = [ "ENABLE_VIDEO_WITH_MIXED_AUDIO" ] + libs = ["videodecoderformixer"] } data = [ diff --git a/chromium/chromecast/media/cma/backend/BUILD.gn b/chromium/chromecast/media/cma/backend/BUILD.gn index 50870c4fd82..35c73b53c52 100644 --- a/chromium/chromecast/media/cma/backend/BUILD.gn +++ b/chromium/chromecast/media/cma/backend/BUILD.gn @@ -176,6 +176,19 @@ cast_source_set("post_processor_factory") { ] } +cast_source_set("audio_resampler") { + sources = [ + "audio_resampler.cc", + "audio_resampler.h", + ] + + deps = [ + "//base", + "//chromecast/media/cma/base", + "//media", + ] +} + cast_source_set("for_mixer_audio") { sources = [ "audio_decoder_for_mixer.cc", @@ -193,6 +206,8 @@ cast_source_set("for_mixer_audio") { "media_pipeline_backend_for_mixer.h", "mixer_input.cc", "mixer_input.h", + "mixer_pipeline.cc", + "mixer_pipeline.h", "post_processing_pipeline.h", "post_processing_pipeline_impl.cc", "post_processing_pipeline_impl.h", @@ -208,6 +223,7 @@ cast_source_set("for_mixer_audio") { deps = [ ":audio_buildflags", ":audio_helpers", + ":audio_resampler", ":cast_audio_json", ":post_processor_factory", ":public", @@ -245,17 +261,21 @@ test("cast_audio_backend_unittests") { "mock_mixer_source.h", "mock_redirected_audio_output.cc", "mock_redirected_audio_output.h", + "stream_mixer_external_audio_pipeline_unittest.cc", "stream_mixer_unittest.cc", + "volume_map_unittest.cc", ] deps = [ ":audio_helpers", ":av_sync_dummy", + ":cast_audio_json", ":for_mixer_audio", ":null_video", ":public", "//base", "//base/test:run_all_unittests", + "//chromecast/media/audio:fake_external_audio_pipeline", "//chromecast/media/cma/backend/post_processors:unittests", "//chromecast/public", "//chromecast/public/media", diff --git a/chromium/chromecast/media/cma/backend/android/BUILD.gn b/chromium/chromecast/media/cma/backend/android/BUILD.gn index 584191b3ef2..96e8ead8f40 100644 --- a/chromium/chromecast/media/cma/backend/android/BUILD.gn +++ b/chromium/chromecast/media/cma/backend/android/BUILD.gn @@ -73,8 +73,8 @@ android_library("audio_track_java") { "//base:base_java", "//chromecast/base:base_java", "//chromecast/public:volume_control_enums_java", - "//third_party/android_tools:android_support_annotations_java", - "//third_party/android_tools:android_support_v13_java", + "//third_party/android_deps:android_support_annotations_java", + "//third_party/android_deps:android_support_v13_java", ] } diff --git a/chromium/chromecast/media/cma/backend/fuchsia/BUILD.gn b/chromium/chromecast/media/cma/backend/fuchsia/BUILD.gn index 5d2af30b73d..1e4d0646f7c 100644 --- a/chromium/chromecast/media/cma/backend/fuchsia/BUILD.gn +++ b/chromium/chromecast/media/cma/backend/fuchsia/BUILD.gn @@ -40,7 +40,7 @@ cast_source_set("cma_backend_support") { "//chromecast/public", "//chromecast/public/media", "//media", - "//third_party/fuchsia-sdk:media", + "//third_party/fuchsia-sdk/sdk:media", ] } @@ -56,6 +56,6 @@ cast_source_set("unit_tests") { ":cma_backend_support", "//base", "//testing/gtest", - "//third_party/fuchsia-sdk:media", + "//third_party/fuchsia-sdk/sdk:media", ] } diff --git a/chromium/chromecast/net/BUILD.gn b/chromium/chromecast/net/BUILD.gn index ed74944ae1b..ce7780b6a7e 100644 --- a/chromium/chromecast/net/BUILD.gn +++ b/chromium/chromecast/net/BUILD.gn @@ -37,6 +37,20 @@ cast_source_set("net") { ] } +cast_source_set("small_message_socket") { + sources = [ + "small_message_socket.cc", + "small_message_socket.h", + ] + public_deps = [ + "//net", + ] + + deps = [ + "//base", + ] +} + cast_source_set("test_support") { testonly = true diff --git a/chromium/chromecast/public/BUILD.gn b/chromium/chromecast/public/BUILD.gn index e839008853f..99730d04409 100644 --- a/chromium/chromecast/public/BUILD.gn +++ b/chromium/chromecast/public/BUILD.gn @@ -50,7 +50,7 @@ if (is_android) { android_library("volume_control_enums_java") { srcjar_deps = [ ":java_enums_volume_control" ] deps = [ - "//third_party/android_tools:android_support_annotations_java", + "//third_party/android_deps:android_support_annotations_java", ] } } diff --git a/chromium/chromecast/renderer/media/BUILD.gn b/chromium/chromecast/renderer/media/BUILD.gn index 799c41c645d..59f6477cf45 100644 --- a/chromium/chromecast/renderer/media/BUILD.gn +++ b/chromium/chromecast/renderer/media/BUILD.gn @@ -22,7 +22,7 @@ cast_source_set("media") { "//components/cdm/renderer", "//content/public/renderer", "//media", - "//third_party/widevine/cdm:headers", + "//third_party/widevine/cdm:buildflags", "//ui/gfx/geometry", ] } |