13 files changed, 59 insertions, 31 deletions
diff --git a/chromium/cc/base/completion_event.h b/chromium/cc/base/completion_event.h
index 5c9debd64f4..f5084d5346c 100644
--- a/chromium/cc/base/completion_event.h
+++ b/chromium/cc/base/completion_event.h
@@ -5,7 +5,7 @@
 #ifndef CC_BASE_COMPLETION_EVENT_H_
 #define CC_BASE_COMPLETION_EVENT_H_
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
diff --git a/chromium/cc/base/devtools_instrumentation.cc b/chromium/cc/base/devtools_instrumentation.cc
index 72b7be7a999..b386c7527c7 100644
--- a/chromium/cc/base/devtools_instrumentation.cc
+++ b/chromium/cc/base/devtools_instrumentation.cc
@@ -66,23 +66,34 @@ ScopedImageUploadTask::~ScopedImageUploadTask() {
     return;
 
   auto duration = base::TimeTicks::Now() - start_time_;
+  const char* histogram_name = nullptr;
   switch (image_type_) {
-    case ImageType::kWebP:
-      UmaHistogramCustomMicrosecondsTimes(
-          "Renderer4.ImageUploadTaskDurationUs.WebP", duration, hist_min_,
-          hist_max_, bucket_count_);
+    case ImageType::kAvif:
+      histogram_name = "Renderer4.ImageUploadTaskDurationUs.Avif";
+      break;
+    case ImageType::kBmp:
+      histogram_name = "Renderer4.ImageUploadTaskDurationUs.Bmp";
+      break;
+    case ImageType::kGif:
+      histogram_name = "Renderer4.ImageUploadTaskDurationUs.Gif";
+      break;
+    case ImageType::kIco:
+      histogram_name = "Renderer4.ImageUploadTaskDurationUs.Ico";
       break;
     case ImageType::kJpeg:
-      UmaHistogramCustomMicrosecondsTimes(
-          "Renderer4.ImageUploadTaskDurationUs.Jpeg", duration, hist_min_,
-          hist_max_, bucket_count_);
+      histogram_name = "Renderer4.ImageUploadTaskDurationUs.Jpeg";
       break;
-    case ImageType::kOther:
-      UmaHistogramCustomMicrosecondsTimes(
-          "Renderer4.ImageUploadTaskDurationUs.Other", duration, hist_min_,
-          hist_max_, bucket_count_);
+    case ImageType::kPng:
+      histogram_name = "Renderer4.ImageUploadTaskDurationUs.Png";
       break;
+    case ImageType::kWebP:
+      histogram_name = "Renderer4.ImageUploadTaskDurationUs.WebP";
+      break;
+    case ImageType::kOther:
+      histogram_name = "Renderer4.ImageUploadTaskDurationUs.Other";
   }
+  UmaHistogramCustomMicrosecondsTimes(histogram_name, duration, hist_min_,
+                                      hist_max_, bucket_count_);
 }
 
 ScopedImageDecodeTask::ScopedImageDecodeTask(const void* image_ptr,
@@ -104,23 +115,36 @@ ScopedImageDecodeTask::~ScopedImageDecodeTask() {
     return;
 
   auto duration = base::TimeTicks::Now() - start_time_;
+  const char* histogram_name = nullptr;
   switch (image_type_) {
-    case ImageType::kWebP:
-      RecordMicrosecondTimesUmaByDecodeType(
-          "Renderer4.ImageDecodeTaskDurationUs.WebP", duration, hist_min_,
-          hist_max_, bucket_count_, decode_type_);
+    case ImageType::kAvif:
+      histogram_name = "Renderer4.ImageDecodeTaskDurationUs.Avif";
+      break;
+    case ImageType::kBmp:
+      histogram_name = "Renderer4.ImageDecodeTaskDurationUs.Bmp";
+      break;
+    case ImageType::kGif:
+      histogram_name = "Renderer4.ImageDecodeTaskDurationUs.Gif";
+      break;
+    case ImageType::kIco:
+      histogram_name = "Renderer4.ImageDecodeTaskDurationUs.Ico";
       break;
     case ImageType::kJpeg:
-      RecordMicrosecondTimesUmaByDecodeType(
-          "Renderer4.ImageDecodeTaskDurationUs.Jpeg", duration, hist_min_,
-          hist_max_, bucket_count_, decode_type_);
+      histogram_name = "Renderer4.ImageDecodeTaskDurationUs.Jpeg";
+      break;
+    case ImageType::kPng:
+      histogram_name = "Renderer4.ImageDecodeTaskDurationUs.Png";
+      break;
+    case ImageType::kWebP:
+      histogram_name = "Renderer4.ImageDecodeTaskDurationUs.WebP";
       break;
     case ImageType::kOther:
-      RecordMicrosecondTimesUmaByDecodeType(
-          "Renderer4.ImageDecodeTaskDurationUs.Other", duration, hist_min_,
-          hist_max_, bucket_count_, decode_type_);
+      histogram_name = "Renderer4.ImageDecodeTaskDurationUs.Other";
       break;
   }
+  RecordMicrosecondTimesUmaByDecodeType(histogram_name, duration, hist_min_,
+                                        hist_max_, bucket_count_, decode_type_);
+
   switch (task_type_) {
     case kInRaster:
       RecordMicrosecondTimesUmaByDecodeType(
diff --git a/chromium/cc/base/devtools_instrumentation.h b/chromium/cc/base/devtools_instrumentation.h
index 12e4c9c7016..8c2fd998669 100644
--- a/chromium/cc/base/devtools_instrumentation.h
+++ b/chromium/cc/base/devtools_instrumentation.h
@@ -66,9 +66,9 @@ class CC_BASE_EXPORT ScopedLayerTask {
 
 class CC_BASE_EXPORT ScopedImageTask {
  public:
-  enum ImageType { kWebP, kJpeg, kOther };
+  enum ImageType { kAvif, kBmp, kGif, kIco, kJpeg, kPng, kWebP, kOther };
 
-  ScopedImageTask(ImageType image_type)
+  explicit ScopedImageTask(ImageType image_type)
       : image_type_(image_type), start_time_(base::TimeTicks::Now()) {}
   ScopedImageTask(const ScopedImageTask&) = delete;
   ~ScopedImageTask() = default;
diff --git a/chromium/cc/base/features.cc b/chromium/cc/base/features.cc
index 8c0c599f83d..5c230565fd2 100644
--- a/chromium/cc/base/features.cc
+++ b/chromium/cc/base/features.cc
@@ -12,6 +12,10 @@ namespace features {
 const base::Feature kImpulseScrollAnimations = {
     "ImpulseScrollAnimations", base::FEATURE_DISABLED_BY_DEFAULT};
 
+// Whether the compositor should attempt to sync with the scroll handlers before submitting a frame.
+const base::Feature kSynchronizedScrolling = {"SynchronizedScrolling",
+                                              base::FEATURE_ENABLED_BY_DEFAULT};
+
 // When enabled BeginMainFrame does not wait for activation in the compositor
 // thread for texture layers (crbug.com/1046463)
 const base::Feature kTextureLayerSkipWaitForActivation{
diff --git a/chromium/cc/base/features.h b/chromium/cc/base/features.h
index 56c620c6eea..ea86ee616d8 100644
--- a/chromium/cc/base/features.h
+++ b/chromium/cc/base/features.h
@@ -12,6 +12,7 @@
 namespace features {
 
 CC_BASE_EXPORT extern const base::Feature kImpulseScrollAnimations;
+CC_BASE_EXPORT extern const base::Feature kSynchronizedScrolling;
 CC_BASE_EXPORT extern const base::Feature kTextureLayerSkipWaitForActivation;
 
 #if !defined(OS_ANDROID)
diff --git a/chromium/cc/base/list_container.h b/chromium/cc/base/list_container.h
index 27ba06b9192..a01d07958dd 100644
--- a/chromium/cc/base/list_container.h
+++ b/chromium/cc/base/list_container.h
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "base/optional.h"
 #include "cc/base/list_container_helper.h"
 
diff --git a/chromium/cc/base/list_container_helper.cc b/chromium/cc/base/list_container_helper.cc
index afd386e3a88..7b594b4a458 100644
--- a/chromium/cc/base/list_container_helper.cc
+++ b/chromium/cc/base/list_container_helper.cc
@@ -7,6 +7,7 @@
 #include <stddef.h>
 
 #include <algorithm>
+#include <cstring>
 #include <vector>
 
 #include "base/check_op.h"
diff --git a/chromium/cc/base/math_util.h b/chromium/cc/base/math_util.h
index 1001124d9af..a5f30e02252 100644
--- a/chromium/cc/base/math_util.h
+++ b/chromium/cc/base/math_util.h
@@ -9,7 +9,7 @@
 #include <memory>
 #include <vector>
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "base/numerics/ranges.h"
 #include "build/build_config.h"
 #include "cc/base/base_export.h"
diff --git a/chromium/cc/base/reverse_spiral_iterator.h b/chromium/cc/base/reverse_spiral_iterator.h
index 3fef364871d..1d07381e62d 100644
--- a/chromium/cc/base/reverse_spiral_iterator.h
+++ b/chromium/cc/base/reverse_spiral_iterator.h
@@ -5,7 +5,6 @@
 #ifndef CC_BASE_REVERSE_SPIRAL_ITERATOR_H_
 #define CC_BASE_REVERSE_SPIRAL_ITERATOR_H_
 
-#include "base/logging.h"
 #include "cc/base/base_export.h"
 #include "cc/base/index_rect.h"
 
diff --git a/chromium/cc/base/rtree.h b/chromium/cc/base/rtree.h
index 2ee4e7cb588..9e92f955de4 100644
--- a/chromium/cc/base/rtree.h
+++ b/chromium/cc/base/rtree.h
@@ -13,7 +13,7 @@
 #include <map>
 #include <vector>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "base/numerics/clamped_math.h"
 #include "ui/gfx/geometry/rect.h"
 
diff --git a/chromium/cc/base/spiral_iterator.h b/chromium/cc/base/spiral_iterator.h
index af64b76afde..3ed081688e7 100644
--- a/chromium/cc/base/spiral_iterator.h
+++ b/chromium/cc/base/spiral_iterator.h
@@ -5,7 +5,6 @@
 #ifndef CC_BASE_SPIRAL_ITERATOR_H_
 #define CC_BASE_SPIRAL_ITERATOR_H_
 
-#include "base/logging.h"
 #include "cc/base/base_export.h"
 #include "cc/base/index_rect.h"
 
diff --git a/chromium/cc/base/switches.h b/chromium/cc/base/switches.h
index 7b6c6b398e0..12615d5dcdc 100644
--- a/chromium/cc/base/switches.h
+++ b/chromium/cc/base/switches.h
@@ -7,7 +7,7 @@
 #ifndef CC_BASE_SWITCHES_H_
 #define CC_BASE_SWITCHES_H_
 
-#include "base/logging.h"
+#include "base/check.h"
 #include "cc/base/base_export.h"
 
 // Since cc is used from the render process, anything that goes here also needs
diff --git a/chromium/cc/base/tiling_data.h b/chromium/cc/base/tiling_data.h
index a8b9ee7ec6c..ac294ac5ad6 100644
--- a/chromium/cc/base/tiling_data.h
+++ b/chromium/cc/base/tiling_data.h
@@ -7,7 +7,7 @@
 
 #include <utility>
 
-#include "base/logging.h"
+#include "base/check_op.h"
 #include "cc/base/base_export.h"
 #include "cc/base/index_rect.h"
 #include "cc/base/reverse_spiral_iterator.h"