BASELINE: Update Chromium to 83.0.4103.122

Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 6 insertions, 7 deletions

diff --git a/chromium/cc/layers/picture_layer_impl.h b/chromium/cc/layers/picture_layer_impl.h
index d2459c42af7..1061fc68370 100644
--- a/chromium/cc/layers/picture_layer_impl.h
+++ b/chromium/cc/layers/picture_layer_impl.h
@@ -64,6 +64,7 @@ class CC_EXPORT PictureLayerImpl
   void RecreateTileResources() override;
   Region GetInvalidationRegionForDebugging() override;
   gfx::Rect GetEnclosingRectInTargetSpace() const override;
+  gfx::ContentColorUsage GetContentColorUsage() const override;
 
   // PictureLayerTilingClient overrides.
   std::unique_ptr<Tile> CreateTile(const Tile::CreateInfo& info) override;
@@ -104,6 +105,8 @@ class CC_EXPORT PictureLayerImpl
 
   void SetUseTransformedRasterization(bool use);
 
+  void SetDirectlyCompositedImageSize(base::Optional<gfx::Size>);
+
   size_t GPUMemoryUsageInBytes() const override;
 
   void RunMicroBenchmark(MicroBenchmarkImpl* benchmark) override;
@@ -119,10 +122,6 @@ class CC_EXPORT PictureLayerImpl
   // Used for benchmarking
   RasterSource* GetRasterSource() const { return raster_source_.get(); }
 
-  void set_is_directly_composited_image(bool is_directly_composited_image) {
-    is_directly_composited_image_ = is_directly_composited_image;
-  }
-
   // This enum is the return value of the InvalidateRegionForImages() call. The
   // possible values represent the fact that there are no images on this layer
   // (kNoImages), the fact that the invalidation images don't cause an
@@ -174,6 +173,7 @@ class CC_EXPORT PictureLayerImpl
   float MaximumContentsScale() const;
   void UpdateViewportRectForTilePriorityInContentSpace();
   PictureLayerImpl* GetRecycledTwinLayer() const;
+  float GetDirectlyCompositedImageRasterScale() const;
 
   void SanityCheckTilingState() const;
 
@@ -189,8 +189,6 @@ class CC_EXPORT PictureLayerImpl
   void RegisterAnimatedImages();
   void UnregisterAnimatedImages();
 
-  std::unique_ptr<base::DictionaryValue> LayerAsJson() const override;
-
   // Set the collection of PaintWorkletInput as well as their PaintImageId that
   // are part of this layer.
   void SetPaintWorkletInputs(
@@ -230,9 +228,10 @@ class CC_EXPORT PictureLayerImpl
 
   bool nearest_neighbor_ : 1;
   bool use_transformed_rasterization_ : 1;
-  bool is_directly_composited_image_ : 1;
   bool can_use_lcd_text_ : 1;
 
+  base::Optional<gfx::Size> directly_composited_image_size_;
+
   // Use this instead of |visible_layer_rect()| for tiling calculations. This
   // takes external viewport and transform for tile priority into account.
   gfx::Rect viewport_rect_for_tile_priority_in_content_space_;