Fix broken Linux build (flutter#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.
Konoha-orz · Apr 16, 2018 · d6d4eec · d6d4eec
1 parent d15dc76
commit d6d4eec
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -79,7 +79,6 @@ sk_sp<SkData> GetImageBytesAsRGBA(sk_sp<SkImage> 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
@@ -1,3 +1,2 @@
-.dart_tool
 .packages
 pubspec.lock