Make skia.mojom.Bitmap use shared buffer

ui/gfx/image/mojo/image_traits_unittest.cc

 // Copyright 2017 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 <vector>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 61 matching lines @@
 TEST_F(ImageTraitsTest, NullImageSkiaRep) {
   ImageSkiaRep null_rep;
   ASSERT_TRUE(null_rep.is_null());
 
   ImageSkiaRep output(gfx::Size(1, 1), 1.0f);
   ASSERT_FALSE(output.is_null());
   service()->EchoImageSkiaRep(null_rep, &output);
   EXPECT_TRUE(output.is_null());
 }
 
-TEST_F(ImageTraitsTest, EmptyImageSkiaRep) {
+TEST_F(ImageTraitsTest, EmptyImageSkiaRepBecomesNull) {
   SkBitmap empty_bitmap;
   empty_bitmap.allocN32Pixels(0, 0);
   // Empty SkBitmap is not null.
   EXPECT_FALSE(empty_bitmap.isNull());
   EXPECT_TRUE(empty_bitmap.drawsNothing());
 
   ImageSkiaRep empty_rep(empty_bitmap, 1.0f);
   // ImageSkiaRep with empty bitmap is not null.
   ASSERT_FALSE(empty_rep.is_null());
 
   ImageSkiaRep output(gfx::Size(1, 1), 1.0f);
   ASSERT_FALSE(output.is_null());
   service()->EchoImageSkiaRep(empty_rep, &output);
-  EXPECT_TRUE(empty_rep.sk_bitmap().drawsNothing());
-  EXPECT_TRUE(test::AreBitmapsEqual(empty_rep.sk_bitmap(), output.sk_bitmap()));
+  // After transport, output rep has no underlying buffer but has valid size.
+  EXPECT_TRUE(output.is_null());

[msw, 2017/03/25 00:59:52]

Odd that this doesn't match empty_rep.is_null()...

+  EXPECT_EQ(empty_rep.pixel_size(), output.pixel_size());
+  EXPECT_EQ(empty_rep.scale(), output.scale());
 }
 
 TEST_F(ImageTraitsTest, ImageSkiaRep) {
   ImageSkiaRep image_rep(gfx::Size(2, 4), 2.0f);
 
   ImageSkiaRep output;
   service()->EchoImageSkiaRep(image_rep, &output);
 
   EXPECT_FALSE(output.is_null());
   EXPECT_EQ(image_rep.scale(), output.scale());
@@ skipping 37 matching lines @@
   ImageSkia image(new TestImageSkiaSource(kSize), kSize);
   image.GetRepresentation(1.0f);
   image.GetRepresentation(2.0f);
 
   ImageSkia output;
   service()->EchoImageSkia(image, &output);
 
   EXPECT_TRUE(test::AreImagesEqual(Image(output), Image(image)));
 }
 
-TEST_F(ImageTraitsTest, EmptyRepPreserved) {
-  const gfx::Size kSize(1, 2);
-  ImageSkia image(new TestImageSkiaSource(kSize), kSize);
-  image.GetRepresentation(1.0f);
-
-  SkBitmap empty_bitmap;
-  empty_bitmap.allocN32Pixels(0, 0);
-  image.AddRepresentation(ImageSkiaRep(empty_bitmap, 2.0f));
-
-  ImageSkia output;
-  service()->EchoImageSkia(image, &output);
-
-  EXPECT_TRUE(test::AreImagesEqual(Image(output), Image(image)));
-}
-
 TEST_F(ImageTraitsTest, ImageSkiaWithOperations) {
   const gfx::Size kSize(32, 32);
   ImageSkia image(new TestImageSkiaSource(kSize), kSize);
 
   const gfx::Size kNewSize(16, 16);
   ImageSkia resized = ImageSkiaOperations::CreateResizedImage(
       image, skia::ImageOperations::RESIZE_BEST, kNewSize);
   resized.GetRepresentation(1.0f);
   resized.GetRepresentation(2.0f);
 
   ImageSkia output;
   service()->EchoImageSkia(resized, &output);
 
   EXPECT_TRUE(test::AreImagesEqual(Image(output), Image(resized)));
 }
 
 }  // namespace gfx