From ce9321c7bda0562fd13ee3396d47aa5c2f215365 Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Thu, 6 Sep 2018 13:19:45 -0700 Subject: [PATCH 1/5] Dart SDK roll for 2018/09/06 --- DEPS | 2 +- ci/licenses_golden/licenses_flutter | 28 ++++---- ci/licenses_golden/licenses_third_party | 91 +++++++++++++------------ frontend_server/lib/server.dart | 4 ++ 4 files changed, 65 insertions(+), 60 deletions(-) diff --git a/DEPS b/DEPS index 57f0e480f55da..02abb00386995 100644 --- a/DEPS +++ b/DEPS @@ -31,7 +31,7 @@ vars = { # 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': '760a9690c22ec3f3d163173737f9949f97e6e02a', + 'dart_revision': 'c7ab56e1b5ab9bcf6f20057ac9135dede7d40395', 'dart_args_tag': '1.4.4', 'dart_async_tag': '2.0.8', diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index 62c4bcd7b2671..5d21c515eb505 100644 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -649,13 +649,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: engine -ORIGIN: ../../../flutter/fml/time/time_delta_unittest.cc + ../../../third_party/tonic/LICENSE +ORIGIN: ../../../flutter/lib/ui/painting/image.cc + ../../../LICENSE TYPE: LicenseType.bsd -FILE: ../../../flutter/fml/export.h -FILE: ../../../flutter/fml/time/time_delta_unittest.cc -FILE: ../../../flutter/fml/time/time_point_unittest.cc +FILE: ../../../flutter/lib/ui/painting/image.cc +FILE: ../../../flutter/lib/ui/painting/image.h +FILE: ../../../flutter/shell/common/switches.cc +FILE: ../../../flutter/shell/common/switches.h +FILE: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java +FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterMain.java +FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java ---------------------------------------------------------------------------------------------------- -Copyright 2017 The Fuchsia Authors. All rights reserved. +Copyright 2013 The Chromium Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -686,17 +690,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: engine -ORIGIN: ../../../flutter/lib/ui/painting/image.cc + ../../../LICENSE +ORIGIN: ../../../garnet/LICENSE TYPE: LicenseType.bsd -FILE: ../../../flutter/lib/ui/painting/image.cc -FILE: ../../../flutter/lib/ui/painting/image.h -FILE: ../../../flutter/shell/common/switches.cc -FILE: ../../../flutter/shell/common/switches.h -FILE: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java -FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterMain.java -FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java +FILE: ../../../flutter/fml/export.h +FILE: ../../../flutter/fml/time/time_delta_unittest.cc +FILE: ../../../flutter/fml/time/time_point_unittest.cc ---------------------------------------------------------------------------------------------------- -Copyright 2013 The Chromium Authors. All rights reserved. +Copyright 2017 The Fuchsia Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index effcb3701a544..4aba7f34ba2fb 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: da77c336d1e2756b2cca2e2d00f2d741 +Signature: cd0d6dca1aa2aca73d1f1dab47cf9355 UNUSED LICENSES: @@ -5461,6 +5461,7 @@ FILE: ../../../third_party/dart/runtime/vm/compiler/backend/code_statistics.cc FILE: ../../../third_party/dart/runtime/vm/compiler/backend/code_statistics.h FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.cc FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.h +FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_state.h FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/base_flow_graph_builder.cc FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/base_flow_graph_builder.h FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/bytecode_reader.cc @@ -16698,6 +16699,50 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: tonic +ORIGIN: ../../../garnet/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/tonic/dart_list.cc +FILE: ../../../third_party/tonic/dart_list.h +FILE: ../../../third_party/tonic/file_loader/file_loader_fuchsia.cc +FILE: ../../../third_party/tonic/file_loader/file_loader_posix.cc +FILE: ../../../third_party/tonic/file_loader/file_loader_win.cc +FILE: ../../../third_party/tonic/filesystem/filesystem/path_win.cc +FILE: ../../../third_party/tonic/filesystem/filesystem/portable_unistd.h +FILE: ../../../third_party/tonic/platform/platform_utils.h +FILE: ../../../third_party/tonic/platform/platform_utils_posix.cc +FILE: ../../../third_party/tonic/platform/platform_utils_win.cc +---------------------------------------------------------------------------------------------------- +Copyright 2017 The Fuchsia Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +==================================================================================================== + ==================================================================================================== LIBRARY: tonic ORIGIN: ../../../third_party/tonic/LICENSE @@ -16797,50 +16842,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== -==================================================================================================== -LIBRARY: tonic -ORIGIN: ../../../third_party/tonic/file_loader/file_loader_fuchsia.cc + ../../../third_party/tonic/LICENSE -TYPE: LicenseType.bsd -FILE: ../../../third_party/tonic/dart_list.cc -FILE: ../../../third_party/tonic/dart_list.h -FILE: ../../../third_party/tonic/file_loader/file_loader_fuchsia.cc -FILE: ../../../third_party/tonic/file_loader/file_loader_posix.cc -FILE: ../../../third_party/tonic/file_loader/file_loader_win.cc -FILE: ../../../third_party/tonic/filesystem/filesystem/path_win.cc -FILE: ../../../third_party/tonic/filesystem/filesystem/portable_unistd.h -FILE: ../../../third_party/tonic/platform/platform_utils.h -FILE: ../../../third_party/tonic/platform/platform_utils_posix.cc -FILE: ../../../third_party/tonic/platform/platform_utils_win.cc ----------------------------------------------------------------------------------------------------- -Copyright 2017 The Fuchsia Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -==================================================================================================== - ==================================================================================================== LIBRARY: tonic ORIGIN: ../../../third_party/tonic/typed_data/dart_byte_data.cc + ../../../third_party/tonic/LICENSE diff --git a/frontend_server/lib/server.dart b/frontend_server/lib/server.dart index 804c5699eb2f8..342813b7dbe8b 100644 --- a/frontend_server/lib/server.dart +++ b/frontend_server/lib/server.dart @@ -38,6 +38,10 @@ class _FlutterFrontendCompiler implements frontend.CompilerInterface{ void acceptLastDelta() { _compiler.acceptLastDelta(); } + @override + Future rejectLastDelta() async { + return _compiler.rejectLastDelta(); + } @override void invalidate(Uri uri) { From 39d41a71fe43de244b1b89ea89c9bbf47332436b Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Thu, 6 Sep 2018 13:44:27 -0700 Subject: [PATCH 2/5] Fixed licenses --- ci/licenses_golden/licenses_flutter | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index 5d21c515eb505..62c4bcd7b2671 100644 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -649,17 +649,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: engine -ORIGIN: ../../../flutter/lib/ui/painting/image.cc + ../../../LICENSE +ORIGIN: ../../../flutter/fml/time/time_delta_unittest.cc + ../../../third_party/tonic/LICENSE TYPE: LicenseType.bsd -FILE: ../../../flutter/lib/ui/painting/image.cc -FILE: ../../../flutter/lib/ui/painting/image.h -FILE: ../../../flutter/shell/common/switches.cc -FILE: ../../../flutter/shell/common/switches.h -FILE: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java -FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterMain.java -FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java +FILE: ../../../flutter/fml/export.h +FILE: ../../../flutter/fml/time/time_delta_unittest.cc +FILE: ../../../flutter/fml/time/time_point_unittest.cc ---------------------------------------------------------------------------------------------------- -Copyright 2013 The Chromium Authors. All rights reserved. +Copyright 2017 The Fuchsia Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -690,13 +686,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: engine -ORIGIN: ../../../garnet/LICENSE +ORIGIN: ../../../flutter/lib/ui/painting/image.cc + ../../../LICENSE TYPE: LicenseType.bsd -FILE: ../../../flutter/fml/export.h -FILE: ../../../flutter/fml/time/time_delta_unittest.cc -FILE: ../../../flutter/fml/time/time_point_unittest.cc +FILE: ../../../flutter/lib/ui/painting/image.cc +FILE: ../../../flutter/lib/ui/painting/image.h +FILE: ../../../flutter/shell/common/switches.cc +FILE: ../../../flutter/shell/common/switches.h +FILE: ../../../flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java +FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterMain.java +FILE: ../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java ---------------------------------------------------------------------------------------------------- -Copyright 2017 The Fuchsia Authors. All rights reserved. +Copyright 2013 The Chromium Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are From 32dc935caf098ceacc3e8c014317dcb7e0247b6d Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Thu, 6 Sep 2018 13:56:34 -0700 Subject: [PATCH 3/5] Added whitespace --- frontend_server/lib/server.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend_server/lib/server.dart b/frontend_server/lib/server.dart index 342813b7dbe8b..d7276fad4c51a 100644 --- a/frontend_server/lib/server.dart +++ b/frontend_server/lib/server.dart @@ -38,7 +38,8 @@ class _FlutterFrontendCompiler implements frontend.CompilerInterface{ void acceptLastDelta() { _compiler.acceptLastDelta(); } - @override + + @override Future rejectLastDelta() async { return _compiler.rejectLastDelta(); } From 4f90efbc252d88bd34d6a507a4ee3ef34ea82f58 Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Thu, 6 Sep 2018 13:56:54 -0700 Subject: [PATCH 4/5] Whitespace... --- frontend_server/lib/server.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend_server/lib/server.dart b/frontend_server/lib/server.dart index d7276fad4c51a..7891841484267 100644 --- a/frontend_server/lib/server.dart +++ b/frontend_server/lib/server.dart @@ -39,7 +39,7 @@ class _FlutterFrontendCompiler implements frontend.CompilerInterface{ _compiler.acceptLastDelta(); } - @override + @override Future rejectLastDelta() async { return _compiler.rejectLastDelta(); } From 87f3deb988ef16d10cc114bdc095c95f083ff2b2 Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Thu, 6 Sep 2018 15:43:54 -0700 Subject: [PATCH 5/5] Whitespace --- frontend_server/lib/server.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend_server/lib/server.dart b/frontend_server/lib/server.dart index 7891841484267..572087e9d186e 100644 --- a/frontend_server/lib/server.dart +++ b/frontend_server/lib/server.dart @@ -38,7 +38,7 @@ class _FlutterFrontendCompiler implements frontend.CompilerInterface{ void acceptLastDelta() { _compiler.acceptLastDelta(); } - + @override Future rejectLastDelta() async { return _compiler.rejectLastDelta();