[patch] combined jumbo patch

qtwebengine-jumbo.patch (text/plain), 4.52 KB, created by Stephan Hartmann (RETIRED) on 2021-10-31 21:44:42 UTC

--- a/src/3rdparty/chromium/third_party/blink/renderer/core/animation/document_animations.cc
+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/animation/document_animations.cc
@@ -57,8 +57,8 @@ void UpdateAnimationTiming(
   document.GetWorkletAnimationController().UpdateAnimationTimings(reason);
 }
 
-bool CompareAnimations(const Member<Animation>& left,
-                       const Member<Animation>& right) {
+bool CompareAnimationsDocument(const Member<Animation>& left,
+                               const Member<Animation>& right) {
   return Animation::HasLowerCompositeOrdering(
       left.Get(), right.Get(),
       Animation::CompareAnimationsOrdering::kTreeOrder);
@@ -157,7 +157,7 @@ HeapVector<Member<Animation>> DocumentAnimations::getAnimations(
   else
     GetAnimationsTargetingTreeScope(animations, tree_scope);
 
-  std::sort(animations.begin(), animations.end(), CompareAnimations);
+  std::sort(animations.begin(), animations.end(), CompareAnimationsDocument);
   return animations;
 }
 
@@ -203,7 +203,7 @@ void DocumentAnimations::RemoveReplacedAnimations(
 
     // By processing in decreasing order by priority, we can perform a single
     // pass for discovery of replaced properties.
-    std::sort(animations->begin(), animations->end(), CompareAnimations);
+    std::sort(animations->begin(), animations->end(), CompareAnimationsDocument);
     PropertyHandleSet replaced_properties;
     for (auto anim_it = animations->rbegin(); anim_it != animations->rend();
          anim_it++) {
--- a/src/3rdparty/chromium/third_party/blink/renderer/core/html/forms/date_time_chooser_impl.cc
+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/html/forms/date_time_chooser_impl.cc
@@ -129,11 +129,11 @@ void DateTimeChooserImpl::WriteDocument(SharedBuffer* data) {
       data);
 
   data->Append(ChooserResourceLoader::GetPickerCommonStyleSheet());
-  if (!features::IsFormControlsRefreshEnabled())
+  if (!::features::IsFormControlsRefreshEnabled())
     data->Append(ChooserResourceLoader::GetPickerButtonStyleSheet());
   data->Append(ChooserResourceLoader::GetSuggestionPickerStyleSheet());
   data->Append(ChooserResourceLoader::GetCalendarPickerStyleSheet());
-  if (features::IsFormControlsRefreshEnabled()) {
+  if (::features::IsFormControlsRefreshEnabled()) {
     data->Append(ChooserResourceLoader::GetCalendarPickerRefreshStyleSheet());
     if (parameters_->type == input_type_names::kTime ||
         parameters_->type == input_type_names::kDatetimeLocal) {
@@ -183,9 +183,9 @@ void DateTimeChooserImpl::WriteDocument(SharedBuffer* data) {
   AddProperty("isLocaleRTL", locale_->IsRTL(), data);
   AddProperty("isRTL", parameters_->is_anchor_element_rtl, data);
   AddProperty("isFormControlsRefreshEnabled",
-              features::IsFormControlsRefreshEnabled(), data);
+              ::features::IsFormControlsRefreshEnabled(), data);
 #if defined(OS_MAC)
-  AddProperty("isBorderTransparent", features::IsFormControlsRefreshEnabled(),
+  AddProperty("isBorderTransparent", ::features::IsFormControlsRefreshEnabled(),
               data);
 #endif
   AddProperty("mode", parameters_->type.GetString(), data);
@@ -236,7 +236,7 @@ void DateTimeChooserImpl::WriteDocument(SharedBuffer* data) {
 
   data->Append(ChooserResourceLoader::GetPickerCommonJS());
   data->Append(ChooserResourceLoader::GetSuggestionPickerJS());
-  if (features::IsFormControlsRefreshEnabled()) {
+  if (::features::IsFormControlsRefreshEnabled()) {
     data->Append(ChooserResourceLoader::GetMonthPickerJS());
     if (parameters_->type == input_type_names::kTime) {
       data->Append(ChooserResourceLoader::GetTimePickerJS());
--- a/src/3rdparty/chromium/base/task/thread_pool.cc
+++ b/src/3rdparty/chromium/base/task/thread_pool.cc
@@ -15,10 +15,10 @@ namespace base {
 
 namespace {
 
-class PostTaskAndReplyWithTraitsTaskRunner
+class PostTaskAndReplyWithTraitsTaskRunnerTP
     : public internal::PostTaskAndReplyImpl {
  public:
-  explicit PostTaskAndReplyWithTraitsTaskRunner(const TaskTraits& traits)
+  explicit PostTaskAndReplyWithTraitsTaskRunnerTP(const TaskTraits& traits)
       : traits_(traits) {}
 
  private:
@@ -85,7 +85,7 @@ bool ThreadPool::PostTaskAndReply(const Location& from_here,
                                   const TaskTraits& traits,
                                   OnceClosure task,
                                   OnceClosure reply) {
-  return PostTaskAndReplyWithTraitsTaskRunner(traits).PostTaskAndReply(
+  return PostTaskAndReplyWithTraitsTaskRunnerTP(traits).PostTaskAndReply(
       from_here, std::move(task), std::move(reply));
 }