BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 11 insertions, 11 deletions

diff --git a/chromium/cc/raster/raster_source.h b/chromium/cc/raster/raster_source.h
index 7a70742f127..8f7f8679691 100644
--- a/chromium/cc/raster/raster_source.h
+++ b/chromium/cc/raster/raster_source.h
@@ -56,6 +56,9 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
   // i.e. contents in the rect will be cropped and translated onto the canvas.
   // canvas_playback_rect can be used to replay only part of the recording in,
   // the content space, so only a sub-rect of the tile gets rastered.
+  //
+  // Note that this should only be called after the image decode controller has
+  // been set, which happens during commit.
   void PlaybackToCanvas(SkCanvas* canvas,
                         const gfx::Size& content_size,
                         const gfx::Rect& canvas_bitmap_rect,
@@ -63,17 +66,6 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
                         const gfx::AxisTransform2d& raster_transform,
                         const PlaybackSettings& settings) const;
 
-  // Raster this RasterSource into the given canvas. Canvas states such as
-  // CTM and clip region will be respected. This function will replace pixels
-  // in the clip region without blending.
-  //
-  // Virtual for testing.
-  //
-  // Note that this should only be called after the image decode controller has
-  // been set, which happens during commit.
-  virtual void PlaybackToCanvas(SkCanvas* canvas,
-                                ImageProvider* image_provider) const;
-
   // Returns whether the given rect at given scale is of solid color in
   // this raster source, as well as the solid color value.
   bool PerformSolidColorAnalysis(gfx::Rect content_rect, SkColor* color) const;
@@ -139,6 +131,14 @@ class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
                             const gfx::Rect& canvas_bitmap_rect,
                             const gfx::Rect& canvas_playback_rect) const;
 
+  // Raster the display list of this raster source into the given canvas.
+  // Canvas states such as CTM and clip region will be respected.
+  // This function will replace pixels in the clip region without blending.
+  //
+  // Virtual for testing.
+  virtual void PlaybackDisplayListToCanvas(SkCanvas* canvas,
+                                           ImageProvider* image_provider) const;
+
   // The serialized size for the largest op in this RasterSource. This is
   // accessed only on the raster threads with the context lock acquired.
   size_t max_op_size_hint_ =