sync

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': '24e58341fbcd904fdf81d86e5a7703e254d63e35',
+  'skia_revision': '71f8475a0dbacc5d63fef094100835bad7b1e74c',
 
   # 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': '760a9690c22ec3f3d163173737f9949f97e6e02a',
+  'dart_revision': '2b995b2654ba162c48cdd187ce0b2f1d24c6838f',
 
   'dart_args_tag': '1.4.4',
   'dart_async_tag': '2.0.8',
@@ -115,7 +115,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '35959f6255c341eee550884ed69afd6b2891bd53',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '7aadfaf196f9cd8a299f9ad78fab63362800466d',
 
    # Fuchsia compatibility
    #
@@ -124,7 +124,7 @@ deps = {
    # and not have to specific specific hashes.
 
   'src/third_party/tonic':
-   Var('fuchsia_git') + '/tonic' + '@' + '90c9c81f49461d9f4d414845a6eeba1c0df35bb4',
+   Var('fuchsia_git') + '/tonic' + '@' + 'd91fa62844f8531a3701450f6192298d0e873246',
 
   'src/third_party/benchmark':
    Var('fuchsia_git') + '/third_party/benchmark' + '@' + '296537bc48d380adf21567c5d736ab79f5363d22',

ci/licenses_golden/licenses_flutter

@@ -819,8 +819,6 @@ FILE: ../../../flutter/shell/common/animator.cc
 FILE: ../../../flutter/shell/common/animator.h
 FILE: ../../../flutter/shell/common/engine.cc
 FILE: ../../../flutter/shell/common/engine.h
-FILE: ../../../flutter/shell/common/picture_serializer.cc
-FILE: ../../../flutter/shell/common/picture_serializer.h
 FILE: ../../../flutter/shell/common/platform_view.cc
 FILE: ../../../flutter/shell/common/platform_view.h
 FILE: ../../../flutter/shell/common/rasterizer.cc

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: af91da401385350e1fd99d6d8f3947a4
+Signature: 2d0f3b3ff2a5279313bfee7ef0cef7c5
 
 UNUSED LICENSES:
 
@@ -959,8 +959,6 @@ FILE: ../../../third_party/skia/src/core/SkColorSpace.cpp
 FILE: ../../../third_party/skia/src/core/SkColorSpacePriv.h
 FILE: ../../../third_party/skia/src/core/SkColorSpaceXform.cpp
 FILE: ../../../third_party/skia/src/core/SkColorSpaceXformPriv.h
-FILE: ../../../third_party/skia/src/core/SkColorSpace_XYZ.cpp
-FILE: ../../../third_party/skia/src/core/SkColorSpace_XYZ.h
 FILE: ../../../third_party/skia/src/core/SkCpu.cpp
 FILE: ../../../third_party/skia/src/core/SkCpu.h
 FILE: ../../../third_party/skia/src/core/SkDeduper.h
@@ -1495,9 +1493,6 @@ FILE: ../../../third_party/skia/src/gpu/effects/GrLumaColorFilterEffect.h
 FILE: ../../../third_party/skia/src/gpu/effects/GrMagnifierEffect.cpp
 FILE: ../../../third_party/skia/src/gpu/effects/GrMagnifierEffect.fp
 FILE: ../../../third_party/skia/src/gpu/effects/GrMagnifierEffect.h
-FILE: ../../../third_party/skia/src/gpu/effects/GrOverdrawFragmentProcessor.cpp
-FILE: ../../../third_party/skia/src/gpu/effects/GrOverdrawFragmentProcessor.fp
-FILE: ../../../third_party/skia/src/gpu/effects/GrOverdrawFragmentProcessor.h
 FILE: ../../../third_party/skia/src/gpu/effects/GrPremulInputFragmentProcessor.cpp
 FILE: ../../../third_party/skia/src/gpu/effects/GrPremulInputFragmentProcessor.fp
 FILE: ../../../third_party/skia/src/gpu/effects/GrPremulInputFragmentProcessor.h

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: 149340ef002a59fe0840631d6cfd1773
+Signature: 5ff2cabdf3ef0c70254ec22bc9e767c6
 
 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

flow/matrix_decomposition.cc

@@ -28,6 +28,15 @@ static inline SkVector3 SkVector3Cross(const SkVector3& a, const SkVector3& b) {
 MatrixDecomposition::MatrixDecomposition(const SkMatrix& matrix)
     : MatrixDecomposition(SkMatrix44{matrix}) {}
 
+// Use custom normalize to avoid skia precision loss/normalize() privatization.
+static inline void SkVector3Normalize(SkVector3& v) {
+  double mag = sqrt(v.fX * v.fX + v.fY * v.fY + v.fZ * v.fZ);
+  double scale = 1.0 / mag;
+  v.fX *= scale;
+  v.fY *= scale;
+  v.fZ *= scale;
+}
+
 MatrixDecomposition::MatrixDecomposition(SkMatrix44 matrix) : valid_(false) {
   if (matrix.get(3, 3) == 0) {
     return;
@@ -83,14 +92,14 @@ MatrixDecomposition::MatrixDecomposition(SkMatrix44 matrix) : valid_(false) {
 
   scale_.fX = row[0].length();
 
-  row[0].normalize();
+  SkVector3Normalize(row[0]);
 
   shear_.fX = row[0].dot(row[1]);
   row[1] = SkVector3Combine(row[1], 1.0, row[0], -shear_.fX);
 
   scale_.fY = row[1].length();
 
-  row[1].normalize();
+  SkVector3Normalize(row[1]);
 
   shear_.fX /= scale_.fY;
 
@@ -101,7 +110,7 @@ MatrixDecomposition::MatrixDecomposition(SkMatrix44 matrix) : valid_(false) {
 
   scale_.fZ = row[2].length();
 
-  row[2].normalize();
+  SkVector3Normalize(row[2]);
 
   shear_.fY /= scale_.fZ;
   shear_.fZ /= scale_.fZ;

flow/matrix_decomposition_unittests.cc

@@ -95,8 +95,7 @@ TEST(MatrixDecomposition, Combination) {
 }
 
 TEST(MatrixDecomposition, ScaleFloatError) {
-  // Strange behavior under 0.000245 due to underflow issues.
-  for (float scale = 0.000245f; scale < 2.0f; scale += 0.000001f) {
+  for (float scale = 0.0001f; scale < 2.0f; scale += 0.000001f) {
     SkMatrix44 matrix = SkMatrix44::I();
     matrix.setScale(scale, scale, 1.0f);
 

shell/common/BUILD.gn

@@ -67,8 +67,6 @@ source_set("common") {
     "io_manager.h",
     "isolate_configuration.cc",
     "isolate_configuration.h",
-    "picture_serializer.cc",
-    "picture_serializer.h",
     "platform_view.cc",
     "platform_view.h",
     "rasterizer.cc",

shell/common/rasterizer.cc

@@ -13,6 +13,10 @@
 #include "third_party/skia/include/core/SkSurfaceCharacterization.h"
 #include "third_party/skia/include/utils/SkBase64.h"
 
+#ifdef ERROR
+#undef ERROR
+#endif
+
 namespace shell {
 
 Rasterizer::Rasterizer(blink::TaskRunners task_runners)
@@ -114,7 +118,7 @@ bool Rasterizer::DrawToSurface(flow::LayerTree& layer_tree) {
       surface_->GetContext(), canvas, surface_->GetRootTransformation(), true);
 
   if (canvas) {
-    canvas->clear(SK_ColorBLACK);
+    canvas->clear(SK_ColorTRANSPARENT);
   }
 
   if (compositor_frame && compositor_frame->Raster(layer_tree, false)) {
@@ -173,6 +177,7 @@ static sk_sp<SkData> ScreenshotLayerTreeAsImage(
   auto snapshot_surface =
       CreateSnapshotSurface(surface_context, tree->frame_size());
   if (snapshot_surface == nullptr) {
+    FML_LOG(ERROR) << "Screenshot: unable to create snapshot surface";
     return nullptr;
   }
 
@@ -186,23 +191,25 @@ static sk_sp<SkData> ScreenshotLayerTreeAsImage(
 
   auto frame = compositor_context.AcquireFrame(
       surface_context, canvas, root_surface_transformation, false);
-  canvas->clear(SK_ColorBLACK);
+  canvas->clear(SK_ColorTRANSPARENT);
   frame->Raster(*tree, true);
   canvas->flush();
 
   // Prepare an image from the surface, this image may potentially be on th GPU.
   auto potentially_gpu_snapshot = snapshot_surface->makeImageSnapshot();
   if (!potentially_gpu_snapshot) {
+    FML_LOG(ERROR) << "Screenshot: unable to make image screenshot";
     return nullptr;
   }
 
   // Copy the GPU image snapshot into CPU memory.
   auto cpu_snapshot = potentially_gpu_snapshot->makeRasterImage();
   if (!cpu_snapshot) {
+    FML_LOG(ERROR) << "Screenshot: unable to make raster image";
     return nullptr;
   }
 
-  // If the caller want the pixels to be compressed, there is a Skia utilitiy to
+  // If the caller want the pixels to be compressed, there is a Skia utility to
   // compress to PNG. Use that.
   if (compressed) {
     return cpu_snapshot->encodeToData();
@@ -211,6 +218,7 @@ static sk_sp<SkData> ScreenshotLayerTreeAsImage(
   // Copy it into a bitmap and return the same.
   SkPixmap pixmap;
   if (!cpu_snapshot->peekPixels(&pixmap)) {
+    FML_LOG(ERROR) << "Screenshot: unable to obtain bitmap pixels";
     return nullptr;
   }
 
@@ -222,7 +230,7 @@ Rasterizer::Screenshot Rasterizer::ScreenshotLastLayerTree(
     bool base64_encode) {
   auto layer_tree = GetLastLayerTree();
   if (layer_tree == nullptr) {
-    FML_DLOG(INFO) << "Last layer tree was null when screenshotting.";
+    FML_LOG(ERROR) << "Last layer tree was null when screenshotting.";
     return {};
   }
 
@@ -246,7 +254,7 @@ Rasterizer::Screenshot Rasterizer::ScreenshotLastLayerTree(
   }
 
   if (data == nullptr) {
-    FML_DLOG(INFO) << "Sceenshot data was null.";
+    FML_LOG(ERROR) << "Screenshot data was null.";
     return {};
   }
 

shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java

@@ -158,7 +158,7 @@ public boolean sendKeyEvent(KeyEvent event) {
                 int character = event.getUnicodeChar();
                 if (character != 0) {
                     int selStart = Math.max(0, Selection.getSelectionStart(mEditable));
-                    int selEnd = Selection.getSelectionEnd(mEditable);
+                    int selEnd = Math.max(0, Selection.getSelectionEnd(mEditable));
                     if (selEnd != selStart)
                         mEditable.delete(selStart, selEnd);
                     mEditable.insert(selStart, String.valueOf((char) character));

shell/platform/android/io/flutter/view/FlutterMain.java

@@ -262,15 +262,7 @@ private static void initResources(Context applicationContext) {
 
         sResourceExtractor = new ResourceExtractor(context);
 
-        // Search for the icudtl.dat file at the old and new locations.
-        // TODO(jsimmons): remove the old location when all tools have been updated.
-        Set<String> sharedAssets = listAssets(applicationContext, SHARED_ASSET_DIR);
-        String icuAssetPath;
-        if (sharedAssets.contains(SHARED_ASSET_ICU_DATA)) {
-          icuAssetPath = SHARED_ASSET_DIR + File.separator + SHARED_ASSET_ICU_DATA;
-        } else {
-          icuAssetPath = SHARED_ASSET_ICU_DATA;
-        }
+        String icuAssetPath = SHARED_ASSET_DIR + File.separator + SHARED_ASSET_ICU_DATA;
         sResourceExtractor.addResource(icuAssetPath);
         sIcuDataPath = PathUtils.getDataDirectory(applicationContext) + File.separator + icuAssetPath;