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

Author: dnfield

DEPS

@@ -26,27 +26,27 @@ 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': 'c21dc07a78b914dd9d992f2d66b38187e7126a72',
+  'skia_revision': 'a38945abe337019886f3b6bdcac4a7e3060870c2',
 
   # When updating the Dart revision, ensure that all entries that are
   # dependencies of Dart are also updated to match the entries in the
   # Dart SDK's DEPS file for that revision of Dart. The DEPS file for
   # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '2cec6af2652ff859979987f568d18193df48163e',
+  'dart_revision': '2b8d00ac48e7b0b9b72e227db844256fbb87d11b',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
   'dart_args_tag': '1.6.0',
   'dart_boringssl_gen_rev': '429ccb1877f7987a6f3988228bc2440e61293499',
   'dart_boringssl_rev': '4dfd5af70191b068aebe567b8e29ce108cee85ce',
-  'dart_collection_rev': '583693680fc067e34ca5b72503df25e8b80579f9',
+  'dart_collection_rev': '65d3e58ee5289528ec280d361a67a631d65b3d7f',
   'dart_dart_style_tag': '1.3.7',
   'dart_http_retry_tag': '0.1.1',
   'dart_http_throttle_tag': '1.0.2',
   'dart_intl_tag': '0.16.1',
-  'dart_linter_tag': '0.1.118',
+  'dart_linter_tag': '0.1.119',
   'dart_oauth2_tag': '1.6.0',
   'dart_protobuf_rev': '3746c8fd3f2b0147623a8e3db89c3ff4330de760',
   'dart_pub_rev': '04e237f78b2302d7f20d0b362554425e8deb8add',
@@ -163,7 +163,7 @@ deps = {
    Var('dart_git') + '/args.git' + '@' + Var('dart_args_tag'),
 
   'src/third_party/dart/third_party/pkg/async':
-   Var('dart_git') + '/async.git@128c461a97dbdbd9336ba000ba5a5c02e79b8651',
+   Var('dart_git') + '/async.git@3fedad22c6940650526a86adebbf2872b81c2805',
 
   'src/third_party/dart/third_party/pkg/bazel_worker':
    Var('dart_git') + '/bazel_worker.git@26680d5e249b249c7216ab2fed0ac8ed4ee285c5',
@@ -232,7 +232,7 @@ deps = {
    Var('dart_git') + '/linter.git' + '@' + Var('dart_linter_tag'),
 
   'src/third_party/dart/third_party/pkg/logging':
-   Var('dart_git') + '/logging.git@9561ba016ae607747ae69b846c0e10958ca58ed4',
+   Var('dart_git') + '/logging.git@1590ba0b648a51e7eb3895c612e4b72f72623b6f',
 
   'src/third_party/dart/third_party/pkg/markdown':
    Var('dart_git') + '/markdown.git@dbeafd47759e7dd0a167602153bb9c49fb5e5fe7',
@@ -349,7 +349,7 @@ deps = {
    Var('dart_git') + '/package_config.git@9c586d04bd26fef01215fd10e7ab96a3050cfa64',
 
   'src/third_party/dart/tools/sdks':
-   {'packages': [{'version': 'version:2.10.0-79.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
+   {'packages': [{'version': 'version:2.10.0-110.3.beta', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 
@@ -516,7 +516,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': '2nHpC_AEOz0oVODsc65QrKSPY3VEdG9FzHhu03zq-tgC'
+        'version': 'WcbX470pSuGWDXDCGAzGWK5nuDCs450msAwPRfAuTGgC'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -536,7 +536,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'Qi0ptKLxNLDkuSKwxaoe5tmmCdfzPZxB4S5D6IQnmDEC'
+        'version': 'VgNGzw-DQgPmqPjzWLF0pcdQXGYdpmBH79JRE3QZbJcC'
        }
      ],
      'condition': 'host_os == "linux"',

ci/licenses_golden/licenses_flutter

@@ -19,6 +19,7 @@ FILE: ../../../flutter/assets/directory_asset_bundle.cc
 FILE: ../../../flutter/assets/directory_asset_bundle.h
 FILE: ../../../flutter/benchmarking/benchmarking.cc
 FILE: ../../../flutter/benchmarking/benchmarking.h
+FILE: ../../../flutter/common/constants.h
 FILE: ../../../flutter/common/exported_symbols.sym
 FILE: ../../../flutter/common/settings.cc
 FILE: ../../../flutter/common/settings.h

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: 6f2a79790cea306db4e190ec0d3a6ee7
+Signature: 33483771ca357eaef16a9db67567a89a
 
 UNUSED LICENSES:
 
@@ -1285,7 +1285,6 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.cobalt/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.runner/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.data/meta.json
-FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.deprecatedtimezone/deprecated_time_service.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.deprecatedtimezone/deprecated_time_zone.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.deprecatedtimezone/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.developer.tiles/meta.json

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: ab6bb712b55598c93bd4290fbef36706
+Signature: ae2f29e80f26d815ca253c2e9ec1ba3b
 
 UNUSED LICENSES:
 

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: 3efa8608e94837e1d3aef3cd39f58189
+Signature: f58a32a9b7d49316c9500bc956653761
 
 UNUSED LICENSES:
 
@@ -8105,6 +8105,7 @@ FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_type.cc
 FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_type.h
 FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/recognized_method.cc
 FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/recognized_method.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/kernel_binary_flowgraph_test.cc
 FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler.cc
 FILE: ../../../third_party/dart/runtime/vm/compiler/write_barrier_elimination.cc
 FILE: ../../../third_party/dart/runtime/vm/compiler/write_barrier_elimination.h

common/constants.h

@@ -0,0 +1,7 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+namespace flutter {
+constexpr double kMegaByteSizeInBytes = (1 << 20);
+}  // namespace flutter

flow/compositor_context.h

@@ -45,7 +45,9 @@ enum class RasterStatus {
   // only used when thread configuration change occurs.
   kEnqueuePipeline,
   // Failed to rasterize the frame.
-  kFailed
+  kFailed,
+  // Layer tree was discarded due to LayerTreeDiscardCallback
+  kDiscarded
 };
 
 class CompositorContext {

flow/raster_cache.cc

@@ -6,6 +6,7 @@
 
 #include <vector>
 
+#include "flutter/common/constants.h"
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/paint_utils.h"
 #include "flutter/fml/logging.h"
@@ -298,12 +299,11 @@ void RasterCache::SetCheckboardCacheImages(bool checkerboard) {
 
 void RasterCache::TraceStatsToTimeline() const {
 #if !FLUTTER_RELEASE
-  constexpr double kMegaBytes = (1 << 20);
   FML_TRACE_COUNTER("flutter", "RasterCache", reinterpret_cast<int64_t>(this),
                     "LayerCount", layer_cache_.size(), "LayerMBytes",
-                    EstimateLayerCacheByteSize() / kMegaBytes, "PictureCount",
-                    picture_cache_.size(), "PictureMBytes",
-                    EstimatePictureCacheByteSize() / kMegaBytes);
+                    EstimateLayerCacheByteSize() / kMegaByteSizeInBytes,
+                    "PictureCount", picture_cache_.size(), "PictureMBytes",
+                    EstimatePictureCacheByteSize() / kMegaByteSizeInBytes);
 
 #endif  // !FLUTTER_RELEASE
 }

lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart

@@ -1306,6 +1306,7 @@ class SkPictureRecorder {
 /// "borrowed", i.e. their memory is managed by other objects. In the case of
 /// [SkCanvas] it is managed by [SkPictureRecorder].
 @JS()
+@anonymous
 class SkCanvas {
   external void clear(Float32List color);
   external void clipPath(
@@ -1444,11 +1445,13 @@ class SkCanvas {
 }
 
 @JS()
+@anonymous
 class SkCanvasSaveLayerWithoutBoundsOverload {
   external void saveLayer(SkPaint paint);
 }
 
 @JS()
+@anonymous
 class SkCanvasSaveLayerWithFilterOverload {
   external void saveLayer(
     SkPaint? paint,
@@ -1465,6 +1468,7 @@ class SkPicture {
 }
 
 @JS()
+@anonymous
 class SkParagraphBuilderNamespace {
   external SkParagraphBuilder Make(
     SkParagraphStyle paragraphStyle,
@@ -1490,6 +1494,7 @@ class SkParagraphBuilder {
 }
 
 @JS()
+@anonymous
 class SkParagraphStyle {}
 
 @JS()

lib/web_ui/lib/src/engine/canvaskit/image.dart

@@ -100,6 +100,9 @@ class CkAnimatedImage implements ui.Image {
     final ByteData data = bytes.buffer.asByteData(0, bytes.length);
     return Future<ByteData>.value(data);
   }
+
+  @override
+  String toString() => '[$width\u00D7$height]';
 }
 
 /// A [ui.Image] backed by an `SkImage` from Skia.
@@ -154,6 +157,9 @@ class CkImage implements ui.Image {
     final ByteData data = bytes.buffer.asByteData(0, bytes.length);
     return Future<ByteData>.value(data);
   }
+
+  @override
+  String toString() => '[$width\u00D7$height]';
 }
 
 /// A [Codec] that wraps an `SkAnimatedImage`.