Merge remote-tracking branch 'upstream/master' into trace_save_layer

Author: dnfield

BUILD.gn

@@ -21,12 +21,6 @@ config("config") {
       cflags = [ "/WX" ]  # Treat warnings as errors.
     }
   }
-
-  defines = []
-
-  if (is_debug) {
-    defines += [ "FLUTTER_ENABLE_DIFF_CONTEXT" ]
-  }
 }
 
 config("export_dynamic_symbols") {

DEPS

@@ -27,7 +27,7 @@ vars = {
   'skia_git': 'https://skia.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': '39eccabdc3e4bdc5f3088e3fa241eba0847ed9d0',
+  'skia_revision': 'a05d3029ac650f2662e7aba925d464c279e8d685',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -99,7 +99,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '2610767168166f98e7e0656893fe1a550d5f6fab',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'b0c315b5e6964fd85dd87b8d0195ddb5c3b60a34',
 
    # Fuchsia compatibility
    #
@@ -570,7 +570,7 @@ deps = {
      'packages': [
        {
         'package': 'flutter/android/embedding_bundle',
-        'version': 'last_updated:2021-10-28T23:34:47-0700'
+        'version': 'last_updated:2021-11-03T10:29:50-0700'
        }
      ],
      'condition': 'download_android_deps',
@@ -625,7 +625,7 @@ deps = {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/linux-amd64',
-        'version': 'usfKkGnw00OEgzxLzcWeF1xLd9SsPtL9BxNhxTcawLkC'
+        'version': '5N9a1nYj5C2ueEhnn6QH-yo00rVsRHll-w33R9UAH50C'
       }
     ],
     'condition': 'host_os == "linux"',
@@ -651,7 +651,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'nblJjRFDAh-l2D4eNhZfTsUsSjrbplStpRa8eBsPKkQC'
+        'version': 'nkHhPcy3qP2eerVT3O2h2jyIDk5ad5MxY_qQHfL3ERUC'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -661,7 +661,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'tBL8VjITEMr2lN4iUgYcOl_MnOZ7-K0bgCFlF0_XGTEC'
+        'version': 'm90mMA37b7TMZqFL-v-jk2obHAjYn67shKTWmulUXSQC'
        }
      ],
      'condition': 'host_os == "linux"',

build/dart/rules.gni

@@ -8,6 +8,7 @@ import("//build/compiled_action.gni")
 import("//build/module_args/dart.gni")
 import("//flutter/common/config.gni")
 import("//third_party/dart/build/dart/dart_action.gni")
+import("//third_party/dart/sdk_args.gni")
 
 frontend_server_files =
     exec_script("//third_party/dart/tools/list_dart_files.py",
@@ -267,6 +268,13 @@ template("application_snapshot") {
     assert(false, "Bad snapshot_kind: '$snapshot_kind'")
   }
 
+  # Ensure the compiled appliation (e.g. frontend-server, ...) will use this
+  # Dart SDK hash when consuming/producing kernel.
+  #
+  # (Instead of ensuring every user of the "application_snapshot" passes it's
+  # own)
+  snapshot_vm_args += [ "-Dsdk_hash=$sdk_hash" ]
+
   if (flutter_prebuilt_dart_sdk) {
     action(target_name) {
       forward_variables_from(invoker,

ci/licenses_golden/licenses_flutter

@@ -835,6 +835,7 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/Rende
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/SplashScreen.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/SplashScreenProvider.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/TransparencyMode.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/android/WindowInfoRepositoryCallbackAdapterWrapper.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineCache.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineConnectionRegistry.java

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: 786622216247c45ab35bd4e632e459dc
+Signature: 1a0bc799c84c3cad01c08469e8d29ed0
 
 UNUSED LICENSES:
 
@@ -863,9 +863,6 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.ex
 FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN.json
 FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-TSAN.json
 FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-Tidy.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-V1andV2.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-V1only.json
-FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-V2only.json
 FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-Wuffs.json
 FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-ANGLE.json
 FILE: ../../../third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-ASAN.json
@@ -4038,7 +4035,6 @@ FILE: ../../../third_party/skia/fuzz/FuzzSkParagraph.cpp
 FILE: ../../../third_party/skia/gm/3d.cpp
 FILE: ../../../third_party/skia/gm/bc1_transparency.cpp
 FILE: ../../../third_party/skia/gm/bicubic.cpp
-FILE: ../../../third_party/skia/gm/colrv1.cpp
 FILE: ../../../third_party/skia/gm/compressed_textures.cpp
 FILE: ../../../third_party/skia/gm/crbug_1073670.cpp
 FILE: ../../../third_party/skia/gm/crbug_1086705.cpp
@@ -5401,6 +5397,7 @@ FILE: ../../../third_party/skia/experimental/graphite/src/mtl/MtlUtils.mm
 FILE: ../../../third_party/skia/fuzz/FuzzDDLThreading.cpp
 FILE: ../../../third_party/skia/gm/aarecteffect.cpp
 FILE: ../../../third_party/skia/gm/colorspace.cpp
+FILE: ../../../third_party/skia/gm/colrv1.cpp
 FILE: ../../../third_party/skia/gm/drawglyphs.cpp
 FILE: ../../../third_party/skia/gm/largeclippedpath.cpp
 FILE: ../../../third_party/skia/gm/skbug_12212.cpp
@@ -5431,6 +5428,7 @@ FILE: ../../../third_party/skia/modules/androidkit/src/Utils.cpp
 FILE: ../../../third_party/skia/modules/androidkit/src/Utils.h
 FILE: ../../../third_party/skia/modules/skottie/src/effects/DirectionalBlur.cpp
 FILE: ../../../third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp
+FILE: ../../../third_party/skia/modules/skottie/src/effects/SkSLEffect.cpp
 FILE: ../../../third_party/skia/modules/skottie/src/effects/SphereEffect.cpp
 FILE: ../../../third_party/skia/modules/skottie/src/effects/ThresholdEffect.cpp
 FILE: ../../../third_party/skia/modules/skunicode/src/SkUnicode_icu.h

ci/licenses_golden/licenses_skia

@@ -4,11 +4,45 @@
 
 #include "flutter/flow/compositor_context.h"
 
+#include <optional>
 #include "flutter/flow/layers/layer_tree.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace flutter {
 
+std::optional<SkRect> FrameDamage::ComputeClipRect(
+    flutter::LayerTree& layer_tree) {
+  if (layer_tree.root_layer()) {
+    PaintRegionMap empty_paint_region_map;
+    DiffContext context(layer_tree.frame_size(),
+                        layer_tree.device_pixel_ratio(),
+                        layer_tree.paint_region_map(),
+                        prev_layer_tree_ ? prev_layer_tree_->paint_region_map()
+                                         : empty_paint_region_map);
+    context.PushCullRect(SkRect::MakeIWH(layer_tree.frame_size().width(),
+                                         layer_tree.frame_size().height()));
+    {
+      DiffContext::AutoSubtreeRestore subtree(&context);
+      const Layer* prev_root_layer = nullptr;
+      if (!prev_layer_tree_ ||
+          prev_layer_tree_->frame_size() != layer_tree.frame_size()) {
+        // If there is no previous layer tree assume the entire frame must be
+        // repainted.
+        context.MarkSubtreeDirty(SkRect::MakeIWH(
+            layer_tree.frame_size().width(), layer_tree.frame_size().height()));
+      } else {
+        prev_root_layer = prev_layer_tree_->root_layer();
+      }
+      layer_tree.root_layer()->Diff(&context, prev_root_layer);
+    }
+
+    damage_ = context.ComputeDamage(additional_damage_);
+    return SkRect::Make(damage_->buffer_damage);
+  } else {
+    return std::nullopt;
+  }
+}
+
 CompositorContext::CompositorContext(fml::Milliseconds frame_budget)
     : raster_time_(frame_budget), ui_time_(frame_budget) {}
 
@@ -68,9 +102,15 @@ CompositorContext::ScopedFrame::~ScopedFrame() {
 
 RasterStatus CompositorContext::ScopedFrame::Raster(
     flutter::LayerTree& layer_tree,
-    bool ignore_raster_cache) {
+    bool ignore_raster_cache,
+    FrameDamage* frame_damage) {
   TRACE_EVENT0("flutter", "CompositorContext::ScopedFrame::Raster");
-  bool root_needs_readback = layer_tree.Preroll(*this, ignore_raster_cache);
+
+  std::optional<SkRect> clip_rect =
+      frame_damage ? frame_damage->ComputeClipRect(layer_tree) : std::nullopt;
+
+  bool root_needs_readback = layer_tree.Preroll(
+      *this, ignore_raster_cache, clip_rect ? *clip_rect : kGiantRect);
   bool needs_save_layer = root_needs_readback && !surface_supports_readback();
   PostPrerollResult post_preroll_result = PostPrerollResult::kSuccess;
   if (view_embedder_ && raster_thread_merger_) {
@@ -84,9 +124,16 @@ RasterStatus CompositorContext::ScopedFrame::Raster(
   if (post_preroll_result == PostPrerollResult::kSkipAndRetryFrame) {
     return RasterStatus::kSkipAndRetry;
   }
+
+  SkAutoCanvasRestore restore(canvas(), clip_rect.has_value());
+
   // Clearing canvas after preroll reduces one render target switch when preroll
   // paints some raster cache.
   if (canvas()) {
+    if (clip_rect) {
+      canvas()->clipRect(*clip_rect);
+    }
+
     if (needs_save_layer) {
       TRACE_EVENT0("flutter", "Canvas::saveLayer");
       SkRect bounds = SkRect::Make(layer_tree.frame_size());

flow/compositor_context.cc

@@ -9,6 +9,7 @@
 #include <string>
 
 #include "flutter/common/graphics/texture.h"
+#include "flutter/flow/diff_context.h"
 #include "flutter/flow/embedded_views.h"
 #include "flutter/flow/instrumentation.h"
 #include "flutter/flow/raster_cache.h"
@@ -54,6 +55,43 @@ enum class RasterStatus {
   kYielded,
 };
 
+class FrameDamage {
+ public:
+  // Sets previous layer tree for calculating frame damage. If not set, entire
+  // frame will be repainted.
+  void SetPreviousLayerTree(const LayerTree* prev_layer_tree) {
+    prev_layer_tree_ = prev_layer_tree;
+  }
+
+  // Adds additional damage (accumulated for double / triple buffering).
+  // This is area that will be repainted alongside any changed part.
+  void AddAdditonalDamage(const SkIRect& damage) {
+    additional_damage_.join(damage);
+  }
+
+  // Calculates clip rect for current rasterization. This is diff of layer tree
+  // and previous layer tree + any additional provideddamage.
+  // If previous layer tree is not specified, clip rect will be nulloptional,
+  // but the paint region of layer_tree will be calculated so that it can be
+  // used for diffing of subsequent frames.
+  std::optional<SkRect> ComputeClipRect(flutter::LayerTree& layer_tree);
+
+  // See Damage::frame_damage.
+  std::optional<SkIRect> GetFrameDamage() const {
+    return damage_ ? std::make_optional(damage_->frame_damage) : std::nullopt;
+  }
+
+  // See Damage::buffer_damage.
+  std::optional<SkIRect> GetBufferDamage() {
+    return damage_ ? std::make_optional(damage_->buffer_damage) : std::nullopt;
+  }
+
+ private:
+  SkIRect additional_damage_ = SkIRect::MakeEmpty();
+  std::optional<Damage> damage_;
+  const LayerTree* prev_layer_tree_ = nullptr;
+};
+
 class CompositorContext {
  public:
   class ScopedFrame {
@@ -84,7 +122,8 @@ class CompositorContext {
     GrDirectContext* gr_context() const { return gr_context_; }
 
     virtual RasterStatus Raster(LayerTree& layer_tree,
-                                bool ignore_raster_cache);
+                                bool ignore_raster_cache,
+                                FrameDamage* frame_damage);
 
    private:
     CompositorContext& context_;

flow/compositor_context.h

@@ -7,8 +7,6 @@
 
 namespace flutter {
 
-#ifdef FLUTTER_ENABLE_DIFF_CONTEXT
-
 DiffContext::DiffContext(SkISize frame_size,
                          double frame_device_pixel_ratio,
                          PaintRegionMap& this_frame_paint_region_map,
@@ -23,6 +21,7 @@ void DiffContext::BeginSubtree() {
   state_stack_.push_back(state_);
   state_.rect_index_ = rects_->size();
   state_.has_filter_bounds_adjustment = false;
+  state_.has_texture = false;
   if (state_.transform_override) {
     state_.transform = *state_.transform_override;
     state_.transform_override = std::nullopt;
@@ -42,7 +41,8 @@ DiffContext::State::State()
     : dirty(false),
       cull_rect(kGiantRect),
       rect_index_(0),
-      has_filter_bounds_adjustment(false) {}
+      has_filter_bounds_adjustment(false),
+      has_texture(false) {}
 
 void DiffContext::PushTransform(const SkMatrix& transform) {
   state_.transform.preConcat(transform);
@@ -118,6 +118,12 @@ void DiffContext::MarkSubtreeDirty(const PaintRegion& previous_paint_region) {
   state_.dirty = true;
 }
 
+void DiffContext::MarkSubtreeDirty(const SkRect& previous_paint_region) {
+  FML_DCHECK(!IsSubtreeDirty());
+  AddDamage(previous_paint_region);
+  state_.dirty = true;
+}
+
 void DiffContext::AddLayerBounds(const SkRect& rect) {
   // During painting we cull based on non-overriden transform and then
   // override the transform right before paint. Do the same thing here to get
@@ -136,6 +142,16 @@ void DiffContext::AddLayerBounds(const SkRect& rect) {
   }
 }
 
+void DiffContext::MarkSubtreeHasTextureLayer() {
+  // Set the has_texture flag on current state and all parent states. That
+  // way we'll know that we can't skip diff for retained layers because
+  // they contain a TextureLayer.
+  for (auto& state : state_stack_) {
+    state.has_texture = true;
+  }
+  state_.has_texture = true;
+}
+
 void DiffContext::AddExistingPaintRegion(const PaintRegion& region) {
   // Adding paint region for retained layer implies that current subtree is not
   // dirty, so we know, for example, that the inherited transforms must match
@@ -158,7 +174,8 @@ PaintRegion DiffContext::CurrentSubtreeRegion() const {
   bool has_readback = std::any_of(
       readbacks_.begin(), readbacks_.end(),
       [&](const Readback& r) { return r.position >= state_.rect_index_; });
-  return PaintRegion(rects_, state_.rect_index_, rects_->size(), has_readback);
+  return PaintRegion(rects_, state_.rect_index_, rects_->size(), has_readback,
+                     state_.has_texture);
 }
 
 void DiffContext::AddDamage(const PaintRegion& damage) {
@@ -200,6 +217,4 @@ void DiffContext::Statistics::LogStatistics() {
 #endif  // !FLUTTER_RELEASE
 }
 
-#endif  // FLUTTER_ENABLE_DIFF_CONTEXT
-
 }  // namespace flutter

flow/diff_context.cc

@@ -17,8 +17,6 @@
 
 namespace flutter {
 
-#ifdef FLUTTER_ENABLE_DIFF_CONTEXT
-
 class Layer;
 
 // Represents area that needs to be updated in front buffer (frame_damage) and
@@ -102,9 +100,14 @@ class DiffContext {
   // added to damage.
   void MarkSubtreeDirty(
       const PaintRegion& previous_paint_region = PaintRegion());
+  void MarkSubtreeDirty(const SkRect& previous_paint_region);
 
   bool IsSubtreeDirty() const { return state_.dirty; }
 
+  // Marks that current subtree contains a TextureLayer. This is needed to
+  // ensure that we'll Diff the TextureLayer even if inside retained layer.
+  void MarkSubtreeHasTextureLayer();
+
   // Add layer bounds to current paint region; rect is in "local" (layer)
   // coordinates.
   void AddLayerBounds(const SkRect& rect);
@@ -204,6 +207,9 @@ class DiffContext {
     // Whether this subtree has filter bounds adjustment function. If so,
     // it will need to be removed from stack when subtree is closed.
     bool has_filter_bounds_adjustment;
+
+    // Whether there is a texture layer in this subtree.
+    bool has_texture;
   };
 
   std::shared_ptr<std::vector<SkRect>> rects_;
@@ -237,8 +243,6 @@ class DiffContext {
   Statistics statistics_;
 };
 
-#endif  // FLUTTER_ENABLE_DIFF_CONTEXT
-
 }  // namespace flutter
 
 #endif  // FLUTTER_FLOW_DIFF_CONTEXT_H_