Merge branch 'master' into jni_end

Author: cg021

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': '32d5cfa1f35e0368f3d1b2a807514a1a0ec814bb',
+  'skia_revision': '21bbfc6c2dfe07f0406df3dcce4eddd160db92b7',
 
   # 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': 'f043f9e5f6ea4194c0ff4114e30adc5380cbc932',
+  'dart_revision': '50836c171e9153459aafef4a2404b3180fb35fd6',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -110,7 +110,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'd00ecf066669b2d6b3f9174de581864655bce6ff',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'b445ea3b0aec9c9aa9bc1833d1423a8db71e9358',
 
    # Fuchsia compatibility
    #
@@ -354,7 +354,7 @@ deps = {
    Var('dart_git') + '/package_config.git@9c586d04bd26fef01215fd10e7ab96a3050cfa64',
 
   'src/third_party/dart/tools/sdks':
-   {'packages': [{'version': 'version:2.9.0-15.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
+   {'packages': [{'version': 'version:2.9.0-10.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 
@@ -521,7 +521,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'Wj0yogFK9aLJz9Ywn4EvTVNZFgia4Li_-l3iQZjARlsC'
+        'version': 'gR0ZcVF7fBt2skRCkqUqX9GgjPH0Jxs8H6CwJdT65OcC'
        }
      ],
      'condition': 'host_os == "mac"',

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: 993fb29d3f36954f6bd8c6cc91a573ef
+Signature: cfdd5bbe0473ca5d32a6dea2b2b55e27
 
 UNUSED LICENSES:
 

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: e2381fb0c6bd8969b9e68bc7898a2915
+Signature: bfcb15c7a644429b76382d47bc5aa5d7
 
 UNUSED LICENSES:
 

shell/common/BUILD.gn

@@ -223,21 +223,21 @@ if (enable_unittests) {
 
         defines += [ "SHELL_ENABLE_GL" ]
       }
+    }
 
-      if (test_enable_vulkan) {
-        sources += [
-          "shell_test_platform_view_vulkan.cc",
-          "shell_test_platform_view_vulkan.h",
-        ]
+    if (test_enable_vulkan) {
+      sources += [
+        "shell_test_platform_view_vulkan.cc",
+        "shell_test_platform_view_vulkan.h",
+      ]
 
-        public_deps += [
-          "//flutter/shell/gpu:gpu_surface_vulkan",
-          "//flutter/testing:vulkan",
-          "//flutter/vulkan",
-        ]
+      public_deps += [
+        "//flutter/shell/gpu:gpu_surface_vulkan",
+        "//flutter/testing:vulkan",
+        "//flutter/vulkan",
+      ]
 
-        defines += [ "SHELL_ENABLE_VULKAN" ]
-      }
+      defines += [ "SHELL_ENABLE_VULKAN" ]
     }
   }
 
@@ -263,6 +263,10 @@ if (enable_unittests) {
     if (!defined(defines)) {
       defines = []
     }
+
+    if (test_enable_vulkan) {
+      defines += [ "SHELL_ENABLE_VULKAN" ]
+    }
   }
 
   if (is_fuchsia) {

shell/common/persistent_cache_unittests.cc

@@ -99,12 +99,17 @@ TEST_F(ShellTest, CacheSkSLWorks) {
   firstFrameLatch.Wait();
   WaitForIO(shell.get());
 
+// Shader precompilation from SKSL is not implemented on the Skia Vulkan
+// backend so don't run the second half of this test on Vulkan. This can get
+// removed if SKSL precompilation is implemented in the Skia Vulkan backend.
+#if !defined(SHELL_ENABLE_VULKAN)
   // To check that all shaders are precompiled, verify that no new skp is dumped
   // due to shader compilations.
   int old_skp_count = skp_count;
   skp_count = 0;
   fml::VisitFilesRecursively(dir.fd(), skp_visitor);
   ASSERT_EQ(skp_count, old_skp_count);
+#endif  // !defined(SHELL_ENABLE_VULKAN)
 
   // Remove all files generated
   fml::FileVisitor remove_visitor = [&remove_visitor](

shell/common/rasterizer.cc

@@ -120,6 +120,10 @@ void Rasterizer::DrawLastLayerTree() {
 }
 
 void Rasterizer::Draw(std::shared_ptr<LayerTreeHolder> layer_tree_holder) {
+  if (layer_tree_holder->IsEmpty()) {
+    // We do not have any frame to raster.
+    return;
+  }
   TRACE_EVENT0("flutter", "GPURasterizer::Draw");
   if (raster_thread_merger_ &&
       !raster_thread_merger_->IsOnRasterizingThread()) {

shell/common/shell_test_platform_view_vulkan.cc

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/common/shell_test_platform_view_vulkan.h"
+#include "flutter/shell/common/persistent_cache.h"
 #include "flutter/vulkan/vulkan_utilities.h"
 
 namespace flutter {
@@ -105,7 +106,14 @@ bool ShellTestPlatformViewVulkan::OffScreenSurface::CreateSkiaGrContext() {
     return false;
   }
 
-  sk_sp<GrContext> context = GrContext::MakeVulkan(backend_context);
+  GrContextOptions options;
+  if (PersistentCache::cache_sksl()) {
+    options.fShaderCacheStrategy = GrContextOptions::ShaderCacheStrategy::kSkSL;
+  }
+  PersistentCache::MarkStrategySet();
+  options.fPersistentCache = PersistentCache::GetCacheForProcess();
+
+  sk_sp<GrContext> context = GrContext::MakeVulkan(backend_context, options);
 
   if (context == nullptr) {
     FML_DLOG(ERROR) << "Failed to create GrContext";

shell/platform/android/platform_view_android_jni_impl.cc

@@ -737,7 +737,7 @@ bool PlatformViewAndroid::Register(JNIEnv* env) {
     FML_LOG(ERROR) << "Could not locate onEndFrame method";
     return false;
   }
-
+  
   g_on_display_overlay_surface_method = env->GetMethodID(
       g_flutter_jni_class->obj(), "onDisplayOverlaySurface", "(IIIII)V");
 

shell/platform/linux/fl_text_input_plugin.cc

@@ -288,6 +288,10 @@ FlTextInputPlugin* fl_text_input_plugin_new(FlBinaryMessenger* messenger) {
 gboolean fl_text_input_plugin_filter_keypress(FlTextInputPlugin* self,
                                               GdkEventKey* event) {
   g_return_val_if_fail(FL_IS_TEXT_INPUT_PLUGIN(self), FALSE);
+
+  if (self->client_id == kClientIdUnset)
+    return FALSE;
+
   if (gtk_im_context_filter_keypress(self->im_context, event))
     return TRUE;
 

shell/platform/linux/fl_view.cc

@@ -330,10 +330,8 @@ static gboolean fl_view_motion_notify_event(GtkWidget* widget,
 static gboolean fl_view_key_press_event(GtkWidget* widget, GdkEventKey* event) {
   FlView* self = FL_VIEW(widget);
 
-  if (fl_text_input_plugin_filter_keypress(self->text_input_plugin, event))
-    return TRUE;
-
   fl_key_event_plugin_send_key_event(self->key_event_plugin, event);
+  fl_text_input_plugin_filter_keypress(self->text_input_plugin, event);
 
   return TRUE;
 }
@@ -343,10 +341,8 @@ static gboolean fl_view_key_release_event(GtkWidget* widget,
                                           GdkEventKey* event) {
   FlView* self = FL_VIEW(widget);
 
-  if (fl_text_input_plugin_filter_keypress(self->text_input_plugin, event))
-    return TRUE;
-
   fl_key_event_plugin_send_key_event(self->key_event_plugin, event);
+  fl_text_input_plugin_filter_keypress(self->text_input_plugin, event);
 
   return TRUE;
 }

testing/BUILD.gn

@@ -98,6 +98,21 @@ source_set("fixture_test") {
 }
 
 if (enable_unittests) {
+  source_set("vulkan") {
+    testonly = true
+
+    deps = [
+      ":skia",
+      "//flutter/fml",
+    ]
+
+    # SwiftShader only supports x86/x64_64
+    if (target_cpu == "x86" || target_cpu == "x64") {
+      configs += [ "//third_party/swiftshader_flutter:swiftshader_config" ]
+      deps += [ "//third_party/swiftshader_flutter:swiftshader_vulkan" ]
+    }
+  }
+
   # SwiftShader only supports x86/x64_64
   if (target_cpu == "x86" || target_cpu == "x64") {
     source_set("opengl") {
@@ -117,18 +132,6 @@ if (enable_unittests) {
       ]
     }
 
-    source_set("vulkan") {
-      testonly = true
-
-      configs += [ "//third_party/swiftshader_flutter:swiftshader_config" ]
-
-      deps = [
-        ":skia",
-        "//flutter/fml",
-        "//third_party/swiftshader_flutter:swiftshader_vulkan",
-      ]
-    }
-
     # All targets on all platforms should be able to use the Metal utilities. On
     # platforms where Metal is not available, the tests must be skipped or
     # implemented to use another available client rendering API. This is usually