Merge pull request #8 from flutter/master

update merge
flutter · Mar 14, 2020 · b64dd60 · b64dd60
2 parents 98d18ce + 025e2d8
commit b64dd60
Show file tree

Hide file tree

Showing 210 changed files with 2,736 additions and 1,873 deletions.
diff --git a/DEPS b/DEPS
@@ -26,15 +26,15 @@ 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': '23899c64e3db9378bcc3a960962777f1a5c49ab4',
+  'skia_revision': '320c32bfa3062b0c67270667df5e4df1856f176e',
 
   # 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': '97674262bc29447dc59d5c93024b18b27d4bcf98',
+  'dart_revision': '7c5059f528814e14dc9ff29ee1629b922daf77a4',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -497,11 +497,11 @@ deps = {
      'dep_type': 'cipd',
    },
 
-  'src/third_party/robolectric': {
+  'src/third_party/android_embedding_dependencies': {
      'packages': [
        {
-        'package': 'flutter/android/robolectric_bundle',
-        'version': 'last_updated:2019-09-09T16:47:38-0700'
+        'package': 'flutter/android/embedding_bundle',
+        'version': 'last_updated:2020-03-13T15:42:26-0700'
        }
      ],
      'condition': 'download_android_deps',
@@ -536,7 +536,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'r_oCIi4f4p_CI6qo9yAgBEsa85ebjaJshJI_bW3aEjQC'
+        'version': 'eGWV8Up-Giv-15K1FBRnkFQompVx2GpVBNomG09my_wC'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -556,7 +556,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'v32mJWB9n4UYKqJoJTd6ASYrptBC8r25yRRBlumR3KAC'
+        'version': '6ds94xRmD_5jjJ9jn1pngltBcWUyduH4JF-PxklsD50C'
        }
      ],
      'condition': 'host_os == "linux"',
@@ -593,15 +593,6 @@ hooks = [
     'pattern': '.',
     'action': ['python', 'src/build/vs_toolchain.py', 'update'],
   },
-  {
-    'name': 'download_android_support',
-    'pattern': '.',
-    'condition': 'download_android_deps',
-    'action': [
-        'python',
-        'src/flutter/tools/android_support/download_android_support.py',
-    ],
-  },
   {
     'name': 'generate_package_files',
     'pattern': '.',

diff --git a/assets/asset_resolver.h b/assets/asset_resolver.h
@@ -21,8 +21,7 @@ class AssetResolver {
 
   virtual bool IsValid() const = 0;
 
-  FML_WARN_UNUSED_RESULT
-  virtual std::unique_ptr<fml::Mapping> GetAsMapping(
+  [[nodiscard]] virtual std::unique_ptr<fml::Mapping> GetAsMapping(
       const std::string& asset_name) const = 0;
 
  private:

diff --git a/benchmarking/benchmarking.cc b/benchmarking/benchmarking.cc
@@ -4,11 +4,13 @@
 
 #include "benchmarking.h"
 
+#include "flutter/fml/backtrace.h"
 #include "flutter/fml/icu_util.h"
 
 namespace benchmarking {
 
 int Main(int argc, char** argv) {
+  fml::InstallCrashHandler();
   benchmark::Initialize(&argc, argv);
   fml::icu::InitializeICU("icudtl.dat");
   ::benchmark::RunSpecifiedBenchmarks();

diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -92,6 +92,9 @@ FILE: ../../../flutter/flow/raster_cache.h
 FILE: ../../../flutter/flow/raster_cache_key.cc
 FILE: ../../../flutter/flow/raster_cache_key.h
 FILE: ../../../flutter/flow/raster_cache_unittests.cc
+FILE: ../../../flutter/flow/rtree.cc
+FILE: ../../../flutter/flow/rtree.h
+FILE: ../../../flutter/flow/rtree_unittests.cc
 FILE: ../../../flutter/flow/scene_update_context.cc
 FILE: ../../../flutter/flow/scene_update_context.h
 FILE: ../../../flutter/flow/skia_gpu_object.cc
@@ -104,6 +107,10 @@ FILE: ../../../flutter/flow/view_holder.cc
 FILE: ../../../flutter/flow/view_holder.h
 FILE: ../../../flutter/flutter_frontend_server/bin/starter.dart
 FILE: ../../../flutter/flutter_frontend_server/lib/server.dart
+FILE: ../../../flutter/fml/backtrace.cc
+FILE: ../../../flutter/fml/backtrace.h
+FILE: ../../../flutter/fml/backtrace_stub.cc
+FILE: ../../../flutter/fml/backtrace_unittests.cc
 FILE: ../../../flutter/fml/base32.cc
 FILE: ../../../flutter/fml/base32.h
 FILE: ../../../flutter/fml/base32_unittest.cc
@@ -865,12 +872,18 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/platform_messa
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/module.modulemap
+FILE: ../../../flutter/shell/platform/darwin/ios/ios_context.h
+FILE: ../../../flutter/shell/platform/darwin/ios/ios_context.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/ios_context_gl.h
+FILE: ../../../flutter/shell/platform/darwin/ios/ios_context_gl.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/ios_context_metal.h
+FILE: ../../../flutter/shell/platform/darwin/ios/ios_context_metal.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/ios_context_software.h
+FILE: ../../../flutter/shell/platform/darwin/ios/ios_context_software.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/ios_external_texture_gl.h
 FILE: ../../../flutter/shell/platform/darwin/ios/ios_external_texture_gl.mm
-FILE: ../../../flutter/shell/platform/darwin/ios/ios_gl_context.h
-FILE: ../../../flutter/shell/platform/darwin/ios/ios_gl_context.mm
-FILE: ../../../flutter/shell/platform/darwin/ios/ios_gl_render_target.h
-FILE: ../../../flutter/shell/platform/darwin/ios/ios_gl_render_target.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/ios_render_target_gl.h
+FILE: ../../../flutter/shell/platform/darwin/ios/ios_render_target_gl.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface.h
 FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface_gl.h
@@ -881,6 +894,8 @@ FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface_software.h
 FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface_software.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/platform_view_ios.h
 FILE: ../../../flutter/shell/platform/darwin/ios/platform_view_ios.mm
+FILE: ../../../flutter/shell/platform/darwin/ios/rendering_api_selection.h
+FILE: ../../../flutter/shell/platform/darwin/ios/rendering_api_selection.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/FlutterMacOS.podspec
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h