From 2dc8271a4c08028b856018c4e8c88afe86389b40 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Tue, 4 Sep 2018 00:27:51 -0400 Subject: [PATCH 01/27] Roll src/third_party/skia 24e58341fbcd..cff3fd834ca8 (1 commits) (#6151) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 4042ebeef53d6..4bbb54852db24 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': '24e58341fbcd904fdf81d86e5a7703e254d63e35', + 'skia_revision': 'cff3fd834ca8f3849cca81b4cb4353f10d7ad10f', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 9b6281e840565..8ac7acb52a13d 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: af91da401385350e1fd99d6d8f3947a4 +Signature: b7ea7936f3a9d9f8522895f97e83bc67 UNUSED LICENSES: From b0b8daa7b2a63d0371aa31deb637ca263545fdcd Mon Sep 17 00:00:00 2001 From: Kirill Nikolaev Date: Tue, 4 Sep 2018 15:31:01 +0200 Subject: [PATCH 02/27] Unregister onFrameAvailable callbacks when a TextureEntry is released. (#6079) Otherwise the callbacks may be called after FlutterNativeView is destroyed and is null. Also defensively check for whether the texture is already released in the callback because the callback may be called from another thread by a stale reference (see the comment). This closes https://github.com/flutter/flutter/issues/20951. --- .../android/io/flutter/view/FlutterView.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java index 0acaa6c4e894c..33c8c834742be 100644 --- a/shell/platform/android/io/flutter/view/FlutterView.java +++ b/shell/platform/android/io/flutter/view/FlutterView.java @@ -997,9 +997,19 @@ final class SurfaceTextureRegistryEntry implements TextureRegistry.SurfaceTextur this.surfaceTexture.setOnFrameAvailableListener(new SurfaceTexture.OnFrameAvailableListener() { @Override public void onFrameAvailable(SurfaceTexture texture) { + if (released) { + // Even though we make sure to unregister the callback before releasing, as of Android O + // SurfaceTexture has a data race when accessing the callback, so the callback may + // still be called by a stale reference after released==true and mNativeView==null. + return; + } nativeMarkTextureFrameAvailable(mNativeView.get(), SurfaceTextureRegistryEntry.this.id); } - }); + }, + // The callback relies on being executed on the UI thread (unsynchronised read of mNativeView + // and also the engine code check for platform thread in Shell::OnPlatformViewMarkTextureFrameAvailable), + // so we explicitly pass a Handler for the current thread. + new Handler()); } @Override @@ -1019,6 +1029,9 @@ public void release() { } released = true; nativeUnregisterTexture(mNativeView.get(), id); + // Otherwise onFrameAvailableListener might be called after mNativeView==null + // (https://github.com/flutter/flutter/issues/20951). See also the check in onFrameAvailable. + surfaceTexture.setOnFrameAvailableListener(null); surfaceTexture.release(); } } From f89a386a1c06d203c041758a00f90e0ca15f8576 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Tue, 4 Sep 2018 09:48:58 -0400 Subject: [PATCH 03/27] Roll src/third_party/skia cff3fd834ca8..a45e1a71f548 (1 commits) (#6152) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 4bbb54852db24..ee6ec21094686 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': 'cff3fd834ca8f3849cca81b4cb4353f10d7ad10f', + 'skia_revision': 'a45e1a71f548e0814d99b1a299911ec7c944887f', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 8ac7acb52a13d..2bf7919fefc2b 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: b7ea7936f3a9d9f8522895f97e83bc67 +Signature: 8a26acc7786c1e0c403afb52fb28ef0a UNUSED LICENSES: From 137389a85b74832515204e7e34fb5fed2be6c9b0 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Tue, 4 Sep 2018 13:13:51 -0400 Subject: [PATCH 04/27] Roll src/third_party/skia a45e1a71f548..b84576af0a43 (16 commits) (#6153) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/DEPS b/DEPS index ee6ec21094686..00d42fb2c616b 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': 'a45e1a71f548e0814d99b1a299911ec7c944887f', + 'skia_revision': 'b84576af0a4386a88bf5f8453b8ff7bc0db3adcc', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 2bf7919fefc2b..96f83ce457e68 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 8a26acc7786c1e0c403afb52fb28ef0a +Signature: aaaf2a01cd942fd5b5d2eb792ca3420f 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 From 593ed59143c65bba7c3965ba2dc73b94c69ee593 Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Tue, 4 Sep 2018 10:21:30 -0700 Subject: [PATCH 05/27] Revert "Use Skia normalize again after Skia precision fix. (#6121)" (#6122) This reverts commit dc7b5eb89da31cddc2abc91aa5b30bcc6d66e70c. --- flow/matrix_decomposition.cc | 14 +++++++++++--- flow/matrix_decomposition_unittests.cc | 3 +-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/flow/matrix_decomposition.cc b/flow/matrix_decomposition.cc index 73a774b4dd037..e1ac11a927046 100644 --- a/flow/matrix_decomposition.cc +++ b/flow/matrix_decomposition.cc @@ -28,6 +28,14 @@ static inline SkVector3 SkVector3Cross(const SkVector3& a, const SkVector3& b) { MatrixDecomposition::MatrixDecomposition(const SkMatrix& matrix) : MatrixDecomposition(SkMatrix44{matrix}) {} +// TODO(garyq): use skia row[x].normalize() when skia fixes it +static inline void SkVector3Normalize(SkVector3& v) { + float mag = sqrt(v.fX * v.fX + v.fY * v.fY + v.fZ * v.fZ); + v.fX /= mag; + v.fY /= mag; + v.fZ /= mag; +} + MatrixDecomposition::MatrixDecomposition(SkMatrix44 matrix) : valid_(false) { if (matrix.get(3, 3) == 0) { return; @@ -83,14 +91,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 +109,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; diff --git a/flow/matrix_decomposition_unittests.cc b/flow/matrix_decomposition_unittests.cc index 3c1b7d6c9b77b..3b9f8ed815ff6 100644 --- a/flow/matrix_decomposition_unittests.cc +++ b/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); From aaf98fbfedb2ebf1eb81d082514170adbd35f34c Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Tue, 4 Sep 2018 10:54:52 -0700 Subject: [PATCH 06/27] Use double multiplication by a scale instead of 3 divides for speed. (#6154) --- flow/matrix_decomposition.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/flow/matrix_decomposition.cc b/flow/matrix_decomposition.cc index e1ac11a927046..0cc035cbba216 100644 --- a/flow/matrix_decomposition.cc +++ b/flow/matrix_decomposition.cc @@ -28,12 +28,13 @@ static inline SkVector3 SkVector3Cross(const SkVector3& a, const SkVector3& b) { MatrixDecomposition::MatrixDecomposition(const SkMatrix& matrix) : MatrixDecomposition(SkMatrix44{matrix}) {} -// TODO(garyq): use skia row[x].normalize() when skia fixes it +// Use custom normalize to avoid skia precision loss/normalize() privatization. static inline void SkVector3Normalize(SkVector3& v) { - float mag = sqrt(v.fX * v.fX + v.fY * v.fY + v.fZ * v.fZ); - v.fX /= mag; - v.fY /= mag; - v.fZ /= mag; + 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) { From c173655b227fcb3067fd1738aa98f825553fd7d1 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Tue, 4 Sep 2018 16:37:51 -0400 Subject: [PATCH 07/27] Roll src/third_party/skia b84576af0a43..e486bbaae296 (9 commits) (#6155) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 00d42fb2c616b..a7aa655ffcaad 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': 'b84576af0a4386a88bf5f8453b8ff7bc0db3adcc', + 'skia_revision': 'e486bbaae296b81cd47101c1a57ceef1728571f9', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 96f83ce457e68..8458af8583196 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: aaaf2a01cd942fd5b5d2eb792ca3420f +Signature: 112b161eefde13f4bf778963ba8895b8 UNUSED LICENSES: From b32ceafb1f1cc47836ea8db1ce9046ede8e45b6d Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Tue, 4 Sep 2018 14:38:10 -0700 Subject: [PATCH 08/27] Add some more logs for diagnosing screenshot failures (#6156) Fixes https://github.com/flutter/flutter/issues/21228 --- shell/common/rasterizer.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc index 6f0ddd53a1907..4603c57b0ea87 100644 --- a/shell/common/rasterizer.cc +++ b/shell/common/rasterizer.cc @@ -173,6 +173,7 @@ static sk_sp 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; } @@ -193,16 +194,18 @@ static sk_sp ScreenshotLayerTreeAsImage( // 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 +214,7 @@ static sk_sp 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 +226,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 +250,7 @@ Rasterizer::Screenshot Rasterizer::ScreenshotLastLayerTree( } if (data == nullptr) { - FML_DLOG(INFO) << "Sceenshot data was null."; + FML_LOG(ERROR) << "Screenshot data was null."; return {}; } From 30af2f299718f7a042bd379ae7afb669a5ac0b13 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Tue, 4 Sep 2018 20:02:51 -0400 Subject: [PATCH 09/27] Roll src/third_party/skia e486bbaae296..fddc6fa394cb (2 commits) (#6159) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index a7aa655ffcaad..0e65f669f0598 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': 'e486bbaae296b81cd47101c1a57ceef1728571f9', + 'skia_revision': 'fddc6fa394cb645a7239f0d27925ffb4e6070340', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 8458af8583196..79e7573492e74 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 112b161eefde13f4bf778963ba8895b8 +Signature: bfba71d5b389f53589fcb7b70a68c942 UNUSED LICENSES: From 6ad3183b181fd6c45b624ad73288da3ea7494db9 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Tue, 4 Sep 2018 18:23:29 -0700 Subject: [PATCH 10/27] Fix windows build. (#6162) --- shell/common/rasterizer.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc index 4603c57b0ea87..cbfc4e4f5c547 100644 --- a/shell/common/rasterizer.cc +++ b/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) From 9643a50ac4d72676d2604c0caea41d5d4dc38e92 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Tue, 4 Sep 2018 23:26:51 -0400 Subject: [PATCH 11/27] Roll src/third_party/skia fddc6fa394cb..85f4e40c5481 (1 commits) (#6164) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 0e65f669f0598..bd17ac6c1ba5f 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': 'fddc6fa394cb645a7239f0d27925ffb4e6070340', + 'skia_revision': '85f4e40c5481fea45a519433c18f482b80a16d34', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 79e7573492e74..a5e3f82245fb1 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: bfba71d5b389f53589fcb7b70a68c942 +Signature: 5061d7463742eef8941a8620bf704635 UNUSED LICENSES: From 19a3bc8e11fd56915a230b3b5ab22f232ae02093 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Wed, 5 Sep 2018 02:51:51 -0400 Subject: [PATCH 12/27] Roll src/third_party/skia 85f4e40c5481..72a02112a99f (1 commits) (#6165) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index bd17ac6c1ba5f..9f549a63702ce 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': '85f4e40c5481fea45a519433c18f482b80a16d34', + 'skia_revision': '72a02112a99fa9d73ceb0aca66f9bd2833ef60ba', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index a5e3f82245fb1..34e253507ef50 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 5061d7463742eef8941a8620bf704635 +Signature: eebd7bb9ce26512160f6865b1b022ee5 UNUSED LICENSES: From 5063a8a5b32c36d4ba7b921e260b7b4ee09c9f35 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Wed, 5 Sep 2018 06:16:51 -0400 Subject: [PATCH 13/27] Roll src/third_party/skia 72a02112a99f..9478f7a38e6c (1 commits) (#6166) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 9f549a63702ce..23d6dc3571275 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': '72a02112a99fa9d73ceb0aca66f9bd2833ef60ba', + 'skia_revision': '9478f7a38e6c378f338648ec3eade4060e7721ea', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 34e253507ef50..2a2259e4542ef 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: eebd7bb9ce26512160f6865b1b022ee5 +Signature: 2e165b14710a3965f27465c91f1843e7 UNUSED LICENSES: From 6d0fbc7eb7da7c218a69918dd142ff6ea5cf2b66 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Wed, 5 Sep 2018 09:41:51 -0400 Subject: [PATCH 14/27] Roll src/third_party/skia 9478f7a38e6c..d0f0cb8ffc5e (1 commits) (#6167) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 23d6dc3571275..f03b8a17de78b 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': '9478f7a38e6c378f338648ec3eade4060e7721ea', + 'skia_revision': 'd0f0cb8ffc5ed55647d39071586f929132aa46b7', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 2a2259e4542ef..96010bbb33afe 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 2e165b14710a3965f27465c91f1843e7 +Signature: b3451a3c64c368c9a9360530914fb1de UNUSED LICENSES: From b22badf1d473d2fc88e8db60d2616028bfbc5226 Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Wed, 5 Sep 2018 09:16:56 -0700 Subject: [PATCH 15/27] Dart SDK roll for 2018/09/04 (#6161) --- DEPS | 2 +- ci/licenses_golden/licenses_third_party | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index f03b8a17de78b..4415e4de95352 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': '2b995b2654ba162c48cdd187ce0b2f1d24c6838f', 'dart_args_tag': '1.4.4', 'dart_async_tag': '2.0.8', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 2d0cf91811ccd..4f3821e0c6fc6 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 149340ef002a59fe0840631d6cfd1773 +Signature: 598ca2c15761821d8380b0e4c6c1307b 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 From 6af60d716abdc4dd64459107c12b72161ff24988 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Wed, 5 Sep 2018 10:01:33 -0700 Subject: [PATCH 16/27] Remove obsolete discovery mechanism from FlutterView (#6157) --- .../android/io/flutter/view/FlutterView.java | 39 ------------------- 1 file changed, 39 deletions(-) diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java index 33c8c834742be..b72643e3f3ce7 100644 --- a/shell/platform/android/io/flutter/view/FlutterView.java +++ b/shell/platform/android/io/flutter/view/FlutterView.java @@ -69,8 +69,6 @@ public interface Provider { private static final String TAG = "FlutterView"; - private static final String ACTION_DISCOVER = "io.flutter.view.DISCOVER"; - static final class ViewportMetrics { float devicePixelRatio = 1.0f; int physicalWidth = 0; @@ -96,7 +94,6 @@ static final class ViewportMetrics { private final BasicMessageChannel mFlutterLifecycleChannel; private final BasicMessageChannel mFlutterSystemChannel; private final BasicMessageChannel mFlutterSettingsChannel; - private final BroadcastReceiver mDiscoveryReceiver; private final List mActivityLifecycleListeners; private final List mFirstFrameListeners; private final AtomicLong nextTextureId = new AtomicLong(0L); @@ -183,13 +180,6 @@ public void surfaceDestroyed(SurfaceHolder holder) { setLocale(getResources().getConfiguration().locale); setUserSettings(); - - if ((context.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) { - mDiscoveryReceiver = new DiscoveryReceiver(); - context.registerReceiver(mDiscoveryReceiver, new IntentFilter(ACTION_DISCOVER)); - } else { - mDiscoveryReceiver = null; - } } private void encodeKeyEvent(KeyEvent event, Map message) { @@ -332,9 +322,6 @@ float getDevicePixelRatio() { public FlutterNativeView detach() { if (!isAttached()) return null; - if (mDiscoveryReceiver != null) { - getContext().unregisterReceiver(mDiscoveryReceiver); - } getHolder().removeCallback(mSurfaceCallback); mNativeView.detach(); @@ -347,10 +334,6 @@ public void destroy() { if (!isAttached()) return; - if (mDiscoveryReceiver != null) { - getContext().unregisterReceiver(mDiscoveryReceiver); - } - getHolder().removeCallback(mSurfaceCallback); mNativeView.destroy(); @@ -946,28 +929,6 @@ public void setMessageHandler(String channel, BinaryMessageHandler handler) { mNativeView.setMessageHandler(channel, handler); } - /** - * Broadcast receiver used to discover active Flutter instances. - * - * This is used by the `flutter` tool to find the observatory ports for all the - * active Flutter views. We dump the data to the logs and the tool scrapes the - * log lines for the data. - */ - private class DiscoveryReceiver extends BroadcastReceiver { - @Override - public void onReceive(Context context, Intent intent) { - URI observatoryUri = URI.create(FlutterNativeView.getObservatoryUri()); - JSONObject discover = new JSONObject(); - try { - discover.put("id", getContext().getPackageName()); - discover.put("observatoryPort", observatoryUri.getPort()); - Log.i(TAG, "DISCOVER: " + discover); // The tool looks for this data. See - // android_device.dart. - } catch (JSONException e) { - } - } - } - /** * Listener will be called on the Android UI thread once when Flutter renders * the first frame. From 564d214b71ec3ad251a2dc7b243c606eb057d69a Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Wed, 5 Sep 2018 13:05:51 -0400 Subject: [PATCH 17/27] Roll src/third_party/skia d0f0cb8ffc5e..9d1c88d9912d (12 commits) (#6168) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 4415e4de95352..30f014b703912 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': 'd0f0cb8ffc5ed55647d39071586f929132aa46b7', + 'skia_revision': '9d1c88d9912dbddc2fe0b09878b4f30675c9f3bd', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 96010bbb33afe..5ea8c3c3fc51f 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: b3451a3c64c368c9a9360530914fb1de +Signature: ea6fea0bd881af4fc62c11924902a3f0 UNUSED LICENSES: From 3a7d0b559fe9190b11aa36402ea663736bd802e7 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Wed, 5 Sep 2018 10:20:55 -0700 Subject: [PATCH 18/27] Roll buildroot to 7aadfaf196f9cd8a299f9ad78fab63362800466d (#6169) --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 30f014b703912..6cc050877a3af 100644 --- a/DEPS +++ b/DEPS @@ -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 # From 0981731fd703507ba42996bdb1edeecdb27b04b7 Mon Sep 17 00:00:00 2001 From: Michael Klimushyn Date: Wed, 5 Sep 2018 10:44:02 -0700 Subject: [PATCH 19/27] Enable transparent FlutterViews (#6163) - Changes rasterizer to clear the canvas with `SkColor_TRANSPARENT` - Removes the unused `backgroundColor` param from `FlutterView.java` --- shell/common/rasterizer.cc | 4 ++-- .../android/io/flutter/view/FlutterView.java | 14 ++------------ .../platform/android/platform_view_android_jni.cc | 5 ++--- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc index cbfc4e4f5c547..d3d78c6d72c8c 100644 --- a/shell/common/rasterizer.cc +++ b/shell/common/rasterizer.cc @@ -118,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)) { @@ -191,7 +191,7 @@ static sk_sp 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(); diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java index b72643e3f3ce7..9a3ee9cb9d55f 100644 --- a/shell/platform/android/io/flutter/view/FlutterView.java +++ b/shell/platform/android/io/flutter/view/FlutterView.java @@ -128,20 +128,11 @@ public FlutterView(Context context, AttributeSet attrs, FlutterNativeView native } mNativeView.attachViewAndActivity(this, activity); - int color = 0xFF000000; - TypedValue typedValue = new TypedValue(); - context.getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true); - if (typedValue.type >= TypedValue.TYPE_FIRST_COLOR_INT && typedValue.type <= TypedValue.TYPE_LAST_COLOR_INT) { - color = typedValue.data; - } - // TODO(abarth): Consider letting the developer override this color. - final int backgroundColor = color; - mSurfaceCallback = new SurfaceHolder.Callback() { @Override public void surfaceCreated(SurfaceHolder holder) { assertAttached(); - nativeSurfaceCreated(mNativeView.get(), holder.getSurface(), backgroundColor); + nativeSurfaceCreated(mNativeView.get(), holder.getSurface()); } @Override @@ -634,8 +625,7 @@ public Bitmap getBitmap() { return nativeGetBitmap(mNativeView.get()); } - private static native void nativeSurfaceCreated(long nativePlatformViewAndroid, Surface surface, - int backgroundColor); + private static native void nativeSurfaceCreated(long nativePlatformViewAndroid, Surface surface); private static native void nativeSurfaceChanged(long nativePlatformViewAndroid, int width, int height); diff --git a/shell/platform/android/platform_view_android_jni.cc b/shell/platform/android/platform_view_android_jni.cc index 315ac0b55bdc0..6dd4b9ab3350a 100644 --- a/shell/platform/android/platform_view_android_jni.cc +++ b/shell/platform/android/platform_view_android_jni.cc @@ -176,8 +176,7 @@ static jstring GetObservatoryUri(JNIEnv* env, jclass clazz) { static void SurfaceCreated(JNIEnv* env, jobject jcaller, jlong shell_holder, - jobject jsurface, - jint backgroundColor) { + jobject jsurface) { // Note: This frame ensures that any local references used by // ANativeWindow_fromSurface are released immediately. This is needed as a // workaround for https://code.google.com/p/android/issues/detail?id=68174 @@ -638,7 +637,7 @@ bool PlatformViewAndroid::Register(JNIEnv* env) { static const JNINativeMethod view_methods[] = { { .name = "nativeSurfaceCreated", - .signature = "(JLandroid/view/Surface;I)V", + .signature = "(JLandroid/view/Surface;)V", .fnPtr = reinterpret_cast(&shell::SurfaceCreated), }, { From 9f0ad8b794e384ae17cf00109d0f45951942ef03 Mon Sep 17 00:00:00 2001 From: Simon Lightfoot Date: Wed, 5 Sep 2018 20:12:21 +0100 Subject: [PATCH 20/27] Fixes negative end selection offset. (#6171) --- .../io/flutter/plugin/editing/InputConnectionAdaptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java b/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java index 7136457ffca47..ae3a1381e230a 100644 --- a/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java +++ b/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)); From e6d9b34a8cefe8f425b0cb493b3cbe1a535c52ed Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Wed, 5 Sep 2018 12:22:27 -0700 Subject: [PATCH 21/27] Remove the old location of the ICU data asset (#6170) The tools are now placing icudtl.dat in the flutter_shared directory. It is no longer necessary to check for this asset at its previous path. --- .../platform/android/io/flutter/view/FlutterMain.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/shell/platform/android/io/flutter/view/FlutterMain.java b/shell/platform/android/io/flutter/view/FlutterMain.java index 2ac9347f18955..49d3b01707633 100644 --- a/shell/platform/android/io/flutter/view/FlutterMain.java +++ b/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 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; From a0f30b3b0c0395d1268496af36e5fdd310bf1962 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Wed, 5 Sep 2018 16:45:51 -0400 Subject: [PATCH 22/27] Roll src/third_party/skia 9d1c88d9912d..343553a1fe9e (16 commits) (#6175) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 6cc050877a3af..ecb7bb82cfef4 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': '9d1c88d9912dbddc2fe0b09878b4f30675c9f3bd', + 'skia_revision': '343553a1fe9ec65ee6526015a7972435914d7a48', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 5ea8c3c3fc51f..90c46770b3701 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: ea6fea0bd881af4fc62c11924902a3f0 +Signature: bde0f7aa6e379bb73ab99efb8fba20a1 UNUSED LICENSES: From f6ad3e0967d1d378fc2e42aaf7c757bf3b68ed32 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Wed, 5 Sep 2018 16:16:58 -0700 Subject: [PATCH 23/27] Roll Tonic (#6177) --- DEPS | 2 +- ci/licenses_golden/licenses_third_party | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index ecb7bb82cfef4..fdb0f7872eaea 100644 --- a/DEPS +++ b/DEPS @@ -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', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 4f3821e0c6fc6..aca13aa04fe96 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 598ca2c15761821d8380b0e4c6c1307b +Signature: 5ff2cabdf3ef0c70254ec22bc9e767c6 UNUSED LICENSES: From 108e0a64eff59c1783c507e1596eaad8c94d26c2 Mon Sep 17 00:00:00 2001 From: Michael Klimushyn Date: Wed, 5 Sep 2018 16:47:02 -0700 Subject: [PATCH 24/27] Add transparency helpers to FlutterView.java (#6172) Fixes #9627 --- .../android/io/flutter/view/FlutterView.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java index 9a3ee9cb9d55f..8a46370248365 100644 --- a/shell/platform/android/io/flutter/view/FlutterView.java +++ b/shell/platform/android/io/flutter/view/FlutterView.java @@ -12,6 +12,7 @@ import android.content.pm.ApplicationInfo; import android.content.res.Configuration; import android.database.ContentObserver; +import android.graphics.PixelFormat; import android.provider.Settings; import android.net.Uri; import android.os.Handler; @@ -276,6 +277,26 @@ public void removeFirstFrameListener(FirstFrameListener listener) { mFirstFrameListeners.remove(listener); } + /** + * Updates this to support rendering as a transparent {@link SurfaceView}. + * + * Sets it on top of its window. The background color still needs to be + * controlled from within the Flutter UI itself. + */ + public void enableTransparentBackground() { + setZOrderOnTop(true); + getHolder().setFormat(PixelFormat.TRANSPARENT); + } + + /** + * Reverts this back to the {@link SurfaceView} defaults, at the back of its + * window and opaque. + */ + public void disableTransparentBackground() { + setZOrderOnTop(false); + getHolder().setFormat(PixelFormat.OPAQUE); + } + public void setInitialRoute(String route) { mFlutterNavigationChannel.invokeMethod("setInitialRoute", route); } From 572753fb1205dabe699724bbe99cfe7ca02a78d9 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Wed, 5 Sep 2018 20:05:51 -0400 Subject: [PATCH 25/27] Roll src/third_party/skia 343553a1fe9e..ffbcc3fadfa1 (6 commits) (#6178) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index fdb0f7872eaea..4e417716f42ac 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': '343553a1fe9ec65ee6526015a7972435914d7a48', + 'skia_revision': 'ffbcc3fadfa1e9718acf591be0989d279c22d266', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 90c46770b3701..4aa343aded22a 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: bde0f7aa6e379bb73ab99efb8fba20a1 +Signature: e1e86ab62aa82b8b7f174536641a6f8d UNUSED LICENSES: From ade0f22303716b28cbf27f6c8be5aa71e1c4608e Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Wed, 5 Sep 2018 19:45:55 -0700 Subject: [PATCH 26/27] Remove unused file picture_serializer. (#6179) --- ci/licenses_golden/licenses_flutter | 2 -- shell/common/BUILD.gn | 2 -- shell/common/picture_serializer.cc | 16 ---------------- shell/common/picture_serializer.h | 18 ------------------ 4 files changed, 38 deletions(-) delete mode 100644 shell/common/picture_serializer.cc delete mode 100644 shell/common/picture_serializer.h diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index 813bdff51f800..62c4bcd7b2671 100644 --- a/ci/licenses_golden/licenses_flutter +++ b/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 diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn index 0091d5bf02361..db0b6dd43e975 100644 --- a/shell/common/BUILD.gn +++ b/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", diff --git a/shell/common/picture_serializer.cc b/shell/common/picture_serializer.cc deleted file mode 100644 index b62e96d74f0a1..0000000000000 --- a/shell/common/picture_serializer.cc +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "flutter/shell/common/picture_serializer.h" - -#include "third_party/skia/include/core/SkStream.h" - -namespace shell { - -void SerializePicture(const std::string& path, SkPicture* picture) { - SkFILEWStream stream(path.c_str()); - picture->serialize(&stream); -} - -} // namespace shell diff --git a/shell/common/picture_serializer.h b/shell/common/picture_serializer.h deleted file mode 100644 index 0416b2f0c6277..0000000000000 --- a/shell/common/picture_serializer.h +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef SHELL_GPU_PICTURE_SERIALIZER_H_ -#define SHELL_GPU_PICTURE_SERIALIZER_H_ - -#include - -#include "third_party/skia/include/core/SkPicture.h" - -namespace shell { - -void SerializePicture(const std::string& path, SkPicture* picture); - -} // namespace shell - -#endif // SHELL_GPU_PICTURE_SERIALIZER_H_ From 1768bedcf935f3a6eb798aedca4bde21978ba520 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Thu, 6 Sep 2018 08:00:52 -0400 Subject: [PATCH 27/27] Roll src/third_party/skia ffbcc3fadfa1..71f8475a0dba (3 commits) (#6181) Auto-roller completed checks. Merging. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 4e417716f42ac..9c47002732a2a 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': 'ffbcc3fadfa1e9718acf591be0989d279c22d266', + '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 diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 4aa343aded22a..31cb5f4ce3bbe 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: e1e86ab62aa82b8b7f174536641a6f8d +Signature: 2d0f3b3ff2a5279313bfee7ef0cef7c5 UNUSED LICENSES: