diff options
8 files changed, 19 insertions, 14 deletions
diff --git a/chromium/cc/metrics/frame_sequence_tracker.cc b/chromium/cc/metrics/frame_sequence_tracker.cc index ca00bb02e07..27527fe42c3 100644 --- a/chromium/cc/metrics/frame_sequence_tracker.cc +++ b/chromium/cc/metrics/frame_sequence_tracker.cc @@ -37,7 +37,7 @@ namespace cc { namespace { -constexpr char kTraceCategory[] = +constexpr char kTraceCategoryFST[] = "cc,benchmark," TRACE_DISABLED_BY_DEFAULT("devtools.timeline.frame"); } // namespace @@ -90,7 +90,7 @@ FrameSequenceTracker::FrameSequenceTracker( // TODO(crbug.com/1158439): remove the trace event once the validation is // completed. TRACE_EVENT_NESTABLE_ASYNC_BEGIN_WITH_TIMESTAMP1( - kTraceCategory, "TrackerValidation", TRACE_ID_LOCAL(this), + kTraceCategoryFST, "TrackerValidation", TRACE_ID_LOCAL(this), base::TimeTicks::Now(), "name", GetFrameSequenceTrackerTypeName(type)); } @@ -107,7 +107,7 @@ FrameSequenceTracker::FrameSequenceTracker( FrameSequenceTracker::~FrameSequenceTracker() { TRACE_EVENT_NESTABLE_ASYNC_END_WITH_TIMESTAMP2( - kTraceCategory, "TrackerValidation", TRACE_ID_LOCAL(this), + kTraceCategoryFST, "TrackerValidation", TRACE_ID_LOCAL(this), base::TimeTicks::Now(), "aborted_main", aborted_main_frame_, "no_damage_main", no_damage_draw_main_frames_); CleanUp(); diff --git a/chromium/cc/metrics/jank_injector.cc b/chromium/cc/metrics/jank_injector.cc index da18a0ce561..5346b6b6b33 100644 --- a/chromium/cc/metrics/jank_injector.cc +++ b/chromium/cc/metrics/jank_injector.cc @@ -23,7 +23,7 @@ namespace cc { namespace { -constexpr char kTraceCategory[] = +constexpr char kTraceCategoryJI[] = "cc,benchmark," TRACE_DISABLED_BY_DEFAULT("devtools.timeline.frame"); const char kJankInjectionAllowedURLs[] = "allowed_urls"; @@ -91,7 +91,7 @@ bool IsJankInjectionEnabledForURL(const GURL& url) { } void RunJank(JankInjectionParams params) { - TRACE_EVENT0(kTraceCategory, "Injected Jank"); + TRACE_EVENT0(kTraceCategoryJI, "Injected Jank"); if (params.busy_loop) { // Do some useless work, and prevent any weird compiler optimization from // doing anything here. diff --git a/chromium/content/renderer/service_worker/web_service_worker_provider_impl.cc b/chromium/content/renderer/service_worker/web_service_worker_provider_impl.cc index 402a94b6347..d618c29c3d2 100644 --- a/chromium/content/renderer/service_worker/web_service_worker_provider_impl.cc +++ b/chromium/content/renderer/service_worker/web_service_worker_provider_impl.cc @@ -258,7 +258,7 @@ void WebServiceWorkerProviderImpl::OnDidGetRegistration( blink::mojom::ServiceWorkerRegistrationObjectInfoPtr registration) { TRACE_EVENT_NESTABLE_ASYNC_END2( "ServiceWorker", "WebServiceWorkerProviderImpl::GetRegistration", - TRACE_ID_LOCAL(this), "Error", MojoEnumToString(error), "Message", + TRACE_ID_LOCAL(this), "Error", MojoEnumToString2(error), "Message", error_msg ? *error_msg : "Success"); if (error != blink::mojom::ServiceWorkerErrorType::kNone) { DCHECK(error_msg); diff --git a/chromium/extensions/common/BUILD.gn b/chromium/extensions/common/BUILD.gn index dade4ead130..4270ddb175e 100644 --- a/chromium/extensions/common/BUILD.gn +++ b/chromium/extensions/common/BUILD.gn @@ -413,6 +413,7 @@ if (enable_extensions) { jumbo_excluded_sources = [ "manifest_handlers/file_handler_info.cc", + "manifest_handlers/permissions_parser.cc", ] configs += [ diff --git a/chromium/third_party/blink/renderer/core/html/forms/html_input_element.cc b/chromium/third_party/blink/renderer/core/html/forms/html_input_element.cc index b1655b0d87f..a0f46d0e2e3 100644 --- a/chromium/third_party/blink/renderer/core/html/forms/html_input_element.cc +++ b/chromium/third_party/blink/renderer/core/html/forms/html_input_element.cc @@ -96,7 +96,7 @@ namespace { const unsigned kMaxEmailFieldLength = 254; -static bool is_default_font_prewarmed_ = false; +static bool is_default_font_prewarmed_hie = false; } // namespace @@ -415,10 +415,10 @@ void HTMLInputElement::InitializeTypeInParsing() { // Prewarm the default font family. Do this while parsing because the style // recalc calls |TextControlInnerEditorElement::CreateInnerEditorStyle| which // needs the primary font. - if (!is_default_font_prewarmed_ && new_type_name == input_type_names::kText) { + if (!is_default_font_prewarmed_hie && new_type_name == input_type_names::kText) { FontCache::PrewarmFamily(LayoutThemeFontProvider::SystemFontFamily( CSSValueID::kWebkitSmallControl)); - is_default_font_prewarmed_ = true; + is_default_font_prewarmed_hie = true; } } diff --git a/chromium/third_party/blink/renderer/core/html/forms/html_text_area_element.cc b/chromium/third_party/blink/renderer/core/html/forms/html_text_area_element.cc index a00069dbf67..45a6b5b07b7 100644 --- a/chromium/third_party/blink/renderer/core/html/forms/html_text_area_element.cc +++ b/chromium/third_party/blink/renderer/core/html/forms/html_text_area_element.cc @@ -67,7 +67,7 @@ namespace blink { static const unsigned kDefaultRows = 2; static const unsigned kDefaultCols = 20; -static bool is_default_font_prewarmed_ = false; +static bool is_default_font_prewarmed_htae = false; static inline unsigned ComputeLengthForAPIValue(const String& text) { unsigned length = text.length(); @@ -93,14 +93,14 @@ HTMLTextAreaElement::HTMLTextAreaElement(Document& document) is_placeholder_visible_(false) { EnsureUserAgentShadowRoot(); - if (!is_default_font_prewarmed_) { + if (!is_default_font_prewarmed_htae) { if (Settings* settings = document.GetSettings()) { // Prewarm 'monospace', the default font family for `<textarea>`. The // default language should be fine for this purpose because most users set // the same family for all languages. FontCache::PrewarmFamily(settings->GetGenericFontFamilySettings().Fixed( LayoutLocale::GetDefault().GetScript())); - is_default_font_prewarmed_ = true; + is_default_font_prewarmed_htae = true; } } } diff --git a/chromium/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc b/chromium/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc index 3b431c9bb10..913bb6f73fd 100644 --- a/chromium/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc +++ b/chromium/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc @@ -39,7 +39,7 @@ namespace blink { namespace { -bool IsLinkHighlighted(const LayoutObject& object) { +bool IsLinkHighlightedPPTW(const LayoutObject& object) { return object.GetFrame()->GetPage()->GetLinkHighlight().IsHighlighting( object); } @@ -520,7 +520,7 @@ FragmentData* PrePaintTreeWalk::GetOrCreateFragmentData( // is the highlighted link (in which case even culled inlines get paint // effects). if (!object.IsBox() && !object.HasInlineFragments() && - !IsLinkHighlighted(object)) + !IsLinkHighlightedPPTW(object)) return nullptr; DCHECK(allow_update); diff --git a/chromium/ui/gl/BUILD.gn b/chromium/ui/gl/BUILD.gn index 4365e4081c3..c0283a8b1e4 100644 --- a/chromium/ui/gl/BUILD.gn +++ b/chromium/ui/gl/BUILD.gn @@ -222,6 +222,10 @@ jumbo_component("gl") { "gl_image_egl_angle_vulkan.cc", "gl_image_egl_angle_vulkan.h", ] + + jumbo_excluded_sources = [ + "gl_angle_util_vulkan.cc", + ] } if (is_linux || is_chromeos || use_ozone) { |