...
 
Commits (20)
This diff is collapsed.
out/Release/libwidevinecdmadapter.so usr/lib/chromium
......@@ -6,7 +6,6 @@ chrome/test/data/webui/i18n_process_css_test.html
third_party/ffmpeg/BUILD.gn
third_party/flac/BUILD.gn
third_party/harfbuzz-ng/BUILD.gn
base/third_party/libevent/BUILD.gn
build/secondary/third_party/libjpeg_turbo/BUILD.gn
third_party/libdrm/BUILD.gn
......@@ -20,3 +19,11 @@ third_party/snappy/BUILD.gn
third_party/yasm/yasm_assemble.gni
third_party/zlib/BUILD.gn
third_party/icu/BUILD.gn
third_party/opus/BUILD.gn
third_party/freetype/BUILD.gn
third_party/fontconfig/BUILD.gn
build/config/freetype/freetype.gni
third_party/yasm/run_yasm.py
tools/gn/base/numerics/safe_math_arm_impl.h
tools/gn/base/numerics/safe_conversions_arm_impl.h
......@@ -72,6 +72,7 @@ Build-Depends:
libhunspell-dev,
libharfbuzz-dev (>= 1.2.7),
libusb-1.0-0-dev,
libopenjp2-7-dev,
libmodpbase64-dev,
libgnome-keyring-dev,
libnss3-dev (>= 3.12.3),
......@@ -95,6 +96,7 @@ Depends:
x11-utils,
xdg-utils,
Recommends:
libgl1-mesa-dri,
fonts-liberation,
Suggests:
chromium-l10n,
......@@ -108,6 +110,10 @@ Conflicts:
libnettle4,
libsecret-1-0 (<< 0.18),
libgl1-mesa-swx11,
Breaks:
chromium-common (<< ${binary:Version}),
Replaces:
chromium-common (<< ${binary:Version}),
Description: web browser
Web browser that aims to build a safer, faster, and more stable internet
browsing experience.
......
description: Stretch binutils doesn't recognize LR on arm64
author: Riku Voipio
--- a/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+++ b/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
@@ -312,14 +312,14 @@ CAPTURECONTEXT_SYMBOL2:
stp x28, x29, [x0, #0x198]
// The original LR can't be recovered.
- str LR, [x0, #0x1a8]
+ str x30, [x0, #0x1a8]
// Use x1 as a scratch register.
mov x1, SP
str x1, [x0, #0x1b0] // context->uc_mcontext.sp
// The link register holds the return address for this function.
- str LR, [x0, #0x1b8] // context->uc_mcontext.pc
+ str x30, [x0, #0x1b8] // context->uc_mcontext.pc
// NZCV, pstate, and CPSR are synonyms.
mrs x1, NZCV
description: GCC ICE with optimized version
author: Riku Voipio
bug-debian: http://bugs.debian.org/901290
--- a/third_party/skia/third_party/skcms/skcms.gni
+++ b/third_party/skia/third_party/skcms/skcms.gni
@@ -3,6 +3,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+if ((current_cpu == "arm64" || current_cpu == "arm") && !is_clang) {
+ defines = [ "SKCMS_PORTABLE=1" ]
+}
+
skcms_sources = [
"skcms.cc",
"skcms.h",
description: build fix for armhf
author: Riku Voipio
--- a/third_party/skia/src/opts/SkRasterPipeline_opts.h
+++ b/third_party/skia/src/opts/SkRasterPipeline_opts.h
@@ -657,7 +657,7 @@ SI F approx_powf(F x, F y) {
}
SI F from_half(U16 h) {
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
return vcvt_f32_f16(h);
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
@@ -677,7 +677,7 @@ SI F from_half(U16 h) {
}
SI U16 to_half(F f) {
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
return vcvt_f16_f32(f);
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
......@@ -4,16 +4,8 @@ Author: Daniel Echeverry <epsilon77@gmail.com>
--- a/chrome/app/resources/manpage.1.in
+++ b/chrome/app/resources/manpage.1.in
@@ -1,5 +1,5 @@
-." This file is processed by chrome.gyp to generate manpages in the
-." build diretory.
+.\" This file is processed by chrome.gyp to generate manpages in the
+.\" build diretory.
.TH @@FILENAME@@ 1 "" "" "USER COMMANDS"
.SH NAME
@@ -20,6 +20,23 @@ This manpage only describes invocation,
@@NAME@@ has hundreds of undocumented command-line flags that are added
@@MENUNAME@@ has hundreds of undocumented command-line flags that are added
and removed at the whim of the developers. Here, we document relatively
stable flags.
+
......@@ -36,7 +28,7 @@ Author: Daniel Echeverry <epsilon77@gmail.com>
.TP
\fB\-\-user\-data\-dir\fR=\fIDIR\fR
Specifies the directory that user data (your "profile") is kept in.
@@ -110,6 +127,7 @@ as
@@ -114,6 +131,7 @@ as
See the GTK documentation for more:
.IP
<http://library.gnome.org/devel/gtk/stable/gtk-running.html>
......
......@@ -9,7 +9,7 @@ author: Michael Gilbert <mgilbert@debian.org>
base::FilePath MasterPrefsPath() {
- // The standard location of the master prefs is next to the chrome binary.
- base::FilePath master_prefs;
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
- if (!base::PathService::Get(base::DIR_EXE, &master_prefs))
- return base::FilePath();
- return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
+ return base::FilePath("/usr/share/chromium/master_preferences");
......
description: disable dependency on chrome/android
author: Michael Gilbert <mgilbert@debian.org>
--- a/device/vr/buildflags/buildflags.gni
+++ b/device/vr/buildflags/buildflags.gni
@@ -5,7 +5,6 @@
import("//build/config/chrome_build.gni")
import("//build/config/chromecast_build.gni")
import("//build/config/gclient_args.gni")
-import("//chrome/android/channel.gni")
declare_args() {
# TODO(733935): Enable for other Android architectures too. Currently we only
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -349,7 +349,7 @@ group("gn_all") {
# seems currently broken for this platform at the moment, and the
# corresponding code build and works on Linux unmodified.
# See instructions in the corresponding BUILD.gn.
- if (is_linux) {
+ if (is_android) {
deps +=
[ "//third_party/android_crazy_linker:android_crazy_linker_zip_fuzzer" ]
}
author: Michael Gilbert <mgilbert@debian.org>
description: disable loading external components
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -41,21 +41,6 @@ ExternalComponentLoader::~ExternalCompon
void ExternalComponentLoader::StartLoading() {
prefs_.reset(new base::DictionaryValue());
-#if defined(GOOGLE_CHROME_BUILD)
- AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId);
-#endif // defined(GOOGLE_CHROME_BUILD)
-
- if (HotwordServiceFactory::IsHotwordAllowed(profile_))
- AddExternalExtension(extension_misc::kHotwordSharedModuleId);
-
-#if defined(OS_CHROMEOS)
- {
- base::CommandLine* const command_line =
- base::CommandLine::ForCurrentProcess();
- if (!command_line->HasSwitch(chromeos::switches::kDisableNewZIPUnpacker))
- AddExternalExtension(extension_misc::kZIPUnpackerExtensionId);
- }
-#endif
#if defined(ENABLE_MEDIA_ROUTER)
if (media_router::MediaRouterEnabled(profile_) &&
@@ -64,12 +49,6 @@ void ExternalComponentLoader::StartLoadi
}
#endif // defined(ENABLE_MEDIA_ROUTER)
-#if BUILDFLAG(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
- std::string google_now_extension_id;
- if (GetGoogleNowExtensionId(&google_now_extension_id))
- AddExternalExtension(google_now_extension_id);
-#endif
-
LoadFinished();
}
description: fuzzers aren't built, so don't depend on them
author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -696,8 +696,7 @@ group("gn_all") {
}
}
- if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) ||
- (use_libfuzzer && is_mac)) {
+ if (false) {
deps += [
"//testing/libfuzzer/fuzzers",
"//testing/libfuzzer/tests:libfuzzer_tests",
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -2135,9 +2135,3 @@ test("content_perftests") {
deps += [ "//testing/android/native_test:native_test_native_code" ]
}
}
-
-group("fuzzers") {
- deps = [
- "//content/test/fuzzer",
- ]
-}
--- a/v8/tools/BUILD.gn
+++ b/v8/tools/BUILD.gn
@@ -11,7 +11,6 @@ group("gn_all") {
data_deps = [
":v8_check_static_initializers",
"gcmole:v8_run_gcmole",
- "jsfunfuzz:v8_jsfunfuzz",
]
}
description: disable the google api key warning when those aren't found
author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -838,8 +838,6 @@ void StartupBrowserCreatorImpl::AddInfoB
!command_line_.HasSwitch(switches::kTestType) &&
!command_line_.HasSwitch(switches::kEnableAutomation)) {
chrome::ShowBadFlagsPrompt(browser);
- GoogleApiKeysInfoBarDelegate::Create(InfoBarService::FromWebContents(
- browser->tab_strip_model()->GetActiveWebContents()));
ObsoleteSystemInfoBarDelegate::Create(InfoBarService::FromWebContents(
browser->tab_strip_model()->GetActiveWebContents()));
@@ -919,10 +919,6 @@ void StartupBrowserCreatorImpl::AddInfoB
chrome::ShowBadFlagsPrompt(web_contents);
InfoBarService* infobar_service =
InfoBarService::FromWebContents(web_contents);
- if (!google_apis::HasAPIKeyConfigured() ||
- !google_apis::HasOAuthClientConfigured()) {
- GoogleApiKeysInfoBarDelegate::Create(infobar_service);
- }
if (ObsoleteSystem::IsObsoleteNowOrSoon()) {
PrefService* local_state = g_browser_process->local_state();
if (!local_state ||
description: disable support for openh264, will be added later
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/webrtc/webrtc.gni
+++ b/third_party/webrtc/webrtc.gni
@@ -125,7 +125,7 @@ declare_args() {
# H.264, compilation succeeds but |H264DecoderImpl| fails to initialize.
# CHECK THE OPENH264, FFMPEG AND H.264 LICENSES/PATENTS BEFORE BUILDING.
# http://www.openh264.org, https://www.ffmpeg.org/
- rtc_use_h264 = proprietary_codecs && !is_android && !is_ios
+ rtc_use_h264 = false
# By default, use normal platform audio support or dummy audio, but don't
# use file-based audio playout and record.
description: disable dependencies on third_party/perfetto
author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -642,7 +642,7 @@ group("gn_all") {
}
}
- if (is_mac || is_linux || is_android) {
+ if (false) {
deps += [ "//third_party/perfetto:all" ]
}
--- a/services/tracing/BUILD.gn
+++ b/services/tracing/BUILD.gn
@@ -28,7 +28,7 @@ source_set("lib") {
"//services/tracing/public/cpp",
]
- if (is_mac || is_linux || is_android || is_win) {
+ if (false) {
sources += [
"perfetto/json_trace_exporter.cc",
"perfetto/json_trace_exporter.h",
@@ -76,7 +76,7 @@ source_set("tests") {
"test_util.h",
]
- if (is_mac || is_linux || is_android) {
+ if (false) {
sources += [ "public/cpp/perfetto/trace_event_data_source_unittest.cc" ]
}
@@ -97,7 +97,7 @@ source_set("tests") {
"//testing/gtest",
]
- if (is_mac || is_linux || is_android) {
+ if (false) {
sources += [
"perfetto/json_trace_exporter_unittest.cc",
"perfetto/perfetto_integration_unittest.cc",
--- a/services/tracing/tracing_service.h
+++ b/services/tracing/tracing_service.h
@@ -17,8 +17,7 @@
#include "services/tracing/agent_registry.h"
#include "services/tracing/coordinator.h"
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
- defined(OS_WIN)
+#if 0
#define PERFETTO_SERVICE_AVAILABLE
#endif
--- a/services/tracing/public/cpp/BUILD.gn
+++ b/services/tracing/public/cpp/BUILD.gn
@@ -22,7 +22,7 @@ component("cpp") {
"//services/tracing/public/mojom",
]
- if (is_mac || is_linux || is_android || is_win) {
+ if (false) {
sources += [
"perfetto/producer_client.cc",
"perfetto/producer_client.h",
--- a/services/tracing/public/cpp/trace_event_agent.cc
+++ b/services/tracing/public/cpp/trace_event_agent.cc
@@ -22,8 +22,7 @@
#include "services/tracing/public/cpp/tracing_features.h"
#include "services/tracing/public/mojom/constants.mojom.h"
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
- defined(OS_WIN)
+#if 0
#define PERFETTO_AVAILABLE
#include "services/tracing/public/cpp/perfetto/producer_client.h"
#endif
author: Michael Gilbert <mgilbert@debian.org>
description: disable the ad promo system by default
bug-debian: http://bugs.debian.org/634101
--- a/chrome/browser/ui/app_list/app_list_service.cc
+++ b/chrome/browser/ui/app_list/app_list_service.cc
@@ -145,7 +145,7 @@ void AppListService::RegisterPrefs(PrefR
// Identifies whether we should show the app launcher promo or not. This
// becomes false when the user dismisses the promo.
- registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, true);
+ registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false);
}
// static
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -421,7 +421,7 @@ group("gn_all") {
]
}
- if ((is_win || is_mac || is_linux || is_chromeos) &&
+ if (false &&
(target_cpu == "x86" || target_cpu == "x64")) {
deps += [ "//third_party/swiftshader" ]
}
......@@ -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
@@ -79,7 +79,7 @@ void CookieSettings::GetCookieSettings(
@@ -50,7 +50,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
......
description: some libraries fail to link when --as-needed is set
author: Michael Gilbert <mgilbert@debian.org>
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -385,7 +385,7 @@ config("compiler") {
if (!using_sanitizer) {
ldflags += [
"-Wl,-z,defs",
- "-Wl,--as-needed",
+ "-Wl,--no-as-needed",
]
}
}
description: set chromedriver version as undefined
--- a/chrome/test/chromedriver/embed_version_in_cpp.py
+++ b/chrome/test/chromedriver/embed_version_in_cpp.py
@@ -26,7 +26,7 @@ def main():
options, _ = parser.parse_args()
version = open(options.version_file, 'r').read().strip()
- revision = lastchange.FetchVersionInfo(None).revision
+ revision = "undefined"
if revision:
match = re.match('([0-9a-fA-F]+)(-refs/heads/master@{#(\d+)})?', revision)
description: fix inverted check
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/crc32c/src/include/crc32c/crc32c.h
+++ b/third_party/crc32c/src/include/crc32c/crc32c.h
@@ -37,7 +37,7 @@ inline uint32_t Crc32c(const std::string
#if __has_include(<string_view>)
// Visual Studio provides a <string_view> header even in C++11 mode. When
// included, the header issues an #error. (C1189)
-#if !defined(_MSC_VER) || __cplusplus >= 201703L
+#if !defined(_MSC_VER) && __cplusplus >= 201703L
#include <string_view>
// Comptues the CRC32C of the bytes in the string_view.
description: dma-buf.h is not provided by linux-libc-dev until version 4.11 in debian
author: Michael Gilbert <mgilbert@debian.org>
--- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc
+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc
@@ -17,7 +17,7 @@
#include "base/strings/stringprintf.h"
#include "base/trace_event/trace_event.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
#include <linux/types.h>
struct local_dma_buf_sync {
description: arraysize marco fails for zero length array, add one character
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/blink/renderer/platform/text/character_property_data_generator.h
+++ b/third_party/blink/renderer/platform/text/character_property_data_generator.h
@@ -244,10 +244,10 @@ static const UChar32 kIsHangulRanges[] =
0xD7B0, 0xD7FF,
// Halfwidth Hangul Jamo
// https://www.unicode.org/charts/nameslist/c_FF00.html
- 0xFFA0, 0xFFDC,
+ 0xFFA0, 0xFFDB,
};
-static const UChar32 kIsHangulArray[] = {};
+static const UChar32 kIsHangulArray[] = {0xFFDC};
} // namespace blink
......@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/781940
--- a/gpu/ipc/service/gpu_watchdog_thread.cc
+++ b/gpu/ipc/service/gpu_watchdog_thread.cc
@@ -41,7 +41,7 @@ const int kGpuTimeout = 30000;
@@ -42,7 +42,7 @@ const int kGpuTimeout = 30000;
// infected machines.
const int kGpuTimeout = 15000;
#else
......
description: better integration with gtk3 themes
origin: https://bugs.archlinux.org/task/47682
--- a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc
+++ b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc
@@ -138,6 +138,11 @@ SkColor GetBGColor(GtkWidget* widget, Wi
gtk_widget_get_style_context(widget), stateMap[state], &color);
G_GNUC_END_IGNORE_DEPRECATIONS
+ if (color.alpha == 0.0)
+ gtk_style_context_get_background_color(
+ gtk_widget_get_style_context(gtk_widget_get_toplevel(widget)),
+ stateMap[state], &color);
+
// Hack for default color
if (color.alpha == 0.0)
color = {1, 1, 1, 1};
@@ -507,8 +512,11 @@ GtkWidget* NativeThemeGtk2::GetEntry() c
GtkWidget* NativeThemeGtk2::GetLabel() const {
static GtkWidget* fake_label = NULL;
- if (!fake_label)
+ if (!fake_label) {
fake_label = gtk_label_new("");
+ gtk_style_context_add_class(
+ gtk_widget_get_style_context(fake_label), "gtkstyle-fallback");
+ }
return fake_label;
}
description: use inspector_protocol from top level third_party dir
author: Michael Gilbert <mgilbert@debian.org>
--- a/v8/src/inspector/BUILD.gn
+++ b/v8/src/inspector/BUILD.gn
@@ -4,7 +4,7 @@
import("../../gni/v8.gni")
-_inspector_protocol = v8_path_prefix + "/third_party/inspector_protocol"
+_inspector_protocol = "../../../third_party/inspector_protocol"
import("$_inspector_protocol/inspector_protocol.gni")
_protocol_generated = [
@@ -30,7 +30,7 @@ _protocol_generated = [
action("protocol_compatibility") {
visibility = [ ":*" ] # Only targets in this file can depend on this.
- script = "$_inspector_protocol/CheckProtocolCompatibility.py"
+ script = "$_inspector_protocol/check_protocol_compatibility.py"
inputs = [
"js_protocol.json",
]
description: fix mojo layout test build error
author: Michael Gilbert <mgilbert@debian.org>
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -112,8 +112,6 @@ static_library("content_shell_lib") {
"browser/layout_test/layout_test_url_request_context_getter.h",
"browser/layout_test/leak_detector.cc",
"browser/layout_test/leak_detector.h",
- "browser/layout_test/mojo_layout_test_helper.cc",
- "browser/layout_test/mojo_layout_test_helper.h",
"browser/layout_test/secondary_test_window_observer.cc",
"browser/layout_test/secondary_test_window_observer.h",
"browser/layout_test/test_info_extractor.cc",
@@ -264,9 +262,7 @@ static_library("content_shell_lib") {
"//content/public/common",
"//content/public/common:service_names",
"//content/shell/test_runner:test_runner",
- "//content/test:content_test_mojo_bindings",
"//content/test:layouttest_support",
- "//content/test:mojo_layouttest_bindings",
"//content/test:test_support",
"//device/bluetooth",
"//device/bluetooth:fake_bluetooth",
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
@@ -21,7 +21,6 @@
#include "content/shell/browser/layout_test/layout_test_browser_context.h"
#include "content/shell/browser/layout_test/layout_test_browser_main_parts.h"
#include "content/shell/browser/layout_test/layout_test_message_filter.h"
-#include "content/shell/browser/layout_test/mojo_layout_test_helper.h"
#include "content/shell/browser/shell_browser_context.h"
#include "content/shell/common/layout_test/layout_test_switches.h"
#include "content/shell/common/shell_messages.h"
@@ -39,11 +38,6 @@ namespace {
LayoutTestContentBrowserClient* g_layout_test_browser_client;
-void BindLayoutTestHelper(mojom::MojoLayoutTestHelperRequest request,
- RenderFrameHost* render_frame_host) {
- MojoLayoutTestHelper::Create(std::move(request));
-}
-
class WebPackageInternalsImpl : public blink::test::mojom::WebPackageInternals {
public:
explicit WebPackageInternalsImpl(WebPackageContext* web_package_context)
@@ -177,7 +171,6 @@ void LayoutTestContentBrowserClient::Exp
&WebPackageInternalsImpl::Create,
base::Unretained(
render_process_host->GetStoragePartition()->GetWebPackageContext())));
- registry->AddInterface(base::BindRepeating(&MojoLayoutTestHelper::Create));
registry->AddInterface(
base::BindRepeating(&LayoutTestContentBrowserClient::BindClipboardHost,
base::Unretained(this)),
@@ -286,7 +279,6 @@ bool LayoutTestContentBrowserClient::Can
void LayoutTestContentBrowserClient::ExposeInterfacesToFrame(
service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>*
registry) {
- registry->AddInterface(base::Bind(&BindLayoutTestHelper));
}
scoped_refptr<LoginDelegate>
--- a/chromecast/common/mojom/typemaps.gni
+++ b/chromecast/common/mojom/typemaps.gni
@@ -2,4 +2,4 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-typemaps = [ "//chromecast/common/mojom/multiroom.typemap" ]
+typemaps = [ ]
description: add missing variable declaration
author: Michael Gilbert <mgilbert@debian.org>
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -75,6 +75,8 @@ declare_args() {
msvs_xtree_patched = false
}
+ optimize_for_size = true
+
# Enable fatal linker warnings. Building Chromium with certain versions
# of binutils can cause linker warning.
# See: https://bugs.chromium.org/p/chromium/issues/detail?id=457359
description: upstream tries to use a unique_ptr that has already been moved
author: Michael Gilbert <mgilbert@debian.org>
--- a/services/resource_coordinator/coordination_unit/coordination_unit_base.cc
+++ b/services/resource_coordinator/coordination_unit/coordination_unit_base.cc
@@ -81,7 +81,8 @@ void CoordinationUnitBase::SetProperty(m
// static
CoordinationUnitBase* CoordinationUnitBase::PassOwnershipToGraph(
std::unique_ptr<CoordinationUnitBase> new_cu) {
- return new_cu->graph()->AddNewCoordinationUnit(std::move(new_cu));
+ CoordinationUnitGraph* graph = new_cu->graph();
+ return graph->AddNewCoordinationUnit(std::move(new_cu));
}
} // namespace resource_coordinator
......@@ -3,7 +3,7 @@ author: Salvatore Bonaccorso
--- a/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
+++ b/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
@@ -347,6 +347,7 @@ void PrintDialogGtk2::ShowDialog(
@@ -350,6 +350,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>(
......
description: size_t is not in scope by default in gcc 6
author: Michael Gilbert <mgilbert@debian.org>
--- a/media/base/subsample_entry.h
+++ b/media/base/subsample_entry.h
@@ -36,7 +36,7 @@ struct SubsampleEntry {
// does not match |input_size|.
MEDIA_EXPORT bool VerifySubsamplesMatchSize(
const std::vector<SubsampleEntry>& subsamples,
- size_t input_size);
+ std::size_t input_size);
} // namespace media
description: indicate that widevine continues to be supported on linux
author: Gregory M. Turner
origin: https://gitweb.gentoo.org/repo/gentoo.git/commit/www-client/chromium/files?id=09b804516320eee06930303870cd68008aac8a8a
--- a/third_party/widevine/cdm/BUILD.gn
+++ b/third_party/widevine/cdm/BUILD.gn
@@ -11,7 +11,7 @@ import("//third_party/widevine/cdm/widev
# Internal Cast builds set enable_widevine=true to bring in Widevine support.
# TODO(xhwang): Support component updated CDM on other platforms and remove this
# assert.
-assert(!enable_widevine || is_win || is_mac || is_chromecast,
+assert(!enable_widevine || is_win || is_mac || is_chromecast || is_linux,
"Component updated CDM only supported on Windows and Mac for now.")
widevine_arch = current_cpu
description: fix errors in gn's bootstrapping script
author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -451,7 +451,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/memory/ref_counted_memory.cc',
'base/memory/singleton.cc',
'base/memory/shared_memory_handle.cc',
- 'base/memory/shared_memory_tracker.cc',
'base/memory/weak_ptr.cc',
'base/message_loop/incoming_task_queue.cc',
'base/message_loop/message_loop.cc',
@@ -460,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/message_loop/message_pump_default.cc',
'base/metrics/bucket_ranges.cc',
'base/metrics/field_trial.cc',
+ 'base/metrics/field_trial_params.cc',
'base/metrics/field_trial_param_associator.cc',
'base/metrics/histogram.cc',
'base/metrics/histogram_base.cc',
@@ -510,6 +510,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/task_scheduler/scheduler_lock_impl.cc',
'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
'base/task_scheduler/scheduler_worker.cc',
+ 'base/task_scheduler/scheduler_worker_pool.cc',
'base/task_scheduler/scheduler_worker_pool_impl.cc',
'base/task_scheduler/scheduler_worker_pool_params.cc',
'base/task_scheduler/scheduler_worker_stack.cc',
@@ -529,6 +530,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/sequence_local_storage_map.cc',
'base/threading/sequenced_task_runner_handle.cc',
'base/threading/sequenced_worker_pool.cc',
+ 'base/threading/scoped_blocking_call.cc',
'base/threading/simple_thread.cc',
'base/threading/thread.cc',
'base/threading/thread_checker_impl.cc',
@@ -580,7 +582,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/tracked_objects.cc',
'base/tracking_info.cc',
'base/unguessable_token.cc',
- 'base/value_iterators.cc',
'base/values.cc',
'base/value_iterators.cc',
'base/vlog.cc',
......@@ -27,7 +27,7 @@ author: Michael Gilbert <mgilbert@debian.org>
toolchain_args = {
current_cpu = "arm"
current_os = "linux"
@@ -95,6 +105,10 @@ gcc_toolchain("x86") {
@@ -103,6 +113,10 @@ gcc_toolchain("x86") {
# Output linker map files for binary size analysis.
enable_linker_map = true
......@@ -38,7 +38,7 @@ author: Michael Gilbert <mgilbert@debian.org>
toolchain_args = {
current_cpu = "x86"
current_os = "linux"
@@ -140,6 +154,10 @@ gcc_toolchain("x64") {
@@ -156,6 +170,10 @@ gcc_toolchain("x64") {
# Output linker map files for binary size analysis.
enable_linker_map = true
......
description: avoid chromium's embedded C++ library when bootstrapping gn
author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/build/gen.py
+++ b/tools/gn/build/gen.py
@@ -369,7 +369,6 @@ def WriteGNNinja(path, platform, host, o
cflags.append('--sysroot=' + linux_sysroot)
ldflags.append('--sysroot=' + linux_sysroot)
ldflags.extend([
- '-static-libstdc++',
'-Wl,--as-needed',
])
libs.extend([
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -83,14 +83,6 @@ def main(argv):
['ninja', '-C', gn_build_dir, 'gn', '-w', 'dupbuild=err'])
shutil.copy2(os.path.join(gn_build_dir, 'gn'), gn_path)
- gn_gen_args = options.gn_gen_args or ''
- if not options.debug:
- gn_gen_args += ' is_debug=false'
- subprocess.check_call([
- gn_path, 'gen', out_dir,
- '--args=%s' % gn_gen_args, "--root=" + SRC_ROOT
- ])
-
if __name__ == '__main__':
sys.exit(main(sys.argv[1:]))
......@@ -3,20 +3,26 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -102,6 +102,7 @@ def main(argv):
parser.add_option('--gn-gen-args', help='Args to pass to gn gen --args')
parser.add_option('-v', '--verbose', action='store_true',
help='Log more details')
@@ -51,6 +51,7 @@ def main(argv):
action='store_true',
help='Download and build with the Debian sysroot.')
parser.add_option('-v', '--verbose', help='ignored')
+ parser.add_option('-j', '--jobs', help='Number of jobs')
options, args = parser.parse_args(argv)
if args:
@@ -199,6 +200,8 @@ def build_gn_with_ninja_manually(tempdir
cmd = ['ninja', '-C', tempdir]
if options.verbose:
cmd.append('-v')
parser.error('Unrecognized command line arguments: %s.' % ', '.join(args))
@@ -79,8 +80,12 @@ def main(argv):
shutil.copy2(
os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir)
- subprocess.check_call(
- ['ninja', '-C', gn_build_dir, 'gn', '-w', 'dupbuild=err'])
+ if options.jobs:
+ cmd.append('-j'+str(options.jobs))
+ subprocess.check_call(
+ ['ninja', '-C', gn_build_dir, 'gn', '-w', 'dupbuild=err', '-j'+str(options.jobs)])
+ else:
+ subprocess.check_call(
+ ['ninja', '-C', gn_build_dir, 'gn', '-w', 'dupbuild=err'])
shutil.copy2(os.path.join(gn_build_dir, 'gn'), gn_path)
if is_win:
cmd.append('gn.exe')
manpage.patch
master-preferences.patch
debianization/manpage.patch
debianization/master-preferences.patch
gn/libcxx.patch
gn/parallel.patch
gn/buildflags.patch
disable/promo.patch
disable/google-api-warning.patch
disable/third-party-cookies.patch
disable/external-components.patch
arm/skia.patch
arm/crashpad.patch
arm/gcc_skcms_ice.patch
fixes/dma.patch
fixes/mojo.patch
fixes/sizet.patch
fixes/widevine.patch
fixes/optimize.patch
fixes/ps-print.patch
fixes/as-needed.patch
fixes/inspector.patch
fixes/gpu-timeout.patch
fixes/empty-array.patch
fixes/ownership-error.patch
fixes/widevine-revision.patch
fixes/chromedriver-revision.patch
system/icu.patch
disable/android.patch
disable/fuzzers.patch
disable/openh264.patch
disable/perfetto.patch
disable/swiftshader.patch
disable/google-api-warning.patch
disable/third-party-cookies.patch
system/vpx16.patch
system/vpx.patch
system/icu.patch
system/jpeg.patch
system/nspr.patch
system/zlib.patch
system/event.patch
system/libxml.patch
system/libdrm.patch
system/ffmpeg.patch
system/ffmpeg34.patch
system/fontconfig.patch
system/openjpeg.patch
system/openjpeg21.patch
description: class definitions were defined outside of namespace when using gtk2
author: Michael Gilbert <mgilbert@debian.org>
--- a/ui/accessibility/platform/atk_util_auralinux_gtk2.cc
+++ b/ui/accessibility/platform/atk_util_auralinux_gtk2.cc
@@ -56,6 +56,8 @@ void FinishAccessibilityInitOnMainThread
init_func();
}
+namespace ui {
+
bool AtkUtilAuraLinux::PlatformShouldEnableAccessibility() {
std::unique_ptr<base::Environment> env(base::Environment::Create());
std::string gtk_modules;
@@ -78,3 +80,5 @@ void AtkUtilAuraLinux::PlatformInitializ
base::Bind(&GetAccessibilityModuleInitFunc),
base::Bind(&FinishAccessibilityInitOnMainThread));
}
+
+}
description: build using system libevent
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/webrtc/base/task_queue_libevent.cc
+++ b/third_party/webrtc/base/task_queue_libevent.cc
@@ -15,7 +15,7 @@
#include <string.h>
--- a/third_party/webrtc/rtc_base/task_queue_libevent.cc
+++ b/third_party/webrtc/rtc_base/task_queue_libevent.cc
@@ -16,7 +16,7 @@
#include <unistd.h>
#include <list>
-#include "base/third_party/libevent/event.h"
+#include <event.h>
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/task_queue_posix.h"
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -578,29 +578,9 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_posix.cc',
'base/trace_event/heap_profiler_allocation_register_posix.cc',
])
- static_libraries['libevent'] = {
- 'sources': [
- 'base/third_party/libevent/buffer.c',
- 'base/third_party/libevent/evbuffer.c',
- 'base/third_party/libevent/evdns.c',
- 'base/third_party/libevent/event.c',
- 'base/third_party/libevent/event_tagging.c',
- 'base/third_party/libevent/evrpc.c',
- 'base/third_party/libevent/evutil.c',
- 'base/third_party/libevent/http.c',
- 'base/third_party/libevent/log.c',
- 'base/third_party/libevent/poll.c',
- 'base/third_party/libevent/select.c',
- 'base/third_party/libevent/signal.c',
- 'base/third_party/libevent/strlcpy.c',
- ],
- 'tool': 'cc',
- 'include_dirs': [],
- 'cflags': cflags + ['-DHAVE_CONFIG_H'],
- }
if is_linux:
- libs.extend(['-lrt', '-latomic', '-lnspr4'])
+ libs.extend(['-lrt', '-latomic', '-lnspr4', '-levent'])
ldflags.extend(['-pthread'])
static_libraries['xdg_user_dirs'] = {
@@ -627,13 +607,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/platform_thread_linux.cc',
'base/trace_event/malloc_dump_provider.cc',
])
- static_libraries['libevent']['include_dirs'].extend([
- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'linux')
- ])
- static_libraries['libevent']['sources'].extend([
- 'base/third_party/libevent/epoll.c',
- ])
-
if is_mac:
static_libraries['base']['sources'].extend([
@@ -663,12 +636,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/platform_thread_mac.mm',
'base/trace_event/malloc_dump_provider.cc',
])
- static_libraries['libevent']['include_dirs'].extend([
- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'mac')
- ])
- static_libraries['libevent']['sources'].extend([
- 'base/third_party/libevent/kqueue.c',
- ])
libs.extend([
'-framework', 'AppKit',
#include "rtc_base/checks.h"
#include "rtc_base/criticalsection.h"
#include "rtc_base/logging.h"
--- a/base/message_loop/message_pump_libevent.cc
+++ b/base/message_loop/message_pump_libevent.cc
@@ -14,7 +14,7 @@
......@@ -83,3 +23,13 @@ author: Michael Gilbert <mgilbert@debian.org>
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
--- a/tools/gn/build/gen.py
+++ b/tools/gn/build/gen.py
@@ -377,6 +377,7 @@ def WriteGNNinja(path, platform, host, o
'-lpthread',
# Additional system libraries that are used.
'-lnspr4',
+ '-levent',
])
elif platform.is_darwin():
min_mac_version_flag = '-mmacosx-version-min=10.9'
description: don't use ffmpeg's private API, which can change at any time.
author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
description: changes required to support ffmpeg 3.2 in stretch
author: Michael Gilbert <mgilbert@debian.org>
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
@@ -26,7 +26,6 @@ extern "C" {
// Disable deprecated features which result in spammy compile warnings. This
// list of defines must mirror those in the 'defines' section of FFmpeg's
// BUILD.gn file or the headers below will generate different structures!
-#define FF_API_CONVERGENCE_DURATION 0
// Upstream libavcodec/utils.c still uses the deprecated
// av_dup_packet(), causing deprecation warnings.
// The normal fix for such things is to disable the feature as below,
@@ -40,7 +39,6 @@ extern "C" {
MSVC_PUSH_DISABLE_WARNING(4244);
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
-#include <libavformat/internal.h>
#include <libavformat/avio.h>
#include <libavutil/avutil.h>
#include <libavutil/imgutils.h>
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -1223,29 +1223,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);
- const AVFormatInternal* internal = format_context->internal;
- if (internal && internal->packet_buffer &&
- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- struct AVPacketList* packet_buffer = internal->packet_buffer;
- while (packet_buffer != internal->packet_buffer_end) {
- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
- start_time_estimates.size());
- const AVStream* stream =
- format_context->streams[packet_buffer->pkt.stream_index];
- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- const base::TimeDelta packet_pts =
- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
- // We ignore kNoTimestamp here since -int64_t::min() is possible; see
- // https://crbug.com/700501. Technically this is a valid value, but in
- // practice shouldn't occur, so just ignore it when estimating.
- if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration &&
- packet_pts < start_time_estimates[stream->index]) {
- start_time_estimates[stream->index] = packet_pts;
- }
- }
- packet_buffer = packet_buffer->next;
- }
- }
std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -189,8 +189,6 @@ static VideoCodec CodecIDToVideoCodec(AV
return kCodecVP8;
case AV_CODEC_ID_VP9:
return kCodecVP9;
- case AV_CODEC_ID_AV1:
- return kCodecAV1;
default:
DVLOG(1) << "Unknown video CodecID: " << codec_id;
}
@@ -213,8 +211,6 @@ AVCodecID VideoCodecToCodecID(VideoCodec
return AV_CODEC_ID_VP8;
case kCodecVP9:
return AV_CODEC_ID_VP9;
- case kCodecAV1:
- return AV_CODEC_ID_AV1;
default:
DVLOG(1) << "Unknown VideoCodec: " << video_codec;
}
description: ffmpeg decoders before version 4.0 require explicit initialization
author: Michael Gilbert <mgilbert@debian.org>
origin: chromium 66 authors
--- a/media/filters/ffmpeg_audio_decoder.cc
+++ b/media/filters/ffmpeg_audio_decoder.cc
@@ -80,6 +80,8 @@ void FFmpegAudioDecoder::Initialize(
return;
}
+ FFmpegGlue::InitializeFFmpeg();
+
if (!ConfigureDecoder(config)) {
av_sample_format_ = 0;
bound_init_cb.Run(false);
--- a/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc
+++ b/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc
@@ -228,10 +228,13 @@ void ConvertCdmKeysInfo(const media::Cdm
}
}
+#include <libavformat/avformat.h>
+
void INITIALIZE_CDM_MODULE() {
DVLOG(1) << __func__;
#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
media::InitializeMediaLibrary();
+ av_register_all();
#endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
g_is_cdm_module_initialized = true;
--- a/media/filters/ffmpeg_glue.cc
+++ b/media/filters/ffmpeg_glue.cc
@@ -63,7 +63,13 @@ static int64_t AVIOSeekOperation(void* o
return new_offset;
}
+void FFmpegGlue::InitializeFFmpeg() {
+ av_register_all();
+}
+
FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol) {
+ InitializeFFmpeg();
+
// Initialize an AVIOContext using our custom read and seek operations. Don't
// keep pointers to the buffer since FFmpeg may reallocate it on the fly. It
// will be cleaned up
--- a/media/filters/ffmpeg_glue.h
+++ b/media/filters/ffmpeg_glue.h
@@ -59,6 +59,8 @@ class MEDIA_EXPORT FFmpegURLProtocol {
class MEDIA_EXPORT FFmpegGlue {
public:
+ static void InitializeFFmpeg();
+
// See file documentation for usage. |protocol| must outlive FFmpegGlue.
explicit FFmpegGlue(FFmpegURLProtocol* protocol);
~FFmpegGlue();
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -28,6 +28,7 @@
#include "media/base/video_util.h"
#include "media/ffmpeg/ffmpeg_common.h"
#include "media/ffmpeg/ffmpeg_decoding_loop.h"
+#include "media/filters/ffmpeg_glue.h"
namespace media {
@@ -110,6 +111,7 @@ static void ReleaseVideoBufferImpl(void*
// static
bool FFmpegVideoDecoder::IsCodecSupported(VideoCodec codec) {
+ FFmpegGlue::InitializeFFmpeg();
return avcodec_find_decoder(VideoCodecToCodecID(codec)) != nullptr;
}
@@ -253,6 +255,8 @@ void FFmpegVideoDecoder::Initialize(
return;
}
+ FFmpegGlue::InitializeFFmpeg();
+
if (!ConfigureDecoder(config, low_delay)) {
bound_init_cb.Run(false);
return;
description: disable build commands for embedded fontconfig
author: Michael Gilbert <mgilbert@debian.org>
--- a/build/config/posix/BUILD.gn
+++ b/build/config/posix/BUILD.gn
@@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//buildtools/deps_revisions.gni")
import("//build/config/c++/c++.gni")
import("//build/config/clang/clang.gni")
import("//build/config/compiler/compiler.gni")
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -204,13 +204,6 @@ static_library("test_support") {
if (is_linux) {
public_deps += [ ":fontconfig_util_linux" ]
- data_deps = [
- "//third_party/test_fonts",
- ]
- if (current_toolchain == host_toolchain) {
- data_deps += [ ":do_generate_fontconfig_caches" ]
- data += [ "$root_out_dir/fontconfig_caches/" ]
- }
}
if (is_ios) {
@@ -359,7 +352,7 @@ if (is_linux) {
]
}
- if (current_toolchain == host_toolchain) {
+ if (false) {
executable("generate_fontconfig_caches") {
testonly = true
sources = [
--- a/content/shell/test_runner/BUILD.gn
+++ b/content/shell/test_runner/BUILD.gn
@@ -169,7 +169,7 @@ group("resources") {
if (is_mac) {
deps += [ ":test_runner_bundle_data" ]
data_deps += [ ":test_runner_bundle_data" ]
- } else {
+ } else if (false) {
deps += [ "//third_party/test_fonts" ]
data_deps += [ "//third_party/test_fonts" ]
}
This diff is collapsed.
description: use system jpeg library
author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -665,7 +665,6 @@ group("gn_all") {
"//third_party/angle:libEGL",
"//third_party/angle:libGLESv2",
"//third_party/leveldatabase:leveldb_test_targets",
- "//third_party/libjpeg_turbo:simd",
"//third_party/opus:opus_compare",
"//third_party/opus:opus_demo",
"//third_party/opus:test_opus_api",
@@ -689,7 +688,6 @@ group("gn_all") {
if (enable_nacl) {
deps += [ "//native_client/src/trusted/platform_qualify:vcpuid" ]
}
- deps += [ "//third_party/libjpeg_turbo:simd_asm" ]
}
if (is_linux && current_toolchain == host_toolchain) {
deps += [ "//v8:v8_shell" ]
description: libdrm in stretch doesn't explicitly define DRM_FORMAT_MOD_INVALID
author: Michael Gilbert <mgilbert@debian.org>
--- a/ui/gfx/native_pixmap_handle.cc
+++ b/ui/gfx/native_pixmap_handle.cc
@@ -11,7 +11,7 @@
namespace gfx {
-#if defined(OS_LINUX)
+#if 0
static_assert(NativePixmapPlane::kNoModifier == DRM_FORMAT_MOD_INVALID,
"gfx::NativePixmapPlane::kNoModifier should be an alias for"
"DRM_FORMAT_MOD_INVALID");
description: system libxml2 2.9.4 does not yet provide XML_PARSE_NOXXE
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/libxml/chromium/libxml_utils.cc
+++ b/third_party/libxml/chromium/libxml_utils.cc
@@ -24,8 +24,7 @@ XmlReader::~XmlReader() {
bool XmlReader::Load(const std::string& input) {
const int kParseOptions = XML_PARSE_RECOVER | // recover on errors
- XML_PARSE_NONET | // forbid network access
- XML_PARSE_NOXXE; // no external entities
+ XML_PARSE_NONET; // forbid network access
// TODO(evanm): Verify it's OK to pass NULL for the URL and encoding.
// The libxml code allows for these, but it's unclear what effect is has.
reader_ = xmlReaderForMemory(input.data(), static_cast<int>(input.size()),
@@ -35,8 +34,7 @@ bool XmlReader::Load(const std::string&
bool XmlReader::LoadFile(const std::string& file_path) {
const int kParseOptions = XML_PARSE_RECOVER | // recover on errors
- XML_PARSE_NONET | // forbid network access
- XML_PARSE_NOXXE; // no external entities
+ XML_PARSE_NONET; // forbid network access
reader_ = xmlReaderForFile(file_path.c_str(), NULL, kParseOptions);
return reader_ != NULL;
}
......@@ -15,37 +15,18 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/base/time/time.cc
+++ b/base/time/time.cc
@@ -14,7 +14,7 @@
#include "base/logging.h"
#include "base/macros.h"
#include "base/no_destructor.h"
#include "base/strings/stringprintf.h"
-#include "base/third_party/nspr/prtime.h"
+#include <nspr/prtime.h>
#include "base/time/time_override.h"
#include "build/build_config.h"
namespace base {
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -492,7 +492,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',
- 'base/third_party/nspr/prtime.cc',
'base/threading/non_thread_safe_impl.cc',
'base/threading/post_task_and_reply_impl.cc',
'base/threading/sequenced_task_runner_handle.cc',
@@ -601,7 +600,7 @@ def write_gn_ninja(path, root_gen_dir, o
}
if is_linux:
- libs.extend(['-lrt', '-latomic'])
+ libs.extend(['-lrt', '-latomic', '-lnspr4'])
ldflags.extend(['-pthread'])
static_libraries['xdg_user_dirs'] = {
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -58,6 +58,9 @@ config("base_flags") {
"-Wno-char-subscripts",
@@ -86,6 +86,9 @@ config("base_flags") {
"-Wexit-time-destructors",
]
}
+ ldflags = [
......@@ -54,12 +35,23 @@ author: Michael Gilbert <mgilbert@debian.org>
}
config("base_implementation") {
@@ -861,8 +864,6 @@ component("base") {
@@ -915,8 +918,6 @@ jumbo_component("base") {
"third_party/dmg_fp/g_fmt.cc",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",
- "third_party/nspr/prtime.cc",
- "third_party/nspr/prtime.h",
"third_party/superfasthash/superfasthash.c",
"third_party/valgrind/memcheck.h",
"threading/non_thread_safe.h",
"thread_annotations.h",
"threading/platform_thread.h",
--- a/tools/gn/build/gen.py
+++ b/tools/gn/build/gen.py
@@ -375,6 +375,8 @@ def WriteGNNinja(path, platform, host, o
# These are needed by libc++.
'-ldl',
'-lpthread',
+ # Additional system libraries that are used.
+ '-lnspr4',
])
elif platform.is_darwin():
min_mac_version_flag = '-mmacosx-version-min=10.9'
description: build using system openjpeg
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/pdfium/third_party/BUILD.gn
+++ b/third_party/pdfium/third_party/BUILD.gn
@@ -366,39 +366,11 @@ config("fx_libopenjpeg_warnings") {
}
}
-static_library("fx_libopenjpeg") {
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- "//build/config/compiler:no_chromium_code",
- "//build/config/sanitizers:cfi_icall_generalize_pointers",
- ":pdfium_third_party_config",
-
- # Must be after no_chromium_code for warning flags to be ordered correctly.
- ":fx_libopenjpeg_warnings",
- ]
- sources = [
- "libopenjpeg20/bio.c",
- "libopenjpeg20/cio.c",
- "libopenjpeg20/dwt.c",
- "libopenjpeg20/event.c",
- "libopenjpeg20/function_list.c",
- "libopenjpeg20/image.c",
- "libopenjpeg20/invert.c",
- "libopenjpeg20/j2k.c",
- "libopenjpeg20/jp2.c",
- "libopenjpeg20/mct.c",
- "libopenjpeg20/mqc.c",
- "libopenjpeg20/openjpeg.c",
- "libopenjpeg20/opj_clock.c",
- "libopenjpeg20/pi.c",
- "libopenjpeg20/sparse_array.c",
- "libopenjpeg20/sparse_array.h",
- "libopenjpeg20/t1.c",
- "libopenjpeg20/t2.c",
- "libopenjpeg20/tcd.c",
- "libopenjpeg20/tgt.c",
- "libopenjpeg20/thread.c",
- ]
+pkg_config("libopenjpeg_from_pkgconfig") {
+ packages = [ "libopenjp2" ]
+}
+group("fx_libopenjpeg") {
+ public_configs = [ ":libopenjpeg_from_pkgconfig" ]
}
config("system_libpng_config") {
--- a/third_party/pdfium/core/fxcodec/codec/codec_int.h
+++ b/third_party/pdfium/core/fxcodec/codec/codec_int.h
@@ -15,7 +15,7 @@
#include <vector>
#include "core/fxcodec/jbig2/JBig2_Context.h"
-#include "third_party/libopenjpeg20/openjpeg.h"
+#include <openjpeg-2.3/openjpeg.h>
class CPDF_ColorSpace;
--- a/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -16,8 +16,6 @@
#include "core/fxcrt/fx_memory.h"
#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/ptr_util.h"
-#include "third_party/libopenjpeg20/openjpeg.h"
-#include "third_party/libopenjpeg20/opj_malloc.h"
namespace {
@@ -514,7 +512,6 @@ bool CJPX_Decoder::Init(pdfium::span<con
return false;
m_Image = pTempImage;
- m_Image->pdfium_use_colorspace = !!m_ColorSpace;
if (!m_Parameters.nb_tile_to_decode) {
if (!opj_set_decode_area(m_Codec.Get(), m_Image.Get(), m_Parameters.DA_x0,
@@ -548,7 +545,7 @@ bool CJPX_Decoder::Init(pdfium::span<con
// TODO(palmer): Using |opj_free| here resolves the crash described in
// https://crbug.com/737033, but ultimately we need to harmonize the
// memory allocation strategy across OpenJPEG and its PDFium callers.
- opj_free(m_Image->icc_profile_buf);
+ free(m_Image->icc_profile_buf);
m_Image->icc_profile_buf = nullptr;
m_Image->icc_profile_len = 0;
}
--- a/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h
+++ b/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h
@@ -13,7 +13,7 @@
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcrt/unowned_ptr.h"
#include "third_party/base/span.h"
-#include "third_party/libopenjpeg20/openjpeg.h"
+#include <openjpeg-2.3/openjpeg.h>
class CPDF_ColorSpace;
--- a/third_party/pdfium/BUILD.gn
+++ b/third_party/pdfium/BUILD.gn
@@ -21,7 +21,6 @@ config("pdfium_common_config") {
ldflags = []
include_dirs = [ "." ]
defines = [
- "OPJ_STATIC",
"PNG_PREFIX",
"PNG_USE_READ_MACROS",
]
@@ -75,7 +74,6 @@ config("pdfium_core_config") {
if (is_linux) {
if (current_cpu == "x64") {
defines += [ "_FX_CPU_=_FX_X64_" ]
- cflags += [ "-fPIC" ]
} else if (current_cpu == "x86") {
defines += [ "_FX_CPU_=_FX_X86_" ]
}
description: maintain compatibility with openjpeg 2.1
author: chromium 57 authors
--- a/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -40,20 +40,20 @@ opj_stream_t* fx_opj_stream_create_memor
}
bool alloc_rgb(int** out_r, int** out_g, int** out_b, size_t size) {
- int* r = static_cast<int*>(opj_image_data_alloc(size));
+ int* r = FX_Alloc(int, size);
if (!r)
return false;
- int* g = static_cast<int*>(opj_image_data_alloc(size));
+ int* g = FX_Alloc(int, size);
if (!g) {
- opj_image_data_free(r);
+ FX_Free(r);
return false;
}
- int* b = static_cast<int*>(opj_image_data_alloc(size));
+ int* b = FX_Alloc(int, size);
if (!b) {
- opj_image_data_free(r);
- opj_image_data_free(g);
+ FX_Free(r);
+ FX_Free(g);
return false;
}
@@ -114,9 +114,9 @@ void sycc444_to_rgb(opj_image_t* img) {
for (size_t i = 0; i < max_size.ValueOrDie(); ++i) {
sycc_to_rgb(offset, upb, *y++, *cb++, *cr++, r++, g++, b++);
}
- opj_image_data_free(img->comps[0].data);
- opj_image_data_free(img->comps[1].data);
- opj_image_data_free(img->comps[2].data);
+ FX_Free(img->comps[0].data);
+ FX_Free(img->comps[1].data);
+ FX_Free(img->comps[2].data);
img->comps[0].data = d0;
img->comps[1].data = d1;
img->comps[2].data = d2;
@@ -182,9 +182,9 @@ void sycc422_to_rgb(opj_image_t* img) {
sycc_to_rgb(offset, upb, *y++, *cb++, *cr++, r++, g++, b++);
}
}
- opj_image_data_free(img->comps[0].data);
- opj_image_data_free(img->comps[1].data);
- opj_image_data_free(img->comps[2].data);
+ FX_Free(img->comps[0].data);
+ FX_Free(img->comps[1].data);
+ FX_Free(img->comps[2].data);
img->comps[0].data = d0;
img->comps[1].data = d1;
img->comps[2].data = d2;
@@ -438,9 +438,9 @@ void sycc420_to_rgb(opj_image_t* img) {
}
}
- opj_image_data_free(img->comps[0].data);
- opj_image_data_free(img->comps[1].data);
- opj_image_data_free(img->comps[2].data);
+ FX_Free(img->comps[0].data);
+ FX_Free(img->comps[1].data);
+ FX_Free(img->comps[2].data);
img->comps[0].data = d0;
img->comps[1].data = d1;
img->comps[2].data = d2;
--- a/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h
+++ b/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h
@@ -13,7 +13,7 @@
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcrt/unowned_ptr.h"
#include "third_party/base/span.h"
-#include <openjpeg-2.3/openjpeg.h>
+#include <openjpeg-2.1/openjpeg.h>
class CPDF_ColorSpace;
--- a/third_party/pdfium/core/fxcodec/codec/codec_int.h
+++ b/third_party/pdfium/core/fxcodec/codec/codec_int.h
@@ -15,7 +15,7 @@
#include <vector>
#include "core/fxcodec/jbig2/JBig2_Context.h"
-#include <openjpeg-2.3/openjpeg.h>
+#include <openjpeg-2.1/openjpeg.h>
class CPDF_ColorSpace;
description: maintain compatibility with system vpx
description: maintain compatibility with vpx 1.7
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+++ b/third_party/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
@@ -1077,9 +1077,6 @@ int VP8DecoderImpl::Decode(const Encoded
img = vpx_codec_get_frame(decoder_, &iter);
int qp;
- vpx_codec_err_t vpx_ret =
- vpx_codec_control(decoder_, VPXD_GET_LAST_QUANTIZER, &qp);
- RTC_DCHECK_EQ(vpx_ret, VPX_CODEC_OK);
ret = ReturnFrame(img, input_image._timeStamp, input_image.ntp_time_ms_, qp);
if (ret != 0) {
// Reset to avoid requesting key frames too often.
@@ -1126,8 +1123,9 @@ int VP8DecoderImpl::ReturnFrame(const vp
VideoFrame decoded_image(buffer, timestamp, 0, kVideoRotation_0);
decoded_image.set_ntp_time_ms(ntp_time_ms);
- decode_complete_callback_->Decoded(decoded_image, rtc::Optional<int32_t>(),
- rtc::Optional<uint8_t>(qp));
+ int ret = decode_complete_callback_->Decoded(decoded_image);
+ if (ret != 0)
+ return ret;
return WEBRTC_VIDEO_CODEC_OK;
--- a/media/base/decode_capabilities.cc
+++ b/media/base/decode_capabilities.cc
@@ -12,8 +12,8 @@
#include "ui/display/display_switches.h"
#if BUILDFLAG(ENABLE_LIBVPX)
-#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
-#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h"
+#include <vpx/vp8dx.h>
+#include <vpx/vpx_codec.h>
#endif
namespace media {
--- a/third_party/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc
+++ b/third_party/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc
@@ -15,10 +15,10 @@
#include <limits>
#include <vector>
-#include "vpx/vp8cx.h"
-#include "vpx/vp8dx.h"
-#include "vpx/vpx_decoder.h"
-#include "vpx/vpx_encoder.h"
+#include <vpx/vp8cx.h>
+#include <vpx/vp8dx.h>
+#include <vpx/vpx_decoder.h>
+#include <vpx/vpx_encoder.h>
#include "absl/memory/memory.h"
#include "api/video/color_space.h"
@@ -523,34 +523,6 @@ int VP9EncoderImpl::InitAndSetControlSet
vpx_codec_control(encoder_, VP9E_SET_SVC_PARAMETERS, &svc_params_);
}
- if (num_spatial_layers_ > 1) {
- switch (inter_layer_pred_) {
- case InterLayerPredMode::kOn:
- vpx_codec_control(encoder_, VP9E_SET_SVC_INTER_LAYER_PRED, 0);
- break;
- case InterLayerPredMode::kOff:
- vpx_codec_control(encoder_, VP9E_SET_SVC_INTER_LAYER_PRED, 1);
- break;
- case InterLayerPredMode::kOnKeyPic:
- vpx_codec_control(encoder_, VP9E_SET_SVC_INTER_LAYER_PRED, 2);
- break;
- default:
- RTC_NOTREACHED();
- }
-
- // Configure encoder to drop entire superframe whenever it needs to drop
- // a layer. This mode is prefered over per-layer dropping which causes