Commit 359d98d4 authored by Michael Gilbert's avatar Michael Gilbert

refresh patches for chromium 67

parent 0916ad7a
description: backport from upstream glibc 2.27 / gcc 7.3 buildfixes form ARM
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
@@ -288,7 +288,7 @@ CAPTURECONTEXT_SYMBOL2:
#elif defined(__aarch64__)
// Zero out fault_address, which is unused.
- str x31, [x0, #0xb0] // context->uc_mcontext.fault_address
+ str xzr, [x0, #0xb0] // context->uc_mcontext.fault_address
// Save general purpose registers in context->uc_mcontext.regs[i].
// The original x0 can't be recovered.
Index: chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp
===================================================================
--- chromium-browser-65.0.3325.73.orig/third_party/skia/src/jumper/SkJumper_stages.cpp
+++ chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp
@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) {
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
@@ -653,7 +653,7 @@ SI F approx_powf(F x, F y) {
}
SI F from_half(U16 h) {
......@@ -11,7 +12,7 @@ Index: chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages
return vcvt_f32_f16(h);
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
@@ -673,7 +673,7 @@ SI F from_half(U16 h) {
}
SI U16 to_half(F f) {
......
description: content_shell_fonts depends on prebuilt ttf files
author: Michael Gilbert <mgilbert@debian.org>
--- a/content/shell/test_runner/BUILD.gn
+++ b/content/shell/test_runner/BUILD.gn
@@ -204,7 +204,7 @@ group("resources") {
deps += [ ":copy_android_fonts_config" ]
data_deps += [ ":copy_android_fonts_config" ]
}
- if (is_android || is_linux || is_fuchsia) {
+ if (false) {
deps += [ "//third_party/content_shell_fonts" ]
data_deps += [ "//third_party/content_shell_fonts" ]
}
......@@ -3,10 +3,10 @@ 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
chrome::ShowBadFlagsPrompt(browser);
InfoBarService* infobar_service = InfoBarService::FromWebContents(
browser->tab_strip_model()->GetActiveWebContents());
@@ -900,8 +900,6 @@ void StartupBrowserCreatorImpl::AddInfoB
chrome::ShowBadFlagsPrompt(web_contents);
InfoBarService* infobar_service =
InfoBarService::FromWebContents(web_contents);
- if (!google_apis::HasKeysConfigured())
- GoogleApiKeysInfoBarDelegate::Create(infobar_service);
if (ObsoleteSystem::IsObsoleteNowOrSoon()) {
......
......@@ -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
@@ -100,7 +100,7 @@ void CookieSettings::GetCookieSettings(
@@ -111,7 +111,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
......
description: fix ambiguous namespace alias errors that occur in jumbo build
author: Michael Gilbert <mgilbert@debian.org>
--- a/extensions/common/manifest_handlers/permissions_parser.cc
+++ b/extensions/common/manifest_handlers/permissions_parser.cc
@@ -26,10 +26,10 @@
#include "extensions/common/url_pattern_set.h"
#include "url/url_constants.h"
-namespace extensions {
+namespace keys = extensions::manifest_keys;
+namespace errors = extensions::manifest_errors;
-namespace keys = manifest_keys;
-namespace errors = manifest_errors;
+namespace extensions {
namespace {
--- a/extensions/common/manifest_handlers/requirements_info.cc
+++ b/extensions/common/manifest_handlers/requirements_info.cc
@@ -12,10 +12,10 @@
#include "extensions/common/error_utils.h"
#include "extensions/common/manifest_constants.h"
-namespace extensions {
+namespace keys = extensions::manifest_keys;
+namespace errors = extensions::manifest_errors;
-namespace keys = manifest_keys;
-namespace errors = manifest_errors;
+namespace extensions {
RequirementsInfo::RequirementsInfo(const Manifest* manifest)
: webgl(false), window_shape(false) {}
--- a/extensions/common/manifest_handlers/sandboxed_page_info.cc
+++ b/extensions/common/manifest_handlers/sandboxed_page_info.cc
@@ -17,10 +17,10 @@
#include "extensions/common/manifest_constants.h"
#include "extensions/common/url_pattern.h"
-namespace extensions {
-
namespace keys = extensions::manifest_keys;
-namespace errors = manifest_errors;
+namespace errors = extensions::manifest_errors;
+
+namespace extensions {
namespace {
--- a/extensions/common/manifest_handlers/shared_module_info.cc
+++ b/extensions/common/manifest_handlers/shared_module_info.cc
@@ -22,11 +22,11 @@
#include "extensions/common/permissions/permission_set.h"
#include "extensions/common/permissions/permissions_data.h"
-namespace extensions {
+namespace keys = extensions::manifest_keys;
+namespace values = extensions::manifest_values;
+namespace errors = extensions::manifest_errors;
-namespace keys = manifest_keys;
-namespace values = manifest_values;
-namespace errors = manifest_errors;
+namespace extensions {
namespace {
description: gcc6 constexpr error
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/WebKit/Source/core/loader/IdlenessDetector.cpp
+++ b/third_party/WebKit/Source/core/loader/IdlenessDetector.cpp
@@ -15,8 +15,8 @@
namespace blink {
-const TimeDelta IdlenessDetector::kNetworkQuietWindow;
-const TimeDelta IdlenessDetector::kNetworkQuietWatchdog;
+constexpr TimeDelta IdlenessDetector::kNetworkQuietWindow;
+constexpr TimeDelta IdlenessDetector::kNetworkQuietWatchdog;
void IdlenessDetector::Shutdown() {
Stop();
description: renamed routine collides with WTFString.h, revert to chromium 64 name
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/WebKit/Source/modules/indexeddb/IDBKey.h
+++ b/third_party/WebKit/Source/modules/indexeddb/IDBKey.h
@@ -106,7 +106,7 @@ class MODULES_EXPORT IDBKey {
return binary_;
}
- const String& String() const {
+ const String& GetString() const {
DCHECK_EQ(type_, kStringType);
return string_;
}
--- a/third_party/WebKit/Source/modules/indexeddb/IDBKeyPath.h
+++ b/third_party/WebKit/Source/modules/indexeddb/IDBKeyPath.h
@@ -65,7 +65,7 @@ class MODULES_EXPORT IDBKeyPath {
return array_;
}
- const String& String() const {
+ const String& GetString() const {
DCHECK_EQ(type_, kStringType);
return string_;
}
--- a/third_party/WebKit/Source/bindings/modules/v8/V8BindingForModules.cpp
+++ b/third_party/WebKit/Source/bindings/modules/v8/V8BindingForModules.cpp
@@ -68,7 +68,7 @@ v8::Local<v8::Value> ToV8(const IDBKeyPa
case IDBKeyPath::kNullType:
return v8::Null(isolate);
case IDBKeyPath::kStringType:
- return V8String(isolate, value.String());
+ return V8String(isolate, value.GetString());
case IDBKeyPath::kArrayType:
return ToV8(value.Array(), creation_context, isolate);
}
@@ -97,7 +97,7 @@ v8::Local<v8::Value> ToV8(const IDBKey*
case IDBKey::kNumberType:
return v8::Number::New(isolate, key->Number());
case IDBKey::kStringType:
- return V8String(isolate, key->String());
+ return V8String(isolate, key->GetString());
case IDBKey::kBinaryType:
// https://w3c.github.io/IndexedDB/#convert-a-value-to-a-key
return ToV8(DOMArrayBuffer::Create(key->Binary()), creation_context,
@@ -375,7 +375,7 @@ static std::unique_ptr<IDBKey> CreateIDB
}
DCHECK_EQ(key_path.GetType(), IDBKeyPath::kStringType);
- return CreateIDBKeyFromValueAndKeyPath(isolate, value, key_path.String(),
+ return CreateIDBKeyFromValueAndKeyPath(isolate, value, key_path.GetString(),
exception_state);
}
@@ -479,7 +479,7 @@ bool InjectV8KeyIntoV8Value(v8::Isolate*
DCHECK(isolate->InContext());
DCHECK_EQ(key_path.GetType(), IDBKeyPath::kStringType);
- Vector<String> key_path_elements = ParseKeyPath(key_path.String());
+ Vector<String> key_path_elements = ParseKeyPath(key_path.GetString());
// The conbination of a key generator and an empty key path is forbidden by
// spec.
@@ -565,7 +565,7 @@ bool CanInjectIDBKeyIntoScriptValue(v8::
const IDBKeyPath& key_path) {
IDB_TRACE("canInjectIDBKeyIntoScriptValue");
DCHECK_EQ(key_path.GetType(), IDBKeyPath::kStringType);
- Vector<String> key_path_elements = ParseKeyPath(key_path.String());
+ Vector<String> key_path_elements = ParseKeyPath(key_path.GetString());
if (!key_path_elements.size())
return false;
--- a/third_party/WebKit/Source/modules/exported/WebIDBKey.cpp
+++ b/third_party/WebKit/Source/modules/exported/WebIDBKey.cpp
@@ -56,7 +56,7 @@ WebData WebIDBKeyView::Binary() const {
}
WebString WebIDBKeyView::String() const {
- return private_->String();
+ return private_->GetString();
}
double WebIDBKeyView::Date() const {
--- a/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp
+++ b/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp
@@ -297,7 +297,7 @@ IDBObjectStore* IDBDatabase::createObjec
}
if (auto_increment && ((key_path.GetType() == IDBKeyPath::kStringType &&
- key_path.String().IsEmpty()) ||
+ key_path.GetString().IsEmpty()) ||
key_path.GetType() == IDBKeyPath::kArrayType)) {
exception_state.ThrowDOMException(
kInvalidAccessError,
--- a/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp
+++ b/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp
@@ -399,7 +399,7 @@ static std::unique_ptr<KeyPath> KeyPathF
case IDBKeyPath::kStringType:
key_path = KeyPath::create()
.setType(KeyPath::TypeEnum::String)
- .setString(idb_key_path.String())
+ .setString(idb_key_path.GetString())
.build();
break;
case IDBKeyPath::kArrayType: {
description: fix includes that cause errors in jumbo builds
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/blink/renderer/platform/fonts/font_cache_key.h
+++ b/third_party/blink/renderer/platform/fonts/font_cache_key.h
@@ -36,7 +36,6 @@
#include "third_party/blink/renderer/platform/wtf/allocator.h"
#include "third_party/blink/renderer/platform/wtf/hash_map.h"
#include "third_party/blink/renderer/platform/wtf/hash_table_deleted_value_type.h"
-#include "third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h"
#include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
namespace blink {
--- a/third_party/blink/renderer/platform/text/hyphenation.h
+++ b/third_party/blink/renderer/platform/text/hyphenation.h
@@ -9,7 +9,7 @@
#include "third_party/blink/renderer/platform/wtf/forward.h"
#include "third_party/blink/renderer/platform/wtf/hash_map.h"
#include "third_party/blink/renderer/platform/wtf/ref_counted.h"
-#include "third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h"
+#include "third_party/blink/renderer/platform/wtf/text/atomic_string.h"
#include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
namespace blink {
description: gcc requires complete definition when types are used in unique_ptr
author: Michael Gilbert <mgilbert@debian.org>
--- a/services/preferences/tracked/pref_hash_filter.h
+++ b/services/preferences/tracked/pref_hash_filter.h
@@ -22,8 +22,8 @@
#include "services/preferences/tracked/hash_store_contents.h"
#include "services/preferences/tracked/interceptable_pref_filter.h"
#include "services/preferences/tracked/tracked_preference.h"
+#include "services/preferences/tracked/pref_hash_store.h"
-class PrefHashStore;
class PrefService;
namespace base {
--- a/components/policy/core/browser/browser_policy_connector_base.h
+++ b/components/policy/core/browser/browser_policy_connector_base.h
@@ -14,10 +14,10 @@
#include "components/policy/core/common/schema.h"
#include "components/policy/core/common/schema_registry.h"
#include "components/policy/policy_export.h"
+#include "components/policy/core/common/configuration_policy_provider.h"
namespace policy {
-class ConfigurationPolicyProvider;
class PolicyService;
class PolicyServiceImpl;
description: gcc6 needs explicit 'this->' for functions used in a lamba capturing 'this'
bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67274
author: Michael Gilbert <mgilbert@debian.org>
--- a/ui/accessibility/ax_event_generator.cc
+++ b/ui/accessibility/ax_event_generator.cc
@@ -411,7 +411,7 @@ void AXEventGenerator::FireRelationSourc
return;
source_nodes.insert(source_node);
- AddEvent(source_node, Event::RELATED_NODE_CHANGED);
+ this->AddEvent(source_node, Event::RELATED_NODE_CHANGED);
});
};
......@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -92,8 +92,6 @@ static_library("content_shell_lib") {
@@ -101,8 +101,6 @@ static_library("content_shell_lib") {
"browser/layout_test/layout_test_push_messaging_service.h",
"browser/layout_test/layout_test_url_request_context_getter.cc",
"browser/layout_test/layout_test_url_request_context_getter.h",
......@@ -12,7 +12,7 @@ author: Michael Gilbert <mgilbert@debian.org>
"browser/layout_test/secondary_test_window_observer.cc",
"browser/layout_test/secondary_test_window_observer.h",
"browser/layout_test/test_info_extractor.cc",
@@ -244,9 +242,7 @@ static_library("content_shell_lib") {
@@ -255,9 +253,7 @@ static_library("content_shell_lib") {
"//content/public/common",
"//content/public/common:service_names",
"//content/shell/test_runner:test_runner",
......@@ -24,7 +24,7 @@ author: Michael Gilbert <mgilbert@debian.org>
"//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
@@ -18,7 +18,6 @@
@@ -21,7 +21,6 @@
#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/layout_test_notification_manager.h"
......@@ -32,7 +32,7 @@ author: Michael Gilbert <mgilbert@debian.org>
#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"
@@ -31,11 +30,6 @@ namespace {
@@ -36,11 +35,6 @@ namespace {
LayoutTestContentBrowserClient* g_layout_test_browser_client;
......@@ -41,22 +41,22 @@ author: Michael Gilbert <mgilbert@debian.org>
- MojoLayoutTestHelper::Create(std::move(request));
-}
-
} // namespace
LayoutTestContentBrowserClient::LayoutTestContentBrowserClient() {
@@ -98,7 +92,6 @@ void LayoutTestContentBrowserClient::Exp
registry->AddInterface(base::Bind(&bluetooth::FakeBluetooth::Create),
ui_task_runner);
- registry->AddInterface(base::Bind(&MojoLayoutTestHelper::Create));
class WebPackageInternalsImpl : public blink::test::mojom::WebPackageInternals {
public:
explicit WebPackageInternalsImpl(WebPackageContext* web_package_context)
@@ -148,7 +142,6 @@ void LayoutTestContentBrowserClient::Exp
&WebPackageInternalsImpl::Create,
base::Unretained(
render_process_host->GetStoragePartition()->GetWebPackageContext())));
- registry->AddInterface(base::BindRepeating(&MojoLayoutTestHelper::Create));
}
void LayoutTestContentBrowserClient::OverrideWebkitPrefs(
@@ -186,7 +179,6 @@ bool LayoutTestContentBrowserClient::Can
@@ -236,7 +229,6 @@ bool LayoutTestContentBrowserClient::Can
void LayoutTestContentBrowserClient::ExposeInterfacesToFrame(
service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>*
registry) {
- registry->AddInterface(base::Bind(&BindLayoutTestHelper));
}
ResourceDispatcherHostLoginDelegate*
scoped_refptr<LoginDelegate>
description: gcc 6 isn't able to correctly deduce the namespace
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/blink/renderer/platform/graphics/path.h
+++ b/third_party/blink/renderer/platform/graphics/path.h
@@ -199,13 +199,13 @@ class PLATFORM_EXPORT Path {
SkPath path_;
};
-class PLATFORM_EXPORT RefCountedPath : public Path,
+class PLATFORM_EXPORT RefCountedPath : public blink::Path,
public RefCounted<RefCountedPath> {
USING_FAST_MALLOC(RefCountedPath);
public:
template <typename... Args>
- RefCountedPath(Args&&... args) : Path(std::forward<Args>(args)...) {}
+ RefCountedPath(Args&&... args) : blink::Path(std::forward<Args>(args)...) {}
};
// Only used for DCHECKs
description: Optional as of chromium 66 excludes copy construction from a type
author: Michael Gilbert <mgilbert@debian.org>
--- a/content/browser/appcache/appcache_request_handler.cc
+++ b/content/browser/appcache/appcache_request_handler.cc
@@ -639,7 +639,7 @@ AppCacheRequestHandler::MaybeCreateSubre
SubresourceLoaderParams params;
params.loader_factory_info = factory_ptr.PassInterface();
- return params;
+ return std::move(params);
}
void AppCacheRequestHandler::MaybeCreateSubresourceLoader(
--- a/content/browser/service_worker/service_worker_controllee_request_handler.cc
+++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc
@@ -271,7 +271,7 @@ ServiceWorkerControlleeRequestHandler::M
controller_info->object_info = provider_host_->GetOrCreateServiceWorkerHandle(
provider_host_->controller());
params.controller_service_worker_info = std::move(controller_info);
- return params;
+ return std::move(params);
}
void ServiceWorkerControlleeRequestHandler::PrepareForMainResource(
--- a/device/fido/device_response_converter.cc
+++ b/device/fido/device_response_converter.cc
@@ -121,7 +121,7 @@ base::Optional<AuthenticatorGetAssertion
response.SetNumCredentials(it->second.GetUnsigned());
}
- return response;
+ return std::move(response);
}
base::Optional<AuthenticatorGetInfoResponse> ReadCTAPGetInfoResponse(
@@ -241,7 +241,7 @@ base::Optional<AuthenticatorGetInfoRespo
response.SetPinProtocols(std::move(supported_pin_protocols));
}
- return response;
+ return std::move(response);
}
} // namespace device
--- a/cc/raster/playback_image_provider.cc
+++ b/cc/raster/playback_image_provider.cc
@@ -70,7 +70,6 @@ PlaybackImageProvider::GetDecodedDrawIma
}
PlaybackImageProvider::Settings::Settings() = default;
-PlaybackImageProvider::Settings::Settings(const Settings& other) = default;
PlaybackImageProvider::Settings::~Settings() = default;
} // namespace cc
--- a/cc/raster/playback_image_provider.h
+++ b/cc/raster/playback_image_provider.h
@@ -20,7 +20,6 @@ class CC_EXPORT PlaybackImageProvider :
public:
struct CC_EXPORT Settings {
Settings();
- Settings(const Settings& other);
~Settings();
// The set of image ids to skip during raster.
--- a/chrome/browser/supervised_user/supervised_user_url_filter.cc
+++ b/chrome/browser/supervised_user/supervised_user_url_filter.cc
@@ -368,7 +368,7 @@ SupervisedUserURLFilter::GetFilteringBeh
// Allow navigations to whitelisted origins (currently families.google.com).
static const base::NoDestructor<base::flat_set<GURL>> kWhitelistedOrigins(
- {GURL(kFamiliesUrl).GetOrigin()});
+ std::vector<GURL>({GURL(kFamiliesUrl).GetOrigin()}));
if (base::ContainsKey(*kWhitelistedOrigins, effective_url.GetOrigin()))
return ALLOW;
From b84682f31dc99b9c90f5a04947075815697c68d9 Mon Sep 17 00:00:00 2001
From: Jose Dapena Paz <jose.dapena@lge.com>
Date: Wed, 7 Mar 2018 20:07:48 +0000
Subject: [PATCH] GCC: do not initialize NEON int32x4_t with braces initializer
GCC does not support int32x4_t loading using braces wrapping 4 ints.
Instead we should use the NEON intrinsic to load from an array of
ints.
Bug: 819294
Change-Id: I13b877405273e4ebcc944d50c155ee29ff31cc99
Reviewed-on: https://chromium-review.googlesource.com/951773
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541544}
---
skia/ext/convolver_neon.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/skia/ext/convolver_neon.cc b/skia/ext/convolver_neon.cc
index 26b91b9c88c4..cae6bc2f833f 100644
--- a/skia/ext/convolver_neon.cc
+++ b/skia/ext/convolver_neon.cc
@@ -23,7 +23,7 @@ AccumRemainder(const unsigned char* pixels_left,
remainder[2] += coeff * pixels_left[i * 4 + 2];
remainder[3] += coeff * pixels_left[i * 4 + 3];
}
- return {remainder[0], remainder[1], remainder[2], remainder[3]};
+ return vld1q_s32(remainder);
}
// Convolves horizontally along a single row. The row data is given in
@@ -336,4 +336,4 @@ void ConvolveVertically_Neon(const ConvolutionFilter1D::Fixed* filter_values,
}
}
-} // namespace skia
\ No newline at end of file
+} // namespace skia
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 79aafb2b535f..a8daf9b77911 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -282,10 +282,12 @@ component("skia") {
"ext/convolver_mips_dspr2.h",
]
} else if (current_cpu == "arm" || current_cpu == "arm64") {
- sources += [
- "ext/convolver_neon.cc",
- "ext/convolver_neon.h",
- ]
+ if (arm_use_neon) {
+ sources += [
+ "ext/convolver_neon.cc",
+ "ext/convolver_neon.h",
+ ]
+ }
}
# The imported Skia gni source paths are made absolute by gn.
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: gcc before 7.3.0-10 handles Optional<WTF::Vector<T>> incorrectly
origin: derived from fix for std::vector in base/template_util.h
--- a/third_party/WebKit/Source/platform/wtf/Vector.h
+++ b/third_party/WebKit/Source/platform/wtf/Vector.h
@@ -1995,6 +1995,13 @@ Vector<T, inlineCapacity, Allocator>::Tr
} // namespace WTF
+#include "base/template_util.h"
+
+namespace base {
+template <typename T>
+struct is_trivially_copy_constructible<WTF::Vector<T>> : std::false_type {};
+}
+
using WTF::Vector;
#endif // WTF_Vector_h
......@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -663,6 +663,8 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -713,6 +713,8 @@ def write_gn_ninja(path, root_gen_dir, o
}
if is_linux or is_aix:
......@@ -12,7 +12,7 @@ author: Michael Gilbert <mgilbert@debian.org>
static_libraries['xdg_user_dirs'] = {
'sources': [
'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
@@ -688,85 +690,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -738,85 +740,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/platform_thread_linux.cc',
])
if is_linux:
......
......@@ -3,15 +3,15 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -115,6 +115,7 @@ def main(argv):
'relative to the src directory. (eg. out/Release)')
@@ -154,6 +154,7 @@ def main(argv):
'the out_bootstrap to be located in the parent directory')
parser.add_option('-v', '--verbose', action='store_true',
help='Log more details')
+ parser.add_option('-j', '--jobs', help='Number of jobs')
options, args = parser.parse_args(argv)
if args:
@@ -236,6 +237,8 @@ def build_gn_with_ninja_manually(tempdir
@@ -282,6 +283,8 @@ def build_gn_with_ninja_manually(tempdir
cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
if options.verbose:
cmd.append('-v')
......
manpage.patch
master-preferences.patch
debianization/manpage.patch
debianization/master-preferences.patch
gn/libcxx.patch
gn/parallel.patch
gn/buildflags.patch
disable/fonts.patch
disable/fuzzers.patch
disable/google-api-warning.patch
disable/third-party-cookies.patch
fixes/mojo.patch
fixes/optional.patch
fixes/widevine.patch
fixes/optimize.patch
fixes/ps-print.patch
fixes/constexpr.patch
fixes/namespace.patch
fixes/inspector.patch
fixes/wtf-vector.patch
fixes/gpu-timeout.patch
fixes/duplicate-name.patch
fixes/overloaded-call.patch
fixes/incomplete-types.patch
fixes/inconsistent-this.patch
fixes/ambiguous-aliases.patch
fixes/widevine-revision.patch
fixes/include-collisions.patch
fixes/chromedriver-revision.patch
fixes/skia_buildfix.patch
fixes/skia_neon.patch
arm/skia.patch
arm/crashpad.patch
system/icu.patch
system/vpx.patch
system/jpeg.patch
system/nspr.patch
system/event.patch
system/ffmpeg.patch
system/ffmpeg2.patch
system/libdrm.patch
add-missing-blink-tools.patch
system/fontconfig.patch
......@@ -14,7 +14,7 @@ author: Michael Gilbert <mgilbert@debian.org>
#include "rtc_base/logging.h"
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -643,26 +643,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -693,26 +693,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_conversion_posix.cc',
'base/trace_event/heap_profiler_allocation_register_posix.cc',
])
......@@ -41,7 +41,7 @@ author: Michael Gilbert <mgilbert@debian.org>
if is_linux or is_aix:
ldflags.extend(['-pthread'])
@@ -696,13 +676,7 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -746,13 +726,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/allocator/allocator_shim.cc',
'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
])
......@@ -56,7 +56,7 @@ author: Michael Gilbert <mgilbert@debian.org>
else:
ldflags.extend(['-pthread'])
libs.extend(['-lrt'])
@@ -742,12 +716,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -792,12 +766,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_mac.cc',
'base/threading/platform_thread_mac.mm',
])
......
description: ffmpeg before version 4.0 requires 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
@@ -222,10 +222,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();