From d6d4eec24c38bb06a9b1aef4e70c321d447ba762 Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Mon, 16 Apr 2018 16:20:48 -0700 Subject: [PATCH] Fix broken Linux build (#5019) After we write the pixels in the correct format, the color type of the SkPixmap is still set to its previous value, so the existing assertion was failing. --- .gitignore | 1 + lib/ui/painting/image_encoding.cc | 1 - testing/dart/.gitignore | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b5f80bd40a3fe..2e1362f0aae0b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .DS_Store .classpath .cproject +.dart_tool .gdb_history .checkstyle .gdbinit diff --git a/lib/ui/painting/image_encoding.cc b/lib/ui/painting/image_encoding.cc index 15d2d31c9ec75..c103d5d8271e4 100644 --- a/lib/ui/painting/image_encoding.cc +++ b/lib/ui/painting/image_encoding.cc @@ -79,7 +79,6 @@ sk_sp GetImageBytesAsRGBA(sk_sp image) { FXL_LOG(ERROR) << "Pixel address is not available."; return nullptr; } - ASSERT(pixmap.colorType() == kRGBA_8888_SkColorType); const size_t pixmap_size = pixmap.computeByteSize(); return SkData::MakeWithCopy(pixmap.addr32(), pixmap_size); diff --git a/testing/dart/.gitignore b/testing/dart/.gitignore index 79f51c3d50b9f..93d2a1eaede95 100644 --- a/testing/dart/.gitignore +++ b/testing/dart/.gitignore @@ -1,3 +1,2 @@ -.dart_tool .packages pubspec.lock