Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit b64dd60

Browse files
Merge pull request #8 from flutter/master
update merge
2 parents 98d18ce + 025e2d8 commit b64dd60

File tree

210 files changed

+2736
-1873
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+2736
-1873
lines changed

DEPS

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ vars = {
2626
'skia_git': 'https://skia.googlesource.com',
2727
# OCMock is for testing only so there is no google clone
2828
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
29-
'skia_revision': '23899c64e3db9378bcc3a960962777f1a5c49ab4',
29+
'skia_revision': '320c32bfa3062b0c67270667df5e4df1856f176e',
3030

3131
# When updating the Dart revision, ensure that all entries that are
3232
# dependencies of Dart are also updated to match the entries in the
3333
# Dart SDK's DEPS file for that revision of Dart. The DEPS file for
3434
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
3535
# You can use //tools/dart/create_updated_flutter_deps.py to produce
3636
# updated revision list of existing dependencies.
37-
'dart_revision': '97674262bc29447dc59d5c93024b18b27d4bcf98',
37+
'dart_revision': '7c5059f528814e14dc9ff29ee1629b922daf77a4',
3838

3939
# WARNING: DO NOT EDIT MANUALLY
4040
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -497,11 +497,11 @@ deps = {
497497
'dep_type': 'cipd',
498498
},
499499

500-
'src/third_party/robolectric': {
500+
'src/third_party/android_embedding_dependencies': {
501501
'packages': [
502502
{
503-
'package': 'flutter/android/robolectric_bundle',
504-
'version': 'last_updated:2019-09-09T16:47:38-0700'
503+
'package': 'flutter/android/embedding_bundle',
504+
'version': 'last_updated:2020-03-13T15:42:26-0700'
505505
}
506506
],
507507
'condition': 'download_android_deps',
@@ -536,7 +536,7 @@ deps = {
536536
'packages': [
537537
{
538538
'package': 'fuchsia/sdk/core/mac-amd64',
539-
'version': 'r_oCIi4f4p_CI6qo9yAgBEsa85ebjaJshJI_bW3aEjQC'
539+
'version': 'eGWV8Up-Giv-15K1FBRnkFQompVx2GpVBNomG09my_wC'
540540
}
541541
],
542542
'condition': 'host_os == "mac"',
@@ -556,7 +556,7 @@ deps = {
556556
'packages': [
557557
{
558558
'package': 'fuchsia/sdk/core/linux-amd64',
559-
'version': 'v32mJWB9n4UYKqJoJTd6ASYrptBC8r25yRRBlumR3KAC'
559+
'version': '6ds94xRmD_5jjJ9jn1pngltBcWUyduH4JF-PxklsD50C'
560560
}
561561
],
562562
'condition': 'host_os == "linux"',
@@ -593,15 +593,6 @@ hooks = [
593593
'pattern': '.',
594594
'action': ['python', 'src/build/vs_toolchain.py', 'update'],
595595
},
596-
{
597-
'name': 'download_android_support',
598-
'pattern': '.',
599-
'condition': 'download_android_deps',
600-
'action': [
601-
'python',
602-
'src/flutter/tools/android_support/download_android_support.py',
603-
],
604-
},
605596
{
606597
'name': 'generate_package_files',
607598
'pattern': '.',

assets/asset_resolver.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ class AssetResolver {
2121

2222
virtual bool IsValid() const = 0;
2323

24-
FML_WARN_UNUSED_RESULT
25-
virtual std::unique_ptr<fml::Mapping> GetAsMapping(
24+
[[nodiscard]] virtual std::unique_ptr<fml::Mapping> GetAsMapping(
2625
const std::string& asset_name) const = 0;
2726

2827
private:

benchmarking/benchmarking.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44

55
#include "benchmarking.h"
66

7+
#include "flutter/fml/backtrace.h"
78
#include "flutter/fml/icu_util.h"
89

910
namespace benchmarking {
1011

1112
int Main(int argc, char** argv) {
13+
fml::InstallCrashHandler();
1214
benchmark::Initialize(&argc, argv);
1315
fml::icu::InitializeICU("icudtl.dat");
1416
::benchmark::RunSpecifiedBenchmarks();

ci/licenses_golden/licenses_flutter

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ FILE: ../../../flutter/flow/raster_cache.h
9292
FILE: ../../../flutter/flow/raster_cache_key.cc
9393
FILE: ../../../flutter/flow/raster_cache_key.h
9494
FILE: ../../../flutter/flow/raster_cache_unittests.cc
95+
FILE: ../../../flutter/flow/rtree.cc
96+
FILE: ../../../flutter/flow/rtree.h
97+
FILE: ../../../flutter/flow/rtree_unittests.cc
9598
FILE: ../../../flutter/flow/scene_update_context.cc
9699
FILE: ../../../flutter/flow/scene_update_context.h
97100
FILE: ../../../flutter/flow/skia_gpu_object.cc
@@ -104,6 +107,10 @@ FILE: ../../../flutter/flow/view_holder.cc
104107
FILE: ../../../flutter/flow/view_holder.h
105108
FILE: ../../../flutter/flutter_frontend_server/bin/starter.dart
106109
FILE: ../../../flutter/flutter_frontend_server/lib/server.dart
110+
FILE: ../../../flutter/fml/backtrace.cc
111+
FILE: ../../../flutter/fml/backtrace.h
112+
FILE: ../../../flutter/fml/backtrace_stub.cc
113+
FILE: ../../../flutter/fml/backtrace_unittests.cc
107114
FILE: ../../../flutter/fml/base32.cc
108115
FILE: ../../../flutter/fml/base32.h
109116
FILE: ../../../flutter/fml/base32_unittest.cc
@@ -865,12 +872,18 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/platform_messa
865872
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h
866873
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm
867874
FILE: ../../../flutter/shell/platform/darwin/ios/framework/module.modulemap
875+
FILE: ../../../flutter/shell/platform/darwin/ios/ios_context.h
876+
FILE: ../../../flutter/shell/platform/darwin/ios/ios_context.mm
877+
FILE: ../../../flutter/shell/platform/darwin/ios/ios_context_gl.h
878+
FILE: ../../../flutter/shell/platform/darwin/ios/ios_context_gl.mm
879+
FILE: ../../../flutter/shell/platform/darwin/ios/ios_context_metal.h
880+
FILE: ../../../flutter/shell/platform/darwin/ios/ios_context_metal.mm
881+
FILE: ../../../flutter/shell/platform/darwin/ios/ios_context_software.h
882+
FILE: ../../../flutter/shell/platform/darwin/ios/ios_context_software.mm
868883
FILE: ../../../flutter/shell/platform/darwin/ios/ios_external_texture_gl.h
869884
FILE: ../../../flutter/shell/platform/darwin/ios/ios_external_texture_gl.mm
870-
FILE: ../../../flutter/shell/platform/darwin/ios/ios_gl_context.h
871-
FILE: ../../../flutter/shell/platform/darwin/ios/ios_gl_context.mm
872-
FILE: ../../../flutter/shell/platform/darwin/ios/ios_gl_render_target.h
873-
FILE: ../../../flutter/shell/platform/darwin/ios/ios_gl_render_target.mm
885+
FILE: ../../../flutter/shell/platform/darwin/ios/ios_render_target_gl.h
886+
FILE: ../../../flutter/shell/platform/darwin/ios/ios_render_target_gl.mm
874887
FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface.h
875888
FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface.mm
876889
FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface_gl.h
@@ -881,6 +894,8 @@ FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface_software.h
881894
FILE: ../../../flutter/shell/platform/darwin/ios/ios_surface_software.mm
882895
FILE: ../../../flutter/shell/platform/darwin/ios/platform_view_ios.h
883896
FILE: ../../../flutter/shell/platform/darwin/ios/platform_view_ios.mm
897+
FILE: ../../../flutter/shell/platform/darwin/ios/rendering_api_selection.h
898+
FILE: ../../../flutter/shell/platform/darwin/ios/rendering_api_selection.mm
884899
FILE: ../../../flutter/shell/platform/darwin/macos/framework/FlutterMacOS.podspec
885900
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h
886901
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h

0 commit comments

Comments
 (0)