Commit decf1dad authored by Michael Gilbert's avatar Michael Gilbert

refresh patches for chromium 56

parent 0ea36721
......@@ -2,7 +2,7 @@ description: disable loading external components
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -39,6 +39,9 @@ ExternalComponentLoader::~ExternalCompon
@@ -41,6 +41,9 @@ ExternalComponentLoader::~ExternalCompon
void ExternalComponentLoader::StartLoading() {
prefs_.reset(new base::DictionaryValue());
......
......@@ -2,7 +2,7 @@ description: disable the google api key warning when those aren't found
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -805,8 +805,6 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -804,8 +804,6 @@ void StartupBrowserCreatorImpl::AddInfoB
if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP &&
!command_line_.HasSwitch(switches::kTestType)) {
chrome::ShowBadFlagsPrompt(browser);
......
......@@ -3,7 +3,7 @@ author: Chad Miller <chad.miller@canonical.com>
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -82,7 +82,7 @@ void CookieSettings::GetCookieSettings(
@@ -83,7 +83,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
......
description: add ps printing capability
description: add postscript (ps) printing capability
author: Salvatore Bonaccorso
--- a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc
+++ b/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc
@@ -346,6 +346,7 @@ void PrintDialogGtk2::ShowDialog(
--- a/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
+++ b/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
@@ -348,6 +348,7 @@ void PrintDialogGtk2::ShowDialog(
// Since we only generate PDF, only show printers that support PDF.
// TODO(thestig) Add more capabilities to support?
GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
......
......@@ -5,14 +5,14 @@ Origin: upstream, https://chromium.googlesource.com/chromium/src.git/+/b9a43ab09
--- a/tools/gn/args.cc
+++ b/tools/gn/args.cc
@@ -268,6 +268,7 @@ void Args::SetSystemVarsLocked(Scope* de
@@ -266,6 +266,7 @@ void Args::SetSystemVarsLocked(Scope* de
static const char kX86[] = "x86";
static const char kX64[] = "x64";
static const char kArm[] = "arm";
+ static const char kArm64[] = "arm64";
static const char kMips[] = "mipsel";
const char* arch = nullptr;
static const char kS390X[] = "s390x";
static const char kPPC64[] = "ppc64";
@@ -280,6 +281,8 @@ void Args::SetSystemVarsLocked(Scope* de
arch = kX64;
else if (os_arch.substr(0, 3) == "arm")
......@@ -21,4 +21,4 @@ Origin: upstream, https://chromium.googlesource.com/chromium/src.git/+/b9a43ab09
+ arch = kArm64;
else if (os_arch == "mips")
arch = kMips;
else
else if (os_arch == "s390x")
......@@ -14,7 +14,7 @@ author: Michael Gilbert <mgilbert@debian.org>
#include "webrtc/base/task_queue_posix.h"
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -544,29 +544,9 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -543,29 +543,9 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_posix.cc',
'base/trace_event/heap_profiler_allocation_register_posix.cc',
])
......@@ -45,7 +45,7 @@ author: Michael Gilbert <mgilbert@debian.org>
ldflags.extend(['-pthread'])
static_libraries['xdg_user_dirs'] = {
@@ -590,13 +570,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -589,13 +569,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/platform_thread_linux.cc',
'base/trace_event/malloc_dump_provider.cc',
])
......@@ -59,7 +59,7 @@ author: Michael Gilbert <mgilbert@debian.org>
if is_mac:
static_libraries['base']['sources'].extend([
@@ -625,12 +598,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -624,12 +597,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/platform_thread_mac.mm',
'base/trace_event/malloc_dump_provider.cc',
])
......
......@@ -21,7 +21,7 @@ author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
#include <libavutil/imgutils.h>
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -1186,24 +1186,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
@@ -1198,24 +1198,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
// If no estimate is found, the stream entry will be kInfiniteDuration.
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
kInfiniteDuration);
......
......@@ -25,7 +25,7 @@ author: Michael Gilbert <mgilbert@debian.org>
namespace base {
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -467,7 +467,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -466,7 +466,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/third_party/dmg_fp/dtoa_wrapper.cc',
'base/third_party/dmg_fp/g_fmt.cc',
'base/third_party/icu/icu_utf.cc',
......@@ -33,7 +33,7 @@ author: Michael Gilbert <mgilbert@debian.org>
'base/threading/non_thread_safe_impl.cc',
'base/threading/post_task_and_reply_impl.cc',
'base/threading/sequenced_task_runner_handle.cc',
@@ -567,7 +566,7 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -566,7 +565,7 @@ def write_gn_ninja(path, root_gen_dir, o
}
if is_linux:
......@@ -44,7 +44,7 @@ author: Michael Gilbert <mgilbert@debian.org>
static_libraries['xdg_user_dirs'] = {
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -52,6 +52,9 @@ config("base_flags") {
@@ -49,6 +49,9 @@ config("base_flags") {
"-Wno-char-subscripts",
]
}
......@@ -54,7 +54,7 @@ author: Michael Gilbert <mgilbert@debian.org>
}
config("base_implementation") {
@@ -823,8 +826,6 @@ component("base") {
@@ -833,8 +836,6 @@ component("base") {
"third_party/dmg_fp/g_fmt.cc",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",
......
......@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/webrtc/modules/video_coding/BUILD.gn
+++ b/third_party/webrtc/modules/video_coding/BUILD.gn
@@ -88,7 +88,6 @@ rtc_static_library("video_coding") {
@@ -89,7 +89,6 @@ rtc_static_library("video_coding") {
":webrtc_h264",
":webrtc_i420",
":webrtc_vp8",
......@@ -13,32 +13,27 @@ author: Michael Gilbert <mgilbert@debian.org>
"../../system_wrappers",
--- a/third_party/webrtc/video/video_encoder.cc
+++ b/third_party/webrtc/video/video_encoder.cc
@@ -24,9 +24,6 @@ VideoEncoder* VideoEncoder::Create(Video
@@ -24,8 +24,6 @@ VideoEncoder* VideoEncoder::Create(Video
return H264Encoder::Create();
case kVp8:
return VP8Encoder::Create();
- case kVp9:
- RTC_DCHECK(VP9Encoder::IsSupported());
- return VP9Encoder::Create();
case kUnsupportedCodec:
RTC_NOTREACHED();
return nullptr;
--- a/third_party/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/third_party/webrtc/media/engine/webrtcvideoengine2.cc
@@ -161,10 +161,6 @@ bool CodecIsInternallySupported(const st
if (CodecNamesEq(codec_name, kVp8CodecName)) {
return true;
}
- if (CodecNamesEq(codec_name, kVp9CodecName)) {
- return webrtc::VP9Encoder::IsSupported() &&
- webrtc::VP9Decoder::IsSupported();
- }
if (CodecNamesEq(codec_name, kH264CodecName)) {
return webrtc::H264Encoder::IsSupported() &&
webrtc::H264Decoder::IsSupported();
@@ -40,8 +38,6 @@ bool VideoEncoder::IsSupportedSoftware(E
return H264Encoder::IsSupported();
case kVp8:
return true;
- case kVp9:
- return VP9Encoder::IsSupported();
case kUnsupportedCodec:
RTC_NOTREACHED();
return false;
--- a/third_party/webrtc/modules/video_coding/codec_database.cc
+++ b/third_party/webrtc/modules/video_coding/codec_database.cc
@@ -576,8 +576,6 @@ VCMGenericDecoder* VCMCodecDataBase::Cre
@@ -573,8 +573,6 @@ VCMGenericDecoder* VCMCodecDataBase::Cre
switch (type) {
case kVideoCodecVP8:
return new VCMGenericDecoder(VP8Decoder::Create());
......@@ -59,3 +54,17 @@ author: Michael Gilbert <mgilbert@debian.org>
case kUnsupportedCodec:
LOG(LS_ERROR) << "Creating NullVideoDecoder for unsupported codec.";
return new NullVideoDecoder();
--- a/third_party/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/third_party/webrtc/media/engine/webrtcvideoengine2.cc
@@ -433,11 +433,6 @@ std::vector<VideoCodec> DefaultVideoCode
AddCodecAndMaybeRtxCodec(
MakeVideoCodecWithDefaultFeedbackParams(kDefaultVp8PlType, kVp8CodecName),
&codecs);
- if (webrtc::VP9Encoder::IsSupported() && webrtc::VP9Decoder::IsSupported()) {
- AddCodecAndMaybeRtxCodec(MakeVideoCodecWithDefaultFeedbackParams(
- kDefaultVp9PlType, kVp9CodecName),
- &codecs);
- }
if (webrtc::H264Encoder::IsSupported() &&
webrtc::H264Decoder::IsSupported()) {
VideoCodec codec = MakeVideoCodecWithDefaultFeedbackParams(
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment