Merge branch 'master' into roll-rapidjson

Author: stuartmorgan-g

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': 'af99f3ee60177fe5f20f5d7e995540852f8b0d66',
+  'skia_revision': '2aee7d24da8f53d5c493c86a62fe7d5bda0ed2a2',
 
   # 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': 'c8ed304e979a283f10e28a4104e0da31a3f114ff',
+  'dart_revision': '68e904e444dcfdce6acbce49e949df675f44674b',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -529,7 +529,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': '6h3IHoN06A4cvumNQ92hnYAs89rNFxu_tnQJ0awXfhEC'
+        'version': 'Ke00YoQY3gr6XjjvRphHcHlYUnNly2QpRtyZUPvkgPkC'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -549,7 +549,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'Tszo5lUJw4pMkhAqlHOsAZfuMWHcLEdrCk2X56cxNKAC'
+        'version': 'VJv0H274DVlq71Q_dUGYrsM4cDQFW0GniDIuYcX3XtcC'
        }
      ],
      'condition': 'host_os == "linux"',

ci/licenses_golden/licenses_flutter

@@ -603,6 +603,8 @@ FILE: ../../../flutter/shell/gpu/gpu_surface_software_delegate.cc
 FILE: ../../../flutter/shell/gpu/gpu_surface_software_delegate.h
 FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan.cc
 FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan.h
+FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan_delegate.cc
+FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan_delegate.h
 FILE: ../../../flutter/shell/platform/android/AndroidManifest.xml
 FILE: ../../../flutter/shell/platform/android/android_context_gl.cc
 FILE: ../../../flutter/shell/platform/android/android_context_gl.h

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: b47a2e0b85d0f0730a965160e75f46a8
+Signature: 7eee75c10d5417c5bff805c87dd1183b
 
 UNUSED LICENSES:
 
@@ -483,6 +483,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/meta.json
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sounds/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediacodec/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/meta.json
@@ -1403,6 +1404,8 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/images.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/player.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/publisher.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sounds/meta.json
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sounds/sound_player.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_consumer.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/audio_core.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/meta.json
@@ -2177,6 +2180,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.audio/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.drm/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.playback/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sessions2/meta.json
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media.sounds/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.media/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mediacodec/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.mem/meta.json

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: 36875dca0b44ca56ffdb6a9227249afb
+Signature: f8c0f0571265c025ed51b5a016fafb68
 
 UNUSED LICENSES:
 
@@ -5610,6 +5610,7 @@ LIBRARY: skia
 ORIGIN: ../../../third_party/skia/gm/3d.cpp + ../../../third_party/skia/LICENSE
 TYPE: LicenseType.bsd
 FILE: ../../../third_party/skia/gm/3d.cpp
+FILE: ../../../third_party/skia/gm/bc1_transparency.cpp
 FILE: ../../../third_party/skia/gm/bicubic.cpp
 FILE: ../../../third_party/skia/gm/compressed_textures.cpp
 FILE: ../../../third_party/skia/gm/exoticformats.cpp

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: d4172921f48473fbb848a21f0ec3b6da
+Signature: d5e9bd72c17a7fa0003170ac337e5223
 
 UNUSED LICENSES:
 
@@ -7472,6 +7472,26 @@ FILE: ../../../third_party/dart/runtime/bin/ffi_test/clobber_x86.S
 FILE: ../../../third_party/dart/runtime/bin/ffi_test/ffi_test_functions_helpers.S
 FILE: ../../../third_party/dart/runtime/docs/compiler/images/catch-block-entry-0.png
 FILE: ../../../third_party/dart/runtime/docs/compiler/images/catch-block-entry-1.png
+FILE: ../../../third_party/dart/runtime/docs/images/aot-ic-dictionary.png
+FILE: ../../../third_party/dart/runtime/docs/images/aot-ic-linear.png
+FILE: ../../../third_party/dart/runtime/docs/images/aot-ic-monomorphic.png
+FILE: ../../../third_party/dart/runtime/docs/images/aot-ic-singletarget.png
+FILE: ../../../third_party/dart/runtime/docs/images/aot-ic-unlinked.png
+FILE: ../../../third_party/dart/runtime/docs/images/aot.png
+FILE: ../../../third_party/dart/runtime/docs/images/dart-to-kernel.png
+FILE: ../../../third_party/dart/runtime/docs/images/flutter-cfe.png
+FILE: ../../../third_party/dart/runtime/docs/images/images.graffle!images
+FILE: ../../../third_party/dart/runtime/docs/images/inline-cache-1.png
+FILE: ../../../third_party/dart/runtime/docs/images/isolates.png
+FILE: ../../../third_party/dart/runtime/docs/images/kernel-loaded-1.png
+FILE: ../../../third_party/dart/runtime/docs/images/kernel-loaded-2.png
+FILE: ../../../third_party/dart/runtime/docs/images/kernel-service.png
+FILE: ../../../third_party/dart/runtime/docs/images/optimizing-compilation.png
+FILE: ../../../third_party/dart/runtime/docs/images/raw-function-lazy-compile.png
+FILE: ../../../third_party/dart/runtime/docs/images/snapshot-appjit.png
+FILE: ../../../third_party/dart/runtime/docs/images/snapshot-with-code.png
+FILE: ../../../third_party/dart/runtime/docs/images/snapshot.png
+FILE: ../../../third_party/dart/runtime/docs/images/unoptimized-compilation.png
 FILE: ../../../third_party/dart/runtime/docs/infra/images/isolated-out-browser.png
 FILE: ../../../third_party/dart/runtime/docs/infra/images/isolated-out-link.png
 FILE: ../../../third_party/dart/runtime/observatory/lib/elements.dart
@@ -7482,6 +7502,10 @@ FILE: ../../../third_party/dart/runtime/observatory/web/favicon.ico
 FILE: ../../../third_party/dart/runtime/observatory/web/index.html
 FILE: ../../../third_party/dart/runtime/observatory/web/third_party/trace_viewer_full.html
 FILE: ../../../third_party/dart/runtime/observatory/web/timeline.html
+FILE: ../../../third_party/dart/runtime/tools/wiki/styles/style.scss
+FILE: ../../../third_party/dart/runtime/tools/wiki/templates/includes/auto-refresh.html
+FILE: ../../../third_party/dart/runtime/tools/wiki/templates/includes/favicon.html
+FILE: ../../../third_party/dart/runtime/tools/wiki/templates/page.html
 FILE: ../../../third_party/dart/samples/ffi/sqlite/docs/lib/scenario-default.svg
 FILE: ../../../third_party/dart/samples/ffi/sqlite/docs/lib/scenario-full.svg
 FILE: ../../../third_party/dart/sdk/lib/html/html_common/conversions_dart2js.dart
@@ -7755,6 +7779,11 @@ TYPE: LicenseType.bsd
 FILE: ../../../third_party/dart/benchmarks/ListCopy/dart/ListCopy.dart
 FILE: ../../../third_party/dart/benchmarks/TypedDataDuplicate/dart/TypedDataDuplicate.dart
 FILE: ../../../third_party/dart/runtime/observatory/bin/heap_snapshot.dart
+FILE: ../../../third_party/dart/runtime/tools/wiki/xref_extractor/bin/main.dart
+FILE: ../../../third_party/dart/runtime/tools/wiki/xref_extractor/lib/cquery_driver.dart
+FILE: ../../../third_party/dart/runtime/tools/wiki/xref_extractor/lib/xref_extractor.dart
+FILE: ../../../third_party/dart/runtime/vm/compiler/aot/dispatch_table_generator.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/aot/dispatch_table_generator.h
 FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/abi.cc
 FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/abi.h
 FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/call.cc
@@ -7771,6 +7800,8 @@ FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_representation.cc
 FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_representation.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/dispatch_table.cc
+FILE: ../../../third_party/dart/runtime/vm/dispatch_table.h
 FILE: ../../../third_party/dart/runtime/vm/field_table.cc
 FILE: ../../../third_party/dart/runtime/vm/field_table.h
 FILE: ../../../third_party/dart/runtime/vm/timeline_macos.cc

common/settings.h

@@ -122,6 +122,10 @@ struct Settings {
   // the VM service.
   bool disable_service_auth_codes = true;
 
+  // Determine whether the vmservice should fallback to automatic port selection
+  // after failing to bind to a specified port.
+  bool enable_service_port_fallback = false;
+
   // Font settings
   bool use_test_fonts = false;
 

flow/skia_gpu_object_unittests.cc

@@ -88,12 +88,10 @@ TEST_F(SkiaGpuObjectTest, ObjectDestructor) {
   std::shared_ptr<fml::AutoResetWaitableEvent> latch =
       std::make_shared<fml::AutoResetWaitableEvent>();
   fml::TaskQueueId dtor_task_queue_id(0);
-
+  auto object = sk_make_sp<TestSkObject>(latch, &dtor_task_queue_id);
   {
-    auto object = sk_make_sp<TestSkObject>(latch, &dtor_task_queue_id);
-    SkiaGPUObject<TestSkObject> sk_object(object, unref_queue());
-    ASSERT_EQ(sk_object.get(), object);
-    ASSERT_EQ(dtor_task_queue_id, 0);
+    SkiaGPUObject<TestSkObject> sk_object(std::move(object), unref_queue());
+    // Verify that the default SkiaGPUObject dtor queues and unref.
   }
 
   latch->Wait();
@@ -106,29 +104,9 @@ TEST_F(SkiaGpuObjectTest, ObjectReset) {
   fml::TaskQueueId dtor_task_queue_id(0);
   SkiaGPUObject<TestSkObject> sk_object(
       sk_make_sp<TestSkObject>(latch, &dtor_task_queue_id), unref_queue());
-
+  // Verify that explicitly resetting the GPU object queues and unref.
   sk_object.reset();
   ASSERT_EQ(sk_object.get(), nullptr);
-
-  latch->Wait();
-  ASSERT_EQ(dtor_task_queue_id, unref_task_runner()->GetTaskQueueId());
-}
-
-TEST_F(SkiaGpuObjectTest, ObjectResetBeforeDestructor) {
-  std::shared_ptr<fml::AutoResetWaitableEvent> latch =
-      std::make_shared<fml::AutoResetWaitableEvent>();
-  fml::TaskQueueId dtor_task_queue_id(0);
-
-  {
-    auto object = sk_make_sp<TestSkObject>(latch, &dtor_task_queue_id);
-    SkiaGPUObject<TestSkObject> sk_object(object, unref_queue());
-    ASSERT_EQ(sk_object.get(), object);
-    ASSERT_EQ(dtor_task_queue_id, 0);
-
-    sk_object.reset();
-    ASSERT_EQ(sk_object.get(), nullptr);
-  }
-
   latch->Wait();
   ASSERT_EQ(dtor_task_queue_id, unref_task_runner()->GetTaskQueueId());
 }

flutter_frontend_server/lib/server.dart

@@ -70,6 +70,17 @@ class _FlutterFrontendCompiler implements frontend.CompilerInterface {
         expression, definitions, typeDefinitions, libraryUri, klass, isStatic);
   }
 
+  Future<Null> compileExpressionToJs(
+      String libraryUri,
+      int line,
+      int column,
+      Map<String,String> jsModules,
+      Map<String,String> jsFrameValues,
+      String moduleName,
+      String expression) {
+    throw UnimplementedError('Compile expression to JS is not supported');
+  }
+
   @override
   void reportError(String msg) {
     _compiler.reportError(msg);

fml/platform/win/file_win.cc

@@ -76,7 +76,7 @@ static DWORD GetShareFlags(FilePermission permission) {
 }
 
 static DWORD GetFileAttributesForUtf8Path(const char* absolute_path) {
-  return ::GetFileAttributes(ConvertToWString(absolute_path).c_str());
+  return ::GetFileAttributes(StringToWideString(absolute_path).c_str());
 }
 
 static DWORD GetFileAttributesForUtf8Path(const fml::UniqueFD& base_directory,
@@ -272,7 +272,7 @@ bool IsFile(const std::string& path) {
 }
 
 bool UnlinkDirectory(const char* path) {
-  if (!::RemoveDirectory(ConvertToWString(path).c_str())) {
+  if (!::RemoveDirectory(StringToWideString(path).c_str())) {
     FML_DLOG(ERROR) << "Could not remove directory: '" << path << "'. "
                     << GetLastErrorMessage();
     return false;
@@ -291,7 +291,7 @@ bool UnlinkDirectory(const fml::UniqueFD& base_directory, const char* path) {
 }
 
 bool UnlinkFile(const char* path) {
-  if (!::DeleteFile(ConvertToWString(path).c_str())) {
+  if (!::DeleteFile(StringToWideString(path).c_str())) {
     FML_DLOG(ERROR) << "Could not remove file: '" << path << "'. "
                     << GetLastErrorMessage();
     return false;

fml/platform/win/native_library_win.cc

@@ -16,7 +16,7 @@ NativeLibrary::NativeLibrary(const char* path)
     return;
   }
 
-  handle_ = ::LoadLibrary(ConvertToWString(path).c_str());
+  handle_ = ::LoadLibrary(StringToWideString(path).c_str());
 }
 
 NativeLibrary::NativeLibrary(Handle handle, bool close_handle)