Rebase master

flutter · fluttergithubbot · Jun 30, 2022 · Mar 9, 2022 · Mar 9, 2022 · Mar 31, 2022
commit 3e1ed6ce44ad4af12ddad53335aa26a0a0650ad1
diff --git a/flow/layers/clip_shape_layer.h b/flow/layers/clip_shape_layer.h
@@ -35,7 +35,7 @@ class ClipShapeLayer : public CacheableContainerLayer {
 #ifndef SUPPORT_FRACTIONAL_TRANSLATION
     if (UsesSaveLayer()) {
       context->SetTransform(
-          RasterCache::GetIntegralTransCTM(context->GetTransform()));
+          RasterCacheUtil::GetIntegralTransCTM(context->GetTransform()));
     }
 #endif
     if (context->PushCullRect(clip_shape_bounds())) {
@@ -94,8 +94,9 @@ class ClipShapeLayer : public CacheableContainerLayer {
     }
 
 #ifndef SUPPORT_FRACTIONAL_TRANSLATION
-    context.internal_nodes_canvas->setMatrix(RasterCache::GetIntegralTransCTM(
-        context.leaf_nodes_canvas->getTotalMatrix()));
+    context.internal_nodes_canvas->setMatrix(
+        RasterCacheUtil::GetIntegralTransCTM(
+            context.leaf_nodes_canvas->getTotalMatrix()));
 #endif
 
     AutoCachePaint cache_paint(context);

diff --git a/flow/layers/color_filter_layer.cc b/flow/layers/color_filter_layer.cc
@@ -4,6 +4,7 @@
 
 #include "flutter/flow/layers/color_filter_layer.h"
 #include "flutter/flow/raster_cache_item.h"
+#include "flutter/flow/raster_cache_util.h"
 
 namespace flutter {
 
@@ -25,7 +26,7 @@ void ColorFilterLayer::Diff(DiffContext* context, const Layer* old_layer) {
 
 #ifndef SUPPORT_FRACTIONAL_TRANSLATION
   context->SetTransform(
-      RasterCache::GetIntegralTransCTM(context->GetTransform()));
+      RasterCacheUtil::GetIntegralTransCTM(context->GetTransform()));
 #endif
 
   DiffChildren(context, prev);
@@ -50,6 +51,12 @@ void ColorFilterLayer::Paint(PaintContext& context) const {
   FML_DCHECK(needs_painting(context));
 
   AutoCachePaint cache_paint(context);
+
+#ifndef SUPPORT_FRACTIONAL_TRANSLATION
+  context.internal_nodes_canvas->setMatrix(RasterCacheUtil::GetIntegralTransCTM(
+      context.leaf_nodes_canvas->getTotalMatrix()));
+#endif
+
   if (context.raster_cache) {
     if (layer_raster_cache_item_->IsCacheChildren()) {
       cache_paint.setColorFilter(filter_);

diff --git a/flow/layers/display_list_layer.cc b/flow/layers/display_list_layer.cc
@@ -149,7 +149,7 @@ void DisplayListLayer::Paint(PaintContext& context) const {
         fml::TimePoint::Now() - start_time;
 
     const SkRect device_bounds =
-        RasterCache::GetDeviceBounds(paint_bounds(), ctm);
+        RasterCacheUtil::GetDeviceBounds(paint_bounds(), ctm);
     sk_sp<SkData> raster_data = offscreen_surface->GetRasterData(true);
     LayerSnapshotData snapshot_data(unique_id(), offscreen_render_time,
                                     raster_data, device_bounds);

diff --git a/flow/layers/image_filter_layer.cc b/flow/layers/image_filter_layer.cc
@@ -4,6 +4,7 @@
 
 #include "flutter/flow/layers/image_filter_layer.h"
 #include "flutter/flow/layers/layer.h"
+#include "flutter/flow/raster_cache_util.h"
 
 namespace flutter {
 
@@ -25,7 +26,7 @@ void ImageFilterLayer::Diff(DiffContext* context, const Layer* old_layer) {
 
 #ifndef SUPPORT_FRACTIONAL_TRANSLATION
   context->SetTransform(
-      RasterCache::GetIntegralTransCTM(context->GetTransform()));
+      RasterCacheUtil::GetIntegralTransCTM(context->GetTransform()));
 #endif
 
   if (filter_) {
@@ -85,6 +86,11 @@ void ImageFilterLayer::Paint(PaintContext& context) const {
 
   AutoCachePaint cache_paint(context);
 
+#ifndef SUPPORT_FRACTIONAL_TRANSLATION
+  context.internal_nodes_canvas->setMatrix(RasterCacheUtil::GetIntegralTransCTM(
+      context.leaf_nodes_canvas->getTotalMatrix()));
+#endif
+
   if (layer_raster_cache_item_->IsCacheChildren()) {
     cache_paint.setImageFilter(transformed_filter_);
   }

diff --git a/flow/layers/layer_raster_cache_item.cc b/flow/layers/layer_raster_cache_item.cc
@@ -23,7 +23,11 @@ void LayerRasterCacheItem::PrerollSetup(PrerollContext* context,
   if (context->raster_cache && context->raster_cached_entries) {
     context->raster_cached_entries->push_back(this);
     child_items_ = context->raster_cached_entries->size();
-    matrix_ = matrix;
+    auto child_matrix = matrix;
+#ifndef SUPPORT_FRACTIONAL_TRANSLATION
+    child_matrix = RasterCacheUtil::GetIntegralTransCTM(matrix);
+#endif
+    matrix_ = child_matrix;
   }
 }
 
@@ -52,7 +56,7 @@ void LayerRasterCacheItem::PrerollFinalize(PrerollContext* context,
   if (num_cache_attempts_ >= layer_cached_threshold_) {
     // the layer can be cached
     cache_state_ = CacheState::kCurrent;
-    context->raster_cache->MarkSeen(key_id_, matrix);
+    context->raster_cache->MarkSeen(key_id_, matrix_);
   } else {
     num_cache_attempts_++;
     // access current layer
@@ -66,7 +70,7 @@ void LayerRasterCacheItem::PrerollFinalize(PrerollContext* context,
                                    RasterCacheKeyType::kLayerChildren);
       }
       cache_state_ = CacheState::kChildren;
-      context->raster_cache->MarkSeen(layer_children_id_.value(), matrix);
+      context->raster_cache->MarkSeen(layer_children_id_.value(), matrix_);
     }
   }
 }

diff --git a/flow/layers/shader_mask_layer.cc b/flow/layers/shader_mask_layer.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "flutter/flow/layers/shader_mask_layer.h"
+#include "flutter/flow/raster_cache_util.h"
 
 namespace flutter {
 
@@ -28,7 +29,7 @@ void ShaderMaskLayer::Diff(DiffContext* context, const Layer* old_layer) {
 
 #ifndef SUPPORT_FRACTIONAL_TRANSLATION
   context->SetTransform(
-      RasterCache::GetIntegralTransCTM(context->GetTransform()));
+      RasterCacheUtil::GetIntegralTransCTM(context->GetTransform()));
 #endif
 
   DiffChildren(context, prev);
@@ -54,6 +55,11 @@ void ShaderMaskLayer::Paint(PaintContext& context) const {
 
   AutoCachePaint cache_paint(context);
 
+#ifndef SUPPORT_FRACTIONAL_TRANSLATION
+  context.internal_nodes_canvas->setMatrix(RasterCacheUtil::GetIntegralTransCTM(
+      context.leaf_nodes_canvas->getTotalMatrix()));
+#endif
+
   if (context.raster_cache) {
     if (layer_raster_cache_item_->Draw(context, cache_paint.paint())) {
       return;

diff --git a/flow/raster_cache.cc b/flow/raster_cache.cc
@@ -33,7 +33,7 @@ void RasterCacheResult::draw(SkCanvas& canvas, const SkPaint* paint) const {
   SkAutoCanvasRestore auto_restore(&canvas, true);
 
   SkRect bounds =
-      RasterCache::GetDeviceBounds(logical_rect_, canvas.getTotalMatrix());
+      RasterCacheUtil::GetDeviceBounds(logical_rect_, canvas.getTotalMatrix());
   FML_DCHECK(std::abs(bounds.width() - image_->dimensions().width()) <= 1 &&
              std::abs(bounds.height() - image_->dimensions().height()) <= 1);
   canvas.resetMatrix();
@@ -55,13 +55,14 @@ std::unique_ptr<RasterCacheResult> RasterCache::Rasterize(
     const std::function<void(SkCanvas*)>& draw_function) {
   TRACE_EVENT0("flutter", "RasterCachePopulate");
 
-  SkRect dest_rect = RasterCache::GetDeviceBounds(logical_rect, ctm);
+  SkRect dest_rect =
+      RasterCacheUtil::GetDeviceBounds(context.logical_rect, context.matrix);
   // we always round out here so that the texture is integer sized.
   int width = SkScalarCeilToInt(dest_rect.width());
   int height = SkScalarCeilToInt(dest_rect.height());
 
-  const SkImageInfo image_info =
-      SkImageInfo::MakeN32Premul(width, height, sk_ref_sp(dst_color_space));
+  const SkImageInfo image_info = SkImageInfo::MakeN32Premul(
+      width, height, sk_ref_sp(context.dst_color_space));
 
   sk_sp<SkSurface> surface =
       context.gr_context ? SkSurface::MakeRenderTarget(
@@ -75,7 +76,7 @@ std::unique_ptr<RasterCacheResult> RasterCache::Rasterize(
   SkCanvas* canvas = surface->getCanvas();
   canvas->clear(SK_ColorTRANSPARENT);
   canvas->translate(-dest_rect.left(), -dest_rect.top());
-  canvas->concat(ctm);
+  canvas->concat(context.matrix);
   draw_function(canvas);
 
   if (context.checkerboard) {

diff --git a/flow/raster_cache.h b/flow/raster_cache.h
@@ -114,36 +114,6 @@ class RasterCache {
 
   virtual ~RasterCache() = default;
 
-  static SkRect GetDeviceBounds(const SkRect& rect, const SkMatrix& ctm) {
-    SkRect device_rect;
-    ctm.mapRect(&device_rect, rect);
-#ifndef SUPPORT_FRACTIONAL_TRANSLATION
-    device_rect.roundOut(&device_rect);
-#endif
-    return device_rect;
-  }
-
-  /**
-   * @brief Snap the translation components of the matrix to integers.
-   *
-   * The snapping will only happen if the matrix only has scale and translation
-   * transformations.
-   *
-   * @param ctm the current transformation matrix.
-   * @return SkMatrix the snapped transformation matrix.
-   */
-  static SkMatrix GetIntegralTransCTM(const SkMatrix& ctm) {
-    // Avoid integral snapping if the matrix has complex transformation to avoid
-    // the artifact observed in https://github.com/flutter/flutter/issues/41654.
-    if (!ctm.isScaleTranslate()) {
-      return ctm;
-    }
-    SkMatrix result = ctm;
-    result[SkMatrix::kMTransX] = SkScalarRoundToScalar(ctm.getTranslateX());
-    result[SkMatrix::kMTransY] = SkScalarRoundToScalar(ctm.getTranslateY());
-    return result;
-  }
-
   // Draws this item if it should be rendered from the cache and returns
   // true iff it was successfully drawn. Typically this should only fail
   // if the item was disabled due to conditions discovered during |Preroll|

diff --git a/flow/raster_cache_unittests.cc b/flow/raster_cache_unittests.cc
@@ -415,7 +415,7 @@ TEST(RasterCache, DeviceRectRoundOutForSkPicture) {
 TEST(RasterCache, ComputeDeviceRectBasedOnFractionalTranslation) {
   SkRect logical_rect = SkRect::MakeLTRB(0, 0, 300.2, 300.3);
   SkMatrix ctm = SkMatrix::MakeAll(2.0, 0, 0, 0, 2.0, 0, 0, 0, 1);
-  auto result = RasterCache::GetDeviceBounds(logical_rect, ctm);
+  auto result = RasterCacheUtil::GetDeviceBounds(logical_rect, ctm);
 #ifndef SUPPORT_FRACTIONAL_TRANSLATION
   ASSERT_EQ(result, SkRect::MakeLTRB(0.0, 0.0, 601.0, 601.0));
 #else

diff --git a/flow/raster_cache_util.h b/flow/raster_cache_util.h
@@ -48,7 +48,6 @@ struct RasterCacheUtil {
 
     return true;
   }
-
   /**
    * @brief Snap the translation components of the matrix to integers.
    *
@@ -70,12 +69,13 @@ struct RasterCacheUtil {
     return result;
   }
 
-  static SkIRect GetDeviceBounds(const SkRect& rect, const SkMatrix& ctm) {
+  static SkRect GetDeviceBounds(const SkRect& rect, const SkMatrix& ctm) {
     SkRect device_rect;
     ctm.mapRect(&device_rect, rect);
-    SkIRect bounds;
-    device_rect.roundOut(&bounds);
-    return bounds;
+#ifndef SUPPORT_FRACTIONAL_TRANSLATION
+    device_rect.roundOut(&device_rect);
+#endif
+    return device_rect;
   }
 };
 

diff --git a/flow/testing/mock_raster_cache.cc b/flow/testing/mock_raster_cache.cc
@@ -40,7 +40,7 @@ void MockRasterCache::AddMockLayer(int width, int height) {
   UpdateCacheEntry(
       RasterCacheKeyID(layer.unique_id(), RasterCacheKeyType::kLayer),
       r_context, [&](SkCanvas* canvas) {
-        SkIRect cache_rect = RasterCacheUtil::GetDeviceBounds(
+        SkRect cache_rect = RasterCacheUtil::GetDeviceBounds(
             r_context.logical_rect, r_context.matrix);
         return std::make_unique<MockRasterCacheResult>(cache_rect);
       });
@@ -79,7 +79,7 @@ void MockRasterCache::AddMockPicture(int width, int height) {
   UpdateCacheEntry(
       RasterCacheKeyID(picture->uniqueID(), RasterCacheKeyType::kPicture),
       r_context, [&](SkCanvas* canvas) {
-        SkIRect cache_rect = RasterCacheUtil::GetDeviceBounds(
+        SkRect cache_rect = RasterCacheUtil::GetDeviceBounds(
             r_context.logical_rect, r_context.matrix);
         return std::make_unique<MockRasterCacheResult>(cache_rect);
       });