Merge remote-tracking branch 'upstream/master' into transform3d

Author: ferhatb

.cirrus.yml

@@ -65,21 +65,13 @@ task:
         mkdir -p $FRAMEWORK_PATH
         cd $FRAMEWORK_PATH
         git clone https://github.com/flutter/flutter.git
-      test_web_script: |
-        cd $FRAMEWORK_PATH/flutter/dev/integration_tests/web
-        ../../../bin/flutter config --local-engine=host_debug_unopt --no-analytics --enable-web
-        ../../../bin/flutter --local-engine=host_debug_unopt build web -v
       analyze_framework_script: |
         cd $FRAMEWORK_PATH/flutter
         rm -rf bin/cache/pkg/sky_engine
+        mkdir -p bin/cache/pkg/
         cp -r $ENGINE_PATH/src/out/host_debug_unopt/gen/dart-pkg/sky_engine bin/cache/pkg/
         bin/flutter update-packages --local-engine=host_debug_unopt
         bin/flutter analyze --dartdocs --flutter-repo --local-engine=host_debug_unopt
       test_framework_script: |
         cd $FRAMEWORK_PATH/flutter/packages/flutter
         ../../bin/flutter test --local-engine=host_debug_unopt
-
-    - name: build_test
-      build_script: |
-        cd $ENGINE_PATH/src/flutter
-        ./ci/build.sh

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': 'a87c5076a876e63664566bba55e16b6d4d410234',
+  'skia_revision': 'e2c4999ec3408773e4ae6986a04e4f54509c2f5d',
 
   # 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': 'ddbeaabe8b3dc6299d9c963d414f820198edf8cd',
+  'dart_revision': '9560a32779fc966349dd2d719b76aee49fb6a1de',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -46,7 +46,7 @@ vars = {
   'dart_http_retry_tag': '0.1.1',
   'dart_http_throttle_tag': '1.0.2',
   'dart_intl_tag': '0.16.1',
-  'dart_linter_tag': '0.1.119',
+  'dart_linter_tag': '0.1.120',
   'dart_oauth2_tag': '1.6.0',
   'dart_protobuf_rev': '3746c8fd3f2b0147623a8e3db89c3ff4330de760',
   'dart_pub_rev': '04e237f78b2302d7f20d0b362554425e8deb8add',
@@ -516,7 +516,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'UKTUc5UVBDJaJFvP4rO5euHhTXsSx0TDo2rwyCTW2MsC'
+        'version': 'mhxbBrFZDVqhyjD6R_OWPZlC9jG23vcj5Uk33x2NURoC'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -536,7 +536,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'EdtRxRaCSBtWqAj2Ofaisqxa6baoiKQ9th1K-3R3U14C'
+        'version': 'DMUD0TMLr0mavgE2UCvZxEKXGnot54-bpSBGEEvOYJwC'
        }
      ],
      'condition': 'host_os == "linux"',

ci/licenses_golden/licenses_flutter

@@ -795,6 +795,7 @@ FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/common/StandardM
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/common/StandardMethodCodec.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/common/StringCodec.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/editing/FlutterTextUtils.java
+FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/editing/ImeSyncDeferringInsetsCallback.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: 9b48e46f159d6de579f7f185cc23dec4
+Signature: 87f7667613801005c03d97752892b32e
 
 UNUSED LICENSES:
 
@@ -3139,11 +3139,6 @@ FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/string_view.h
 FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/testonly-syscalls.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/string_view.h
 FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/testonly-syscalls.h
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_modular/lib/src/module/internal/_view_provider_impl.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_modular/lib/src/module/noop_view_provider.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_modular/lib/src/module/view_provider.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_modular_testing/lib/src/module_interceptor.dart
-FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_modular_testing/lib/src/module_with_view_provider_impl.dart
 FILE: ../../../fuchsia/sdk/linux/dart/fuchsia_scenic_flutter/lib/src/child_view_render_box_2.dart
 FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/component.dart
 FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/device.dart

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: c8b43171afd115a8618c41b931c64abd
+Signature: 66a02e906b6c190321e40e37296ef68c
 
 UNUSED LICENSES:
 
@@ -3922,6 +3922,7 @@ FILE: ../../../third_party/skia/src/core/SkYUVAPixmaps.cpp
 FILE: ../../../third_party/skia/src/gpu/GrBackendSemaphore.cpp
 FILE: ../../../third_party/skia/src/gpu/GrBackendSurfaceMutableState.cpp
 FILE: ../../../third_party/skia/src/gpu/GrBackendSurfaceMutableStateImpl.h
+FILE: ../../../third_party/skia/src/gpu/GrBackendUtils.cpp
 FILE: ../../../third_party/skia/src/gpu/GrBackendUtils.h
 FILE: ../../../third_party/skia/src/gpu/GrBlockAllocator.cpp
 FILE: ../../../third_party/skia/src/gpu/GrBlockAllocator.h
@@ -4007,6 +4008,7 @@ FILE: ../../../third_party/skia/src/sksl/SkSLInliner.h
 FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.cpp
 FILE: ../../../third_party/skia/src/sksl/SkSLSPIRVtoHLSL.h
 FILE: ../../../third_party/skia/src/sksl/SkSLSampleUsage.cpp
+FILE: ../../../third_party/skia/src/sksl/SkSLTinyUnorderedMap.h
 FILE: ../../../third_party/skia/src/sksl/ir/SkSLInlineMarker.h
 FILE: ../../../third_party/skia/src/utils/SkCustomTypeface.cpp
 ----------------------------------------------------------------------------------------------------

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: f7f2dde13633b0c56c6d8b79c881dace
+Signature: 5188b32b8a99778d79838f3d3d67036d
 
 UNUSED LICENSES:
 
@@ -8062,6 +8062,7 @@ FILE: ../../../third_party/dart/runtime/bin/dartdev_isolate.cc
 FILE: ../../../third_party/dart/runtime/bin/dartdev_isolate.h
 FILE: ../../../third_party/dart/runtime/bin/exe_utils.cc
 FILE: ../../../third_party/dart/runtime/bin/exe_utils.h
+FILE: ../../../third_party/dart/runtime/bin/file_win.h
 FILE: ../../../third_party/dart/runtime/bin/platform_macos.h
 FILE: ../../../third_party/dart/runtime/bin/platform_macos_test.cc
 FILE: ../../../third_party/dart/runtime/include/dart_api_dl.c
@@ -8106,6 +8107,7 @@ FILE: ../../../third_party/dart/runtime/vm/compiler/ffi/native_type.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/compiler/frontend/kernel_binary_flowgraph_test.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/frontend/multiple_entrypoints_test.cc
 FILE: ../../../third_party/dart/runtime/vm/compiler/stub_code_compiler.cc
 FILE: ../../../third_party/dart/runtime/vm/compiler/write_barrier_elimination.cc
 FILE: ../../../third_party/dart/runtime/vm/compiler/write_barrier_elimination.h

e2etests/web/regular_integration_tests/test_driver/text_editing_integration.dart

@@ -143,6 +143,57 @@ void main() {
     expect(input2.value, 'Text2');
   });
 
+  testWidgets('Jump between TextFormFields with tab key after CapsLock is'
+      'activated',
+          (WidgetTester tester) async {
+    app.main();
+    await tester.pumpAndSettle();
+
+    // TODO(nurhan): https://github.com/flutter/flutter/issues/51885
+    SystemChannels.textInput.setMockMethodCallHandler(null);
+
+    // Focus on a TextFormField.
+    final Finder finder = find.byKey(const Key('input'));
+    expect(finder, findsOneWidget);
+    await tester.tap(find.byKey(const Key('input')));
+
+    // A native input element will be appended to the DOM.
+    final List<Node> nodeList = document.getElementsByTagName('input');
+    expect(nodeList.length, equals(1));
+    final InputElement input =
+    document.getElementsByTagName('input')[0] as InputElement;
+
+    // Press and release CapsLock.
+    dispatchKeyboardEvent(input, 'keydown', <String, dynamic>{
+      'key': 'CapsLock',
+      'code': 'CapsLock',
+      'bubbles': true,
+      'cancelable': true,
+    });
+    dispatchKeyboardEvent(input, 'keyup', <String, dynamic>{
+      'key': 'CapsLock',
+      'code': 'CapsLock',
+      'bubbles': true,
+      'cancelable': true,
+    });
+
+    // Press Tab. The focus should move to the next TextFormField.
+    dispatchKeyboardEvent(input, 'keydown', <String, dynamic>{
+      'key': 'Tab',
+      'code': 'Tab',
+      'bubbles': true,
+      'cancelable': true,
+    });
+
+    await tester.pumpAndSettle();
+
+    // A native input element for the next TextField should be attached to the
+    // DOM.
+    final InputElement input2 =
+    document.getElementsByTagName('input')[0] as InputElement;
+    expect(input2.value, 'Text2');
+  });
+
   testWidgets('Read-only fields work', (WidgetTester tester) async {
     const String text = 'Lorem ipsum dolor sit amet';
     app.main();

flow/layers/child_scene_layer.cc

@@ -20,26 +20,10 @@ void ChildSceneLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
 
   context->child_scene_layer_exists_below = true;
   CheckForChildLayerBelow(context);
-
-  // An alpha "hole punch" is required if the frame behind us is not opaque.
-  if (!context->is_opaque) {
-    set_paint_bounds(
-        SkRect::MakeXYWH(offset_.fX, offset_.fY, size_.fWidth, size_.fHeight));
-  }
 }
 
 void ChildSceneLayer::Paint(PaintContext& context) const {
-  TRACE_EVENT0("flutter", "ChildSceneLayer::Paint");
-  FML_DCHECK(needs_painting());
-  FML_DCHECK(needs_system_composite());
-
-  // If we are being rendered into our own frame using the system compositor,
-  // then it is neccesary to "punch a hole" in the canvas/frame behind us so
-  // that group opacity looks correct.
-  SkPaint paint;
-  paint.setColor(SK_ColorTRANSPARENT);
-  paint.setBlendMode(SkBlendMode::kSrc);
-  context.leaf_nodes_canvas->drawRect(paint_bounds(), paint);
+  FML_NOTREACHED();
 }
 
 void ChildSceneLayer::UpdateScene(SceneUpdateContext& context) {

flow/layers/layer.h

@@ -59,7 +59,6 @@ struct PrerollContext {
   // These allow us to track properties like elevation, opacity, and the
   // prescence of a platform view during Preroll.
   bool has_platform_view = false;
-  bool is_opaque = true;
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
   // True if, during the traversal so far, we have seen a child_scene_layer.
   // Informs whether a layer needs to be system composited.

flow/layers/opacity_layer.cc

@@ -14,19 +14,15 @@ OpacityLayer::OpacityLayer(SkAlpha alpha, const SkPoint& offset)
 
 void OpacityLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
   TRACE_EVENT0("flutter", "OpacityLayer::Preroll");
+  FML_DCHECK(!GetChildContainer()->layers().empty());  // We can't be a leaf.
 
-  ContainerLayer* container = GetChildContainer();
-  FML_DCHECK(!container->layers().empty());  // OpacityLayer can't be a leaf.
-
-  const bool parent_is_opaque = context->is_opaque;
   SkMatrix child_matrix = matrix;
   child_matrix.postTranslate(offset_.fX, offset_.fY);
 
   // Similar to what's done in TransformLayer::Preroll, we have to apply the
   // reverse transformation to the cull rect to properly cull child layers.
   context->cull_rect = context->cull_rect.makeOffset(-offset_.fX, -offset_.fY);
 
-  context->is_opaque = parent_is_opaque && (alpha_ == SK_AlphaOPAQUE);
   context->mutators_stack.PushTransform(
       SkMatrix::Translate(offset_.fX, offset_.fY));
   context->mutators_stack.PushOpacity(alpha_);
@@ -35,7 +31,6 @@ void OpacityLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
   ContainerLayer::Preroll(context, child_matrix);
   context->mutators_stack.Pop();
   context->mutators_stack.Pop();
-  context->is_opaque = parent_is_opaque;
 
   {
     set_paint_bounds(paint_bounds().makeOffset(offset_.fX, offset_.fY));