Remove negation in srgb image naming

Right now, there is a name contains_non_srgb_images that is used a
handful of times. The negative "non" complicates things when we have
to !contains_non_srgb_images.

This CL changes the name to contains_only_srgb_images and inverts
the behavior that depends on it.

Bug: 955158
Change-Id: I60799094a3f1aea2ffe9cfa58f7f396eb61d1c4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2055407Reviewed-by: Khushal <khushalsagar@chromium.org>
Commit-Queue: Chris Blume <cblume@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741197}

cc/layers/picture_layer_impl.cc

@@ -1704,18 +1704,17 @@ void PictureLayerImpl::InvalidatePaintWorklets(
 
 gfx::ContentColorUsage PictureLayerImpl::GetContentColorUsage() const {
   auto display_item_list = raster_source_->GetDisplayItemList();
-  bool contains_non_srgb_images = false;
+  bool contains_only_srgb_images = true;
   if (display_item_list) {
-    contains_non_srgb_images =
-        display_item_list->discardable_image_map().contains_non_srgb_images();
+    contains_only_srgb_images =
+        display_item_list->discardable_image_map().contains_only_srgb_images();
   }
 
-  if (contains_non_srgb_images) {
-    // TODO(cblume) This assumes only wide color gamut and not HDR
-    return gfx::ContentColorUsage::kWideColorGamut;
-  }
+  if (contains_only_srgb_images)
+    return gfx::ContentColorUsage::kSRGB;
 
-  return gfx::ContentColorUsage::kSRGB;
+  // TODO(cblume) This assumes only wide color gamut and not HDR
+  return gfx::ContentColorUsage::kWideColorGamut;
 }
 
 }  // namespace cc

cc/paint/discardable_image_map.cc

@@ -70,8 +70,8 @@ class DiscardableImageGenerator {
     }
   }
 
-  bool contains_non_srgb_images() const {
-    return color_stats_srgb_image_count_ != color_stats_total_image_count_;
+  bool contains_only_srgb_images() const {
+    return color_stats_srgb_image_count_ == color_stats_total_image_count_;
   }
 
  private:
@@ -355,7 +355,7 @@ void DiscardableImageMap::Generate(const PaintOpBuffer* paint_op_buffer,
   animated_images_metadata_ = generator.TakeAnimatedImagesMetadata();
   paint_worklet_inputs_ = generator.TakePaintWorkletInputs();
   decoding_mode_map_ = generator.TakeDecodingModeMap();
-  contains_non_srgb_images_ = generator.contains_non_srgb_images();
+  contains_only_srgb_images_ = generator.contains_only_srgb_images();
   auto images = generator.TakeImages();
   images_rtree_.Build(
       images,

cc/paint/discardable_image_map.h

@@ -59,7 +59,7 @@ class CC_PAINT_EXPORT DiscardableImageMap {
   void GetDiscardableImagesInRect(const gfx::Rect& rect,
                                   std::vector<const DrawImage*>* images) const;
   const Rects& GetRectsForImage(PaintImage::Id image_id) const;
-  bool contains_non_srgb_images() const { return contains_non_srgb_images_; }
+  bool contains_only_srgb_images() const { return contains_only_srgb_images_; }
   const std::vector<AnimatedImageMetadata>& animated_images_metadata() const {
     return animated_images_metadata_;
   }
@@ -91,7 +91,7 @@ class CC_PAINT_EXPORT DiscardableImageMap {
   base::flat_map<PaintImage::Id, Rects> image_id_to_rects_;
   std::vector<AnimatedImageMetadata> animated_images_metadata_;
   base::flat_map<PaintImage::Id, PaintImage::DecodingMode> decoding_mode_map_;
-  bool contains_non_srgb_images_ = false;
+  bool contains_only_srgb_images_ = true;
 
   RTree<DrawImage> images_rtree_;
 

cc/paint/discardable_image_map_unittest.cc

@@ -1150,7 +1150,7 @@ TEST_P(DiscardableImageMapColorSpaceTest, ColorSpace) {
   display_list->GenerateDiscardableImagesMetadata();
   const DiscardableImageMap& image_map = display_list->discardable_image_map();
 
-  EXPECT_FALSE(image_map.contains_non_srgb_images());
+  EXPECT_TRUE(image_map.contains_only_srgb_images());
 
   content_layer_client.add_draw_image(discardable_image, gfx::Point(0, 0),
                                       PaintFlags());
@@ -1160,11 +1160,11 @@ TEST_P(DiscardableImageMapColorSpaceTest, ColorSpace) {
   const DiscardableImageMap& image_map2 = display_list->discardable_image_map();
 
   if (!image_color_space.IsValid())
-    EXPECT_FALSE(image_map2.contains_non_srgb_images());
+    EXPECT_TRUE(image_map2.contains_only_srgb_images());
   else if (image_color_space == gfx::ColorSpace::CreateSRGB())
-    EXPECT_FALSE(image_map2.contains_non_srgb_images());
+    EXPECT_TRUE(image_map2.contains_only_srgb_images());
   else
-    EXPECT_TRUE(image_map2.contains_non_srgb_images());
+    EXPECT_FALSE(image_map2.contains_only_srgb_images());
 }
 
 gfx::ColorSpace test_color_spaces[] = {