Merge latest from master => 21008 staging branch

.cirrus.yml

@@ -19,11 +19,12 @@ task:
     gclient sync
 
   matrix:
-    - name: build_host
+    - name: build_and_test_host
       compile_host_script: |
         cd $ENGINE_PATH/src
         ./flutter/tools/gn --unoptimized
         ninja -C out/host_debug_unopt
+      test_host_script: cd $ENGINE_PATH/src && ./flutter/testing/run_tests.sh
     - name: build_android
       compile_host_script: |
         cd $ENGINE_PATH/src
@@ -45,4 +46,3 @@ format_and_dart_test_task:
 
   format_script: cd $ENGINE_PATH/src/flutter && ./ci/format.sh
   build_script: cd $ENGINE_PATH/src/flutter && ./ci/build.sh
-  test_script: cd $ENGINE_PATH/src/flutter && ./ci/test.sh

.gitattributes

@@ -1,7 +1,3 @@
-## This page intentionally left blank. ##
-#
-# Workaround for VS2013 automatically creating .gitattributes files with
-# default settings that we don't want.
-# See also:
-# http://connect.microsoft.com/VisualStudio/feedback/details/804948/inappropriately-creates-gitattributes-file
-# http://crbug.com/342064
+# Dart sources have to be normalized so that source offsets in kernel files
+# with source embedded in them match across all platforms.
+*.dart text eol=lf

.gitignore

@@ -20,3 +20,4 @@ tags
 Thumbs.db
 .idea
 pubspec.lock
+.vscode/

AUTHORS

@@ -4,6 +4,8 @@
 #   Name/Organization <email address>
 
 Google Inc.
+The Chromium Authors
+The Fuchsia Authors
 Jim Simon <jim.j.simon@gmail.com>
 Ali Bitek <alibitek@protonmail.ch>
 Jacob Greenfield <jacob.greenfield.256@gmail.com>

BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# 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.
 
@@ -43,6 +43,10 @@ group("flutter") {
       "$flutter_root/synchronization:synchronization_unittests",
       "$flutter_root/third_party/txt:txt_unittests",
     ]
+
+    if (!is_win) {
+      public_deps += [ "$flutter_root/shell/common:shell_benchmarks" ]
+    }
   }
 }
 

DEPS

@@ -23,15 +23,15 @@ vars = {
   'fuchsia_git': 'https://fuchsia.googlesource.com',
   'github_git': 'https://github.com',
   'skia_git': 'https://skia.googlesource.com',
-  'skia_revision': '3b8b11e1f912fb2ad41de46292819d41f9230748',
+  'skia_revision': 'bb37aba39910ef1a95cdcbb5b85d99cdabf3c362',
 
   # 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': '8a919426f0e8665a0e6b01c2fcf3113587f8b040',
+  'dart_revision': 'f9ebf2129732fd2b606286fdf58e500384b8a0bc',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -47,20 +47,20 @@ vars = {
   'dart_convert_tag': '2.0.2',
   'dart_crypto_tag': '2.0.6',
   'dart_csslib_tag': '0.14.4+1',
-  'dart_dart2js_info_tag': '0.5.6+4',
+  'dart_dart2js_info_tag': '0.5.13',
   'dart_dart_style_tag': '1.2.0',
-  'dart_dartdoc_tag': 'v0.21.1',
+  'dart_dartdoc_tag': 'v0.24.1',
   'dart_fixnum_tag': '0.10.8',
   'dart_glob_tag': '1.1.7',
   'dart_html_tag': '0.13.3+2',
   'dart_http_multi_server_tag': '2.0.5',
   'dart_http_parser_tag': '3.1.1',
   'dart_http_retry_tag': '0.1.1',
-  'dart_http_tag': '0.11.3+17',
+  'dart_http_tag': '0.12.0',
   'dart_http_throttle_tag': '1.0.2',
-  'dart_intl_tag': '0.15.6',
+  'dart_intl_tag': '0.15.7',
   'dart_json_rpc_2_tag': '2.0.9',
-  'dart_linter_tag': '0.1.65',
+  'dart_linter_tag': '0.1.71',
   'dart_logging_tag': '0.11.3+2',
   'dart_markdown_tag': '2.0.2',
   'dart_matcher_tag': '0.12.3',
@@ -92,7 +92,7 @@ vars = {
   'dart_string_scanner_tag': '1.0.3',
   'dart_term_glyph_tag': '1.0.1',
   'dart_test_reflective_loader_tag': '0.1.8',
-  'dart_test_tag': '1.0.0',
+  'dart_test_tag': '1.3.4',
   'dart_tuple_tag': 'v1.0.1',
   'dart_typed_data_tag': '1.1.6',
   'dart_usage_tag': '3.4.0',
@@ -104,7 +104,7 @@ vars = {
   # Build bot tooling for iOS
   'ios_tools_revision': '69b7c1b160e7107a6a98d948363772dc9caea46f',
 
-  'buildtools_revision': 'c1408453246f0475547b6fe634c2f3dad71c6457',
+  'buildtools_revision': '5a9e1b3a0b84a2871f20f85fde665e54a894ba72',
 }
 
 # Only these hosts are allowed for dependencies in this DEPS file.
@@ -117,7 +117,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '96d2493887daabe6877142caa8504a2f964b0e7e',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '29a5d76757ec12655c0562b317830f669bd44ea7',
 
    # Fuchsia compatibility
    #
@@ -126,19 +126,19 @@ deps = {
    # and not have to specific specific hashes.
 
   'src/third_party/tonic':
-   Var('fuchsia_git') + '/tonic' + '@' + 'd91fa62844f8531a3701450f6192298d0e873246',
+   Var('fuchsia_git') + '/tonic' + '@' + '5c9c2b63091ffd6000d44a3b5ff86e4f349e6978',
 
   'src/third_party/benchmark':
-   Var('fuchsia_git') + '/third_party/benchmark' + '@' + '296537bc48d380adf21567c5d736ab79f5363d22',
+   Var('fuchsia_git') + '/third_party/benchmark' + '@' + '21f1eb3fe269ea43eba862bf6b699cde46587ade',
 
   'src/third_party/googletest':
    Var('fuchsia_git') + '/third_party/googletest' + '@' + '2072b0053d3537fa5e8d222e34c759987aae1320',
 
   'src/third_party/rapidjson':
-   Var('fuchsia_git') + '/third_party/rapidjson' + '@' + '9defbb0209a534ffeb3a2b79d5ee440a77407292',
+   Var('fuchsia_git') + '/third_party/rapidjson' + '@' + '32d07c55db1bb6c2ae17cba4033491a667647753',
 
   'src/third_party/harfbuzz':
-   Var('fuchsia_git') + '/third_party/harfbuzz' + '@' + 'd837034f09a957faf2814002e8ebd81da6151d1b',
+   Var('fuchsia_git') + '/third_party/harfbuzz' + '@' + '02caec6c1c6ad996666788b8e920ccaec8b385e5',
 
    # Chromium-style
    #
@@ -353,7 +353,7 @@ deps = {
    Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
 
   'src/third_party/freetype2':
-   Var('fuchsia_git') + '/third_party/freetype2' + '@' + '6581fd3e9c8645f01c0d51e4f53893f5391f2bf3',
+   Var('fuchsia_git') + '/third_party/freetype2' + '@' + 'a10b062df0c8958d69377aa04ea6554a9961a111',
 
   'src/third_party/root_certificates':
    Var('dart_git') + '/root_certificates.git' + '@' + Var('dart_root_certificates_rev'),
@@ -370,9 +370,9 @@ deps = {
   'src/third_party/gyp':
    Var('chromium_git') + '/external/gyp.git' + '@' + '4801a5331ae62da9769a327f11c4213d32fb0dad',
 
-   # Headers for Vulkan 1.0
+   # Headers for Vulkan 1.1
    'src/third_party/vulkan':
-   Var('github_git') + '/KhronosGroup/Vulkan-Docs.git' + '@' + 'e29c2489e238509c41aeb8c7bce9d669a496344b',
+   Var('github_git') + '/KhronosGroup/Vulkan-Docs.git' + '@' + 'v1.1.91',
 
   'src/third_party/pkg/when':
    Var('dart_git') + '/when.git' + '@' + '0.2.0',

LICENSE

@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Flutter Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

README.md

@@ -14,26 +14,13 @@ toolchain. Most developers will interact with Flutter via the [Flutter
 Framework](https://github.com/flutter/flutter), which provides a modern,
 reactive framework, and a rich set of platform, layout and foundation widgets.
 
-
-_Flutter is still under development and we continue to add 
-features._ However, it is ready for use by early adopters who are willing to deal
-with the odd wrinkle or two along the way.  We hope you try it out and send
-us [feedback](mailto:flutter-dev@googlegroups.com).
-
- - For information about using Flutter to build apps, please see
-   the [getting started guide](https://flutter.io/getting-started/).
-
- - For information about contributing to the Flutter framework, please see
-   [the main Flutter repository](https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md).
-
- - For information about contributing code to the engine itself, please see
-   [CONTRIBUTING.md](CONTRIBUTING.md).
-
- - For information about the engine's architecture, please see
-   [the wiki](https://github.com/flutter/engine/wiki).
-
-Community
----------
-
-Join us in our [Gitter chat room](https://gitter.im/flutter/flutter) or join our mailing list,
-[flutter-dev@googlegroups.com](https://groups.google.com/forum/#!forum/flutter-dev).
+If you are new to Flutter, then you will find more general information
+on the Flutter project, including tutorials and samples, on our Web
+site at [flutter.io](https://flutter.io). For specific information
+about Flutter's APIs, consider our API reference which can be found at
+the [docs.flutter.io](https://docs.flutter.io/).
+
+If you intend to contribute to Flutter, welcome! You are encouraged to
+start with [our contributor
+guide](https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md),
+which helps onboard new team members.

assets/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
+# 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.
 

assets/asset_manager.cc

@@ -1,4 +1,4 @@
-// Copyright 2017 The Flutter Authors. All rights reserved.
+// 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.
 
@@ -7,10 +7,6 @@
 #include "flutter/assets/directory_asset_bundle.h"
 #include "flutter/fml/trace_event.h"
 
-#ifdef ERROR
-#undef ERROR
-#endif
-
 namespace blink {
 
 AssetManager::AssetManager() = default;
@@ -39,7 +35,8 @@ std::unique_ptr<fml::Mapping> AssetManager::GetAsMapping(
   if (asset_name.size() == 0) {
     return nullptr;
   }
-  TRACE_EVENT0("flutter", "AssetManager::GetAsMapping");
+  TRACE_EVENT1("flutter", "AssetManager::GetAsMapping", "name",
+               asset_name.c_str());
   for (const auto& resolver : resolvers_) {
     auto mapping = resolver->GetAsMapping(asset_name);
     if (mapping != nullptr) {

assets/asset_manager.h

@@ -1,4 +1,4 @@
-// Copyright 2017 The Flutter Authors. All rights reserved.
+// 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.
 
@@ -15,9 +15,12 @@
 
 namespace blink {
 
-class AssetManager final : public AssetResolver,
-                           public fml::RefCountedThreadSafe<AssetManager> {
+class AssetManager final : public AssetResolver {
  public:
+  AssetManager();
+
+  ~AssetManager() override;
+
   void PushFront(std::unique_ptr<AssetResolver> resolver);
 
   void PushBack(std::unique_ptr<AssetResolver> resolver);
@@ -32,13 +35,7 @@ class AssetManager final : public AssetResolver,
  private:
   std::deque<std::unique_ptr<AssetResolver>> resolvers_;
 
-  AssetManager();
-
-  ~AssetManager();
-
   FML_DISALLOW_COPY_AND_ASSIGN(AssetManager);
-  FML_FRIEND_MAKE_REF_COUNTED(AssetManager);
-  FML_FRIEND_REF_COUNTED_THREAD_SAFE(AssetManager);
 };
 
 }  // namespace blink

assets/asset_resolver.h

@@ -1,4 +1,4 @@
-// Copyright 2017 The Flutter Authors. All rights reserved.
+// 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.
 

assets/directory_asset_bundle.cc

@@ -1,4 +1,4 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// 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.
 

assets/directory_asset_bundle.h

@@ -1,4 +1,4 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// 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.
 

assets/zip_asset_store.cc

@@ -1,4 +1,4 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -41,7 +41,8 @@ bool ZipAssetStore::IsValid() const {
 // |blink::AssetResolver|
 std::unique_ptr<fml::Mapping> ZipAssetStore::GetAsMapping(
     const std::string& asset_name) const {
-  TRACE_EVENT0("flutter", "ZipAssetStore::GetAsMapping");
+  TRACE_EVENT1("flutter", "ZipAssetStore::GetAsMapping", "name",
+               asset_name.c_str());
   auto found = stat_cache_.find(asset_name);
 
   if (found == stat_cache_.end()) {

assets/zip_asset_store.h

@@ -1,4 +1,4 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// 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.
 

benchmarking/BUILD.gn

@@ -0,0 +1,26 @@
+# 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.
+
+config("benchmark_config") {
+  include_dirs = [ "//third_party/benchmark:benchmark_config" ]
+}
+
+source_set("benchmarking") {
+  testonly = true
+
+  sources = [
+    "benchmarking.cc",
+    "benchmarking.h",
+  ]
+
+  public_deps = [
+    "$flutter_root/fml",
+    "//third_party/benchmark",
+  ]
+
+  public_configs = [
+    "$flutter_root:config",
+    ":benchmark_config",
+  ]
+}

benchmarking/benchmarking.cc

@@ -0,0 +1,22 @@
+// 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.
+
+#include "benchmarking.h"
+
+#include "flutter/fml/icu_util.h"
+
+namespace benchmarking {
+
+int Main(int argc, char** argv) {
+  benchmark::Initialize(&argc, argv);
+  fml::icu::InitializeICU("icudtl.dat");
+  ::benchmark::RunSpecifiedBenchmarks();
+  return 0;
+}
+
+}  // namespace benchmarking
+
+int main(int argc, char** argv) {
+  return benchmarking::Main(argc, argv);
+}