diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-05 16:32:43 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-16 15:21:45 +0100 |
| commit | 97b90eeccf8e3b805abc355ae38465dfbcd9e23c (patch) | |
| tree | ff6d327761cd484ef26b38743d1491ff7cfa089a | |
| parent | 3aaaee3312bb9780f7c659167fe811c59dcd1b29 (diff) | |
| download | qtwebengine-chromium-97b90eeccf8e3b805abc355ae38465dfbcd9e23c.tar.gz | |
Fixes for jumbo build
Fixes necessary to make jumbo build work
Change-Id: I1551ddeaa15fdc4e9db72e86ea49191193cb4964
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
63 files changed, 326 insertions, 205 deletions
diff --git a/chromium/base/BUILD.gn b/chromium/base/BUILD.gn index 8c6f3289597..894f0a06330 100644 --- a/chromium/base/BUILD.gn +++ b/chromium/base/BUILD.gn @@ -894,6 +894,10 @@ jumbo_component("base") { } } + jumbo_excluded_sources = [ + "logging.cc", + ] + if (is_win) { sources += [ "debug/close_handle_hook_win.cc", @@ -1202,6 +1206,7 @@ jumbo_component("base") { "process/process_metrics_linux.cc", "threading/platform_thread_linux.cc", ] + jumbo_excluded_sources += [ "process/memory_linux.cc" ] } if (!is_nacl) { @@ -1825,6 +1830,8 @@ jumbo_component("base") { "allocator/partition_allocator/thread_cache.h", "allocator/partition_allocator/yield_processor.h", ] + jumbo_excluded_sources += [ "allocator/partition_allocator/random.cc", ] + if (is_win) { sources += [ "allocator/partition_allocator/page_allocator_internals_win.h", @@ -1860,6 +1867,11 @@ jumbo_component("base") { "strings/string16.cc", ] + # winternl.h and NTSecAPI.h have different definitions of UNICODE_STRING. + # There's only one client of NTSecAPI.h in base but several of winternl.h, + # so exclude the NTSecAPI.h one. + jumbo_excluded_sources += [ "rand_util_win.cc" ] + deps += [ "//base/win:base_win_buildflags" ] data_deps += [ "//build/win:runtime_libs" ] diff --git a/chromium/base/metrics/sparse_histogram.cc b/chromium/base/metrics/sparse_histogram.cc index 6d2720c2369..fb63af6f081 100644 --- a/chromium/base/metrics/sparse_histogram.cc +++ b/chromium/base/metrics/sparse_histogram.cc @@ -21,7 +21,7 @@ #include "base/values.h" namespace { -constexpr char kAsciiNewLine[] = "\n"; +constexpr char kAsciiNewLine2[] = "\n"; } // namespace namespace base { @@ -175,8 +175,8 @@ void SparseHistogram::WriteAscii(std::string* output) const { std::unique_ptr<HistogramSamples> snapshot = SnapshotSamples(); WriteAsciiHeader(*snapshot, output); - output->append(kAsciiNewLine); - WriteAsciiBody(*snapshot, true, kAsciiNewLine, output); + output->append(kAsciiNewLine2); + WriteAsciiBody(*snapshot, true, kAsciiNewLine2, output); } base::DictionaryValue SparseHistogram::ToGraphDict() const { @@ -186,7 +186,7 @@ base::DictionaryValue SparseHistogram::ToGraphDict() const { base::DictionaryValue dict; WriteAsciiHeader(*snapshot, &header); - WriteAsciiBody(*snapshot, true, kAsciiNewLine, &body); + WriteAsciiBody(*snapshot, true, kAsciiNewLine2, &body); dict.SetString("header", header); dict.SetString("body", body); diff --git a/chromium/base/strings/string_piece.h b/chromium/base/strings/string_piece.h index b10707d94ef..4e5ac7d5798 100644 --- a/chromium/base/strings/string_piece.h +++ b/chromium/base/strings/string_piece.h @@ -162,7 +162,11 @@ template <typename STRING_TYPE> class BasicStringPiece { // std::basic_string_view, so remove the special handling for it. // Note: This doesn't just use STRING_TYPE::traits_type::length(), since that // isn't constexpr until C++17. +#if defined(COMPILER_GCC) + constexpr BasicStringPiece(const value_type* str) __attribute__((always_inline)) +#else constexpr BasicStringPiece(const value_type* str) +#endif : ptr_(str), length_(!str ? 0 : CharTraits<value_type>::length(str)) {} // Explicitly disallow construction from nullptr. Note that this does not // catch construction from runtime strings that might be null. diff --git a/chromium/cc/metrics/jank_metrics.cc b/chromium/cc/metrics/jank_metrics.cc index b6237766c7e..e01ab0029d8 100644 --- a/chromium/cc/metrics/jank_metrics.cc +++ b/chromium/cc/metrics/jank_metrics.cc @@ -19,10 +19,10 @@ namespace cc { namespace { -constexpr int kBuiltinSequenceNum = +constexpr int kBuiltinJankSequenceNum = static_cast<int>(FrameSequenceTrackerType::kMaxType) + 1; -constexpr int kMaximumJankHistogramIndex = 2 * kBuiltinSequenceNum; -constexpr int kMaximumStaleHistogramIndex = kBuiltinSequenceNum; +constexpr int kMaximumJankHistogramIndex = 2 * kBuiltinJankSequenceNum; +constexpr int kMaximumStaleHistogramIndex = kBuiltinJankSequenceNum; constexpr base::TimeDelta kStaleHistogramMin = base::TimeDelta::FromMicroseconds(1); @@ -56,7 +56,7 @@ int GetIndexForJankMetric(FrameSequenceMetrics::ThreadType thread_type, return static_cast<int>(type); DCHECK_EQ(thread_type, FrameSequenceMetrics::ThreadType::kCompositor); - return static_cast<int>(type) + kBuiltinSequenceNum; + return static_cast<int>(type) + kBuiltinJankSequenceNum; } int GetIndexForStaleMetric(FrameSequenceTrackerType type) { diff --git a/chromium/components/guest_view/browser/BUILD.gn b/chromium/components/guest_view/browser/BUILD.gn index 4dcb6d1ff61..bc9386e4172 100644 --- a/chromium/components/guest_view/browser/BUILD.gn +++ b/chromium/components/guest_view/browser/BUILD.gn @@ -8,7 +8,9 @@ # remove this assert. assert(!is_android && !is_ios) -static_library("browser") { +import("//build/config/jumbo.gni") + +jumbo_static_library("browser") { output_name = "guest_view_browser" sources = [ "//components/guest_view/browser/bad_message.cc", diff --git a/chromium/components/guest_view/renderer/BUILD.gn b/chromium/components/guest_view/renderer/BUILD.gn index 13065887efd..d79abfecbf7 100644 --- a/chromium/components/guest_view/renderer/BUILD.gn +++ b/chromium/components/guest_view/renderer/BUILD.gn @@ -8,7 +8,9 @@ # remove this assert. assert(!is_android && !is_ios) -static_library("renderer") { +import("//build/config/jumbo.gni") + +jumbo_static_library("renderer") { sources = [ "guest_view_container.cc", "guest_view_container.h", diff --git a/chromium/components/metrics/metrics_state_manager.cc b/chromium/components/metrics/metrics_state_manager.cc index 3229da7384b..dd8931b8ab5 100644 --- a/chromium/components/metrics/metrics_state_manager.cc +++ b/chromium/components/metrics/metrics_state_manager.cc @@ -40,7 +40,7 @@ namespace { // The argument used to generate a non-identifying entropy source. We want no // more than 13 bits of entropy, so use this max to return a number in the range // [0, 7999] as the entropy source (12.97 bits of entropy). -const int kMaxLowEntropySize = 8000; +const int kThisMaxLowEntropySize = 8000; int64_t ReadEnabledDate(PrefService* local_state) { return local_state->GetInt64(prefs::kMetricsReportingEnabledTimestamp); @@ -321,7 +321,7 @@ std::unique_ptr<const base::FieldTrial::EntropyProvider> MetricsStateManager::CreateLowEntropyProvider() { int source = GetLowEntropySource(); return std::make_unique<variations::NormalizedMurmurHashEntropyProvider>( - base::checked_cast<uint16_t>(source), kMaxLowEntropySize); + base::checked_cast<uint16_t>(source), kThisMaxLowEntropySize); } // static diff --git a/chromium/components/printing/browser/BUILD.gn b/chromium/components/printing/browser/BUILD.gn index c727ca42044..aa6c294a745 100644 --- a/chromium/components/printing/browser/BUILD.gn +++ b/chromium/components/printing/browser/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. import("//build/buildflag_header.gni") +import("//build/config/jumbo.gni") if (is_chromeos) { import("//printing/backend/tools/code_generator.gni") } @@ -30,7 +31,7 @@ if (is_chromeos) { } } -static_library("browser") { +jumbo_static_library("browser") { sources = [ "print_composite_client.cc", "print_composite_client.h", diff --git a/chromium/components/printing/common/BUILD.gn b/chromium/components/printing/common/BUILD.gn index d7d9e04887b..ba299d0a33a 100644 --- a/chromium/components/printing/common/BUILD.gn +++ b/chromium/components/printing/common/BUILD.gn @@ -2,11 +2,12 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/jumbo.gni") import("//build/config/features.gni") import("//mojo/public/tools/bindings/mojom.gni") import("//printing/buildflags/buildflags.gni") -static_library("common") { +jumbo_static_library("common") { sources = [ "cloud_print_cdd_conversion.cc", "cloud_print_cdd_conversion.h", diff --git a/chromium/components/storage_monitor/BUILD.gn b/chromium/components/storage_monitor/BUILD.gn index 33bcb82c603..d45e903a13a 100644 --- a/chromium/components/storage_monitor/BUILD.gn +++ b/chromium/components/storage_monitor/BUILD.gn @@ -2,9 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/jumbo.gni") import("//build/config/features.gni") -static_library("storage_monitor") { +jumbo_static_library("storage_monitor") { sources = [ "media_storage_util.cc", "media_storage_util.h", diff --git a/chromium/components/viz/service/BUILD.gn b/chromium/components/viz/service/BUILD.gn index 5e7cae0671e..c56ea5edffa 100644 --- a/chromium/components/viz/service/BUILD.gn +++ b/chromium/components/viz/service/BUILD.gn @@ -178,6 +178,11 @@ viz_component("service") { "viz_service_export.h", ] + jumbo_excluded_sources = [ + "display/display.cc", + "display/overlay_processor_on_gpu.cc", + ] + defines = [ "VIZ_SERVICE_IMPLEMENTATION" ] allow_circular_includes_from = [ ":gpu_service_dependencies" ] diff --git a/chromium/components/viz/service/display_embedder/skia_output_device_webview.cc b/chromium/components/viz/service/display_embedder/skia_output_device_webview.cc index a4af3e197cb..02efbf65f12 100644 --- a/chromium/components/viz/service/display_embedder/skia_output_device_webview.cc +++ b/chromium/components/viz/service/display_embedder/skia_output_device_webview.cc @@ -18,7 +18,7 @@ namespace viz { namespace { -constexpr auto kSurfaceColorType = kRGBA_8888_SkColorType; +constexpr auto kMySurfaceColorType = kRGBA_8888_SkColorType; } SkiaOutputDeviceWebView::SkiaOutputDeviceWebView( @@ -42,9 +42,9 @@ SkiaOutputDeviceWebView::SkiaOutputDeviceWebView( DCHECK(context_state_->context()); capabilities_.sk_color_types[static_cast<int>(gfx::BufferFormat::RGBA_8888)] = - kSurfaceColorType; + kMySurfaceColorType; capabilities_.sk_color_types[static_cast<int>(gfx::BufferFormat::BGRA_8888)] = - kSurfaceColorType; + kMySurfaceColorType; } SkiaOutputDeviceWebView::~SkiaOutputDeviceWebView() = default; @@ -105,7 +105,7 @@ void SkiaOutputDeviceWebView::InitSkiaSurface(unsigned int fbo) { GrGLFramebufferInfo framebuffer_info; framebuffer_info.fFBOID = fbo; framebuffer_info.fFormat = GL_RGBA8; - SkColorType color_type = kSurfaceColorType; + SkColorType color_type = kMySurfaceColorType; GrBackendRenderTarget render_target(size_.width(), size_.height(), /*sampleCnt=*/0, diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn index 1c3a5dda366..e9f611970e7 100644 --- a/chromium/content/browser/BUILD.gn +++ b/chromium/content/browser/BUILD.gn @@ -21,6 +21,82 @@ import("//printing/buildflags/buildflags.gni") import("//third_party/blink/public/public_features.gni") import("//tools/ipc_fuzzer/ipc_fuzzer.gni") +jumbo_static_library("devtools_protocol") { + configs += [ + "//build/config:precompiled_headers", + "//content:content_implementation", + ] + + deps = [ + "//base", + "//content/browser/devtools:devtools_background_services_proto", + "//content/browser/devtools:protocol_sources", + "//content/common:buildflags", + "//third_party/inspector_protocol:crdtp", + ] + + sources = [ + "$target_gen_dir/devtools/protocol/audits.cc", + "$target_gen_dir/devtools/protocol/audits.h", + "$target_gen_dir/devtools/protocol/background_service.cc", + "$target_gen_dir/devtools/protocol/background_service.h", + "$target_gen_dir/devtools/protocol/base_string_adapter.cc", + "$target_gen_dir/devtools/protocol/base_string_adapter.h", + "$target_gen_dir/devtools/protocol/browser.cc", + "$target_gen_dir/devtools/protocol/browser.h", + "$target_gen_dir/devtools/protocol/dom.cc", + "$target_gen_dir/devtools/protocol/dom.h", + "$target_gen_dir/devtools/protocol/emulation.cc", + "$target_gen_dir/devtools/protocol/emulation.h", + "$target_gen_dir/devtools/protocol/fetch.cc", + "$target_gen_dir/devtools/protocol/fetch.h", + "$target_gen_dir/devtools/protocol/forward.h", + "$target_gen_dir/devtools/protocol/input.cc", + "$target_gen_dir/devtools/protocol/input.h", + "$target_gen_dir/devtools/protocol/inspector.cc", + "$target_gen_dir/devtools/protocol/inspector.h", + "$target_gen_dir/devtools/protocol/io.cc", + "$target_gen_dir/devtools/protocol/io.h", + "$target_gen_dir/devtools/protocol/log.cc", + "$target_gen_dir/devtools/protocol/log.h", + "$target_gen_dir/devtools/protocol/memory.cc", + "$target_gen_dir/devtools/protocol/memory.h", + "$target_gen_dir/devtools/protocol/network.cc", + "$target_gen_dir/devtools/protocol/network.h", + "$target_gen_dir/devtools/protocol/overlay.cc", + "$target_gen_dir/devtools/protocol/overlay.h", + "$target_gen_dir/devtools/protocol/page.cc", + "$target_gen_dir/devtools/protocol/page.h", + "$target_gen_dir/devtools/protocol/protocol.cc", + "$target_gen_dir/devtools/protocol/protocol.h", + "$target_gen_dir/devtools/protocol/runtime.cc", + "$target_gen_dir/devtools/protocol/runtime.h", + "$target_gen_dir/devtools/protocol/schema.cc", + "$target_gen_dir/devtools/protocol/schema.h", + "$target_gen_dir/devtools/protocol/security.cc", + "$target_gen_dir/devtools/protocol/security.h", + "$target_gen_dir/devtools/protocol/service_worker.cc", + "$target_gen_dir/devtools/protocol/service_worker.h", + "$target_gen_dir/devtools/protocol/storage.cc", + "$target_gen_dir/devtools/protocol/storage.h", + "$target_gen_dir/devtools/protocol/system_info.cc", + "$target_gen_dir/devtools/protocol/system_info.h", + "$target_gen_dir/devtools/protocol/target.cc", + "$target_gen_dir/devtools/protocol/target.h", + "$target_gen_dir/devtools/protocol/tethering.cc", + "$target_gen_dir/devtools/protocol/tethering.h", + "$target_gen_dir/devtools/protocol/tracing.cc", + "$target_gen_dir/devtools/protocol/tracing.h", + ] + if (!is_android) { + # The WebAuthn devtools protocol API is not supported in Android yet. + sources += [ + "$target_gen_dir/devtools/protocol/web_authn.cc", + "$target_gen_dir/devtools/protocol/web_authn.h", + ] + } +} + jumbo_static_library("browser") { # Only the public target should depend on this. All other targets (even # internal content ones) should depend on the public one. @@ -105,8 +181,6 @@ jumbo_static_library("browser") { "//content/browser/content_index:content_index_proto", "//content/browser/conversions:mojo_bindings", "//content/browser/cookie_store:cookie_store_proto", - "//content/browser/devtools:devtools_background_services_proto", - "//content/browser/devtools:protocol_sources", "//content/browser/file_system_access:proto", "//content/browser/notifications:notification_proto", "//content/browser/payments:payment_app_proto", @@ -246,6 +320,7 @@ jumbo_static_library("browser") { "//ui/snapshot", "//ui/touch_selection", "//v8:v8_version", + ":devtools_protocol", ] public_deps = [ @@ -260,57 +335,6 @@ jumbo_static_library("browser") { ] sources = [ - "$target_gen_dir/devtools/protocol/audits.cc", - "$target_gen_dir/devtools/protocol/audits.h", - "$target_gen_dir/devtools/protocol/background_service.cc", - "$target_gen_dir/devtools/protocol/background_service.h", - "$target_gen_dir/devtools/protocol/base_string_adapter.cc", - "$target_gen_dir/devtools/protocol/base_string_adapter.h", - "$target_gen_dir/devtools/protocol/browser.cc", - "$target_gen_dir/devtools/protocol/browser.h", - "$target_gen_dir/devtools/protocol/dom.cc", - "$target_gen_dir/devtools/protocol/dom.h", - "$target_gen_dir/devtools/protocol/emulation.cc", - "$target_gen_dir/devtools/protocol/emulation.h", - "$target_gen_dir/devtools/protocol/fetch.cc", - "$target_gen_dir/devtools/protocol/fetch.h", - "$target_gen_dir/devtools/protocol/forward.h", - "$target_gen_dir/devtools/protocol/input.cc", - "$target_gen_dir/devtools/protocol/input.h", - "$target_gen_dir/devtools/protocol/inspector.cc", - "$target_gen_dir/devtools/protocol/inspector.h", - "$target_gen_dir/devtools/protocol/io.cc", - "$target_gen_dir/devtools/protocol/io.h", - "$target_gen_dir/devtools/protocol/log.cc", - "$target_gen_dir/devtools/protocol/log.h", - "$target_gen_dir/devtools/protocol/memory.cc", - "$target_gen_dir/devtools/protocol/memory.h", - "$target_gen_dir/devtools/protocol/network.cc", - "$target_gen_dir/devtools/protocol/network.h", - "$target_gen_dir/devtools/protocol/overlay.cc", - "$target_gen_dir/devtools/protocol/overlay.h", - "$target_gen_dir/devtools/protocol/page.cc", - "$target_gen_dir/devtools/protocol/page.h", - "$target_gen_dir/devtools/protocol/protocol.cc", - "$target_gen_dir/devtools/protocol/protocol.h", - "$target_gen_dir/devtools/protocol/runtime.cc", - "$target_gen_dir/devtools/protocol/runtime.h", - "$target_gen_dir/devtools/protocol/schema.cc", - "$target_gen_dir/devtools/protocol/schema.h", - "$target_gen_dir/devtools/protocol/security.cc", - "$target_gen_dir/devtools/protocol/security.h", - "$target_gen_dir/devtools/protocol/service_worker.cc", - "$target_gen_dir/devtools/protocol/service_worker.h", - "$target_gen_dir/devtools/protocol/storage.cc", - "$target_gen_dir/devtools/protocol/storage.h", - "$target_gen_dir/devtools/protocol/system_info.cc", - "$target_gen_dir/devtools/protocol/system_info.h", - "$target_gen_dir/devtools/protocol/target.cc", - "$target_gen_dir/devtools/protocol/target.h", - "$target_gen_dir/devtools/protocol/tethering.cc", - "$target_gen_dir/devtools/protocol/tethering.h", - "$target_gen_dir/devtools/protocol/tracing.cc", - "$target_gen_dir/devtools/protocol/tracing.h", "about_url_loader_factory.cc", "about_url_loader_factory.h", "accessibility/accessibility_event_recorder.cc", @@ -2048,6 +2072,13 @@ jumbo_static_library("browser") { ] } + jumbo_excluded_sources = [ + "push_messaging/push_messaging_router.cc", + "renderer_host/media/media_devices_manager.cc", + "service_worker/service_worker_registry.cc", + "web_package/web_bundle_blob_data_source.cc", + ] + if (toolkit_views) { deps += [ "//ui/events" ] } @@ -2267,6 +2298,9 @@ jumbo_static_library("browser") { "media/capture/desktop_capture_device.h", ] deps += [ "//third_party/webrtc_overrides:webrtc_component" ] + jumbo_excluded_sources += [ + "media/capture/desktop_capture_device.cc", + ] } } @@ -2555,6 +2589,12 @@ jumbo_static_library("browser") { "web_contents/web_contents_view_android.h", ] + jumbo_excluded_sources += [ + # Files with kJavaLangClass and similar constants: + # Bug https://crbug.com/787557. + "android/java/java_method.cc", # and in gin_java_bound_object.cc. + ] + deps += [ ":reflection_jni_headers", "//build/config/freetype", @@ -2582,10 +2622,6 @@ jumbo_static_library("browser") { } else { # Not Android. sources += [ - # The WebAuthn devtools protocol API is not supported in Android yet. - "$target_gen_dir/devtools/protocol/web_authn.cc", - "$target_gen_dir/devtools/protocol/web_authn.h", - # Devtools frontend not included in Android "devtools/devtools_frontend_host_impl.cc", "devtools/devtools_frontend_host_impl.h", @@ -2810,6 +2846,7 @@ jumbo_static_library("browser") { "gpu/viz_devtools_connector.cc", "gpu/viz_devtools_connector.h", ] + jumbo_excluded_sources += [ "gpu/viz_devtools_connector.cc" ] } if (enable_vr) { diff --git a/chromium/content/browser/cookie_store/cookie_change_subscription.cc b/chromium/content/browser/cookie_store/cookie_change_subscription.cc index 6dff0ba3213..4e35e50be4d 100644 --- a/chromium/content/browser/cookie_store/cookie_change_subscription.cc +++ b/chromium/content/browser/cookie_store/cookie_change_subscription.cc @@ -7,14 +7,15 @@ #include <utility> #include "content/browser/cookie_store/cookie_change_subscriptions.pb.h" +#include "third_party/blink/renderer/platform/wtf/assertions.h" namespace content { namespace { -#define STATIC_ASSERT_ENUM(a, b) \ - static_assert(static_cast<int>(a) == static_cast<int>(b), \ - "mismatching enums: " #a) +//#define STATIC_ASSERT_ENUM(a, b) \ +// static_assert(static_cast<int>(a) == static_cast<int>(b), \ +// "mismatching enums: " #a) STATIC_ASSERT_ENUM(network::mojom::CookieMatchType::EQUALS, proto::CookieMatchType::EQUALS); diff --git a/chromium/content/browser/devtools/BUILD.gn b/chromium/content/browser/devtools/BUILD.gn index d715654aeea..aaa9842bc0d 100644 --- a/chromium/content/browser/devtools/BUILD.gn +++ b/chromium/content/browser/devtools/BUILD.gn @@ -39,7 +39,7 @@ if (!is_android && !is_fuchsia) { } inspector_protocol_generate("protocol_sources") { - visibility = [ "//content/browser" ] + visibility = [ "//content/browser:*" ] deps = [ "//third_party/blink/public/devtools_protocol:protocol_version" ] _blink_protocol_path = rebase_path( "$root_gen_dir/third_party/blink/public/devtools_protocol/protocol.json", diff --git a/chromium/content/browser/net/cross_origin_embedder_policy_reporter.cc b/chromium/content/browser/net/cross_origin_embedder_policy_reporter.cc index 03616fbcc27..f63cbb90142 100644 --- a/chromium/content/browser/net/cross_origin_embedder_policy_reporter.cc +++ b/chromium/content/browser/net/cross_origin_embedder_policy_reporter.cc @@ -13,7 +13,7 @@ namespace content { namespace { -constexpr char kType[] = "coep"; +constexpr char kTypeCoep[] = "coep"; GURL StripUsernameAndPassword(const GURL& url) { url::Replacements<char> replacements; @@ -95,7 +95,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify( blink::mojom::ReportBodyElement::New("disposition", disposition)); observer_->Notify(blink::mojom::Report::New( - kType, context_url_, blink::mojom::ReportBody::New(std::move(list)))); + kTypeCoep, context_url_, blink::mojom::ReportBody::New(std::move(list)))); } if (endpoint) { base::DictionaryValue body_to_pass; @@ -107,7 +107,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify( // TODO(https://crbug.com/993805): Pass in the appropriate // NetworkIsolationKey. storage_partition_->GetNetworkContext()->QueueReport( - kType, *endpoint, context_url_, net::NetworkIsolationKey::Todo(), + kTypeCoep, *endpoint, context_url_, net::NetworkIsolationKey::Todo(), /*user_agent=*/base::nullopt, std::move(body_to_pass)); } } diff --git a/chromium/content/browser/quota/quota_change_dispatcher.h b/chromium/content/browser/quota/quota_change_dispatcher.h index cfd3937132c..920f4ea3070 100644 --- a/chromium/content/browser/quota/quota_change_dispatcher.h +++ b/chromium/content/browser/quota/quota_change_dispatcher.h @@ -16,8 +16,6 @@ #include "third_party/blink/public/mojom/quota/quota_manager_host.mojom.h" #include "url/origin.h" -class TimeDelta; - namespace content { // Dispatches a storage pressure event to listeners across multiple origins. @@ -69,4 +67,4 @@ class CONTENT_EXPORT QuotaChangeDispatcher } // namespace content -#endif // CONTENT_BROWSER_QUOTA_QUOTA_CHANGE_DISPATCHER_H_
\ No newline at end of file +#endif // CONTENT_BROWSER_QUOTA_QUOTA_CHANGE_DISPATCHER_H_ diff --git a/chromium/content/browser/renderer_host/render_frame_proxy_host.cc b/chromium/content/browser/renderer_host/render_frame_proxy_host.cc index 2e4e1ead8f9..6668564415a 100644 --- a/chromium/content/browser/renderer_host/render_frame_proxy_host.cc +++ b/chromium/content/browser/renderer_host/render_frame_proxy_host.cc @@ -58,10 +58,10 @@ typedef std::unordered_map<RenderFrameProxyHostID, base::LazyInstance<RoutingIDFrameProxyMap>::DestructorAtExit g_routing_id_frame_proxy_map = LAZY_INSTANCE_INITIALIZER; -using TokenFrameMap = std::unordered_map<base::UnguessableToken, - RenderFrameProxyHost*, - base::UnguessableTokenHash>; -base::LazyInstance<TokenFrameMap>::Leaky g_token_frame_proxy_map = +using TokenFrameProxyMap = std::unordered_map<base::UnguessableToken, + RenderFrameProxyHost*, + base::UnguessableTokenHash>; +base::LazyInstance<TokenFrameProxyMap>::Leaky g_token_frame_proxy_map = LAZY_INSTANCE_INITIALIZER; } // namespace @@ -86,7 +86,7 @@ RenderFrameProxyHost* RenderFrameProxyHost::FromFrameToken( int process_id, const base::UnguessableToken& frame_token) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - TokenFrameMap* frames = g_token_frame_proxy_map.Pointer(); + TokenFrameProxyMap* frames = g_token_frame_proxy_map.Pointer(); auto it = frames->find(frame_token); // The check against |process_id| isn't strictly necessary, but represents // an extra level of protection against a renderer trying to force a frame diff --git a/chromium/content/browser/service_worker/service_worker_resource_ops.h b/chromium/content/browser/service_worker/service_worker_resource_ops.h index ca71cc48bc0..bc9d3affb79 100644 --- a/chromium/content/browser/service_worker/service_worker_resource_ops.h +++ b/chromium/content/browser/service_worker/service_worker_resource_ops.h @@ -149,7 +149,7 @@ class CONTENT_EXPORT ServiceWorkerResourceReaderImpl DiskEntryOpener entry_opener_; // Used to read metadata from disk cache. - scoped_refptr<BigIOBuffer> metadata_buffer_; + scoped_refptr<content::BigIOBuffer> metadata_buffer_; // Holds the return value of ReadResponseHead(). Stored as a member field // to handle //net-style maybe-async methods. network::mojom::URLResponseHeadPtr response_head_; diff --git a/chromium/device/fido/cable/cable_discovery_data.h b/chromium/device/fido/cable/cable_discovery_data.h index 14c9dfd617a..846a0c8387f 100644 --- a/chromium/device/fido/cable/cable_discovery_data.h +++ b/chromium/device/fido/cable/cable_discovery_data.h @@ -94,7 +94,7 @@ struct COMPONENT_EXPORT(DEVICE_FIDO) Pairing { // within the structure is validated by using |local_identity_seed| and // |handshake_hash|. static base::Optional<std::unique_ptr<Pairing>> Parse( - const cbor::Value& cbor, + const ::cbor::Value& cbor, uint32_t tunnel_server_domain, base::span<const uint8_t, kQRSeedSize> local_identity_seed, base::span<const uint8_t, 32> handshake_hash); diff --git a/chromium/device/fido/public_key_credential_descriptor.h b/chromium/device/fido/public_key_credential_descriptor.h index 70b89428c00..62772d5cac6 100644 --- a/chromium/device/fido/public_key_credential_descriptor.h +++ b/chromium/device/fido/public_key_credential_descriptor.h @@ -25,7 +25,7 @@ namespace device { class COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialDescriptor { public: static base::Optional<PublicKeyCredentialDescriptor> CreateFromCBORValue( - const cbor::Value& cbor); + const ::cbor::Value& cbor); PublicKeyCredentialDescriptor(); PublicKeyCredentialDescriptor(CredentialType credential_type, @@ -63,7 +63,7 @@ class COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialDescriptor { base::flat_set<FidoTransportProtocol> transports_; }; -cbor::Value AsCBOR(const PublicKeyCredentialDescriptor&); +::cbor::Value AsCBOR(const PublicKeyCredentialDescriptor&); } // namespace device diff --git a/chromium/device/fido/public_key_credential_params.h b/chromium/device/fido/public_key_credential_params.h index c93ca32e61b..f62fc338063 100644 --- a/chromium/device/fido/public_key_credential_params.h +++ b/chromium/device/fido/public_key_credential_params.h @@ -32,7 +32,7 @@ class COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialParams { }; static base::Optional<PublicKeyCredentialParams> CreateFromCBORValue( - const cbor::Value& cbor_value); + const ::cbor::Value& cbor_value); explicit PublicKeyCredentialParams( std::vector<CredentialInfo> credential_params); @@ -50,7 +50,7 @@ class COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialParams { std::vector<CredentialInfo> public_key_credential_params_; }; -cbor::Value AsCBOR(const PublicKeyCredentialParams&); +::cbor::Value AsCBOR(const PublicKeyCredentialParams&); } // namespace device diff --git a/chromium/device/fido/public_key_credential_rp_entity.h b/chromium/device/fido/public_key_credential_rp_entity.h index 60fd7d8e3d1..3b4691f78e9 100644 --- a/chromium/device/fido/public_key_credential_rp_entity.h +++ b/chromium/device/fido/public_key_credential_rp_entity.h @@ -23,7 +23,7 @@ namespace device { struct COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialRpEntity { public: static base::Optional<PublicKeyCredentialRpEntity> CreateFromCBORValue( - const cbor::Value& cbor); + const ::cbor::Value& cbor); PublicKeyCredentialRpEntity(); explicit PublicKeyCredentialRpEntity(std::string id); @@ -43,7 +43,7 @@ struct COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialRpEntity { base::Optional<GURL> icon_url; }; -cbor::Value AsCBOR(const PublicKeyCredentialRpEntity&); +::cbor::Value AsCBOR(const PublicKeyCredentialRpEntity&); } // namespace device diff --git a/chromium/device/fido/public_key_credential_user_entity.h b/chromium/device/fido/public_key_credential_user_entity.h index 240245597f1..ac00239d239 100644 --- a/chromium/device/fido/public_key_credential_user_entity.h +++ b/chromium/device/fido/public_key_credential_user_entity.h @@ -24,7 +24,7 @@ namespace device { class COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialUserEntity { public: static base::Optional<PublicKeyCredentialUserEntity> CreateFromCBORValue( - const cbor::Value& cbor); + const ::cbor::Value& cbor); PublicKeyCredentialUserEntity(); explicit PublicKeyCredentialUserEntity(std::vector<uint8_t> id); @@ -47,7 +47,7 @@ class COMPONENT_EXPORT(DEVICE_FIDO) PublicKeyCredentialUserEntity { base::Optional<GURL> icon_url; }; -cbor::Value AsCBOR(const PublicKeyCredentialUserEntity&); +::cbor::Value AsCBOR(const PublicKeyCredentialUserEntity&); } // namespace device diff --git a/chromium/gpu/command_buffer/service/BUILD.gn b/chromium/gpu/command_buffer/service/BUILD.gn index a6dfbf1b4f8..a6adaaa0080 100644 --- a/chromium/gpu/command_buffer/service/BUILD.gn +++ b/chromium/gpu/command_buffer/service/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("//build/config/jumbo.gni") import("//build/config/ui.gni") import("//gpu/vulkan/features.gni") import("//skia/features.gni") @@ -26,9 +25,9 @@ group("gles2") { } if (is_component_build) { - link_target_type = "jumbo_source_set" + link_target_type = "source_set" } else { - link_target_type = "jumbo_static_library" + link_target_type = "static_library" } target(link_target_type, "service_sources") { # External code should depend on this via //gpu/command_buffer/service above @@ -488,7 +487,7 @@ proto_library("disk_cache_proto") { } if (is_android) { - jumbo_static_library("android_texture_owner_test_support") { + static_library("android_texture_owner_test_support") { testonly = true sources = [ "mock_abstract_texture.cc", diff --git a/chromium/gpu/config/BUILD.gn b/chromium/gpu/config/BUILD.gn index 18a0db79907..859cc506e4c 100644 --- a/chromium/gpu/config/BUILD.gn +++ b/chromium/gpu/config/BUILD.gn @@ -5,7 +5,6 @@ import("//build/config/chrome_build.gni") import("//build/config/chromecast_build.gni") import("//build/config/chromeos/ui_mode.gni") -import("//build/config/jumbo.gni") import("//build/config/python.gni") import("//build/config/ui.gni") import("//gpu/vulkan/features.gni") @@ -114,7 +113,7 @@ if (enable_vulkan) { } } -jumbo_source_set("config_sources") { +source_set("config_sources") { # External code should depend on this via //gpu/config above rather than # depending on this directly or the component build will break. visibility = [ "//gpu/*" ] diff --git a/chromium/media/filters/media_file_checker.cc b/chromium/media/filters/media_file_checker.cc index a0f2848bbc6..2ae23e02fcb 100644 --- a/chromium/media/filters/media_file_checker.cc +++ b/chromium/media/filters/media_file_checker.cc @@ -29,7 +29,7 @@ void OnMediaFileCheckerError(bool* called) { *called = false; } -struct Decoder { +struct DecoderStruct { std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> context; std::unique_ptr<FFmpegDecodingLoop> loop; }; @@ -59,7 +59,7 @@ bool MediaFileChecker::Start(base::TimeDelta check_time) { // Remember the codec context for any decodable audio or video streams. bool found_streams = false; - std::vector<Decoder> stream_contexts(format_context->nb_streams); + std::vector<DecoderStruct> stream_contexts(format_context->nb_streams); for (size_t i = 0; i < format_context->nb_streams; ++i) { AVCodecParameters* cp = format_context->streams[i]->codecpar; diff --git a/chromium/mojo/public/tools/bindings/mojom.gni b/chromium/mojo/public/tools/bindings/mojom.gni index 989825f5ef3..dd042201d21 100644 --- a/chromium/mojo/public/tools/bindings/mojom.gni +++ b/chromium/mojo/public/tools/bindings/mojom.gni @@ -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("//build/config/jumbo.gni") import("//build/config/python.gni") import("//third_party/closure_compiler/closure_args.gni") import("//third_party/closure_compiler/compile_js.gni") @@ -848,7 +847,7 @@ template("mojom") { } shared_cpp_sources_target_name = "${target_name}_shared_cpp_sources" - jumbo_source_set(shared_cpp_sources_target_name) { + source_set(shared_cpp_sources_target_name) { if (defined(invoker.testonly)) { testonly = invoker.testonly } @@ -1361,7 +1360,7 @@ template("mojom") { js_data_deps_target_name = target_name + "_js_data_deps" not_needed([ "js_data_deps_target_name" ]) - target("jumbo_" + output_target_type, "${target_name}${variant_suffix}") { + target(output_target_type, "${target_name}${variant_suffix}") { if (defined(output_name_override)) { output_name = output_name_override } diff --git a/chromium/services/network/public/cpp/BUILD.gn b/chromium/services/network/public/cpp/BUILD.gn index 92bae4c0cc9..431e46b32aa 100644 --- a/chromium/services/network/public/cpp/BUILD.gn +++ b/chromium/services/network/public/cpp/BUILD.gn @@ -273,6 +273,11 @@ jumbo_component("cpp_base") { "url_request_mojom_traits.cc", "url_request_mojom_traits.h", ] + jumbo_excluded_sources = [ + "network_ipc_param_traits.cc", + "p2p_param_traits.cc", + "url_request_mojom_traits.cc" + ] configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/chromium/storage/browser/BUILD.gn b/chromium/storage/browser/BUILD.gn index c8bd1e0c90f..5947353f789 100644 --- a/chromium/storage/browser/BUILD.gn +++ b/chromium/storage/browser/BUILD.gn @@ -214,6 +214,10 @@ jumbo_component("browser") { "quota/usage_tracker.h", ] + jumbo_excluded_sources = [ + "file_system/local_file_stream_reader.cc", + ] + defines = [ "IS_STORAGE_BROWSER_IMPL" ] configs += [ "//build/config:precompiled_headers", diff --git a/chromium/storage/browser/quota/quota_settings.cc b/chromium/storage/browser/quota/quota_settings.cc index 4b8ac29b314..7a5fb1b9ae9 100644 --- a/chromium/storage/browser/quota/quota_settings.cc +++ b/chromium/storage/browser/quota/quota_settings.cc @@ -24,7 +24,7 @@ namespace storage { namespace { -const int64_t kMBytes = 1024 * 1024; +const int64_t _kMBytes = 1024 * 1024; const int kRandomizedPercentage = 10; const double kDefaultPerHostRatio = 0.75; const double kDefaultPoolSizeRatio = 0.8; @@ -32,7 +32,7 @@ const double kIncognitoQuotaRatioLowerBound = 0.15; const double kIncognitoQuotaRatioUpperBound = 0.2; // Skews |value| by +/- |percent|. -int64_t RandomizeByPercent(int64_t value, int percent) { +int64_t MyRandomizeByPercent(int64_t value, int percent) { double random_percent = (base::RandDouble() - 0.5) * percent * 2; return value + (value * (random_percent / 100.0)); } @@ -83,7 +83,7 @@ base::Optional<QuotaSettings> CalculateNominalDynamicSettings( // * 64GB storage -- min(6GB,2GB) = 2GB // * 16GB storage -- min(1.6GB,2GB) = 1.6GB // * 8GB storage -- min(800MB,2GB) = 800MB - const int64_t kShouldRemainAvailableFixed = 2048 * kMBytes; // 2GB + const int64_t kShouldRemainAvailableFixed = 2048 * _kMBytes; // 2GB const double kShouldRemainAvailableRatio = 0.1; // 10% // The amount of the device's storage the browser attempts to @@ -98,7 +98,7 @@ base::Optional<QuotaSettings> CalculateNominalDynamicSettings( // * 64GB storage -- min(640MB,1GB) = 640MB // * 16GB storage -- min(160MB,1GB) = 160MB // * 8GB storage -- min(80MB,1GB) = 80MB - const int64_t kMustRemainAvailableFixed = 1024 * kMBytes; // 1GB + const int64_t kMustRemainAvailableFixed = 1024 * _kMBytes; // 1GB const double kMustRemainAvailableRatio = 0.01; // 1% // The fraction of the temporary pool that can be utilized by a single host. @@ -107,7 +107,7 @@ base::Optional<QuotaSettings> CalculateNominalDynamicSettings( // SessionOnly (or ephemeral) origins are allotted a fraction of what // normal origins are provided, and the amount is capped to a hard limit. const double kSessionOnlyHostQuotaRatio = 0.1; // 10% - const int64_t kMaxSessionOnlyHostQuota = 300 * kMBytes; + const int64_t kMaxSessionOnlyHostQuota = 300 * _kMBytes; QuotaSettings settings; @@ -128,7 +128,7 @@ base::Optional<QuotaSettings> CalculateNominalDynamicSettings( static_cast<int64_t>(total * kMustRemainAvailableRatio)); settings.per_host_quota = pool_size * kPerHostTemporaryRatio; settings.session_only_per_host_quota = std::min( - RandomizeByPercent(kMaxSessionOnlyHostQuota, kRandomizedPercentage), + MyRandomizeByPercent(kMaxSessionOnlyHostQuota, kRandomizedPercentage), static_cast<int64_t>(settings.per_host_quota * kSessionOnlyHostQuotaRatio)); settings.refresh_interval = base::TimeDelta::FromSeconds(60); diff --git a/chromium/third_party/blink/common/user_agent/user_agent_metadata.cc b/chromium/third_party/blink/common/user_agent/user_agent_metadata.cc index e6477dcf950..e3bfa8be48c 100644 --- a/chromium/third_party/blink/common/user_agent/user_agent_metadata.cc +++ b/chromium/third_party/blink/common/user_agent/user_agent_metadata.cc @@ -10,7 +10,7 @@ namespace blink { namespace { -constexpr uint32_t kVersion = 2u; +constexpr uint32_t kVersionUA = 2u; } // namespace UserAgentBrandVersion::UserAgentBrandVersion( @@ -47,7 +47,7 @@ base::Optional<std::string> UserAgentMetadata::Marshal( if (!in) return base::nullopt; base::Pickle out; - out.WriteUInt32(kVersion); + out.WriteUInt32(kVersionUA); out.WriteUInt32(in->brand_version_list.size()); for (const auto& brand_version : in->brand_version_list) { @@ -75,7 +75,7 @@ base::Optional<UserAgentMetadata> UserAgentMetadata::Demarshal( uint32_t version; UserAgentMetadata out; - if (!in.ReadUInt32(&version) || version != kVersion) + if (!in.ReadUInt32(&version) || version != kVersionUA) return base::nullopt; uint32_t brand_version_size; diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py index f64cef88c48..8417375cb05 100644 --- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py @@ -185,6 +185,7 @@ def generate_callback_interface(callback_interface_identifier): cg_context, FN_INSTALL_INTERFACE_TEMPLATE, class_name=class_name, + api_class_name=class_name, trampoline_var_name=None, constructor_entries=[], supplemental_install_node=SequenceNode(), diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py index 5a6c82c1b8f..e1ea6dd9a87 100644 --- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py @@ -5073,7 +5073,7 @@ ${prototype_object}->GetPrototype().As<v8::Object>()->Delete( return SequenceNode(nodes) if nodes else None -def make_install_interface_template(cg_context, function_name, class_name, +def make_install_interface_template(cg_context, function_name, class_name, api_class_name, trampoline_var_name, constructor_entries, supplemental_install_node, install_unconditional_func_name, @@ -5174,7 +5174,7 @@ def make_install_interface_template(cg_context, function_name, class_name, for entry in constructor_entries: set_callback = _format( "${interface_function_template}->SetCallHandler({});", - entry.ctor_callback_name) + api_class_name + "Callbacks::" + entry.ctor_callback_name) set_length = _format("${interface_function_template}->SetLength({});", entry.ctor_func_length) if entry.world == CodeGenContext.MAIN_WORLD: @@ -5564,6 +5564,7 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As<v8::Object>();\ if unconditional_entries: body.append( CxxBlockNode([ + TextNode("using namespace ${class_name}Callbacks;"), make_table_func(table_name, unconditional_entries), TextNode(installer_call_text), ])) @@ -5573,6 +5574,7 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As<v8::Object>();\ CxxUnlikelyIfNode( cond=conditional, body=[ + TextNode("using namespace ${class_name}Callbacks;"), make_table_func(table_name, entries), TextNode(installer_call_text), ])) @@ -5722,6 +5724,8 @@ def make_indexed_and_named_property_callbacks_and_install_node(cg_context): map(lambda flag: "int32_t({})".format(flag), flags)))) pattern = """\ // Named interceptors +{{ +using namespace ${class_name}Callbacks; ${instance_object_template}->SetHandler( v8::NamedPropertyHandlerConfiguration( {impl_bridge}::NamedPropertyGetterCallback, @@ -5742,7 +5746,9 @@ interface.indexed_and_named_properties.named_getter.extended_attributes: {impl_bridge}::NamedPropertyDefinerCallback, {impl_bridge}::NamedPropertyDescriptorCallback, v8::Local<v8::Value>(), - {property_handler_flags}));""" + {property_handler_flags})); +}} +""" install_node.append( F(pattern, impl_bridge=impl_bridge, @@ -5781,6 +5787,8 @@ interface.indexed_and_named_properties.named_getter.extended_attributes: property_handler_flags = flags[0] pattern = """\ // Indexed interceptors +{{ +using namespace ${class_name}Callbacks; ${instance_object_template}->SetHandler( v8::IndexedPropertyHandlerConfiguration( {impl_bridge}::IndexedPropertyGetterCallback, @@ -5795,7 +5803,8 @@ ${instance_object_template}->SetHandler( {impl_bridge}::IndexedPropertyDefinerCallback, {impl_bridge}::IndexedPropertyDescriptorCallback, v8::Local<v8::Value>(), - {property_handler_flags}));""" + {property_handler_flags})); +}}""" install_node.append( F(pattern, impl_bridge=impl_bridge, @@ -5852,6 +5861,8 @@ def make_named_properties_object_callbacks_and_install_node(cg_context): callback_defs.append(EmptyNode()) text = """\ +{{ +using namespace ${class_name}Callbacks; // Named interceptors ${npo_prototype_template}->SetHandler( v8::NamedPropertyHandlerConfiguration( @@ -5877,7 +5888,8 @@ ${npo_prototype_template}->SetHandler( NamedPropsObjIndexedDefinerCallback, NamedPropsObjIndexedDescriptorCallback, v8::Local<v8::Value>(), - v8::PropertyHandlerFlags::kNone));""" + v8::PropertyHandlerFlags::kNone)); +}}""" install_node.append(TextNode(text)) return callback_defs, install_node @@ -6016,6 +6028,8 @@ def make_cross_origin_property_callbacks_and_install_node( text = """\ // Cross origin properties +{{ +using namespace ${class_name}Callbacks; ${instance_object_template}->SetAccessCheckCallbackAndHandler( CrossOriginAccessCheckCallback, v8::NamedPropertyHandlerConfiguration( @@ -6041,6 +6055,7 @@ ${instance_object_template}->SetAccessCheckCallbackAndHandler( v8::External::New( ${isolate}, const_cast<WrapperTypeInfo*>(${class_name}::GetWrapperTypeInfo()))); +}} """ install_node.append(TextNode(text)) install_node.accumulate( @@ -6073,6 +6088,8 @@ ${instance_object_template}->SetAccessCheckCallbackAndHandler( callback_defs.append(EmptyNode()) text = """\ +{{ +using namespace ${class_name}Callbacks; // Same origin interceptors ${instance_object_template}->SetHandler( v8::IndexedPropertyHandlerConfiguration( @@ -6085,6 +6102,7 @@ ${instance_object_template}->SetHandler( SameOriginIndexedDescriptorCallback, v8::Local<v8::Value>(), v8::PropertyHandlerFlags::kNone)); +}} """ install_node.append(TextNode(text)) @@ -6200,6 +6218,7 @@ def make_wrapper_type_info(cg_context, function_name, cg_context.template_bindings()) pattern = """\ +namespace ${class_name}Callbacks {{ }} // Construction of WrapperTypeInfo may require non-trivial initialization due // to cross-component address resolution in order to load the pointer to the // parent interface's WrapperTypeInfo. We ignore this issue because the issue @@ -6403,6 +6422,7 @@ def _make_v8_context_snapshot_get_reference_table_function( lambda name: TextNode("reinterpret_cast<intptr_t>({}),".format(name)), filter(None, callback_names)) table_node = ListNode([ + TextNode("using namespace ${class_name}Callbacks;"), TextNode("static const intptr_t kReferenceTable[] = {"), ListNode(entry_nodes), TextNode("};"), @@ -6839,6 +6859,7 @@ def generate_class_like(class_like): cg_context, FN_INSTALL_INTERFACE_TEMPLATE, class_name=impl_class_name, + api_class_name=api_class_name, trampoline_var_name=tp_install_interface_template, constructor_entries=constructor_entries, supplemental_install_node=supplemental_install_node, @@ -7052,7 +7073,7 @@ def generate_class_like(class_like): ]) impl_source_blink_ns.body.extend([ - CxxNamespaceNode(name="", body=callback_defs), + CxxNamespaceNode(name=api_class_name + "Callbacks", body=callback_defs), EmptyNode(), installer_function_defs, EmptyNode(), diff --git a/chromium/third_party/blink/renderer/core/BUILD.gn b/chromium/third_party/blink/renderer/core/BUILD.gn index b2c65ce562b..cfd62b6f1db 100644 --- a/chromium/third_party/blink/renderer/core/BUILD.gn +++ b/chromium/third_party/blink/renderer/core/BUILD.gn @@ -5,6 +5,7 @@ import("//build/config/chromecast_build.gni") import("//build/config/compiler/compiler.gni") import("//build/config/dcheck_always_on.gni") +import("//build/config/jumbo.gni") import("//build/config/ui.gni") import("//build/toolchain/toolchain.gni") import("//printing/buildflags/buildflags.gni") @@ -117,7 +118,7 @@ source_set("core_common") { sources = [ "core_export.h" ] } -source_set("prerequisites") { +jumbo_source_set("prerequisites") { public_deps = [ "//services/network/public/cpp:cpp", "//services/network/public/mojom", @@ -166,7 +167,7 @@ source_set("prerequisites") { ] } -component("core") { +jumbo_component("core") { output_name = "blink_core" visibility = [] # Allow re-assignment of list. diff --git a/chromium/third_party/blink/renderer/core/animation/BUILD.gn b/chromium/third_party/blink/renderer/core/animation/BUILD.gn index a690dc32877..20e51f763b8 100644 --- a/chromium/third_party/blink/renderer/core/animation/BUILD.gn +++ b/chromium/third_party/blink/renderer/core/animation/BUILD.gn @@ -277,6 +277,9 @@ blink_core_sources("animation") { "worklet_animation_controller.cc", "worklet_animation_controller.h", ] + jumbo_excluded_sources = [ + "css_transform_interpolation_type.cc", + ] deps = [ ":buildflags", diff --git a/chromium/third_party/blink/renderer/core/frame/sticky_ad_detector.cc b/chromium/third_party/blink/renderer/core/frame/sticky_ad_detector.cc index 0748d359148..26d5668e6ff 100644 --- a/chromium/third_party/blink/renderer/core/frame/sticky_ad_detector.cc +++ b/chromium/third_party/blink/renderer/core/frame/sticky_ad_detector.cc @@ -20,8 +20,8 @@ namespace blink { namespace { -constexpr base::TimeDelta kFireInterval = base::TimeDelta::FromSeconds(1); -constexpr double kLargeAdSizeToViewportSizeThreshold = 0.3; +constexpr base::TimeDelta kFireInterval2 = base::TimeDelta::FromSeconds(1); +constexpr double kLargeAdSizeToViewportSizeThreshold2 = 0.3; // An sticky element should have a non-default position w.r.t. the viewport. The // main page should also be scrollable. @@ -67,7 +67,7 @@ void StickyAdDetector::MaybeFireDetection(LocalFrame* main_frame) { base::Time current_time = base::Time::Now(); if (last_detection_time_.has_value() && - current_time < last_detection_time_.value() + kFireInterval) { + current_time < last_detection_time_.value() + kFireInterval2) { return; } @@ -116,7 +116,7 @@ void StickyAdDetector::MaybeFireDetection(LocalFrame* main_frame) { bool is_large = (overlay_rect.Size().Area() > - main_frame_size.Area() * kLargeAdSizeToViewportSizeThreshold); + main_frame_size.Area() * kLargeAdSizeToViewportSizeThreshold2); bool is_main_page_scrollable = element->GetDocument().GetLayoutView()->HasScrollableOverflowY(); diff --git a/chromium/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc b/chromium/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc index d4bf83aa10d..9d31832e2a2 100644 --- a/chromium/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc +++ b/chromium/third_party/blink/renderer/core/layout/ng/flex/ng_flex_layout_algorithm.cc @@ -73,10 +73,10 @@ LayoutUnit NGFlexLayoutAlgorithm::MainAxisContentExtent( namespace { -enum AxisEdge { kStart, kCenter, kEnd }; +enum class LocalAxisEdge { kStart, kCenter, kEnd }; // Maps the resolved justify-content value to a static-position edge. -AxisEdge MainAxisStaticPositionEdge(const ComputedStyle& style, +LocalAxisEdge MainAxisStaticPositionEdge(const ComputedStyle& style, bool is_column) { const StyleContentAlignmentData justify = FlexLayoutAlgorithm::ResolvedJustifyContent(style); @@ -86,18 +86,18 @@ AxisEdge MainAxisStaticPositionEdge(const ComputedStyle& style, : style.ResolvedIsRowReverseFlexDirection(); if (content_position == ContentPosition::kFlexEnd) - return is_reverse_flex ? AxisEdge::kStart : AxisEdge::kEnd; + return is_reverse_flex ? LocalAxisEdge::kStart : LocalAxisEdge::kEnd; if (content_position == ContentPosition::kCenter || justify.Distribution() == ContentDistributionType::kSpaceAround || justify.Distribution() == ContentDistributionType::kSpaceEvenly) - return AxisEdge::kCenter; + return LocalAxisEdge::kCenter; - return is_reverse_flex ? AxisEdge::kEnd : AxisEdge::kStart; + return is_reverse_flex ? LocalAxisEdge::kEnd : LocalAxisEdge::kStart; } // Maps the resolved alignment value to a static-position edge. -AxisEdge CrossAxisStaticPositionEdge(const ComputedStyle& style, +LocalAxisEdge CrossAxisStaticPositionEdge(const ComputedStyle& style, const ComputedStyle& child_style) { ItemPosition alignment = FlexLayoutAlgorithm::AlignmentForChild(style, child_style); @@ -105,27 +105,27 @@ AxisEdge CrossAxisStaticPositionEdge(const ComputedStyle& style, // kFlexEnd, but not kStretch. kStretch is supposed to act like kFlexStart. if (style.FlexWrap() == EFlexWrap::kWrapReverse && alignment == ItemPosition::kStretch) { - return AxisEdge::kEnd; + return LocalAxisEdge::kEnd; } if (alignment == ItemPosition::kFlexEnd) - return AxisEdge::kEnd; + return LocalAxisEdge::kEnd; if (alignment == ItemPosition::kCenter) - return AxisEdge::kCenter; + return LocalAxisEdge::kCenter; - return AxisEdge::kStart; + return LocalAxisEdge::kStart; } } // namespace void NGFlexLayoutAlgorithm::HandleOutOfFlowPositioned(NGBlockNode child) { - AxisEdge main_axis_edge = MainAxisStaticPositionEdge(Style(), is_column_); - AxisEdge cross_axis_edge = + LocalAxisEdge main_axis_edge = MainAxisStaticPositionEdge(Style(), is_column_); + LocalAxisEdge cross_axis_edge = CrossAxisStaticPositionEdge(Style(), child.Style()); - AxisEdge inline_axis_edge = is_column_ ? cross_axis_edge : main_axis_edge; - AxisEdge block_axis_edge = is_column_ ? main_axis_edge : cross_axis_edge; + LocalAxisEdge inline_axis_edge = is_column_ ? cross_axis_edge : main_axis_edge; + LocalAxisEdge block_axis_edge = is_column_ ? main_axis_edge : cross_axis_edge; using InlineEdge = NGLogicalStaticPosition::InlineEdge; using BlockEdge = NGLogicalStaticPosition::BlockEdge; @@ -135,9 +135,9 @@ void NGFlexLayoutAlgorithm::HandleOutOfFlowPositioned(NGBlockNode child) { LogicalOffset offset = BorderScrollbarPadding().StartOffset(); // Determine the static-position based off the axis-edge. - if (inline_axis_edge == AxisEdge::kStart) { + if (inline_axis_edge == LocalAxisEdge::kStart) { inline_edge = InlineEdge::kInlineStart; - } else if (inline_axis_edge == AxisEdge::kCenter) { + } else if (inline_axis_edge == LocalAxisEdge::kCenter) { inline_edge = InlineEdge::kInlineCenter; offset.inline_offset += ChildAvailableSize().inline_size / 2; } else { @@ -147,9 +147,9 @@ void NGFlexLayoutAlgorithm::HandleOutOfFlowPositioned(NGBlockNode child) { // We may not know the final block-size of the fragment yet. This will be // adjusted within the |NGContainerFragmentBuilder| once set. - if (block_axis_edge == AxisEdge::kStart) { + if (block_axis_edge == LocalAxisEdge::kStart) { block_edge = BlockEdge::kBlockStart; - } else if (block_axis_edge == AxisEdge::kCenter) { + } else if (block_axis_edge == LocalAxisEdge::kCenter) { block_edge = BlockEdge::kBlockCenter; offset.block_offset -= BorderScrollbarPadding().BlockSum() / 2; } else { diff --git a/chromium/third_party/blink/renderer/core/layout/ng/mathml/ng_math_scripts_layout_algorithm.cc b/chromium/third_party/blink/renderer/core/layout/ng/mathml/ng_math_scripts_layout_algorithm.cc index 56a9d5efaf1..5e38a439357 100644 --- a/chromium/third_party/blink/renderer/core/layout/ng/mathml/ng_math_scripts_layout_algorithm.cc +++ b/chromium/third_party/blink/renderer/core/layout/ng/mathml/ng_math_scripts_layout_algorithm.cc @@ -15,7 +15,7 @@ namespace { using MathConstants = OpenTypeMathSupport::MathConstants; -static bool IsPrescriptDelimiter(const NGBlockNode& blockNode) { +bool MyIsPrescriptDelimiter(const NGBlockNode& blockNode) { auto* node = blockNode.GetDOMNode(); return node && IsA<MathMLElement>(node) && node->HasTagName(mathml_names::kMprescriptsTag); @@ -147,7 +147,7 @@ void NGMathScriptsLayoutAlgorithm::GatherChildren( case MathScriptType::kMultiscripts: { // The structure of mmultiscripts is specified here: // https://mathml-refresh.github.io/mathml-core/#prescripts-and-tensor-indices-mmultiscripts - if (IsPrescriptDelimiter(block_child)) { + if (MyIsPrescriptDelimiter(block_child)) { if (!number_of_scripts_is_even || *first_prescript_index > 0) { NOTREACHED(); return; diff --git a/chromium/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc b/chromium/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc index daa05e73043..e19b8285fce 100644 --- a/chromium/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc +++ b/chromium/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc @@ -25,7 +25,7 @@ namespace blink { const char kAbortErrorMessage[] = "The Bluetooth operation was cancelled."; -const char kInactiveDocumentError[] = "Document not active"; +const char kInactiveDocumentError2[] = "Document not active"; const char kInvalidStateErrorMessage[] = "Pending watch advertisements operation."; @@ -110,7 +110,7 @@ ScriptPromise BluetoothDevice::watchAdvertisements( ExceptionState& exception_state) { ExecutionContext* context = GetExecutionContext(); if (!context) { - exception_state.ThrowTypeError(kInactiveDocumentError); + exception_state.ThrowTypeError(kInactiveDocumentError2); return ScriptPromise(); } diff --git a/chromium/third_party/blink/renderer/modules/canvas/BUILD.gn b/chromium/third_party/blink/renderer/modules/canvas/BUILD.gn index 3dee2798eee..a79a5a8390f 100644 --- a/chromium/third_party/blink/renderer/modules/canvas/BUILD.gn +++ b/chromium/third_party/blink/renderer/modules/canvas/BUILD.gn @@ -41,6 +41,10 @@ blink_modules_sources("canvas") { "offscreencanvas2d/offscreen_canvas_rendering_context_2d.cc", "offscreencanvas2d/offscreen_canvas_rendering_context_2d.h", ] + jumbo_excluded_sources = [ + "imagebitmap/image_bitmap_rendering_context_base.cc", + "offscreencanvas2d/offscreen_canvas_rendering_context_2d.cc", + ] } fuzzer_test("canvas_fuzzer") { diff --git a/chromium/third_party/blink/renderer/modules/credentialmanager/otp_credential.cc b/chromium/third_party/blink/renderer/modules/credentialmanager/otp_credential.cc index cd021b57ae4..8b7ef3d51eb 100644 --- a/chromium/third_party/blink/renderer/modules/credentialmanager/otp_credential.cc +++ b/chromium/third_party/blink/renderer/modules/credentialmanager/otp_credential.cc @@ -9,12 +9,12 @@ namespace blink { -namespace { -constexpr char kOtpCredentialType[] = "otp"; +namespace i { +constexpr static char kOtpCredentialType[] = "otp"; } OTPCredential::OTPCredential(const String& code) - : Credential(String(), kOtpCredentialType), code_(code) {} + : Credential(String(), i::kOtpCredentialType), code_(code) {} bool OTPCredential::IsOTPCredential() const { return true; diff --git a/chromium/third_party/blink/renderer/modules/mediastream/BUILD.gn b/chromium/third_party/blink/renderer/modules/mediastream/BUILD.gn index a6724bd9f5e..64773d3ca28 100644 --- a/chromium/third_party/blink/renderer/modules/mediastream/BUILD.gn +++ b/chromium/third_party/blink/renderer/modules/mediastream/BUILD.gn @@ -107,6 +107,13 @@ blink_modules_sources("mediastream") { "webmediaplayer_ms_compositor.cc", "webmediaplayer_ms_compositor.h", ] + + jumbo_excluded_sources = [ + "input_device_info.cc", + "processed_local_audio_source.cc", + "user_media_processor.cc", + ] + deps = [ "//build:chromecast_buildflags", "//build:chromeos_buildflags", diff --git a/chromium/third_party/blink/renderer/modules/native_io/native_io_file.cc b/chromium/third_party/blink/renderer/modules/native_io/native_io_file.cc index 76f50d3fa39..9ded4adc919 100644 --- a/chromium/third_party/blink/renderer/modules/native_io/native_io_file.cc +++ b/chromium/third_party/blink/renderer/modules/native_io/native_io_file.cc @@ -38,7 +38,7 @@ namespace blink { namespace { // Extracts the read/write operation size from the buffer size. -int OperationSize(const DOMArrayBufferView& buffer) { +inline int OperationSize(const DOMArrayBufferView& buffer) { // On 32-bit platforms, clamp operation sizes to 2^31-1. return base::saturated_cast<int>(buffer.byteLength()); } diff --git a/chromium/third_party/blink/renderer/modules/native_io/native_io_file_sync.cc b/chromium/third_party/blink/renderer/modules/native_io/native_io_file_sync.cc index fd019bc639f..292a0b14a43 100644 --- a/chromium/third_party/blink/renderer/modules/native_io/native_io_file_sync.cc +++ b/chromium/third_party/blink/renderer/modules/native_io/native_io_file_sync.cc @@ -20,11 +20,13 @@ namespace blink { +namespace j { // Extracts the read/write operation size from the buffer size. -int OperationSize(const DOMArrayBufferView& buffer) { +inline static int OperationSize(const DOMArrayBufferView& buffer) { // On 32-bit platforms, clamp operation sizes to 2^31-1. return base::saturated_cast<int>(buffer.byteLength()); } +} NativeIOFileSync::NativeIOFileSync( base::File backing_file, @@ -99,7 +101,7 @@ void NativeIOFileSync::setLength(uint64_t length, uint64_t NativeIOFileSync::read(MaybeShared<DOMArrayBufferView> buffer, uint64_t file_offset, ExceptionState& exception_state) { - int read_size = OperationSize(*buffer.View()); + int read_size = j::OperationSize(*buffer.View()); char* read_data = static_cast<char*>(buffer.View()->BaseAddressMaybeShared()); if (!backing_file_.IsValid()) { exception_state.ThrowDOMException(DOMExceptionCode::kInvalidStateError, @@ -117,7 +119,7 @@ uint64_t NativeIOFileSync::read(MaybeShared<DOMArrayBufferView> buffer, uint64_t NativeIOFileSync::write(MaybeShared<DOMArrayBufferView> buffer, uint64_t file_offset, ExceptionState& exception_state) { - int write_size = OperationSize(*buffer.View()); + int write_size = j::OperationSize(*buffer.View()); char* write_data = static_cast<char*>(buffer.View()->BaseAddressMaybeShared()); if (!backing_file_.IsValid()) { diff --git a/chromium/third_party/blink/renderer/modules/peerconnection/BUILD.gn b/chromium/third_party/blink/renderer/modules/peerconnection/BUILD.gn index fdf4c79d246..5be481669a8 100644 --- a/chromium/third_party/blink/renderer/modules/peerconnection/BUILD.gn +++ b/chromium/third_party/blink/renderer/modules/peerconnection/BUILD.gn @@ -140,6 +140,10 @@ blink_modules_sources("peerconnection") { "webrtc_set_description_observer.h", ] + jumbo_excluded_sources = [ + "rtc_rtp_sender_impl.cc" + ] + public_deps = [ "//third_party/webrtc_overrides:webrtc_component" ] deps = [ "//jingle:webrtc_glue", diff --git a/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn b/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn index b4090bd22c0..14cf7f81b20 100644 --- a/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn +++ b/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn @@ -48,6 +48,7 @@ blink_modules_sources("webcodecs") { "video_track_writer.cc", "video_track_writer.h", ] + jumbo_excluded_sources = [ "video_decoder_broker.cc" ] deps = [ "//media", "//media/mojo:buildflags", diff --git a/chromium/third_party/blink/renderer/modules/xr/xr_transient_input_hit_test_source.cc b/chromium/third_party/blink/renderer/modules/xr/xr_transient_input_hit_test_source.cc index 30e2199b178..7da5faa4b67 100644 --- a/chromium/third_party/blink/renderer/modules/xr/xr_transient_input_hit_test_source.cc +++ b/chromium/third_party/blink/renderer/modules/xr/xr_transient_input_hit_test_source.cc @@ -12,7 +12,7 @@ #include "device/vr/public/mojom/vr_service.mojom-blink.h" namespace { -const char* kCannotCancelHitTestSource = +const char* kCannotCancelHitTestSource2 = "Hit test source could not be canceled. Ensure that it was not already " "canceled."; } @@ -35,7 +35,7 @@ void XRTransientInputHitTestSource::cancel(ExceptionState& exception_state) { if (!xr_session_->RemoveHitTestSource(this)) { exception_state.ThrowDOMException(DOMExceptionCode::kInvalidStateError, - kCannotCancelHitTestSource); + kCannotCancelHitTestSource2); } } diff --git a/chromium/third_party/blink/renderer/platform/BUILD.gn b/chromium/third_party/blink/renderer/platform/BUILD.gn index 99364af9da1..ce401e1b391 100644 --- a/chromium/third_party/blink/renderer/platform/BUILD.gn +++ b/chromium/third_party/blink/renderer/platform/BUILD.gn @@ -1525,6 +1525,13 @@ jumbo_component("platform") { } } + jumbo_excluded_sources = [ + "fonts/font_matching_metrics.cc", + "mediastream/media_stream_audio_source.cc", + "mediastream/media_stream_audio_track.cc", + "peerconnection/rtc_video_decoder_factory.cc", + ] + if (is_mac) { sources += [ "audio/mac/fft_frame_mac.cc", @@ -1758,6 +1765,9 @@ jumbo_component("platform") { "peerconnection/video_codec_factory.cc", "peerconnection/video_codec_factory.h", ] + jumbo_excluded_sources -= [ + "peerconnection/rtc_video_decoder_factory.cc", + ] deps -= [ "//third_party/webrtc_overrides:webrtc_component" ] diff --git a/chromium/third_party/blink/renderer/platform/audio/hrtf_panner.cc b/chromium/third_party/blink/renderer/platform/audio/hrtf_panner.cc index cc12303b7f6..488244f0f3f 100644 --- a/chromium/third_party/blink/renderer/platform/audio/hrtf_panner.cc +++ b/chromium/third_party/blink/renderer/platform/audio/hrtf_panner.cc @@ -37,7 +37,7 @@ namespace blink { // The value of 2 milliseconds is larger than the largest delay which exists in // any HRTFKernel from the default HRTFDatabase (0.0136 seconds). // We ASSERT the delay values used in process() with this value. -const double kMaxDelayTimeSeconds = 0.002; +const double kMaxDelayTimeSeconds2 = 0.002; const int kUninitializedAzimuth = -1; @@ -56,8 +56,8 @@ HRTFPanner::HRTFPanner(float sample_rate, HRTFDatabaseLoader* database_loader) convolver_r1_(FftSizeForSampleRate(sample_rate)), convolver_l2_(FftSizeForSampleRate(sample_rate)), convolver_r2_(FftSizeForSampleRate(sample_rate)), - delay_line_l_(kMaxDelayTimeSeconds, sample_rate), - delay_line_r_(kMaxDelayTimeSeconds, sample_rate), + delay_line_l_(kMaxDelayTimeSeconds2, sample_rate), + delay_line_r_(kMaxDelayTimeSeconds2, sample_rate), temp_l1_(audio_utilities::kRenderQuantumFrames), temp_r1_(audio_utilities::kRenderQuantumFrames), temp_l2_(audio_utilities::kRenderQuantumFrames), @@ -245,10 +245,10 @@ void HRTFPanner::Pan(double desired_azimuth, DCHECK(kernel_r1); DCHECK(kernel_l2); DCHECK(kernel_r2); - DCHECK_LT(frame_delay_l1 / SampleRate(), kMaxDelayTimeSeconds); - DCHECK_LT(frame_delay_r1 / SampleRate(), kMaxDelayTimeSeconds); - DCHECK_LT(frame_delay_l2 / SampleRate(), kMaxDelayTimeSeconds); - DCHECK_LT(frame_delay_r2 / SampleRate(), kMaxDelayTimeSeconds); + DCHECK_LT(frame_delay_l1 / SampleRate(), kMaxDelayTimeSeconds2); + DCHECK_LT(frame_delay_r1 / SampleRate(), kMaxDelayTimeSeconds2); + DCHECK_LT(frame_delay_l2 / SampleRate(), kMaxDelayTimeSeconds2); + DCHECK_LT(frame_delay_r2 / SampleRate(), kMaxDelayTimeSeconds2); // Crossfade inter-aural delays based on transitions. double frame_delay_l = @@ -361,7 +361,7 @@ double HRTFPanner::TailTime() const { // the tailTime of the HRTFPanner is the sum of the tailTime of the // DelayKernel and the tailTime of the FFTConvolver, which is // MaxDelayTimeSeconds and fftSize() / 2, respectively. - return kMaxDelayTimeSeconds + + return kMaxDelayTimeSeconds2 + (FftSize() / 2) / static_cast<double>(SampleRate()); } diff --git a/chromium/third_party/blink/renderer/platform/loader/web_url_request_util.cc b/chromium/third_party/blink/renderer/platform/loader/web_url_request_util.cc index d89f39a78f8..333bbb3497f 100644 --- a/chromium/third_party/blink/renderer/platform/loader/web_url_request_util.cc +++ b/chromium/third_party/blink/renderer/platform/loader/web_url_request_util.cc @@ -24,6 +24,7 @@ #include "third_party/blink/public/platform/web_mixed_content.h" #include "third_party/blink/public/platform/web_string.h" #include "third_party/blink/public/platform/web_url_request.h" +#include "third_party/blink/renderer/platform/wtf/assertions.h" #include "third_party/blink/renderer/platform/wtf/std_lib_extras.h" #include "third_party/blink/renderer/platform/wtf/text/string_builder.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" diff --git a/chromium/third_party/blink/renderer/platform/widget/input/widget_input_handler_manager.cc b/chromium/third_party/blink/renderer/platform/widget/input/widget_input_handler_manager.cc index 73cac4d137d..cac21542141 100644 --- a/chromium/third_party/blink/renderer/platform/widget/input/widget_input_handler_manager.cc +++ b/chromium/third_party/blink/renderer/platform/widget/input/widget_input_handler_manager.cc @@ -404,7 +404,7 @@ void WidgetInputHandlerManager::LogInputTimingUMA() { void WidgetInputHandlerManager::DispatchScrollGestureToCompositor( std::unique_ptr<WebGestureEvent> event) { - DCHECK(base::FeatureList::IsEnabled(features::kScrollUnification)); + DCHECK(base::FeatureList::IsEnabled(::features::kScrollUnification)); std::unique_ptr<WebCoalescedInputEvent> web_scoped_gesture_event = std::make_unique<WebCoalescedInputEvent>(std::move(event), ui::LatencyInfo()); @@ -419,7 +419,7 @@ void WidgetInputHandlerManager::DispatchScrollGestureToCompositor( void WidgetInputHandlerManager:: HandleInputEventWithLatencyOnInputHandlingThread( std::unique_ptr<WebCoalescedInputEvent> event) { - DCHECK(base::FeatureList::IsEnabled(features::kScrollUnification)); + DCHECK(base::FeatureList::IsEnabled(::features::kScrollUnification)); DCHECK(input_handler_proxy_); input_handler_proxy_->HandleInputEventWithLatencyInfo( std::move(event), nullptr, base::DoNothing()); diff --git a/chromium/ui/base/ime/win/BUILD.gn b/chromium/ui/base/ime/win/BUILD.gn index b6cb95fcf81..5e82201f9b2 100644 --- a/chromium/ui/base/ime/win/BUILD.gn +++ b/chromium/ui/base/ime/win/BUILD.gn @@ -34,6 +34,7 @@ jumbo_component("win") { "virtual_keyboard_debounce_timer.cc", "virtual_keyboard_debounce_timer.h", ] + jumbo_excluded_sources = [ "tsf_text_store.cc" ] defines = [ "IS_UI_BASE_IME_WIN_IMPL" ] diff --git a/chromium/ui/base/x/BUILD.gn b/chromium/ui/base/x/BUILD.gn index cd93618f0a6..b1aa641a4fe 100644 --- a/chromium/ui/base/x/BUILD.gn +++ b/chromium/ui/base/x/BUILD.gn @@ -2,14 +2,13 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/config/jumbo.gni") import("//build/config/linux/gtk/gtk.gni") import("//build/config/ozone.gni") import("//build/config/ui.gni") assert(use_x11 || ozone_platform_x11) -jumbo_component("x") { +component("x") { output_name = "ui_base_x" sources = [ diff --git a/chromium/ui/color/BUILD.gn b/chromium/ui/color/BUILD.gn index f279a84ff9e..898dd69d377 100644 --- a/chromium/ui/color/BUILD.gn +++ b/chromium/ui/color/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. import("//build/buildflag_header.gni") -import("//build/config/jumbo.gni") import("//testing/test.gni") import("//ui/base/ui_features.gni") @@ -22,7 +21,7 @@ source_set("color_headers") { ] } -jumbo_component("color") { +component("color") { sources = [ "color_mixer.cc", "color_provider.cc", @@ -65,7 +64,7 @@ test("color_unittests") { ] } -jumbo_component("mixers") { +component("mixers") { sources = [ "color_mixers.h", "core_default_color_mixer.cc", diff --git a/chromium/ui/events/blink/web_input_event_builders_win.cc b/chromium/ui/events/blink/web_input_event_builders_win.cc index 619602f3fb6..96a0d99dfb2 100644 --- a/chromium/ui/events/blink/web_input_event_builders_win.cc +++ b/chromium/ui/events/blink/web_input_event_builders_win.cc @@ -19,7 +19,7 @@ namespace ui { static const unsigned long kDefaultScrollLinesPerWheelDelta = 3; static const unsigned long kDefaultScrollCharsPerWheelDelta = 1; -static const unsigned long kScrollPercentPerLineOrChar = 5; +static const unsigned long kMyScrollPercentPerLineOrChar = 5; // WebMouseEvent -------------------------------------------------------------- @@ -305,7 +305,7 @@ WebMouseWheelEvent WebMouseWheelEventBuilder::Build( // the percentage amount (out of 1, i.e. 1 == 100%) the targeted scroller // should scroll. This percentage will be resolved against the size of // the scroller in the renderer process. - scroll_delta *= kScrollPercentPerLineOrChar / 100.f; + scroll_delta *= kMyScrollPercentPerLineOrChar / 100.f; result.delta_units = ui::ScrollGranularity::kScrollByPercentage; } else { // Convert wheel delta amount to a number of pixels to scroll. diff --git a/chromium/ui/native_theme/BUILD.gn b/chromium/ui/native_theme/BUILD.gn index 55983e170dd..d68531fe065 100644 --- a/chromium/ui/native_theme/BUILD.gn +++ b/chromium/ui/native_theme/BUILD.gn @@ -2,11 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/config/jumbo.gni") import("//build/config/ui.gni") import("//testing/test.gni") -jumbo_component("native_theme") { +component("native_theme") { sources = [ "caption_style.cc", "caption_style.h", @@ -88,7 +87,7 @@ jumbo_component("native_theme") { } if (is_win) { - jumbo_component("native_theme_browser") { + component("native_theme_browser") { defines = [ "NATIVE_THEME_IMPLEMENTATION" ] # These files cannot work in the renderer on Windows. @@ -109,11 +108,11 @@ if (is_win) { libs = [ "uxtheme.lib" ] } } else { - jumbo_source_set("native_theme_browser") { + source_set("native_theme_browser") { } } -jumbo_source_set("test_support") { +source_set("test_support") { testonly = true deps = [ diff --git a/chromium/v8/src/heap/cppgc-js/cpp-heap.cc b/chromium/v8/src/heap/cppgc-js/cpp-heap.cc index 712be09f2c3..8ad35749783 100644 --- a/chromium/v8/src/heap/cppgc-js/cpp-heap.cc +++ b/chromium/v8/src/heap/cppgc-js/cpp-heap.cc @@ -81,7 +81,7 @@ class UnifiedHeapConcurrentMarker unified_heap_marking_state_(unified_heap_marking_state) {} std::unique_ptr<cppgc::Visitor> CreateConcurrentMarkingVisitor( - ConcurrentMarkingState&) const final; + cppgc::internal::ConcurrentMarkingState&) const final; private: UnifiedHeapMarkingState& unified_heap_marking_state_; @@ -89,7 +89,7 @@ class UnifiedHeapConcurrentMarker std::unique_ptr<cppgc::Visitor> UnifiedHeapConcurrentMarker::CreateConcurrentMarkingVisitor( - ConcurrentMarkingState& marking_state) const { + cppgc::internal::ConcurrentMarkingState& marking_state) const { return std::make_unique<ConcurrentUnifiedHeapMarkingVisitor>( heap(), marking_state, unified_heap_marking_state_); } diff --git a/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.cc b/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.cc index e235f8885d9..16543fe0192 100644 --- a/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.cc +++ b/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.cc @@ -14,7 +14,7 @@ namespace v8 { namespace internal { UnifiedHeapMarkingVisitorBase::UnifiedHeapMarkingVisitorBase( - HeapBase& heap, MarkingStateBase& marking_state, + HeapBase& heap, cppgc::internal::MarkingStateBase& marking_state, UnifiedHeapMarkingState& unified_heap_marking_state) : JSVisitor(cppgc::internal::VisitorFactory::CreateKey()), marking_state_(marking_state), @@ -89,7 +89,7 @@ void MutatorUnifiedHeapMarkingVisitor::VisitWeakRoot(const void* object, } ConcurrentUnifiedHeapMarkingVisitor::ConcurrentUnifiedHeapMarkingVisitor( - HeapBase& heap, ConcurrentMarkingState& marking_state, + HeapBase& heap, cppgc::internal::ConcurrentMarkingState& marking_state, UnifiedHeapMarkingState& unified_heap_marking_state) : UnifiedHeapMarkingVisitorBase(heap, marking_state, unified_heap_marking_state) {} @@ -99,7 +99,7 @@ bool ConcurrentUnifiedHeapMarkingVisitor::DeferTraceToMutatorThreadIfConcurrent( size_t deferred_size) { marking_state_.concurrent_marking_bailout_worklist().Push( {parameter, callback, deferred_size}); - static_cast<ConcurrentMarkingState&>(marking_state_) + static_cast<cppgc::internal::ConcurrentMarkingState&>(marking_state_) .AccountDeferredMarkedBytes(deferred_size); return true; } diff --git a/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.h b/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.h index 05e3affaa80..0231d2632c5 100644 --- a/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.h +++ b/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.h @@ -28,14 +28,12 @@ namespace internal { using cppgc::SourceLocation; using cppgc::TraceDescriptor; using cppgc::WeakCallback; -using cppgc::internal::ConcurrentMarkingState; using cppgc::internal::HeapBase; -using cppgc::internal::MarkingStateBase; using cppgc::internal::MutatorMarkingState; class V8_EXPORT_PRIVATE UnifiedHeapMarkingVisitorBase : public JSVisitor { public: - UnifiedHeapMarkingVisitorBase(HeapBase&, MarkingStateBase&, + UnifiedHeapMarkingVisitorBase(HeapBase&, cppgc::internal::MarkingStateBase&, UnifiedHeapMarkingState&); ~UnifiedHeapMarkingVisitorBase() override = default; @@ -53,7 +51,7 @@ class V8_EXPORT_PRIVATE UnifiedHeapMarkingVisitorBase : public JSVisitor { // JS handling. void Visit(const TracedReferenceBase& ref) final; - MarkingStateBase& marking_state_; + cppgc::internal::MarkingStateBase& marking_state_; UnifiedHeapMarkingState& unified_heap_marking_state_; }; @@ -73,7 +71,7 @@ class V8_EXPORT_PRIVATE MutatorUnifiedHeapMarkingVisitor final class V8_EXPORT_PRIVATE ConcurrentUnifiedHeapMarkingVisitor final : public UnifiedHeapMarkingVisitorBase { public: - ConcurrentUnifiedHeapMarkingVisitor(HeapBase&, ConcurrentMarkingState&, + ConcurrentUnifiedHeapMarkingVisitor(HeapBase&, cppgc::internal::ConcurrentMarkingState&, UnifiedHeapMarkingState&); ~ConcurrentUnifiedHeapMarkingVisitor() override = default; diff --git a/chromium/v8/src/heap/cppgc/marker.cc b/chromium/v8/src/heap/cppgc/marker.cc index 236bc12af4f..d027c5e577b 100644 --- a/chromium/v8/src/heap/cppgc/marker.cc +++ b/chromium/v8/src/heap/cppgc/marker.cc @@ -84,9 +84,9 @@ void ResetRememberedSet(HeapBase& heap) { #endif } -static constexpr size_t kDefaultDeadlineCheckInterval = 150u; +static constexpr size_t kDefaultMarkerDeadlineCheckInterval = 150u; -template <size_t kDeadlineCheckInterval = kDefaultDeadlineCheckInterval, +template <size_t kDeadlineCheckInterval = kDefaultMarkerDeadlineCheckInterval, typename WorklistLocal, typename Callback> bool DrainWorklistWithBytesAndTimeDeadline(MarkingStateBase& marking_state, size_t marked_bytes_deadline, @@ -362,7 +362,7 @@ bool MarkerBase::ProcessWorklistsWithDeadline( // Bailout objects may be complicated to trace and thus might take longer // than other objects. Therefore we reduce the interval between deadline // checks to guarantee the deadline is not exceeded. - if (!DrainWorklistWithBytesAndTimeDeadline<kDefaultDeadlineCheckInterval / + if (!DrainWorklistWithBytesAndTimeDeadline<kDefaultMarkerDeadlineCheckInterval / 5>( mutator_marking_state_, marked_bytes_deadline, time_deadline, mutator_marking_state_.concurrent_marking_bailout_worklist(), diff --git a/chromium/v8/src/regexp/experimental/experimental-compiler.cc b/chromium/v8/src/regexp/experimental/experimental-compiler.cc index 4d53c2c0c55..69390c4b61d 100644 --- a/chromium/v8/src/regexp/experimental/experimental-compiler.cc +++ b/chromium/v8/src/regexp/experimental/experimental-compiler.cc @@ -180,7 +180,7 @@ bool ExperimentalRegExpCompiler::CanBeHandled(RegExpTree* tree, return CanBeHandledVisitor::Check(tree, flags, capture_count); } -namespace { +namespace experimental { // A label in bytecode which starts with no known address. The address *must* // be bound with `Bind` before the label goes out of scope. @@ -628,7 +628,7 @@ class CompileVisitor : private RegExpVisitor { ZoneList<RegExpInstruction> ExperimentalRegExpCompiler::Compile( RegExpTree* tree, JSRegExp::Flags flags, Zone* zone) { - return CompileVisitor::Compile(tree, flags, zone); + return experimental::CompileVisitor::Compile(tree, flags, zone); } } // namespace internal diff --git a/chromium/v8/src/torque/csa-generator.cc b/chromium/v8/src/torque/csa-generator.cc index 93e8d47df42..68d38bf9658 100644 --- a/chromium/v8/src/torque/csa-generator.cc +++ b/chromium/v8/src/torque/csa-generator.cc @@ -849,8 +849,8 @@ void CSAGenerator::EmitInstruction(const StoreReferenceInstruction& instruction, } namespace { -std::string GetBitFieldSpecialization(const Type* container, - const BitField& field) { +std::string GetBitFieldSpecialization2(const Type* container, + const BitField& field) { auto smi_tagged_type = Type::MatchUnaryGeneric(container, TypeOracle::GetSmiTaggedGeneric()); std::string container_type = smi_tagged_type @@ -903,7 +903,7 @@ void CSAGenerator::EmitInstruction(const LoadBitFieldInstruction& instruction, out() << " " << result_name << " = ca_.UncheckedCast<" << field_type->GetGeneratedTNodeTypeName() << ">(CodeStubAssembler(state_)." << decoder << "<" - << GetBitFieldSpecialization(struct_type, instruction.bit_field) + << GetBitFieldSpecialization2(struct_type, instruction.bit_field) << ">(ca_.UncheckedCast<" << struct_word_type << ">(" << bit_field_struct << ")));\n"; } @@ -945,7 +945,7 @@ void CSAGenerator::EmitInstruction(const StoreBitFieldInstruction& instruction, std::string result_expression = "CodeStubAssembler(state_)." + encoder + "<" + - GetBitFieldSpecialization(struct_type, instruction.bit_field) + + GetBitFieldSpecialization2(struct_type, instruction.bit_field) + ">(ca_.UncheckedCast<" + struct_word_type + ">(" + bit_field_struct + "), ca_.UncheckedCast<" + field_word_type + ">(" + value + ")" + (instruction.starts_as_zero ? ", true" : "") + ")"; |