Skip to content

Commit

Permalink
Merge branch 'main' into maskviewpool_regression
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Yang committed May 1, 2023
2 parents a0851b5 + a37bd4b commit a6ad852
Show file tree
Hide file tree
Showing 43 changed files with 287 additions and 572 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scorecards-analysis.yml
Expand Up @@ -49,6 +49,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@8662eabe0e9f338a07350b7fd050732745f93848
uses: github/codeql-action/upload-sarif@f3feb00acb00f31a6f60280e6ace9ca31d91c76a
with:
sarif_file: results.sarif
10 changes: 5 additions & 5 deletions DEPS
Expand Up @@ -18,7 +18,7 @@ vars = {
'llvm_git': 'https://llvm.googlesource.com',
# OCMock is for testing only so there is no google clone
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
'skia_revision': '9867fa253064e4dcaa083251c0cac3b58e20a427',
'skia_revision': '82d1ef7a833ee606b8e35f5d3fc6514221adf453',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down Expand Up @@ -53,7 +53,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': 'e8b86b073413d929e6a73ad16e1db7224a17a281',
'dart_revision': 'dc4a048e3cf7077be1f70d6e883c554e2f548dc2',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand All @@ -68,7 +68,7 @@ vars = {
'dart_perfetto_rev': 'b8da07095979310818f0efde2ef3c69ea70d62c5',
'dart_protobuf_gn_rev': 'f872f05cb0378eef9a7a2609076929f0f35b4141',
'dart_protobuf_rev': 'b90a4c44d56075eb23ee38ae56ce0febfd7f280f',
'dart_pub_rev': '21eb39e148c720ab8577bbf3bf089556a113eb10',
'dart_pub_rev': 'a3f8b2fd36ec432450caf907474a02023ef3e44e',
'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
'dart_watcher_rev': '00aa79b0ff5562c9dafb0525891e2e69c51be06d',
'dart_webdev_rev': '12f22857d509832e0e80616d937088992f565e6b',
Expand Down Expand Up @@ -881,7 +881,7 @@ deps = {
'packages': [
{
'package': 'fuchsia/sdk/core/mac-amd64',
'version': 'kNDuhglIFq_xEt5n3A4Xvrpnn0oGDIslJCFzfoi1UxwC'
'version': 'NBgD7NzOpwnAULR_gFPv6cpJIkKpefko0tj87DYxUwsC'
}
],
'condition': 'host_os == "mac" and not download_fuchsia_sdk',
Expand All @@ -891,7 +891,7 @@ deps = {
'packages': [
{
'package': 'fuchsia/sdk/core/linux-amd64',
'version': 'xfKYQ2vkoLvxhBHIfawVPzeoCsW3IaqeeOEaJWPSID4C'
'version': 'SJOgKviZ-kwWd1Z1u7URy-XuJcMsJPT3weBV9NYJyV8C'
}
],
'condition': 'host_os == "linux" and not download_fuchsia_sdk',
Expand Down
9 changes: 6 additions & 3 deletions ci/builders/linux_host_desktop_engine.json
Expand Up @@ -8,7 +8,8 @@
"type": "gcs",
"include_paths": [
"out/host_debug/zip_archives/linux-x64-debug/linux-x64-flutter-gtk.zip"
]
],
"realm": "production"
}
],
"drone_dimensions": [
Expand Down Expand Up @@ -40,7 +41,8 @@
"type": "gcs",
"include_paths": [
"out/host_profile/zip_archives/linux-x64-profile/linux-x64-flutter-gtk.zip"
]
],
"realm": "production"
}
],
"drone_dimensions": [
Expand Down Expand Up @@ -73,7 +75,8 @@
"type": "gcs",
"include_paths": [
"out/host_release/zip_archives/linux-x64-release/linux-x64-flutter-gtk.zip"
]
],
"realm": "production"
}
],
"drone_dimensions": [
Expand Down
4 changes: 1 addition & 3 deletions ci/licenses_golden/excluded_files
Expand Up @@ -2800,8 +2800,6 @@
../../../third_party/skia/src/gpu/ganesh/vk/BUILD.bazel
../../../third_party/skia/src/gpu/gl/BUILD.bazel
../../../third_party/skia/src/gpu/mtl/BUILD.bazel
../../../third_party/skia/src/gpu/piet/BUILD.bazel
../../../third_party/skia/src/gpu/piet/README.md
../../../third_party/skia/src/gpu/tessellate/BUILD.bazel
../../../third_party/skia/src/gpu/vk/BUILD.bazel
../../../third_party/skia/src/image/BUILD.bazel
Expand Down Expand Up @@ -2842,7 +2840,7 @@
../../../third_party/skia/third_party/libjpeg-turbo
../../../third_party/skia/third_party/libpng
../../../third_party/skia/third_party/lua
../../../third_party/skia/third_party/piet-gpu/Makefile
../../../third_party/skia/third_party/vello
../../../third_party/skia/third_party/vulkanmemoryallocator/BUILD.bazel
../../../third_party/skia/toolchain/BUILD.bazel
../../../third_party/skia/toolchain/android_trampolines/gen_trampolines/BUILD.bazel
Expand Down
16 changes: 3 additions & 13 deletions ci/licenses_golden/licenses_fuchsia
@@ -1,4 +1,4 @@
Signature: 4258ab218ee2fb31efe41dd71bd85ed8
Signature: 3c2ca726df921aebd2cbe83506fe1dce

====================================================================================================
LIBRARY: fuchsia_sdk
Expand Down Expand Up @@ -1138,17 +1138,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: fuchsia_sdk
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/bootfs.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/image.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/limits.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/smc.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/threads.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/time.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/bootfs.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/image.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/dlfcn.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/features.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/pci.h + ../../../fuchsia/sdk/linux/LICENSE
Expand Down Expand Up @@ -1391,17 +1387,13 @@ ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/profile.cc + ../../../fuchsia/sdk/linu
ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/resource.cc + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/pkg/zx/vcpu.cc + ../../../fuchsia/sdk/linux/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/bootfs.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/image.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/dlfcn.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/features.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/hw/pci.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/limits.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/smc.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/threads.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/time.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/bootfs.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/image.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/dlfcn.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/features.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/hw/pci.h
Expand Down Expand Up @@ -3472,10 +3464,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: fuchsia_sdk
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/driver-config.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/driver-config.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/errors.h + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/internal/cdecls.inc + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/optional_nullable.dart + ../../../fuchsia/sdk/linux/LICENSE
Expand Down Expand Up @@ -3702,10 +3692,8 @@ ORIGIN: ../../../fuchsia/sdk/linux/pkg/utf-utils/internal/scalar.cc + ../../../f
ORIGIN: ../../../fuchsia/sdk/linux/pkg/utf-utils/utf-utils.cc + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/pkg/vulkan/client.shard.cml + ../../../fuchsia/sdk/linux/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/boot/driver-config.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/errors.h
FILE: ../../../fuchsia/sdk/linux/arch/arm64/sysroot/include/zircon/syscalls/internal/cdecls.inc
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/boot/driver-config.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/errors.h
FILE: ../../../fuchsia/sdk/linux/arch/x64/sysroot/include/zircon/syscalls/internal/cdecls.inc
FILE: ../../../fuchsia/sdk/linux/dart/fidl/lib/src/optional_nullable.dart
Expand Down Expand Up @@ -3966,6 +3954,7 @@ ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/inspect_sink.fidl +
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/graphical_presenter.fidl + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/clock.fidl + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/common.fidl + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/plug.fidl + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer_format.fidl + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/history.fidl + ../../../fuchsia/sdk/linux/LICENSE
ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/symlink.fidl + ../../../fuchsia/sdk/linux/LICENSE
Expand All @@ -3989,6 +3978,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/inspect_sink.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/graphical_presenter.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/clock.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/common.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/plug.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio/ring_buffer_format.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/history.fidl
FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/symlink.fidl
Expand Down
21 changes: 4 additions & 17 deletions ci/licenses_golden/licenses_skia
@@ -1,4 +1,4 @@
Signature: 22c46ddbf02271a20eb6b0e13be8c9ad
Signature: 7aa1cedbb79e0a5d9dfe292a9ca0caf8

====================================================================================================
LIBRARY: etc1
Expand Down Expand Up @@ -384,6 +384,7 @@ FILE: ../../../third_party/skia/modules/pathkit/perf/pathops.bench.js
FILE: ../../../third_party/skia/modules/pathkit/perf/perfReporter.js
FILE: ../../../third_party/skia/modules/skparagraph/test.html
FILE: ../../../third_party/skia/package-lock.json
FILE: ../../../third_party/skia/relnotes/skimage_methods.md
FILE: ../../../third_party/skia/relnotes/skimage_subset.md
FILE: ../../../third_party/skia/src/core/SkOrderedReadBuffer.h
FILE: ../../../third_party/skia/src/gpu/gpu_workaround_list.txt
Expand Down Expand Up @@ -656,9 +657,9 @@ ORIGIN: ../../../third_party/skia/src/base/SkTSort.h + ../../../third_party/skia
ORIGIN: ../../../third_party/skia/src/base/SkUtils.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/base/SkUtils.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkAlphaRuns.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkAlphaRuns.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkAnalyticEdge.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkAnalyticEdge.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkAntiRun.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkBlitBWMaskTemplate.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkBlitter.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/core/SkBlitter.h + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -805,9 +806,9 @@ FILE: ../../../third_party/skia/src/base/SkTSort.h
FILE: ../../../third_party/skia/src/base/SkUtils.cpp
FILE: ../../../third_party/skia/src/base/SkUtils.h
FILE: ../../../third_party/skia/src/core/SkAlphaRuns.cpp
FILE: ../../../third_party/skia/src/core/SkAlphaRuns.h
FILE: ../../../third_party/skia/src/core/SkAnalyticEdge.cpp
FILE: ../../../third_party/skia/src/core/SkAnalyticEdge.h
FILE: ../../../third_party/skia/src/core/SkAntiRun.h
FILE: ../../../third_party/skia/src/core/SkBlitBWMaskTemplate.h
FILE: ../../../third_party/skia/src/core/SkBlitter.cpp
FILE: ../../../third_party/skia/src/core/SkBlitter.h
Expand Down Expand Up @@ -8353,8 +8354,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/graphite/PaintParams.cpp + ../../../th
ORIGIN: ../../../third_party/skia/src/gpu/graphite/PaintParams.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/PaintParamsKey.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/PaintParamsKey.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/PipelineData.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/PipelineData.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/Precompile.cpp + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -8575,8 +8574,6 @@ FILE: ../../../third_party/skia/src/gpu/graphite/PaintParams.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/PaintParams.h
FILE: ../../../third_party/skia/src/gpu/graphite/PaintParamsKey.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/PaintParamsKey.h
FILE: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/PietRenderTask.h
FILE: ../../../third_party/skia/src/gpu/graphite/PipelineData.cpp
FILE: ../../../third_party/skia/src/gpu/graphite/PipelineData.h
FILE: ../../../third_party/skia/src/gpu/graphite/Precompile.cpp
Expand Down Expand Up @@ -8757,11 +8754,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/MutableTextureStateRef.h + ../../../th
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/piet/PietTypes.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/piet/Render.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/piet/Render.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/piet/Scene.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/piet/Scene.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/src/sksl/SkSLPosition.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
Expand All @@ -8779,11 +8771,6 @@ FILE: ../../../third_party/skia/src/gpu/MutableTextureStateRef.h
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.h
FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp
FILE: ../../../third_party/skia/src/gpu/piet/PietTypes.h
FILE: ../../../third_party/skia/src/gpu/piet/Render.cpp
FILE: ../../../third_party/skia/src/gpu/piet/Render.h
FILE: ../../../third_party/skia/src/gpu/piet/Scene.cpp
FILE: ../../../third_party/skia/src/gpu/piet/Scene.h
FILE: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h
FILE: ../../../third_party/skia/src/sksl/SkSLPosition.cpp
----------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
Signature: 36f70f102f3c815ac2c23bd10facee67
Signature: 0957108b8f344f5f840417524392edfa

====================================================================================================
LIBRARY: angle
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
Signature: aabe540615f08ecf9c89970cdec802bc
Signature: f7b260cd821ec8f8838b3b739d9a4970

14 changes: 14 additions & 0 deletions impeller/aiks/aiks_unittests.cc
Expand Up @@ -2163,5 +2163,19 @@ TEST_P(AiksTest, OpaqueEntitiesGetCoercedToSource) {
ASSERT_EQ(entity.GetBlendMode(), BlendMode::kSource);
}

TEST_P(AiksTest, CanRenderDestructiveSaveLayer) {
Canvas canvas;

canvas.DrawPaint({.color = Color::Red()});
// Draw an empty savelayer with a destructive blend mode, which will replace
// the entire red screen with fully transparent black, except for the green
// circle drawn within the layer.
canvas.SaveLayer({.blend_mode = BlendMode::kSource});
canvas.DrawCircle({300, 300}, 100, {.color = Color::Green()});
canvas.Restore();

ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
}

} // namespace testing
} // namespace impeller
3 changes: 0 additions & 3 deletions impeller/entity/contents/contents.cc
Expand Up @@ -109,9 +109,6 @@ bool Contents::ShouldRender(const Entity& entity,
if (!stencil_coverage.has_value()) {
return false;
}
if (Entity::IsBlendModeDestructive(entity.GetBlendMode())) {
return true;
}

auto coverage = GetCoverage(entity);
if (!coverage.has_value()) {
Expand Down
2 changes: 1 addition & 1 deletion impeller/entity/entity.cc
Expand Up @@ -124,7 +124,7 @@ bool Entity::SetInheritedOpacity(Scalar alpha) {
return true;
}

/// @brief Returns true if the blend mode is "destrictive", meaning that even
/// @brief Returns true if the blend mode is "destructive", meaning that even
/// fully transparent source colors would result in the destination
/// getting changed.
///
Expand Down
11 changes: 6 additions & 5 deletions impeller/image/backends/skia/compressed_image_skia.cc
Expand Up @@ -9,8 +9,9 @@
#include "impeller/base/validation.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkData.h"
#include "third_party/skia/include/core/SkImageGenerator.h"
#include "third_party/skia/include/core/SkImage.h"
#include "third_party/skia/include/core/SkPixmap.h"
#include "third_party/skia/include/core/SkRefCnt.h"

namespace impeller {

Expand Down Expand Up @@ -46,12 +47,12 @@ DecompressedImage CompressedImageSkia::Decode() const {
},
src);

auto generator = SkImageGenerator::MakeFromEncoded(sk_data);
if (!generator) {
auto image = SkImages::DeferredFromEncodedData(sk_data);
if (!image) {
return {};
}

const auto dims = generator->getInfo().dimensions();
const auto dims = image->imageInfo().dimensions();
auto info = SkImageInfo::Make(dims.width(), dims.height(),
kRGBA_8888_SkColorType, kPremul_SkAlphaType);

Expand All @@ -61,7 +62,7 @@ DecompressedImage CompressedImageSkia::Decode() const {
return {};
}

if (!generator->getPixels(bitmap->pixmap())) {
if (!image->readPixels(nullptr, bitmap->pixmap(), 0, 0)) {
VALIDATION_LOG << "Could not decompress image into arena.";
return {};
}
Expand Down

0 comments on commit a6ad852

Please sign in to comment.