Update from https://crrev.com/315085

cc/resources/picture_unittest.cc

 // Copyright 2013 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 "cc/resources/picture.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "cc/test/fake_content_layer_client.h"
@@ skipping 26 matching lines @@
   tmp.reset(new base::StringValue("abc!@#$%"));
   scoped_refptr<Picture> invalid_picture =
       Picture::CreateFromValue(tmp.get());
   EXPECT_FALSE(invalid_picture.get());
 
   // Single full-size rect picture.
   content_layer_client.add_draw_rect(layer_rect, red_paint);
 
   scoped_refptr<Picture> one_rect_picture =
       Picture::Create(layer_rect, &content_layer_client, tile_grid_size, false,
-                      Picture::RECORD_NORMALLY);
+                      RecordingSource::RECORD_NORMALLY);
   scoped_ptr<base::Value> serialized_one_rect(one_rect_picture->AsValue());
 
   // Reconstruct the picture.
   scoped_refptr<Picture> one_rect_picture_check =
       Picture::CreateFromValue(serialized_one_rect.get());
   EXPECT_TRUE(!!one_rect_picture_check.get());
 
   // Check for equivalence.
   unsigned char one_rect_buffer[4 * 100 * 100] = {0};
   DrawPicture(one_rect_buffer, layer_rect, one_rect_picture);
   unsigned char one_rect_buffer_check[4 * 100 * 100] = {0};
   DrawPicture(one_rect_buffer_check, layer_rect, one_rect_picture_check);
 
   EXPECT_EQ(one_rect_picture->LayerRect(), one_rect_picture_check->LayerRect());
   EXPECT_EQ(0, memcmp(one_rect_buffer, one_rect_buffer_check, 4 * 100 * 100));
 
   // Two rect picture.
   content_layer_client.add_draw_rect(gfx::Rect(25, 25, 50, 50), green_paint);
 
   scoped_refptr<Picture> two_rect_picture =
       Picture::Create(layer_rect, &content_layer_client, tile_grid_size, false,
-                      Picture::RECORD_NORMALLY);
+                      RecordingSource::RECORD_NORMALLY);
 
   scoped_ptr<base::Value> serialized_two_rect(two_rect_picture->AsValue());
 
   // Reconstruct the picture.
   scoped_refptr<Picture> two_rect_picture_check =
       Picture::CreateFromValue(serialized_two_rect.get());
   EXPECT_TRUE(!!two_rect_picture_check.get());
 
   // Check for equivalence.
   unsigned char two_rect_buffer[4 * 100 * 100] = {0};
@@ skipping 31 matching lines @@
         SkPaint paint;
         content_layer_client.add_draw_bitmap(
             discardable_bitmap[y][x],
             gfx::Point(x * 512 + 6, y * 512 + 6), paint);
       }
     }
   }
 
   scoped_refptr<Picture> picture =
       Picture::Create(layer_rect, &content_layer_client, tile_grid_size, true,
-                      Picture::RECORD_NORMALLY);
+                      RecordingSource::RECORD_NORMALLY);
 
   // Default iterator does not have any pixel refs
   {
     Picture::PixelRefIterator iterator;
     EXPECT_FALSE(iterator);
   }
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
       Picture::PixelRefIterator iterator(gfx::Rect(x * 512, y * 512, 500, 500),
                                          picture.get());
@@ skipping 74 matching lines @@
         SkPaint paint;
         content_layer_client.add_draw_bitmap(
             discardable_bitmap[y][x],
             gfx::Point(1024 + x * 512 + 6, y * 512 + 6), paint);
       }
     }
   }
 
   scoped_refptr<Picture> picture =
       Picture::Create(layer_rect, &content_layer_client, tile_grid_size, true,
-                      Picture::RECORD_NORMALLY);
+                      RecordingSource::RECORD_NORMALLY);
 
   // Default iterator does not have any pixel refs
   {
     Picture::PixelRefIterator iterator;
     EXPECT_FALSE(iterator);
   }
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
       Picture::PixelRefIterator iterator(
           gfx::Rect(1024 + x * 512, y * 512, 500, 500), picture.get());
@@ skipping 97 matching lines @@
         SkPaint paint;
         content_layer_client.add_draw_bitmap(
             discardable_bitmap[y][x],
             gfx::Point(x * 512 + 6, y * 512 + 6), paint);
       }
     }
   }
 
   scoped_refptr<Picture> picture =
       Picture::Create(layer_rect, &content_layer_client, tile_grid_size, true,
-                      Picture::RECORD_NORMALLY);
+                      RecordingSource::RECORD_NORMALLY);
 
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
       Picture::PixelRefIterator iterator(
           gfx::Rect(x * 512, y * 512 + 256, 1, 1), picture.get());
       if ((x + y) & 1) {
         EXPECT_TRUE(iterator) << x << " " << y;
         EXPECT_TRUE(*iterator == discardable_bitmap[y][x].pixelRef());
         EXPECT_FALSE(++iterator) << x << " " << y;
       } else {
@@ skipping 22 matching lines @@
   // Invalid picture (not a dict).
   tmp.reset(new base::StringValue("abc!@#$%"));
   scoped_refptr<Picture> invalid_picture =
       Picture::CreateFromSkpValue(tmp.get());
   EXPECT_TRUE(!invalid_picture.get());
 
   // Single full-size rect picture.
   content_layer_client.add_draw_rect(layer_rect, red_paint);
   scoped_refptr<Picture> one_rect_picture =
       Picture::Create(layer_rect, &content_layer_client, tile_grid_size, false,
-                      Picture::RECORD_NORMALLY);
+                      RecordingSource::RECORD_NORMALLY);
   scoped_ptr<base::Value> serialized_one_rect(
       one_rect_picture->AsValue());
 
   const base::DictionaryValue* value = NULL;
   EXPECT_TRUE(serialized_one_rect->GetAsDictionary(&value));
 
   // Decode the picture from base64.
   const base::Value* skp_value;
   EXPECT_TRUE(value->Get("skp64", &skp_value));
 
@@ skipping 11 matching lines @@
 
   gfx::Rect layer_rect(100, 200);
 
   gfx::Size tile_grid_size(100, 200);
 
   FakeContentLayerClient content_layer_client;
   EXPECT_EQ(NULL, content_layer_client.last_canvas());
 
   scoped_refptr<Picture> picture =
       Picture::Create(layer_rect, &content_layer_client, tile_grid_size, false,
-                      Picture::RECORD_NORMALLY);
+                      RecordingSource::RECORD_NORMALLY);
   EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
-  EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED,
-            content_layer_client.last_context_status());
+  EXPECT_EQ(ContentLayerClient::PAINTING_BEHAVIOR_NORMAL,
+            content_layer_client.last_painting_control());
   EXPECT_TRUE(picture.get());
 
   picture = Picture::Create(layer_rect, &content_layer_client, tile_grid_size,
-                            false, Picture::RECORD_WITH_SK_NULL_CANVAS);
+                            false, RecordingSource::RECORD_WITH_SK_NULL_CANVAS);
   EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
-  EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_ENABLED,
-            content_layer_client.last_context_status());
+  EXPECT_EQ(ContentLayerClient::PAINTING_BEHAVIOR_NORMAL,
+            content_layer_client.last_painting_control());
   EXPECT_TRUE(picture.get());
 
-  picture = Picture::Create(layer_rect, &content_layer_client, tile_grid_size,
-                            false, Picture::RECORD_WITH_PAINTING_DISABLED);
+  picture =
+      Picture::Create(layer_rect, &content_layer_client, tile_grid_size, false,
+                      RecordingSource::RECORD_WITH_PAINTING_DISABLED);
   EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
-  EXPECT_EQ(ContentLayerClient::GRAPHICS_CONTEXT_DISABLED,
-            content_layer_client.last_context_status());
+  EXPECT_EQ(ContentLayerClient::DISPLAY_LIST_CONSTRUCTION_DISABLED,
+            content_layer_client.last_painting_control());
   EXPECT_TRUE(picture.get());
 
-  EXPECT_EQ(3, Picture::RECORDING_MODE_COUNT);
+  picture =
+      Picture::Create(layer_rect, &content_layer_client, tile_grid_size, false,
+                      RecordingSource::RECORD_WITH_CACHING_DISABLED);
+  EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
+  EXPECT_EQ(ContentLayerClient::DISPLAY_LIST_CACHING_DISABLED,
+            content_layer_client.last_painting_control());
+  EXPECT_TRUE(picture.get());
+
+  EXPECT_EQ(4, RecordingSource::RECORDING_MODE_COUNT);
 }
 
 }  // namespace
 }  // namespace cc